diff options
author | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-03-18 12:47:35 +0100 |
---|---|---|
committer | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-03-18 12:47:35 +0100 |
commit | be01dac147dda9295e9faeff01c7acec4e71ab31 (patch) | |
tree | 85154672d76bd72b10b6277a5189e1b6587ae11a | |
parent | 0940d96d1736a524cdad76d6f6f685462ee136e5 (diff) | |
download | paste-git-be01dac147dda9295e9faeff01c7acec4e71ab31.tar.gz |
Python 3: Replace "except Exception, exc" with "except Exception as exc:"
-rw-r--r-- | paste/auth/auth_tkt.py | 2 | ||||
-rw-r--r-- | paste/cgiapp.py | 2 | ||||
-rw-r--r-- | paste/errordocument.py | 4 | ||||
-rw-r--r-- | paste/evalexception/middleware.py | 6 | ||||
-rw-r--r-- | paste/exceptions/formatter.py | 4 | ||||
-rw-r--r-- | paste/fileapp.py | 6 | ||||
-rw-r--r-- | paste/httpexceptions.py | 2 | ||||
-rw-r--r-- | paste/recursive.py | 2 | ||||
-rw-r--r-- | paste/registry.py | 4 | ||||
-rw-r--r-- | paste/urlparser.py | 4 | ||||
-rw-r--r-- | paste/util/PySourceColor.py | 2 | ||||
-rw-r--r-- | paste/util/import_string.py | 4 | ||||
-rw-r--r-- | paste/util/scgiserver.py | 2 | ||||
-rw-r--r-- | paste/wsgilib.py | 2 | ||||
-rw-r--r-- | tests/test_auth/test_auth_digest.py | 2 | ||||
-rw-r--r-- | tests/test_recursive.py | 4 |
16 files changed, 26 insertions, 26 deletions
diff --git a/paste/auth/auth_tkt.py b/paste/auth/auth_tkt.py index e94f539..e960653 100644 --- a/paste/auth/auth_tkt.py +++ b/paste/auth/auth_tkt.py @@ -162,7 +162,7 @@ def parse_ticket(secret, ticket, ip, digest_algo=DEFAULT_DIGEST): digest = ticket[:digest_hexa_size] try: timestamp = int(ticket[digest_hexa_size:digest_hexa_size + 8], 16) - except ValueError, e: + except ValueError as e: raise BadTicket('Timestamp is not a hex integer: %s' % e) try: userid, data = ticket[digest_hexa_size + 8:].split('!', 1) diff --git a/paste/cgiapp.py b/paste/cgiapp.py index 2718506..c37ba4c 100644 --- a/paste/cgiapp.py +++ b/paste/cgiapp.py @@ -254,7 +254,7 @@ def proc_communicate(proc, stdin=None, stdout=None, stderr=None): try: proc.wait() - except OSError, e: + except OSError as e: if e.errno != 10: raise diff --git a/paste/errordocument.py b/paste/errordocument.py index 8b7d81c..1289add 100644 --- a/paste/errordocument.py +++ b/paste/errordocument.py @@ -84,7 +84,7 @@ class StatusKeeper(object): #raise Exception(self.url, self.status) try: return self.app(environ, keep_status_start_response) - except RecursionLoop, e: + except RecursionLoop as e: environ['wsgi.errors'].write('Recursion error getting error page: %s\n' % e) keep_status_start_response('500 Server Error', [('Content-type', 'text/plain')], sys.exc_info()) return ['Error: %s. (Error page could not be fetched)' @@ -363,7 +363,7 @@ class _StatusBasedRedirect(object): forward.start_response = eat_start_response try: app_iter = forward(url_, new_environ) - except InvalidForward, e: + except InvalidForward as e: code, message = code_message[0] environ['wsgi.errors'].write( 'Error occurred in ' diff --git a/paste/evalexception/middleware.py b/paste/evalexception/middleware.py index a31d7e1..455758a 100644 --- a/paste/evalexception/middleware.py +++ b/paste/evalexception/middleware.py @@ -146,7 +146,7 @@ def get_debug_info(func): % debugcount) debug_info = self.debug_infos[debugcount] return func(self, debug_info=debug_info, **form) - except ValueError, e: + except ValueError as e: form['headers']['status'] = '500 Server Error' return '<html>There was an error: %s</html>' % html_quote(e) return debug_info_replacement @@ -457,8 +457,8 @@ def make_table(items): out = StringIO() try: pprint.pprint(value, out) - except Exception, e: - print >> out, 'Error: %s' % e + except Exception as e: + print('Error: %s' % e, file=out) value = html_quote(out.getvalue()) if len(value) > 100: # @@: This can actually break the HTML :( diff --git a/paste/exceptions/formatter.py b/paste/exceptions/formatter.py index e1fadbe..a613479 100644 --- a/paste/exceptions/formatter.py +++ b/paste/exceptions/formatter.py @@ -220,7 +220,7 @@ class TextFormatter(AbstractFormatter): for n, v in items: try: v = repr(v) - except Exception, e: + except Exception as e: v = 'Cannot display: %s' % e v = truncate(v) lines.append(' %s: %s' % (n, v)) @@ -310,7 +310,7 @@ class HTMLFormatter(TextFormatter): for name, value in rows: try: value = repr(value) - except Exception, e: + except Exception as e: value = 'Cannot print: %s' % e odd = not odd table.append( diff --git a/paste/fileapp.py b/paste/fileapp.py index 6c42072..3825386 100644 --- a/paste/fileapp.py +++ b/paste/fileapp.py @@ -123,7 +123,7 @@ class DataApp(object): head.delete(headers) start_response('304 Not Modified', headers) return [''] - except HTTPBadRequest, exce: + except HTTPBadRequest as exce: return exce.wsgi_application(environ, start_response) # If we get If-None-Match and If-Modified-Since, and @@ -139,7 +139,7 @@ class DataApp(object): head.delete(headers) start_response('304 Not Modified', headers) return [''] # empty body - except HTTPBadRequest, exce: + except HTTPBadRequest as exce: return exce.wsgi_application(environ, start_response) (lower, upper) = (0, self.content_length - 1) @@ -215,7 +215,7 @@ class FileApp(DataApp): return exc(environ, start_response) try: file = open(self.filename, 'rb') - except (IOError, OSError), e: + except (IOError, OSError) as e: exc = HTTPForbidden( 'You are not permitted to view this file (%s)' % e) return exc.wsgi_application( diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py index ede4f7e..d04308f 100644 --- a/paste/httpexceptions.py +++ b/paste/httpexceptions.py @@ -631,7 +631,7 @@ class HTTPExceptionHandler(object): []).append(HTTPException) try: return self.application(environ, start_response) - except HTTPException, exc: + except HTTPException as exc: return exc(environ, start_response) def middleware(*args, **kw): diff --git a/paste/recursive.py b/paste/recursive.py index 944b002..13d33e8 100644 --- a/paste/recursive.py +++ b/paste/recursive.py @@ -82,7 +82,7 @@ class RecursiveMiddleware(object): environ['paste.recursive.script_name'] = my_script_name try: return self.application(environ, start_response) - except ForwardRequestException, e: + except ForwardRequestException as e: middleware = CheckForRecursionMiddleware( e.factory(self), environ) return middleware(environ, start_response) diff --git a/paste/registry.py b/paste/registry.py index ff47c19..4c0e2b0 100644 --- a/paste/registry.py +++ b/paste/registry.py @@ -384,7 +384,7 @@ class RegistryManager(object): #print "STREAMING" return self.streaming_iter(app_iter, reg, environ) - except Exception, e: + except Exception as e: # Regardless of if the content is an iterable, generator, list # or tuple, we clean-up right now. If its an iterable/generator # care should be used to ensure the generator has its own ref @@ -415,7 +415,7 @@ class RegistryManager(object): try: for item in app_iter: yield item - except Exception, e: + except Exception as e: # Regardless of if the content is an iterable, generator, list # or tuple, we clean-up right now. If its an iterable/generator # care should be used to ensure the generator has its own ref diff --git a/paste/urlparser.py b/paste/urlparser.py index a7469e3..4174bf7 100644 --- a/paste/urlparser.py +++ b/paste/urlparser.py @@ -368,7 +368,7 @@ def load_module_from_name(environ, filename, module_name, errors): if not os.path.exists(init_filename): try: f = open(init_filename, 'w') - except (OSError, IOError), e: + except (OSError, IOError) as e: errors.write( 'Cannot write __init__.py file into directory %s (%s)\n' % (os.path.dirname(filename), e)) @@ -574,7 +574,7 @@ class PkgResourcesParser(StaticURLParser): # @@: I don't know what to do with the encoding. try: file = self.egg.get_resource_stream(self.manager, resource) - except (IOError, OSError), e: + except (IOError, OSError) as e: exc = httpexceptions.HTTPForbidden( 'You are not permitted to view this file (%s)' % e) return exc.wsgi_application(environ, start_response) diff --git a/paste/util/PySourceColor.py b/paste/util/PySourceColor.py index d9f451f..64c0f56 100644 --- a/paste/util/PySourceColor.py +++ b/paste/util/PySourceColor.py @@ -1311,7 +1311,7 @@ class Parser(object): # Parse the source and write out the results.
try:
tokenize.tokenize(text.readline, self)
- except tokenize.TokenError, ex:
+ except tokenize.TokenError as ex:
msg = ex[0]
line = ex[1][0]
self.out.write("<h3>ERROR: %s</h3>%s\n"%
diff --git a/paste/util/import_string.py b/paste/util/import_string.py index 3feb4dd..a10db18 100644 --- a/paste/util/import_string.py +++ b/paste/util/import_string.py @@ -47,7 +47,7 @@ def simple_import(s): try: module = import_module(name) parts = parts[1:] - except ImportError, e: + except ImportError as e: last_import_error = e break obj = module @@ -79,7 +79,7 @@ def try_import_module(module_name): """ try: return import_module(module_name) - except ImportError, e: + except ImportError as e: if not getattr(e, 'args', None): raise desc = e.args[0] diff --git a/paste/util/scgiserver.py b/paste/util/scgiserver.py index d20c952..7963ed6 100644 --- a/paste/util/scgiserver.py +++ b/paste/util/scgiserver.py @@ -131,7 +131,7 @@ class SWAP(scgi_server.SCGIHandler): input.close() output.close() conn.close() - except IOError, err: + except IOError as err: debug("IOError while closing connection ignored: %s" % err) diff --git a/paste/wsgilib.py b/paste/wsgilib.py index a44bc9d..d958844 100644 --- a/paste/wsgilib.py +++ b/paste/wsgilib.py @@ -351,7 +351,7 @@ def raw_interactive(application, path='', raise_on_wsgi_error=False, if not headers_set: raise AssertionError("Content sent w/o headers!") output.append(s) - except TypeError, e: + except TypeError as e: # Typically "iteration over non-sequence", so we want # to give better debugging information... e.args = ((e.args[0] + ' iterable: %r' % app_iter),) + e.args[1:] diff --git a/tests/test_auth/test_auth_digest.py b/tests/test_auth/test_auth_digest.py index 55f953d..a821720 100644 --- a/tests/test_auth/test_auth_digest.py +++ b/tests/test_auth/test_auth_digest.py @@ -82,7 +82,7 @@ if os.environ.get("TEST_SOCKET",""): try: authfetch('bing','wrong') assert False, "this should raise an exception" - except urllib2.HTTPError, e: + except HTTPError as e: assert e.code == 401 def test_shutdown(): diff --git a/tests/test_recursive.py b/tests/test_recursive.py index e79d586..34f2f66 100644 --- a/tests/test_recursive.py +++ b/tests/test_recursive.py @@ -37,7 +37,7 @@ def forward(app): assert 'Page not found' in res try: res = app.get('/recurse') - except AssertionError, e: + except AssertionError as e: if str(e).startswith('Forwarding loop detected'): pass else: @@ -89,7 +89,7 @@ def test_ForwardRequest_factory(): assert 'Page not found' in res try: res = app.get('/recurse') - except AssertionError, e: + except AssertionError as e: if str(e).startswith('Forwarding loop detected'): pass else: |