projects
/
update-copyright.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 9b0686688feed1b3ad10fe4f2085da20167feb18..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
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
_BazaarBackend = None
try:
from .vcs.mercurial import MercurialBackend as _MercurialBackend
-except ImportError
,
_mercurial_import_error:
+except ImportError
as
_mercurial_import_error:
_MercurialBackend = None
_MercurialBackend = None
@@
-65,7
+65,7
@@
class Project (object):
clean_section = section.replace('-', '_')
try:
loader = getattr(self, '_load_{}_conf'.format(clean_section))
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)
_LOG.error('invalid {} section'.format(section))
raise
loader(parser=parser)
@@
-124,7
+124,7
@@
class Project (object):
except _configparser.NoOptionError:
pass
else:
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:
try:
pyfile = parser.get('files', 'pyfile')
except _configparser.NoOptionError:
@@
-161,7
+161,7
@@
class Project (object):
_aliases = parser.get('aliases', author)
author = unicode(author, encoding)
aliases[author] = set(
_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
self._aliases = aliases
if self._vcs is not None:
self._vcs._aliases = self._aliases