Fix #3170 — make nikola version --check work again

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Sep 30, 2018 · 1a44901 · 1a44901
1 parent f58ba9a
commit 1a44901
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -10,6 +10,7 @@ Features
 Bugfixes
 --------
 
+* Make ``nikola version --check`` work again (Issue #3170)
 * Set logging level for reST to warning in order to limit noise
 * Fix docinfo removal for sites that use reST docinfo metadata
   (Issue #3167)

diff --git a/nikola/plugins/command/version.py b/nikola/plugins/command/version.py
@@ -33,7 +33,7 @@
 from nikola.plugin_categories import Command
 from nikola import __version__
 
-URL = 'https://pypi.python.org/pypi?:action=doap&name=Nikola'
+URL = 'https://pypi.org/pypi/Nikola/json'
 
 
 class CommandVersion(Command):
@@ -59,10 +59,11 @@ def _execute(self, options={}, args=None):
         """Print the version number."""
         print("Nikola v" + __version__)
         if options.get('check'):
-            data = requests.get(URL).text
-            doc = lxml.etree.fromstring(data.encode('utf8'))
-            revision = doc.findall('*//{http://usefulinc.com/ns/doap#}revision')[0].text
-            if revision == __version__:
+            data = requests.get(URL).json()
+            pypi_version = data['info']['version']
+            if pypi_version == __version__:
                 print("Nikola is up-to-date")
             else:
-                print("The latest version of Nikola is v{0} -- please upgrade using `pip install --upgrade Nikola=={0}` or your system package manager".format(revision))
+                print("The latest version of Nikola is v{0}. Please upgrade "
+                      "using `pip install --upgrade Nikola=={0}` or your "
+                      "system package manager.".format(pypi_version))