Merge branch 'master' into python-2.4

This commit is contained in:
rocky
2018-01-08 12:24:59 -05:00
4 changed files with 9 additions and 5 deletions

View File

@@ -162,13 +162,13 @@ grammar-coverage-3.3:
SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-33.cover $(PYTHON) test_pythonlib.py --bytecode-3.3 SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-33.cover $(PYTHON) test_pythonlib.py --bytecode-3.3
SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-33.cover $(PYTHON) test_pyenvlib.py --3.3.6 SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-33.cover $(PYTHON) test_pyenvlib.py --3.3.6
##: Get grammar coverage for Python 3.4 #: Get grammar coverage for Python 3.4
grammar-coverage-3.4: grammar-coverage-3.4:
-rm $(COVER_DIR)/spark-grammar-34.cover -rm $(COVER_DIR)/spark-grammar-34.cover
SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-34.cover $(PYTHON) test_pythonlib.py --bytecode-3.4 SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-34.cover $(PYTHON) test_pythonlib.py --bytecode-3.4
SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-34.cover $(PYTHON) test_pyenvlib.py --3.4.2 SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-34.cover $(PYTHON) test_pyenvlib.py --3.4.2
##: Get grammar coverage for Python 3.5 #: Get grammar coverage for Python 3.5
grammar-coverage-3.5: grammar-coverage-3.5:
rm $(COVER_DIR)/spark-grammar-35.cover || /bin/true rm $(COVER_DIR)/spark-grammar-35.cover || /bin/true
SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-35.cover $(PYTHON) test_pythonlib.py --bytecode-3.5 SPARK_PARSER_COVERAGE=$(COVER_DIR)/spark-grammar-35.cover $(PYTHON) test_pythonlib.py --bytecode-3.5

View File

@@ -1,8 +1,12 @@
# sql/schema.py # From sql/schema.py and 3.5 _strptime.py
# Note that kwargs comes before "positional" args # Note that kwargs comes before "positional" args
def tometadata(self, metadata, schema, Table, args, name=None): def tometadata(self, metadata, schema, Table, args, name=None):
table = Table( table = Table(
name, metadata, schema=schema, name, metadata, schema=schema,
*args, **self.kwargs *args, **self.kwargs
) )
return table return table
def _strptime_datetime(cls, args):
return cls(*args)

View File

@@ -1,4 +1,4 @@
# Copyright (c) 2015-2017 by Rocky Bernstein # Copyright (c) 2015-2018 by Rocky Bernstein
# Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org> # Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com> # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
# Copyright (c) 1999 John Aycock # Copyright (c) 1999 John Aycock
@@ -2316,7 +2316,7 @@ class SourceWalker(GenericASTTraversal, object):
str = '%c(*%C, %c)' str = '%c(*%C, %c)'
elif str == '%c(%C': elif str == '%c(%C':
str = '%c(*%C)' str = '%c(*%C)'
# p2 = (1, -1, 100) p2 = (1, 100, '')
else: else:
str += '*%c)' str += '*%c)'
entry = (str, 0, p2, -2) entry = (str, 0, p2, -2)