summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-19 18:17:58 +0000
committerGerrit Code Review <review@openstack.org>2012-01-19 18:17:58 +0000
commit8d9ace78ee467a7c866d74343a1f50d9a3afc670 (patch)
treeab78e139d0e3ef528d3d5e7f19e804cd3dc5be9b
parent7f97469b11c17ee47296a1068d2237517d47b34e (diff)
parenteedd27127626e35601df7c6257b32f73290482c6 (diff)
downloadkeystone-8d9ace78ee467a7c866d74343a1f50d9a3afc670.tar.gz
keystone-8d9ace78ee467a7c866d74343a1f50d9a3afc670.tar.xz
keystone-8d9ace78ee467a7c866d74343a1f50d9a3afc670.zip
Merge "Revert "Exception raise error""
-rw-r--r--keystone/tools/buffout.py2
-rwxr-xr-xrun_tests.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/keystone/tools/buffout.py b/keystone/tools/buffout.py
index cf6e32ac..e0202c0e 100644
--- a/keystone/tools/buffout.py
+++ b/keystone/tools/buffout.py
@@ -24,7 +24,7 @@ class OutputBuffer():
if exc_type is None:
self.stop()
else:
- raise exc_type, exc_value, traceback
+ raise
def __unicode__(self):
return self._contents
diff --git a/run_tests.sh b/run_tests.sh
index c587c5e1..e943bd8b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -146,7 +146,7 @@ function run_pep8 {
srcfiles+=" keystone examples tools setup.py run_tests.py"
# Just run PEP8 in current environment
${wrapper} pep8 --repeat --show-pep8 --show-source \
- --ignore=E202,E111,W602 \
+ --ignore=E202,E111 \
--exclude=vcsversion.py,$GLOBIGNORE ${srcfiles}
}