Fixed #18013 -- Use the new 'as' syntax for exceptions.

Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).

django/conf/__init__.py

@@ -91,7 +91,7 @@ def __init__(self, settings_module):
 
         try:
             mod = importlib.import_module(self.SETTINGS_MODULE)
-        except ImportError, e:
+        except ImportError as e:
             raise ImportError("Could not import settings '%s' (Is it on sys.path?): %s" % (self.SETTINGS_MODULE, e))
 
         # Settings that should be converted into tuples if they're mistakenly entered

django/contrib/admin/tests.py

@@ -14,7 +14,7 @@ def setUpClass(cls):
             mod = import_module(module)
             WebDriver = getattr(mod, attr)
             cls.selenium = WebDriver()
-        except Exception, e:
+        except Exception as e:
             raise SkipTest('Selenium webdriver "%s" not installed or not '
                            'operational: %s' % (cls.webdriver_class, str(e)))
         super(AdminSeleniumWebDriverTestCase, cls).setUpClass()

django/contrib/admin/util.py

@@ -156,7 +156,7 @@ def collect(self, objs, source_attr=None, **kwargs):
                 self.add_edge(None, obj)
         try:
             return super(NestedObjects, self).collect(objs, source_attr=source_attr, **kwargs)
-        except models.ProtectedError, e:
+        except models.ProtectedError as e:
             self.protected.update(e.protected_objects)
 
     def related_objects(self, related, objs):

django/contrib/admin/views/main.py

@@ -139,7 +139,7 @@ def get_filters(self, request):
                 use_distinct = (use_distinct or
                                 lookup_needs_distinct(self.lookup_opts, key))
             return filter_specs, bool(filter_specs), lookup_params, use_distinct
-        except FieldDoesNotExist, e:
+        except FieldDoesNotExist as e:
             raise IncorrectLookupParameters(e)
 
     def get_query_string(self, new_params=None, remove=None):
@@ -316,7 +316,7 @@ def get_query_set(self, request):
             # Allow certain types of errors to be re-raised as-is so that the
             # caller can treat them in a special way.
             raise
-        except Exception, e:
+        except Exception as e:
             # Every other error is caught with a naked except, because we don't
             # have any other way of validating lookup parameters. They might be
             # invalid if the keyword arguments are incorrect, or if the values

django/contrib/admindocs/views.py

@@ -318,7 +318,7 @@ def load_all_installed_template_libraries():
         for library_name in libraries:
             try:
                 lib = template.get_library(library_name)
-            except template.InvalidTemplateLibrary, e:
+            except template.InvalidTemplateLibrary:
                 pass
 
 def get_return_data_type(func_name):

django/contrib/auth/__init__.py

@@ -11,9 +11,9 @@ def load_backend(path):
     module, attr = path[:i], path[i+1:]
     try:
         mod = import_module(module)
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured('Error importing authentication backend %s: "%s"' % (path, e))
-    except ValueError, e:
+    except ValueError:
         raise ImproperlyConfigured('Error importing authentication backends. Is AUTHENTICATION_BACKENDS a correctly defined list or tuple?')
     try:
         cls = getattr(mod, attr)

django/contrib/comments/views/comments.py

@@ -66,7 +66,7 @@ def post_comment(request, next=None, using=None):
         return CommentPostBadRequest(
             "No object matching content-type %r and object PK %r exists." % \
                 (escape(ctype), escape(object_pk)))
-    except (ValueError, ValidationError), e:
+    except (ValueError, ValidationError) as e:
         return CommentPostBadRequest(
             "Attempting go get content-type %r and object PK %r exists raised %s" % \
                 (escape(ctype), escape(object_pk), e.__class__.__name__))

django/contrib/formtools/wizard/storage/__init__.py

@@ -10,7 +10,7 @@ def get_storage(path, *args, **kwargs):
     module, attr = path[:i], path[i+1:]
     try:
         mod = import_module(module)
-    except ImportError, e:
+    except ImportError as e:
         raise MissingStorageModule(
             'Error loading storage %s: "%s"' % (module, e))
     try:

django/contrib/gis/db/backends/base.py

@@ -164,13 +164,13 @@ def srs(self):
                 try:
                     self._srs = gdal.SpatialReference(self.wkt)
                     return self.srs
-                except Exception, msg:
+                except Exception as msg:
                     pass
 
                 try:
                     self._srs = gdal.SpatialReference(self.proj4text)
                     return self.srs
-                except Exception, msg:
+                except Exception as msg:
                     pass
 
                 raise Exception('Could not get OSR SpatialReference from WKT: %s\nError:\n%s' % (self.wkt, msg))

