diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-24 04:59:51 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-24 04:59:51 -0400 |
| commit | 7975a185be516e1d721afff6a98fdfb5110281e2 (patch) | |
| tree | 4a97d6de5261612e4a1dd8c54c0df54e186dc662 | |
| parent | 55fb96a0411d5a2b14360ce075eb9e087aedc310 (diff) | |
| download | pyramid-7975a185be516e1d721afff6a98fdfb5110281e2.tar.gz pyramid-7975a185be516e1d721afff6a98fdfb5110281e2.tar.bz2 pyramid-7975a185be516e1d721afff6a98fdfb5110281e2.zip | |
more ridiculousness
| -rw-r--r-- | pyramid/config/__init__.py | 5 | ||||
| -rw-r--r-- | pyramid/config/util.py | 6 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_testing.py | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 527745ecf..6f1d71d21 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -912,8 +912,9 @@ class ActionState(object): except: t, v, tb = sys.exc_info() try: - reraise( - ConfigurationExecutionError(t, v, info), None, tb) + reraise(None, + ConfigurationExecutionError(t, v, info), + tb) finally: del t, v, tb finally: diff --git a/pyramid/config/util.py b/pyramid/config/util.py index 73bd053bd..498fe7629 100644 --- a/pyramid/config/util.py +++ b/pyramid/config/util.py @@ -115,7 +115,7 @@ def make_predicates(xhr=None, request_method=None, path_info=None, try: path_info_val = re.compile(path_info) except re.error as why: - raise ConfigurationError(why[0]) + raise ConfigurationError(why.args[0]) def path_info_predicate(context, request): return path_info_val.match(request.path_info) is not None text = "path_info = %s" @@ -150,7 +150,7 @@ def make_predicates(xhr=None, request_method=None, path_info=None, try: header_val = re.compile(header_val) except re.error as why: - raise ConfigurationError(why[0]) + raise ConfigurationError(why.args[0]) if header_val is None: text = "header %s" % header_name else: @@ -198,7 +198,7 @@ def make_predicates(xhr=None, request_method=None, path_info=None, match_param = {match_param: match_param_val} text = "match_param %s" % match_param def match_param_predicate(context, request): - for k, v in match_param.iteritems(): + for k, v in match_param.items(): if request.matchdict.get(k) != v: return False return True diff --git a/pyramid/tests/test_config/test_testing.py b/pyramid/tests/test_config/test_testing.py index 7f8c2c2b2..6c048b46d 100644 --- a/pyramid/tests/test_config/test_testing.py +++ b/pyramid/tests/test_config/test_testing.py @@ -1,5 +1,6 @@ import unittest +from pyramid.compat import text_ from pyramid.tests.test_config import IDummy class TestingConfiguratorMixinTests(unittest.TestCase): @@ -35,14 +36,14 @@ class TestingConfiguratorMixinTests(unittest.TestCase): self.assertEqual(result['context'], ob1) self.assertEqual(result['view_name'], '') self.assertEqual(result['subpath'], ()) - self.assertEqual(result['traversed'], (u'ob1',)) + self.assertEqual(result['traversed'], (text_('ob1'),)) self.assertEqual(result['virtual_root'], ob1) self.assertEqual(result['virtual_root_path'], ()) result = adapter(DummyRequest({'PATH_INFO':'/ob2'})) self.assertEqual(result['context'], ob2) self.assertEqual(result['view_name'], '') self.assertEqual(result['subpath'], ()) - self.assertEqual(result['traversed'], (u'ob2',)) + self.assertEqual(result['traversed'], (text_('ob2'),)) self.assertEqual(result['virtual_root'], ob2) self.assertEqual(result['virtual_root_path'], ()) self.assertRaises(KeyError, adapter, DummyRequest({'PATH_INFO':'/ob3'})) |