Google Git
Sign in
android/platform/external/python/mako/b06ce6e^!/.
commit
b06ce6ea566247b306f0531c5716e57b9c7b4876
[log]
author
Mike Bayer <mike_mp@zzzcomputing.com>
Sun Jan 05 21:16:09 2020 -0500
committer
Mike Bayer <mike_mp@zzzcomputing.com>
Sun Jan 05 21:17:37 2020 -0500
tree
ca17ce20f997e13b7aaba2b3db59f86e07ddd041
parent
bd830f679b873a872c102e7a5181c5e8b9d7d7c9 [diff]
happy new year

also fix one flake8 error

Change-Id: Ia828267fce34d5b194898e3e301b6d463470f068

diff --git a/LICENSE b/LICENSE
index ec32acf..1f835e9 100644
--- a/LICENSE
+++ b/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>.
+Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/mako/__init__.py b/mako/__init__.py
index 38a5b83..384726d 100644
--- a/mako/__init__.py
+++ b/mako/__init__.py

@@ -1,8 +1,8 @@
 # mako/__init__.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-__version__ = '1.1.1'
+__version__ = "1.1.1"

diff --git a/mako/_ast_util.py b/mako/_ast_util.py
index 74c0851..bdcdbf6 100644
--- a/mako/_ast_util.py
+++ b/mako/_ast_util.py

@@ -1,5 +1,5 @@
 # mako/_ast_util.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ast.py b/mako/ast.py
index 8f2cf2e..cfae280 100644
--- a/mako/ast.py
+++ b/mako/ast.py

@@ -1,5 +1,5 @@
 # mako/ast.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/cache.py b/mako/cache.py
index b68b74f..26aa93e 100644
--- a/mako/cache.py
+++ b/mako/cache.py

@@ -1,5 +1,5 @@
 # mako/cache.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/cmd.py b/mako/cmd.py
index 5d52dfb..95de54a 100755
--- a/mako/cmd.py
+++ b/mako/cmd.py

@@ -1,5 +1,5 @@
 # mako/cmd.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/codegen.py b/mako/codegen.py
index 8f9eef4..a9ae55b 100644
--- a/mako/codegen.py
+++ b/mako/codegen.py

@@ -1,5 +1,5 @@
 # mako/codegen.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/compat.py b/mako/compat.py
index 4460fde..9aac98c 100644
--- a/mako/compat.py
+++ b/mako/compat.py

@@ -1,5 +1,5 @@
 # mako/compat.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/exceptions.py b/mako/exceptions.py
index b6388b1..ea7b20d 100644
--- a/mako/exceptions.py
+++ b/mako/exceptions.py

@@ -1,5 +1,5 @@
 # mako/exceptions.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -166,9 +166,7 @@
                     module_source = info.code
                     template_source = info.source
                     template_filename = (
-                        info.template_filename
-                        or info.template_uri
-                        or filename
+                        info.template_filename or info.template_uri or filename
                     )
                 except KeyError:
                     # A normal .py file (not a Template)

diff --git a/mako/ext/autohandler.py b/mako/ext/autohandler.py
index 55afb95..8b1324e 100644
--- a/mako/ext/autohandler.py
+++ b/mako/ext/autohandler.py

@@ -1,5 +1,5 @@
 # ext/autohandler.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ext/babelplugin.py b/mako/ext/babelplugin.py
index dbe2cd0..76bbc5b 100644
--- a/mako/ext/babelplugin.py
+++ b/mako/ext/babelplugin.py

@@ -1,5 +1,5 @@
 # ext/babelplugin.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ext/beaker_cache.py b/mako/ext/beaker_cache.py
index b415c9c..f65ce43 100644
--- a/mako/ext/beaker_cache.py
+++ b/mako/ext/beaker_cache.py

@@ -1,5 +1,5 @@
 # ext/beaker_cache.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ext/extract.py b/mako/ext/extract.py
