ampproject · matthiasrohmer · Feb 9, 2021 · Feb 2, 2021 · Feb 2, 2021 · Feb 2, 2021
diff --git a/pages/extensions/amp_dependencies/__init__.py b/pages/extensions/amp_dependencies/__init__.py
@@ -2,8 +2,8 @@
 from grow import extensions
 from grow.documents import document, static_document
 from grow.extensions import hooks
-from amp_dependencies import AmpDependencies
-from auto_dependency_injector import AutoDependencyInjector
+from .amp_dependencies import AmpDependencies
+from .auto_dependency_injector import AutoDependencyInjector
 
 # Used to determine where to print the script tags
 PLACEHOLDER = '__AMP__DEPENDENCIES__'

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/__init__.py b/pages/extensions/amp_dev/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from extension import *
+from .extension import *
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/__init__.py b/pages/extensions/amp_example_preview/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from amp_example_preview import *
+from .amp_example_preview import *
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_document.py b/pages/extensions/amp_example_preview/util/example_document.py
@@ -1,7 +1,7 @@
 import re
 
-from amp_component_versions import get_component, get_components
-from constants import PREVIEW_MODES, PREVIEW_MODES_IN_IFRAME, PREVIEW_NONE, PREVIEW_INLINE
+from .amp_component_versions import get_component, get_components
+from .constants import PREVIEW_MODES, PREVIEW_MODES_IN_IFRAME, PREVIEW_NONE, PREVIEW_INLINE
 
 
 class ExampleDocument(object):

diff --git a/pages/extensions/amp_example_preview/util/example_exporter.py b/pages/extensions/amp_example_preview/util/example_exporter.py
@@ -1,10 +1,10 @@
 import os
-import urlparse
+import urllib.parse
 import errno
 from grow.documents import document
-from constants import FORMAT_TYPE_IDS, DEFAULT_FORMAT
-from example_document import ExampleDocument
-from templates import load_template
+from .constants import FORMAT_TYPE_IDS, DEFAULT_FORMAT
+from .example_document import ExampleDocument
+from .templates import load_template
 
 
 TEMPLATE_PATH = 'layouts/example-pages/'
@@ -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/amp_example_preview/util/example_extractor.py b/pages/extensions/amp_example_preview/util/example_extractor.py
@@ -1,5 +1,5 @@
 import re
