Merge pull request django-haystack#22 from stefanw/python-3

Convert to PEP 3110 style exception catching

Author: jezdez

celery_haystack/tasks.py

@@ -13,7 +13,7 @@
         from haystack import site
         from haystack.exceptions import NotRegistered as IndexNotFoundException  # noqa
         legacy = True
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured("Haystack couldn't be imported: %s" % e)
 
 if settings.CELERY_HAYSTACK_TRANSACTION_SAFE and not getattr(settings, 'CELERY_ALWAYS_EAGER', False):
@@ -125,7 +125,7 @@ def run(self, action, identifier, **kwargs):
                 try:
                     handler_options = self.get_handler_options(**kwargs)
                     current_index.remove_object(identifier, **handler_options)
-                except Exception, exc:
+                except Exception as exc:
                     logger.exception(exc)
                     self.retry(exc=exc)
                 else:
@@ -146,7 +146,7 @@ def run(self, action, identifier, **kwargs):
                 try:
                     handler_options = self.get_handler_options(**kwargs)
                     current_index.update_object(instance, **handler_options)
-                except Exception, exc:
+                except Exception as exc:
                     logger.exception(exc)
                     self.retry(exc=exc)
                 else:

celery_haystack/utils.py

@@ -11,7 +11,7 @@ def get_update_task(task_path=None):
     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: