Changes to use f-strings instead of format and clean up (#1264)

Author: joachimmetz

l2tdevtools/download_helper.py

@@ -2,7 +2,6 @@
 
 from l2tdevtools.download_helpers import github
 from l2tdevtools.download_helpers import pypi
-from l2tdevtools.download_helpers import sourceforge
 
 
 class DownloadHelperFactory:
@@ -39,10 +38,6 @@ def NewDownloadHelper(cls, project_definition):
       return pypi.PyPIDownloadHelper(
           download_url, source_name=project_definition.pypi_source_name)
 
-    if (download_url.startswith('http://sourceforge.net/projects/') and
-        download_url.endswith('/files')):
-      return sourceforge.SourceForgeDownloadHelper(download_url)
-
     if (download_url.startswith('http://github.com/') and
         download_url.endswith('/releases')):
       release_is_archive = project_definition.github_release_is_archive

l2tdevtools/download_helpers/github.py

@@ -92,8 +92,9 @@ def GetLatestVersion(self, project_name, version_definition):
 
       latest_version = version_definition.GetLatestVersion()
 
-    download_url = 'https://github.com/{0:s}/{1:s}/releases'.format(
-        self._organization, self._repository)
+    download_url = (
+        f'https://github.com/{self._organization:s}/{self._repository:s}'
+        f'/releases')
 
     page_content = self.DownloadPageContent(download_url)
     if not page_content:
@@ -102,8 +103,8 @@ def GetLatestVersion(self, project_name, version_definition):
     # The format of the project download URL is:
     # <a href="/{organization}/{repository}/releases/tag/{git tag}"
     expression_string = (
-        '<a href="/{0:s}/{1:s}/releases/tag/([^"]*)"[^>]*>[^<]*</a>').format(
-            self._organization, self._repository)
+        f'<a href="/{self._organization:s}/{self._repository:s}/releases/tag'
+        f'/([^"]*)"[^>]*>[^<]*</a>')
     matches = re.findall(expression_string, page_content, flags=re.IGNORECASE)
 
     if not matches:
@@ -124,8 +125,9 @@ def GetDownloadURL(self, project_name, project_version):
       str: download URL of the project or None if not available.
     """
     # TODO: add support for URL arguments '?after=release-2.2.0'
-    download_url = 'https://github.com/{0:s}/{1:s}/releases'.format(
-        self._organization, self._repository)
+    download_url = (
+        f'https://github.com/{self._organization:s}/{self._repository:s}'
+        f'/releases')
 
     page_content = self.DownloadPageContent(download_url)
     if not page_content:
@@ -134,10 +136,9 @@ def GetDownloadURL(self, project_name, project_version):
     # The format of the project download URL is:
     # <a href="/{organization}/{repository}/releases/tag/{git tag}"
     expression_string = (
-        '<a href="/{0:s}/{1:s}/releases/tag/{2:s}(.*{3!s}[^"]*)"[^>]*>([^<]*)'
-        '</a>').format(
-            self._organization, self._repository, self._release_tag_prefix,
-            project_version)
+        f'<a href="/{self._organization:s}/{self._repository:s}/releases/tag'
+        f'/{self._release_tag_prefix:s}(.*{project_version!s}[^"]*)"[^>]*>'
+        f'([^<]*)</a>')
 
     matches = re.findall(expression_string, page_content, flags=re.IGNORECASE)
 
@@ -147,20 +148,18 @@ def GetDownloadURL(self, project_name, project_version):
 
       if self._release_is_archive:
         download_url = (
-            'https://github.com/{0:s}/{1:s}/archive/refs/tags/'
-            '{2!s}.tar.gz').format(
-                self._organization, self._repository, version)
+            f'https://github.com/{self._organization:s}/{self._repository:s}'
+            f'/archive/refs/tags/{version!s}.tar.gz')
       else:
         if self._release_prefix:
-          release = '{0:s}{1:s}.tar.gz'.format(self._release_prefix, version)
+          release = f'{self._release_prefix:s}{version:s}'
         else:
-          release = '{0:s}.tar.gz'.format(matches[0][1].replace(' ', '-'))
+          release = matches[0][1].replace(" ", "-")
 
         download_url = (
-            'https://github.com/{0:s}/{1:s}/releases/download/{2:s}{3!s}/'
-            '{4:s}').format(
-                self._organization, self._repository, self._release_tag_prefix,
-                version, release)
+            f'https://github.com/{self._organization:s}/{self._repository:s}'
+            f'/releases/download/{self._release_tag_prefix:s}{version!s}'
+            f'/{release:s}.tar.gz')
 
     return download_url
 
@@ -170,5 +169,4 @@ def GetProjectIdentifier(self):
     Returns:
       str: project identifier.
     """
-    return 'com.github.{0:s}.{1:s}'.format(
-        self._organization, self._repository)
+    return f'com.github.{self._organization:s}.{self._repository:s}'

l2tdevtools/download_helpers/interface.py

