Merge branch 'master' into stable/0.7.x

Author: hodgestar

.travis.yml

@@ -9,6 +9,7 @@ matrix:
     - { python: "3.5" }
     - { python: "3.6" }
     - { python: "3.7", dist: xenial, sudo: true }  # Python 3.7+ requires Xenial
+    - { python: "3.8-dev", dist: xenial, sudo: true }
     - { python: "pypy" }
     - { python: "pypy3" }
   allow_failures:

ChangeLog

@@ -1,3 +1,10 @@
+Version 0.7.2
+https://github.com/edgewall/genshi/releases/tag/0.7.2
+(Apr 27 2019, from branches/stable/0.7.x)
+
+ * Add support for Python 3.8.
+
+
 Version 0.7.1
 https://github.com/edgewall/genshi/releases/tag/0.7.1
 (Sep 1 2018, from branches/stable/0.7.x)

genshi/compat.py

@@ -13,6 +13,7 @@
 
 """Various Python version compatibility classes and functions."""
 
+import _ast
 import sys
 from types import CodeType
 
@@ -96,6 +97,18 @@ def build_code_chunk(code, filename, name, lineno):
                         code.co_varnames, filename, name, lineno,
                         code.co_lnotab, (), ())
 
+
+# In Python 3.8, Str and Ellipsis was replaced by Constant
+
+try:
+    _ast_Ellipsis = _ast.Ellipsis
+    _ast_Str = _ast.Str
+    _ast_Str_value = lambda obj: obj.s
+except AttributeError:
+    _ast_Ellipsis = _ast_Str = _ast.Constant
+    _ast_Str_value = lambda obj: obj.value
+
+
 # Compatibility fallback implementations for Python < 2.6
 
 try:

genshi/filters/i18n.py

@@ -33,7 +33,7 @@
 from genshi.template.base import DirectiveFactory, EXPR, SUB, _apply_directives
 from genshi.template.directives import Directive, StripDirective
 from genshi.template.markup import MarkupTemplate, EXEC
-from genshi.compat import IS_PYTHON2
+from genshi.compat import IS_PYTHON2, _ast_Str, _ast_Str_value
 
 __all__ = ['Translator', 'extract']
 __docformat__ = 'restructuredtext en'
@@ -1187,10 +1187,11 @@ def _walk(node):
                 and node.func.id in gettext_functions:
             strings = []
             def _add(arg):
-                if isinstance(arg, _ast.Str) and isinstance(arg.s, unicode):
-                    strings.append(arg.s)
-                elif isinstance(arg, _ast.Str):
-                    strings.append(unicode(arg.s, 'utf-8'))
+                if isinstance(arg, _ast_Str) \
+                        and isinstance(_ast_Str_value(arg), unicode):
+                    strings.append(_ast_Str_value(arg))
+                elif isinstance(arg, _ast_Str):
+                    strings.append(unicode(_ast_Str_value(arg), 'utf-8'))
                 elif arg:
                     strings.append(None)
             [_add(arg) for arg in node.args]

genshi/template/astutil.py

@@ -21,7 +21,7 @@
     def parse(source, mode):
         return compile(source, '', mode, _ast.PyCF_ONLY_AST)
 
-from genshi.compat import IS_PYTHON2, isstring
+from genshi.compat import IS_PYTHON2, isstring, _ast_Ellipsis
 
 __docformat__ = 'restructuredtext en'
 
@@ -705,6 +705,10 @@ def visit_Num(self, node):
     def visit_Str(self, node):
         self._write(repr(node.s))
 
+    # Constant(object value)
+    def visit_Constant(self, node):
+        self._write(repr(node.value))
+
     if not IS_PYTHON2:
         # Bytes(bytes s)
         def visit_Bytes(self, node):
@@ -721,7 +725,7 @@ def visit_Subscript(self, node):
         self.visit(node.value)
         self._write('[')
         def _process_slice(node):
-            if isinstance(node, _ast.Ellipsis):
+            if isinstance(node, _ast_Ellipsis):
                 self._write('...')
             elif isinstance(node, _ast.Slice):
                 if getattr(node, 'lower', 'None'):

genshi/template/eval.py

@@ -25,7 +25,7 @@
 from genshi.util import flatten
 
 from genshi.compat import get_code_params, build_code_chunk, isstring, \
-                          IS_PYTHON2
+                          IS_PYTHON2, _ast_Str
 
 __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup',
            'Undefined', 'UndefinedError']
@@ -531,7 +531,7 @@ def visit_Str(self, node):
             try: # If the string is ASCII, return a `str` object
                 node.s.decode('ascii')
             except ValueError: # Otherwise return a `unicode` object
-                return _new(_ast.Str, node.s.decode('utf-8'))
+                return _new(_ast_Str, node.s.decode('utf-8'))
         return node
 
     def visit_ClassDef(self, node):
@@ -556,7 +556,7 @@ def visit_ImportFrom(self, node):
                 node = _new(_ast.Expr, _new(_ast.Call,
                     _new(_ast.Name, '_star_import_patch'), [
                         _new(_ast.Name, '__data__'),
-                        _new(_ast.Str, node.module)
+                        _new(_ast_Str, node.module)
                     ], (), ()))
             return node
         if len(self.locals) > 1:
@@ -613,7 +613,7 @@ def visit_Name(self, node):
             # Otherwise, translate the name ref into a context lookup
             name = _new(_ast.Name, '_lookup_name', _ast.Load())
             namearg = _new(_ast.Name, '__data__', _ast.Load())
-            strarg = _new(_ast.Str, node.id)
+            strarg = _new(_ast_Str, node.id)
             node = _new(_ast.Call, name, [namearg, strarg], [])
         elif isinstance(node.ctx, _ast.Store):
             if len(self.locals) > 1:
@@ -632,7 +632,7 @@ def visit_Attribute(self, node):
             return ASTTransformer.visit_Attribute(self, node)
 
         func = _new(_ast.Name, '_lookup_attr', _ast.Load())
-        args = [self.visit(node.value), _new(_ast.Str, node.attr)]
+        args = [self.visit(node.value), _new(_ast_Str, node.attr)]
         return _new(_ast.Call, func, args, [])
 
     def visit_Subscript(self, node):

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,py32,py33,py34,pypy
+envlist = py25,py26,py27,py32,py33,py34,py35,py36,py37,py38,pypy
 [testenv]
 deps=
 setenv=