From e916390ce0ac464e4d1356a7c33edc9c55c7cb7f Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 22 Sep 2011 22:40:59 -0500 Subject: Backed out syntax changes specific to 2.5. --- pyramid/authentication.py | 4 +--- pyramid/config/util.py | 7 ++----- pyramid/session.py | 4 +--- pyramid/tests/test_config/test_views.py | 13 ++++--------- pyramid/tests/test_router.py | 4 +--- pyramid/tests/test_util.py | 4 +--- pyramid/traversal.py | 4 +--- pyramid/urldispatch.py | 4 +--- 8 files changed, 12 insertions(+), 32 deletions(-) diff --git a/pyramid/authentication.py b/pyramid/authentication.py index 898cc77a7..2bbe4d191 100644 --- a/pyramid/authentication.py +++ b/pyramid/authentication.py @@ -3,7 +3,6 @@ from codecs import utf_8_encode from hashlib import md5 import datetime import re -import sys import time as time_mod import urllib @@ -472,8 +471,7 @@ def parse_ticket(secret, ticket, ip): digest = ticket[:32] try: timestamp = int(ticket[32:40], 16) - except ValueError: - e = sys.exc_info()[1] + except ValueError as e: raise BadTicket('Timestamp is not a hex integer: %s' % e) try: userid, data = ticket[40:].split('!', 1) diff --git a/pyramid/config/util.py b/pyramid/config/util.py index f549b1977..53a390c7e 100644 --- a/pyramid/config/util.py +++ b/pyramid/config/util.py @@ -1,5 +1,4 @@ import re -import sys import traceback from pyramid.exceptions import ConfigurationError @@ -112,8 +111,7 @@ def make_predicates(xhr=None, request_method=None, path_info=None, if path_info is not None: try: path_info_val = re.compile(path_info) - except re.error: - why = sys.exc_info()[1] + except re.error as why: raise ConfigurationError(why[0]) def path_info_predicate(context, request): return path_info_val.match(request.path_info) is not None @@ -147,8 +145,7 @@ def make_predicates(xhr=None, request_method=None, path_info=None, header_name, header_val = header.split(':', 1) try: header_val = re.compile(header_val) - except re.error: - why = sys.exc_info()[1] + except re.error as why: raise ConfigurationError(why[0]) if header_val is None: text = "header %s" % header_name diff --git a/pyramid/session.py b/pyramid/session.py index 7d7edab1b..3a179e2fd 100644 --- a/pyramid/session.py +++ b/pyramid/session.py @@ -2,7 +2,6 @@ from hashlib import sha1 import base64 import binascii import hmac -import sys import time import os @@ -254,9 +253,8 @@ def signed_deserialize(serialized, secret, hmac=hmac): try: input_sig, pickled = (serialized[:40], base64.standard_b64decode(serialized[40:])) - except (binascii.Error, TypeError): + except (binascii.Error, TypeError) as e: # Badly formed data can make base64 die - e = sys.exc_info()[1] raise ValueError('Badly formed base64 data: %s' % e) sig = hmac.new(secret, pickled, sha1).hexdigest() diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py index c615c5a9e..0ea9d6cd0 100644 --- a/pyramid/tests/test_config/test_views.py +++ b/pyramid/tests/test_config/test_views.py @@ -1,5 +1,4 @@ import unittest -import sys from pyramid import testing from pyramid.tests.test_config import IDummy @@ -2531,8 +2530,7 @@ class TestViewDeriver(unittest.TestCase): request.url = 'url' try: result(None, request) - except HTTPForbidden: - e = sys.exc_info()[1] + except HTTPForbidden as e: self.assertEqual(e.message, 'Unauthorized: failed permission check') else: # pragma: no cover @@ -2554,8 +2552,7 @@ class TestViewDeriver(unittest.TestCase): request.url = 'url' try: result(None, request) - except HTTPForbidden: - e = sys.exc_info()[1] + except HTTPForbidden as e: self.assertEqual(e.message, 'Unauthorized: myview failed permission check') else: # pragma: no cover @@ -2573,8 +2570,7 @@ class TestViewDeriver(unittest.TestCase): request.method = 'POST' try: result(None, None) - except PredicateMismatch: - e = sys.exc_info()[1] + except PredicateMismatch as e: self.assertEqual(e.detail, 'predicate mismatch for view ') else: # pragma: no cover raise AssertionError @@ -2590,8 +2586,7 @@ class TestViewDeriver(unittest.TestCase): request.method = 'POST' try: result(None, None) - except PredicateMismatch: - e = sys.exc_info()[1] + except PredicateMismatch as e: self.assertEqual(e.detail, 'predicate mismatch for view myview') else: # pragma: no cover raise AssertionError diff --git a/pyramid/tests/test_router.py b/pyramid/tests/test_router.py index 6a1cfd0d2..1bee26e6a 100644 --- a/pyramid/tests/test_router.py +++ b/pyramid/tests/test_router.py @@ -1,4 +1,3 @@ -import sys import unittest from pyramid import testing @@ -1205,8 +1204,7 @@ class DummyLogger: def exc_raised(exc, func, *arg, **kw): try: func(*arg, **kw) - except exc: - e = sys.exc_info()[1] + except exc as e: return e else: raise AssertionError('%s not raised' % exc) # pragma: no cover diff --git a/pyramid/tests/test_util.py b/pyramid/tests/test_util.py index 2c38314f4..eb165ef69 100644 --- a/pyramid/tests/test_util.py +++ b/pyramid/tests/test_util.py @@ -1,5 +1,4 @@ import unittest -import sys class TestDottedNameResolver(unittest.TestCase): def _makeOne(self, package=None): @@ -10,8 +9,7 @@ class TestDottedNameResolver(unittest.TestCase): from pyramid.exceptions import ConfigurationError try: func(*arg, **kw) - except ConfigurationError: - e = sys.exc_info()[1] + except ConfigurationError as e: return e else: raise AssertionError('Invalid not raised') # pragma: no cover diff --git a/pyramid/traversal.py b/pyramid/traversal.py index de525e503..d586c30d9 100644 --- a/pyramid/traversal.py +++ b/pyramid/traversal.py @@ -1,4 +1,3 @@ -import sys import urllib import warnings @@ -484,8 +483,7 @@ def traversal_path(path): segment = urllib.unquote(segment) try: segment = segment.decode('utf-8') - except UnicodeDecodeError: - e = sys.exc_info()[1] + except UnicodeDecodeError as e: raise URLDecodeError(e.encoding, e.object, e.start, e.end, e.reason) if not segment or segment == '.': continue diff --git a/pyramid/urldispatch.py b/pyramid/urldispatch.py index 043203b79..8484fa549 100644 --- a/pyramid/urldispatch.py +++ b/pyramid/urldispatch.py @@ -1,5 +1,4 @@ import re -import sys from zope.interface import implementer from pyramid.interfaces import IRoutesMapper @@ -141,8 +140,7 @@ def _compile_route(route): encoded = url_unquote(v) try: d[k] = encoded.decode('utf-8') - except UnicodeDecodeError: - e = sys.exc_info()[1] + except UnicodeDecodeError as e: raise URLDecodeError( e.encoding, e.object, e.start, e.end, e.reason ) -- cgit v1.2.3