Changes for building rpms (#1240)

data/rpm_templates/XlsxWriter.spec

@@ -1,6 +1,6 @@
-%define name XlsxWriter
+%define name xlsxwriter
 %define version {version}
-%define unmangled_name XlsxWriter
+%define unmangled_name xlsxwriter
 %define unmangled_version {version}
 %define release 1
 

l2tdevtools/download_helpers/interface.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 """Download helper object implementations."""
 
+import http.client
 import logging
 import os
 
@@ -51,7 +52,7 @@ def DownloadFile(self, download_url):
           with open(filename, 'wb') as file_object:
             file_object.write(page_content)
 
-      except urllib_error.URLError as exception:
+      except (http.client.InvalidURL, urllib_error.URLError) as exception:
         logging.warning(
             'Unable to download URL: {0:s} with error: {1!s}'.format(
                 download_url, exception))

l2tdevtools/download_helpers/pypi.py

@@ -113,7 +113,6 @@ def GetLatestVersion(self, project_name, version_definition):
         r'{0:s}-([\d\.\!]*(post\d+)?)\.(tar\.bz2|tar\.gz|zip)"').format(
             self._source_name)
 
-    print("X:", expression_string)
     matches = re.findall(expression_string, page_content, flags=re.IGNORECASE)
     if not matches:
       return None
@@ -140,11 +139,11 @@ def GetDownloadURL(self, project_name, project_version):
       return None
 
     # The format of the project download URL is:
-    # https://files.pythonhosted.org/packages/.*/.*/.*/
+    # https://files.pythonhosted.org/packages/[0-9a-f]*/[0-9a-f]*/[0-9a-f]*/
     #     {project name}-{version}.{extension}
     expression_string = (
-        '(https://files.pythonhosted.org/packages/.*/.*/.*/'
-        '{0:s}-{1!s}[.](tar[.]bz2|tar[.]gz|zip))').format(
+        '(https://files.pythonhosted.org/packages/[0-9a-f]*/[0-9a-f]*/'
+        '[0-9a-f]*/{0:s}-{1!s}[.](tar[.]bz2|tar[.]gz|zip))').format(
             self._source_name, project_version)
     matches = re.findall(expression_string, page_content, flags=re.IGNORECASE)