project: for consistency, also separate alias authors with pipes.

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

diff --git a/update_copyright/project.py b/update_copyright/project.py
index ac0e4845f585bf2653a313da0022fbc33524f059..dd9b2a898af0103bf38de30ad3b2ae3a05cc587a 100644 (file)
--- a/update_copyright/project.py
+++ b/update_copyright/project.py
@@ -59,6 +59,7 @@ class Project (object):
 
     def load_config(self, stream):
         parser = _configparser.RawConfigParser()
 
     def load_config(self, stream):
         parser = _configparser.RawConfigParser()

+        parser.optionxform = str

         parser.readfp(stream)
         for section in parser.sections():
             clean_section = section.replace('-', '_')
         parser.readfp(stream)
         for section in parser.sections():
             clean_section = section.replace('-', '_')


@@ -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(
         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
         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)
         aliases = {}
         for author in parser.options('aliases'):
             _aliases = parser.get('aliases', author)

+            author = unicode(author, encoding)

             aliases[author] = set(
             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