django/contrib/gis/db/backends/oracle/introspection.py

@@ -16,7 +16,7 @@ def get_geometry_type(self, table_name, geo_col):
                 cursor.execute('SELECT "DIMINFO", "SRID" FROM "USER_SDO_GEOM_METADATA" WHERE "TABLE_NAME"=%s AND "COLUMN_NAME"=%s',
                                (table_name.upper(), geo_col.upper()))
                 row = cursor.fetchone()
-            except Exception, msg:
+            except Exception as msg:
                 raise Exception('Could not find entry in USER_SDO_GEOM_METADATA corresponding to "%s"."%s"\n'
                                 'Error message: %s.' % (table_name, geo_col, msg))
 

django/contrib/gis/db/backends/postgis/operations.py

@@ -107,9 +107,7 @@ def __init__(self, connection):
                                        'Was the database created from a spatial database '
                                        'template?' % self.connection.settings_dict['NAME']
                                        )
-        except Exception, e:
-            # TODO: Raise helpful exceptions as they become known.
-            raise
+        # TODO: Raise helpful exceptions as they become known.
 
         # PostGIS-specific operators. The commented descriptions of these
         # operators come from Section 7.6 of the PostGIS 1.4 documentation.

django/contrib/gis/db/backends/spatialite/base.py

@@ -56,7 +56,7 @@ def _cursor(self):
             cur = self.connection.cursor(factory=SQLiteCursorWrapper)
             try:
                 cur.execute("SELECT load_extension(%s)", (self.spatialite_lib,))
-            except Exception, msg:
+            except Exception as msg:
                 raise ImproperlyConfigured('Unable to load the SpatiaLite library extension '
                                            '"%s" because: %s' % (self.spatialite_lib, msg))
             return cur

django/contrib/gis/db/backends/spatialite/operations.py

@@ -122,7 +122,7 @@ def __init__(self, connection):
             self.spatial_version = version
         except ImproperlyConfigured:
             raise
