Update exception handling to use `except X as Y` syntax.

[update-copyright.git] / update_copyright / project.py

diff --git a/update_copyright/project.py b/update_copyright/project.py
index ac0e4845f585bf2653a313da0022fbc33524f059..2a2c33aad078e1e5ef55eedb75e2b0358b6d8794 100644 (file)
--- a/update_copyright/project.py
+++ b/update_copyright/project.py
@@ -28,11 +28,11 @@ from . import utils as _utils
 from .vcs.git import GitBackend as _GitBackend
 try:
     from .vcs.bazaar import BazaarBackend as _BazaarBackend
-except ImportError, _bazaar_import_error:
+except ImportError as _bazaar_import_error:
     _BazaarBackend = None
 try:
     from .vcs.mercurial import MercurialBackend as _MercurialBackend
-except ImportError, _mercurial_import_error:
+except ImportError as _mercurial_import_error:
     _MercurialBackend = None
 
 
@@ -59,12 +59,13 @@ class Project (object):
 
     def load_config(self, stream):
         parser = _configparser.RawConfigParser()
+        parser.optionxform = str
         parser.readfp(stream)
         for section in parser.sections():
             clean_section = section.replace('-', '_')
             try:
                 loader = getattr(self, '_load_{}_conf'.format(clean_section))
-            except AttributeError, e:
+            except AttributeError as e:
                 _LOG.error('invalid {} section'.format(section))
                 raise
             loader(parser=parser)
@@ -123,7 +124,7 @@ class Project (object):
         except _configparser.NoOptionError:
             pass
         else:
-            self._ignored_paths = [pth.strip() for pth in ignored.split(',')]
+            self._ignored_paths = [pth.strip() for pth in ignored.split('|')]
         try:
             pyfile = parser.get('files', 'pyfile')
         except _configparser.NoOptionError:
@@ -138,7 +139,7 @@ class Project (object):
         for path in parser.options('author-hacks'):
             authors = parser.get('author-hacks', path)
             author_hacks[tuple(path.split('/'))] = set(
-                unicode(a.strip(), encoding) for a in authors.split(','))
+                unicode(a.strip(), encoding) for a in authors.split('|'))
         self._author_hacks = author_hacks
         if self._vcs is not None:
             self._vcs._author_hacks = self._author_hacks
@@ -158,8 +159,9 @@ class Project (object):
         aliases = {}
         for author in parser.options('aliases'):
             _aliases = parser.get('aliases', author)
+            author = unicode(author, encoding)
             aliases[author] = set(
-                unicode(a.strip(), encoding) for a in _aliases.split(','))
+                unicode(a.strip(), encoding) for a in _aliases.split('|'))
         self._aliases = aliases
         if self._vcs is not None:
             self._vcs._aliases = self._aliases