Support Python 3.x for changelog scripts.

Author: millems

.gitignore

@@ -17,3 +17,4 @@ target/
 **/dependency-reduced-pom.xml
 
 *.pyc
+*.swp

scripts/changelog/util.py

@@ -2,7 +2,7 @@
 import os
 from datetime import date
 
-from model import ReleaseChanges, ChangelogEntry, Version
+from changelog.model import ReleaseChanges, ChangelogEntry, Version
 
 
 def version_cmp(a,b):

scripts/changelog/writer.py

@@ -1,6 +1,6 @@
-from git import stage_file
-from util import load_all_released_changes, load_unreleased_changes, version_cmp
-
+from changelog.git import stage_file
+from changelog.util import load_all_released_changes, load_unreleased_changes, version_cmp
+from functools import cmp_to_key
 
 class ChangelogWriter(object):
     """
@@ -48,10 +48,7 @@ def group_entries(self):
             self.categories.add(e.category)
 
     def get_sorted_categories(self):
-        def category_cmp(a,b):
-            return cmp(a,b)
-
-        return sorted(list(self.categories), cmp=category_cmp)
+        return sorted(list(self.categories))
 
     def is_service_category(self,s):
         return s.lower() not in NON_SERVICE_CATEGORIES
@@ -106,7 +103,7 @@ def write(self, s):
 def write_changelog():
     unreleased = load_unreleased_changes(".changes/next-release")
     released = load_all_released_changes(".changes")
-    released = sorted(released, key=lambda c: c.version, cmp=version_cmp)
+    released = sorted(released, key=lambda c: [c.version.major, c.version.minor, c.version.patch, c.version.prerelease_version_number()], reverse=True)
 
     if unreleased is not None:
         all_changes = [unreleased] + released
@@ -121,4 +118,4 @@ def write_changelog():
         for changes in all_changes:
             writer.write_changes(changes)
 
-    stage_file('CHANGELOG.md')
+    stage_file('CHANGELOG.md')

scripts/finalize-release-changes

@@ -10,7 +10,7 @@ import shutil
 from changelog.git import stage_file
 from changelog.util import load_unreleased_changes, marshall_release_changes, parse_version_string
 
-VERSION_REGEX = re.compile('^[0-9]+\.[0-9]+\.[0-9]$')
+VERSION_REGEX = re.compile('^[0-9]+\.[0-9]+\.[0-9]+$')
 DATE_REGEX = re.compile('^[0-9]{4}-[0-9]{2}-[0-9]{2}$')
 
 def validate_args(args):

scripts/new-change

@@ -139,7 +139,7 @@ def write_new_change(parsed_values):
     category = parsed_values['category']
     short_summary = ''.join(filter(lambda x: x in VALID_CHARS, category))
     contents = json.dumps(parsed_values, indent=4) + "\n"
-    contents_digest = hashlib.sha1(contents).hexdigest()
+    contents_digest = hashlib.sha1(contents.encode('utf-8')).hexdigest()
     filename = '{type_name}-{summary}-{digest}.json'.format(
         type_name=parsed_values['type'],
         summary=short_summary,