@@ -37,14 +37,14 @@ def DownloadFile(self, download_url):
     _, _, filename = download_url.rpartition('/')
 
     if not os.path.exists(filename):
-      logging.info('Downloading: {0:s}'.format(download_url))
+      logging.info(f'Downloading: {download_url:s}')
 
       try:
         with urllib_request.urlopen(download_url) as url_object:
           if url_object.code != 200:
             logging.warning(
-                'Unable to download URL: {0:s} with status code: {1:d}'.format(
-                    download_url, url_object.code))
+                f'Unable to download URL: {download_url:s} with status code: '
+                f'{url_object.code:d}')
             return None
 
           page_content = url_object.read()
@@ -53,8 +53,8 @@ def DownloadFile(self, download_url):
 
       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))
+            f'Unable to download URL: {download_url:s} with error: '
+            f'{exception!s}')
         return None
 
     return filename
@@ -83,8 +83,8 @@ def DownloadPageContent(self, download_url, encoding='utf-8'):
 
       except urllib_error.URLError as exception:
         logging.warning(
-            'Unable to download URL: {0:s} with error: {1!s}'.format(
-                download_url, exception))
+            f'Unable to download URL: {download_url:s} with error: '
+            f'{exception!s}')
         return None
 
       if encoding and isinstance(page_content, bytes):

l2tdevtools/download_helpers/pypi.py

@@ -25,8 +25,7 @@ def __init__(self, download_url, source_name=None):
     url_segments = download_url.split('/')
     if (len(url_segments) < 5 or url_segments[2] != 'pypi.org' or
         url_segments[3] != 'project'):
-      raise ValueError('Unsupported download URL: {0:s}.'.format(
-          download_url))
+      raise ValueError(f'Unsupported download URL: {download_url:s}.')
 
     super().__init__(download_url)
     self._project_name = url_segments[4]
@@ -98,7 +97,7 @@ def GetLatestVersion(self, project_name, version_definition):
 
       latest_version = version_definition.GetLatestVersion()
 
-    download_url = 'https://pypi.org/pypi/{0:s}/json'.format(self._project_name)
+    download_url = f'https://pypi.org/pypi/{self._project_name:s}/json'
 
     page_content = self.DownloadPageContent(download_url)
     if not page_content:
@@ -128,7 +127,7 @@ def GetDownloadURL(self, project_name, project_version):
     Returns:
       str: download URL of the project or None if not available.
     """
-    download_url = 'https://pypi.org/pypi/{0:s}/json'.format(self._project_name)
+    download_url = f'https://pypi.org/pypi/{self._project_name:s}/json'
 
     page_content = self.DownloadPageContent(download_url)
     if not page_content:
@@ -138,9 +137,9 @@ def GetDownloadURL(self, project_name, project_version):
     # 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-9a-f]*/[0-9a-f]*/'
-        '[0-9a-f]*/{0:s}-{1!s}[.](tar[.]bz2|tar[.]gz|zip))').format(
-            self._source_name, project_version)
+        f'(https://files.pythonhosted.org/packages/[0-9a-f]*/[0-9a-f]*/'
+        f'[0-9a-f]*/{self._source_name:s}-{project_version!s}[.]'
+        f'(tar[.]bz2|tar[.]gz|zip))')
     matches = re.findall(expression_string, page_content, flags=re.IGNORECASE)
 
     if not matches:
@@ -154,4 +153,4 @@ def GetProjectIdentifier(self):
     Returns:
       str: project identifier.
     """
-    return 'org.pypi.{0:s}'.format(self._project_name)
+    return f'org.pypi.{self._project_name:s}'

l2tdevtools/download_helpers/sourceforge.py

@@ -45,8 +45,7 @@ def GetLatestVersion(self, project_name, version_definition):
     # The format of the project download URL is:
     # http://zlib.net/{project name}-{version}.tar.gz
     expression_string = (
-        '<A HREF="{0:s}-([0-9]+.[0-9]+.[0-9]+).tar.gz"').format(
-            self._project_name)
+        f'<A HREF="{self._project_name:s}-([0-9]+.[0-9]+.[0-9]+).tar.gz"')
     matches = re.findall(expression_string, page_content, flags=re.IGNORECASE)
 
     if not matches:
@@ -67,13 +66,12 @@ def GetDownloadURL(self, project_name, project_version):
     """
     # The format of the project download URL is:
     # http://zlib.net/{project name}-{version}.tar.gz
-    return 'http://zlib.net/{0:s}-{1:s}.tar.gz'.format(
-        self._project_name, project_version)
+    return f'http://zlib.net/{self._project_name:s}-{project_version:s}.tar.gz'
 
   def GetProjectIdentifier(self):
     """Retrieves the project identifier for a given project name.
 
     Returns:
       str: project identifier.
     """
-    return 'net.zlib.{0:s}'.format(self._project_name)
+    return f'net.zlib.{self._project_name:s}'