Imported Upstream version 6.4.0upstream/6.4.0

3 files changed, 31 insertions, 4 deletions

diff --git a/scripts/getpyver.py b/scripts/getpyver.py
new file mode 100755
index 0000000..b5f83b0
--- /dev/null
+++ b/scripts/getpyver.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# For internal use only.
+"""Return the Python version in a sane format (vX.Y).
+
+Also available a less sane format (X.Y) if `short` is provided
+as an argument.
+
+Or ([v]X.Y.Z) if `long` is provided.
+
+$ getpyver.py
+v2.7
+$ getpyver.py short
+2.7
+$ getpyver.py long
+v2.7.6
+$ getpyver.py long short
+2.7.6
+
+"""
+import sys
+limit = 3 if 'long' in sys.argv else 2
+if 'short' in sys.argv:
+    print(".".join([str(i) for i in sys.version_info[0:limit]]))
+else:
+    print("v" + (".".join([str(i) for i in sys.version_info[0:limit]])))
diff --git a/scripts/import_po.py b/scripts/import_po.py
index 224826c..7e99064 100755
--- a/scripts/import_po.py
+++ b/scripts/import_po.py
@@ -6,10 +6,12 @@ from __future__ import unicode_literals, print_function
 import codecs
 from glob import glob
 import os
-
+import sys
 import polib
 
-os.system("tx pull -a")
+if 'nopull' not in sys.argv:
+    os.system("tx pull -a")
+
 trans_files = glob(os.path.join('translations', 'nikola.messages', '*.po'))
 for fname in trans_files:
     lang = os.path.splitext(os.path.basename(fname))[0].lower()
diff --git a/scripts/set_version.py b/scripts/set_version.py
index 289aaef..38ea03c 100755
--- a/scripts/set_version.py
+++ b/scripts/set_version.py
@@ -23,7 +23,7 @@ def sed_like_thing(pattern, repl, path):
         outf.write(data)
 
 if __name__ == "__main__":
-    print("New version number: ", end="")
+    print("New version number (in format X.Y.Z): ", end="")
     sys.stdout.flush()
     version = sys.stdin.readline().strip()
 
@@ -34,5 +34,5 @@ if __name__ == "__main__":
     sed_like_thing("version = '.+'", "version = '{0}'".format(version), os.path.join('docs', 'sphinx', 'conf.py'))
     sed_like_thing("release = '.+'", "release = '{0}'".format(version), os.path.join('docs', 'sphinx', 'conf.py'))
     sed_like_thing('__version__ = ".*"', '__version__ = "{0}"'.format(version), os.path.join('nikola', '__init__.py'))
-    sed_like_thing('New in Master', 'New in {0}'.format(version), 'CHANGES.txt')
+    sed_like_thing('New in master', 'New in v{0}'.format(version), 'CHANGES.txt')
     os.system("help2man -h help -N --version-string='{0}' nikola > {1}".format(version, os.path.join('docs', 'man', 'nikola.1')))