index 8a1bd54..ad2348a 100644
--- a/mako/ext/extract.py
+++ b/mako/ext/extract.py

@@ -1,5 +1,5 @@
 # ext/extract.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ext/linguaplugin.py b/mako/ext/linguaplugin.py
index 955a5cb..0f6d165 100644
--- a/mako/ext/linguaplugin.py
+++ b/mako/ext/linguaplugin.py

@@ -1,5 +1,5 @@
 # ext/linguaplugin.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ext/preprocessors.py b/mako/ext/preprocessors.py
index 1eeb7c5..9cc0621 100644
--- a/mako/ext/preprocessors.py
+++ b/mako/ext/preprocessors.py

@@ -1,5 +1,5 @@
 # ext/preprocessors.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ext/pygmentplugin.py b/mako/ext/pygmentplugin.py
index 1734ccd..943a67a 100644
--- a/mako/ext/pygmentplugin.py
+++ b/mako/ext/pygmentplugin.py

@@ -1,5 +1,5 @@
 # ext/pygmentplugin.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/ext/turbogears.py b/mako/ext/turbogears.py
index fdb7741..722a6b4 100644
--- a/mako/ext/turbogears.py
+++ b/mako/ext/turbogears.py

@@ -1,5 +1,5 @@
 # ext/turbogears.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/filters.py b/mako/filters.py
index ba69fdd..0ae33ff 100644
--- a/mako/filters.py
+++ b/mako/filters.py

@@ -1,5 +1,5 @@
 # mako/filters.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/lexer.py b/mako/lexer.py
index dadd663..a02b57f 100644
--- a/mako/lexer.py
+++ b/mako/lexer.py

@@ -1,5 +1,5 @@
 # mako/lexer.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/lookup.py b/mako/lookup.py
index 93558b2..476326d 100644
--- a/mako/lookup.py
+++ b/mako/lookup.py

@@ -1,5 +1,5 @@
 # mako/lookup.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/parsetree.py b/mako/parsetree.py
index 2881da1..801e48a 100644
--- a/mako/parsetree.py
+++ b/mako/parsetree.py

@@ -1,5 +1,5 @@
 # mako/parsetree.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/pygen.py b/mako/pygen.py
index 603676d..947721f 100644
--- a/mako/pygen.py
+++ b/mako/pygen.py

@@ -1,5 +1,5 @@
 # mako/pygen.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/pyparser.py b/mako/pyparser.py
index e41c304..b16672d 100644
--- a/mako/pyparser.py
+++ b/mako/pyparser.py

@@ -1,5 +1,5 @@
 # mako/pyparser.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/runtime.py b/mako/runtime.py
index 0e7149b..465908e 100644
--- a/mako/runtime.py
+++ b/mako/runtime.py

@@ -1,5 +1,5 @@
 # mako/runtime.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php

diff --git a/mako/template.py b/mako/template.py
index 937d15b..3fd0871 100644
--- a/mako/template.py
+++ b/mako/template.py

@@ -1,5 +1,5 @@
 # mako/template.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -520,17 +520,17 @@
 
     """A Template which is constructed given an existing Python module.
 
-        e.g.::
+       e.g.::
 
-        t = Template("this is a template")
-        f = file("mymodule.py", "w")
-        f.write(t.code)
-        f.close()
+            t = Template("this is a template")
+            f = file("mymodule.py", "w")
+            f.write(t.code)
+            f.close()
 
-        import mymodule
+            import mymodule
 
-        t = ModuleTemplate(mymodule)
-        print t.render()
+            t = ModuleTemplate(mymodule)
+            print(t.render())
 
     """
 

diff --git a/mako/util.py b/mako/util.py
index 07f7531..498edbc 100644
--- a/mako/util.py
+++ b/mako/util.py

@@ -1,5 +1,5 @@
 # mako/util.py
-# Copyright 2006-2019 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php