-from example_document import ExampleDocument
+from .example_document import ExampleDocument
 
 EXAMPLE_PATTERN = re.compile(
   r'\[\s*example(\s[^\]]*)?\](.*?(?:\n```html *\n(.*?)\n```' +

diff --git a/pages/extensions/amp_example_preview/util/markdown_processor.py b/pages/extensions/amp_example_preview/util/markdown_processor.py
@@ -1,8 +1,8 @@
-from example_extractor import SourceCodeExtractor
-from example_exporter import ExampleExporter
-from preview import ExamplePreview
-from amp_component_versions import get_component
-from constants import ATTRIBUTE_EXAMPLE_TEMPLATES, ATTRIBUTE_EXAMPLE_IMPORTS, ATTRIBUTE_HAS_INLINE_PREVIEW
+from .example_extractor import SourceCodeExtractor
+from .example_exporter import ExampleExporter
+from .preview import ExamplePreview
+from .amp_component_versions import get_component
+from .constants import ATTRIBUTE_EXAMPLE_TEMPLATES, ATTRIBUTE_EXAMPLE_IMPORTS, ATTRIBUTE_HAS_INLINE_PREVIEW
 
 EXAMPLE_TRIGGER = '[example'
 

diff --git a/pages/extensions/amp_example_preview/util/preview_generator.py b/pages/extensions/amp_example_preview/util/preview_generator.py
@@ -1,8 +1,8 @@
 import re
-from preview import ExamplePreviewMatch
-from constants import ATTRIBUTE_EXAMPLE_TEMPLATES, ATTRIBUTE_EXAMPLE_IMPORTS
-from templates import load_template
-from amp_component_versions import remove_component_from_set
+from .preview import ExamplePreviewMatch
+from .constants import ATTRIBUTE_EXAMPLE_TEMPLATES, ATTRIBUTE_EXAMPLE_IMPORTS
+from .templates import load_template
+from .amp_component_versions import remove_component_from_set
 
 # find existing imports
 IMPORT_PATTERN = re.compile(r'<script(?:\s[^>]*)?\scustom-(element|template)\s*=\s*"?([^"\s>/]+)',

diff --git a/pages/extensions/extract_highlights_info/__init__.py b/pages/extensions/extract_highlights_info/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from grow import extensions
-from page_info_collector import PageInfoCollector
+from .page_info_collector import PageInfoCollector
 
 CONFIG_INPUT_FILE = 'input_file'
 CONFIG_OUTPUT_FOLDER = 'output_folder'

diff --git a/pages/extensions/inline_text_assets/__init__.py b/pages/extensions/inline_text_assets/__init__.py
@@ -1 +1 @@
-from inline_text_assets import *
+from .inline_text_assets import *
diff --git a/pages/extensions/internal_links/__init__.py b/pages/extensions/internal_links/__init__.py
@@ -1,8 +1,8 @@
 from grow import extensions
 from grow.documents import static_document
 from grow.extensions import hooks
-from pod_internal_link_rewriter import PodInternalLinkRewriter
-from component_version_resolver import ComponentVersionResolver
+from .pod_internal_link_rewriter import PodInternalLinkRewriter
+from .component_version_resolver import ComponentVersionResolver
 
 class PodInternalLinkPostRenderHook(hooks.PostRenderHook):
   """Handle the post-render hook."""

diff --git a/pages/extensions/internal_links/pod_internal_link_rewriter.py b/pages/extensions/internal_links/pod_internal_link_rewriter.py
@@ -1,7 +1,7 @@
 import os
 import re
 import traceback
-from component_version_resolver import ComponentVersionResolver
+from .component_version_resolver import ComponentVersionResolver
 from grow.pods.pods import Pod
 from grow.documents.document import Document
 from grow.cache.object_cache import ObjectCache

diff --git a/pages/extensions/jinja2_optimized_codehilite/__init__.py b/pages/extensions/jinja2_optimized_codehilite/__init__.py
@@ -1 +1 @@
-from jinja2_optimized_codehilite import *
+from .jinja2_optimized_codehilite import *
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
+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/jinja2_optimized_codehilite/custom_html_lexer.py b/pages/extensions/jinja2_optimized_codehilite/custom_html_lexer.py
@@ -11,7 +11,7 @@
     Punctuation
 from pygments.util import looks_like_xml, html_doctype_matches
 
-from custom_js_lexer import CustomJavascriptLexer
+from .custom_js_lexer import CustomJavascriptLexer
 from pygments.lexers.css import CssLexer
 
 

diff --git a/pages/extensions/jinja2_optimized_codehilite/jinja2_optimized_codehilite.py b/pages/extensions/jinja2_optimized_codehilite/jinja2_optimized_codehilite.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from grow import extensions
-from custom_html_lexer import CustomHtmlLexer
-from custom_js_lexer import CustomJavascriptLexer
-from custom_html_formatter import CustomHtmlFormatter
+from .custom_html_lexer import CustomHtmlLexer
+from .custom_js_lexer import CustomJavascriptLexer
+from .custom_html_formatter import CustomHtmlFormatter
 
 
 class Jinja2OptimizedCodehiliteExtension(extensions.BaseExtension):

diff --git a/pages/extensions/log_beautifier/__init__.py b/pages/extensions/log_beautifier/__init__.py
@@ -1 +1 @@
-from log_beautifier import *
+from .log_beautifier import *
diff --git a/pages/extensions/log_beautifier/log_beautifier.py b/pages/extensions/log_beautifier/log_beautifier.py
@@ -1,7 +1,7 @@
 import logging
 
 from grow import extensions
-from grow.common import logger
+from grow.common import logger, colors
 from grow.server import manager
 
 logger._get_logger = logger.get_logger
@@ -29,9 +29,22 @@ def get_logger(name='pod'):
 def print_server_ready_message(pod, host, port):
     home_doc = pod.get_home_doc()
     root_path = home_doc.url.path if home_doc and home_doc.exists else '/'
-    url = 'http://{}:{}{}'.format(host, port, root_path)
+    url_base = 'http://{}:{}/'.format(host, port)
+    url_root = 'http://{}:{}{}'.format(host, port, root_path)
     logger.LOGGER.info('Grow started successfully.')
-    return url
+
+    messages = manager.ServerMessages()
+    messages.add_message('Pod:', pod.root, colors.HIGHLIGHT)
+    messages.add_message('Server:', url_root, colors.HIGHLIGHT)
+
+    # Trigger the dev manager message hook.
+    extra_urls = pod.extensions_controller.trigger(
+        'dev_manager_message', messages.add_message, url_base, url_root) or []
+
+    messages.add_message(
+        'Ready.', 'Press ctrl-c to quit.', colors.SUCCESS, colors.SUCCESS)
+
+    return (url_root, extra_urls)
 
 manager.print_server_ready_message = print_server_ready_message
 

diff --git a/pages/extensions/markdown_in_html/__init__.py b/pages/extensions/markdown_in_html/__init__.py
@@ -3,7 +3,7 @@
 from grow.documents import document_format
 from grow.extensions import hooks
 from markdown.extensions import extra
-from html_block_processor import HtmlBlockProcessor
+from .html_block_processor import HtmlBlockProcessor
 
 CLEAR_EXTRA_EXTENSIONS_FLAG = 'prevent_markdown_extra_auto_loading_other'
 
@@ -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 = []
 

diff --git a/pages/extensions/markdown_toc_patch/__init__.py b/pages/extensions/markdown_toc_patch/__init__.py
@@ -1 +1 @@
-from markdown_toc_patch import *
+from .markdown_toc_patch import *
diff --git a/pages/extensions/markdown_toc_patch/markdown_toc_patch.py b/pages/extensions/markdown_toc_patch/markdown_toc_patch.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from grow import extensions
-from custom_toc_tree_processor import CustomTocTreeProcessor
+from .custom_toc_tree_processor import CustomTocTreeProcessor
 
 
 class MarkdownTocPatchExtension(extensions.BaseExtension):

diff --git a/pages/extensions/url_beautifier/__init__.py b/pages/extensions/url_beautifier/__init__.py
@@ -1 +1 @@
-from url_beautifier import *
+from .url_beautifier import *
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from inline_text_assets import *
		from .inline_text_assets import *
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from jinja2_optimized_codehilite import *
		from .jinja2_optimized_codehilite import *
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from log_beautifier import *
		from .log_beautifier import *
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from markdown_toc_patch import *
		from .markdown_toc_patch import *
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from url_beautifier import *
		from .url_beautifier import *