Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hgweb/request.py @ 25660:328739ea70c3
global: mass rewrite to use modern exception syntax
Python 2.6 introduced the "except type as instance" syntax, replacing
the "except type, instance" syntax that came before. Python 3 dropped
support for the latter syntax. Since we no longer support Python 2.4 or
2.5, we have no need to continue supporting the "except type, instance".
This patch mass rewrites the exception syntax to be Python 2.6+ and
Python 3 compatible.
This patch was produced by running `2to3 -f except -w -n .`.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Tue, 23 Jun 2015 22:20:08 -0700 |
parents | e33b9b92a200 |
children | 9df8c729e2e7 |
comparison
equal
deleted
inserted
replaced
25659:d60678a567a9 | 25660:328739ea70c3 |
---|---|
109 | 109 |
110 def write(self, thing): | 110 def write(self, thing): |
111 if thing: | 111 if thing: |
112 try: | 112 try: |
113 self.server_write(thing) | 113 self.server_write(thing) |
114 except socket.error, inst: | 114 except socket.error as inst: |
115 if inst[0] != errno.ECONNRESET: | 115 if inst[0] != errno.ECONNRESET: |
116 raise | 116 raise |
117 | 117 |
118 def writelines(self, lines): | 118 def writelines(self, lines): |
119 for line in lines: | 119 for line in lines: |