Replace old-style except statements with modern as syntax #280

Signed-off-by: Thomas Druez <[email protected]>

Author: tdruez

src/attributecode/api.py

@@ -135,7 +135,7 @@ def request_license_data(url, api_key, license_key):
         if not license_data['results']:
             msg = (u"Invalid 'license': " + license_key)
             errors.append(Error(ERROR, msg))
-    except urllib2.HTTPError, http_e:
+    except urllib2.HTTPError as http_e:
         # some auth problem
         if http_e.code == 403:
             msg = (u"Authorization denied. Invalid '--api_key'. License generation is skipped.")

src/attributecode/attrib.py

@@ -100,7 +100,7 @@ def generate(abouts, template_string=None):
 
         rendered = template.render(abouts=abouts, common_licenses=COMMON_LICENSES, license_key_and_context=sorted_license_key_and_context,
                                    license_text_name_and_key=license_text_name_and_key, license_key_to_license_name=license_key_to_license_name)
-    except Exception, e:
+    except Exception as e:
         line = getattr(e, 'lineno', None)
         ln_msg = ' at line: %r' % line if line else ''
         err = getattr(e, 'message', '')
@@ -115,7 +115,7 @@ def check_template(template_string):
     """
     try:
         jinja2.Template(template_string)
-    except (jinja2.TemplateSyntaxError, jinja2.TemplateAssertionError,), e:
+    except (jinja2.TemplateSyntaxError, jinja2.TemplateAssertionError) as e:
         return e.lineno, e.message
 
 

src/attributecode/gen.py

@@ -263,7 +263,7 @@ def generate(location, base_dir, mapping, license_notice_text_location, fetch_li
             for e in file_field_not_exist_errors:
                 errors.append(Error(ERROR, e))
 
-        except Exception, e:
+        except Exception as e:
             # only keep the first 100 char of the exception
             emsg = repr(e)[:100]
             msg = (u'Failed to write ABOUT file at : '

src/attributecode/model.py

@@ -122,7 +122,7 @@ def validate(self, *args, **kwargs):
                 try:
                     validation_errors = self._validate(*args, **kwargs)
                     errors.extend(validation_errors)
-                except Exception, e:
+                except Exception as e:
                     emsg = repr(e)
                     msg = u'Error validating field %(name)s: %(value)r: %(emsg)r'
                     errors.append(Error(CRITICAL, msg % locals()))
@@ -496,7 +496,7 @@ def _validate(self, *args, **kwargs):
                 location = add_unc(location)
                 text = codecs.open(location, encoding='utf-8', errors='ignore').read()
                 self.value[path] = text
-            except Exception, e:
+            except Exception as e:
                 # only keep the first 100 char of the exception
                 emsg = repr(e)[:100]
                 msg = (u'Field %(name)s: Failed to load text at path: '
@@ -949,7 +949,7 @@ def load(self, location):
             running_inventory = True
             errs = self.load_dict(saneyaml.load(input_text), base_dir, running_inventory)
             errors.extend(errs)
-        except Exception, e:
+        except Exception as e:
             msg = 'Cannot load invalid ABOUT file: %(location)r: %(e)r\n' + str(e)
             errors.append(Error(CRITICAL, msg % locals()))
 
@@ -1430,7 +1430,7 @@ def valid_api_url(api_url):
         # This will always goes to exception as no key are provided.
         # The purpose of this code is to validate the provided api_url is correct
         response = urllib2.urlopen(request)
-    except urllib2.HTTPError, http_e:
+    except urllib2.HTTPError as http_e:
         # The 403 error code is refer to "Authentication credentials were not provided.".
         # This is correct as no key are provided.
         if http_e.code == 403: