Modernize exception syntax

src/sentry/__init__.py

@@ -11,7 +11,7 @@
 try:
     VERSION = __import__('pkg_resources') \
         .get_distribution('sentry').version
-except Exception, e:
+except Exception as e:
     VERSION = 'unknown'
 
 

src/sentry/coreapi.py

@@ -168,7 +168,7 @@ def decode_and_decompress_data(encoded_data):
             return decompress(encoded_data)
         except zlib.error:
             return base64.b64decode(encoded_data)
-    except Exception, e:
+    except Exception as e:
         # This error should be caught as it suggests that there's a
         # bug somewhere in the client's code.
         logger.info(e, **client_metadata(exception=e))
@@ -179,7 +179,7 @@ def decode_and_decompress_data(encoded_data):
 def safely_load_json_string(json_string):
     try:
         obj = json.loads(json_string)
-    except Exception, e:
+    except Exception as e:
         # This error should be caught as it suggests that there's a
         # bug somewhere in the client's code.
         logger.info(e, **client_metadata(exception=e))
@@ -268,7 +268,7 @@ def validate_data(project, data, client=None):
     if 'timestamp' in data:
         try:
             process_data_timestamp(data)
-        except InvalidTimestamp, e:
+        except InvalidTimestamp as e:
             # Log the error, remove the timestamp, and continue
             logger.info(
                 'Discarded invalid value for timestamp: %r', data['timestamp'],
@@ -368,7 +368,7 @@ def validate_data(project, data, client=None):
                 inst = interface(value)
             inst.validate()
             data[import_path] = inst.serialize()
-        except Exception, e:
+        except Exception as e:
             if isinstance(e, AssertionError):
                 log = logger.info
             else:
@@ -381,7 +381,7 @@ def validate_data(project, data, client=None):
         # assume it's something like 'warning'
         try:
             data['level'] = LOG_LEVEL_REVERSE_MAP[level]
-        except KeyError, e:
+        except KeyError as e:
             logger.info(
                 'Discarded invalid logger value: %s', level,
                 **client_metadata(client, project, exception=e))

src/sentry/db/models/fields/gzippeddict.py

@@ -31,7 +31,7 @@ def to_python(self, value):
         if isinstance(value, basestring) and value:
             try:
                 value = pickle.loads(decompress(value))
-            except Exception, e:
+            except Exception as e:
                 logger.exception(e)
                 return {}
         elif not value:

src/sentry/db/models/fields/node.py

@@ -97,7 +97,7 @@ def to_python(self, value):
         if isinstance(value, basestring) and value:
             try:
                 value = pickle.loads(decompress(value))
-            except Exception, e:
+            except Exception as e:
                 logger.exception(e)
                 value = {}
         elif not value:

src/sentry/manager.py

@@ -428,7 +428,7 @@ def save_data(self, project, data, raw=False):
             # TODO: should we mail admins when there are failures?
             try:
                 logger.exception(u'Unable to process log entry: %s', exc)
-            except Exception, exc:
+            except Exception as exc:
                 warnings.warn(u'Unable to process log entry: %s', exc)
             return
 
@@ -573,7 +573,7 @@ def _create_group(self, event, tags=None, **kwargs):
 
         try:
             self.add_tags(group, tags)
-        except Exception, e:
+        except Exception as e:
             logger.exception('Unable to record tags: %s' % (e,))
 
         return group, is_new, is_sample

src/sentry/models/activity.py

@@ -150,6 +150,6 @@ def send_notification(self):
 
         try:
             msg.send()
-        except Exception, e:
+        except Exception as e:
             logger = logging.getLogger('sentry.mail.errors')
             logger.exception(e)

src/sentry/models/pendingteammember.py

@@ -67,6 +67,6 @@ def send_invite_email(self):
 
         try:
             msg.send([self.email])
-        except Exception, e:
+        except Exception as e:
             logger = logging.getLogger('sentry.mail.errors')
             logger.exception(e)

src/sentry/plugins/base.py

@@ -76,7 +76,7 @@ def first(self, func_name, *args, **kwargs):
         for plugin in self.all():
             try:
                 result = getattr(plugin, func_name)(*args, **kwargs)
-            except Exception, e:
+            except Exception as e:
                 logger = logging.getLogger('sentry.plugins')
                 logger.error('Error processing %s() on %r: %s', func_name, plugin.__class__, e, extra={
                     'func_arg': args,

src/sentry/plugins/bases/issue.py

@@ -173,7 +173,7 @@ def view(self, request, group, **kwargs):
                     form_data=form.cleaned_data,
                     request=request,
                 )
-            except forms.ValidationError, e:
+            except forms.ValidationError as e:
                 form.errors['__all__'] = [u'Error creating issue: %s' % e]
 
         if form.is_valid():

src/sentry/replays.py

@@ -34,7 +34,7 @@ def replay(self):
             conn.request(self.method, full_url, data, self.headers or {})
 
             response = conn.getresponse()
-        except socket.error, e:
+        except socket.error as e:
             return {
                 'status': 'error',
                 'reason': str(e),

src/sentry/tasks/store.py

@@ -24,7 +24,7 @@ def preprocess_event(data, **kwargs):
         if settings.SENTRY_SCRAPE_JAVASCRIPT_CONTEXT and data['platform'] == 'javascript':
             try:
                 expand_javascript_source(data)
-            except Exception, e:
+            except Exception as e:
                 logger.exception(u'Error fetching javascript source: %s', e)
     finally:
         save_event.delay(data=data)

src/sentry/utils/cache.py

@@ -63,7 +63,7 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_value, traceback):
         try:
             self.cache.delete(self.lock_key)
-        except Exception, e:
+        except Exception as e:
             logger.exception(e)
 
 

src/sentry/utils/safe.py

@@ -17,7 +17,7 @@
 def safe_execute(func, *args, **kwargs):
     try:
         result = func(*args, **kwargs)
-    except Exception, e:
+    except Exception as e:
         transaction.rollback_unless_managed()
         if hasattr(func, 'im_class'):
             cls = func.im_class

src/sentry/web/api.py

@@ -197,7 +197,7 @@ def _dispatch(self, request, project_id=None, *args, **kwargs):
 
             try:
                 project_, user = project_from_auth_vars(auth_vars)
-            except APIError, error:
+            except APIError as error:
                 return HttpResponse(unicode(error.msg), status=error.http_status)
             else:
                 if user:
@@ -231,7 +231,7 @@ def _dispatch(self, request, project_id=None, *args, **kwargs):
             try:
                 response = super(APIView, self).dispatch(request, project=project, auth=auth, **kwargs)
 
-            except APIError, error:
+            except APIError as error:
                 response = HttpResponse(unicode(error.msg), content_type='text/plain', status=error.http_status)
 
         if origin:
@@ -316,7 +316,7 @@ def process(self, request, project, auth, data, **kwargs):
         try:
             # mutates data
             validate_data(project, data, auth.client)
-        except InvalidData, e:
+        except InvalidData as e:
             raise APIError(u'Invalid data: %s (%s)' % (unicode(e), type(e)))
 
         # mutates data

src/sentry/web/frontend/admin.py

@@ -161,7 +161,7 @@ def create_new_user(request):
                     body, settings.SERVER_EMAIL, [user.email],
                     fail_silently=False
                 )
-            except Exception, e:
+            except Exception as e:
                 logger = logging.getLogger('sentry.mail.errors')
                 logger.exception(e)
 
@@ -339,7 +339,7 @@ def status_mail(request):
                 body, settings.SERVER_EMAIL, [request.user.email],
                 fail_silently=False
             )
-        except Exception, e:
+        except Exception as e:
             form.errors['__all__'] = [unicode(e)]
 
     return render_to_response('sentry/admin/status/mail.html', {

src/sentry/web/frontend/groups.py

@@ -53,7 +53,7 @@ def _get_group_list(request, project):
     for cls in get_filters(Group, project):
         try:
             filters.append(cls(request, project))
-        except Exception, e:
+        except Exception as e:
             logger = logging.getLogger('sentry.filters')
             logger.exception('Error initializing filter %r: %s', cls, e)
 
@@ -71,7 +71,7 @@ def _get_group_list(request, project):
             if not filter_.is_set():
                 continue
             event_list = filter_.get_query_set(event_list)
-        except Exception, e:
+        except Exception as e:
             logger = logging.getLogger('sentry.filters')
             logger.exception('Error processing filter %r: %s', cls, e)
 

tests/sentry/web/views.py

@@ -28,6 +28,6 @@ def logging_request_exc(request):
     logger = logging.getLogger('sentry.test')
     try:
         raise Exception(request.GET.get('message', 'view exception'))
-    except Exception, e:
+    except Exception as e:
         logger.error(e, exc_info=True, extra={'request': request})
     return HttpResponse('')