🚧 Python3 specific changes

ampproject · matthiasrohmer · Feb 9, 2021 · Feb 2, 2021 · Feb 2, 2021 · Feb 2, 2021
commit 9b80e67f695cf3b5e4d4564eaaecb53d054f086c
diff --git a/pages/extensions/amp_dependencies/amp_dependencies.py b/pages/extensions/amp_dependencies/amp_dependencies.py
@@ -55,7 +55,7 @@ def inject(self, content):
     self.injected = True
 
     dependencies = ''
-    for name, details in self._dependencies.iteritems():
+    for name, details in self._dependencies.items():
       version = details[0]
 
       if version is None:

diff --git a/pages/extensions/amp_dependencies/auto_dependency_injector.py b/pages/extensions/amp_dependencies/auto_dependency_injector.py
@@ -16,7 +16,7 @@ class AutoDependencyInjector(object):
   def add_auto_imports(doc, content, amp_dependencies):
     """
     :type doc: document.Document
-    :type content: basestring
+    :type content: str
     :type amp_dependencies: AmpDependencies
     """
 
@@ -34,7 +34,7 @@ def add_auto_imports(doc, content, amp_dependencies):
   def should_do_auto_import(doc, content):
     """
     :type doc: document.Document
-    :type content: basestring
+    :type content: str
     :rtype: bool
     """
     # Do not run for empty documents
@@ -52,11 +52,11 @@ def should_do_auto_import(doc, content):
       return False
 
     # Quick check if the page is really a AMP page
-    if not any(marker in content for marker in ['<html amp', '<html ⚡']):
+    if not any(marker in content for marker in ['<html amp'.encode('utf-8'), '<html ⚡'.encode('utf-8')]):
       return False
 
     # And has a head element
-    if '</head>' not in content:
+    if '</head>'.encode('utf-8') not in content:
       return False
 
     return True

diff --git a/pages/extensions/amp_dev/markdown_extras/block_video.py b/pages/extensions/amp_dev/markdown_extras/block_video.py
@@ -28,8 +28,8 @@ def _transform(content):
                 r'v=(\w*)', attributes['src']).group(1) + '\' %}\n'
 
         # Add in other variables
-        for name, value in attributes.iteritems():
-            if isinstance(value, basestring):
+        for name, value in attributes.items():
+            if isinstance(value, str):
                 replacement += '{% set ' + name + ' = \'' + value + '\' %}\n'
             else:
                 value = str(value)

diff --git a/pages/extensions/amp_example_preview/standalone_example_validator.py b/pages/extensions/amp_example_preview/standalone_example_validator.py
@@ -143,7 +143,7 @@ def createTempDoc(self, formats):
   def get_validation_errors(self, validator_output):
     errors = []
     validations = json.loads(validator_output)
-    for path, result in validations.iteritems():
+    for path, result in validations.items():
       if result['status'] == 'FAIL':
         error_message = self.get_error_text_pattern(path)
         for error in result['errors']:

diff --git a/pages/extensions/amp_example_preview/util/amp_component_versions.py b/pages/extensions/amp_example_preview/util/amp_component_versions.py
@@ -47,7 +47,7 @@ def get_components(identifiers):
   result = []
 
   if identifiers:
-    if isinstance(identifiers, basestring):
+    if isinstance(identifiers, str):
       collection = identifiers.split(',')
     else:
       collection = identifiers

diff --git a/pages/extensions/amp_example_preview/util/example_exporter.py b/pages/extensions/amp_example_preview/util/example_exporter.py
@@ -1,5 +1,5 @@
 import os
-import urlparse
+import urllib.parse
 import errno
 from grow.documents import document
 from .constants import FORMAT_TYPE_IDS, DEFAULT_FORMAT
@@ -32,8 +32,8 @@ def __init__(self, doc, example_document, type_id):
     self.base_url = doc.pod.get_podspec().yaml.get('base_urls').get('preview')
 
     self.file_path = self.get_file_path(doc, example_document.index, type_id)
-    self.canonical = urlparse.urljoin(self.base_url, self.file_path)
-    self.url_without_format = urlparse.urljoin(self.base_url,
+    self.canonical = urllib.parse.urljoin(self.base_url, self.file_path)
+    self.url_without_format = urllib.parse.urljoin(self.base_url,
                                                self.get_file_path(doc, example_document.index, DEFAULT_FORMAT))
 
     self.language = doc.locale

diff --git a/pages/extensions/jinja2_optimized_codehilite/custom_html_formatter.py b/pages/extensions/jinja2_optimized_codehilite/custom_html_formatter.py
@@ -1,12 +1,12 @@
-import StringIO
+import io
 from pygments.formatters import html
 from .jinja2_expression_unescape import unescape_in_expressions
 
 
 class CustomHtmlFormatter(html.HtmlFormatter):
 
   def format_unencoded(self, tokensource, outfile):
-    buffer = StringIO.StringIO()
+    buffer = io.StringIO()
     super(CustomHtmlFormatter, self).format_unencoded(tokensource, buffer)
     content = buffer.getvalue()
     content = unescape_in_expressions(content)
@@ -15,4 +15,4 @@ def format_unencoded(self, tokensource, outfile):
 
   @staticmethod
   def connect_hook():
-    html.HtmlFormatter = CustomHtmlFormatter
+    html.HtmlFormatter = CustomHtmlFormatter
diff --git a/pages/extensions/markdown_in_html/__init__.py b/pages/extensions/markdown_in_html/__init__.py
@@ -52,7 +52,7 @@ class MarkdownInHtmlExtension(extensions.BaseExtension):
   def __init__(self, pod, config):
     super(MarkdownInHtmlExtension, self).__init__(pod, config)
 
-    if config.has_key(CLEAR_EXTRA_EXTENSIONS_FLAG) and config.get(CLEAR_EXTRA_EXTENSIONS_FLAG):
+    if config.__contains__(CLEAR_EXTRA_EXTENSIONS_FLAG) and config.get(CLEAR_EXTRA_EXTENSIONS_FLAG):
       # Clear the markdown extra extensions to prevent auto loading unwanted extensions
       extra.extensions = []