-        except Exception, msg:
+        except Exception as msg:
             raise ImproperlyConfigured('Cannot determine the SpatiaLite version for the "%s" '
                                        'database (error was "%s").  Was the SpatiaLite initialization '
                                        'SQL loaded on this database?' %

django/contrib/gis/geometry/backend/__init__.py

@@ -6,10 +6,10 @@
 
 try:
     module = import_module('.%s' % geom_backend, 'django.contrib.gis.geometry.backend')
-except ImportError, e:
+except ImportError:
     try:
         module = import_module(geom_backend)
-    except ImportError, e_user:
+    except ImportError:
         raise ImproperlyConfigured('Could not import user-defined GEOMETRY_BACKEND '
                                    '"%s".' % geom_backend)
 

django/contrib/gis/management/commands/ogrinspect.py

@@ -87,7 +87,7 @@ def handle(self, *args, **options):
         # Getting the OGR DataSource from the string parameter.
         try:
             ds = gdal.DataSource(data_source)
-        except gdal.OGRException, msg:
+        except gdal.OGRException as msg:
             raise CommandError(msg)
 
         # Whether the user wants to generate the LayerMapping dictionary as well.

django/contrib/gis/tests/test_measure.py

@@ -62,32 +62,20 @@ def testAddition(self):
         d4 -= d1
         self.assertEqual(d4.m, -200)
 
-        try:
+        with self.assertRaises(TypeError):
             d5 = d1 + 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Distance + number should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             d5 = d1 - 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Distance - number should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             d1 += 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Distance += number should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             d1 -= 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Distance -= number should raise TypeError')
 
     def testMultiplication(self):
@@ -110,25 +98,16 @@ def testMultiplication(self):
         self.assertTrue(isinstance(a5, Area))
         self.assertEqual(a5.sq_m, 100*10)
 
-        try:
+        with self.assertRaises(TypeError):
             d1 *= D(m=1)
-        except TypeError, e:
-            pass
-        else:
             self.fail('Distance *= Distance should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             d5 = d1 / D(m=1)
-        except TypeError, e:
-            pass
-        else:
             self.fail('Distance / Distance should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             d1 /= D(m=1)
-        except TypeError, e:
-            pass
-        else:
             self.fail('Distance /= Distance should raise TypeError')
 
     def testUnitConversions(self):
@@ -217,32 +196,20 @@ def testAddition(self):
         a4 -= a1
         self.assertEqual(a4.sq_m, -200)
 
-        try:
+        with self.assertRaises(TypeError):
             a5 = a1 + 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area + number should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             a5 = a1 - 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area - number should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             a1 += 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area += number should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             a1 -= 1
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area -= number should raise TypeError')
 
     def testMultiplication(self):
@@ -261,32 +228,20 @@ def testMultiplication(self):
         a4 /= 5
         self.assertEqual(a4.sq_m, 10)
 
-        try:
+        with self.assertRaises(TypeError):
             a5 = a1 * A(sq_m=1)
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area * Area should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             a1 *= A(sq_m=1)
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area *= Area should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             a5 = a1 / A(sq_m=1)
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area / Area should raise TypeError')
 
-        try:
+        with self.assertRaises(TypeError):
             a1 /= A(sq_m=1)
-        except TypeError, e:
-            pass
-        else:
             self.fail('Area /= Area should raise TypeError')
 
     def testUnitConversions(self):

django/contrib/gis/utils/layermapping.py

@@ -430,7 +430,7 @@ def coord_transform(self):
 
             # Creating the CoordTransform object
             return CoordTransform(self.source_srs, target_srs)
-        except Exception, msg:
+        except Exception as msg:
             raise LayerMapError('Could not translate between the data source and model geometry: %s' % msg)
 
     def geometry_field(self):
@@ -514,7 +514,7 @@ def _save(feat_range=default_range, num_feat=0, num_saved=0):
                 # Getting the keyword arguments
                 try:
                     kwargs = self.feature_kwargs(feat)
-                except LayerMapError, msg:
+                except LayerMapError as msg:
                     # Something borked the validation
                     if strict: raise
                     elif not silent:
@@ -553,7 +553,7 @@ def _save(feat_range=default_range, num_feat=0, num_saved=0):
                         if verbose: stream.write('%s: %s\n' % (is_update and 'Updated' or 'Saved', m))
                     except SystemExit:
                         raise
-                    except Exception, msg:
+                    except Exception as msg:
                         if self.transaction_mode == 'autocommit':
                             # Rolling back the transaction so that other model saves
                             # will work.

django/contrib/markup/tests.py

@@ -87,7 +87,7 @@ def test_docutils(self):
             # Docutils v0.4 and earlier
             self.assertEqual(rendered, """<p>Paragraph 1</p>
 <p>Paragraph 2 with a <a class="reference" href="http://www.example.com/">link</a></p>""")
-        except AssertionError, e:
+        except AssertionError:
             # Docutils from SVN (which will become 0.5)
             self.assertEqual(rendered, """<p>Paragraph 1</p>
 <p>Paragraph 2 with a <a class="reference external" href="http://www.example.com/">link</a></p>""")

django/contrib/messages/storage/__init__.py

@@ -15,7 +15,7 @@ def get_storage(import_path):
     module, classname = import_path[:dot], import_path[dot + 1:]
     try:
         mod = import_module(module)
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured('Error importing module %s: "%s"' %
                                    (module, e))
     try:

django/contrib/sessions/backends/file.py

@@ -90,7 +90,7 @@ def save(self, must_create=False):
             fd = os.open(session_file_name, flags)
             os.close(fd)
 
-        except OSError, e:
+        except OSError as e:
             if must_create and e.errno == errno.EEXIST:
                 raise CreateError
             raise

django/contrib/staticfiles/finders.py

@@ -260,7 +260,7 @@ def _get_finder(import_path):
     module, attr = import_path.rsplit('.', 1)
     try:
         mod = import_module(module)
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured('Error importing module %s: "%s"' %
                                    (module, e))
     try:

django/contrib/staticfiles/handlers.py

@@ -56,7 +56,7 @@ def get_response(self, request):
         if self._should_handle(request.path):
             try:
                 return self.serve(request)
-            except Http404, e:
+            except Http404 as e:
                 if settings.DEBUG:
                     from django.views import debug
                     return debug.technical_404_response(request, e)

django/core/cache/__init__.py

@@ -128,7 +128,7 @@ def get_cache(backend, **kwargs):
             mod_path, cls_name = backend.rsplit('.', 1)
             mod = importlib.import_module(mod_path)
             backend_cls = getattr(mod, cls_name)
-    except (AttributeError, ImportError), e:
+    except (AttributeError, ImportError) as e:
         raise InvalidCacheBackendError(
             "Could not find backend '%s': %s" % (backend, e))
     cache = backend_cls(location, params)

django/core/files/move.py

@@ -79,7 +79,7 @@ def file_move_safe(old_file_name, new_file_name, chunk_size = 1024*64, allow_ove
 
     try:
         os.remove(old_file_name)
-    except OSError, e:
+    except OSError as e:
         # Certain operating systems (Cygwin and Windows) 
         # fail when deleting opened files, ignore it.  (For the 
         # systems where this happens, temporary files will be auto-deleted