From 887faf5ce2ed1a666ea548cb3b3546b13a66bbb2 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 25 Oct 2012 17:53:28 -0400 Subject: [PATCH] project: add Project._split_paragraph(). The python3 branch splits on double-newlines, but we need to stick to single newlines here because Python 2.x's ConfigParser drops blank lines. --- update_copyright/project.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/update_copyright/project.py b/update_copyright/project.py index fc988d5..4a5ac04 100644 --- a/update_copyright/project.py +++ b/update_copyright/project.py @@ -99,17 +99,23 @@ class Project (object): else: raise NotImplementedError('vcs: {}'.format(vcs)) - def _load_copyright_conf(self, parser): + def _load_copyright_conf(self, parser, encoding=None): + if encoding is None: + encoding = self._encoding or _utils.ENCODING try: - self._copyright = parser.get('copyright', 'long').splitlines() + self._copyright = self._split_paragraphs( + unicode(parser.get('copyright', 'long'), encoding)) except _configparser.NoOptionError: pass try: - self._short_copyright = parser.get( - 'copyright', 'short').splitlines() + self._short_copyright = self._split_paragraphs( + unicode(parser.get('copyright', 'short'), encoding)) except _configparser.NoOptionError: pass + def _split_paragraphs(self, text): + return [p.strip() for p in text.split(u'\n')] + def _load_files_conf(self, parser): try: self.with_authors = parser.getboolean('files', 'authors') -- 2.26.2