From python-checkins at python.org  Sat Sep  1 00:52:50 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat,  1 Sep 2012 00:52:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Differentiate_between_l?=
 =?utf-8?q?ibraries_that_are_Python_3_compatible_as-is_vs=2E?=
Message-ID: <3X7wnt72YtzQLj@mail.python.org>

http://hg.python.org/benchmarks/rev/47035700a022
changeset:   163:47035700a022
user:        Brett Cannon <brett at python.org>
date:        Fri Aug 31 18:52:42 2012 -0400
summary:
  Differentiate between libraries that are Python 3 compatible as-is vs.
needing 2to3 translation.

files:
  make_perf3.sh |  11 +++++++++--
  1 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/make_perf3.sh b/make_perf3.sh
--- a/make_perf3.sh
+++ b/make_perf3.sh
@@ -30,9 +30,16 @@
 cp "${srcdir}/perf.py" perf.py
 ${CONVERT} perf.py
 
-SAFE_LIBS="2to3 mako pathlib"
+# Libraries that are Python 3 compatible as-is.
+SAFE_LIBS_AS_IS="pathlib"
+# Libraries that work with Python 3 after passing through 2to3.
+SAFE_LIBS_TO_TRANSLATE="2to3 mako"
 mkdir lib
-for safe_lib in ${SAFE_LIBS}; do
+for safe_lib in ${SAFE_LIBS_AS_IS}; do
+  cp -a "${srcdir}/lib/${safe_lib}" lib/${safe_lib}
+done
+
+for safe_lib in ${SAFE_LIBS_TO_TRANSLATE}; do
   cp -a "${srcdir}/lib/${safe_lib}" lib/${safe_lib}
   ${CONVERT} lib/${safe_lib}
 done

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep  1 00:58:32 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat,  1 Sep 2012 00:58:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Allow_for_the_specifica?=
 =?utf-8?q?tion_of_a_base_directory_for_either_interpreter?=
Message-ID: <3X7wwS2MjFzPyh@mail.python.org>

http://hg.python.org/benchmarks/rev/61768f86170c
changeset:   164:61768f86170c
user:        Brett Cannon <brett at python.org>
date:        Fri Aug 31 18:58:24 2012 -0400
summary:
  Allow for the specification of a base directory for either interpreter
being run. This allows for comparing Python 2.x to Python 3.x by
having a Python 2 copy of the benchmarks and Python 3 copy of the
benchmarks and then specifying the proper directory::

benchmarks_py3k$ python3 perf.py --basedir /some/py2/benchmark `which python2.7` `which python3.2`

files:
  perf.py |  39 ++++++++++++++++++++++++++++++++-------
  1 files changed, 32 insertions(+), 7 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -850,8 +850,14 @@
                                "-exec", "rm", "-f", "{}", ";"])
 
 
-def Relative(path):
-    return os.path.join(os.path.dirname(__file__), path)
+def Relative(path, python=None, options=None):
+    basedir = os.path.dirname(__file__)
+    if python is not None:
+        if python[0] == options.base_binary:
+            basedir = options.control_dirname
+        else:
+            basedir = options.experimental_dirname
+    return os.path.join(basedir, path)
 
 
 def LogCall(command):
@@ -1258,9 +1264,9 @@
 
 
 def Measure2to3(python, options):
-    fast_target = Relative("lib/2to3/lib2to3/refactor.py")
-    two_to_three_bin = Relative("lib/2to3/2to3")
-    two_to_three_dir = Relative("lib/2to3_data")
+    fast_target = Relative("lib/2to3/lib2to3/refactor.py", python, options)
+    two_to_three_bin = Relative("lib/2to3/2to3", python, options)
+    two_to_three_dir = Relative("lib/2to3_data", python, options)
     env = BuildEnv({"PYTHONPATH": two_to_three_dir},
                    inherit_env=options.inherit_env)
 
@@ -1471,8 +1477,8 @@
 
 
 def MeasureMako(python, options):
-    bm_path = Relative("performance/bm_mako.py")
-    mako_path = Relative("lib/mako")
+    bm_path = Relative("performance/bm_mako.py", python, options)
+    mako_path = Relative("lib/mako", python, options)
     bm_env = BuildEnv({"PYTHONPATH": mako_path}, options.inherit_env)
     return MeasureGeneric(python, options, bm_path, bm_env, iteration_scaling=5)
 
@@ -2086,6 +2092,13 @@
     """Parser callback to --inherit_env var names."""
     parser.values.inherit_env = [v for v in value.split(",") if v]
 
+def ParseBasedirOption(python_args_opt):
+    default = os.path.dirname(__file__)
+    parts = python_args_opt.split(",")
+    if len(parts) == 1:  # No comma
+        parts.append('')
+    return [path or default for path in parts]
+
 
 def ParseOutputStyle(option, opt_str, value, parser):
     if value not in ("normal", "table"):
@@ -2142,6 +2155,15 @@
                       help=("Comma-separated list of environment variable names"
                             " that are inherited from the parent environment"
                             " when running benchmarking subprocesses."))
+    parser.add_option("--basedir", default="",
+                      help=("A comma-separated pair of base directories to "
+                            "use when calculating absolute file paths to "
+                            "benchmark and library code. The first argument "
+                            "is for the base interpreter, the second for the "
+                            "experimental one. Any unspecified value is "
+                            "assumed to be the directory containing this "
+                            "file. This is typically used when comparing a "
+                            "Python 2.x interpreter to a 3.x one."))
     parser.add_option("-T", "--disable_timelines", default=False, action="store_true",
                       help="Don't use Google charts for displaying timelines.")
     parser.add_option("-O", "--output_style", metavar="STYLE", type="string",
@@ -2184,6 +2206,9 @@
     base_cmd_prefix = [base] + base_args
     changed_cmd_prefix = [changed] + changed_args
 
+    basedirs = ParseBasedirOption(options.basedir)
+    options.control_dirname, options.experimental_dirname  = basedirs
+
     logging.basicConfig(level=logging.INFO)
 
     if options.track_memory:

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep  1 05:16:49 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  1 Sep 2012 05:16:49 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzEyNzc2LCMxMTgz?=
 =?utf-8?q?9=3A_call_argparse_type_function_only_once=2E?=
Message-ID: <3X82fT2R8dzQTl@mail.python.org>

http://hg.python.org/cpython/rev/1b614921aefa
changeset:   78821:1b614921aefa
branch:      3.2
parent:      78818:c0c7b1998306
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Aug 31 22:45:20 2012 -0400
summary:
  #12776,#11839: call argparse type function only once.

Before, the type function was called twice in the case where the default
was specified and the argument was given as well.  This was especially
problematic for the FileType type, as a default file would always be
opened, even if a file argument was specified on the command line.

Patch by Arnaud Fontaine, with additional test by Mike Meyer.

files:
  Lib/argparse.py           |  21 +++++++---
  Lib/test/test_argparse.py |  48 +++++++++++++++++++++++++++
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   6 +++
  4 files changed, 69 insertions(+), 7 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1714,10 +1714,7 @@
             if action.dest is not SUPPRESS:
                 if not hasattr(namespace, action.dest):
                     if action.default is not SUPPRESS:
-                        default = action.default
-                        if isinstance(action.default, str):
-                            default = self._get_value(action, default)
-                        setattr(namespace, action.dest, default)
+                        setattr(namespace, action.dest, action.default)
 
         # add any parser defaults that aren't present
         for dest in self._defaults:
@@ -1945,12 +1942,22 @@
         if positionals:
             self.error(_('too few arguments'))
 
-        # make sure all required actions were present
+        # make sure all required actions were present, and convert defaults.
         for action in self._actions:
-            if action.required:
-                if action not in seen_actions:
+            if action not in seen_actions:
+                if action.required:
                     name = _get_action_name(action)
                     self.error(_('argument %s is required') % name)
+                else:
+                    # Convert action default now instead of doing it before
+                    # parsing arguments to avoid calling convert functions
+                    # twice (which may fail) if the argument was given, but
+                    # only if it was defined already in the namespace
+                    if (action.default is not None and
+                            hasattr(namespace, action.dest) and
+                            action.default is getattr(namespace, action.dest)):
+                        setattr(namespace, action.dest,
+                                self._get_value(action, action.default))
 
         # make sure all required groups had one option present
         for group in self._mutually_exclusive_groups:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1462,6 +1462,22 @@
         ('readonly', NS(x=None, spam=RFile('readonly'))),
     ]
 
+class TestFileTypeDefaults(TempDirMixin, ParserTestCase):
+    """Test that a file is not created unless the default is needed"""
+    def setUp(self):
+        super(TestFileTypeDefaults, self).setUp()
+        file = open(os.path.join(self.temp_dir, 'good'), 'w')
+        file.write('good')
+        file.close()
+
+    argument_signatures = [
+        Sig('-c', type=argparse.FileType('r'), default='no-file.txt'),
+    ]
+    # should provoke no such file error
+    failures = ['']
+    # should not provoke error because default file is created
+    successes = [('-c good', NS(c=RFile('good')))]
+
 
 class TestFileTypeRB(TempDirMixin, ParserTestCase):
     """Test the FileType option/argument type for reading files"""
@@ -4468,6 +4484,38 @@
         else:
             self.fail()
 
+# ================================================
+# Check that the type function is called only once
+# ================================================
+
+class TestTypeFunctionCallOnlyOnce(TestCase):
+
+    def test_type_function_call_only_once(self):
+        def spam(string_to_convert):
+            self.assertEqual(string_to_convert, 'spam!')
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='bar')
+        args = parser.parse_args('--foo spam!'.split())
+        self.assertEqual(NS(foo='foo_converted'), args)
+
+# ================================================================
+# Check that the type function is called with a non-string default
+# ================================================================
+
+class TestTypeFunctionCallWithNonStringDefault(TestCase):
+
+    def test_type_function_call_with_non_string_default(self):
+        def spam(int_to_convert):
+            self.assertEqual(int_to_convert, 0)
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default=0)
+        args = parser.parse_args([])
+        self.assertEqual(NS(foo='foo_converted'), args)
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -305,6 +305,7 @@
 Frederik Fix
 Matt Fleming
 Hern?n Mart?nez Foffani
+Arnaud Fontaine
 Michael Foord
 Amaury Forgeot d'Arc
 Doug Fort
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -112,6 +112,12 @@
 Library
 -------
 
+- Issue #12776,#11839: call argparse type function (specified by add_argument)
+  only once. Before, the type function was called twice in the case where the
+  default was specified and the argument was given as well.  This was
+  especially problematic for the FileType type, as a default file would always
+  be opened, even if a file argument was specified on the command line.
+
 - Issue #13370: Ensure that ctypes works on Mac OS X when Python is
   compiled using the clang compiler
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 05:16:51 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  1 Sep 2012 05:16:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2312776=2C=2311839=3A_call_argparse_type_function?=
 =?utf-8?q?_only_once=2E?=
Message-ID: <3X82fW1lylzQTl@mail.python.org>

http://hg.python.org/cpython/rev/74f6d87cd471
changeset:   78822:74f6d87cd471
parent:      78819:815b88454e3e
parent:      78821:1b614921aefa
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Aug 31 23:09:34 2012 -0400
summary:
  Merge #12776,#11839: call argparse type function only once.

Before, the type function was called twice in the case where the default
was specified and the argument was given as well.  This was especially
problematic for the FileType type, as a default file would always be
opened, even if a file argument was specified on the command line.

Patch by Arnaud Fontaine, with additional test by Mike Meyer.

files:
  Lib/argparse.py           |  26 ++++++++++---
  Lib/test/test_argparse.py |  48 +++++++++++++++++++++++++++
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   6 +++
  4 files changed, 74 insertions(+), 7 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1722,10 +1722,7 @@
             if action.dest is not SUPPRESS:
                 if not hasattr(namespace, action.dest):
                     if action.default is not SUPPRESS:
-                        default = action.default
-                        if isinstance(action.default, str):
-                            default = self._get_value(action, default)
-                        setattr(namespace, action.dest, default)
+                        setattr(namespace, action.dest, action.default)
 
         # add any parser defaults that aren't present
         for dest in self._defaults:
@@ -1948,9 +1945,24 @@
         # if we didn't consume all the argument strings, there were extras
         extras.extend(arg_strings[stop_index:])
 
-        # make sure all required actions were present
-        required_actions = [_get_action_name(action) for action in self._actions
-                            if action.required and action not in seen_actions]
+        # make sure all required actions were present and also convert
+        # action defaults which were not given as arguments
+        required_actions = []
+        for action in self._actions:
+            if action not in seen_actions:
+                if action.required:
+                    required_actions.append(_get_action_name(action))
+                else:
+                    # Convert action default now instead of doing it before
+                    # parsing arguments to avoid calling convert functions
+                    # twice (which may fail) if the argument was given, but
+                    # only if it was defined already in the namespace
+                    if (action.default is not None and
+                        hasattr(namespace, action.dest) and
+                        action.default is getattr(namespace, action.dest)):
+                        setattr(namespace, action.dest,
+                                self._get_value(action, action.default))
+
         if required_actions:
             self.error(_('the following arguments are required: %s') %
                        ', '.join(required_actions))
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1463,6 +1463,22 @@
         ('readonly', NS(x=None, spam=RFile('readonly'))),
     ]
 
+class TestFileTypeDefaults(TempDirMixin, ParserTestCase):
+    """Test that a file is not created unless the default is needed"""
+    def setUp(self):
+        super(TestFileTypeDefaults, self).setUp()
+        file = open(os.path.join(self.temp_dir, 'good'), 'w')
+        file.write('good')
+        file.close()
+
+    argument_signatures = [
+        Sig('-c', type=argparse.FileType('r'), default='no-file.txt'),
+    ]
+    # should provoke no such file error
+    failures = ['']
+    # should not provoke error because default file is created
+    successes = [('-c good', NS(c=RFile('good')))]
+
 
 class TestFileTypeRB(TempDirMixin, ParserTestCase):
     """Test the FileType option/argument type for reading files"""
@@ -4559,6 +4575,38 @@
         self.assertNotIn(msg, 'optional_positional')
 
 
+# ================================================
+# Check that the type function is called only once
+# ================================================
+
+class TestTypeFunctionCallOnlyOnce(TestCase):
+
+    def test_type_function_call_only_once(self):
+        def spam(string_to_convert):
+            self.assertEqual(string_to_convert, 'spam!')
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='bar')
+        args = parser.parse_args('--foo spam!'.split())
+        self.assertEqual(NS(foo='foo_converted'), args)
+
+# ================================================================
+# Check that the type function is called with a non-string default
+# ================================================================
+
+class TestTypeFunctionCallWithNonStringDefault(TestCase):
+
+    def test_type_function_call_with_non_string_default(self):
+        def spam(int_to_convert):
+            self.assertEqual(int_to_convert, 0)
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default=0)
+        args = parser.parse_args([])
+        self.assertEqual(NS(foo='foo_converted'), args)
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -335,6 +335,7 @@
 Frederik Fix
 Matt Fleming
 Hern?n Mart?nez Foffani
+Arnaud Fontaine
 Michael Foord
 Amaury Forgeot d'Arc
 Doug Fort
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,12 @@
 Library
 -------
 
+- Issue #12776,#11839: call argparse type function (specified by add_argument)
+  only once. Before, the type function was called twice in the case where the
+  default was specified and the argument was given as well.  This was
+  especially problematic for the FileType type, as a default file would always
+  be opened, even if a file argument was specified on the command line.
+
 Extension Modules
 -----------------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 05:16:52 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  1 Sep 2012 05:16:52 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzEyNzc2LCMxMTgz?=
 =?utf-8?q?9=3A_call_argparse_type_function_only_once=2E?=
Message-ID: <3X82fX64QmzQSt@mail.python.org>

http://hg.python.org/cpython/rev/62b5667ef2f4
changeset:   78823:62b5667ef2f4
branch:      2.7
parent:      78820:7b076911f5f9
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Aug 31 23:15:28 2012 -0400
summary:
  #12776,#11839: call argparse type function only once.

Before, the type function was called twice in the case where the default
was specified and the argument was given as well.  This was especially
problematic for the FileType type, as a default file would always be
opened, even if a file argument was specified on the command line.

Patch by Arnaud Fontaine, with additional test by Mike Meyer.

files:
  Lib/argparse.py           |  21 +++++++---
  Lib/test/test_argparse.py |  48 +++++++++++++++++++++++++++
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   6 +++
  4 files changed, 69 insertions(+), 7 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1705,10 +1705,7 @@
             if action.dest is not SUPPRESS:
                 if not hasattr(namespace, action.dest):
                     if action.default is not SUPPRESS:
-                        default = action.default
-                        if isinstance(action.default, basestring):
-                            default = self._get_value(action, default)
-                        setattr(namespace, action.dest, default)
+                        setattr(namespace, action.dest, action.default)
 
         # add any parser defaults that aren't present
         for dest in self._defaults:
@@ -1936,12 +1933,22 @@
         if positionals:
             self.error(_('too few arguments'))
 
-        # make sure all required actions were present
+        # make sure all required actions were present, and convert defaults.
         for action in self._actions:
-            if action.required:
-                if action not in seen_actions:
+            if action not in seen_actions:
+                if action.required:
                     name = _get_action_name(action)
                     self.error(_('argument %s is required') % name)
+                else:
+                    # Convert action default now instead of doing it before
+                    # parsing arguments to avoid calling convert functions
+                    # twice (which may fail) if the argument was given, but
+                    # only if it was defined already in the namespace
+                    if (action.default is not None and
+                            hasattr(namespace, action.dest) and
+                            action.default is getattr(namespace, action.dest)):
+                        setattr(namespace, action.dest,
+                                self._get_value(action, action.default))
 
         # make sure all required groups had one option present
         for group in self._mutually_exclusive_groups:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1467,6 +1467,22 @@
         ('readonly', NS(x=None, spam=RFile('readonly'))),
     ]
 
+class TestFileTypeDefaults(TempDirMixin, ParserTestCase):
+    """Test that a file is not created unless the default is needed"""
+    def setUp(self):
+        super(TestFileTypeDefaults, self).setUp()
+        file = open(os.path.join(self.temp_dir, 'good'), 'w')
+        file.write('good')
+        file.close()
+
+    argument_signatures = [
+        Sig('-c', type=argparse.FileType('r'), default='no-file.txt'),
+    ]
+    # should provoke no such file error
+    failures = ['']
+    # should not provoke error because default file is created
+    successes = [('-c good', NS(c=RFile('good')))]
+
 
 class TestFileTypeRB(TempDirMixin, ParserTestCase):
     """Test the FileType option/argument type for reading files"""
@@ -4432,6 +4448,38 @@
         else:
             self.fail()
 
+# ================================================
+# Check that the type function is called only once
+# ================================================
+
+class TestTypeFunctionCallOnlyOnce(TestCase):
+
+    def test_type_function_call_only_once(self):
+        def spam(string_to_convert):
+            self.assertEqual(string_to_convert, 'spam!')
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='bar')
+        args = parser.parse_args('--foo spam!'.split())
+        self.assertEqual(NS(foo='foo_converted'), args)
+
+# ================================================================
+# Check that the type function is called with a non-string default
+# ================================================================
+
+class TestTypeFunctionCallWithNonStringDefault(TestCase):
+
+    def test_type_function_call_with_non_string_default(self):
+        def spam(int_to_convert):
+            self.assertEqual(int_to_convert, 0)
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default=0)
+        args = parser.parse_args([])
+        self.assertEqual(NS(foo='foo_converted'), args)
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -271,6 +271,7 @@
 Frederik Fix
 Matt Fleming
 Hern?n Mart?nez Foffani
+Arnaud Fontaine
 Michael Foord
 Amaury Forgeot d'Arc
 Doug Fort
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,12 @@
 Library
 -------
 
+- Issue #12776,#11839: call argparse type function (specified by add_argument)
+  only once. Before, the type function was called twice in the case where the
+  default was specified and the argument was given as well.  This was
+  especially problematic for the FileType type, as a default file would always
+  be opened, even if a file argument was specified on the command line.
+
 - Issue #13370: Ensure that ctypes works on Mac OS X when Python is
   compiled using the clang compiler
 

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Sat Sep  1 06:02:21 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 01 Sep 2012 06:02:21 +0200
Subject: [Python-checkins] Daily reference leaks (815b88454e3e): sum=0
Message-ID: <E1T7eub-0004kA-FF@ap.vmr.nerim.net>

results for 815b88454e3e on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogtCRzFU', '-x']

From python-checkins at python.org  Sat Sep  1 06:31:53 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Sat,  1 Sep 2012 06:31:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzEzNzY5OiBFbmhh?=
 =?utf-8?q?nce_docs_for_ensure=5Fascii_semantics_in_JSON_decoding_function?=
 =?utf-8?q?s?=
Message-ID: <3X84K516KVzQNR@mail.python.org>

http://hg.python.org/cpython/rev/a1884b3027c5
changeset:   78824:a1884b3027c5
branch:      2.7
user:        Petri Lehtinen <petri at digip.org>
date:        Sat Sep 01 07:27:58 2012 +0300
summary:
  #13769: Enhance docs for ensure_ascii semantics in JSON decoding functions

files:
  Doc/library/json.rst |  30 ++++++++++++++++++------------
  Lib/json/__init__.py |  18 ++++++++++--------
  Lib/json/encoder.py  |   9 ++++++---
  Misc/NEWS            |   3 +++
  4 files changed, 37 insertions(+), 23 deletions(-)


diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -127,11 +127,14 @@
    :class:`float`, :class:`bool`, ``None``) will be skipped instead of raising a
    :exc:`TypeError`.
 
-   If *ensure_ascii* is ``False`` (default: ``True``), then some chunks written
-   to *fp* may be :class:`unicode` instances, subject to normal Python
-   :class:`str` to :class:`unicode` coercion rules.  Unless ``fp.write()``
-   explicitly understands :class:`unicode` (as in :func:`codecs.getwriter`) this
-   is likely to cause an error.
+   If *ensure_ascii* is ``True`` (the default), all non-ASCII characters in the
+   output are escaped with ``\uXXXX`` sequences, and the result is a
+   :class:`str` instance consisting of ASCII characters only.  If
+   *ensure_ascii* is ``False``, some chunks written to *fp* may be
+   :class:`unicode` instances.  This usually happens because the input contains
+   unicode strings or the *encoding* parameter is used.  Unless ``fp.write()``
+   explicitly understands :class:`unicode` (as in :func:`codecs.getwriter`)
+   this is likely to cause an error.
 
    If *check_circular* is ``False`` (default: ``True``), then the circular
    reference check for container types will be skipped and a circular reference
@@ -168,11 +171,11 @@
 
 .. function:: dumps(obj[, skipkeys[, ensure_ascii[, check_circular[, allow_nan[, cls[, indent[, separators[, encoding[, default[, **kw]]]]]]]]]])
 
-   Serialize *obj* to a JSON formatted :class:`str`.
+   Serialize *obj* to a JSON formatted :class:`str`.  If *ensure_ascii* is
+   ``False``, the result may contain non-ASCII characters and the return value
+   may be a :class:`unicode` instance.
 
-   If *ensure_ascii* is ``False``, then the return value will be a
-   :class:`unicode` instance.  The other arguments have the same meaning as in
-   :func:`dump`.
+   The arguments have the same meaning as in :func:`dump`.
 
    .. note::
 
@@ -371,9 +374,12 @@
    attempt encoding of keys that are not str, int, long, float or None.  If
    *skipkeys* is ``True``, such items are simply skipped.
 
-   If *ensure_ascii* is ``True`` (the default), the output is guaranteed to be
-   :class:`str` objects with all incoming unicode characters escaped.  If
-   *ensure_ascii* is ``False``, the output will be a unicode object.
+   If *ensure_ascii* is ``True`` (the default), all non-ASCII characters in the
+   output are escaped with ``\uXXXX`` sequences, and the results are
+   :class:`str` instances consisting of ASCII characters only. If
+   *ensure_ascii* is ``False``, a result may be a :class:`unicode`
+   instance. This usually happens if the input contains unicode strings or the
+   *encoding* parameter is used.
 
    If *check_circular* is ``True`` (the default), then lists, dicts, and custom
    encoded objects will be checked for circular references during encoding to
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -129,11 +129,14 @@
     (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``)
     will be skipped instead of raising a ``TypeError``.
 
-    If ``ensure_ascii`` is false, then the some chunks written to ``fp``
-    may be ``unicode`` instances, subject to normal Python ``str`` to
-    ``unicode`` coercion rules. Unless ``fp.write()`` explicitly
-    understands ``unicode`` (as in ``codecs.getwriter()``) this is likely
-    to cause an error.
+    If ``ensure_ascii`` is true (the default), all non-ASCII characters in the
+    output are escaped with ``\uXXXX`` sequences, and the result is a ``str``
+    instance consisting of ASCII characters only.  If ``ensure_ascii`` is
+    ``False``, some chunks written to ``fp`` may be ``unicode`` instances.
+    This usually happens because the input contains unicode strings or the
+    ``encoding`` parameter is used. Unless ``fp.write()`` explicitly
+    understands ``unicode`` (as in ``codecs.getwriter``) this is likely to
+    cause an error.
 
     If ``check_circular`` is false, then the circular reference check
     for container types will be skipped and a circular reference will
@@ -191,9 +194,8 @@
     (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``)
     will be skipped instead of raising a ``TypeError``.
 
-    If ``ensure_ascii`` is false, then the return value will be a
-    ``unicode`` instance subject to normal Python ``str`` to ``unicode``
-    coercion rules instead of being escaped to an ASCII ``str``.
+    If ``ensure_ascii`` is false, all non-ASCII characters are not escaped, and
+    the return value may be a ``unicode`` instance. See ``dump`` for details.
 
     If ``check_circular`` is false, then the circular reference check
     for container types will be skipped and a circular reference will
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -107,9 +107,12 @@
         encoding of keys that are not str, int, long, float or None.  If
         skipkeys is True, such items are simply skipped.
 
-        If ensure_ascii is true, the output is guaranteed to be str
-        objects with all incoming unicode characters escaped.  If
-        ensure_ascii is false, the output will be unicode object.
+        If *ensure_ascii* is true (the default), all non-ASCII
+        characters in the output are escaped with \uXXXX sequences,
+        and the results are str instances consisting of ASCII
+        characters only.  If ensure_ascii is False, a result may be a
+        unicode instance.  This usually happens if the input contains
+        unicode strings or the *encoding* parameter is used.
 
         If check_circular is true, then lists, dicts, and custom encoded
         objects will be checked for circular references during encoding to
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -393,6 +393,9 @@
 Documentation
 -------------
 
+- Issue #13769: Document the effect of ensure_ascii to the return type
+  of JSON decoding functions.
+
 - Issue #14880: Fix kwargs notation in csv.reader, .writer & .register_dialect.
   Patch by Chris Rebert.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 13:30:46 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Sat,  1 Sep 2012 13:30:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1ODAyOiBGaXgg?=
 =?utf-8?q?test_logic_in_TestMaildir=2Etest=5Fcreate=5Ftmp?=
Message-ID: <3X8FcQ1RDXzQNS@mail.python.org>

http://hg.python.org/cpython/rev/aef4a2ba3210
changeset:   78825:aef4a2ba3210
branch:      3.2
parent:      78821:1b614921aefa
user:        Petri Lehtinen <petri at digip.org>
date:        Sat Sep 01 14:22:36 2012 +0300
summary:
  #15802: Fix test logic in TestMaildir.test_create_tmp

files:
  Lib/test/test_mailbox.py |  10 +++++-----
  Misc/NEWS                |   3 +++
  2 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -759,13 +759,13 @@
             self.assertIsNot(match, None, "Invalid file name: '%s'" % tail)
             groups = match.groups()
             if previous_groups is not None:
-                self.assertTrue(int(groups[0] >= previous_groups[0]),
+                self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]),
                              "Non-monotonic seconds: '%s' before '%s'" %
                              (previous_groups[0], groups[0]))
-                self.assertTrue(int(groups[1] >= previous_groups[1]) or
-                             groups[0] != groups[1],
-                             "Non-monotonic milliseconds: '%s' before '%s'" %
-                             (previous_groups[1], groups[1]))
+                if int(groups[0]) == int(previous_groups[0]):
+                    self.assertGreaterEqual(int(groups[1]), int(previous_groups[1]),
+                                "Non-monotonic milliseconds: '%s' before '%s'" %
+                                (previous_groups[1], groups[1]))
                 self.assertEqual(int(groups[2]), pid,
                              "Process ID mismatch: '%s' should be '%s'" %
                              (groups[2], pid))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -457,6 +457,9 @@
 Tests
 -----
 
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
 - Issue #15747: ZFS always returns EOPNOTSUPP when attempting to set the
   UF_IMMUTABLE flag (via either chflags or lchflags); refactor affected
   tests in test_posix.py to account for this.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 13:30:47 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Sat,  1 Sep 2012 13:30:47 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1ODAyOiBGaXgg?=
 =?utf-8?q?test_logic_in_TestMaildir=2Etest=5Fcreate=5Ftmp?=
Message-ID: <3X8FcR6N30zQQb@mail.python.org>

http://hg.python.org/cpython/rev/2370e331241b
changeset:   78826:2370e331241b
branch:      2.7
parent:      78824:a1884b3027c5
user:        Petri Lehtinen <petri at digip.org>
date:        Sat Sep 01 14:25:48 2012 +0300
summary:
  #15802: Fix test logic in TestMaildir.test_create_tmp

files:
  Lib/test/test_mailbox.py |  10 +++++-----
  Misc/NEWS                |   3 +++
  2 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -660,13 +660,13 @@
             self.assertTrue(match is not None, "Invalid file name: '%s'" % tail)
             groups = match.groups()
             if previous_groups is not None:
-                self.assertTrue(int(groups[0] >= previous_groups[0]),
+                self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]),
                              "Non-monotonic seconds: '%s' before '%s'" %
                              (previous_groups[0], groups[0]))
-                self.assertTrue(int(groups[1] >= previous_groups[1]) or
-                             groups[0] != groups[1],
-                             "Non-monotonic milliseconds: '%s' before '%s'" %
-                             (previous_groups[1], groups[1]))
+                if int(groups[0]) == int(previous_groups[0]):
+                    self.assertGreaterEqual(int(groups[1]), int(previous_groups[1]),
+                                "Non-monotonic milliseconds: '%s' before '%s'" %
+                                (previous_groups[1], groups[1]))
                 self.assertTrue(int(groups[2]) == pid,
                              "Process ID mismatch: '%s' should be '%s'" %
                              (groups[2], pid))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -352,6 +352,9 @@
 Tests
 -----
 
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
 - Issue #15765: Extend a previous fix to Solaris and OpenBSD for quirky
   getcwd() behaviour (issue #9185) to NetBSD as well.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 13:30:49 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Sat,  1 Sep 2012 13:30:49 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_=2315802=3A_Fix_test_logic_in_TestMaildir=2Etest=5Fcreat?=
 =?utf-8?q?e=5Ftmp?=
Message-ID: <3X8FcT2h3WzQP1@mail.python.org>

http://hg.python.org/cpython/rev/e2fec0144bf8
changeset:   78827:e2fec0144bf8
parent:      78822:74f6d87cd471
parent:      78825:aef4a2ba3210
user:        Petri Lehtinen <petri at digip.org>
date:        Sat Sep 01 14:27:24 2012 +0300
summary:
  #15802: Fix test logic in TestMaildir.test_create_tmp

files:
  Lib/test/test_mailbox.py |  10 +++++-----
  Misc/NEWS                |   3 +++
  2 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -763,13 +763,13 @@
             self.assertIsNot(match, None, "Invalid file name: '%s'" % tail)
             groups = match.groups()
             if previous_groups is not None:
-                self.assertTrue(int(groups[0] >= previous_groups[0]),
+                self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]),
                              "Non-monotonic seconds: '%s' before '%s'" %
                              (previous_groups[0], groups[0]))
-                self.assertTrue(int(groups[1] >= previous_groups[1]) or
-                             groups[0] != groups[1],
-                             "Non-monotonic milliseconds: '%s' before '%s'" %
-                             (previous_groups[1], groups[1]))
+                if int(groups[0]) == int(previous_groups[0]):
+                    self.assertGreaterEqual(int(groups[1]), int(previous_groups[1]),
+                                "Non-monotonic milliseconds: '%s' before '%s'" %
+                                (previous_groups[1], groups[1]))
                 self.assertEqual(int(groups[2]), pid,
                              "Process ID mismatch: '%s' should be '%s'" %
                              (groups[2], pid))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@
 Tests
 -----
 
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
 Build
 -----
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 14:27:06 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat,  1 Sep 2012 14:27:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Compile_=5Fdecimal_without?=
 =?utf-8?q?_asserts_and_update_benchmark_results=2E?=
Message-ID: <3X8GsQ1HK3zQQX@mail.python.org>

http://hg.python.org/cpython/rev/259450a161ef
changeset:   78828:259450a161ef
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 01 14:21:22 2012 +0200
summary:
  Compile _decimal without asserts and update benchmark results.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  setup.py             |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1119,7 +1119,7 @@
    +---------+-------------+--------------+-------------+
    |         |  decimal.py |   _decimal   |   speedup   |
    +=========+=============+==============+=============+
-   |   pi    |    38.89s   |    0.38s     |    100x     |
+   |   pi    |    42.02    |    0.345     |    120x     |
    +---------+-------------+--------------+-------------+
    | telco   |   172.19s   |    5.68s     |     30x     |
    +---------+-------------+--------------+-------------+
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1897,7 +1897,7 @@
 
     def _decimal_ext(self):
         extra_compile_args = []
-        undef_macros = ['NDEBUG']
+        undef_macros = []
         if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
             include_dirs = []
             libraries = ['mpdec']

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 14:33:12 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat,  1 Sep 2012 14:33:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_missing_unit=2E?=
Message-ID: <3X8H0S6q4szQMt@mail.python.org>

http://hg.python.org/cpython/rev/d6ebd5d28c76
changeset:   78829:d6ebd5d28c76
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 01 14:27:51 2012 +0200
summary:
  Add missing unit.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1119,7 +1119,7 @@
    +---------+-------------+--------------+-------------+
    |         |  decimal.py |   _decimal   |   speedup   |
    +=========+=============+==============+=============+
-   |   pi    |    42.02    |    0.345     |    120x     |
+   |   pi    |    42.02s   |    0.345s    |    120x     |
    +---------+-------------+--------------+-------------+
    | telco   |   172.19s   |    5.68s     |     30x     |
    +---------+-------------+--------------+-------------+

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 14:40:19 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat,  1 Sep 2012 14:40:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Document?=
 =?utf-8?q?_planned_restrictions_for_memoryview_hashes_in_3=2E3=2E1=2E?=
Message-ID: <3X8H8g2PqgzQNh@mail.python.org>

http://hg.python.org/cpython/rev/895e123d9476
changeset:   78830:895e123d9476
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 01 14:34:45 2012 +0200
summary:
  Issue #15814: Document planned restrictions for memoryview hashes in 3.3.1.

files:
  Doc/library/stdtypes.rst |  24 ++++++++----------------
  1 files changed, 8 insertions(+), 16 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2376,8 +2376,8 @@
       >>> data
       bytearray(b'z1spam')
 
-   Memoryviews of hashable (read-only) types are also hashable. The hash
-   is defined as ``hash(m) == hash(m.tobytes())``::
+   Memoryviews of hashable (read-only) types with formats 'B', 'b' or 'c'
+   are also hashable. The hash is defined as ``hash(m) == hash(m.tobytes())``::
 
       >>> v = memoryview(b'abcefg')
       >>> hash(v) == hash(b'abcefg')
@@ -2387,21 +2387,13 @@
       >>> hash(v[::-2]) == hash(b'abcefg'[::-2])
       True
 
-   Hashing of multi-dimensional objects is supported::
-
-      >>> buf = bytes(list(range(12)))
-      >>> x = memoryview(buf)
-      >>> y = x.cast('B', shape=[2,2,3])
-      >>> x.tolist()
-      [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-      >>> y.tolist()
-      [[[0, 1, 2], [3, 4, 5]], [[6, 7, 8], [9, 10, 11]]]
-      >>> hash(x) == hash(y) == hash(y.tobytes())
-      True
-
    .. versionchanged:: 3.3
-      Memoryview objects are now hashable.
-
+      Memoryview objects with formats 'B', 'b' or 'c' are now hashable.
+
+   .. note::
+      Hashing of memoryviews with formats other than 'B', 'b' or 'c' is
+      possible in version 3.3.0, but will raise an error in 3.3.1 in order
+      to be compatible with the new memoryview equality definition.
 
    :class:`memoryview` has several methods:
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  1 15:08:57 2012
From: python-checkins at python.org (victor.stinner)
Date: Sat,  1 Sep 2012 15:08:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Close_=2314223=3A_Fix_wind?=
 =?utf-8?q?ow=2Eaddch=28curses=2EACS=5FHLINE=29?=
Message-ID: <3X8Hnj38dRzQQK@mail.python.org>

http://hg.python.org/cpython/rev/27b5bd5f0e4c
changeset:   78831:27b5bd5f0e4c
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sat Sep 01 15:00:34 2012 +0200
summary:
  Close #14223: Fix window.addch(curses.ACS_HLINE)

Fix window.addch() of the curses module for special characters like
curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now
calling the C function waddch()/mvwaddch() (as it was done in Python 3.2),
instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still
calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
to libncursesw.

files:
  Misc/NEWS               |   7 +++++
  Modules/_cursesmodule.c |  34 +++++-----------------------
  2 files changed, 14 insertions(+), 27 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,13 @@
   always returning an integer. So it is now possible to distinguish special
   keys like keypad keys.
 
+- Issue #14223: Fix window.addch() of the curses module for special characters
+  like curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now
+  calling the C function waddch()/mvwaddch() (as it was done in Python 3.2),
+  instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still
+  calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
+  to libncursesw.
+
 
 What's New in Python 3.3.0 Release Candidate 1?
 ===============================================
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -280,7 +280,6 @@
 #endif
                           )
 {
-    int ret = 0;
     long value;
 #ifdef HAVE_NCURSESW
     wchar_t buffer[2];
@@ -304,7 +303,6 @@
     }
     else if(PyBytes_Check(obj) && PyBytes_Size(obj) == 1) {
         value = (unsigned char)PyBytes_AsString(obj)[0];
-        ret = 1;
     }
     else if (PyLong_CheckExact(obj)) {
         int overflow;
@@ -314,11 +312,6 @@
                             "int doesn't fit in long");
             return 0;
         }
-#ifdef HAVE_NCURSESW
-        ret = 2;
-#else
-        ret = 1;
-#endif
     }
     else {
         PyErr_Format(PyExc_TypeError,
@@ -326,27 +319,14 @@
                      Py_TYPE(obj)->tp_name);
         return 0;
     }
-#ifdef HAVE_NCURSESW
-    if (ret == 2) {
-        memset(wch->chars, 0, sizeof(wch->chars));
-        wch->chars[0] = (wchar_t)value;
-        if ((long)wch->chars[0] != value) {
-            PyErr_Format(PyExc_OverflowError,
-                         "character doesn't fit in wchar_t");
-            return 0;
-        }
+
+    *ch = (chtype)value;
+    if ((long)*ch != value) {
+        PyErr_Format(PyExc_OverflowError,
+                     "byte doesn't fit in chtype");
+        return 0;
     }
-    else
-#endif
-    {
-        *ch = (chtype)value;
-        if ((long)*ch != value) {
-            PyErr_Format(PyExc_OverflowError,
-                         "byte doesn't fit in chtype");
-            return 0;
-        }
-    }
-    return ret;
+    return 1;
 }
 
 /* Convert an object to a byte string (char*) or a wide character string

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 05:04:46 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 05:04:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Make_super=28=29_internal_?=
 =?utf-8?q?errors_RuntimeError_instead_of_SystemError_=28closes_=2315839?=
 =?utf-8?q?=29?=
Message-ID: <3X8fL65svYzQ8t@mail.python.org>

http://hg.python.org/cpython/rev/e2e4a0a49d2e
changeset:   78832:e2e4a0a49d2e
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Sep 01 23:04:38 2012 -0400
summary:
  Make super() internal errors RuntimeError instead of SystemError (closes #15839)

files:
  Lib/test/test_super.py |  15 +++++++++++++++
  Misc/NEWS              |   2 ++
  Objects/typeobject.c   |  14 +++++++-------
  3 files changed, 24 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
--- a/Lib/test/test_super.py
+++ b/Lib/test/test_super.py
@@ -115,6 +115,21 @@
                 return __class__
         self.assertIs(X.f(), X)
 
+    def test_obscure_super_errors(self):
+        def f():
+            super()
+        self.assertRaises(RuntimeError, f)
+        def f(x):
+            del x
+            super()
+        self.assertRaises(RuntimeError, f, None)
+        class X:
+            def f(x):
+                nonlocal __class__
+                del __class__
+                super()
+        self.assertRaises(RuntimeError, X().f)
+
 
 def test_main():
     support.run_unittest(TestSuper)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
+
 - Issue #15801: Make sure mappings passed to '%' formatting are actually
   subscriptable.
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -6497,18 +6497,18 @@
         PyCodeObject *co = f->f_code;
         Py_ssize_t i, n;
         if (co == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): no code object");
             return -1;
         }
         if (co->co_argcount == 0) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): no arguments");
             return -1;
         }
         obj = f->f_localsplus[0];
         if (obj == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): arg[0] deleted");
             return -1;
         }
@@ -6527,18 +6527,18 @@
                     PyTuple_GET_SIZE(co->co_cellvars) + i;
                 PyObject *cell = f->f_localsplus[index];
                 if (cell == NULL || !PyCell_Check(cell)) {
-                    PyErr_SetString(PyExc_SystemError,
+                    PyErr_SetString(PyExc_RuntimeError,
                       "super(): bad __class__ cell");
                     return -1;
                 }
                 type = (PyTypeObject *) PyCell_GET(cell);
                 if (type == NULL) {
-                    PyErr_SetString(PyExc_SystemError,
+                    PyErr_SetString(PyExc_RuntimeError,
                       "super(): empty __class__ cell");
                     return -1;
                 }
                 if (!PyType_Check(type)) {
-                    PyErr_Format(PyExc_SystemError,
+                    PyErr_Format(PyExc_RuntimeError,
                       "super(): __class__ is not a type (%s)",
                       Py_TYPE(type)->tp_name);
                     return -1;
@@ -6547,7 +6547,7 @@
             }
         }
         if (type == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): __class__ cell not found");
             return -1;
         }

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Sun Sep  2 05:58:19 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 02 Sep 2012 05:58:19 +0200
Subject: [Python-checkins] Daily reference leaks (27b5bd5f0e4c): sum=0
Message-ID: <E1T81KF-0005Cl-LI@ap.vmr.nerim.net>

results for 27b5bd5f0e4c on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog0U4FpJ', '-x']

From python-checkins at python.org  Sun Sep  2 14:57:20 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun,  2 Sep 2012 14:57:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Document?=
 =?utf-8?q?ation=3A_disallow_hashing_of_multi-dimensional_memoryviews=2E?=
Message-ID: <3X8vTr3Hx1zQW7@mail.python.org>

http://hg.python.org/cpython/rev/3b2597c1fe35
changeset:   78833:3b2597c1fe35
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 02 14:50:56 2012 +0200
summary:
  Issue #15814: Documentation: disallow hashing of multi-dimensional memoryviews.

files:
  Doc/library/stdtypes.rst |  14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2376,8 +2376,9 @@
       >>> data
       bytearray(b'z1spam')
 
-   Memoryviews of hashable (read-only) types with formats 'B', 'b' or 'c'
-   are also hashable. The hash is defined as ``hash(m) == hash(m.tobytes())``::
+   One-dimensional memoryviews of hashable (read-only) types with formats
+   'B', 'b' or 'c' are also hashable. The hash is defined as
+   ``hash(m) == hash(m.tobytes())``::
 
       >>> v = memoryview(b'abcefg')
       >>> hash(v) == hash(b'abcefg')
@@ -2388,12 +2389,13 @@
       True
 
    .. versionchanged:: 3.3
-      Memoryview objects with formats 'B', 'b' or 'c' are now hashable.
+      One-dimensional memoryviews with formats 'B', 'b' or 'c' are now hashable.
 
    .. note::
-      Hashing of memoryviews with formats other than 'B', 'b' or 'c' is
-      possible in version 3.3.0, but will raise an error in 3.3.1 in order
-      to be compatible with the new memoryview equality definition.
+      Hashing of memoryviews with formats other than 'B', 'b' or 'c' as well
+      as hashing of multi-dimensional memoryviews is possible in version 3.3.0,
+      but will raise an error in 3.3.1 in order to be compatible with the new
+      memoryview equality definition.
 
    :class:`memoryview` has several methods:
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 18:00:21 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun,  2 Sep 2012 18:00:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_C++-style_comment_=28x?=
	=?utf-8?q?lc_compilation_failure=29?=
Message-ID: <3X8zY15zCmzM7H@mail.python.org>

http://hg.python.org/cpython/rev/db34753bd70e
changeset:   78834:db34753bd70e
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 02 17:56:33 2012 +0200
summary:
  Fix C++-style comment (xlc compilation failure)

files:
  Objects/unicodeobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9146,7 +9146,7 @@
             /* We do not need to compare 0 and len(substring)-1 because
                the if statement above ensured already that they are equal
                when we end up here. */
-            // TODO: honor direction and do a forward or backwards search
+            /* TODO: honor direction and do a forward or backwards search */
             for (i = 1; i < end_sub; ++i) {
                 if (PyUnicode_READ(kind_self, data_self, offset + i) !=
                     PyUnicode_READ(kind_sub, data_sub, i))

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 20:25:25 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 20:25:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_prevert_ast_er?=
 =?utf-8?q?rors_from_being_normalized_before_ast=5Ferror=5Ffinish_is_calle?=
 =?utf-8?q?d?=
Message-ID: <3X92mP5mdMzQLW@mail.python.org>

http://hg.python.org/cpython/rev/0db75a55145a
changeset:   78835:0db75a55145a
branch:      3.2
parent:      78825:aef4a2ba3210
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 14:23:15 2012 -0400
summary:
  prevert ast errors from being normalized before ast_error_finish is called (closes #15846)

files:
  Lib/test/test_ast.py |  6 ++++++
  Misc/NEWS            |  3 +++
  Python/ast.c         |  8 ++++++++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -386,6 +386,12 @@
         b = compile('foo(1 + 1)', '<unknown>', 'exec', ast.PyCF_ONLY_AST)
         self.assertEqual(ast.dump(a), ast.dump(b))
 
+    def test_parse_in_error(self):
+        try:
+            1/0
+        except Exception:
+            self.assertRaises(SyntaxError, ast.parse, r"'\U'")
+
     def test_dump(self):
         node = ast.parse('spam(eggs, "and cheese")')
         self.assertEqual(ast.dump(node),
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15846: Fix SystemError which happened when using ast.parse in an
+  exception handler on code with syntax errors.
+
 - Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X.
 
 - Issue #15801: Make sure mappings passed to '%' formatting are actually
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -92,7 +92,15 @@
     PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
     if (!u)
         return 0;
+    /*
+     * Prevent the error from being chained. PyErr_SetObject will normalize the
+     * exception in order to chain it. ast_error_finish, however, requires the
+     * error not to be normalized.
+     */
+    PyObject *save = PyThreadState_GET()->exc_value;
+    PyThreadState_GET()->exc_value = NULL;
     PyErr_SetObject(PyExc_SyntaxError, u);
+    PyThreadState_GET()->exc_value = save;
     Py_DECREF(u);
     return 0;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 20:25:27 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 20:25:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogbWVyZ2UgMy4yICgjMTU4NDYp?=
Message-ID: <3X92mR2XJrzQ1g@mail.python.org>

http://hg.python.org/cpython/rev/d61424122af5
changeset:   78836:d61424122af5
parent:      78833:3b2597c1fe35
parent:      78835:0db75a55145a
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 14:24:44 2012 -0400
summary:
  merge 3.2 (#15846)

files:
  Lib/test/test_ast.py |  6 ++++++
  Misc/NEWS            |  3 +++
  Python/ast.c         |  8 ++++++++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -407,6 +407,12 @@
         b = compile('foo(1 + 1)', '<unknown>', 'exec', ast.PyCF_ONLY_AST)
         self.assertEqual(ast.dump(a), ast.dump(b))
 
+    def test_parse_in_error(self):
+        try:
+            1/0
+        except Exception:
+            self.assertRaises(SyntaxError, ast.parse, r"'\U'")
+
     def test_dump(self):
         node = ast.parse('spam(eggs, "and cheese")')
         self.assertEqual(ast.dump(node),
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 
+- Issue #15846: Fix SystemError which happened when using ast.parse in an
+  exception handler on code with syntax errors.
+
 - Issue #15801: Make sure mappings passed to '%' formatting are actually
   subscriptable.
 
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -588,7 +588,15 @@
     PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
     if (!u)
         return 0;
+    /*
+     * Prevent the error from being chained. PyErr_SetObject will normalize the
+     * exception in order to chain it. ast_error_finish, however, requires the
+     * error not to be normalized.
+     */
+    PyObject *save = PyThreadState_GET()->exc_value;
+    PyThreadState_GET()->exc_value = NULL;
     PyErr_SetObject(PyExc_SyntaxError, u);
+    PyThreadState_GET()->exc_value = save;
     Py_DECREF(u);
     return 0;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 20:25:29 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 20:25:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3X92mT2b2LzNhM@mail.python.org>

http://hg.python.org/cpython/rev/a2294412d214
changeset:   78837:a2294412d214
parent:      78836:d61424122af5
parent:      78834:db34753bd70e
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 14:25:18 2012 -0400
summary:
  merge heads

files:
  Objects/unicodeobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -9146,7 +9146,7 @@
             /* We do not need to compare 0 and len(substring)-1 because
                the if statement above ensured already that they are equal
                when we end up here. */
-            // TODO: honor direction and do a forward or backwards search
+            /* TODO: honor direction and do a forward or backwards search */
             for (i = 1; i < end_sub; ++i) {
                 if (PyUnicode_READ(kind_self, data_self, offset + i) !=
                     PyUnicode_READ(kind_sub, data_sub, i))

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 20:38:20 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 20:38:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_move_variable_?=
 =?utf-8?q?decl_to_the_top_of_the_function?=
Message-ID: <3X933J1q7rzQVX@mail.python.org>

http://hg.python.org/cpython/rev/a5e28f9924c3
changeset:   78838:a5e28f9924c3
branch:      3.2
parent:      78835:0db75a55145a
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 14:38:08 2012 -0400
summary:
  move variable decl to the top of the function

files:
  Python/ast.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -89,7 +89,7 @@
 static int
 ast_error(const node *n, const char *errstr)
 {
-    PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
+    PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset), *save;
     if (!u)
         return 0;
     /*
@@ -97,7 +97,7 @@
      * exception in order to chain it. ast_error_finish, however, requires the
      * error not to be normalized.
      */
-    PyObject *save = PyThreadState_GET()->exc_value;
+    save = PyThreadState_GET()->exc_value;
     PyThreadState_GET()->exc_value = NULL;
     PyErr_SetObject(PyExc_SyntaxError, u);
     PyThreadState_GET()->exc_value = save;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 20:38:21 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 20:38:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4y?=
Message-ID: <3X933K5XwKzQWR@mail.python.org>

http://hg.python.org/cpython/rev/f96df022f124
changeset:   78839:f96df022f124
parent:      78837:a2294412d214
parent:      78838:a5e28f9924c3
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 14:38:15 2012 -0400
summary:
  merge 3.2

files:
  Python/ast.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -585,7 +585,7 @@
 static int
 ast_error(const node *n, const char *errstr)
 {
-    PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
+    PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset), *save;
     if (!u)
         return 0;
     /*
@@ -593,7 +593,7 @@
      * exception in order to chain it. ast_error_finish, however, requires the
      * error not to be normalized.
      */
-    PyObject *save = PyThreadState_GET()->exc_value;
+    save = PyThreadState_GET()->exc_value;
     PyThreadState_GET()->exc_value = NULL;
     PyErr_SetObject(PyExc_SyntaxError, u);
     PyThreadState_GET()->exc_value = save;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 21:05:04 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 21:05:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_get_rid_of_ast=5Ferror=5Ff?=
 =?utf-8?q?inish_by_passing_the_compiling_struct_to_ast=5Ferror?=
Message-ID: <3X93f8541lzQPN@mail.python.org>

http://hg.python.org/cpython/rev/58de275e9224
changeset:   78840:58de275e9224
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 15:04:51 2012 -0400
summary:
  get rid of ast_error_finish by passing the compiling struct to ast_error

files:
  Lib/test/test_ast.py |    4 +-
  Python/ast.c         |  190 +++++++++++-------------------
  2 files changed, 75 insertions(+), 119 deletions(-)


diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -411,7 +411,9 @@
         try:
             1/0
         except Exception:
-            self.assertRaises(SyntaxError, ast.parse, r"'\U'")
+            with self.assertRaises(SyntaxError) as e:
+                ast.literal_eval(r"'\U'")
+            self.assertIsNotNone(e.exception.__context__)
 
     def test_dump(self):
         node = ast.parse('spam(eggs, "and cheese")')
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -574,87 +574,43 @@
 
 #define NEW_IDENTIFIER(n) new_identifier(STR(n), c)
 
-/* This routine provides an invalid object for the syntax error.
-   The outermost routine must unpack this error and create the
-   proper object.  We do this so that we don't have to pass
-   the filename to everything function.
-
-   XXX Maybe we should just pass the filename...
-*/
-
 static int
-ast_error(const node *n, const char *errstr)
+ast_error(struct compiling *c, const node *n, const char *errmsg)
 {
-    PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset), *save;
-    if (!u)
-        return 0;
-    /*
-     * Prevent the error from being chained. PyErr_SetObject will normalize the
-     * exception in order to chain it. ast_error_finish, however, requires the
-     * error not to be normalized.
-     */
-    save = PyThreadState_GET()->exc_value;
-    PyThreadState_GET()->exc_value = NULL;
-    PyErr_SetObject(PyExc_SyntaxError, u);
-    PyThreadState_GET()->exc_value = save;
-    Py_DECREF(u);
-    return 0;
-}
-
-static void
-ast_error_finish(const char *filename)
-{
-    PyObject *type, *value, *tback, *errstr, *offset, *loc, *tmp;
+    PyObject *value, *errstr, *loc, *tmp;
     PyObject *filename_obj;
-    long lineno;
-
-    assert(PyErr_Occurred());
-    if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
-        return;
-
-    PyErr_Fetch(&type, &value, &tback);
-    errstr = PyTuple_GetItem(value, 0);
-    if (!errstr)
-        return;
-    Py_INCREF(errstr);
-    lineno = PyLong_AsLong(PyTuple_GetItem(value, 1));
-    if (lineno == -1) {
-        Py_DECREF(errstr);
-        return;
-    }
-    offset = PyTuple_GetItem(value, 2);
-    if (!offset) {
-        Py_DECREF(errstr);
-        return;
-    }
-    Py_DECREF(value);
-
-    loc = PyErr_ProgramText(filename, lineno);
+
+    loc = PyErr_ProgramText(c->c_filename, LINENO(n));
     if (!loc) {
         Py_INCREF(Py_None);
         loc = Py_None;
     }
-    if (filename != NULL)
-        filename_obj = PyUnicode_DecodeFSDefault(filename);
-    else {
+    if (c->c_filename) {
+        filename_obj = PyUnicode_DecodeFSDefault(c->c_filename);
+        if (!filename_obj) {
+            Py_DECREF(loc);
+            return 0;
+        }
+    } else {
         Py_INCREF(Py_None);
         filename_obj = Py_None;
     }
-    if (filename_obj != NULL)
-        tmp = Py_BuildValue("(NlOO)", filename_obj, lineno, offset, loc);
-    else
-        tmp = NULL;
-    Py_DECREF(loc);
-    if (!tmp) {
-        Py_DECREF(errstr);
-        return;
+    tmp = Py_BuildValue("(NiiN)", filename_obj, LINENO(n), n->n_col_offset, loc);
+    if (!tmp)
+        return 0;
+    errstr = PyUnicode_FromString(errmsg);
+    if (!errstr) {
+        Py_DECREF(tmp);
+        return 0;
     }
     value = PyTuple_Pack(2, errstr, tmp);
     Py_DECREF(errstr);
     Py_DECREF(tmp);
-    if (!value)
-        return;
-    PyErr_Restore(type, value, tback);
+    if (value) {
+        PyErr_SetObject(PyExc_SyntaxError, value);
+        Py_DECREF(value);
+    }
+    return 0;
 }
 
 /* num_stmts() returns number of contained statements.
@@ -732,11 +688,14 @@
     struct compiling c;
     mod_ty res = NULL;
 
+    c.c_arena = arena;
+    c.c_filename = filename;
+    c.c_normalize = c.c_normalize_args = NULL;
     if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
         c.c_encoding = "utf-8";
         if (TYPE(n) == encoding_decl) {
 #if 0
-            ast_error(n, "encoding declaration in Unicode string");
+            ast_error(c, n, "encoding declaration in Unicode string");
             goto out;
 #endif
             n = CHILD(n, 0);
@@ -748,9 +707,6 @@
         /* PEP 3120 */
         c.c_encoding = "utf-8";
     }
-    c.c_arena = arena;
-    c.c_filename = filename;
-    c.c_normalize = c.c_normalize_args = NULL;
 
     k = 0;
     switch (TYPE(n)) {
@@ -843,8 +799,6 @@
         PyTuple_SET_ITEM(c.c_normalize_args, 1, NULL);
         Py_DECREF(c.c_normalize_args);
     }
-    if (!res)
-        ast_error_finish(filename);
     return res;
 }
 
@@ -890,18 +844,18 @@
 };
 
 static int
-forbidden_name(identifier name, const node *n, int full_checks)
+forbidden_name(struct compiling *c, identifier name, const node *n, int full_checks)
 {
     assert(PyUnicode_Check(name));
     if (PyUnicode_CompareWithASCIIString(name, "__debug__") == 0) {
-        ast_error(n, "assignment to keyword");
+        ast_error(c, n, "assignment to keyword");
         return 1;
     }
     if (full_checks) {
         const char **p;
         for (p = FORBIDDEN; *p; p++) {
             if (PyUnicode_CompareWithASCIIString(name, *p) == 0) {
-                ast_error(n, "assignment to keyword");
+                ast_error(c, n, "assignment to keyword");
                 return 1;
             }
         }
@@ -937,7 +891,7 @@
     switch (e->kind) {
         case Attribute_kind:
             e->v.Attribute.ctx = ctx;
-            if (ctx == Store && forbidden_name(e->v.Attribute.attr, n, 1))
+            if (ctx == Store && forbidden_name(c, e->v.Attribute.attr, n, 1))
                 return 0;
             break;
         case Subscript_kind:
@@ -950,7 +904,7 @@
             break;
         case Name_kind:
             if (ctx == Store) {
-                if (forbidden_name(e->v.Name.id, n, 1))
+                if (forbidden_name(c, e->v.Name.id, n, 1))
                     return 0; /* forbidden_name() calls ast_error() */
             }
             e->v.Name.ctx = ctx;
@@ -1024,7 +978,7 @@
                       "can't %s %s",
                       ctx == Store ? "assign to" : "delete",
                       expr_name);
-        return ast_error(n, buf);
+        return ast_error(c, n, buf);
     }
 
     /* If the LHS is a list or tuple, we need to set the assignment
@@ -1172,7 +1126,7 @@
     name = NEW_IDENTIFIER(ch);
     if (!name)
         return NULL;
-    if (forbidden_name(name, ch, 0))
+    if (forbidden_name(c, name, ch, 0))
         return NULL;
 
     if (NCH(n) == 3 && TYPE(CHILD(n, 1)) == COLON) {
@@ -1202,7 +1156,7 @@
     int j = 0; /* index for kwdefaults and kwonlyargs */
 
     if (kwonlyargs == NULL) {
-        ast_error(CHILD(n, start), "named arguments must follow bare *");
+        ast_error(c, CHILD(n, start), "named arguments must follow bare *");
         return -1;
     }
     assert(kwdefaults != NULL);
@@ -1234,7 +1188,7 @@
                 argname = NEW_IDENTIFIER(ch);
                 if (!argname)
                     goto error;
-                if (forbidden_name(argname, ch, 0))
+                if (forbidden_name(c, argname, ch, 0))
                     goto error;
                 arg = arg(argname, annotation, c->c_arena);
                 if (!arg)
@@ -1245,7 +1199,7 @@
             case DOUBLESTAR:
                 return i;
             default:
-                ast_error(ch, "unexpected node");
+                ast_error(c, ch, "unexpected node");
                 goto error;
         }
     }
@@ -1337,7 +1291,7 @@
         return NULL;
 
     if (nposargs + nkwonlyargs > 255) {
-        ast_error(n, "more than 255 arguments");
+        ast_error(c, n, "more than 255 arguments");
         return NULL;
     }
 
@@ -1365,7 +1319,7 @@
                     found_default = 1;
                 }
                 else if (found_default) {
-                    ast_error(n,
+                    ast_error(c, n,
                              "non-default argument follows default argument");
                     return NULL;
                 }
@@ -1377,7 +1331,7 @@
                 break;
             case STAR:
                 if (i+1 >= NCH(n)) {
-                    ast_error(CHILD(n, i),
+                    ast_error(c, CHILD(n, i),
                         "named arguments must follow bare *");
                     return NULL;
                 }
@@ -1394,7 +1348,7 @@
                     vararg = NEW_IDENTIFIER(CHILD(ch, 0));
                     if (!vararg)
                         return NULL;
-                    if (forbidden_name(vararg, CHILD(ch, 0), 0))
+                    if (forbidden_name(c, vararg, CHILD(ch, 0), 0))
                         return NULL;
                     if (NCH(ch) > 1) {
                         /* there is an annotation on the vararg */
@@ -1425,7 +1379,7 @@
                     if (!kwargannotation)
                         return NULL;
                 }
-                if (forbidden_name(kwarg, CHILD(ch, 0), 0))
+                if (forbidden_name(c, kwarg, CHILD(ch, 0), 0))
                     return NULL;
                 i += 3;
                 break;
@@ -1544,7 +1498,7 @@
     name = NEW_IDENTIFIER(CHILD(n, name_i));
     if (!name)
         return NULL;
-    if (forbidden_name(name, CHILD(n, name_i), 0))
+    if (forbidden_name(c, name, CHILD(n, name_i), 0))
         return NULL;
     args = ast_for_arguments(c, CHILD(n, name_i + 1));
     if (!args)
@@ -1885,10 +1839,10 @@
                     char buf[128];
                     s = _PyUnicode_AsString(errstr);
                     PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
-                    ast_error(n, buf);
+                    ast_error(c, n, buf);
                     Py_DECREF(errstr);
                 } else {
-                    ast_error(n, "(unicode error) unknown error");
+                    ast_error(c, n, "(unicode error) unknown error");
                 }
                 Py_DECREF(type);
                 Py_DECREF(value);
@@ -2473,14 +2427,14 @@
         }
     }
     if (ngens > 1 || (ngens && (nargs || nkeywords))) {
-        ast_error(n, "Generator expression must be parenthesized "
+        ast_error(c, n, "Generator expression must be parenthesized "
                   "if not sole argument");
         return NULL;
     }
 
     if (nargs + nkeywords + ngens > 255) {
-      ast_error(n, "more than 255 arguments");
-      return NULL;
+        ast_error(c, n, "more than 255 arguments");
+        return NULL;
     }
 
     args = asdl_seq_new(nargs + ngens, c->c_arena);
@@ -2497,12 +2451,12 @@
             expr_ty e;
             if (NCH(ch) == 1) {
                 if (nkeywords) {
-                    ast_error(CHILD(ch, 0),
+                    ast_error(c, CHILD(ch, 0),
                               "non-keyword arg after keyword arg");
                     return NULL;
                 }
                 if (vararg) {
-                    ast_error(CHILD(ch, 0),
+                    ast_error(c, CHILD(ch, 0),
                               "only named arguments may follow *expression");
                     return NULL;
                 }
@@ -2532,19 +2486,19 @@
                  * then is very confusing.
                  */
                 if (e->kind == Lambda_kind) {
-                    ast_error(CHILD(ch, 0), "lambda cannot contain assignment");
+                    ast_error(c, CHILD(ch, 0), "lambda cannot contain assignment");
                     return NULL;
                 } else if (e->kind != Name_kind) {
-                    ast_error(CHILD(ch, 0), "keyword can't be an expression");
+                    ast_error(c, CHILD(ch, 0), "keyword can't be an expression");
                     return NULL;
-                } else if (forbidden_name(e->v.Name.id, ch, 1)) {
+                } else if (forbidden_name(c, e->v.Name.id, ch, 1)) {
                     return NULL;
                 }
                 key = e->v.Name.id;
                 for (k = 0; k < nkeywords; k++) {
                     tmp = ((keyword_ty)asdl_seq_GET(keywords, k))->arg;
                     if (!PyUnicode_Compare(tmp, key)) {
-                        ast_error(CHILD(ch, 0), "keyword argument repeated");
+                        ast_error(c, CHILD(ch, 0), "keyword argument repeated");
                         return NULL;
                     }
                 }
@@ -2637,7 +2591,7 @@
             case Subscript_kind:
                 break;
             default:
-                ast_error(ch, "illegal expression for augmented assignment");
+                ast_error(c, ch, "illegal expression for augmented assignment");
                 return NULL;
         }
 
@@ -2670,7 +2624,7 @@
             expr_ty e;
             node *ch = CHILD(n, i);
             if (TYPE(ch) == yield_expr) {
-                ast_error(ch, "assignment to yield expression not possible");
+                ast_error(c, ch, "assignment to yield expression not possible");
                 return NULL;
             }
             e = ast_for_testlist(c, ch);
@@ -2817,11 +2771,11 @@
                 str = NEW_IDENTIFIER(str_node);
                 if (!str)
                     return NULL;
-                if (store && forbidden_name(str, str_node, 0))
+                if (store && forbidden_name(c, str, str_node, 0))
                     return NULL;
             }
             else {
-                if (forbidden_name(name, name_node, 0))
+                if (forbidden_name(c, name, name_node, 0))
                     return NULL;
             }
             return alias(name, str, c->c_arena);
@@ -2840,7 +2794,7 @@
                 a->asname = NEW_IDENTIFIER(asname_node);
                 if (!a->asname)
                     return NULL;
-                if (forbidden_name(a->asname, asname_node, 0))
+                if (forbidden_name(c, a->asname, asname_node, 0))
                     return NULL;
                 return a;
             }
@@ -2851,7 +2805,7 @@
                 name = NEW_IDENTIFIER(name_node);
                 if (!name)
                     return NULL;
-                if (store && forbidden_name(name, name_node, 0))
+                if (store && forbidden_name(c, name, name_node, 0))
                     return NULL;
                 return alias(name, NULL, c->c_arena);
             }
@@ -2980,13 +2934,13 @@
             n = CHILD(n, idx);
             n_children = NCH(n);
             if (n_children % 2 == 0) {
-                ast_error(n, "trailing comma not allowed without"
+                ast_error(c, n, "trailing comma not allowed without"
                              " surrounding parentheses");
                 return NULL;
             }
             break;
         default:
-            ast_error(n, "Unexpected node-type in from-import");
+            ast_error(c, n, "Unexpected node-type in from-import");
             return NULL;
         }
 
@@ -3392,7 +3346,7 @@
         identifier e = NEW_IDENTIFIER(CHILD(exc, 3));
         if (!e)
             return NULL;
-        if (forbidden_name(e, CHILD(exc, 3), 0))
+        if (forbidden_name(c, e, CHILD(exc, 3), 0))
             return NULL;
         expression = ast_for_expr(c, CHILD(exc, 1));
         if (!expression)
@@ -3451,7 +3405,7 @@
         }
     }
     else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
-        ast_error(n, "malformed 'try' statement");
+        ast_error(c, n, "malformed 'try' statement");
         return NULL;
     }
 
@@ -3543,7 +3497,7 @@
         classname = NEW_IDENTIFIER(CHILD(n, 1));
         if (!classname)
             return NULL;
-        if (forbidden_name(classname, CHILD(n, 3), 0))
+        if (forbidden_name(c, classname, CHILD(n, 3), 0))
             return NULL;
         return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
                         LINENO(n), n->n_col_offset, c->c_arena);
@@ -3556,7 +3510,7 @@
         classname = NEW_IDENTIFIER(CHILD(n, 1));
         if (!classname)
             return NULL;
-        if (forbidden_name(classname, CHILD(n, 3), 0))
+        if (forbidden_name(c, classname, CHILD(n, 3), 0))
             return NULL;
         return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
                         LINENO(n), n->n_col_offset, c->c_arena);
@@ -3581,7 +3535,7 @@
     classname = NEW_IDENTIFIER(CHILD(n, 1));
     if (!classname)
         return NULL;
-    if (forbidden_name(classname, CHILD(n, 1), 0))
+    if (forbidden_name(c, classname, CHILD(n, 1), 0))
         return NULL;
 
     return ClassDef(classname, call->v.Call.args, call->v.Call.keywords,
@@ -3840,10 +3794,10 @@
     }
     if (*bytesmode) {
         /* Disallow non-ascii characters (but not escapes) */
-        const char *c;
-        for (c = s; *c; c++) {
-            if (Py_CHARMASK(*c) >= 0x80) {
-                ast_error(n, "bytes can only contain ASCII "
+        const char *ch;
+        for (ch = s; *ch; ch++) {
+            if (Py_CHARMASK(*ch) >= 0x80) {
+                ast_error(c, n, "bytes can only contain ASCII "
                           "literal characters.");
                 return NULL;
             }
@@ -3891,7 +3845,7 @@
             if (s == NULL)
                 goto onError;
             if (*bytesmode != subbm) {
-                ast_error(n, "cannot mix bytes and nonbytes literals");
+                ast_error(c, n, "cannot mix bytes and nonbytes literals");
                 goto onError;
             }
             if (PyBytes_Check(v) && PyBytes_Check(s)) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 22:37:17 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 22:37:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_put_*_in_the_n?=
	=?utf-8?q?ormal_place?=
Message-ID: <3X95hY4T0JzQCP@mail.python.org>

http://hg.python.org/cpython/rev/0c6a09b982d8
changeset:   78841:0c6a09b982d8
branch:      3.2
parent:      78838:a5e28f9924c3
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 16:36:01 2012 -0400
summary:
  put * in the normal place

files:
  Python/ast.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -47,9 +47,9 @@
 #define COMP_SETCOMP  2
 
 static identifier
-new_identifier(const char* n, PyArena *arena)
+new_identifier(const char *n, PyArena *arena)
 {
-    PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
+    PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
     Py_UNICODE *u;
     if (!id)
         return NULL;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  2 22:37:19 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sun,  2 Sep 2012 22:37:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4y?=
Message-ID: <3X95hb1pDBzQDt@mail.python.org>

http://hg.python.org/cpython/rev/8ff2f4634ed8
changeset:   78842:8ff2f4634ed8
parent:      78840:58de275e9224
parent:      78841:0c6a09b982d8
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 02 16:37:09 2012 -0400
summary:
  merge 3.2

files:
  Python/ast.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -545,9 +545,9 @@
 }
 
 static identifier
-new_identifier(const char* n, struct compiling *c)
+new_identifier(const char *n, struct compiling *c)
 {
-    PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
+    PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
     if (!id)
         return NULL;
     /* PyUnicode_DecodeUTF8 should always return a ready string. */

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Mon Sep  3 06:03:07 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 03 Sep 2012 06:03:07 +0200
Subject: [Python-checkins] Daily reference leaks (8ff2f4634ed8): sum=0
Message-ID: <E1T8NsR-0004x0-Ss@ap.vmr.nerim.net>

results for 8ff2f4634ed8 on branch "default"
--------------------------------------------

test_support leaked [-1, 1, 0] references, sum=0


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogpRmYOX', '-x']

From python-checkins at python.org  Mon Sep  3 13:19:36 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  3 Sep 2012 13:19:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Explicitly_recast_this_propos?=
 =?utf-8?q?al_as_a_new_kind_of_decorator_clause?=
Message-ID: <3X9TGc4mpxzQJm@mail.python.org>

http://hg.python.org/peps/rev/ba7a581514d0
changeset:   4503:ba7a581514d0
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Sep 03 21:19:27 2012 +1000
summary:
  Explicitly recast this proposal as a new kind of decorator clause

files:
  pep-0403.txt |  129 ++++++++++++++++++++++++++------------
  1 files changed, 88 insertions(+), 41 deletions(-)


diff --git a/pep-0403.txt b/pep-0403.txt
--- a/pep-0403.txt
+++ b/pep-0403.txt
@@ -1,5 +1,5 @@
 PEP: 403
-Title: Statement local functions and classes
+Title: General purpose decorator clause
 Version: $Revision$
 Last-Modified: $Date$
 Author: Nick Coghlan <ncoghlan at gmail.com>
@@ -15,17 +15,18 @@
 Abstract
 ========
 
-This PEP proposes the addition of a new ``in`` statement that accepts a
-statement local function or class definition.
+This PEP proposes the addition of a new ``@in`` decorator clause that makes
+it possible to override the name binding step of a function or class
+definition.
 
-The statement accepts a single simple statement that can make a forward
-reference to a trailing function or class definition.
+The new clause accepts a single simple statement that can make a forward
+reference to decorated function or class definition.
 
-This new statement is designed to be used whenever a "one-shot" function or
+This new clause is designed to be used whenever a "one-shot" function or
 class is needed, and placing the function or class definition before the
 statement that uses it actually makes the code harder to read. It also
 avoids any name shadowing concerns by making sure the new name is visible
-only to the statement in the ``in`` clause.
+only to the statement in the ``@in`` clause.
 
 This PEP is based heavily on many of the ideas in PEP 3150 (Statement Local
 Namespaces) so some elements of the rationale will be familiar to readers of
@@ -41,7 +42,7 @@
 
 As a trivial example, a weakref callback could be defined as follows::
 
-    in x = weakref.ref(target, report_destruction)
+    @in x = weakref.ref(target, report_destruction)
     def report_destruction(obj):
         print("{} is being destroyed".format(obj))
 
@@ -59,7 +60,7 @@
 If the repetition of the name seems especially annoying, then a throwaway
 name like ``f`` can be used instead::
 
-    in x = weakref.ref(target, f)
+    @in x = weakref.ref(target, f)
     def f(obj):
         print("{} is being destroyed".format(obj))
 
@@ -67,7 +68,7 @@
 Similarly, a sorted operation on a particularly poorly defined type could
 now be defined as::
 
-    in sorted_list = sorted(original, key=f)
+    @in sorted_list = sorted(original, key=f)
     def f(item):
         try:
             return item.calc_sort_order()
@@ -86,7 +87,7 @@
 
 And early binding semantics in a list comprehension could be attained via::
 
-    in funcs = [adder(i) for i in range(10)]
+    @in funcs = [adder(i) for i in range(10)]
     def adder(i):
         return lambda x: x + i
 
@@ -94,34 +95,50 @@
 Proposal
 ========
 
-This PEP proposes the addition of a new ``in`` statement that is a variant
-of the existing class and function definition syntax.
+This PEP proposes the addition of a new ``@in`` clause that is a variant
+of the existing class and function decorator syntax.
 
-The new ``in`` clause replaces the decorator lines, and allows forward
+The new ``@in`` clause precedes the decorator lines, and allows forward
 references to the trailing function or class definition.
 
 The trailing function or class definition is always named - the name of
 the trailing definition is then used to make the forward reference from the
-preceding statement.
+``@in`` clause.
 
-The ``in`` clause is allowed to contain any simple statement (including those
-that don't make any sense in that context, such as ``pass`` - while such code
-would be legal, there wouldn't be any point in writing it). This permissive
-structure is easier to define and easier to explain, but a more restrictive
-approach that only permits operations that "make sense" would also be
-possible (see PEP 3150 for a list of possible candidates).
+The ``@in`` clause is allowed to contain any simple statement (including
+those that don't make any sense in that context, such as ``pass`` - while
+such code would be legal, there wouldn't be any point in writing it). This
+permissive structure is easier to define and easier to explain, but a more
+restrictive approach that only permits operations that "make sense" would
+also be possible (see PEP 3150 for a list of possible candidates).
 
-The ``in`` statement will not create a new scope - all name binding
+The ``@in`` clause will not create a new scope - all name binding
 operations aside from the trailing function or class definition will affect
 the containing scope.
 
 The name used in the trailing function or class definition is only visible
-from the associated ``in`` clause, and behaves as if it was an ordinary
+from the associated ``@in`` clause, and behaves as if it was an ordinary
 variable defined in that scope. If any nested scopes are created in either
-the ``in`` clause or the trailing function or class definition, those scopes
+the ``@in`` clause or the trailing function or class definition, those scopes
 will see the trailing function or class definition rather than any other
 bindings for that name in the containing scope.
 
+In a very real sense, this proposal is about making it possible to override
+the implicit "name = <defined function or class>" name binding operation
+that is part of every function or class definition, specifically in those
+cases where the local name binding isn't actually needed.
+
+Under this PEP, an ordinary class or function definition::
+
+    def name():
+        ...
+
+would be equivalent to::
+
+    @in name = name
+    def name():
+        ...
+
 
 Background
 ==========
@@ -147,7 +164,7 @@
   * comprehensions, generator expressions, map(), filter()
   * key arguments to sorted(), min(), max()
   * partial function application
-  * provision of callbacks (e.g. for weak references)
+  * provision of callbacks (e.g. for weak references or aysnchronous IO)
   * array broadcast operations in NumPy
 
 However, adopting Ruby's block syntax directly won't work for Python, since
@@ -197,6 +214,11 @@
 The ``in`` keyword was chosen as an existing keyword that can be used to
 denote the concept of a forward reference.
 
+The ``@`` prefix was included in order to exploit the fact that Python
+programmers are already used to decorator syntax as an indication of
+out of order execution, where the function or class is actually defined
+*first* and then decorators are applied in reverse order.
+
 For functions, the construct is intended to be read as "in <this statement
 that references NAME> define NAME as a function that does <operation>".
 
@@ -231,9 +253,9 @@
 Syntax Change
 =============
 
-New::
+Syntactically, only one new grammar rule is needed::
 
-    in_stmt: 'in' simple_stmt (classdef|funcdef)
+    in_stmt: '@in' simple_stmt decorated
 
 Grammar: http://hg.python.org/cpython/file/default/Grammar/Grammar
 
@@ -244,10 +266,10 @@
 This proposal has at least one titanic advantage over PEP 3150:
 implementation should be relatively straightforward.
 
-The AST for the ``in`` statement will include both the function or class
-definition and the statement that references it, so it should just be a
-matter of emitting the two operations out of order and using a hidden
-variable to link up any references.
+The ``@in`` clause will be included in the AST for the associated function or
+class definition and the statement that references it. When the ``@in``
+clause is present, it will be emitted in place of the local name binding
+operation normally implied by a function or class definition.
 
 The one potentially tricky part is changing the meaning of the references to
 the statement local function or namespace while within the scope of the
@@ -268,7 +290,7 @@
   del _createenviron
 
   # Becomes:
-  in environ = _createenviron()
+  @in environ = _createenviron()
   def _createenviron():
       ... # 27 line function
 
@@ -278,25 +300,45 @@
   funcs = [(lambda x, i=i: x + i) for i in range(10)]
 
   # Becomes:
-  in funcs = [adder(i) for i in range(10)]
+  @in funcs = [adder(i) for i in range(10)]
   def adder(i):
-    return lambda x: x + i
+      return lambda x: x + i
 
   # Or even:
-  in funcs = [adder(i) for i in range(10)]
+  @in funcs = [adder(i) for i in range(10)]
   def adder(i):
-    in return incr
-    def incr(x):
-        return x + i
+      @in return incr
+      def incr(x):
+          return x + i
 
 A trailing class can be used as a statement local namespace::
 
   # Evaluate subexpressions only once
-  in c = math.sqrt(x.a*x.a + x.b*x.b)
+  @in c = math.sqrt(x.a*x.a + x.b*x.b)
   class x:
-    a = calculate_a()
-    b = calculate_b()
+      a = calculate_a()
+      b = calculate_b()
 
+A function can be bound directly to a location which isn't a valid
+identifier::
+
+   @in dispatch[MyClass] = f
+   def f():
+       ...
+
+Constructs that verge on decorator abuse can be eliminated::
+
+   # Current Python
+   @call
+   def f():
+       ...
+
+   # Becomes:
+   @in f()
+   def f():
+       ...
+
+   
 
 Reference Implementation
 ========================
@@ -335,6 +377,11 @@
     a = calculate_a()
     b = calculate_b()
 
+Another past alternative omitted the ``@`` prefix. However, without that
+prefix, the bare ``in`` keyword didn't associate the clause strongly
+enough with the subsequent function or class definition. Reusing the
+decorator prefix and explicitly characterising the new construct as a kind
+of decorator clause should address that problem.
 
 References
 ==========

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Mon Sep  3 13:33:26 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  3 Sep 2012 13:33:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Don=27t_have_quite_so_many_to?=
	=?utf-8?q?p_level_headings?=
Message-ID: <3X9TZZ01C1zPpX@mail.python.org>

http://hg.python.org/peps/rev/4ad4bea85935
changeset:   4504:4ad4bea85935
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Sep 03 21:33:16 2012 +1000
summary:
  Don't have quite so many top level headings

files:
  pep-0403.txt |  37 ++++++++++++++++++++-----------------
  1 files changed, 20 insertions(+), 17 deletions(-)


diff --git a/pep-0403.txt b/pep-0403.txt
--- a/pep-0403.txt
+++ b/pep-0403.txt
@@ -139,9 +139,21 @@
     def name():
         ...
 
+Syntax Change
+-------------
+
+Syntactically, only one new grammar rule is needed::
+
+    in_stmt: '@in' simple_stmt decorated
+
+Grammar: http://hg.python.org/cpython/file/default/Grammar/Grammar
+
+
+Design Discussion
+=================
 
 Background
-==========
+----------
 
 The question of "multi-line lambdas" has been a vexing one for many
 Python users for a very long time, and it took an exploration of Ruby's
@@ -185,7 +197,7 @@
 
 
 Relation to PEP 3150
-====================
+--------------------
 
 PEP 3150 (Statement Local Namespaces) described its primary motivation
 as being to elevate ordinary assignment statements to be on par with ``class``
@@ -203,7 +215,7 @@
 
 
 Keyword Choice
-==============
+--------------
 
 The proposal definitely requires *some* kind of prefix to avoid parsing
 ambiguity and backwards compatibility problems with existing constructs.
@@ -227,13 +239,14 @@
 
 
 Better Debugging Support for Functions and Classes with Short Names
-===================================================================
+-------------------------------------------------------------------
 
 One of the objections to widespread use of lambda expressions is that they
 have a negative effect on traceback intelligibility and other aspects of
-introspection. Similarly objections are raised regarding constructs that
+introspection. Similar objections are raised regarding constructs that
 promote short, cryptic function names (including this one, which requires
-that the name of the trailing definition be supplied at least twice)
+that the name of the trailing definition be supplied at least twice,
+encouraging the use of shorthand placeholder names like ``f``).
 
 However, the introduction of qualified names in PEP 3155 means that even
 anonymous classes and functions will now have different representations if
@@ -250,18 +263,8 @@
 still a major improvement over the historical situation where everything
 *except* the object ID was identical.
 
-Syntax Change
-=============
-
-Syntactically, only one new grammar rule is needed::
-
-    in_stmt: '@in' simple_stmt decorated
-
-Grammar: http://hg.python.org/cpython/file/default/Grammar/Grammar
-
-
 Possible Implementation Strategy
-================================
+--------------------------------
 
 This proposal has at least one titanic advantage over PEP 3150:
 implementation should be relatively straightforward.

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Mon Sep  3 13:46:44 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  3 Sep 2012 13:46:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Add_NEWS?=
 =?utf-8?q?_entry_regarding_intended_memoryview_hashing_restrictions?=
Message-ID: <3X9Tsw6RTdzQJg@mail.python.org>

http://hg.python.org/cpython/rev/c9c9d890400c
changeset:   78843:c9c9d890400c
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Sep 03 21:46:33 2012 +1000
summary:
  Issue #15814: Add NEWS entry regarding intended memoryview hashing restrictions

files:
  Misc/NEWS |  8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,14 @@
   calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
   to libncursesw.
 
+Documentation
+-------------
+
+- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted
+  the hashing of multi-dimensional memorviews and memoryviews with multi-byte
+  item formats. The intended restrictions have now been documented - they
+  will be correctly enforced in 3.3.1
+
 
 What's New in Python 3.3.0 Release Candidate 1?
 ===============================================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 14:09:40 2012
From: python-checkins at python.org (nick.coghlan)
Date: Mon,  3 Sep 2012 14:09:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Tweak_the_equivalence_example?=
 =?utf-8?q?=2C_explain_why_a_nested_suite_is_a_bad_idea?=
Message-ID: <3X9VNN4TQYzQJ6@mail.python.org>

http://hg.python.org/peps/rev/9f8c31db2b19
changeset:   4505:9f8c31db2b19
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Sep 03 22:09:30 2012 +1000
summary:
  Tweak the equivalence example, explain why a nested suite is a bad idea

files:
  pep-0403.txt |  27 +++++++++++++++++++++++++--
  1 files changed, 25 insertions(+), 2 deletions(-)


diff --git a/pep-0403.txt b/pep-0403.txt
--- a/pep-0403.txt
+++ b/pep-0403.txt
@@ -130,12 +130,14 @@
 
 Under this PEP, an ordinary class or function definition::
 
+    @deco2
+    @deco1
     def name():
         ...
 
-would be equivalent to::
+can be explained as being roughly equivalent to::
 
-    @in name = name
+    @in name = deco2(deco1(name))
     def name():
         ...
 
@@ -214,6 +216,27 @@
 actual name binding in the current scope.
 
 
+Why not a nested suite?
+-----------------------
+
+The problem with using a full nested suite is best described by reviewing
+PEP 3150. It's ridiculously hard to implement properly, and creates way
+too many situations where there are two ways to do it (almost any construct
+that can be expressed with ordinary imperative code could instead be
+expressed using a given statement).
+
+By contrast, the decorator inspired syntax explicitly limits the new
+feature to cases where it should actually improve readability, rather than
+harming it. As in the case of the original introduction of decorators, the
+idea of this new syntax is that if it *can* be used (i.e. the local name
+binding of the function is completely unnecessary) then it *should* be used.
+
+While a non-decorator based alternative could be considered (e.g. a nested
+"suite" that actually allowed only a single class or function definition),
+it seems excessive to introduce a completely new concept when it is
+possible to use a variant of the existing decorator syntax instead.
+
+
 Keyword Choice
 --------------
 

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Mon Sep  3 18:53:27 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon,  3 Sep 2012 18:53:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1NTA5OiBJZiAl?=
 =?utf-8?q?action_substitution_produces_a_null_string=2C_drop_it=2E?=
Message-ID: <3X9cgq4bfDzQGg@mail.python.org>

http://hg.python.org/cpython/rev/6768aa70c2d3
changeset:   78844:6768aa70c2d3
branch:      3.2
parent:      78841:0c6a09b982d8
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 03 12:30:12 2012 -0400
summary:
  #15509: If %action substitution produces a null string, drop it.

Patch by Anton Barkovsky, comment addition by me.

This showed up as a bug in 3.3 because the definition for Chrome
produced such an empty string.  This fix is tested in 3.3+;
backporting the new test suite is more trouble than it is worth.

files:
  Lib/webbrowser.py |  11 +++++++++--
  Misc/NEWS         |   3 +++
  2 files changed, 12 insertions(+), 2 deletions(-)


diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -206,12 +206,18 @@
     """Parent class for all Unix browsers with remote functionality."""
 
     raise_opts = None
+    background = False
+    redirect_stdout = True
+    # In remote_args, %s will be replaced with the requested URL.  %action will
+    # be replaced depending on the value of 'new' passed to open.
+    # remote_action is used for new=0 (open).  If newwin is not None, it is
+    # used for new=1 (open_new).  If newtab is not None, it is used for
+    # new=3 (open_new_tab).  After both substitutions are made, any empty
+    # strings in the transformed remote_args list will be removed.
     remote_args = ['%action', '%s']
     remote_action = None
     remote_action_newwin = None
     remote_action_newtab = None
-    background = False
-    redirect_stdout = True
 
     def _invoke(self, args, remote, autoraise):
         raise_opt = []
@@ -267,6 +273,7 @@
 
         args = [arg.replace("%s", url).replace("%action", action)
                 for arg in self.remote_args]
+        args = [arg for arg in args if arg]
         success = self._invoke(args, True, autoraise)
         if not success:
             # remote invocation failed, try straight way
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -115,6 +115,9 @@
 Library
 -------
 
+- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
+  Popen when %action substitutions produce empty strings.
+
 - Issue #12776,#11839: call argparse type function (specified by add_argument)
   only once. Before, the type function was called twice in the case where the
   default was specified and the argument was given as well.  This was

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 18:53:29 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon,  3 Sep 2012 18:53:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2315509=3A_If_=25action_substitution_produces_a_n?=
 =?utf-8?q?ull_string=2C_drop_it=2E?=
Message-ID: <3X9cgs3nn6zQGt@mail.python.org>

http://hg.python.org/cpython/rev/323ca2f0e382
changeset:   78845:323ca2f0e382
parent:      78843:c9c9d890400c
parent:      78844:6768aa70c2d3
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 03 12:37:59 2012 -0400
summary:
  Merge #15509: If %action substitution produces a null string, drop it.

Patch by Anton Barkovsky, comment addition by me.

This shows up as a bug in 3.3 because the definition for Chrome
produces such an empty string.  Tests will follow.

files:
  Lib/webbrowser.py |  11 +++++++++--
  Misc/NEWS         |   3 +++
  2 files changed, 12 insertions(+), 2 deletions(-)


diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -206,12 +206,18 @@
     """Parent class for all Unix browsers with remote functionality."""
 
     raise_opts = None
+    background = False
+    redirect_stdout = True
+    # In remote_args, %s will be replaced with the requested URL.  %action will
+    # be replaced depending on the value of 'new' passed to open.
+    # remote_action is used for new=0 (open).  If newwin is not None, it is
+    # used for new=1 (open_new).  If newtab is not None, it is used for
+    # new=3 (open_new_tab).  After both substitutions are made, any empty
+    # strings in the transformed remote_args list will be removed.
     remote_args = ['%action', '%s']
     remote_action = None
     remote_action_newwin = None
     remote_action_newtab = None
-    background = False
-    redirect_stdout = True
 
     def _invoke(self, args, remote, autoraise):
         raise_opt = []
@@ -264,6 +270,7 @@
 
         args = [arg.replace("%s", url).replace("%action", action)
                 for arg in self.remote_args]
+        args = [arg for arg in args if arg]
         success = self._invoke(args, True, autoraise)
         if not success:
             # remote invocation failed, try straight way
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,9 @@
 Library
 -------
 
+- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
+  Popen when %action substitutions produce empty strings.
+
 - Issue #12776,#11839: call argparse type function (specified by add_argument)
   only once. Before, the type function was called twice in the case where the
   default was specified and the argument was given as well.  This was

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 18:53:30 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon,  3 Sep 2012 18:53:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2315447=3A_Use_subprocess?=
 =?utf-8?q?=2EDEVNULL_in_webbrowser=2C_instead_of_opening?=
Message-ID: <3X9cgt74VszQJD@mail.python.org>

http://hg.python.org/cpython/rev/901c790e4417
changeset:   78846:901c790e4417
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 03 12:44:29 2012 -0400
summary:
  #15447: Use subprocess.DEVNULL in webbrowser, instead of opening

This eliminates a ResourceWarning, since before webbrowser was
explicitly opening os.devnull and then leaving it open.  Tests
to follow.

Patch by Anton Barkovsky.

files:
  Lib/webbrowser.py |  4 ++--
  Misc/NEWS         |  3 +++
  2 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -230,7 +230,7 @@
         cmdline = [self.name] + raise_opt + args
 
         if remote or self.background:
-            inout = io.open(os.devnull, "r+")
+            inout = subprocess.DEVNULL
         else:
             # for TTY browsers, we need stdin/out
             inout = None
@@ -354,7 +354,7 @@
         else:
             action = "openURL"
 
-        devnull = io.open(os.devnull, "r+")
+        devnull = subprocess.DEVNULL
         # if possible, put browser in separate process group, so
         # keyboard interrupts don't affect browser as well as Python
         setsid = getattr(os, 'setsid', None)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,9 @@
 Library
 -------
 
+- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
+  os.devnull explicitly and leaving it open.
+
 - Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
   Popen when %action substitutions produce empty strings.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 18:53:32 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon,  3 Sep 2012 18:53:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbjogIzE1NTU3LCMxNTQ0NywjMTU1?=
 =?utf-8?q?09=3A_webbrowser_test_suite_added=2E?=
Message-ID: <3X9cgw4F6JzQGn@mail.python.org>

http://hg.python.org/cpython/rev/5da3b2df38b3
changeset:   78847:5da3b2df38b3
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 03 12:52:08 2012 -0400
summary:
  #15557,#15447,#15509: webbrowser test suite added.

Initial patch by Anton Barkovsky, refined a bit by me to further subdivide the
test methods.  Provides tests for the previous two bug fix commits.

files:
  Lib/test/test_webbrowser.py |  192 ++++++++++++++++++++++++
  Misc/NEWS                   |    3 +
  2 files changed, 195 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/test_webbrowser.py
@@ -0,0 +1,192 @@
+import webbrowser
+import unittest
+import subprocess
+from unittest import mock
+from test import support
+
+
+URL = 'http://www.example.com'
+CMD_NAME = 'test'
+
+
+class PopenMock(mock.MagicMock):
+
+    def poll(self):
+        return 0
+
+    def wait(self, seconds=None):
+        return 0
+
+
+class CommandTestMixin:
+
+    def _test(self, meth, *, args=[URL], kw={}, options, arguments):
+        """Given a web browser instance method name along with arguments and
+        keywords for same (which defaults to the single argument URL), creates
+        a browser instance from the class pointed to by self.browser, calls the
+        indicated instance method with the indicated arguments, and compares
+        the resulting options and arguments passed to Popen by the browser
+        instance against the 'options' and 'args' lists.  Options are compared
+        in a position independent fashion, and the arguments are compared in
+        sequence order to whatever is left over after removing the options.
+
+        """
+        popen = PopenMock()
+        support.patch(self, subprocess, 'Popen', popen)
+        browser = self.browser_class(name=CMD_NAME)
+        getattr(browser, meth)(*args, **kw)
+        popen_args = subprocess.Popen.call_args[0][0]
+        self.assertEqual(popen_args[0], CMD_NAME)
+        popen_args.pop(0)
+        for option in options:
+            self.assertIn(option, popen_args)
+            popen_args.pop(popen_args.index(option))
+        self.assertEqual(popen_args, arguments)
+
+
+class GenericBrowserCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.GenericBrowser
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+
+class BackgroundBrowserCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.BackgroundBrowser
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+
+class ChromeCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Chrome
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['--new-window'],
+                   arguments=[URL])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=[],
+                   arguments=[URL])
+
+
+class MozillaCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Mozilla
+
+    def test_open(self):
+        self._test('open',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-noraise', '-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({},new-tab)'.format(URL)])
+
+
+class GaleonCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Galeon
+
+    def test_open(self):
+        self._test('open',
+                   options=['-n'],
+                   arguments=[URL])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-noraise', '-n'],
+                   arguments=[URL])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-w'],
+                   arguments=[URL])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-w'],
+                   arguments=[URL])
+
+
+class OperaCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Opera
+
+    def test_open(self):
+        self._test('open',
+                   options=['-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-remote', '-noraise'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new_tab',
+                   options=['-remote'],
+                   arguments=['openURL({},new-page)'.format(URL)])
+
+
+class ELinksCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Elinks
+
+    def test_open(self):
+        self._test('open', options=['-remote'],
+                           arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open',
+                   options=['-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-remote'],
+                   arguments=['openURL({},new-tab)'.format(URL)])
+
+
+if __name__=='__main__':
+    unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,9 @@
 - Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
   by Serhiy Storchaka.
 
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
 Build
 -----
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 22:29:40 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Mon,  3 Sep 2012 22:29:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODU1?=
 =?utf-8?q?=3A_added_docstrings_for_memoryview_methods_and_data_descriptor?=
 =?utf-8?q?s=2E?=
Message-ID: <3X9jTJ4JNgzQHh@mail.python.org>

http://hg.python.org/cpython/rev/c49f89261d65
changeset:   78848:c49f89261d65
branch:      3.2
parent:      78844:6768aa70c2d3
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Mon Sep 03 16:29:11 2012 -0400
summary:
  Issue #15855: added docstrings for memoryview methods and data descriptors.

files:
  Objects/memoryobject.c |  54 +++++++++++++++++++++++------
  1 files changed, 43 insertions(+), 11 deletions(-)


diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -402,14 +402,33 @@
     return PyLong_FromLong(self->view.ndim);
 }
 
-static PyGetSetDef memory_getsetlist[] ={
-    {"format",                (getter)memory_format_get,      NULL, NULL},
-    {"itemsize",        (getter)memory_itemsize_get,    NULL, NULL},
-    {"shape",           (getter)memory_shape_get,       NULL, NULL},
-    {"strides",         (getter)memory_strides_get,     NULL, NULL},
-    {"suboffsets",      (getter)memory_suboffsets_get,  NULL, NULL},
-    {"readonly",        (getter)memory_readonly_get,    NULL, NULL},
-    {"ndim",            (getter)memory_ndim_get,        NULL, NULL},
+PyDoc_STRVAR(memory_format_doc,
+             "A string containing the format (in struct module style)\n"
+             " for each element in the view.");
+PyDoc_STRVAR(memory_itemsize_doc,
+             "The size in bytes of each element of the memoryview.");
+PyDoc_STRVAR(memory_shape_doc,
+             "A tuple of ndim integers giving the shape of the memory\n"
+             " as an N-dimensional array.");
+PyDoc_STRVAR(memory_strides_doc,
+             "A tuple of ndim integers giving the size in bytes to access\n"
+             " each element for each dimension of the array.");
+PyDoc_STRVAR(memory_suboffsets_doc,
+             "A tuple of integers used internally for PIL-style arrays.");
+PyDoc_STRVAR(memory_readonly_doc,
+             "A bool indicating whether the memory is read only.");
+PyDoc_STRVAR(memory_ndim_doc,
+             "An integer indicating how many dimensions of a multi-dimensional\n"
+             " array the memory represents.");
+
+static PyGetSetDef memory_getsetlist[] = {
+    {"format",          (getter)memory_format_get,      NULL, memory_format_doc},
+    {"itemsize",        (getter)memory_itemsize_get,    NULL, memory_itemsize_doc},
+    {"shape",           (getter)memory_shape_get,       NULL, memory_shape_doc},
+    {"strides",         (getter)memory_strides_get,     NULL, memory_strides_doc},
+    {"suboffsets",      (getter)memory_suboffsets_get,  NULL, memory_suboffsets_doc},
+    {"readonly",        (getter)memory_readonly_get,    NULL, memory_readonly_doc},
+    {"ndim",            (getter)memory_ndim_get,        NULL, memory_ndim_doc},
     {NULL, NULL, NULL, NULL},
 };
 
@@ -485,10 +504,23 @@
     Py_RETURN_NONE;
 }
 
+PyDoc_STRVAR(memory_release_doc,
+"M.release() -> None\n\
+\n\
+Release the underlying buffer exposed by the memoryview object.");
+PyDoc_STRVAR(memory_tobytes_doc,
+"M.tobytes() -> bytes\n\
+\n\
+Return the data in the buffer as a byte string.");
+PyDoc_STRVAR(memory_tolist_doc,
+"M.tolist() -> list\n\
+\n\
+Return the data in the buffer as a list of elements.");
+
 static PyMethodDef memory_methods[] = {
-    {"release", memory_exit, METH_NOARGS},
-    {"tobytes", (PyCFunction)memory_tobytes, METH_NOARGS, NULL},
-    {"tolist", (PyCFunction)memory_tolist, METH_NOARGS, NULL},
+    {"release", memory_exit, METH_NOARGS, memory_release_doc},
+    {"tobytes", (PyCFunction)memory_tobytes, METH_NOARGS, memory_tobytes_doc},
+    {"tolist", (PyCFunction)memory_tolist, METH_NOARGS, memory_tolist_doc},
     {"__enter__", memory_enter, METH_NOARGS},
     {"__exit__", memory_exit, METH_VARARGS},
     {NULL,          NULL}           /* sentinel */

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 22:44:10 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Mon,  3 Sep 2012 22:44:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315855=3A_added_docstrings_for_memoryview_method?=
 =?utf-8?q?s_and_data_descriptors?=
Message-ID: <3X9jp20tg5zNWX@mail.python.org>

http://hg.python.org/cpython/rev/16a69ccff5ce
changeset:   78849:16a69ccff5ce
parent:      78847:5da3b2df38b3
parent:      78848:c49f89261d65
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Mon Sep 03 16:43:55 2012 -0400
summary:
  Issue #15855: added docstrings for memoryview methods and data descriptors (merge 3.2).

files:
  Objects/memoryobject.c |  51 ++++++++++++++++++++++++-----
  1 files changed, 41 insertions(+), 10 deletions(-)


diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2861,27 +2861,58 @@
     return PyBool_FromLong(MV_ANY_CONTIGUOUS(self->flags));
 }
 
+PyDoc_STRVAR(memory_format_doc,
+             "A string containing the format (in struct module style)\n"
+             " for each element in the view.");
+PyDoc_STRVAR(memory_itemsize_doc,
+             "The size in bytes of each element of the memoryview.");
+PyDoc_STRVAR(memory_shape_doc,
+             "A tuple of ndim integers giving the shape of the memory\n"
+             " as an N-dimensional array.");
+PyDoc_STRVAR(memory_strides_doc,
+             "A tuple of ndim integers giving the size in bytes to access\n"
+             " each element for each dimension of the array.");
+PyDoc_STRVAR(memory_suboffsets_doc,
+             "A tuple of integers used internally for PIL-style arrays.");
+PyDoc_STRVAR(memory_readonly_doc,
+             "A bool indicating whether the memory is read only.");
+PyDoc_STRVAR(memory_ndim_doc,
+             "An integer indicating how many dimensions of a multi-dimensional\n"
+             " array the memory represents.");
+
 static PyGetSetDef memory_getsetlist[] = {
     {"obj",             (getter)memory_obj_get,        NULL, NULL},
     {"nbytes",          (getter)memory_nbytes_get,     NULL, NULL},
-    {"readonly",        (getter)memory_readonly_get,   NULL, NULL},
-    {"itemsize",        (getter)memory_itemsize_get,   NULL, NULL},
-    {"format",          (getter)memory_format_get,     NULL, NULL},
-    {"ndim",            (getter)memory_ndim_get,       NULL, NULL},
-    {"shape",           (getter)memory_shape_get,      NULL, NULL},
-    {"strides",         (getter)memory_strides_get,    NULL, NULL},
-    {"suboffsets",      (getter)memory_suboffsets_get, NULL, NULL},
+    {"readonly",        (getter)memory_readonly_get,   NULL, memory_readonly_doc},
+    {"itemsize",        (getter)memory_itemsize_get,   NULL, memory_itemsize_doc},
+    {"format",          (getter)memory_format_get,     NULL, memory_format_doc},
+    {"ndim",            (getter)memory_ndim_get,       NULL, memory_ndim_doc},
+    {"shape",           (getter)memory_shape_get,      NULL, memory_shape_doc},
+    {"strides",         (getter)memory_strides_get,    NULL, memory_strides_doc},
+    {"suboffsets",      (getter)memory_suboffsets_get, NULL, memory_suboffsets_doc},
     {"c_contiguous",    (getter)memory_c_contiguous,   NULL, NULL},
     {"f_contiguous",    (getter)memory_f_contiguous,   NULL, NULL},
     {"contiguous",      (getter)memory_contiguous,     NULL, NULL},
     {NULL, NULL, NULL, NULL},
 };
 
+PyDoc_STRVAR(memory_release_doc,
+"M.release() -> None\n\
+\n\
+Release the underlying buffer exposed by the memoryview object.");
+PyDoc_STRVAR(memory_tobytes_doc,
+"M.tobytes() -> bytes\n\
+\n\
+Return the data in the buffer as a byte string.");
+PyDoc_STRVAR(memory_tolist_doc,
+"M.tolist() -> list\n\
+\n\
+Return the data in the buffer as a list of elements.");
 
 static PyMethodDef memory_methods[] = {
-    {"release",     (PyCFunction)memory_release, METH_NOARGS, NULL},
-    {"tobytes",     (PyCFunction)memory_tobytes, METH_NOARGS, NULL},
-    {"tolist",      (PyCFunction)memory_tolist, METH_NOARGS, NULL},
+    {"release",     (PyCFunction)memory_release, METH_NOARGS, memory_release_doc},
+    {"tobytes",     (PyCFunction)memory_tobytes, METH_NOARGS, memory_tobytes_doc},
+    {"tolist",      (PyCFunction)memory_tolist, METH_NOARGS, memory_tolist_doc},
     {"cast",        (PyCFunction)memory_cast, METH_VARARGS|METH_KEYWORDS, NULL},
     {"__enter__",   memory_enter, METH_NOARGS, NULL},
     {"__exit__",    memory_exit, METH_VARARGS, NULL},

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 22:51:11 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Mon,  3 Sep 2012 22:51:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315855=3A_added_do?=
 =?utf-8?q?cstrings_for_memoryview_methods_and_data_descriptors_new?=
Message-ID: <3X9jy751B1zNk2@mail.python.org>

http://hg.python.org/cpython/rev/ba2c1def3710
changeset:   78850:ba2c1def3710
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Mon Sep 03 16:51:01 2012 -0400
summary:
  Issue #15855: added docstrings for memoryview methods and data descriptors new in 3.3.

files:
  Objects/memoryobject.c |  41 ++++++++++++++++++++---------
  1 files changed, 28 insertions(+), 13 deletions(-)


diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2861,11 +2861,21 @@
     return PyBool_FromLong(MV_ANY_CONTIGUOUS(self->flags));
 }
 
+PyDoc_STRVAR(memory_obj_doc,
+             "The underlying object of the memoryview.");
+PyDoc_STRVAR(memory_nbytes_doc,
+             "The amount of space in bytes that the array would use in\n"
+             " a contiguous representation.");
+PyDoc_STRVAR(memory_readonly_doc,
+             "A bool indicating whether the memory is read only.");
+PyDoc_STRVAR(memory_itemsize_doc,
+             "The size in bytes of each element of the memoryview.");
 PyDoc_STRVAR(memory_format_doc,
              "A string containing the format (in struct module style)\n"
              " for each element in the view.");
-PyDoc_STRVAR(memory_itemsize_doc,
-             "The size in bytes of each element of the memoryview.");
+PyDoc_STRVAR(memory_ndim_doc,
+             "An integer indicating how many dimensions of a multi-dimensional\n"
+             " array the memory represents.");
 PyDoc_STRVAR(memory_shape_doc,
              "A tuple of ndim integers giving the shape of the memory\n"
              " as an N-dimensional array.");
@@ -2874,15 +2884,16 @@
              " each element for each dimension of the array.");
 PyDoc_STRVAR(memory_suboffsets_doc,
              "A tuple of integers used internally for PIL-style arrays.");
-PyDoc_STRVAR(memory_readonly_doc,
-             "A bool indicating whether the memory is read only.");
-PyDoc_STRVAR(memory_ndim_doc,
-             "An integer indicating how many dimensions of a multi-dimensional\n"
-             " array the memory represents.");
+PyDoc_STRVAR(memory_c_contiguous_doc,
+             "A bool indicating whether the memory is C contiguous.");
+PyDoc_STRVAR(memory_f_contiguous_doc,
+             "A bool indicating whether the memory is Fortran contiguous.");
+PyDoc_STRVAR(memory_contiguous_doc,
+             "A bool indicating whether the memory is contiguous.");
 
 static PyGetSetDef memory_getsetlist[] = {
-    {"obj",             (getter)memory_obj_get,        NULL, NULL},
-    {"nbytes",          (getter)memory_nbytes_get,     NULL, NULL},
+    {"obj",             (getter)memory_obj_get,        NULL, memory_obj_doc},
+    {"nbytes",          (getter)memory_nbytes_get,     NULL, memory_nbytes_doc},
     {"readonly",        (getter)memory_readonly_get,   NULL, memory_readonly_doc},
     {"itemsize",        (getter)memory_itemsize_get,   NULL, memory_itemsize_doc},
     {"format",          (getter)memory_format_get,     NULL, memory_format_doc},
@@ -2890,9 +2901,9 @@
     {"shape",           (getter)memory_shape_get,      NULL, memory_shape_doc},
     {"strides",         (getter)memory_strides_get,    NULL, memory_strides_doc},
     {"suboffsets",      (getter)memory_suboffsets_get, NULL, memory_suboffsets_doc},
-    {"c_contiguous",    (getter)memory_c_contiguous,   NULL, NULL},
-    {"f_contiguous",    (getter)memory_f_contiguous,   NULL, NULL},
-    {"contiguous",      (getter)memory_contiguous,     NULL, NULL},
+    {"c_contiguous",    (getter)memory_c_contiguous,   NULL, memory_c_contiguous_doc},
+    {"f_contiguous",    (getter)memory_f_contiguous,   NULL, memory_f_contiguous_doc},
+    {"contiguous",      (getter)memory_contiguous,     NULL, memory_contiguous_doc},
     {NULL, NULL, NULL, NULL},
 };
 
@@ -2908,12 +2919,16 @@
 "M.tolist() -> list\n\
 \n\
 Return the data in the buffer as a list of elements.");
+PyDoc_STRVAR(memory_cast_doc,
+"M.cast(format[, shape]) -> memoryview\n\
+\n\
+Cast a memoryview to a new format or shape.");
 
 static PyMethodDef memory_methods[] = {
     {"release",     (PyCFunction)memory_release, METH_NOARGS, memory_release_doc},
     {"tobytes",     (PyCFunction)memory_tobytes, METH_NOARGS, memory_tobytes_doc},
     {"tolist",      (PyCFunction)memory_tolist, METH_NOARGS, memory_tolist_doc},
-    {"cast",        (PyCFunction)memory_cast, METH_VARARGS|METH_KEYWORDS, NULL},
+    {"cast",        (PyCFunction)memory_cast, METH_VARARGS|METH_KEYWORDS, memory_cast_doc},
     {"__enter__",   memory_enter, METH_NOARGS, NULL},
     {"__exit__",    memory_exit, METH_VARARGS, NULL},
     {NULL,          NULL}

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep  3 23:29:33 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Mon,  3 Sep 2012 23:29:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315855=3A_updated_?=
	=?utf-8?q?related_manual_entries=2E?=
Message-ID: <3X9kpP6S19zQFy@mail.python.org>

http://hg.python.org/cpython/rev/82ae284cd5f1
changeset:   78851:82ae284cd5f1
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Mon Sep 03 17:29:22 2012 -0400
summary:
  Issue #15855: updated related manual entries.

files:
  Doc/library/stdtypes.rst |  8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2687,13 +2687,19 @@
    .. attribute:: shape
 
       A tuple of integers the length of :attr:`ndim` giving the shape of the
-      memory as a N-dimensional array.
+      memory as an N-dimensional array.
+
+      .. versionchanged:: 3.3
+         An empty tuple instead of None when ndim = 0.
 
    .. attribute:: strides
 
       A tuple of integers the length of :attr:`ndim` giving the size in bytes to
       access each element for each dimension of the array.
 
+      .. versionchanged:: 3.3
+         An empty tuple instead of None when ndim = 0.
+
    .. attribute:: suboffsets
 
       Used internally for PIL-style arrays. The value is informational only.

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Tue Sep  4 05:57:27 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 04 Sep 2012 05:57:27 +0200
Subject: [Python-checkins] Daily reference leaks (82ae284cd5f1): sum=0
Message-ID: <E1T8kGV-0004oa-Fr@ap.vmr.nerim.net>

results for 82ae284cd5f1 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogJ__EYf', '-x']

From python-checkins at python.org  Tue Sep  4 13:33:51 2012
From: python-checkins at python.org (nick.coghlan)
Date: Tue,  4 Sep 2012 13:33:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Expand_the_discussion_of_nest?=
	=?utf-8?q?ed_suite_variants?=
Message-ID: <3XB5Xb2ClDzQDV@mail.python.org>

http://hg.python.org/peps/rev/5377635cedcd
changeset:   4506:5377635cedcd
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Tue Sep 04 21:33:39 2012 +1000
summary:
  Expand the discussion of nested suite variants

files:
  pep-0403.txt |  167 +++++++++++++++++++++++++++++++-------
  1 files changed, 137 insertions(+), 30 deletions(-)


diff --git a/pep-0403.txt b/pep-0403.txt
--- a/pep-0403.txt
+++ b/pep-0403.txt
@@ -216,27 +216,6 @@
 actual name binding in the current scope.
 
 
-Why not a nested suite?
------------------------
-
-The problem with using a full nested suite is best described by reviewing
-PEP 3150. It's ridiculously hard to implement properly, and creates way
-too many situations where there are two ways to do it (almost any construct
-that can be expressed with ordinary imperative code could instead be
-expressed using a given statement).
-
-By contrast, the decorator inspired syntax explicitly limits the new
-feature to cases where it should actually improve readability, rather than
-harming it. As in the case of the original introduction of decorators, the
-idea of this new syntax is that if it *can* be used (i.e. the local name
-binding of the function is completely unnecessary) then it *should* be used.
-
-While a non-decorator based alternative could be considered (e.g. a nested
-"suite" that actually allowed only a single class or function definition),
-it seems excessive to introduce a completely new concept when it is
-possible to use a variant of the existing decorator syntax instead.
-
-
 Keyword Choice
 --------------
 
@@ -300,7 +279,9 @@
 The one potentially tricky part is changing the meaning of the references to
 the statement local function or namespace while within the scope of the
 ``in`` statement, but that shouldn't be too hard to address by maintaining
-some additional state within the compiler.
+some additional state within the compiler (it's much easier to handle this
+for a single name than it is for an unknown number of names in a full
+nested suite).
 
 
 More Examples
@@ -383,9 +364,32 @@
 Rejected Concepts
 =================
 
-A previous incarnation of this PEP (see [1]) proposed a much uglier syntax
-that (quite rightly) was not well received. The current proposal is
-significantly easier both to read and write.
+To avoid retreading previously covered ground, some rejected alternatives
+are documented in this section.
+
+
+Omitting the decorator prefix character
+---------------------------------------
+
+Earlier versions of this proposal omitted the ``@`` prefix. However, without
+that prefix, the bare ``in`` keyword didn't associate the clause strongly
+enough with the subsequent function or class definition. Reusing the
+decorator prefix and explicitly characterising the new construct as a kind
+of decorator clause is intended to help users link the two concepts and
+see them as two variants of the same idea.
+
+
+Anonymous Forward References
+----------------------------
+
+A previous incarnation of this PEP (see [1]) proposed a syntax where the
+new clause was introduced with ``:`` and the forward reference was written
+using ``@``. Feedback on this variant was almost universally
+negative, as it was considered both ugly and excessively magical::
+
+    :x = weakref.ref(target, @)
+    def report_destruction(obj):
+        print("{} is being destroyed".format(obj))
 
 A more recent variant always used ``...`` for forward references, along
 with genuinely anonymous function and class definitions. However, this
@@ -403,11 +407,114 @@
     a = calculate_a()
     b = calculate_b()
 
-Another past alternative omitted the ``@`` prefix. However, without that
-prefix, the bare ``in`` keyword didn't associate the clause strongly
-enough with the subsequent function or class definition. Reusing the
-decorator prefix and explicitly characterising the new construct as a kind
-of decorator clause should address that problem.
+
+Using a nested suite
+--------------------
+
+The problems with using a full nested suite are best described in
+PEP 3150. It's comparatively difficult to implement properly, the scoping
+semantics are hard to explain and it creates quite a few situations where
+there are two ways to do it without clear guidelines for choosing between
+them (as almost any construct that can be expressed with ordinary imperative
+code could instead be expressed using a given statement). While the PEP did
+propose some new PEP 8 guidelines to help address that last problem, the
+difficulties in implementation and explanation are not so easily dealt with.
+
+By contrast, the decorator inspired syntax in this PEP explicitly limits the
+new feature to cases where it should actually improve readability, rather
+than harming it. As in the case of the original introduction of decorators,
+the idea of this new syntax is that if it *can* be used (i.e. the local name
+binding of the function is completely unnecessary) then it *should* be used.
+
+Another possible variant of this idea is to keep the decorator based
+*semantics* of this PEP, while adopting the prettier syntax from PEP 3150::
+
+    x = weakref.ref(target, report_destruction) given:
+        def report_destruction(obj):
+            print("{} is being destroyed".format(obj))
+
+There are a couple of problems with this approach. The main issue is that
+this syntax variant uses something that looks like a suite, but really isn't
+one. A secondary concern is that it's not clear how the compiler will know
+which name(s) in the leading expression are forward references (although
+that could potentially be addressed through a suitable definition of the
+suite-that-is-not-a-suite in the languge grammar).
+
+There's yet another possibility which would require names to be explicitly
+lifted out of the private namespace, eliminating much of the implementation
+complexity discussed in PEP 3150 (as only identifiers would be exported,
+rather than arbitrary subexpressions)::
+
+    x = weakref.ref(target, report_destruction) given report_destruction from:
+        def report_destruction(obj):
+            print("{} is being destroyed".format(obj))
+
+or even::
+
+    x = weakref.ref(target, f) given report_destruction as f from:
+        def report_destruction(obj):
+            print("{} is being destroyed".format(obj))
+
+This approach actually has much to recommend it. It's as powerful as
+PEP 3150 while being substantially simpler both to implement and to
+explain. The main downside is that it requires even *more* repetition
+of names than is needed with the proposed ``@in`` decorator based syntax
+or with the status quo where the function is defined and bound to a local
+name prior to its sole use.
+
+Some more examples using this last variant::
+
+    sorted_list = sorted(original, key=f) given f from:
+        def f(item):
+            try:
+                return item.calc_sort_order()
+            except NotSortableError:
+                return float('inf')
+
+    funcs = [adder(i) for i in range(10)] given adder from:
+        def adder(i):
+            return lambda x: x + i
+    
+    environ = _createenviron() given _createenviron from:
+        def _createenviron():
+            ... # 27 line function
+
+    c = math.sqrt(a*a + b*b) given a, b from:
+        a = calculate_a()
+        b = calculate_b()
+
+    dispatch[MyClass] = f given f from:
+        def f():
+            ...
+
+    f() given f from:
+        def f():
+            ...
+
+One interesting outcome of such an approach is that it allows the semantics
+of function decoration to be represented almost exactly as a specific
+case of the new syntax::
+
+    # @deco2
+    # @deco1
+    # def name():
+    #    ...
+
+    name = f given f from:
+        # Decorator expressions are evaluated first, in code order
+        _d2 = deco2
+        _d1 = deco1
+
+        # The base function object is defined
+        def name():
+            ...
+
+        # Decorators are applied innermost first
+        f = _d2(_d1(name))
+
+Hmm, perhaps PEP 3150 isn't *quite* as dead as I thought, although the
+triple repetition of names is still a rather large downside.
+
 
 References
 ==========

-- 
Repository URL: http://hg.python.org/peps

From solipsis at pitrou.net  Wed Sep  5 06:03:19 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 05 Sep 2012 06:03:19 +0200
Subject: [Python-checkins] Daily reference leaks (82ae284cd5f1): sum=0
Message-ID: <E1T96pj-0005Hc-Sj@ap.vmr.nerim.net>

results for 82ae284cd5f1 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogS94519', '-x']

From python-checkins at python.org  Wed Sep  5 13:15:11 2012
From: python-checkins at python.org (nick.coghlan)
Date: Wed,  5 Sep 2012 13:15:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Updating_PEP_3150=27s_stateme?=
 =?utf-8?q?nt_local_namespaces_to_be_substantially_simpler_and?=
Message-ID: <3XBj4b2fwDzQ4M@mail.python.org>

http://hg.python.org/peps/rev/2f04a362718c
changeset:   4507:2f04a362718c
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Wed Sep 05 21:15:00 2012 +1000
summary:
  Updating PEP 3150's statement local namespaces to be substantially simpler and easier to understand, and make PEP 403 and PEP 3150 direct competitors again

files:
  pep-0403.txt |  149 +++-----
  pep-3150.txt |  650 +++++++++++++++++---------------------
  2 files changed, 361 insertions(+), 438 deletions(-)


diff --git a/pep-0403.txt b/pep-0403.txt
--- a/pep-0403.txt
+++ b/pep-0403.txt
@@ -1,5 +1,5 @@
 PEP: 403
-Title: General purpose decorator clause
+Title: General purpose decorator clause (aka "@in" clause)
 Version: $Revision$
 Last-Modified: $Date$
 Author: Nick Coghlan <ncoghlan at gmail.com>
@@ -209,11 +209,16 @@
 the simple name binding of a standard function definition to be replaced
 with something else (like assigning the result of the function to a value).
 
-This PEP also achieves most of the other effects described in PEP 3150
-without introducing a new brainbending kind of scope. All of the complex
-scoping rules in PEP 3150 are replaced in this PEP with allowing a forward
-reference to the associated function or class definition without creating an
-actual name binding in the current scope.
+Despite having the same author, the two PEPs are in direct competition with
+each other. This PEP represents a minimalist approach that attempts to
+achieve useful functionality with a minimum of change from the status quo.
+PEP 3150 instead aims for a more flexible standalone statement design, which
+requires a larger degree of change to the language.
+
+Note that where this PEP is better suited to explaining the behaviour of
+generator expressions correctly, PEP 3150 is better able to explain the
+behaviour of decorator clauses in general. Both PEPs support adequate
+explanations for the semantics of container comprehensions.
 
 
 Keyword Choice
@@ -284,6 +289,47 @@
 nested suite).
 
 
+Explaining Container Comprehensions and Generator Expressions
+-------------------------------------------------------------
+
+One interesting feature of the proposed construct is that it can be used as
+a primitive to explain the scoping and execution order semantics of
+both generator expressions and container comprehensions::
+
+    seq2 = [x for x in y if q(x) for y in seq if p(y)]
+
+    # would be equivalent to
+
+    @in seq2 = f(seq):
+    def f(seq)
+        result = []
+        for y in seq:
+            if p(y):
+                for x in y:
+                    if q(x):
+                        result.append(x)
+        return result
+
+The important point in this expansion is that it explains why comprehensions
+appear to misbehave at class scope: only the outermost iterator is evaluated
+at class scope, while all predicates, nested iterators and value expressions
+are evaluated inside a nested scope.
+
+An equivalent expansion is possible for generator expressions::
+
+    gen = (x for x in y if q(x) for y in seq if p(y))
+
+    # would be equivalent to
+
+    @in gen = g(seq):
+    def g(seq)
+        for y in seq:
+            if p(y):
+                for x in y:
+                    if q(x):
+                        yield x
+
+
 More Examples
 =============
 
@@ -413,18 +459,19 @@
 
 The problems with using a full nested suite are best described in
 PEP 3150. It's comparatively difficult to implement properly, the scoping
-semantics are hard to explain and it creates quite a few situations where
+semantics are harder to explain and it creates quite a few situations where
 there are two ways to do it without clear guidelines for choosing between
 them (as almost any construct that can be expressed with ordinary imperative
-code could instead be expressed using a given statement). While the PEP did
+code could instead be expressed using a given statement). While the PEP does
 propose some new PEP 8 guidelines to help address that last problem, the
-difficulties in implementation and explanation are not so easily dealt with.
+difficulties in implementation are not so easily dealt with.
 
 By contrast, the decorator inspired syntax in this PEP explicitly limits the
 new feature to cases where it should actually improve readability, rather
 than harming it. As in the case of the original introduction of decorators,
 the idea of this new syntax is that if it *can* be used (i.e. the local name
-binding of the function is completely unnecessary) then it *should* be used.
+binding of the function is completely unnecessary) then it probably *should*
+be used.
 
 Another possible variant of this idea is to keep the decorator based
 *semantics* of this PEP, while adopting the prettier syntax from PEP 3150::
@@ -438,82 +485,14 @@
 one. A secondary concern is that it's not clear how the compiler will know
 which name(s) in the leading expression are forward references (although
 that could potentially be addressed through a suitable definition of the
-suite-that-is-not-a-suite in the languge grammar).
+suite-that-is-not-a-suite in the language grammar).
 
-There's yet another possibility which would require names to be explicitly
-lifted out of the private namespace, eliminating much of the implementation
-complexity discussed in PEP 3150 (as only identifiers would be exported,
-rather than arbitrary subexpressions)::
-
-    x = weakref.ref(target, report_destruction) given report_destruction from:
-        def report_destruction(obj):
-            print("{} is being destroyed".format(obj))
-
-or even::
-
-    x = weakref.ref(target, f) given report_destruction as f from:
-        def report_destruction(obj):
-            print("{} is being destroyed".format(obj))
-
-This approach actually has much to recommend it. It's as powerful as
-PEP 3150 while being substantially simpler both to implement and to
-explain. The main downside is that it requires even *more* repetition
-of names than is needed with the proposed ``@in`` decorator based syntax
-or with the status quo where the function is defined and bound to a local
-name prior to its sole use.
-
-Some more examples using this last variant::
-
-    sorted_list = sorted(original, key=f) given f from:
-        def f(item):
-            try:
-                return item.calc_sort_order()
-            except NotSortableError:
-                return float('inf')
-
-    funcs = [adder(i) for i in range(10)] given adder from:
-        def adder(i):
-            return lambda x: x + i
-    
-    environ = _createenviron() given _createenviron from:
-        def _createenviron():
-            ... # 27 line function
-
-    c = math.sqrt(a*a + b*b) given a, b from:
-        a = calculate_a()
-        b = calculate_b()
-
-    dispatch[MyClass] = f given f from:
-        def f():
-            ...
-
-    f() given f from:
-        def f():
-            ...
-
-One interesting outcome of such an approach is that it allows the semantics
-of function decoration to be represented almost exactly as a specific
-case of the new syntax::
-
-    # @deco2
-    # @deco1
-    # def name():
-    #    ...
-
-    name = f given f from:
-        # Decorator expressions are evaluated first, in code order
-        _d2 = deco2
-        _d1 = deco1
-
-        # The base function object is defined
-        def name():
-            ...
-
-        # Decorators are applied innermost first
-        f = _d2(_d1(name))
-
-Hmm, perhaps PEP 3150 isn't *quite* as dead as I thought, although the
-triple repetition of names is still a rather large downside.
+However, a nested suite has not yet been ruled out completely. The latest
+version of PEP 3150 uses explicit forward reference and name binding
+schemes that greatly simplify the semantics of the statement, and it
+does offer the advantage of allowing the definition of arbitrary
+subexpressions rather than being restricted to a single function or
+class definition.
 
 
 References
diff --git a/pep-3150.txt b/pep-3150.txt
--- a/pep-3150.txt
+++ b/pep-3150.txt
@@ -3,7 +3,7 @@
 Version: $Revision$
 Last-Modified: $Date$
 Author: Nick Coghlan <ncoghlan at gmail.com>
-Status: Withdrawn
+Status: Deferred
 Type: Standards Track
 Content-Type: text/x-rst
 Created: 2010-07-09
@@ -19,7 +19,9 @@
 Python statements that do not currently have an associated code suite. This
 clause will create a statement local namespace for additional names that are
 accessible in the associated statement, but do not become part of the
-containing namespace.
+containing namespace. To permit a sane implementation strategy, forward
+references to names from the ``given`` clause will need to be marked
+explicitly.
 
 The primary motivation is to enable a more declarative style of programming,
 where the operation to be performed is presented to the reader first, and the
@@ -47,23 +49,6 @@
 but has not yet itself been subject to the test of implementation.
 
 
-PEP Withdrawal
-==============
-
-I've had a complicated history with this PEP. For a long time I left it in
-the Deferred state because I wasn't convinced the additional complexity was
-worth the payoff. Then, briefly, I became more enamoured of the idea and
-only left it at Deferred because I didn't really have time to pursue it.
-
-I'm now withdrawing it, as, the longer I reflect on the topic, the more I
-feel this approach is simply far too intrusive and complicated to ever be
-a good idea for Python as a language.
-
-I've also finally found a couple of syntax proposals for PEP 403 that
-read quite nicely and address the same set of use cases as this PEP
-while remaining significantly simpler.
-
-
 Proposal
 ========
 
@@ -87,16 +72,171 @@
 name in the header line, with the actual definitions following in
 the indented clause. As a simple example::
 
-   sorted_data = sorted(data, key=sort_key) given:
+   sorted_data = sorted(data, key=.sort_key) given:
        def sort_key(item):
            return item.attr1, item.attr2
 
+The leading ``.`` on ``.sort_key`` indicates to the compiler that this
+is a forward reference to a name defined in the ``given`` clause.
+
 The ``pass`` statement is included to provide a consistent way to skip
 inclusion of a meaningful expression in the header line. While this is not
 an intended use case, it isn't one that can be prevented as multiple
 alternatives (such as ``...`` and ``()``) remain available even if ``pass``
 itself is disallowed.
 
+The body of the given clause will execute in a new scope, using normal
+function closure semantics. To support early binding of loop variables
+and global references, as well as to allow access to other names defined at
+class scope, the ``given`` clause will also allow explicit
+binding operations in the header line::
+
+   # Explicit early binding via given clause
+   seq = []
+   for i in range(10):
+       seq.append(.f) given i=i:
+           def f():
+               return i
+   assert [f() for f in seq] == list(range(10))
+
+
+Semantics
+---------
+
+The following statement::
+
+   op(.f, .g) given bound_a=a, bound_b=b:
+       def f():
+           return bound_a + bound_b
+       def g():
+           return bound_a - bound_b
+
+Would be roughly equivalent to the following code (``__var`` denotes a
+hidden compiler variable or simply an entry on the interpreter stack)::
+
+   __arg1 = a
+   __arg2 = b
+   def __scope(bound_a, bound_b):
+       def f():
+           return bound_a + bound_b
+       def g():
+           return bound_a - bound_b
+      return f, g
+   __ref1, __ref2 = __scope(__arg1)
+   op(__ref1, __ref2)
+
+A ``given`` clause is essentially a nested function which is created and
+then immediately executed. Unless explicitly passed in, names are looked
+up using normal scoping rules, and thus names defined at class scope will
+not be visible. Names declared as forward references are returned and
+used in the header statement, without being bound locally in the
+surrounding namespace.
+
+
+Syntax Change
+-------------
+
+Current::
+
+   expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) |
+                ('=' (yield_expr|testlist_star_expr))*)
+   del_stmt: 'del' exprlist
+   pass_stmt: 'pass'
+   return_stmt: 'return' [testlist]
+   yield_stmt: yield_expr
+   raise_stmt: 'raise' [test ['from' test]]
+   assert_stmt: 'assert' test [',' test]
+
+
+New::
+
+   expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) |
+                ('=' (yield_expr|testlist_star_expr))*) [given_clause]
+   del_stmt: 'del' exprlist [given_clause]
+   pass_stmt: 'pass' [given_clause]
+   return_stmt: 'return' [testlist] [given_clause]
+   yield_stmt: yield_expr [given_clause]
+   raise_stmt: 'raise' [test ['from' test]] [given_clause]
+   assert_stmt: 'assert' test [',' test] [given_clause]
+   given_clause: "given" (NAME '=' test)* ":" suite
+
+(Note that ``expr_stmt`` in the grammar is a slight misnomer, as it covers
+assignment and augmented assignment in addition to simple expression
+statements)
+
+The new clause is added as an optional element of the existing statements
+rather than as a new kind of compound statement in order to avoid creating
+an ambiguity in the grammar. It is applied only to the specific elements
+listed so that nonsense like the following is disallowed::
+
+   break given:
+       a = b = 1
+
+   import sys given:
+       a = b = 1
+
+However, the precise Grammar change described above is inadequate, as it
+creates problems for the definition of simple_stmt (which allows chaining of
+multiple single line statements with ";" rather than "\\n").
+
+So the above syntax change should instead be taken as a statement of intent.
+Any actual proposal would need to resolve the simple_stmt parsing problem
+before it could be seriously considered. This would likely require a
+non-trivial restructuring of the grammar, breaking up small_stmt and
+flow_stmt to separate the statements that potentially contain arbitrary
+subexpressions and then allowing a single one of those statements with
+a ``given`` clause at the simple_stmt level. Something along the lines of::
+
+   stmt: simple_stmt | given_stmt | compound_stmt
+   simple_stmt: small_stmt (';' (small_stmt | subexpr_stmt))* [';'] NEWLINE
+   small_stmt: (pass_stmt | flow_stmt | import_stmt |
+                global_stmt | nonlocal_stmt)
+   flow_stmt: break_stmt | continue_stmt
+   given_stmt: subexpr_stmt (given_clause |
+                 (';' (small_stmt | subexpr_stmt))* [';']) NEWLINE
+   subexpr_stmt: expr_stmt | del_stmt | flow_subexpr_stmt | assert_stmt
+   flow_subexpr_stmt: return_stmt | raise_stmt | yield_stmt
+   given_clause: "given" (NAME '=' test)* ":" suite
+
+For reference, here are the current definitions at that level::
+
+   stmt: simple_stmt | compound_stmt
+   simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
+   small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt |
+                import_stmt | global_stmt | nonlocal_stmt | assert_stmt)
+   flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
+
+In addition to the above changes, the definition of ``atom`` would be changed
+to also allow ``"." NAME``. The restriction of this usage to statements with
+an associated ``given`` clause would be handled by a later stage of the
+compilation process (likely AST construction, which already enforces
+other restrictions where the grammar is overly permissive in order to
+simplify the initial parsing step).
+
+
+New PEP 8 Guidelines
+--------------------
+
+As discussed on python-ideas ([7]_, [9]_) new PEP 8 guidelines would also
+need to be developed to provide appropriate direction on when to use the
+``given`` clause over ordinary variable assignments.
+
+Based on the similar guidelines already present for ``try`` statements, this
+PEP proposes the following additions for ``given`` statements to the
+"Programming Conventions" section of PEP 8:
+
+  - for code that could reasonably be factored out into a separate function,
+    but is not currently reused anywhere, consider using a ``given`` clause.
+    This clearly indicates which variables are being used only to define
+    subcomponents of another statement rather than to hold algorithm or
+    application state. This is an especially useful technique when
+    passing multi-line functions to operations which take callable
+    arguments.
+
+  - keep ``given`` clauses concise. If they become unwieldy, either break
+    them up into multiple steps or else move the details into a separate
+    function.
+
 
 Rationale
 =========
@@ -152,11 +292,14 @@
 One potentially useful way to think of the proposed clause is as a middle
 ground between conventional in-line code and separation of an
 operation out into a dedicated function, just as an inline while loop may
-eventually be factored out into a dedicator generator.
+eventually be factored out into a dedicated generator.
 
 
+Design Discussion
+=================
+
 Keyword Choice
-==============
+--------------
 
 This proposal initially used ``where`` based on the name of a similar
 construct in Haskell. However, it has been pointed out that there
@@ -177,12 +320,86 @@
 That way lies C++ and Perl :)
 
 
+Relation to PEP 403
+-------------------
+
+PEP 403 (General Purpose Decorator Clause) attempts to achieve the main
+goals of this PEP using a less radical language change inspired by the
+existing decorator syntax.
+
+Despite having the same author, the two PEPs are in direct competition with
+each other. PEP 403 represents a minimalist approach that attempts to achieve
+useful functionality with a minimum of change from the status quo. This PEP
+instead aims for a more flexible standalone statement design, which requires
+a larger degree of change to the language.
+
+Note that where PEP 403 is better suited to explaining the behaviour of
+generator expressions correctly, this PEP is better able to explain the
+behaviour of decorator clauses in general. Both PEPs support adequate
+explanations for the semantics of container comprehensions.
+
+
+Explaining Container Comprehensions and Generator Expressions
+-------------------------------------------------------------
+
+One interesting feature of the proposed construct is that it can be used as
+a primitive to explain the scoping and execution order semantics of
+container comprehensions::
+
+    seq2 = [x for x in y if q(x) for y in seq if p(y)]
+
+    # would be equivalent to
+
+    seq2 = .result given seq=seq:
+        result = []
+        for y in seq:
+            if p(y):
+                for x in y:
+                    if q(x):
+                        result.append(x)
+
+The important point in this expansion is that it explains why comprehensions
+appear to misbehave at class scope: only the outermost iterator is evaluated
+at class scope, while all predicates, nested iterators and value expressions
+are evaluated inside a nested scope.
+
+Not that, unlike PEP 403, the current version of this PEP *cannot*
+provide a precisely equivalent expansion for a generator expression. The
+closest it can get is to define an additional level of scoping::
+
+    seq2 = .g(seq) given:
+        def g(seq):
+            for y in seq:
+                if p(y):
+                    for x in y:
+                        if q(x):
+                            yield x
+
+Explaining Decorator Clause Evaluation and Application
+------------------------------------------------------
+
+The standard explanation of decorator clause evaluation and application
+has to deal with the idea of hidden compiler variables in order to show
+steps in their order of execution. The given statement allows a decorated
+function definition like::
+
+   @classmethod
+   def classname(cls):
+       return cls.__name__
+
+To instead be explained as roughly equivalent to::
+
+   classname = .d1(classname) given:
+       d1 = classmethod
+       def classname(cls):
+           return cls.__name__
+
 Anticipated Objections
-======================
+----------------------
 
 
 Two Ways To Do It
------------------
+~~~~~~~~~~~~~~~~~
 
 A lot of code may now be written with values defined either before the
 expression where they are used or afterwards in a ``given`` clause, creating
@@ -203,11 +420,11 @@
 Opinions differ, and that's OK.
 
 However, explicit PEP 8 guidance will be needed for CPython and the standard
-library, and that is discussed below.
+library, and that is discussed in the proposal above.
 
 
 Out of Order Execution
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
 
 The ``given`` clause makes execution jump around a little strangely, as the
 body of the ``given`` clause is executed before the simple statement in the
@@ -231,7 +448,7 @@
    sorted_list = sorted(original, key=(lambda v: v.attr1, v.attr2))
 
 That gets the job done, but it hardly reaches the standard of ``executable
-pseudocode`` that Python aspires to, does it?
+pseudocode`` that fits Python's reputation.
 
 If they don't like ``lambda`` specifically, the ``operator`` module offers an
 alternative that still allows the key function to be defined inline::
@@ -239,7 +456,8 @@
    sorted_list = sorted(original,
                         key=operator.attrgetter(v. 'attr1', 'attr2'))
 
-Again, it gets the job done, but executable pseudocode it ain't.
+Again, it gets the job done, but even the most generous of readers would
+ not consider that to be "executable pseudocode".
 
 If they think both of the above options are ugly and confusing, or they need
 logic in their key function that can't be expressed as an expression (such
@@ -256,47 +474,20 @@
 but it really does represent a break between what the user is thinking and
 what the language allows them to express.
 
-I believe the proposal in this PEP will finally let Python get close to the
+I believe the proposal in this PEP would finally let Python get close to the
 "executable pseudocode" bar for the kind of thought expressed above::
 
-   sorted_list = sorted(original, key=sort_key) given:
+   sorted_list = sorted(original, key=.sort_key) given:
        def sort_key(item):
            return item.attr1, item.attr2
 
 Everything is in the same order as it was in the user's original thought, the
 only addition they have to make is to give the sorting criteria a name so that
 the usage can be linked up to the subsequent definition.
-
-One other useful note on this front, is that this PEP allows existing out of
-order execution constructs to be described as special cases of the more
-general out of order execution syntax (just as comprehensions are now special
-cases of the more general generator expression syntax, even though list
-comprehensions existed first)::
-
-   @classmethod
-   def classname(cls):
-       return cls.__name__
-
-Would be roughly equivalent to::
-
-   classname = f1(classname) given:
-       f1 = classmethod
-       def classname(cls):
-           return cls.__name__
-
-A list comprehension like ``squares = [x*x for x in range(10)]``
-would be equivalent to::
-
-   # Note: this example uses an explicit early binding variant that
-   # isn't yet reflected in the rest of the PEP. It will get there, though.
-   squares = seq given outermost=range(10):
-       seq = []
-       for x in outermost:
-           seq.append(x*x)
    
 
 Harmful to Introspection
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 Poking around in module and class internals is an invaluable tool for
 white-box testing and interactive debugging. The ``given`` clause will be
@@ -314,7 +505,7 @@
 
 
 Lack of Real World Impact Assessment
-------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The examples in the current PEP are almost all relatively small "toy"
 examples. The proposal in this PEP needs to be subjected to the test of
@@ -322,261 +513,32 @@
 Twisted application) in a search for examples where the readability of real
 world code is genuinely enhanced.
 
-This is more of a deficiency in the PEP rather than the idea, though.
+This is more of a deficiency in the PEP rather than the idea, though. If
+it wasn't a real world problem, we wouldn't get so many complaints about
+the lack of multi-line lambda support and Ruby's block construct
+probaly wouldn't be quite so popular.
 
 
-New PEP 8 Guidelines
-====================
+Open Questions
+==============
 
-As discussed on python-ideas ([7]_, [9]_) new PEP 8 guidelines would also
-need to be developed to provide appropriate direction on when to use the
-``given`` clause over ordinary variable assignments.
-
-Based on the similar guidelines already present for ``try`` statements, this
-PEP proposes the following additions for ``given`` statements to the
-"Programming Conventions" section of PEP 8:
-
-  - for code that could reasonably be factored out into a separate function,
-    but is not currently reused anywhere, consider using a ``given`` clause.
-    This clearly indicates which variables are being used only to define
-    subcomponents of another statement rather than to hold algorithm or
-    application state.
-
-  - keep ``given`` clauses concise. If they become unwieldy, either break
-    them up into multiple steps or else move the details into a separate
-    function.
-
-
-Syntax Change
-=============
-
-Current::
-
-   expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) |
-                ('=' (yield_expr|testlist_star_expr))*)
-   del_stmt: 'del' exprlist
-   pass_stmt: 'pass'
-   return_stmt: 'return' [testlist]
-   yield_stmt: yield_expr
-   raise_stmt: 'raise' [test ['from' test]]
-   assert_stmt: 'assert' test [',' test]
-
-
-New::
-
-   expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) |
-                ('=' (yield_expr|testlist_star_expr))*) [given_clause]
-   del_stmt: 'del' exprlist [given_clause]
-   pass_stmt: 'pass' [given_clause]
-   return_stmt: 'return' [testlist] [given_clause]
-   yield_stmt: yield_expr [given_clause]
-   raise_stmt: 'raise' [test ['from' test]] [given_clause]
-   assert_stmt: 'assert' test [',' test] [given_clause]
-   given_clause: "given" ":" suite
-
-(Note that ``expr_stmt`` in the grammar is a slight misnomer, as it covers
-assignment and augmented assignment in addition to simple expression
-statements)
-
-The new clause is added as an optional element of the existing statements
-rather than as a new kind of compound statement in order to avoid creating
-an ambiguity in the grammar. It is applied only to the specific elements
-listed so that nonsense like the following is disallowed::
-
-   break given:
-       a = b = 1
-
-   import sys given:
-       a = b = 1
-
-However, the precise Grammar change described above is inadequate, as it
-creates problems for the definition of simple_stmt (which allows chaining of
-multiple single line statements with ";" rather than "\\n").
-
-So the above syntax change should instead be taken as a statement of intent.
-Any actual proposal would need to resolve the simple_stmt parsing problem
-before it could be seriously considered. This would likely require a
-non-trivial restructuring of the grammar, breaking up small_stmt and
-flow_stmt to separate the statements that potentially contain arbitrary
-subexpressions and then allowing a single one of those statements with
-a ``given`` clause at the simple_stmt level. Something along the lines of::
-
-   stmt: simple_stmt | given_stmt | compound_stmt
-   simple_stmt: small_stmt (';' (small_stmt | subexpr_stmt))* [';'] NEWLINE
-   small_stmt: (pass_stmt | flow_stmt | import_stmt |
-                global_stmt | nonlocal_stmt)
-   flow_stmt: break_stmt | continue_stmt
-   given_stmt: subexpr_stmt (given_clause |
-                 (';' (small_stmt | subexpr_stmt))* [';']) NEWLINE
-   subexpr_stmt: expr_stmt | del_stmt | flow_subexpr_stmt | assert_stmt
-   flow_subexpr_stmt: return_stmt | raise_stmt | yield_stmt
-   given_clause: "given" ":" suite
-
-For reference, here are the current definitions at that level::
-
-   stmt: simple_stmt | compound_stmt
-   simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
-   small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt |
-                import_stmt | global_stmt | nonlocal_stmt | assert_stmt)
-   flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
-
-
-Possible Implementation Strategy
-================================
-
-Torture Test
-------------
-
-An implementation of this PEP should support execution of the following
-code at module, class and function scope::
-
-   b = {}
-   a = b[f(a)] = x given:
-       x = 42
-       def f(x):
-           return x
-   assert "x" not in locals()
-   assert "f" not in locals()
-   assert a == 42
-   assert d[42] == 42 given:
-       d = b
-   assert "d" not in locals()
-   y = y given:
-       x = 42
-       def f(): pass
-       y = locals("x"), f.__name__
-   assert "x" not in locals()
-   assert "f" not in locals()
-   assert y == (42, "f")
-
-Most naive implementations will choke on the first complex assignment,
-while less naive but still broken implementations will fail when
-the torture test is executed at class scope. Renaming based strategies
-struggle to support ``locals()`` correctly and also have problems with
-class and function ``__name__`` attributes.
-
-And yes, that's a perfectly well-defined assignment statement. Insane,
-you might rightly say, but legal::
-
-   >>> def f(x): return x
-   ...
-   >>> x = 42
-   >>> b = {}
-   >>> a = b[f(a)] = x
-   >>> a
-   42
-   >>> b
-   {42: 42}
-
-Details of Proposed Semantics
+Syntax for Forward References
 -----------------------------
 
-AKA How Class Scopes Screw You When Attempting To Implement This
+The leading ``.`` arguably fails the "syntax shall not look like grit on
+Uncle Tim's monitor" test. However, it does have the advantages of being
+easy to type and already having an association with namespaces.
 
-The natural idea when setting out to implement this concept is to
-use an ordinary nested function scope. This doesn't work for the
-two reasons mentioned in the Torture Test section above:
 
-* Non-local variables are not your friend because they ignore class scopes
-  and (when writing back to the outer scope) aren't really on speaking
-  terms with module scopes either.
+Handling of ``nonlocal`` and ``global``
+---------------------------------------
 
-* Return-based semantics struggle with complex assignment statements
-  like the one in the torture test
+``nonlocal`` and ``global`` are explicitly disallowed in the ``given`` clause
+suite and will be syntax errors if they occur. They will work normally if
+they appear within a ``def`` statement within that suite.
 
-The second thought is generally some kind of hidden renaming strategy. This
-also creates problems, as Python exposes variables names via the ``locals()``
-dictionary and class and function ``__name__`` attributes.
-
-The most promising approach is one based on symtable analysis and
-copy-in-copy-out referencing semantics to move any required name
-bindings between the inner and outer scopes. The torture test above
-would then translate to something like the following::
-
-   b = {}
-   def _anon1(b): # 'b' reference copied in
-       x = 42
-       def f(x):
-           return x
-       a = b[f(a)] = x
-       return a # 'a' reference copied out
-   a = _anon1(b)
-   assert "x" not in locals()
-   assert "f" not in locals()
-   assert a == 42
-   def _anon2(b) # 'b' reference copied in
-       d = b
-       assert d[42] == 42
-       # Nothing to copy out (not an assignment)
-   _anon2()
-   assert "d" not in locals()
-   def _anon3() # Nothing to copy in (no references to other variables)
-       x = 42
-       def f(): pass
-       y = locals("x"), f.__name__
-       y = y    # Assuming no optimisation of special cases
-       return y # 'y' reference copied out
-   y = _anon3()
-   assert "x" not in locals()
-   assert "f" not in locals()
-   assert y == (42, "f")
-
-However, as noted in the abstract, an actual implementation of
-this idea has never been tried.
-
-
-Detailed Semantics #1: Early Binding of Variable References
------------------------------------------------------------
-
-The copy-in-copy-out semantics mean that all variable references from a
-``given`` clause will exhibit early binding behaviour, in contrast to the
-late binding typically seen with references to closure variables and globals
-in ordinary functions. This behaviour will allow the ``given`` clause to
-be used as a substitute for the default argument hack when early binding
-behaviour is desired::
-
-  # Current Python (late binding)
-  seq = []
-  for i in range(10):
-    def f():
-      return i
-    seq.append(f)
-  assert [f() for f in seq] == [9]*10
-
-  # Current Python (early binding via default argument hack)
-  seq = []
-  for i in range(10):
-    def f(_i=i):
-      return i
-    seq.append(f)
-  assert [f() for f in seq] == list(range(10))
-
-  # Early binding via given clause
-  seq = []
-  for i in range(10):
-    seq.append(f) given:
-      def f():
-        return i
-  assert [f() for f in seq] == list(range(10))
-
-Note that the current intention is for the copy-in/copy-out semantics to
-apply only to names defined in the local scope containing the ``given``
-clause. Name in outer scopes will be referenced as normal.
-
-This intention is subject to revision based on feedback and practicalities
-of implementation.
-
-
-Detailed Semantics #2: Handling of ``nonlocal`` and ``global``
---------------------------------------------------------------
-
-``nonlocal`` and ``global`` will largely operate as if the anonymous
-functions were defined as in the expansion above. However, they will also
-override the default early-binding semantics for names from the containing
-scope.
-
-This intention is subject to revision based on feedback and practicalities
-of implementation.
+Alternatively, they could be defined as operating as if the anonymous
+functions were defined as in the expansion above.
 
 
 Detailed Semantics #3: Handling of ``break`` and ``continue``
@@ -588,53 +550,14 @@
 a ``for`` or ``while`` loop as part of that suite.
 
 
-Detailed Semantics #4: Handling of ``return`` and ``yield``
--------------------------------------------------------------
+Handling of ``return`` and ``yield``
+------------------------------------
 
 ``return`` and ``yield`` are explicitly disallowed in the ``given`` clause
 suite and will be syntax errors if they occur. They will work normally if
 they appear within a ``def`` statement within that suite.
 
 
-Alternative Semantics for Name Binding
---------------------------------------
-
-The "early binding" semantics proposed for the ``given`` clause are driven
-by the desire to have ``given`` clauses work "normally" in class scopes (that
-is, allowing them to see the local variables in the class, even though classes
-do not participate in normal lexical scoping).
-
-There is an alternative, which is to simply declare that the ``given`` clause
-creates an ordinary nested scope, just like comprehensions and generator
-expressions. Thus, the given clause would share the same quirks as those
-constructs: they exhibit surprising behaviour at class scope, since they
-can't see the local variables in the class definition. While this behaviour
-is considered desirable for method definitions (where class variables are
-accessed via the class or instance argument passed to the method), it can be
-surprising and inconvenient for implicit scopes that are designed to hide
-their own name bindings from the containing scope rather than vice-versa.
-
-A third alternative, more analogous to the comprehension case (where the
-outermost iterator expression is evaluated in the current scope and hence can
-see class locals normally), would be to allow *explicit* early binding in the
-``given`` clause, by passing an optional tuple of assignments after the
-``given`` keyword::
-
-  # Explicit early binding via given clause
-  seq = []
-  for i in range(10):
-    seq.append(f) given i=i:
-      def f():
-        return i
-  assert [f() for f in seq] == list(range(10))
-
-(Note: I actually like the explicit early binding idea significantly more
-than I do the implicit early binding - expect a future version of the PEP
-to be updated accordingly. I've already used it above when describing how
-an existing construct like a list comprehension could be expressed as a
-special case of the new syntax)
-
-
 Examples
 ========
 
@@ -654,10 +577,9 @@
   @singleton(*params)
   class public_name():
     ... # However many lines
-  public_name = public_name(*params)
 
   # Becomes:
-  public_name = MeaningfulClassName(*params) given:
+  public_name = .MeaningfulClassName(*params) given:
     class MeaningfulClassName():
       ... # Should trawl the stdlib for an example of doing this
 
@@ -671,7 +593,7 @@
   del _createenviron
 
   # Becomes:
-  environ = _createenviron() given:
+  environ = ._createenviron() given:
       def _createenviron():
         ... # 27 line function
 
@@ -684,7 +606,7 @@
   return decorating_function
 
   # Becomes:
-  return decorating_function given:
+  return .decorating_function given:
     # Cell variables rather than locals, but should give similar speedup
     tuple, sorted, len, KeyError = tuple, sorted, len, KeyError
     def decorating_function(user_function):
@@ -709,7 +631,29 @@
 
 * The "explicit early binding" variant may be applicable to the discussions
   on python-ideas on how to eliminate the default argument hack. A ``given``
-  clause in the header line for functions may be the answer to that question.
+  clause in the header line for functions (after the return type annotation)
+  may be the answer to that question.
+
+
+Rejected Alternatives
+=====================
+
+* An earlier version of this PEP allowed implicit forward references to the
+  names in the trailing suite, and also used implicit early binding
+  semantics. Both of these ideas substantially complicated the proposal
+  without providing a sufficient increase in expressive power. The current
+  proposing with explicit forward references and early binding brings the
+  new construct into line with existing scoping semantics, greatly
+  improving the chances the idea can actually be implemented.
+
+* In addition to the proposals made here, there have also been suggestions
+  of two suite "in-order" variants which provide the limited scoping of
+  names without supporting out-of-order execution. I believe these
+  suggestions largely miss the point of what people are complaining about
+  when they ask for multi-line lambda support - it isn't that coming up
+  with a name for the subexpression is especially difficult, it's that
+  naming the function before the statement that uses it means the code
+  no longer matches the way the developer thinks about the problem at hand.
 
 
 Reference Implementation
@@ -722,10 +666,10 @@
 TO-DO
 =====
 
-* Mention two-suite in-order variants (and explain why they're even more
-  pointless than the specific idea in the PEP)
 * Mention PEP 359 and possible uses for locals() in the ``given`` clause
 
+* Figure out if this can be used internally to make the implementation of
+  zero-argument super() calls less awful
 
 References
 ==========

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Wed Sep  5 20:20:51 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Wed,  5 Sep 2012 20:20:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODQx?=
 =?utf-8?q?=3A_The_readable=28=29=2C_writable=28=29_and_seekable=28=29_met?=
 =?utf-8?q?hods_of_BytesIO?=
Message-ID: <3XBtWl3b5kzPS8@mail.python.org>

http://hg.python.org/cpython/rev/524931e5aebf
changeset:   78852:524931e5aebf
branch:      3.2
parent:      78848:c49f89261d65
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Sep 05 20:11:49 2012 +0200
summary:
  Issue #15841: The readable(), writable() and seekable() methods of BytesIO
and StringIO objects now raise ValueError when the object has been closed.
Patch by Alessandro Moura.

files:
  Lib/_pyio.py              |   8 ++++++++
  Lib/test/test_memoryio.py |   7 +++----
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   4 ++++
  Modules/_io/bytesio.c     |  20 +++++++++++++++-----
  Modules/_io/stringio.c    |  19 ++++++++++++++++---
  6 files changed, 47 insertions(+), 12 deletions(-)


diff --git a/Lib/_pyio.py b/Lib/_pyio.py
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -889,12 +889,18 @@
         return pos
 
     def readable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def writable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
 
@@ -1567,6 +1573,8 @@
         return self._buffer
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return self._seekable
 
     def readable(self):
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -318,9 +318,9 @@
         self.assertEqual(memio.isatty(), False)
         self.assertEqual(memio.closed, False)
         memio.close()
-        self.assertEqual(memio.writable(), True)
-        self.assertEqual(memio.readable(), True)
-        self.assertEqual(memio.seekable(), True)
+        self.assertRaises(ValueError, memio.writable)
+        self.assertRaises(ValueError, memio.readable)
+        self.assertRaises(ValueError, memio.seekable)
         self.assertRaises(ValueError, memio.isatty)
         self.assertEqual(memio.closed, True)
 
@@ -665,7 +665,6 @@
         check(io.BytesIO(b'a'), basesize + 1 + 1 )
         check(io.BytesIO(b'a' * 1000), basesize + 1000 + 1 )
 
-
 class CStringIOTest(PyStringIOTest):
     ioclass = io.StringIO
     UnsupportedOperation = io.UnsupportedOperation
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -658,6 +658,7 @@
 Paul Moore
 Derek Morr
 James A Morrison
+Alessandro Moura
 Pablo Mouzo
 Mher Movsisyan
 Ruslan Mstoi
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -115,6 +115,10 @@
 Library
 -------
 
+- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
+  and StringIO objects now raise ValueError when the object has been closed.
+  Patch by Alessandro Moura.
+
 - Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
   Popen when %action substitutions produce empty strings.
 
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -121,7 +121,7 @@
 }
 
 /* Internal routine for writing a string of bytes to the buffer of a BytesIO
-   object. Returns the number of bytes wrote, or -1 on error. */
+   object. Returns the number of bytes written, or -1 on error. */
 static Py_ssize_t
 write_bytes(bytesio *self, const char *bytes, Py_ssize_t len)
 {
@@ -171,10 +171,20 @@
     }
 }
 
+PyDoc_STRVAR(readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 /* Generic getter for the writable, readable and seekable properties */
 static PyObject *
-return_true(bytesio *self)
+return_not_closed(bytesio *self)
 {
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -867,9 +877,9 @@
 };
 
 static struct PyMethodDef bytesio_methods[] = {
-    {"readable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"seekable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"writable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
+    {"readable",   (PyCFunction)return_not_closed,  METH_NOARGS, readable_doc},
+    {"seekable",   (PyCFunction)return_not_closed,  METH_NOARGS, seekable_doc},
+    {"writable",   (PyCFunction)return_not_closed,  METH_NOARGS, writable_doc},
     {"close",      (PyCFunction)bytesio_close,      METH_NOARGS, close_doc},
     {"flush",      (PyCFunction)bytesio_flush,      METH_NOARGS, flush_doc},
     {"isatty",     (PyCFunction)bytesio_isatty,     METH_NOARGS, isatty_doc},
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -650,10 +650,21 @@
 }
 
 /* Properties and pseudo-properties */
+
+PyDoc_STRVAR(stringio_readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(stringio_writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(stringio_seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 static PyObject *
 stringio_seekable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -661,6 +672,7 @@
 stringio_readable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -668,6 +680,7 @@
 stringio_writable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -835,9 +848,9 @@
     {"seek",     (PyCFunction)stringio_seek,     METH_VARARGS, stringio_seek_doc},
     {"write",    (PyCFunction)stringio_write,    METH_O,       stringio_write_doc},
 
-    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS},
-    {"readable", (PyCFunction)stringio_readable, METH_NOARGS},
-    {"writable", (PyCFunction)stringio_writable, METH_NOARGS},
+    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS, stringio_seekable_doc},
+    {"readable", (PyCFunction)stringio_readable, METH_NOARGS, stringio_readable_doc},
+    {"writable", (PyCFunction)stringio_writable, METH_NOARGS, stringio_writable_doc},
 
     {"__getstate__", (PyCFunction)stringio_getstate, METH_NOARGS},
     {"__setstate__", (PyCFunction)stringio_setstate, METH_O},

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep  5 20:20:53 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Wed,  5 Sep 2012 20:20:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogSXNzdWUgIzE1ODQxOiBUaGUgcmVhZGFibGUoKSwgd3JpdGFibGUoKSBh?=
 =?utf-8?q?nd_seekable=28=29_methods_of_BytesIO?=
Message-ID: <3XBtWn1vyyzQJM@mail.python.org>

http://hg.python.org/cpython/rev/fcf097cb5f6b
changeset:   78853:fcf097cb5f6b
parent:      78851:82ae284cd5f1
parent:      78852:524931e5aebf
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Sep 05 20:13:48 2012 +0200
summary:
  Issue #15841: The readable(), writable() and seekable() methods of BytesIO
and StringIO objects now raise ValueError when the object has been closed.
Patch by Alessandro Moura.

files:
  Lib/_pyio.py              |   8 ++++++++
  Lib/test/test_memoryio.py |   7 +++----
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   4 ++++
  Modules/_io/bytesio.c     |  20 +++++++++++++++-----
  Modules/_io/stringio.c    |  19 ++++++++++++++++---
  6 files changed, 47 insertions(+), 12 deletions(-)


diff --git a/Lib/_pyio.py b/Lib/_pyio.py
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -895,12 +895,18 @@
         return pos
 
     def readable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def writable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
 
@@ -1562,6 +1568,8 @@
         return self._buffer
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return self._seekable
 
     def readable(self):
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -318,9 +318,9 @@
         self.assertEqual(memio.isatty(), False)
         self.assertEqual(memio.closed, False)
         memio.close()
-        self.assertEqual(memio.writable(), True)
-        self.assertEqual(memio.readable(), True)
-        self.assertEqual(memio.seekable(), True)
+        self.assertRaises(ValueError, memio.writable)
+        self.assertRaises(ValueError, memio.readable)
+        self.assertRaises(ValueError, memio.seekable)
         self.assertRaises(ValueError, memio.isatty)
         self.assertEqual(memio.closed, True)
 
@@ -665,7 +665,6 @@
         check(io.BytesIO(b'a'), basesize + 1 + 1 )
         check(io.BytesIO(b'a' * 1000), basesize + 1000 + 1 )
 
-
 class CStringIOTest(PyStringIOTest):
     ioclass = io.StringIO
     UnsupportedOperation = io.UnsupportedOperation
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -731,6 +731,7 @@
 Derek Morr
 James A Morrison
 Derek McTavish Mounce
+Alessandro Moura
 Pablo Mouzo
 Mher Movsisyan
 Ruslan Mstoi
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,10 @@
 Library
 -------
 
+- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
+  and StringIO objects now raise ValueError when the object has been closed.
+  Patch by Alessandro Moura.
+
 - Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
   os.devnull explicitly and leaving it open.
 
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -121,7 +121,7 @@
 }
 
 /* Internal routine for writing a string of bytes to the buffer of a BytesIO
-   object. Returns the number of bytes wrote, or -1 on error. */
+   object. Returns the number of bytes written, or -1 on error. */
 static Py_ssize_t
 write_bytes(bytesio *self, const char *bytes, Py_ssize_t len)
 {
@@ -171,10 +171,20 @@
     }
 }
 
+PyDoc_STRVAR(readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 /* Generic getter for the writable, readable and seekable properties */
 static PyObject *
-return_true(bytesio *self)
+return_not_closed(bytesio *self)
 {
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -867,9 +877,9 @@
 };
 
 static struct PyMethodDef bytesio_methods[] = {
-    {"readable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"seekable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"writable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
+    {"readable",   (PyCFunction)return_not_closed,  METH_NOARGS, readable_doc},
+    {"seekable",   (PyCFunction)return_not_closed,  METH_NOARGS, seekable_doc},
+    {"writable",   (PyCFunction)return_not_closed,  METH_NOARGS, writable_doc},
     {"close",      (PyCFunction)bytesio_close,      METH_NOARGS, close_doc},
     {"flush",      (PyCFunction)bytesio_flush,      METH_NOARGS, flush_doc},
     {"isatty",     (PyCFunction)bytesio_isatty,     METH_NOARGS, isatty_doc},
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -760,10 +760,21 @@
 }
 
 /* Properties and pseudo-properties */
+
+PyDoc_STRVAR(stringio_readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(stringio_writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(stringio_seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 static PyObject *
 stringio_seekable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -771,6 +782,7 @@
 stringio_readable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -778,6 +790,7 @@
 stringio_writable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -956,9 +969,9 @@
     {"seek",     (PyCFunction)stringio_seek,     METH_VARARGS, stringio_seek_doc},
     {"write",    (PyCFunction)stringio_write,    METH_O,       stringio_write_doc},
 
-    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS},
-    {"readable", (PyCFunction)stringio_readable, METH_NOARGS},
-    {"writable", (PyCFunction)stringio_writable, METH_NOARGS},
+    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS, stringio_seekable_doc},
+    {"readable", (PyCFunction)stringio_readable, METH_NOARGS, stringio_readable_doc},
+    {"writable", (PyCFunction)stringio_writable, METH_NOARGS, stringio_writable_doc},
 
     {"__getstate__", (PyCFunction)stringio_getstate, METH_NOARGS},
     {"__setstate__", (PyCFunction)stringio_setstate, METH_O},

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep  5 20:20:54 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Wed,  5 Sep 2012 20:20:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1ODQx?=
 =?utf-8?q?=3A_The_readable=28=29=2C_writable=28=29_and_seekable=28=29_met?=
 =?utf-8?q?hods_of_io=2EBytesIO?=
Message-ID: <3XBtWp6v9qzQLW@mail.python.org>

http://hg.python.org/cpython/rev/d0ab34d4c733
changeset:   78854:d0ab34d4c733
branch:      2.7
parent:      78826:2370e331241b
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Sep 05 20:11:49 2012 +0200
summary:
  Issue #15841: The readable(), writable() and seekable() methods of io.BytesIO
and io.StringIO objects now raise ValueError when the object has been closed.
Patch by Alessandro Moura.

files:
  Lib/_pyio.py              |   8 ++++++++
  Lib/test/test_memoryio.py |   7 +++----
  Misc/ACKS                 |   1 +
  Misc/NEWS                 |   4 ++++
  Modules/_io/bytesio.c     |  20 +++++++++++++++-----
  Modules/_io/stringio.c    |  19 ++++++++++++++++---
  6 files changed, 47 insertions(+), 12 deletions(-)


diff --git a/Lib/_pyio.py b/Lib/_pyio.py
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -883,12 +883,18 @@
         return pos
 
     def readable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def writable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
 
@@ -1546,6 +1552,8 @@
         return self._buffer
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return self._seekable
 
     def readable(self):
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -328,9 +328,9 @@
         self.assertEqual(memio.isatty(), False)
         self.assertEqual(memio.closed, False)
         memio.close()
-        self.assertEqual(memio.writable(), True)
-        self.assertEqual(memio.readable(), True)
-        self.assertEqual(memio.seekable(), True)
+        self.assertRaises(ValueError, memio.writable)
+        self.assertRaises(ValueError, memio.readable)
+        self.assertRaises(ValueError, memio.seekable)
         self.assertRaises(ValueError, memio.isatty)
         self.assertEqual(memio.closed, True)
 
@@ -649,7 +649,6 @@
         check(io.BytesIO(b'a'), basesize + 1 + 1 )
         check(io.BytesIO(b'a' * 1000), basesize + 1000 + 1 )
 
-
 class CStringIOTest(PyStringIOTest):
     ioclass = io.StringIO
     UnsupportedOperation = io.UnsupportedOperation
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -602,6 +602,7 @@
 Paul Moore
 Derek Morr
 James A Morrison
+Alessandro Moura
 Pablo Mouzo
 Ruslan Mstoi
 Sjoerd Mullender
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,10 @@
 Library
 -------
 
+- Issue #15841: The readable(), writable() and seekable() methods of
+  io.BytesIO and io.StringIO objects now raise ValueError when the object has
+  been closed.  Patch by Alessandro Moura.
+
 - Issue #12776,#11839: call argparse type function (specified by add_argument)
   only once. Before, the type function was called twice in the case where the
   default was specified and the argument was given as well.  This was
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -106,7 +106,7 @@
 }
 
 /* Internal routine for writing a string of bytes to the buffer of a BytesIO
-   object. Returns the number of bytes wrote, or -1 on error. */
+   object. Returns the number of bytes written, or -1 on error. */
 static Py_ssize_t
 write_bytes(bytesio *self, const char *bytes, Py_ssize_t len)
 {
@@ -156,10 +156,20 @@
     }
 }
 
+PyDoc_STRVAR(readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 /* Generic getter for the writable, readable and seekable properties */
 static PyObject *
-return_true(bytesio *self)
+return_not_closed(bytesio *self)
 {
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -827,9 +837,9 @@
 };
 
 static struct PyMethodDef bytesio_methods[] = {
-    {"readable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"seekable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"writable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
+    {"readable",   (PyCFunction)return_not_closed,  METH_NOARGS, readable_doc},
+    {"seekable",   (PyCFunction)return_not_closed,  METH_NOARGS, seekable_doc},
+    {"writable",   (PyCFunction)return_not_closed,  METH_NOARGS, writable_doc},
     {"close",      (PyCFunction)bytesio_close,      METH_NOARGS, close_doc},
     {"flush",      (PyCFunction)bytesio_flush,      METH_NOARGS, flush_doc},
     {"isatty",     (PyCFunction)bytesio_isatty,     METH_NOARGS, isatty_doc},
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -632,10 +632,21 @@
 }
 
 /* Properties and pseudo-properties */
+
+PyDoc_STRVAR(stringio_readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(stringio_writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(stringio_seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 static PyObject *
 stringio_seekable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -643,6 +654,7 @@
 stringio_readable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -650,6 +662,7 @@
 stringio_writable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -817,9 +830,9 @@
     {"seek",     (PyCFunction)stringio_seek,     METH_VARARGS, stringio_seek_doc},
     {"write",    (PyCFunction)stringio_write,    METH_O,       stringio_write_doc},
 
-    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS},
-    {"readable", (PyCFunction)stringio_readable, METH_NOARGS},
-    {"writable", (PyCFunction)stringio_writable, METH_NOARGS},
+    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS, stringio_seekable_doc},
+    {"readable", (PyCFunction)stringio_readable, METH_NOARGS, stringio_readable_doc},
+    {"writable", (PyCFunction)stringio_writable, METH_NOARGS, stringio_writable_doc},
 
     {"__getstate__", (PyCFunction)stringio_getstate, METH_NOARGS},
     {"__setstate__", (PyCFunction)stringio_setstate, METH_O},

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 01:03:50 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  6 Sep 2012 01:03:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzEzOTky?=
 =?utf-8?q?=3A_The_trashcan_mechanism_is_now_thread-safe=2E__This_eliminat?=
 =?utf-8?q?es?=
Message-ID: <3XC0pG20KWzQM6@mail.python.org>

http://hg.python.org/cpython/rev/5a2ef447b80d
changeset:   78855:5a2ef447b80d
branch:      2.7
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Sep 06 00:59:49 2012 +0200
summary:
  Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
sporadic crashes in multi-thread programs when several long deallocator
chains ran concurrently and involved subclasses of built-in container
types.

Because of this change, a couple extension modules compiled for 2.7.4
(those which use the trashcan mechanism, despite it being undocumented)
will not be loadable by 2.7.3 and earlier. However, extension modules
compiled for 2.7.3 and earlier will be loadable by 2.7.4.

files:
  Include/object.h     |  27 ++++++++----
  Include/pystate.h    |   3 +
  Lib/test/test_gc.py  |  69 ++++++++++++++++++++++++++++++++
  Misc/NEWS            |   5 ++
  Objects/object.c     |  37 +++++++++++++++++
  Objects/typeobject.c |   5 ++
  Python/pystate.c     |   3 +
  7 files changed, 140 insertions(+), 9 deletions(-)


diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -971,24 +971,33 @@
 with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
 */
 
+/* This is the old private API, invoked by the macros before 2.7.4.
+   Kept for binary compatibility of extensions. */
 PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
 PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
 PyAPI_DATA(int) _PyTrash_delete_nesting;
 PyAPI_DATA(PyObject *) _PyTrash_delete_later;
 
+/* The new thread-safe private API, invoked by the macros below. */
+PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
+PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
+
 #define PyTrash_UNWIND_LEVEL 50
 
 #define Py_TRASHCAN_SAFE_BEGIN(op) \
-    if (_PyTrash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
-        ++_PyTrash_delete_nesting;
-        /* The body of the deallocator is here. */
+    do { \
+        PyThreadState *_tstate = PyThreadState_GET(); \
+        if (_tstate->trash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
+            ++_tstate->trash_delete_nesting;
+            /* The body of the deallocator is here. */
 #define Py_TRASHCAN_SAFE_END(op) \
-        --_PyTrash_delete_nesting; \
-        if (_PyTrash_delete_later && _PyTrash_delete_nesting <= 0) \
-            _PyTrash_destroy_chain(); \
-    } \
-    else \
-        _PyTrash_deposit_object((PyObject*)op);
+            --_tstate->trash_delete_nesting; \
+            if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \
+                _PyTrash_thread_destroy_chain(); \
+        } \
+        else \
+            _PyTrash_thread_deposit_object((PyObject*)op); \
+    } while (0);
 
 #ifdef __cplusplus
 }
diff --git a/Include/pystate.h b/Include/pystate.h
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -95,6 +95,9 @@
     PyObject *async_exc; /* Asynchronous exception to raise */
     long thread_id; /* Thread id where this tstate was created */
 
+    int trash_delete_nesting;
+    PyObject *trash_delete_later;
+
     /* XXX signal handlers should also be here */
 
 } PyThreadState;
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
--- a/Lib/test/test_gc.py
+++ b/Lib/test/test_gc.py
@@ -1,9 +1,15 @@
 import unittest
 from test.test_support import verbose, run_unittest
 import sys
+import time
 import gc
 import weakref
 
+try:
+    import threading
+except ImportError:
+    threading = None
+
 ### Support code
 ###############################################################################
 
@@ -299,6 +305,69 @@
                 v = {1: v, 2: Ouch()}
         gc.disable()
 
+    @unittest.skipUnless(threading, "test meaningless on builds without threads")
+    def test_trashcan_threads(self):
+        # Issue #13992: trashcan mechanism should be thread-safe
+        NESTING = 60
+        N_THREADS = 2
+
+        def sleeper_gen():
+            """A generator that releases the GIL when closed or dealloc'ed."""
+            try:
+                yield
+            finally:
+                time.sleep(0.000001)
+
+        class C(list):
+            # Appending to a list is atomic, which avoids the use of a lock.
+            inits = []
+            dels = []
+            def __init__(self, alist):
+                self[:] = alist
+                C.inits.append(None)
+            def __del__(self):
+                # This __del__ is called by subtype_dealloc().
+                C.dels.append(None)
+                # `g` will release the GIL when garbage-collected.  This
+                # helps assert subtype_dealloc's behaviour when threads
+                # switch in the middle of it.
+                g = sleeper_gen()
+                next(g)
+                # Now that __del__ is finished, subtype_dealloc will proceed
+                # to call list_dealloc, which also uses the trashcan mechanism.
+
+        def make_nested():
+            """Create a sufficiently nested container object so that the
+            trashcan mechanism is invoked when deallocating it."""
+            x = C([])
+            for i in range(NESTING):
+                x = [C([x])]
+            del x
+
+        def run_thread():
+            """Exercise make_nested() in a loop."""
+            while not exit:
+                make_nested()
+
+        old_checkinterval = sys.getcheckinterval()
+        sys.setcheckinterval(3)
+        try:
+            exit = False
+            threads = []
+            for i in range(N_THREADS):
+                t = threading.Thread(target=run_thread)
+                threads.append(t)
+            for t in threads:
+                t.start()
+            time.sleep(1.0)
+            exit = True
+            for t in threads:
+                t.join()
+        finally:
+            sys.setcheckinterval(old_checkinterval)
+        gc.collect()
+        self.assertEqual(len(C.inits), len(C.dels))
+
     def test_boom(self):
         class Boom:
             def __getattr__(self, someattribute):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,11 @@
 Core and Builtins
 -----------------
 
+- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
+  sporadic crashes in multi-thread programs when several long deallocator
+  chains ran concurrently and involved subclasses of built-in container
+  types.
+
 - Issue #15801: Make sure mappings passed to '%' formatting are actually
   subscriptable.
 
diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -2428,6 +2428,18 @@
     _PyTrash_delete_later = op;
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_deposit_object(PyObject *op)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    assert(PyObject_IS_GC(op));
+    assert(_Py_AS_GC(op)->gc.gc_refs == _PyGC_REFS_UNTRACKED);
+    assert(op->ob_refcnt == 0);
+    _Py_AS_GC(op)->gc.gc_prev = (PyGC_Head *) tstate->trash_delete_later;
+    tstate->trash_delete_later = op;
+}
+
 /* Dealloccate all the objects in the _PyTrash_delete_later list.  Called when
  * the call-stack unwinds again.
  */
@@ -2454,6 +2466,31 @@
     }
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_destroy_chain(void)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    while (tstate->trash_delete_later) {
+        PyObject *op = tstate->trash_delete_later;
+        destructor dealloc = Py_TYPE(op)->tp_dealloc;
+
+        tstate->trash_delete_later =
+            (PyObject*) _Py_AS_GC(op)->gc.gc_prev;
+
+        /* Call the deallocator directly.  This used to try to
+         * fool Py_DECREF into calling it indirectly, but
+         * Py_DECREF was already called on this object, and in
+         * assorted non-release builds calling Py_DECREF again ends
+         * up distorting allocation statistics.
+         */
+        assert(op->ob_refcnt == 0);
+        ++tstate->trash_delete_nesting;
+        (*dealloc)(op);
+        --tstate->trash_delete_nesting;
+    }
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -896,6 +896,7 @@
 {
     PyTypeObject *type, *base;
     destructor basedealloc;
+    PyThreadState *tstate = PyThreadState_GET();
 
     /* Extract the type; we expect it to be a heap type */
     type = Py_TYPE(self);
@@ -945,8 +946,10 @@
     /* See explanation at end of function for full disclosure */
     PyObject_GC_UnTrack(self);
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_BEGIN(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
     /* DO NOT restore GC tracking at this point.  weakref callbacks
      * (if any, and whether directly here or indirectly in something we
      * call) may trigger GC, and if self is tracked at that point, it
@@ -1025,8 +1028,10 @@
 
   endlabel:
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_END(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
 
     /* Explanation of the weirdness around the trashcan macros:
 
diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -192,6 +192,9 @@
         tstate->c_profileobj = NULL;
         tstate->c_traceobj = NULL;
 
+        tstate->trash_delete_nesting = 0;
+        tstate->trash_delete_later = NULL;
+
         if (init)
             _PyThreadState_Init(tstate);
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 01:21:42 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  6 Sep 2012 01:21:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzEzOTky?=
 =?utf-8?q?=3A_The_trashcan_mechanism_is_now_thread-safe=2E__This_eliminat?=
 =?utf-8?q?es?=
Message-ID: <3XC1Bt5WrTzQM6@mail.python.org>

http://hg.python.org/cpython/rev/e72cda3f40a2
changeset:   78856:e72cda3f40a2
branch:      3.2
parent:      78852:524931e5aebf
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Sep 06 00:59:49 2012 +0200
summary:
  Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
sporadic crashes in multi-thread programs when several long deallocator
chains ran concurrently and involved subclasses of built-in container
types.

Because of this change, a couple extension modules compiled for 3.2.4
(those which use the trashcan mechanism, despite it being undocumented)
will not be loadable by 3.2.3 and earlier. However, extension modules
compiled for 3.2.3 and earlier will be loadable by 3.2.4.

files:
  Include/object.h     |  27 ++++++++----
  Include/pystate.h    |   3 +
  Lib/test/test_gc.py  |  69 ++++++++++++++++++++++++++++++++
  Misc/NEWS            |   5 ++
  Objects/object.c     |  37 +++++++++++++++++
  Objects/typeobject.c |   5 ++
  Python/pystate.c     |   3 +
  7 files changed, 140 insertions(+), 9 deletions(-)


diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -911,24 +911,33 @@
 with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
 */
 
+/* This is the old private API, invoked by the macros before 3.2.4.
+   Kept for binary compatibility of extensions. */
 PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
 PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
 PyAPI_DATA(int) _PyTrash_delete_nesting;
 PyAPI_DATA(PyObject *) _PyTrash_delete_later;
 
+/* The new thread-safe private API, invoked by the macros below. */
+PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
+PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
+
 #define PyTrash_UNWIND_LEVEL 50
 
 #define Py_TRASHCAN_SAFE_BEGIN(op) \
-    if (_PyTrash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
-        ++_PyTrash_delete_nesting;
-        /* The body of the deallocator is here. */
+    do { \
+        PyThreadState *_tstate = PyThreadState_GET(); \
+        if (_tstate->trash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
+            ++_tstate->trash_delete_nesting;
+            /* The body of the deallocator is here. */
 #define Py_TRASHCAN_SAFE_END(op) \
-        --_PyTrash_delete_nesting; \
-        if (_PyTrash_delete_later && _PyTrash_delete_nesting <= 0) \
-            _PyTrash_destroy_chain(); \
-    } \
-    else \
-        _PyTrash_deposit_object((PyObject*)op);
+            --_tstate->trash_delete_nesting; \
+            if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \
+                _PyTrash_thread_destroy_chain(); \
+        } \
+        else \
+            _PyTrash_thread_deposit_object((PyObject*)op); \
+    } while (0);
 
 #ifdef __cplusplus
 }
diff --git a/Include/pystate.h b/Include/pystate.h
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -113,6 +113,9 @@
     PyObject *async_exc; /* Asynchronous exception to raise */
     long thread_id; /* Thread id where this tstate was created */
 
+    int trash_delete_nesting;
+    PyObject *trash_delete_later;
+
     /* XXX signal handlers should also be here */
 
 } PyThreadState;
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
--- a/Lib/test/test_gc.py
+++ b/Lib/test/test_gc.py
@@ -1,9 +1,15 @@
 import unittest
 from test.support import verbose, run_unittest, strip_python_stderr
 import sys
+import time
 import gc
 import weakref
 
+try:
+    import threading
+except ImportError:
+    threading = None
+
 ### Support code
 ###############################################################################
 
@@ -310,6 +316,69 @@
                 v = {1: v, 2: Ouch()}
         gc.disable()
 
+    @unittest.skipUnless(threading, "test meaningless on builds without threads")
+    def test_trashcan_threads(self):
+        # Issue #13992: trashcan mechanism should be thread-safe
+        NESTING = 60
+        N_THREADS = 2
+
+        def sleeper_gen():
+            """A generator that releases the GIL when closed or dealloc'ed."""
+            try:
+                yield
+            finally:
+                time.sleep(0.000001)
+
+        class C(list):
+            # Appending to a list is atomic, which avoids the use of a lock.
+            inits = []
+            dels = []
+            def __init__(self, alist):
+                self[:] = alist
+                C.inits.append(None)
+            def __del__(self):
+                # This __del__ is called by subtype_dealloc().
+                C.dels.append(None)
+                # `g` will release the GIL when garbage-collected.  This
+                # helps assert subtype_dealloc's behaviour when threads
+                # switch in the middle of it.
+                g = sleeper_gen()
+                next(g)
+                # Now that __del__ is finished, subtype_dealloc will proceed
+                # to call list_dealloc, which also uses the trashcan mechanism.
+
+        def make_nested():
+            """Create a sufficiently nested container object so that the
+            trashcan mechanism is invoked when deallocating it."""
+            x = C([])
+            for i in range(NESTING):
+                x = [C([x])]
+            del x
+
+        def run_thread():
+            """Exercise make_nested() in a loop."""
+            while not exit:
+                make_nested()
+
+        old_switchinterval = sys.getswitchinterval()
+        sys.setswitchinterval(1e-5)
+        try:
+            exit = False
+            threads = []
+            for i in range(N_THREADS):
+                t = threading.Thread(target=run_thread)
+                threads.append(t)
+            for t in threads:
+                t.start()
+            time.sleep(1.0)
+            exit = True
+            for t in threads:
+                t.join()
+        finally:
+            sys.setswitchinterval(old_switchinterval)
+        gc.collect()
+        self.assertEqual(len(C.inits), len(C.dels))
+
     def test_boom(self):
         class Boom:
             def __getattr__(self, someattribute):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,11 @@
 Core and Builtins
 -----------------
 
+- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
+  sporadic crashes in multi-thread programs when several long deallocator
+  chains ran concurrently and involved subclasses of built-in container
+  types.
+
 - Issue #15846: Fix SystemError which happened when using ast.parse in an
   exception handler on code with syntax errors.
 
diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1876,6 +1876,18 @@
     _PyTrash_delete_later = op;
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_deposit_object(PyObject *op)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    assert(PyObject_IS_GC(op));
+    assert(_Py_AS_GC(op)->gc.gc_refs == _PyGC_REFS_UNTRACKED);
+    assert(op->ob_refcnt == 0);
+    _Py_AS_GC(op)->gc.gc_prev = (PyGC_Head *) tstate->trash_delete_later;
+    tstate->trash_delete_later = op;
+}
+
 /* Dealloccate all the objects in the _PyTrash_delete_later list.  Called when
  * the call-stack unwinds again.
  */
@@ -1902,6 +1914,31 @@
     }
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_destroy_chain(void)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    while (tstate->trash_delete_later) {
+        PyObject *op = tstate->trash_delete_later;
+        destructor dealloc = Py_TYPE(op)->tp_dealloc;
+
+        tstate->trash_delete_later =
+            (PyObject*) _Py_AS_GC(op)->gc.gc_prev;
+
+        /* Call the deallocator directly.  This used to try to
+         * fool Py_DECREF into calling it indirectly, but
+         * Py_DECREF was already called on this object, and in
+         * assorted non-release builds calling Py_DECREF again ends
+         * up distorting allocation statistics.
+         */
+        assert(op->ob_refcnt == 0);
+        ++tstate->trash_delete_nesting;
+        (*dealloc)(op);
+        --tstate->trash_delete_nesting;
+    }
+}
+
 #ifndef Py_TRACE_REFS
 /* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc.
    Define this here, so we can undefine the macro. */
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -847,6 +847,7 @@
 {
     PyTypeObject *type, *base;
     destructor basedealloc;
+    PyThreadState *tstate = PyThreadState_GET();
 
     /* Extract the type; we expect it to be a heap type */
     type = Py_TYPE(self);
@@ -896,8 +897,10 @@
     /* See explanation at end of function for full disclosure */
     PyObject_GC_UnTrack(self);
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_BEGIN(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
     /* DO NOT restore GC tracking at this point.  weakref callbacks
      * (if any, and whether directly here or indirectly in something we
      * call) may trigger GC, and if self is tracked at that point, it
@@ -976,8 +979,10 @@
 
   endlabel:
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_END(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
 
     /* Explanation of the weirdness around the trashcan macros:
 
diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -206,6 +206,9 @@
         tstate->c_profileobj = NULL;
         tstate->c_traceobj = NULL;
 
+        tstate->trash_delete_nesting = 0;
+        tstate->trash_delete_later = NULL;
+
         if (init)
             _PyThreadState_Init(tstate);
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 01:21:44 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu,  6 Sep 2012 01:21:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2313992=3A_The_trashcan_mechanism_is_now_thread-s?=
 =?utf-8?q?afe=2E__This_eliminates?=
Message-ID: <3XC1Bw5Q1VzQPN@mail.python.org>

http://hg.python.org/cpython/rev/6bcaba9e8df2
changeset:   78857:6bcaba9e8df2
parent:      78853:fcf097cb5f6b
parent:      78856:e72cda3f40a2
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Sep 06 01:17:42 2012 +0200
summary:
  Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
sporadic crashes in multi-thread programs when several long deallocator
chains ran concurrently and involved subclasses of built-in container
types.

Note that the trashcan functions are part of the stable ABI, therefore
they have to be kept around for binary compatibility of extensions.

files:
  Include/object.h     |  27 ++++++++----
  Include/pystate.h    |   3 +
  Lib/test/test_gc.py  |  69 ++++++++++++++++++++++++++++++++
  Misc/NEWS            |   5 ++
  Objects/object.c     |  37 +++++++++++++++++
  Objects/typeobject.c |   5 ++
  Python/pystate.c     |   3 +
  7 files changed, 140 insertions(+), 9 deletions(-)


diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -961,24 +961,33 @@
 with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
 */
 
+/* This is the old private API, invoked by the macros before 3.2.4.
+   Kept for binary compatibility of extensions using the stable ABI. */
 PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
 PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
 PyAPI_DATA(int) _PyTrash_delete_nesting;
 PyAPI_DATA(PyObject *) _PyTrash_delete_later;
 
+/* The new thread-safe private API, invoked by the macros below. */
+PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
+PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
+
 #define PyTrash_UNWIND_LEVEL 50
 
 #define Py_TRASHCAN_SAFE_BEGIN(op) \
-    if (_PyTrash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
-        ++_PyTrash_delete_nesting;
-        /* The body of the deallocator is here. */
+    do { \
+        PyThreadState *_tstate = PyThreadState_GET(); \
+        if (_tstate->trash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
+            ++_tstate->trash_delete_nesting;
+            /* The body of the deallocator is here. */
 #define Py_TRASHCAN_SAFE_END(op) \
-        --_PyTrash_delete_nesting; \
-        if (_PyTrash_delete_later && _PyTrash_delete_nesting <= 0) \
-            _PyTrash_destroy_chain(); \
-    } \
-    else \
-        _PyTrash_deposit_object((PyObject*)op);
+            --_tstate->trash_delete_nesting; \
+            if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \
+                _PyTrash_thread_destroy_chain(); \
+        } \
+        else \
+            _PyTrash_thread_deposit_object((PyObject*)op); \
+    } while (0);
 
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(void)
diff --git a/Include/pystate.h b/Include/pystate.h
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -114,6 +114,9 @@
     PyObject *async_exc; /* Asynchronous exception to raise */
     long thread_id; /* Thread id where this tstate was created */
 
+    int trash_delete_nesting;
+    PyObject *trash_delete_later;
+
     /* XXX signal handlers should also be here */
 
 } PyThreadState;
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
--- a/Lib/test/test_gc.py
+++ b/Lib/test/test_gc.py
@@ -2,9 +2,15 @@
 from test.support import (verbose, refcount_test, run_unittest,
                             strip_python_stderr)
 import sys
+import time
 import gc
 import weakref
 
+try:
+    import threading
+except ImportError:
+    threading = None
+
 ### Support code
 ###############################################################################
 
@@ -328,6 +334,69 @@
                 v = {1: v, 2: Ouch()}
         gc.disable()
 
+    @unittest.skipUnless(threading, "test meaningless on builds without threads")
+    def test_trashcan_threads(self):
+        # Issue #13992: trashcan mechanism should be thread-safe
+        NESTING = 60
+        N_THREADS = 2
+
+        def sleeper_gen():
+            """A generator that releases the GIL when closed or dealloc'ed."""
+            try:
+                yield
+            finally:
+                time.sleep(0.000001)
+
+        class C(list):
+            # Appending to a list is atomic, which avoids the use of a lock.
+            inits = []
+            dels = []
+            def __init__(self, alist):
+                self[:] = alist
+                C.inits.append(None)
+            def __del__(self):
+                # This __del__ is called by subtype_dealloc().
+                C.dels.append(None)
+                # `g` will release the GIL when garbage-collected.  This
+                # helps assert subtype_dealloc's behaviour when threads
+                # switch in the middle of it.
+                g = sleeper_gen()
+                next(g)
+                # Now that __del__ is finished, subtype_dealloc will proceed
+                # to call list_dealloc, which also uses the trashcan mechanism.
+
+        def make_nested():
+            """Create a sufficiently nested container object so that the
+            trashcan mechanism is invoked when deallocating it."""
+            x = C([])
+            for i in range(NESTING):
+                x = [C([x])]
+            del x
+
+        def run_thread():
+            """Exercise make_nested() in a loop."""
+            while not exit:
+                make_nested()
+
+        old_switchinterval = sys.getswitchinterval()
+        sys.setswitchinterval(1e-5)
+        try:
+            exit = False
+            threads = []
+            for i in range(N_THREADS):
+                t = threading.Thread(target=run_thread)
+                threads.append(t)
+            for t in threads:
+                t.start()
+            time.sleep(1.0)
+            exit = True
+            for t in threads:
+                t.join()
+        finally:
+            sys.setswitchinterval(old_switchinterval)
+        gc.collect()
+        self.assertEqual(len(C.inits), len(C.dels))
+
     def test_boom(self):
         class Boom:
             def __getattr__(self, someattribute):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,11 @@
 Core and Builtins
 -----------------
 
+- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
+  sporadic crashes in multi-thread programs when several long deallocator
+  chains ran concurrently and involved subclasses of built-in container
+  types.
+
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 
 - Issue #15846: Fix SystemError which happened when using ast.parse in an
diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1954,6 +1954,18 @@
     _PyTrash_delete_later = op;
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_deposit_object(PyObject *op)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    assert(PyObject_IS_GC(op));
+    assert(_Py_AS_GC(op)->gc.gc_refs == _PyGC_REFS_UNTRACKED);
+    assert(op->ob_refcnt == 0);
+    _Py_AS_GC(op)->gc.gc_prev = (PyGC_Head *) tstate->trash_delete_later;
+    tstate->trash_delete_later = op;
+}
+
 /* Dealloccate all the objects in the _PyTrash_delete_later list.  Called when
  * the call-stack unwinds again.
  */
@@ -1980,6 +1992,31 @@
     }
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_destroy_chain(void)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    while (tstate->trash_delete_later) {
+        PyObject *op = tstate->trash_delete_later;
+        destructor dealloc = Py_TYPE(op)->tp_dealloc;
+
+        tstate->trash_delete_later =
+            (PyObject*) _Py_AS_GC(op)->gc.gc_prev;
+
+        /* Call the deallocator directly.  This used to try to
+         * fool Py_DECREF into calling it indirectly, but
+         * Py_DECREF was already called on this object, and in
+         * assorted non-release builds calling Py_DECREF again ends
+         * up distorting allocation statistics.
+         */
+        assert(op->ob_refcnt == 0);
+        ++tstate->trash_delete_nesting;
+        (*dealloc)(op);
+        --tstate->trash_delete_nesting;
+    }
+}
+
 #ifndef Py_TRACE_REFS
 /* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc.
    Define this here, so we can undefine the macro. */
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -891,6 +891,7 @@
 {
     PyTypeObject *type, *base;
     destructor basedealloc;
+    PyThreadState *tstate = PyThreadState_GET();
 
     /* Extract the type; we expect it to be a heap type */
     type = Py_TYPE(self);
@@ -940,8 +941,10 @@
     /* See explanation at end of function for full disclosure */
     PyObject_GC_UnTrack(self);
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_BEGIN(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
     /* DO NOT restore GC tracking at this point.  weakref callbacks
      * (if any, and whether directly here or indirectly in something we
      * call) may trigger GC, and if self is tracked at that point, it
@@ -1020,8 +1023,10 @@
 
   endlabel:
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_END(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
 
     /* Explanation of the weirdness around the trashcan macros:
 
diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -206,6 +206,9 @@
         tstate->c_profileobj = NULL;
         tstate->c_traceobj = NULL;
 
+        tstate->trash_delete_nesting = 0;
+        tstate->trash_delete_later = NULL;
+
         if (init)
             _PyThreadState_Init(tstate);
 

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Thu Sep  6 06:06:46 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 06 Sep 2012 06:06:46 +0200
Subject: [Python-checkins] Daily reference leaks (6bcaba9e8df2): sum=1
Message-ID: <E1T9TMc-0005Na-Nj@ap.vmr.nerim.net>

results for 6bcaba9e8df2 on branch "default"
--------------------------------------------

test_support leaked [1, 0, 0] references, sum=1


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogebcnjc', '-x']

From python-checkins at python.org  Thu Sep  6 07:21:53 2012
From: python-checkins at python.org (eric.snow)
Date: Thu,  6 Sep 2012 07:21:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_add_whatsnew_entry_for_PEP?=
	=?utf-8?q?_421?=
Message-ID: <3XC9BT1kLczQMw@mail.python.org>

http://hg.python.org/cpython/rev/30ce5a944c7d
changeset:   78858:30ce5a944c7d
user:        Eric Snow <ericsnowcurrently at gmail.com>
date:        Wed Sep 05 22:19:38 2012 -0700
summary:
  add whatsnew entry for PEP 421

files:
  Doc/whatsnew/3.3.rst |  35 ++++++++++++++++++++++++++++++++
  1 files changed, 35 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -564,6 +564,41 @@
 or amends calling signatures or arguments.
 
 
+PEP 421: Adding sys.implementation
+==================================
+
+:pep:`421` - Adding sys.implementation
+ PEP written and implemented by Eric Snow.
+
+A new attribute on the :mod:`sys` module exposes details specific to the
+implementation of the currently running interpreter.  The initial set of
+attributes on :attr:`sys.implementation` are ``name``, ``version``,
+``hexversion``, and ``cache_tag``.
+
+The intention of ``sys.implementation`` is to consolidate into one namespace
+the implementation-specific data used by the standard library.  This allows
+different Python implementations to share a single standard library code base
+much more easily.  In its initial state, ``sys.implementation`` holds only a
+small portion of the implementation-specific data.  Over time that ratio will
+shift in order to make the standard library more portable.
+
+One example of improved standard library portability is ``cache_tag``.  As of
+Python 3.3, ``sys.implementation.cache_tag`` is used by :mod:`importlib` to
+support :pep:`3147` compliance.  Any Python implementation that uses
+``importlib`` for its built-in import system may use ``cache_tag`` to control
+the caching behavior for modules.
+
+SimpleNamespace
+---------------
+
+The implementation of ``sys.implementation`` also introduces a new type to
+Python: :class:`types.SimpleNamespace`.  In contrast to a mapping-based
+namespace, like :class:`dict`, ``SimpleNamespace`` is attribute-based, like
+:class:`object`.  However, unlike ``object``, ``SimpleNamespace`` instances
+are writable.  This means that you can add, remove, and modify the namespace
+through normal attribute access.
+
+
 .. _importlib:
 
 Using importlib as the Implementation of Import

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 09:49:19 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu,  6 Sep 2012 09:49:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=5Ftestbuffer=2Ec=3A_In_al?=
 =?utf-8?q?l_current_use_cases_of_cmp=5Fstructure=28=29_dest-=3Eformat_and?=
Message-ID: <3XCDSb3qZFzQNv@mail.python.org>

http://hg.python.org/cpython/rev/7c007110d952
changeset:   78859:7c007110d952
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Sep 06 09:42:29 2012 +0200
summary:
  _testbuffer.c: In all current use cases of cmp_structure() dest->format and
src->format are either both NULL or both non-NULL. However, it is safer to
generalize the function. Found by Coverity.

files:
  Modules/_testbuffer.c |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
--- a/Modules/_testbuffer.c
+++ b/Modules/_testbuffer.c
@@ -16,6 +16,7 @@
 static const char *simple_fmt = "B";
 PyObject *simple_format = NULL;
 #define SIMPLE_FORMAT(fmt) (fmt == NULL || strcmp(fmt, "B") == 0)
+#define FIX_FORMAT(fmt) (fmt == NULL ? "B" : fmt)
 
 
 /**************************************************************************/
@@ -513,10 +514,8 @@
 cmp_structure(Py_buffer *dest, Py_buffer *src)
 {
     Py_ssize_t i;
-    int same_fmt = ((dest->format == NULL && src->format == NULL) || \
-                    (strcmp(dest->format, src->format) == 0));
-
-    if (!same_fmt ||
+
+    if (strcmp(FIX_FORMAT(dest->format), FIX_FORMAT(src->format)) != 0 ||
         dest->itemsize != src->itemsize ||
         dest->ndim != src->ndim)
         return -1;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 13:09:21 2012
From: python-checkins at python.org (stefan.krah)
Date: Thu,  6 Sep 2012 13:09:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_After_the_jump_in_line_105?=
 =?utf-8?q?1_unicode=5Ftmp_is_NULL=2E_Found_by_Coverity=2E?=
Message-ID: <3XCJvP5V0CzQLq@mail.python.org>

http://hg.python.org/cpython/rev/dc2909a62262
changeset:   78860:dc2909a62262
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Sep 06 13:02:46 2012 +0200
summary:
  After the jump in line 1051 unicode_tmp is NULL. Found by Coverity.

files:
  Python/formatter_unicode.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -1099,7 +1099,7 @@
                          &locale, 0);
 
 done:
-    Py_DECREF(unicode_tmp);
+    Py_XDECREF(unicode_tmp);
     free_locale_info(&locale);
     return result;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 18:06:55 2012
From: python-checkins at python.org (christian.heimes)
Date: Thu,  6 Sep 2012 18:06:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1NTkx?=
 =?utf-8?q?=3A_run_ctypes=27_configure_in_quiet_mode_when_setup=2Epy_runs_?=
 =?utf-8?q?silently?=
Message-ID: <3XCRVl4l9dzNB3@mail.python.org>

http://hg.python.org/cpython/rev/048e13546a7c
changeset:   78861:048e13546a7c
branch:      3.2
parent:      78856:e72cda3f40a2
user:        Christian Heimes <christian at cheimes.de>
date:        Thu Sep 06 18:02:49 2012 +0200
summary:
  Issue #15591: run ctypes' configure in quiet mode when setup.py runs silently

files:
  setup.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1675,6 +1675,8 @@
                 from distutils.dir_util import mkpath
                 mkpath(ffi_builddir)
                 config_args = []
+                if not self.verbose:
+                    config_args.append("-q")
 
                 # Pass empty CFLAGS because we'll just append the resulting
                 # CFLAGS to Python's; -g or -O2 is to be avoided.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 18:06:57 2012
From: python-checkins at python.org (christian.heimes)
Date: Thu,  6 Sep 2012 18:06:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315591=3A_run_ctypes=27_configure_in_quiet_mode_?=
 =?utf-8?q?when_setup=2Epy_runs_silently?=
Message-ID: <3XCRVn3DyNzQYc@mail.python.org>

http://hg.python.org/cpython/rev/e5569b03a287
changeset:   78862:e5569b03a287
parent:      78860:dc2909a62262
parent:      78861:048e13546a7c
user:        Christian Heimes <christian at cheimes.de>
date:        Thu Sep 06 18:03:32 2012 +0200
summary:
  Issue #15591: run ctypes' configure in quiet mode when setup.py runs silently

files:
  setup.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1788,6 +1788,8 @@
                 mkpath(ffi_builddir)
                 config_args = [arg for arg in sysconfig.get_config_var("CONFIG_ARGS").split()
                                if (('--host=' in arg) or ('--build=' in arg))]
+                if not self.verbose:
+                    config_args.append("-q")
 
                 # Pass empty CFLAGS because we'll just append the resulting
                 # CFLAGS to Python's; -g or -O2 is to be avoided.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 18:06:58 2012
From: python-checkins at python.org (christian.heimes)
Date: Thu,  6 Sep 2012 18:06:58 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1NTkx?=
 =?utf-8?q?=3A_run_ctypes=27_configure_in_quiet_mode_when_setup=2Epy_runs_?=
 =?utf-8?q?silently?=
Message-ID: <3XCRVp62tLzQZg@mail.python.org>

http://hg.python.org/cpython/rev/962e8b2a39f3
changeset:   78863:962e8b2a39f3
branch:      2.7
parent:      78855:5a2ef447b80d
user:        Christian Heimes <christian at cheimes.de>
date:        Thu Sep 06 18:02:49 2012 +0200
summary:
  Issue #15591: run ctypes' configure in quiet mode when setup.py runs silently

files:
  setup.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1872,6 +1872,8 @@
                 from distutils.dir_util import mkpath
                 mkpath(ffi_builddir)
                 config_args = []
+                if not self.verbose:
+                    config_args.append("-q")
 
                 # Pass empty CFLAGS because we'll just append the resulting
                 # CFLAGS to Python's; -g or -O2 is to be avoided.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep  6 19:03:04 2012
From: python-checkins at python.org (ross.lagerwall)
Date: Thu,  6 Sep 2012 19:03:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_a_typo_in_the_curses_d?=
	=?utf-8?q?ocs?=
Message-ID: <3XCSlX2MSJzQ9k@mail.python.org>

http://hg.python.org/cpython/rev/99a436de7029
changeset:   78864:99a436de7029
parent:      78862:e5569b03a287
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Thu Sep 06 18:58:43 2012 +0200
summary:
  Fix a typo in the curses docs

files:
  Doc/library/curses.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -837,7 +837,7 @@
 .. attribute:: window.encoding
 
    Encoding used to encode method arguments (Unicode strings and characters).
-   The encoding attribute is inherited from by parent window when a subwindow
+   The encoding attribute is inherited from the parent window when a subwindow
    is created, for example with :meth:`window.subwin`. By default, the locale
    encoding is used (see :func:`locale.getpreferredencoding`).
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 01:19:05 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 01:19:05 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1NTkx?=
 =?utf-8?q?_and_Issue_=2311715=3A_silence_output_of_setup=2Epy_when_make_i?=
 =?utf-8?q?s_run_with?=
Message-ID: <3XCd5P6BZmzQYn@mail.python.org>

http://hg.python.org/cpython/rev/b9261dd34289
changeset:   78865:b9261dd34289
branch:      3.2
parent:      78861:048e13546a7c
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 00:55:33 2012 +0200
summary:
  Issue #15591 and Issue #11715: silence output of setup.py when make is run with -s option.

files:
  Makefile.pre.in |  16 +++++++++-------
  1 files changed, 9 insertions(+), 7 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -198,6 +198,14 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
+# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
+# by GNU make. The 's' flag is always in the first word.
+ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
+    QUIET=-q
+else
+    QUIET=
+endif
+
 # === Definitions added by makesetup ===
 
 
@@ -438,14 +446,8 @@
 
 # Build the shared modules
 sharedmods: $(BUILDPYTHON)
-	if which getopt >/dev/null; then \
-	  mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \
-	else \
-	  mflags=" $$MAKEFLAGS "; \
-	fi; \
-	case $$mflags in "* -s *") quiet=-q; esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
+		./$(BUILDPYTHON) -E $(srcdir)/setup.py $(QUIET) build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 01:19:07 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 01:19:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315591_and_Issue_=2311715=3A_silence_output_of_s?=
 =?utf-8?q?etup=2Epy_when_make_is_run_with?=
Message-ID: <3XCd5R2vdHzQbL@mail.python.org>

http://hg.python.org/cpython/rev/fcc629208842
changeset:   78866:fcc629208842
parent:      78862:e5569b03a287
parent:      78865:b9261dd34289
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 00:56:56 2012 +0200
summary:
  Issue #15591 and Issue #11715: silence output of setup.py when make is run with -s option.

files:
  Makefile.pre.in |  16 +++++++++-------
  1 files changed, 9 insertions(+), 7 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -202,6 +202,14 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
+# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
+# by GNU make. The 's' flag is always in the first word.
+ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
+    QUIET=-q
+else
+    QUIET=
+endif
+
 # === Definitions added by makesetup ===
 
 
@@ -475,14 +483,8 @@
 
 # Build the shared modules
 sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
-	if which getopt >/dev/null; then \
-	  mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \
-	else \
-	  mflags=" $$MAKEFLAGS "; \
-	fi; \
-	case $$mflags in "* -s *") quiet=-q; esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $(QUIET) build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 01:19:08 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 01:19:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1NTkx?=
 =?utf-8?q?_and_Issue_=2311715=3A_silence_output_of_setup=2Epy_when_make_i?=
 =?utf-8?q?s_run_with?=
Message-ID: <3XCd5S5k7yzQYn@mail.python.org>

http://hg.python.org/cpython/rev/2587aeb616b6
changeset:   78867:2587aeb616b6
branch:      2.7
parent:      78863:962e8b2a39f3
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 00:58:26 2012 +0200
summary:
  Issue #15591 and Issue #11715: silence output of setup.py when make is run with -s option.

files:
  Makefile.pre.in |  16 +++++++++-------
  1 files changed, 9 insertions(+), 7 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -189,6 +189,14 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
+# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
+# by GNU make. The 's' flag is always in the first word.
+ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
+    QUIET=-q
+else
+    QUIET=
+endif
+
 # === Definitions added by makesetup ===
 
 
@@ -409,14 +417,8 @@
 
 # Build the shared modules
 sharedmods: $(BUILDPYTHON)
-	if which getopt >/dev/null 2>&1; then \
-	  mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \
-	else \
-	  mflags=" $$MAKEFLAGS "; \
-	fi; \
-	case $$mflags in "* -s *") quiet=-q; esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
+		./$(BUILDPYTHON) -E $(srcdir)/setup.py $(QUIET) build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 01:19:10 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 01:19:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315591_and_Issue_=2311715=3A_silence_output_of_s?=
 =?utf-8?q?etup=2Epy_when_make_is_run_with?=
Message-ID: <3XCd5V1t6qzQcV@mail.python.org>

http://hg.python.org/cpython/rev/4807ed8a627e
changeset:   78868:4807ed8a627e
parent:      78864:99a436de7029
parent:      78866:fcc629208842
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 01:07:12 2012 +0200
summary:
  Issue #15591 and Issue #11715: silence output of setup.py when make is run with -s option.

files:
  Makefile.pre.in |  16 +++++++++-------
  1 files changed, 9 insertions(+), 7 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -202,6 +202,14 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
+# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
+# by GNU make. The 's' flag is always in the first word.
+ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
+    QUIET=-q
+else
+    QUIET=
+endif
+
 # === Definitions added by makesetup ===
 
 
@@ -475,14 +483,8 @@
 
 # Build the shared modules
 sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
-	if which getopt >/dev/null; then \
-	  mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \
-	else \
-	  mflags=" $$MAKEFLAGS "; \
-	fi; \
-	case $$mflags in "* -s *") quiet=-q; esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $(QUIET) build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 02:27:22 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 02:27:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_for_fcc629?=
	=?utf-8?q?208842?=
Message-ID: <3XCfcB1ZLFzM2t@mail.python.org>

http://hg.python.org/cpython/rev/abb858a0740f
changeset:   78869:abb858a0740f
branch:      3.2
parent:      78865:b9261dd34289
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 02:24:58 2012 +0200
summary:
  Fix for fcc629208842
BSD's make doesn't support some of the features.

files:
  Makefile.pre.in |  16 +++++++---------
  1 files changed, 7 insertions(+), 9 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -198,14 +198,6 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
-# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
-# by GNU make. The 's' flag is always in the first word.
-ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
-    QUIET=-q
-else
-    QUIET=
-endif
-
 # === Definitions added by makesetup ===
 
 
@@ -445,9 +437,15 @@
 
 
 # Build the shared modules
+# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+# -s, --silent or --quiet is always the first char.
 sharedmods: $(BUILDPYTHON)
+	@case "$$MAKEFLAGS" in \
+	    s*) quiet="-q";; \
+	    *) quiet="";; \
+	esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		./$(BUILDPYTHON) -E $(srcdir)/setup.py $(QUIET) build
+		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 02:27:23 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 02:27:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_Fix_for_fcc629208842?=
Message-ID: <3XCfcC6x31zQJK@mail.python.org>

http://hg.python.org/cpython/rev/ffcb7f5f2e48
changeset:   78870:ffcb7f5f2e48
parent:      78868:4807ed8a627e
parent:      78869:abb858a0740f
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 02:26:26 2012 +0200
summary:
  Fix for fcc629208842
BSD's make doesn't support some of the features.

files:
  Makefile.pre.in |  16 +++++++---------
  1 files changed, 7 insertions(+), 9 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -202,14 +202,6 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
-# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
-# by GNU make. The 's' flag is always in the first word.
-ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
-    QUIET=-q
-else
-    QUIET=
-endif
-
 # === Definitions added by makesetup ===
 
 
@@ -482,9 +474,15 @@
 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
 
 # Build the shared modules
+# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+# -s, --silent or --quiet is always the first char.
 sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
+	@case "$$MAKEFLAGS" in \
+	    s*) quiet="-q";; \
+	    *) quiet="";; \
+	esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $(QUIET) build
+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 02:27:25 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 02:27:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1NTkx?=
 =?utf-8?q?_and_Issue_=2311715=3A_silence_output_of_setup=2Epy_when_make_i?=
 =?utf-8?q?s_run_with?=
Message-ID: <3XCfcF2gx1zQLL@mail.python.org>

http://hg.python.org/cpython/rev/8cd6acffbcb9
changeset:   78871:8cd6acffbcb9
branch:      2.7
parent:      78867:2587aeb616b6
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 00:55:33 2012 +0200
summary:
  Issue #15591 and Issue #11715: silence output of setup.py when make is run with -s option.

files:



-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Fri Sep  7 06:05:24 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 07 Sep 2012 06:05:24 +0200
Subject: [Python-checkins] Daily reference leaks (ffcb7f5f2e48): sum=0
Message-ID: <E1T9poq-0005Xp-9b@ap.vmr.nerim.net>

results for ffcb7f5f2e48 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogYqyJNz', '-x']

From python-checkins at python.org  Fri Sep  7 08:38:27 2012
From: python-checkins at python.org (ross.lagerwall)
Date: Fri,  7 Sep 2012 08:38:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315876=3A_Fix_a_re?=
	=?utf-8?q?fleak_in_the_curses_module?=
Message-ID: <3XCprM0mppzQDt@mail.python.org>

http://hg.python.org/cpython/rev/c82e3a6553fc
changeset:   78872:c82e3a6553fc
parent:      78870:ffcb7f5f2e48
user:        Ross Lagerwall <rosslagerwall at gmail.com>
date:        Fri Sep 07 08:34:23 2012 +0200
summary:
  Issue #15876: Fix a refleak in the curses module

The refleak occurred when assigning to window.encoding.

files:
  Misc/NEWS               |  2 ++
  Modules/_cursesmodule.c |  1 +
  2 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@
 Library
 -------
 
+- Issue #15876: Fix a refleak in the curses module: window.encoding.
+
 - Issue #15841: The readable(), writable() and seekable() methods of BytesIO
   and StringIO objects now raise ValueError when the object has been closed.
   Patch by Alessandro Moura.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1938,6 +1938,7 @@
     if (ascii == NULL)
         return -1;
     encoding = strdup(PyBytes_AS_STRING(ascii));
+    Py_DECREF(ascii);
     if (encoding == NULL) {
         PyErr_NoMemory();
         return -1;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 14:33:18 2012
From: python-checkins at python.org (christian.heimes)
Date: Fri,  7 Sep 2012 14:33:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Added_me_and_Brett_as_con?=
	=?utf-8?q?tacts_for_coverity_scan?=
Message-ID: <3XCyjp4z6xzQKj@mail.python.org>

http://hg.python.org/devguide/rev/8a37fda37d44
changeset:   543:8a37fda37d44
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 14:33:07 2012 +0200
summary:
  Added me and Brett as contacts for coverity scan

files:
  experts.rst |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/experts.rst b/experts.rst
--- a/experts.rst
+++ b/experts.rst
@@ -301,6 +301,7 @@
 buildbots           pitrou
 bytecode            pitrou, georg.brandl
 context managers    ncoghlan
+coverity scan       christian.heimes, brett.cannon
 data formats        mark.dickinson, georg.brandl
 database            lemburg
 devguide            ncoghlan, eric.araujo, ezio.melotti

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Fri Sep  7 23:56:06 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri,  7 Sep 2012 23:56:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1MzQw?=
 =?utf-8?q?=3A_Fix_importing_the_random_module_when_/dev/urandom_cannot_be?=
Message-ID: <3XDCCB2tkdzQ0h@mail.python.org>

http://hg.python.org/cpython/rev/2e8b01583839
changeset:   78873:2e8b01583839
branch:      3.2
parent:      78869:abb858a0740f
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Sep 07 23:49:07 2012 +0200
summary:
  Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
This was a regression caused by the hash randomization patch.

files:
  Misc/NEWS       |  3 +++
  Python/random.c |  3 ++-
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,9 @@
 Library
 -------
 
+- Issue #15340: Fix importing the random module when /dev/urandom cannot
+  be opened.  This was a regression caused by the hash randomization patch.
+
 - Issue #15841: The readable(), writable() and seekable() methods of BytesIO
   and StringIO objects now raise ValueError when the object has been closed.
   Patch by Alessandro Moura.
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -165,7 +165,8 @@
     Py_END_ALLOW_THREADS
     if (fd < 0)
     {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom");
+        PyErr_SetString(PyExc_NotImplementedError,
+                        "/dev/urandom (or equivalent) not found");
         return -1;
     }
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 23:56:08 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri,  7 Sep 2012 23:56:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315340=3A_Fix_importing_the_random_module_when_/?=
 =?utf-8?q?dev/urandom_cannot_be?=
Message-ID: <3XDCCD0q7rzQ6q@mail.python.org>

http://hg.python.org/cpython/rev/a53fc9982e2a
changeset:   78874:a53fc9982e2a
parent:      78872:c82e3a6553fc
parent:      78873:2e8b01583839
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Sep 07 23:51:22 2012 +0200
summary:
  Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
This was a regression caused by the hash randomization patch.

files:
  Misc/NEWS       |  3 +++
  Python/random.c |  3 ++-
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -88,6 +88,9 @@
 Library
 -------
 
+- Issue #15340: Fix importing the random module when /dev/urandom cannot
+  be opened.  This was a regression caused by the hash randomization patch.
+
 - Issue #15828: Restore support for C extensions in imp.load_module()
 
 - Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize()
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -165,7 +165,8 @@
     Py_END_ALLOW_THREADS
     if (fd < 0)
     {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom");
+        PyErr_SetString(PyExc_NotImplementedError,
+                        "/dev/urandom (or equivalent) not found");
         return -1;
     }
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep  7 23:58:48 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri,  7 Sep 2012 23:58:48 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1MzQw?=
 =?utf-8?q?=3A_Fix_importing_the_random_module_when_/dev/urandom_cannot_be?=
Message-ID: <3XDCGJ1Y2gzQ90@mail.python.org>

http://hg.python.org/cpython/rev/edbf37ace03c
changeset:   78875:edbf37ace03c
branch:      2.7
parent:      78871:8cd6acffbcb9
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Sep 07 23:49:07 2012 +0200
summary:
  Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
This was a regression caused by the hash randomization patch.

files:
  Misc/NEWS       |  3 +++
  Python/random.c |  3 ++-
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,9 @@
 Library
 -------
 
+- Issue #15340: Fix importing the random module when /dev/urandom cannot
+  be opened.  This was a regression caused by the hash randomization patch.
+
 - Issue #15841: The readable(), writable() and seekable() methods of
   io.BytesIO and io.StringIO objects now raise ValueError when the object has
   been closed.  Patch by Alessandro Moura.
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -165,7 +165,8 @@
     Py_END_ALLOW_THREADS
     if (fd < 0)
     {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom");
+        PyErr_SetString(PyExc_NotImplementedError,
+                        "/dev/urandom (or equivalent) not found");
         return -1;
     }
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 05:53:50 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sat,  8 Sep 2012 05:53:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Mention_Petri=27s_git_mir?=
 =?utf-8?q?ror=2C_since_this_question_has_come_up_a_couple_of_times?=
Message-ID: <3XDM7y0LVFzQ4s@mail.python.org>

http://hg.python.org/devguide/rev/a19e721916f5
changeset:   544:a19e721916f5
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sat Sep 08 13:53:41 2012 +1000
summary:
  Mention Petri's git mirror, since this question has come up a couple of times now and using Petri's mirror is the simplest answer

files:
  faq.rst |  24 ++++++++++++++++++++++++
  1 files changed, 24 insertions(+), 0 deletions(-)


diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -140,6 +140,30 @@
 .. _Hg Init\: a Mercurial tutorial: http://hginit.com/
 
 
+I already know how to use Git, can I use that instead?
+------------------------------------------------------
+
+While the main workflow for core developers requires Mercurial, if
+you just want to generate patches with ``git diff`` and post them to the
+`issue tracker`_, Petri Lehtinen maintains a `git mirror`_ of the main
+`CPython repository`_. To create a local clone based on this mirror rather
+than the main repository::
+
+    git clone git://github.com/akheron/cpython
+
+The mirror's master branch tracks the main repository's default branch,
+while the maintenance branch names (``2.7``, ``3.2``, etc) are mapped
+directly.
+
+.. _git mirror: http://github.com/akheron/cpython
+.. _CPython repository: http://hg.python.org/cpython
+
+Please only use this approach if you're already an experienced Git user and
+don't require assistance with the specifics of version control commands. All
+other parts of this developer's guide assume the use of Mercurial for local
+version control.
+
+
 What do I need to use Mercurial?
 -------------------------------------------------------------------------------
 

-- 
Repository URL: http://hg.python.org/devguide

From solipsis at pitrou.net  Sat Sep  8 06:04:41 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 08 Sep 2012 06:04:41 +0200
Subject: [Python-checkins] Daily reference leaks (a53fc9982e2a): sum=0
Message-ID: <E1TACHh-0005Vr-HD@ap.vmr.nerim.net>

results for a53fc9982e2a on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogrr1UG7', '-x']

From python-checkins at python.org  Sat Sep  8 11:26:34 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat,  8 Sep 2012 11:26:34 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODY4?=
 =?utf-8?q?=3A_Fix_refleak_in_bytesio=2Ec_=28Coverity_=23715365=29=2E?=
Message-ID: <3XDVWt2MmWzQ8G@mail.python.org>

http://hg.python.org/cpython/rev/df663603e67a
changeset:   78876:df663603e67a
branch:      3.2
parent:      78873:2e8b01583839
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 08 11:12:33 2012 +0200
summary:
  Issue #15868: Fix refleak in bytesio.c (Coverity #715365).

files:
  Modules/_io/bytesio.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -692,8 +692,10 @@
     }
     else {
         dict = PyDict_Copy(self->dict);
-        if (dict == NULL)
+        if (dict == NULL) {
+            Py_DECREF(initvalue);
             return NULL;
+        }
     }
 
     state = Py_BuildValue("(OnN)", initvalue, self->pos, dict);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 11:26:35 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat,  8 Sep 2012 11:26:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4yLg==?=
Message-ID: <3XDVWv5xMGzQB3@mail.python.org>

http://hg.python.org/cpython/rev/90c8fa612e5b
changeset:   78877:90c8fa612e5b
parent:      78874:a53fc9982e2a
parent:      78876:df663603e67a
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 08 11:19:27 2012 +0200
summary:
  Merge 3.2.

files:
  Modules/_io/bytesio.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -692,8 +692,10 @@
     }
     else {
         dict = PyDict_Copy(self->dict);
-        if (dict == NULL)
+        if (dict == NULL) {
+            Py_DECREF(initvalue);
             return NULL;
+        }
     }
 
     state = Py_BuildValue("(OnN)", initvalue, self->pos, dict);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 15:41:25 2012
From: python-checkins at python.org (stefan.krah)
Date: Sat,  8 Sep 2012 15:41:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Update_w?=
 =?utf-8?q?hatsnew_to_the_current_state_of_hashing_memoryviews=2E?=
Message-ID: <3XDc9x67MLzQGY@mail.python.org>

http://hg.python.org/cpython/rev/ca81b9a3a015
changeset:   78878:ca81b9a3a015
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 08 15:35:01 2012 +0200
summary:
  Issue #15814: Update whatsnew to the current state of hashing memoryviews.

files:
  Doc/whatsnew/3.3.rst |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -158,9 +158,8 @@
 
 * Multi-dimensional comparisons are supported for any array type.
 
-* All array types are hashable if the exporting object is hashable
-  and the view is read-only. (Contributed by Antoine Pitrou in
-  :issue:`13411`)
+* One-dimensional memoryviews of hashable (read-only) types with formats B,
+  b or c are now hashable. (Contributed by Antoine Pitrou in :issue:`13411`)
 
 * Arbitrary slicing of any 1-D arrays type is supported. For example, it
   is now possible to reverse a memoryview in O(1) by using a negative step.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 17:54:05 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sat,  8 Sep 2012 17:54:05 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Update_to_latest_metadata_1?=
	=?utf-8?q?=2E3_draft?=
Message-ID: <3XDg713tbfzQKZ@mail.python.org>

http://hg.python.org/peps/rev/547555402269
changeset:   4508:547555402269
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 09 01:53:56 2012 +1000
summary:
  Update to latest metadata 1.3 draft

files:
  pep-0426.txt |  27 +++++++++++++++------------
  1 files changed, 15 insertions(+), 12 deletions(-)


diff --git a/pep-0426.txt b/pep-0426.txt
--- a/pep-0426.txt
+++ b/pep-0426.txt
@@ -31,9 +31,10 @@
 Metadata Files
 ==============
 
-The syntax defined in this PEP is for use with Python distribution metadata
-files. This file format is a single set of RFC-822 headers parseable by
-the ``rfc822`` or ``email`` modules.  The field names listed in the
+The syntax defined in this PEP is for use with Python distribution
+metadata files. The file format is a simple UTF-8 encoded Key: value
+format with no line length parsable by the ``email`` module with an
+appropriate ``email.policy.Policy()``.  The field names listed in the
 `Fields`_ section are used as the header names.
 
 There are two standard locations for these metadata files:
@@ -51,8 +52,9 @@
 Encoding
 ========
 
-Keys must be ASCII.  Values are expected to be displayed as UTF-8,
-but should otherwise be treated as opaque bytes.
+Metadata 1.3 files are UTF-8, with the restriction that keys must be
+ASCII. Parsers should be aware that older versions of the Metadata
+specification do not specify an encoding.
 
 Fields
 ======
@@ -435,9 +437,10 @@
 Provides-Extra (multiple use)
 :::::::::::::::::::::::::::::
 
-A string containing the name of an optional feature. Must be a valid Python
-identifier. May be used to make a dependency conditional on whether the
-optional feature has been requested.
+A string containing the name of an optional feature. Must be printable
+ASCII, not containing whitespace, comma (,), or square brackets [].
+May be used to make a dependency conditional on whether the optional
+feature has been requested.
 
 Example::
 
@@ -475,13 +478,13 @@
 Extension (multiple-use)
 ::::::::::::::::::::::::
 
-An ASCII string, not containing whitespace or the - character, that
+An ASCII string, not containing whitespace or the / character, that
 indicates the presence of extended metadata. Additional tags defined by
-the extension should be of the form string-Name::
+the extension should be of the form string/Name::
 
     Extension: Chili
-    Chili-Type: Poblano
-    Chili-Heat: Mild
+    Chili/Type: Poblano
+    Chili/Heat: Mild
 
 
 Version Specifiers

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sat Sep  8 18:35:07 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 18:35:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1ODQ3OiBhbGxv?=
 =?utf-8?q?w_args_to_be_a_tuple_in_parse=5Fargs?=
Message-ID: <3XDh2M2zJVzQF2@mail.python.org>

http://hg.python.org/cpython/rev/5d8454fcc629
changeset:   78879:5d8454fcc629
branch:      3.2
parent:      78876:df663603e67a
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 12:08:01 2012 -0400
summary:
  #15847: allow args to be a tuple in parse_args

This fixes a regression introduced by the fix for issue #13922.  Although args
is not documented as being allowed to be a tuple, previously this worked and
so naturally there are programs in the field that depend on it.

Patch by Zbyszek J?drzejewski-Szmek.

files:
  Lib/argparse.py           |   5 ++++-
  Lib/test/test_argparse.py |  18 ++++++++++++++++++
  2 files changed, 22 insertions(+), 1 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1701,9 +1701,12 @@
         return args
 
     def parse_known_args(self, args=None, namespace=None):
-        # args default to the system args
         if args is None:
+            # args default to the system args
             args = _sys.argv[1:]
+        else:
+            # make sure that args are mutable
+            args = list(args)
 
         # default Namespace built from parser defaults
         if namespace is None:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4522,6 +4522,24 @@
 
 class TestParseKnownArgs(TestCase):
 
+    def test_arguments_tuple(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args(())
+
+    def test_arguments_list(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args([])
+
+    def test_arguments_tuple_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(('x',))
+
+    def test_arguments_list_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(['x'])
+
     def test_optionals(self):
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 18:35:09 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 18:35:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_merge_=2315847=3A_allow_args_to_be_a_tuple_in_parse=5Far?=
 =?utf-8?q?gs?=
Message-ID: <3XDh2P0ntlzQFh@mail.python.org>

http://hg.python.org/cpython/rev/76655483c5c8
changeset:   78880:76655483c5c8
parent:      78878:ca81b9a3a015
parent:      78879:5d8454fcc629
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 12:14:25 2012 -0400
summary:
  merge #15847: allow args to be a tuple in parse_args

This fixes a regression introduced by the fix for issue #13922.  Although args
is not documented as being allowed to be a tuple, previously this worked and
so naturally there are programs in the field that depend on it.

Patch by Zbyszek J?drzejewski-Szmek.

files:
  Lib/argparse.py           |   5 ++++-
  Lib/test/test_argparse.py |  18 ++++++++++++++++++
  2 files changed, 22 insertions(+), 1 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1709,9 +1709,12 @@
         return args
 
     def parse_known_args(self, args=None, namespace=None):
-        # args default to the system args
         if args is None:
+            # args default to the system args
             args = _sys.argv[1:]
+        else:
+            # make sure that args are mutable
+            args = list(args)
 
         # default Namespace built from parser defaults
         if namespace is None:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4613,6 +4613,24 @@
 
 class TestParseKnownArgs(TestCase):
 
+    def test_arguments_tuple(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args(())
+
+    def test_arguments_list(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args([])
+
+    def test_arguments_tuple_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(('x',))
+
+    def test_arguments_list_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(['x'])
+
     def test_optionals(self):
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 18:35:10 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 18:35:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1ODQ3OiBhbGxv?=
 =?utf-8?q?w_args_to_be_a_tuple_in_parse=5Fargs?=
Message-ID: <3XDh2Q3lSwzQHL@mail.python.org>

http://hg.python.org/cpython/rev/a2147bbf7868
changeset:   78881:a2147bbf7868
branch:      2.7
parent:      78875:edbf37ace03c
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 12:15:25 2012 -0400
summary:
  #15847: allow args to be a tuple in parse_args

This fixes a regression introduced by the fix for issue #13922.  Although args
is not documented as being allowed to be a tuple, previously this worked and
so naturally there are programs in the field that depend on it.

Patch by Zbyszek J?drzejewski-Szmek.

files:
  Lib/argparse.py           |   5 ++++-
  Lib/test/test_argparse.py |  18 ++++++++++++++++++
  2 files changed, 22 insertions(+), 1 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1692,9 +1692,12 @@
         return args
 
     def parse_known_args(self, args=None, namespace=None):
-        # args default to the system args
         if args is None:
+            # args default to the system args
             args = _sys.argv[1:]
+        else:
+            # make sure that args are mutable
+            args = list(args)
 
         # default Namespace built from parser defaults
         if namespace is None:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4486,6 +4486,24 @@
 
 class TestParseKnownArgs(TestCase):
 
+    def test_arguments_tuple(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args(())
+
+    def test_arguments_list(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args([])
+
+    def test_arguments_tuple_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(('x',))
+
+    def test_arguments_list_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(['x'])
+
     def test_optionals(self):
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:12:55 2012
From: python-checkins at python.org (christian.heimes)
Date: Sat,  8 Sep 2012 19:12:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_for_fcc629?=
	=?utf-8?q?208842?=
Message-ID: <3XDhsz6YMBzQJ6@mail.python.org>

http://hg.python.org/cpython/rev/d19fa616b8fa
changeset:   78882:d19fa616b8fa
branch:      2.7
parent:      78871:8cd6acffbcb9
user:        Christian Heimes <christian at cheimes.de>
date:        Fri Sep 07 02:24:58 2012 +0200
summary:
  Fix for fcc629208842
BSD's make doesn't support some of the features.

files:
  Makefile.pre.in |  16 +++++++---------
  1 files changed, 7 insertions(+), 9 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -189,14 +189,6 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
-# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
-# by GNU make. The 's' flag is always in the first word.
-ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
-    QUIET=-q
-else
-    QUIET=
-endif
-
 # === Definitions added by makesetup ===
 
 
@@ -416,9 +408,15 @@
 
 
 # Build the shared modules
+# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+# -s, --silent or --quiet is always the first char.
 sharedmods: $(BUILDPYTHON)
+	@case "$$MAKEFLAGS" in \
+	    s*) quiet="-q";; \
+	    *) quiet="";; \
+	esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		./$(BUILDPYTHON) -E $(srcdir)/setup.py $(QUIET) build
+		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:12:57 2012
From: python-checkins at python.org (christian.heimes)
Date: Sat,  8 Sep 2012 19:12:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?=
	=?utf-8?q?_Fix_for_fcc629208842?=
Message-ID: <3XDht14yQ9zQLp@mail.python.org>

http://hg.python.org/cpython/rev/0ee8ce24fcd0
changeset:   78883:0ee8ce24fcd0
branch:      2.7
parent:      78881:a2147bbf7868
parent:      78882:d19fa616b8fa
user:        Christian Heimes <christian at cheimes.de>
date:        Sat Sep 08 19:12:05 2012 +0200
summary:
  Fix for fcc629208842
BSD's make doesn't support some of the features.

files:
  Makefile.pre.in |  16 +++++++---------
  1 files changed, 7 insertions(+), 9 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -189,14 +189,6 @@
 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
 #PROFILE_TASK=	$(srcdir)/Lib/test/regrtest.py
 
-# Find the silent flag in MAKEFLAGS. The flags are sorted and normalized
-# by GNU make. The 's' flag is always in the first word.
-ifneq (,$(findstring s,$(word 1,$(MAKEFLAGS))))
-    QUIET=-q
-else
-    QUIET=
-endif
-
 # === Definitions added by makesetup ===
 
 
@@ -416,9 +408,15 @@
 
 
 # Build the shared modules
+# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+# -s, --silent or --quiet is always the first char.
 sharedmods: $(BUILDPYTHON)
+	@case "$$MAKEFLAGS" in \
+	    s*) quiet="-q";; \
+	    *) quiet="";; \
+	esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-		./$(BUILDPYTHON) -E $(srcdir)/setup.py $(QUIET) build
+		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:42:42 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 19:42:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1NTEwOiBjbGFy?=
 =?utf-8?q?ify_textwrap=27s_handling_of_whitespace=2C_and_add_confirming_t?=
 =?utf-8?q?ests=2E?=
Message-ID: <3XDjXL4BJ7zQ6B@mail.python.org>

http://hg.python.org/cpython/rev/65e5f28801e1
changeset:   78884:65e5f28801e1
branch:      3.2
parent:      78879:5d8454fcc629
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 13:13:25 2012 -0400
summary:
  #15510: clarify textwrap's handling of whitespace, and add confirming tests.

Patch by Chris Jerdonek.

files:
  Doc/library/textwrap.rst  |  19 +++++--
  Lib/test/test_textwrap.py |  64 +++++++++++++++++++++++---
  2 files changed, 69 insertions(+), 14 deletions(-)


diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst
--- a/Doc/library/textwrap.rst
+++ b/Doc/library/textwrap.rst
@@ -25,6 +25,9 @@
    Optional keyword arguments correspond to the instance attributes of
    :class:`TextWrapper`, documented below.  *width* defaults to ``70``.
 
+   See the :meth:`TextWrapper.wrap` method for additional details on how
+   :func:`wrap` behaves.
+
 
 .. function:: fill(text, width=70, **kwargs)
 
@@ -131,15 +134,18 @@
 
    .. attribute:: drop_whitespace
 
-      (default: ``True``) If true, whitespace that, after wrapping, happens to
-      end up at the beginning or end of a line is dropped (leading whitespace in
-      the first line is always preserved, though).
+      (default: ``True``) If true, whitespace at the beginning and ending of
+      every line (after wrapping but before indenting) is dropped.
+      Whitespace at the beginning of the paragraph, however, is not dropped
+      if non-whitespace follows it.  If whitespace being dropped takes up an
+      entire line, the whole line is dropped.
 
 
    .. attribute:: initial_indent
 
       (default: ``''``) String that will be prepended to the first line of
-      wrapped output.  Counts towards the length of the first line.
+      wrapped output.  Counts towards the length of the first line.  The empty
+      string is not indented.
 
 
    .. attribute:: subsequent_indent
@@ -200,8 +206,9 @@
 
       Wraps the single paragraph in *text* (a string) so every line is at most
       :attr:`width` characters long.  All wrapping options are taken from
-      instance attributes of the :class:`TextWrapper` instance. Returns a list
-      of output lines, without final newlines.
+      instance attributes of the :class:`TextWrapper` instance.  Returns a list
+      of output lines, without final newlines.  If the wrapped output has no
+      content, the returned list is empty.
 
 
    .. method:: fill(text)
diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py
--- a/Lib/test/test_textwrap.py
+++ b/Lib/test/test_textwrap.py
@@ -22,7 +22,7 @@
             result = []
             for i in range(len(textin)):
                 result.append("  %d: %r" % (i, textin[i]))
-            result = '\n'.join(result)
+            result = "\n".join(result) if result else "  no lines"
         elif isinstance(textin, str):
             result = "  %s\n" % repr(textin)
         return result
@@ -66,6 +66,15 @@
                          "I'm glad to hear it!"])
         self.check_wrap(text, 80, [text])
 
+    def test_empty_string(self):
+        # Check that wrapping the empty string returns an empty list.
+        self.check_wrap("", 6, [])
+        self.check_wrap("", 6, [], drop_whitespace=False)
+
+    def test_empty_string_with_initial_indent(self):
+        # Check that the empty string is not indented.
+        self.check_wrap("", 6, [], initial_indent="++")
+        self.check_wrap("", 6, [], initial_indent="++", drop_whitespace=False)
 
     def test_whitespace(self):
         # Whitespace munging and end-of-sentence detection
@@ -323,7 +332,32 @@
                          ["blah", " ", "(ding", " ", "dong),",
                           " ", "wubba"])
 
-    def test_initial_whitespace(self):
+    def test_drop_whitespace_false(self):
+        # Check that drop_whitespace=False preserves whitespace.
+        # SF patch #1581073
+        text = " This is a    sentence with     much whitespace."
+        self.check_wrap(text, 10,
+                        [" This is a", "    ", "sentence ",
+                         "with     ", "much white", "space."],
+                        drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only(self):
+        # Check that drop_whitespace=False preserves a whitespace-only string.
+        self.check_wrap("   ", 6, ["   "], drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only_with_indent(self):
+        # Check that a whitespace-only string gets indented (when
+        # drop_whitespace is False).
+        self.check_wrap("   ", 6, ["     "], drop_whitespace=False,
+                        initial_indent="  ")
+
+    def test_drop_whitespace_whitespace_only(self):
+        # Check drop_whitespace on a whitespace-only string.
+        self.check_wrap("  ", 6, [])
+
+    def test_drop_whitespace_leading_whitespace(self):
+        # Check that drop_whitespace does not drop leading whitespace (if
+        # followed by non-whitespace).
         # SF bug #622849 reported inconsistent handling of leading
         # whitespace; let's test that a bit, shall we?
         text = " This is a sentence with leading whitespace."
@@ -332,13 +366,27 @@
         self.check_wrap(text, 30,
                         [" This is a sentence with", "leading whitespace."])
 
-    def test_no_drop_whitespace(self):
-        # SF patch #1581073
-        text = " This is a    sentence with     much whitespace."
-        self.check_wrap(text, 10,
-                        [" This is a", "    ", "sentence ",
-                         "with     ", "much white", "space."],
+    def test_drop_whitespace_whitespace_line(self):
+        # Check that drop_whitespace skips the whole line if a non-leading
+        # line consists only of whitespace.
+        text = "abcd    efgh"
+        # Include the result for drop_whitespace=False for comparison.
+        self.check_wrap(text, 6, ["abcd", "    ", "efgh"],
                         drop_whitespace=False)
+        self.check_wrap(text, 6, ["abcd", "efgh"])
+
+    def test_drop_whitespace_whitespace_only_with_indent(self):
+        # Check that initial_indent is not applied to a whitespace-only
+        # string.  This checks a special case of the fact that dropping
+        # whitespace occurs before indenting.
+        self.check_wrap("  ", 6, [], initial_indent="++")
+
+    def test_drop_whitespace_whitespace_indent(self):
+        # Check that drop_whitespace does not drop whitespace indents.
+        # This checks a special case of the fact that dropping whitespace
+        # occurs before indenting.
+        self.check_wrap("abcd efgh", 6, ["  abcd", "  efgh"],
+                        initial_indent="  ", subsequent_indent="  ")
 
     def test_split(self):
         # Ensure that the standard _split() method works as advertised

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:42:44 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 19:42:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2315510=3A_clarify_textwrap=27s_handling_of_white?=
 =?utf-8?q?space=2C_and_add_confirming?=
Message-ID: <3XDjXN3CgqzQKZ@mail.python.org>

http://hg.python.org/cpython/rev/0e9ad455355b
changeset:   78885:0e9ad455355b
parent:      78880:76655483c5c8
parent:      78884:65e5f28801e1
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 13:14:58 2012 -0400
summary:
  Merge #15510: clarify textwrap's handling of whitespace, and add confirming tests.

Patch by Chris Jerdonek.

files:
  Doc/library/textwrap.rst  |  19 +++++--
  Lib/test/test_textwrap.py |  64 +++++++++++++++++++++++---
  2 files changed, 69 insertions(+), 14 deletions(-)


diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst
--- a/Doc/library/textwrap.rst
+++ b/Doc/library/textwrap.rst
@@ -25,6 +25,9 @@
    Optional keyword arguments correspond to the instance attributes of
    :class:`TextWrapper`, documented below.  *width* defaults to ``70``.
 
+   See the :meth:`TextWrapper.wrap` method for additional details on how
+   :func:`wrap` behaves.
+
 
 .. function:: fill(text, width=70, **kwargs)
 
@@ -167,15 +170,18 @@
 
    .. attribute:: drop_whitespace
 
-      (default: ``True``) If true, whitespace that, after wrapping, happens to
-      end up at the beginning or end of a line is dropped (leading whitespace in
-      the first line is always preserved, though).
+      (default: ``True``) If true, whitespace at the beginning and ending of
+      every line (after wrapping but before indenting) is dropped.
+      Whitespace at the beginning of the paragraph, however, is not dropped
+      if non-whitespace follows it.  If whitespace being dropped takes up an
+      entire line, the whole line is dropped.
 
 
    .. attribute:: initial_indent
 
       (default: ``''``) String that will be prepended to the first line of
-      wrapped output.  Counts towards the length of the first line.
+      wrapped output.  Counts towards the length of the first line.  The empty
+      string is not indented.
 
 
    .. attribute:: subsequent_indent
@@ -236,8 +242,9 @@
 
       Wraps the single paragraph in *text* (a string) so every line is at most
       :attr:`width` characters long.  All wrapping options are taken from
-      instance attributes of the :class:`TextWrapper` instance. Returns a list
-      of output lines, without final newlines.
+      instance attributes of the :class:`TextWrapper` instance.  Returns a list
+      of output lines, without final newlines.  If the wrapped output has no
+      content, the returned list is empty.
 
 
    .. method:: fill(text)
diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py
--- a/Lib/test/test_textwrap.py
+++ b/Lib/test/test_textwrap.py
@@ -22,7 +22,7 @@
             result = []
             for i in range(len(textin)):
                 result.append("  %d: %r" % (i, textin[i]))
-            result = '\n'.join(result)
+            result = "\n".join(result) if result else "  no lines"
         elif isinstance(textin, str):
             result = "  %s\n" % repr(textin)
         return result
@@ -66,6 +66,15 @@
                          "I'm glad to hear it!"])
         self.check_wrap(text, 80, [text])
 
+    def test_empty_string(self):
+        # Check that wrapping the empty string returns an empty list.
+        self.check_wrap("", 6, [])
+        self.check_wrap("", 6, [], drop_whitespace=False)
+
+    def test_empty_string_with_initial_indent(self):
+        # Check that the empty string is not indented.
+        self.check_wrap("", 6, [], initial_indent="++")
+        self.check_wrap("", 6, [], initial_indent="++", drop_whitespace=False)
 
     def test_whitespace(self):
         # Whitespace munging and end-of-sentence detection
@@ -331,7 +340,32 @@
                          ["blah", " ", "(ding", " ", "dong),",
                           " ", "wubba"])
 
-    def test_initial_whitespace(self):
+    def test_drop_whitespace_false(self):
+        # Check that drop_whitespace=False preserves whitespace.
+        # SF patch #1581073
+        text = " This is a    sentence with     much whitespace."
+        self.check_wrap(text, 10,
+                        [" This is a", "    ", "sentence ",
+                         "with     ", "much white", "space."],
+                        drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only(self):
+        # Check that drop_whitespace=False preserves a whitespace-only string.
+        self.check_wrap("   ", 6, ["   "], drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only_with_indent(self):
+        # Check that a whitespace-only string gets indented (when
+        # drop_whitespace is False).
+        self.check_wrap("   ", 6, ["     "], drop_whitespace=False,
+                        initial_indent="  ")
+
+    def test_drop_whitespace_whitespace_only(self):
+        # Check drop_whitespace on a whitespace-only string.
+        self.check_wrap("  ", 6, [])
+
+    def test_drop_whitespace_leading_whitespace(self):
+        # Check that drop_whitespace does not drop leading whitespace (if
+        # followed by non-whitespace).
         # SF bug #622849 reported inconsistent handling of leading
         # whitespace; let's test that a bit, shall we?
         text = " This is a sentence with leading whitespace."
@@ -340,13 +374,27 @@
         self.check_wrap(text, 30,
                         [" This is a sentence with", "leading whitespace."])
 
-    def test_no_drop_whitespace(self):
-        # SF patch #1581073
-        text = " This is a    sentence with     much whitespace."
-        self.check_wrap(text, 10,
-                        [" This is a", "    ", "sentence ",
-                         "with     ", "much white", "space."],
+    def test_drop_whitespace_whitespace_line(self):
+        # Check that drop_whitespace skips the whole line if a non-leading
+        # line consists only of whitespace.
+        text = "abcd    efgh"
+        # Include the result for drop_whitespace=False for comparison.
+        self.check_wrap(text, 6, ["abcd", "    ", "efgh"],
                         drop_whitespace=False)
+        self.check_wrap(text, 6, ["abcd", "efgh"])
+
+    def test_drop_whitespace_whitespace_only_with_indent(self):
+        # Check that initial_indent is not applied to a whitespace-only
+        # string.  This checks a special case of the fact that dropping
+        # whitespace occurs before indenting.
+        self.check_wrap("  ", 6, [], initial_indent="++")
+
+    def test_drop_whitespace_whitespace_indent(self):
+        # Check that drop_whitespace does not drop whitespace indents.
+        # This checks a special case of the fact that dropping whitespace
+        # occurs before indenting.
+        self.check_wrap("abcd efgh", 6, ["  abcd", "  efgh"],
+                        initial_indent="  ", subsequent_indent="  ")
 
     def test_split(self):
         # Ensure that the standard _split() method works as advertised

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:42:46 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 19:42:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1NTEwOiBjbGFy?=
 =?utf-8?q?ify_textwrap=27s_handling_of_whitespace=2C_and_add_confirming_t?=
 =?utf-8?q?ests=2E?=
Message-ID: <3XDjXQ1KRczQKZ@mail.python.org>

http://hg.python.org/cpython/rev/fca48971ac35
changeset:   78886:fca48971ac35
branch:      2.7
parent:      78883:0ee8ce24fcd0
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 13:42:01 2012 -0400
summary:
  #15510: clarify textwrap's handling of whitespace, and add confirming tests.

Patch by Chris Jerdonek.

files:
  Doc/library/textwrap.rst  |  19 +++++--
  Lib/test/test_textwrap.py |  62 +++++++++++++++++++++++---
  2 files changed, 68 insertions(+), 13 deletions(-)


diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst
--- a/Doc/library/textwrap.rst
+++ b/Doc/library/textwrap.rst
@@ -26,6 +26,9 @@
    Optional keyword arguments correspond to the instance attributes of
    :class:`TextWrapper`, documented below.  *width* defaults to ``70``.
 
+   See the :meth:`TextWrapper.wrap` method for additional details on how
+   :func:`wrap` behaves.
+
 
 .. function:: fill(text[, width[, ...]])
 
@@ -134,9 +137,11 @@
 
    .. attribute:: drop_whitespace
 
-      (default: ``True``) If true, whitespace that, after wrapping, happens to
-      end up at the beginning or end of a line is dropped (leading whitespace in
-      the first line is always preserved, though).
+      (default: ``True``) If true, whitespace at the beginning and ending of
+      every line (after wrapping but before indenting) is dropped.
+      Whitespace at the beginning of the paragraph, however, is not dropped
+      if non-whitespace follows it.  If whitespace being dropped takes up an
+      entire line, the whole line is dropped.
 
       .. versionadded:: 2.6
          Whitespace was always dropped in earlier versions.
@@ -145,7 +150,8 @@
    .. attribute:: initial_indent
 
       (default: ``''``) String that will be prepended to the first line of
-      wrapped output.  Counts towards the length of the first line.
+      wrapped output.  Counts towards the length of the first line.  The empty
+      string is not indented.
 
 
    .. attribute:: subsequent_indent
@@ -208,8 +214,9 @@
 
       Wraps the single paragraph in *text* (a string) so every line is at most
       :attr:`width` characters long.  All wrapping options are taken from
-      instance attributes of the :class:`TextWrapper` instance. Returns a list
-      of output lines, without final newlines.
+      instance attributes of the :class:`TextWrapper` instance.  Returns a list
+      of output lines, without final newlines.  If the wrapped output has no
+      content, the returned list is empty.
 
 
    .. method:: fill(text)
diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py
--- a/Lib/test/test_textwrap.py
+++ b/Lib/test/test_textwrap.py
@@ -66,6 +66,15 @@
                          "I'm glad to hear it!"])
         self.check_wrap(text, 80, [text])
 
+    def test_empty_string(self):
+        # Check that wrapping the empty string returns an empty list.
+        self.check_wrap("", 6, [])
+        self.check_wrap("", 6, [], drop_whitespace=False)
+
+    def test_empty_string_with_initial_indent(self):
+        # Check that the empty string is not indented.
+        self.check_wrap("", 6, [], initial_indent="++")
+        self.check_wrap("", 6, [], initial_indent="++", drop_whitespace=False)
 
     def test_whitespace(self):
         # Whitespace munging and end-of-sentence detection
@@ -323,7 +332,32 @@
                          ["blah", " ", "(ding", " ", "dong),",
                           " ", "wubba"])
 
-    def test_initial_whitespace(self):
+    def test_drop_whitespace_false(self):
+        # Check that drop_whitespace=False preserves whitespace.
+        # SF patch #1581073
+        text = " This is a    sentence with     much whitespace."
+        self.check_wrap(text, 10,
+                        [" This is a", "    ", "sentence ",
+                         "with     ", "much white", "space."],
+                        drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only(self):
+        # Check that drop_whitespace=False preserves a whitespace-only string.
+        self.check_wrap("   ", 6, ["   "], drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only_with_indent(self):
+        # Check that a whitespace-only string gets indented (when
+        # drop_whitespace is False).
+        self.check_wrap("   ", 6, ["     "], drop_whitespace=False,
+                        initial_indent="  ")
+
+    def test_drop_whitespace_whitespace_only(self):
+        # Check drop_whitespace on a whitespace-only string.
+        self.check_wrap("  ", 6, [])
+
+    def test_drop_whitespace_leading_whitespace(self):
+        # Check that drop_whitespace does not drop leading whitespace (if
+        # followed by non-whitespace).
         # SF bug #622849 reported inconsistent handling of leading
         # whitespace; let's test that a bit, shall we?
         text = " This is a sentence with leading whitespace."
@@ -332,13 +366,27 @@
         self.check_wrap(text, 30,
                         [" This is a sentence with", "leading whitespace."])
 
-    def test_no_drop_whitespace(self):
-        # SF patch #1581073
-        text = " This is a    sentence with     much whitespace."
-        self.check_wrap(text, 10,
-                        [" This is a", "    ", "sentence ",
-                         "with     ", "much white", "space."],
+    def test_drop_whitespace_whitespace_line(self):
+        # Check that drop_whitespace skips the whole line if a non-leading
+        # line consists only of whitespace.
+        text = "abcd    efgh"
+        # Include the result for drop_whitespace=False for comparison.
+        self.check_wrap(text, 6, ["abcd", "    ", "efgh"],
                         drop_whitespace=False)
+        self.check_wrap(text, 6, ["abcd", "efgh"])
+
+    def test_drop_whitespace_whitespace_only_with_indent(self):
+        # Check that initial_indent is not applied to a whitespace-only
+        # string.  This checks a special case of the fact that dropping
+        # whitespace occurs before indenting.
+        self.check_wrap("  ", 6, [], initial_indent="++")
+
+    def test_drop_whitespace_whitespace_indent(self):
+        # Check that drop_whitespace does not drop whitespace indents.
+        # This checks a special case of the fact that dropping whitespace
+        # occurs before indenting.
+        self.check_wrap("abcd efgh", 6, ["  abcd", "  efgh"],
+                        initial_indent="  ", subsequent_indent="  ")
 
     if test_support.have_unicode:
         def test_unicode(self):

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:53:11 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  8 Sep 2012 19:53:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1ODY1OiBhZGQg?=
 =?utf-8?q?=22*=22_in_the_signature_to_document_keyword-only_args_in_the_d?=
 =?utf-8?q?ocs=2E?=
Message-ID: <3XDjmR2dfrzQPg@mail.python.org>

http://hg.python.org/cpython/rev/a30b3915228b
changeset:   78887:a30b3915228b
branch:      3.2
parent:      78879:5d8454fcc629
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 08 20:46:01 2012 +0300
summary:
  #15865: add "*" in the signature to document keyword-only args in the docs.  Patch by Chris Jerdonek.

files:
  Doc/library/configparser.rst |  16 +++++++++++-----
  Doc/library/nntplib.rst      |   6 +++---
  2 files changed, 14 insertions(+), 8 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1007,7 +1007,7 @@
       .. versionadded:: 3.2
 
 
-   .. method:: get(section, option, raw=False, [vars, fallback])
+   .. method:: get(section, option, *, raw=False, vars=None[, fallback])
 
       Get an *option* value for the named *section*.  If *vars* is provided, it
       must be a dictionary.  The *option* is looked up in *vars* (if provided),
@@ -1025,21 +1025,21 @@
          (especially when using the mapping protocol).
 
 
-   .. method:: getint(section, option, raw=False, [vars, fallback])
+   .. method:: getint(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to an integer.  See :meth:`get` for explanation of *raw*, *vars* and
       *fallback*.
 
 
-   .. method:: getfloat(section, option, raw=False, [vars, fallback])
+   .. method:: getfloat(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a floating point number.  See :meth:`get` for explanation of *raw*,
       *vars* and *fallback*.
 
 
-   .. method:: getboolean(section, option, raw=False, [vars, fallback])
+   .. method:: getboolean(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a Boolean value.  Note that the accepted values for the option are
@@ -1149,7 +1149,13 @@
 RawConfigParser Objects
 -----------------------
 
-.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configaparser.DEFAULTSECT, interpolation=None)
+.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, \
+                           allow_no_value=False, *, delimiters=('=', ':'), \
+                           comment_prefixes=('#', ';'), \
+                           inline_comment_prefixes=None, strict=True, \
+                           empty_lines_in_values=True, \
+                           default_section=configparser.DEFAULTSECT[, \
+                           interpolation])
 
    Legacy variant of the :class:`ConfigParser` with interpolation disabled
    by default and unsafe ``add_section`` and ``set`` methods.
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -474,10 +474,10 @@
 them have been superseded by newer commands in :rfc:`3977`.
 
 
-.. method:: NNTP.xhdr(header, string, *, file=None)
+.. method:: NNTP.xhdr(hdr, str, *, file=None)
 
-   Send an ``XHDR`` command.  The *header* argument is a header keyword, e.g.
-   ``'subject'``.  The *string* argument should have the form ``'first-last'``
+   Send an ``XHDR`` command.  The *hdr* argument is a header keyword, e.g.
+   ``'subject'``.  The *str* argument should have the form ``'first-last'``
    where *first* and *last* are the first and last article numbers to search.
    Return a pair ``(response, list)``, where *list* is a list of pairs ``(id,
    text)``, where *id* is an article number (as a string) and *text* is the text of

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:53:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  8 Sep 2012 19:53:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1ODY1OiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XDjmT1WcdzQPT@mail.python.org>

http://hg.python.org/cpython/rev/694c725f241a
changeset:   78888:694c725f241a
parent:      78885:0e9ad455355b
parent:      78887:a30b3915228b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 08 20:49:18 2012 +0300
summary:
  #15865: merge with 3.2.

files:
  Doc/library/configparser.rst |  16 +++++++++++-----
  Doc/library/nntplib.rst      |   6 +++---
  Doc/library/threading.rst    |   6 ++----
  3 files changed, 16 insertions(+), 12 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1007,7 +1007,7 @@
       .. versionadded:: 3.2
 
 
-   .. method:: get(section, option, raw=False, [vars, fallback])
+   .. method:: get(section, option, *, raw=False, vars=None[, fallback])
 
       Get an *option* value for the named *section*.  If *vars* is provided, it
       must be a dictionary.  The *option* is looked up in *vars* (if provided),
@@ -1025,21 +1025,21 @@
          (especially when using the mapping protocol).
 
 
-   .. method:: getint(section, option, raw=False, [vars, fallback])
+   .. method:: getint(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to an integer.  See :meth:`get` for explanation of *raw*, *vars* and
       *fallback*.
 
 
-   .. method:: getfloat(section, option, raw=False, [vars, fallback])
+   .. method:: getfloat(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a floating point number.  See :meth:`get` for explanation of *raw*,
       *vars* and *fallback*.
 
 
-   .. method:: getboolean(section, option, raw=False, [vars, fallback])
+   .. method:: getboolean(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a Boolean value.  Note that the accepted values for the option are
@@ -1149,7 +1149,13 @@
 RawConfigParser Objects
 -----------------------
 
-.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configaparser.DEFAULTSECT, interpolation=None)
+.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, \
+                           allow_no_value=False, *, delimiters=('=', ':'), \
+                           comment_prefixes=('#', ';'), \
+                           inline_comment_prefixes=None, strict=True, \
+                           empty_lines_in_values=True, \
+                           default_section=configparser.DEFAULTSECT[, \
+                           interpolation])
 
    Legacy variant of the :class:`ConfigParser` with interpolation disabled
    by default and unsafe ``add_section`` and ``set`` methods.
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -487,10 +487,10 @@
 them have been superseded by newer commands in :rfc:`3977`.
 
 
-.. method:: NNTP.xhdr(header, string, *, file=None)
+.. method:: NNTP.xhdr(hdr, str, *, file=None)
 
-   Send an ``XHDR`` command.  The *header* argument is a header keyword, e.g.
-   ``'subject'``.  The *string* argument should have the form ``'first-last'``
+   Send an ``XHDR`` command.  The *hdr* argument is a header keyword, e.g.
+   ``'subject'``.  The *str* argument should have the form ``'first-last'``
    where *first* and *last* are the first and last article numbers to search.
    Return a pair ``(response, list)``, where *list* is a list of pairs ``(id,
    text)``, where *id* is an article number (as a string) and *text* is the text of
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -255,8 +255,8 @@
 since it is impossible to detect the termination of alien threads.
 
 
-.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={},
-                  verbose=None, *, daemon=None)
+.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}, *, \
+                  daemon=None)
 
    This constructor should always be called with keyword arguments.  Arguments
    are:
@@ -275,8 +275,6 @@
    *kwargs* is a dictionary of keyword arguments for the target invocation.
    Defaults to ``{}``.
 
-   *verbose* is a flag used for debugging messages.
-
    If not ``None``, *daemon* explicitly sets whether the thread is daemonic.
    If ``None`` (the default), the daemonic property is inherited from the
    current thread.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 19:53:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat,  8 Sep 2012 19:53:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?=
	=?utf-8?q?_Merge_heads=2E?=
Message-ID: <3XDjmV4MLnzQQG@mail.python.org>

http://hg.python.org/cpython/rev/90b6aa842d9b
changeset:   78889:90b6aa842d9b
branch:      3.2
parent:      78884:65e5f28801e1
parent:      78887:a30b3915228b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 08 20:52:19 2012 +0300
summary:
  Merge heads.

files:
  Doc/library/configparser.rst |  16 +++++++++++-----
  Doc/library/nntplib.rst      |   6 +++---
  2 files changed, 14 insertions(+), 8 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1007,7 +1007,7 @@
       .. versionadded:: 3.2
 
 
-   .. method:: get(section, option, raw=False, [vars, fallback])
+   .. method:: get(section, option, *, raw=False, vars=None[, fallback])
 
       Get an *option* value for the named *section*.  If *vars* is provided, it
       must be a dictionary.  The *option* is looked up in *vars* (if provided),
@@ -1025,21 +1025,21 @@
          (especially when using the mapping protocol).
 
 
-   .. method:: getint(section, option, raw=False, [vars, fallback])
+   .. method:: getint(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to an integer.  See :meth:`get` for explanation of *raw*, *vars* and
       *fallback*.
 
 
-   .. method:: getfloat(section, option, raw=False, [vars, fallback])
+   .. method:: getfloat(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a floating point number.  See :meth:`get` for explanation of *raw*,
       *vars* and *fallback*.
 
 
-   .. method:: getboolean(section, option, raw=False, [vars, fallback])
+   .. method:: getboolean(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a Boolean value.  Note that the accepted values for the option are
@@ -1149,7 +1149,13 @@
 RawConfigParser Objects
 -----------------------
 
-.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configaparser.DEFAULTSECT, interpolation=None)
+.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, \
+                           allow_no_value=False, *, delimiters=('=', ':'), \
+                           comment_prefixes=('#', ';'), \
+                           inline_comment_prefixes=None, strict=True, \
+                           empty_lines_in_values=True, \
+                           default_section=configparser.DEFAULTSECT[, \
+                           interpolation])
 
    Legacy variant of the :class:`ConfigParser` with interpolation disabled
    by default and unsafe ``add_section`` and ``set`` methods.
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -474,10 +474,10 @@
 them have been superseded by newer commands in :rfc:`3977`.
 
 
-.. method:: NNTP.xhdr(header, string, *, file=None)
+.. method:: NNTP.xhdr(hdr, str, *, file=None)
 
-   Send an ``XHDR`` command.  The *header* argument is a header keyword, e.g.
-   ``'subject'``.  The *string* argument should have the form ``'first-last'``
+   Send an ``XHDR`` command.  The *hdr* argument is a header keyword, e.g.
+   ``'subject'``.  The *str* argument should have the form ``'first-last'``
    where *first* and *last* are the first and last article numbers to search.
    Return a pair ``(response, list)``, where *list* is a list of pairs ``(id,
    text)``, where *id* is an article number (as a string) and *text* is the text of

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 22:44:09 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 22:44:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogTWVyZ2UgRXppbydzICdtZXJnZSBoZWFkcycu?=
Message-ID: <3XDnYj53nNzPSW@mail.python.org>

http://hg.python.org/cpython/rev/7e1b46d3e24c
changeset:   78890:7e1b46d3e24c
parent:      78888:694c725f241a
parent:      78889:90b6aa842d9b
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 16:43:17 2012 -0400
summary:
  Merge Ezio's 'merge heads'.

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 22:48:37 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 22:48:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzUwODg6IGRvY3Vt?=
 =?utf-8?q?ent_behavior_of_optparse_defaults_with_=27append=27_action=2E?=
Message-ID: <3XDnfs39C1zQM4@mail.python.org>

http://hg.python.org/cpython/rev/8c60bb098eff
changeset:   78891:8c60bb098eff
branch:      3.2
parent:      78889:90b6aa842d9b
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 16:45:35 2012 -0400
summary:
  #5088: document behavior of optparse defaults with 'append' action.

files:
  Doc/library/optparse.rst |  11 +++++++++++
  1 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -1165,6 +1165,17 @@
 
      options.tracks.append(int("4"))
 
+  The ``append`` action calls the ``append`` method on the current value of the
+  option.  This means that any default value specified must have an ``append``
+  method.  It also means that if the default value is non-empty, the default
+  elements will be present in the parsed value for the option, with any values
+  from the command line appended after those default values::
+
+     >>> parser.add_option("--files", action="append", default=['~/.mypkg/defaults'])
+     >>> opts, args = parser.parse_args(['--files', 'overrides.mypkg'])
+     >>> opts.files
+     ['~/.mypkg/defaults', 'overrides.mypkg']
+
 * ``"append_const"`` [required: :attr:`~Option.const`; relevant:
   :attr:`~Option.dest`]
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 22:48:39 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 22:48:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=235088=3A_document_behavior_of_optparse_defaults_?=
 =?utf-8?q?with_=27append=27_action=2E?=
Message-ID: <3XDnfv17PbzQVV@mail.python.org>

http://hg.python.org/cpython/rev/0c2bdd2c2032
changeset:   78892:0c2bdd2c2032
parent:      78890:7e1b46d3e24c
parent:      78891:8c60bb098eff
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 16:46:10 2012 -0400
summary:
  Merge #5088: document behavior of optparse defaults with 'append' action.

files:
  Doc/library/optparse.rst |  11 +++++++++++
  1 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -1165,6 +1165,17 @@
 
      options.tracks.append(int("4"))
 
+  The ``append`` action calls the ``append`` method on the current value of the
+  option.  This means that any default value specified must have an ``append``
+  method.  It also means that if the default value is non-empty, the default
+  elements will be present in the parsed value for the option, with any values
+  from the command line appended after those default values::
+
+     >>> parser.add_option("--files", action="append", default=['~/.mypkg/defaults'])
+     >>> opts, args = parser.parse_args(['--files', 'overrides.mypkg'])
+     >>> opts.files
+     ['~/.mypkg/defaults', 'overrides.mypkg']
+
 * ``"append_const"`` [required: :attr:`~Option.const`; relevant:
   :attr:`~Option.dest`]
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 22:48:40 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 22:48:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogY2xvc2VzICM1MDg4?=
 =?utf-8?q?=3A_document_behavior_of_optparse_defaults_with_=27append=27_ac?=
 =?utf-8?q?tion=2E?=
Message-ID: <3XDnfw3xtDzQVX@mail.python.org>

http://hg.python.org/cpython/rev/79f6d4aff39d
changeset:   78893:79f6d4aff39d
branch:      2.7
parent:      78886:fca48971ac35
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 16:47:24 2012 -0400
summary:
  closes #5088: document behavior of optparse defaults with 'append' action.

files:
  Doc/library/optparse.rst |  11 +++++++++++
  1 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -1168,6 +1168,17 @@
 
      options.tracks.append(int("4"))
 
+  The ``append`` action calls the ``append`` method on the current value of the
+  option.  This means that any default value specified must have an ``append``
+  method.  It also means that if the default value is non-empty, the default
+  elements will be present in the parsed value for the option, with any values
+  from the command line appended after those default values::
+
+     >>> parser.add_option("--files", action="append", default=['~/.mypkg/defaults'])
+     >>> opts, args = parser.parse_args(['--files', 'overrides.mypkg'])
+     >>> opts.files
+     ['~/.mypkg/defaults', 'overrides.mypkg']
+
 * ``"append_const"`` [required: :attr:`~Option.const`; relevant:
   :attr:`~Option.dest`]
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep  8 23:51:43 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat,  8 Sep 2012 23:51:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_=2315820=3A_Improve_the_H?=
 =?utf-8?q?elping_with_the_Devguide_section?=
Message-ID: <3XDq3g6CGvzQVv@mail.python.org>

http://hg.python.org/devguide/rev/18e31605b161
changeset:   545:18e31605b161
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 08 17:51:33 2012 -0400
summary:
  #15820: Improve the Helping with the Devguide section

Original idea and initial patch by Mike Hoy.  Blame me
for the actual result, though.

files:
  docquality.rst |  37 ++++++++++++++++++++++++++++---------
  index.rst      |   5 ++---
  2 files changed, 30 insertions(+), 12 deletions(-)


diff --git a/docquality.rst b/docquality.rst
--- a/docquality.rst
+++ b/docquality.rst
@@ -66,18 +66,37 @@
 makes it harder to break the work up for multiple people to help with.
 
 
+.. _helping-with-the-developers-guide:
+
 Helping with the Developer's Guide
 ----------------------------------
 
-The Developer's Guide uses the same process as the main Python
-documentation, except for some small differences.
-The source lives in a `separate repository`_. To build and view the
-documentation, install `Sphinx`_ and issue the following command: ::
-
-   make html
-
-Changes to the documentation are normally published within a day on a
-schedule that may be different from the main documentation.
+The Developer's Guide uses the same process as the main Python documentation,
+except for some small differences.  The source lives in a `separate
+repository`_.  Bug reports and and patches should be submitted to the `python
+bug tracker`_ using the ``devguide`` component.  Changes to the devguide
+are normally published within a day, on a schedule that may be different from
+the main documentation.
 
 .. _separate repository: http://hg.python.org/devguide
+.. _python bug tracker: http://bugs.python.org
+
+To clone the Developer's Guide:
+
+``hg clone http://hg.python.org/devguide``
+
+Core developers should use:
+
+``hg clone ssh://hg at hg.python.org/devguide``
+
+instead so that they can push back their edits to the server.
+
+To build the devguide, you must have `Sphinx`_ installed.  The devguide html
+can be built by running:
+
+    make html
+
+in the checkout directory, which will write the files to the ``_build/html``
+directory.
+
 .. _Sphinx: http://sphinx.pocoo.org/
diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -150,9 +150,8 @@
 Resources
 ---------
 
-* Anyone can clone this guide from http://hg.python.org/devguide/.  Core
-  developers should use ssh://hg at hg.python.org/devguide instead, so that they
-  can push back their edits to the server.
+* Anyone can clone the sources for this guide.  See
+  :ref:`helping-with-the-developers-guide`.
 * Coding style guides
     * :PEP:`7` (Style Guide for C Code)
     * :PEP:`8` (Style Guide for Python Code)

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Sun Sep  9 04:08:54 2012
From: python-checkins at python.org (ned.deily)
Date: Sun,  9 Sep 2012 04:08:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1ODIy?=
 =?utf-8?q?=3A_Fix_installation_of_lib2to3_grammar_pickles_to_ensure?=
Message-ID: <3XDwmQ5zMvzQ3Y@mail.python.org>

http://hg.python.org/cpython/rev/2def9ef683da
changeset:   78894:2def9ef683da
branch:      2.7
user:        Ned Deily <nad at acm.org>
date:        Sat Sep 08 18:47:27 2012 -0700
summary:
  Issue #15822: Fix installation of lib2to3 grammar pickles to ensure
they are created in the install locations and with the proper timestamp.
(Solution suggested by MvL)

files:
  Lib/lib2to3/pgen2/driver.py |  17 +++++++++++++++++
  Makefile.pre.in             |   8 +++++---
  Misc/NEWS                   |   2 +-
  3 files changed, 23 insertions(+), 4 deletions(-)


diff --git a/Lib/lib2to3/pgen2/driver.py b/Lib/lib2to3/pgen2/driver.py
--- a/Lib/lib2to3/pgen2/driver.py
+++ b/Lib/lib2to3/pgen2/driver.py
@@ -138,3 +138,20 @@
     if not os.path.exists(b):
         return True
     return os.path.getmtime(a) >= os.path.getmtime(b)
+
+
+def main(*args):
+    """Main program, when run as a script: produce grammar pickle files.
+
+    Calls load_grammar for each argument, a path to a grammar text file.
+    """
+    if not args:
+        args = sys.argv[1:]
+    logging.basicConfig(level=logging.INFO, stream=sys.stdout,
+                        format='%(message)s')
+    for gt in args:
+        load_grammar(gt, save=True, force=True)
+    return True
+
+if __name__ == "__main__":
+    sys.exit(int(not main()))
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -887,8 +887,6 @@
 		lib-old \
 		curses pydoc_data $(MACHDEPS)
 libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 		if test ! -d $(DESTDIR)$$i; then \
@@ -966,6 +964,10 @@
 		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST)/site-packages -f \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		./$(BUILDPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		./$(BUILDPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
@@ -1203,7 +1205,7 @@
 	find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true
 	find build -name 'fficonfig.py' -exec rm -f {} ';' || true
-	-rm -f $(srcdir)/Lib/lib2to3/*Grammar*.pickle
+	-rm -f Lib/lib2to3/*Grammar*.pickle
 
 profile-removal:
 	find . -name '*.gc??' -exec rm -f {} ';'
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -388,7 +388,7 @@
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
-- Issue #15645: Ensure 2to3 grammar pickles are properly installed.
+- Issue #15822: Ensure 2to3 grammar pickles are properly installed.
 
 - Issue #15560: Fix building _sqlite3 extension on OS X with an SDK.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 04:08:56 2012
From: python-checkins at python.org (ned.deily)
Date: Sun,  9 Sep 2012 04:08:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODIy?=
 =?utf-8?q?=3A_Fix_installation_of_lib2to3_grammar_pickles_to_ensure?=
Message-ID: <3XDwmS3gQbzQNk@mail.python.org>

http://hg.python.org/cpython/rev/adc5e6aca251
changeset:   78895:adc5e6aca251
branch:      3.2
parent:      78891:8c60bb098eff
user:        Ned Deily <nad at acm.org>
date:        Sat Sep 08 18:50:56 2012 -0700
summary:
  Issue #15822: Fix installation of lib2to3 grammar pickles to ensure
they are created in the install locations and with the proper timestamp.
(Solution suggested by MvL)

files:
  Lib/lib2to3/pgen2/driver.py |  17 +++++++++++++++++
  Makefile.pre.in             |   8 +++++---
  Misc/NEWS                   |   2 +-
  3 files changed, 23 insertions(+), 4 deletions(-)


diff --git a/Lib/lib2to3/pgen2/driver.py b/Lib/lib2to3/pgen2/driver.py
--- a/Lib/lib2to3/pgen2/driver.py
+++ b/Lib/lib2to3/pgen2/driver.py
@@ -138,3 +138,20 @@
     if not os.path.exists(b):
         return True
     return os.path.getmtime(a) >= os.path.getmtime(b)
+
+
+def main(*args):
+    """Main program, when run as a script: produce grammar pickle files.
+
+    Calls load_grammar for each argument, a path to a grammar text file.
+    """
+    if not args:
+        args = sys.argv[1:]
+    logging.basicConfig(level=logging.INFO, stream=sys.stdout,
+                        format='%(message)s')
+    for gt in args:
+        load_grammar(gt, save=True, force=True)
+    return True
+
+if __name__ == "__main__":
+    sys.exit(int(not main()))
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -945,8 +945,6 @@
 		unittest unittest/test \
 		curses pydoc_data $(MACHDEPS)
 libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 		if test ! -d $(DESTDIR)$$i; then \
@@ -1024,6 +1022,10 @@
 		./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST)/site-packages -f \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		./$(BUILDPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		./$(BUILDPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
@@ -1264,7 +1266,7 @@
 	find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true
 	find build -name 'fficonfig.py' -exec rm -f {} ';' || true
-	-rm -f $(srcdir)/Lib/lib2to3/*Grammar*.pickle
+	-rm -f Lib/lib2to3/*Grammar*.pickle
 	-rm -f Modules/_testembed
 
 profile-removal:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -525,7 +525,7 @@
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
-- Issue #15645: Ensure 2to3 grammar pickles are properly installed.
+- Issue #15822: Ensure 2to3 grammar pickles are properly installed.
 
 - Issue #15560: Fix building _sqlite3 extension on OS X with an SDK.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 04:08:57 2012
From: python-checkins at python.org (ned.deily)
Date: Sun,  9 Sep 2012 04:08:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_null_merge?=
Message-ID: <3XDwmT6jh7zQMw@mail.python.org>

http://hg.python.org/cpython/rev/23118b802f83
changeset:   78896:23118b802f83
parent:      78892:0c2bdd2c2032
parent:      78895:adc5e6aca251
user:        Ned Deily <nad at acm.org>
date:        Sat Sep 08 18:59:46 2012 -0700
summary:
  null merge

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 04:08:59 2012
From: python-checkins at python.org (ned.deily)
Date: Sun,  9 Sep 2012 04:08:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315822=3A_Fix_inst?=
 =?utf-8?q?allation_of_lib2to3_grammar_pickles_to_ensure?=
Message-ID: <3XDwmW2bfbzQPx@mail.python.org>

http://hg.python.org/cpython/rev/a829889f96b0
changeset:   78897:a829889f96b0
user:        Ned Deily <nad at acm.org>
date:        Sat Sep 08 19:04:47 2012 -0700
summary:
  Issue #15822: Fix installation of lib2to3 grammar pickles to ensure
they are created in the install locations and with the proper timestamp.
(Solution suggested by MvL)

files:
  Lib/lib2to3/pgen2/driver.py |  17 +++++++++++++++++
  Makefile.pre.in             |   8 +++++---
  Misc/NEWS                   |   3 +++
  3 files changed, 25 insertions(+), 3 deletions(-)


diff --git a/Lib/lib2to3/pgen2/driver.py b/Lib/lib2to3/pgen2/driver.py
--- a/Lib/lib2to3/pgen2/driver.py
+++ b/Lib/lib2to3/pgen2/driver.py
@@ -138,3 +138,20 @@
     if not os.path.exists(b):
         return True
     return os.path.getmtime(a) >= os.path.getmtime(b)
+
+
+def main(*args):
+    """Main program, when run as a script: produce grammar pickle files.
+
+    Calls load_grammar for each argument, a path to a grammar text file.
+    """
+    if not args:
+        args = sys.argv[1:]
+    logging.basicConfig(level=logging.INFO, stream=sys.stdout,
+                        format='%(message)s')
+    for gt in args:
+        load_grammar(gt, save=True, force=True)
+    return True
+
+if __name__ == "__main__":
+    sys.exit(int(not main()))
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1024,8 +1024,6 @@
 		venv venv/scripts venv/scripts/posix \
 		curses pydoc_data $(MACHDEPS)
 libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 		if test ! -d $(DESTDIR)$$i; then \
@@ -1103,6 +1101,10 @@
 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST)/site-packages -f \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
@@ -1347,7 +1349,7 @@
 	find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true
 	find build -name 'fficonfig.py' -exec rm -f {} ';' || true
-	-rm -f $(srcdir)/Lib/lib2to3/*Grammar*.pickle
+	-rm -f Lib/lib2to3/*Grammar*.pickle
 	-rm -f $(SYSCONFIGDATA)
 	-rm -f Modules/_testembed Modules/_freeze_importlib
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -62,6 +62,9 @@
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
+- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
+  (replaces fixes for Issue #15645).
+
 Documentation
 -------------
 

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Sun Sep  9 06:03:49 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 09 Sep 2012 06:03:49 +0200
Subject: [Python-checkins] Daily reference leaks (0c2bdd2c2032): sum=3
Message-ID: <E1TAYkP-0005dV-C3@ap.vmr.nerim.net>

results for 0c2bdd2c2032 on branch "default"
--------------------------------------------

test_support leaked [1, 0, 0] references, sum=1
test_dbm leaked [0, 0, 2] references, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogoWyOAY', '-x']

From python-checkins at python.org  Sun Sep  9 09:09:40 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 09:09:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_Daniel_Holth_to_commi?=
	=?utf-8?q?tter_list=2E?=
Message-ID: <3XF3RS039jzQQl@mail.python.org>

http://hg.python.org/devguide/rev/0554ac390c27
changeset:   546:0554ac390c27
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 09:10:12 2012 +0200
summary:
  Add Daniel Holth to committer list.

files:
  developers.rst |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/developers.rst b/developers.rst
--- a/developers.rst
+++ b/developers.rst
@@ -24,6 +24,8 @@
 Permissions History
 -------------------
 
+- Daniel Holth was given push privileges on Sep 9 2012 by GFB, for PEP editing.
+
 - Peter Moody was given push privileges on May 20 2012 by Antoine Pitrou
   for authorship and maintenance of the ipaddress module (accepted in PEP
   3144 by Nick Coghlan).

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Sun Sep  9 09:11:08 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 09:11:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_Eric_Snow=2E?=
Message-ID: <3XF3T86SBbzQQl@mail.python.org>

http://hg.python.org/devguide/rev/2b5d169f3554
changeset:   547:2b5d169f3554
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 09:11:42 2012 +0200
summary:
  Add Eric Snow.

files:
  developers.rst |  9 ++++++---
  1 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/developers.rst b/developers.rst
--- a/developers.rst
+++ b/developers.rst
@@ -26,9 +26,12 @@
 
 - Daniel Holth was given push privileges on Sep 9 2012 by GFB, for PEP editing.
 
-- Peter Moody was given push privileges on May 20 2012 by Antoine Pitrou
-  for authorship and maintenance of the ipaddress module (accepted in PEP
-  3144 by Nick Coghlan).
+- Eric Snow was given push privileges on Sep 5 2012 by Antoine Pitrou for
+  general contributions, on recommendation by Nick Coghlan.
+
+- Peter Moody was given push privileges on May 20 2012 by Antoine Pitrou for
+  authorship and maintenance of the ipaddress module (accepted in PEP 3144 by
+  Nick Coghlan).
 
 - Hynek Schlawack was given push privileges on May 14 2012 by Antoine Pitrou
   for general contributions.

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Sun Sep  9 09:19:50 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 09:19:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Update_committers_list_lo?=
	=?utf-8?q?cation=2E?=
Message-ID: <3XF3gB6HtHzQNv@mail.python.org>

http://hg.python.org/devguide/rev/b40bfc99c54f
changeset:   548:b40bfc99c54f
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 09:20:23 2012 +0200
summary:
  Update committers list location.

files:
  coredev.rst |  4 ++--
  faq.rst     |  2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/coredev.rst b/coredev.rst
--- a/coredev.rst
+++ b/coredev.rst
@@ -25,7 +25,7 @@
 able to commit them without supervision.
 
 A complete list of core developer usernames can be found at
-http://www.python.org/dev/committers. :ref:`developers` lists when and why
+http://hg.python.org/committers.txt. :ref:`developers` lists when and why
 someone received commit privileges.
 
 
@@ -68,7 +68,7 @@
 This should match your username on the issue tracker.
 
 You can verify your commit access by looking at
-http://www.python.org/dev/committers which lists all core developers by
+http://hg.python.org/committers.txt which lists all core developers by
 username.  If you want to practice, there is a `test repository
 <http://hg.python.org/test/>`_ where you can freely commit and push any
 changes you like::
diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -96,7 +96,7 @@
 On the `issue tracker`_, most core developers will have the Python logo
 appear next to their name.
 
-.. _full list of developers: http://www.python.org/dev/committers
+.. _full list of developers: http://hg.python.org/committers.txt
 
 
 What standards of behaviour are expected in these communication channels?

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Sun Sep  9 11:12:24 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:12:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Remove_outdated_Windows_instr?=
	=?utf-8?q?uctions=2E?=
Message-ID: <3XF6942JrlzQ79@mail.python.org>

http://hg.python.org/peps/rev/33ad4b3e0d6f
changeset:   4509:33ad4b3e0d6f
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 11:12:29 2012 +0200
summary:
  Remove outdated Windows instructions.

files:
  pep-0101.txt |  12 ++----------
  1 files changed, 2 insertions(+), 10 deletions(-)


diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -600,16 +600,8 @@
     only person routinely testing on Windows, and that Windows is
     simply a mess.
 
-    Repeat the testing for each target architecture.  On XP/2003, try
-    both an Admin and a plain User (not Power User) account. If you
-    can, also test the installer on Windows 9x.
-
-    WRT Step 5 above (verify the release media), since by the time
-    release files are ready to download the WE has generally run many
-    Windows tests on the installer he uploaded, he usually doesn't do
-    anything for Step 5 except a full byte-comparison ("fc /b" if
-    using a Windows shell) of the downloaded file against the file he
-    uploaded.
+    Repeat the testing for each target architecture.  Try both an
+    Admin and a plain User (not Power User) account.
 
 
 Copyright

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep  9 11:18:59 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:18:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315785=3A_Modify_w?=
 =?utf-8?q?indow=2Eget=5Fwch=28=29_API_of_the_curses_module=3A_return_a?=
Message-ID: <3XF6Jg51zxzQYc@mail.python.org>

http://hg.python.org/cpython/rev/23377e88487b
changeset:   78898:23377e88487b
parent:      78771:290a07e57797
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Aug 29 01:40:57 2012 +0200
summary:
  Issue #15785: Modify window.get_wch() API of the curses module: return a
character for most keys, and an integer for special keys, instead of always
returning an integer. So it is now possible to distinguish special keys like
keypad keys.

files:
  Doc/library/curses.rst  |   9 +++++----
  Lib/test/test_curses.py |  12 +++++-------
  Misc/NEWS               |   7 ++++++-
  Modules/_cursesmodule.c |   5 ++++-
  4 files changed, 20 insertions(+), 13 deletions(-)


diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -869,8 +869,8 @@
 
 .. method:: window.get_wch([y, x])
 
-   Get a wide character. Like :meth:`getch`, but the integer returned is the
-   Unicode code point for the key pressed, so it can be passed to :func:`chr`.
+   Get a wide character. Return a character for most keys, or an integer for
+   function keys, keypad keys, and other special keys.
 
    .. versionadded:: 3.3
 
@@ -878,8 +878,9 @@
 .. method:: window.getkey([y, x])
 
    Get a character, returning a string instead of an integer, as :meth:`getch`
-   does. Function keys, keypad keys and so on return a multibyte string containing
-   the key name.  In no-delay mode, an exception is raised if there is no input.
+   does. Function keys, keypad keys and other special keys return a multibyte
+   string containing the key name.  In no-delay mode, an exception is raised if
+   there is no input.
 
 
 .. method:: window.getmaxyx()
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -267,8 +267,7 @@
 def test_unget_wch(stdscr):
     if not hasattr(curses, 'unget_wch'):
         return
-    import locale
-    encoding = locale.getpreferredencoding()
+    encoding = stdscr.encoding
     for ch in ('a', '\xe9', '\u20ac', '\U0010FFFF'):
         try:
             ch.encode(encoding)
@@ -277,18 +276,17 @@
         try:
             curses.unget_wch(ch)
         except Exception as err:
-            raise Exception("unget_wch(%a) failed with locale encoding %s: %s"
-                            % (ch, encoding, err))
+            raise Exception("unget_wch(%a) failed with encoding %s: %s"
+                            % (ch, stdscr.encoding, err))
         read = stdscr.get_wch()
-        read = chr(read)
         if read != ch:
             raise AssertionError("%r != %r" % (read, ch))
 
         code = ord(ch)
         curses.unget_wch(code)
         read = stdscr.get_wch()
-        if read != code:
-            raise AssertionError("%r != %r" % (read, code))
+        if read != ch:
+            raise AssertionError("%r != %r" % (read, ch))
 
 def test_issue10570():
     b = curses.tparm(curses.tigetstr("cup"), 5, 3)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,11 @@
 Library
 -------
 
+- Issue #15785: Modify window.get_wch() API of the curses module: return
+  a character for most keys, and an integer for special keys, instead of
+  always returning an integer. So it is now possible to distinguish special
+  keys like keypad keys.
+
 
 What's New in Python 3.3.0 Release Candidate 1?
 ===============================================
@@ -23,7 +28,7 @@
 -----------------
 
 - Issue #15573: memoryview comparisons are now performed by value with full
-  support for any valid struct module format definition.  
+  support for any valid struct module format definition.
 
 - Issue #15316: When an item in the fromlist for __import__ doesn't exist,
   don't raise an error, but if an exception is raised as part of an import do
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1203,7 +1203,10 @@
         PyErr_SetString(PyCursesError, "no input");
         return NULL;
     }
-    return PyLong_FromLong(rtn);
+    if (ct == KEY_CODE_YES)
+        return PyLong_FromLong(rtn);
+    else
+        return PyUnicode_FromOrdinal(rtn);
 }
 #endif
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:01 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:01 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315784=3A_Modify_O?=
 =?utf-8?q?SError=2E=5F=5Fstr=5F=5F=28=29_to_better_distinguish_between?=
Message-ID: <3XF6Jj3zqRzQCL@mail.python.org>

http://hg.python.org/cpython/rev/4e941113e4fa
changeset:   78899:4e941113e4fa
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Tue Aug 28 19:33:26 2012 +0100
summary:
  Issue #15784: Modify OSError.__str__() to better distinguish between
errno error numbers and Windows error numbers.

files:
  Lib/test/test_exceptions.py |  4 ++--
  Misc/NEWS                   |  3 +++
  Objects/exceptions.c        |  4 ++--
  3 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -216,14 +216,14 @@
             self.assertEqual(w.winerror, 3)
             self.assertEqual(w.strerror, 'foo')
             self.assertEqual(w.filename, 'bar')
-            self.assertEqual(str(w), "[Error 3] foo: 'bar'")
+            self.assertEqual(str(w), "[WinError 3] foo: 'bar'")
             # Unknown win error becomes EINVAL (22)
             w = OSError(0, 'foo', None, 1001)
             self.assertEqual(w.errno, 22)
             self.assertEqual(w.winerror, 1001)
             self.assertEqual(w.strerror, 'foo')
             self.assertEqual(w.filename, None)
-            self.assertEqual(str(w), "[Error 1001] foo")
+            self.assertEqual(str(w), "[WinError 1001] foo")
             # Non-numeric "errno"
             w = OSError('bar', 'foo')
             self.assertEqual(w.errno, 'bar')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15784: Modify OSError.__str__() to better distinguish between
+  errno error numbers and Windows error numbers.
+
 Library
 -------
 
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1016,12 +1016,12 @@
 #ifdef MS_WINDOWS
     /* If available, winerror has the priority over myerrno */
     if (self->winerror && self->filename)
-        return PyUnicode_FromFormat("[Error %S] %S: %R",
+        return PyUnicode_FromFormat("[WinError %S] %S: %R",
                                     self->winerror ? self->winerror: Py_None,
                                     self->strerror ? self->strerror: Py_None,
                                     self->filename);
     if (self->winerror && self->strerror)
-        return PyUnicode_FromFormat("[Error %S] %S",
+        return PyUnicode_FromFormat("[WinError %S] %S",
                                     self->winerror ? self->winerror: Py_None,
                                     self->strerror ? self->strerror: Py_None);
 #endif

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:03 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315781=3A_Fix_two_?=
 =?utf-8?q?small_race_conditions_in_import=27s_module_locking=2E?=
Message-ID: <3XF6Jl0pNnzQY4@mail.python.org>

http://hg.python.org/cpython/rev/85070f284fd2
changeset:   78900:85070f284fd2
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Aug 28 00:24:52 2012 +0200
summary:
  Issue #15781: Fix two small race conditions in import's module locking.

files:
  Lib/importlib/_bootstrap.py      |    10 +-
  Lib/test/test_threaded_import.py |    12 +-
  Misc/NEWS                        |     2 +
  Python/import.c                  |     6 +-
  Python/importlib.h               |  7302 +++++++++--------
  5 files changed, 3678 insertions(+), 3654 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -268,8 +268,10 @@
 
     Should only be called with the import lock taken."""
     lock = None
-    if name in _module_locks:
+    try:
         lock = _module_locks[name]()
+    except KeyError:
+        pass
     if lock is None:
         if _thread is None:
             lock = _DummyModuleLock(name)
@@ -543,6 +545,9 @@
             # implicitly imports 'locale' and would otherwise trigger an
             # infinite loop.
             module = new_module(fullname)
+            # This must be done before putting the module in sys.modules
+            # (otherwise an optimization shortcut in import.c becomes wrong)
+            module.__initializing__ = True
             sys.modules[fullname] = module
             module.__loader__ = self
             try:
@@ -554,8 +559,9 @@
                     module.__package__ = fullname
                 else:
                     module.__package__ = fullname.rpartition('.')[0]
+        else:
+            module.__initializing__ = True
         try:
-            module.__initializing__ = True
             # If __package__ was not set above, __import__() will do it later.
             return fxn(self, module, *args, **kwargs)
         except:
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -224,7 +224,17 @@
 
 @reap_threads
 def test_main():
-    run_unittest(ThreadedImportTests)
+    old_switchinterval = None
+    try:
+        old_switchinterval = sys.getswitchinterval()
+        sys.setswitchinterval(0.00000001)
+    except AttributeError:
+        pass
+    try:
+        run_unittest(ThreadedImportTests)
+    finally:
+        if old_switchinterval is not None:
+            sys.setswitchinterval(old_switchinterval)
 
 if __name__ == "__main__":
     test_main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@
 - Issue #15784: Modify OSError.__str__() to better distinguish between
   errno error numbers and Windows error numbers.
 
+- Issue #15781: Fix two small race conditions in import's module locking.
+
 Library
 -------
 
diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -1408,7 +1408,11 @@
         int initializing = 0;
 
         Py_INCREF(mod);
-        /* Only call _bootstrap._lock_unlock_module() if __initializing__ is true. */
+        /* Optimization: only call _bootstrap._lock_unlock_module() if
+           __initializing__ is true.
+           NOTE: because of this, __initializing__ must be set *before*
+           stuffing the new module in sys.modules.
+         */
         value = _PyObject_GetAttrId(mod, &PyId___initializing__);
         if (value == NULL)
             PyErr_Clear();
diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:04 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315340=3A_Fix_impo?=
 =?utf-8?q?rting_the_random_module_when_/dev/urandom_cannot_be?=
Message-ID: <3XF6Jm45F5zQY8@mail.python.org>

http://hg.python.org/cpython/rev/6a782496f90a
changeset:   78901:6a782496f90a
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Sep 07 23:49:07 2012 +0200
summary:
  Issue #15340: Fix importing the random module when /dev/urandom cannot be opened.
This was a regression caused by the hash randomization patch.

files:
  Misc/NEWS       |  3 +++
  Python/random.c |  3 ++-
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,9 @@
 Library
 -------
 
+- Issue #15340: Fix importing the random module when /dev/urandom cannot
+  be opened.  This was a regression caused by the hash randomization patch.
+
 - Issue #15785: Modify window.get_wch() API of the curses module: return
   a character for most keys, and an integer for special keys, instead of
   always returning an integer. So it is now possible to distinguish special
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -165,7 +165,8 @@
     Py_END_ALLOW_THREADS
     if (fd < 0)
     {
-        PyErr_SetFromErrnoWithFilename(PyExc_OSError, "/dev/urandom");
+        PyErr_SetString(PyExc_NotImplementedError,
+                        "/dev/urandom (or equivalent) not found");
         return -1;
     }
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:06 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315828=3A_Restore_?=
 =?utf-8?q?support_for_C_extension_modules_in_imp=2Eload=5Fmodule=28=29?=
Message-ID: <3XF6Jp3DwBzQYl@mail.python.org>

http://hg.python.org/cpython/rev/4f6f59303146
changeset:   78902:4f6f59303146
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sat Sep 01 00:13:45 2012 +1000
summary:
  Issue #15828: Restore support for C extension modules in imp.load_module()

files:
  Lib/imp.py              |   6 ++++--
  Lib/test/test_imp.py    |  29 +++++++++++++++++++++++++++++
  Lib/test/test_import.py |  19 -------------------
  Misc/NEWS               |   2 ++
  4 files changed, 35 insertions(+), 21 deletions(-)


diff --git a/Lib/imp.py b/Lib/imp.py
--- a/Lib/imp.py
+++ b/Lib/imp.py
@@ -153,13 +153,15 @@
         warnings.simplefilter('ignore')
         if mode and (not mode.startswith(('r', 'U')) or '+' in mode):
             raise ValueError('invalid file open mode {!r}'.format(mode))
-        elif file is None and type_ in {PY_SOURCE, PY_COMPILED}:
+        elif file is None and type_ in {PY_SOURCE, PY_COMPILED, C_EXTENSION}:
             msg = 'file object required for import (type code {})'.format(type_)
             raise ValueError(msg)
         elif type_ == PY_SOURCE:
             return load_source(name, filename, file)
         elif type_ == PY_COMPILED:
             return load_compiled(name, filename, file)
+        elif type_ == C_EXTENSION:
+            return load_dynamic(name, filename, file)
         elif type_ == PKG_DIRECTORY:
             return load_package(name, filename)
         elif type_ == C_BUILTIN:
@@ -167,7 +169,7 @@
         elif type_ == PY_FROZEN:
             return init_frozen(name)
         else:
-            msg =  "Don't know how to import {} (type code {}".format(name, type_)
+            msg =  "Don't know how to import {} (type code {})".format(name, type_)
             raise ImportError(msg, name=name)
 
 
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -186,6 +186,35 @@
         self.assertRaises(SyntaxError,
                           imp.find_module, "badsyntax_pep3120", [path])
 
+    def test_load_from_source(self):
+        # Verify that the imp module can correctly load and find .py files
+        # XXX (ncoghlan): It would be nice to use support.CleanImport
+        # here, but that breaks because the os module registers some
+        # handlers in copy_reg on import. Since CleanImport doesn't
+        # revert that registration, the module is left in a broken
+        # state after reversion. Reinitialising the module contents
+        # and just reverting os.environ to its previous state is an OK
+        # workaround
+        orig_path = os.path
+        orig_getenv = os.getenv
+        with support.EnvironmentVarGuard():
+            x = imp.find_module("os")
+            self.addCleanup(x[0].close)
+            new_os = imp.load_module("os", *x)
+            self.assertIs(os, new_os)
+            self.assertIs(orig_path, new_os.path)
+            self.assertIsNot(orig_getenv, new_os.getenv)
+
+    @support.cpython_only
+    def test_issue15828_load_extensions(self):
+        # Issue 15828 picked up that the adapter between the old imp API
+        # and importlib couldn't handle C extensions
+        example = "_heapq"
+        x = imp.find_module(example)
+        self.addCleanup(x[0].close)
+        mod = imp.load_module(example, *x)
+        self.assertEqual(mod.__name__, example)
+
     def test_load_dynamic_ImportError_path(self):
         # Issue #1559549 added `name` and `path` attributes to ImportError
         # in order to provide better detail. Issue #10854 implemented those
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -149,25 +149,6 @@
 
         self.assertEqual(oct(stat.S_IMODE(stat_info.st_mode)), oct(mode))
 
-    def test_imp_module(self):
-        # Verify that the imp module can correctly load and find .py files
-        # XXX (ncoghlan): It would be nice to use support.CleanImport
-        # here, but that breaks because the os module registers some
-        # handlers in copy_reg on import. Since CleanImport doesn't
-        # revert that registration, the module is left in a broken
-        # state after reversion. Reinitialising the module contents
-        # and just reverting os.environ to its previous state is an OK
-        # workaround
-        orig_path = os.path
-        orig_getenv = os.getenv
-        with EnvironmentVarGuard():
-            x = imp.find_module("os")
-            self.addCleanup(x[0].close)
-            new_os = imp.load_module("os", *x)
-            self.assertIs(os, new_os)
-            self.assertIs(orig_path, new_os.path)
-            self.assertIsNot(orig_getenv, new_os.getenv)
-
     def test_bug7732(self):
         source = TESTFN + '.py'
         os.mkdir(source)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,8 @@
 Library
 -------
 
+- Issue #15828: Restore support for C extensions in imp.load_module().
+
 - Issue #15340: Fix importing the random module when /dev/urandom cannot
   be opened.  This was a regression caused by the hash randomization patch.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:07 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315828=3A_Don=27t_?=
 =?utf-8?q?try_to_close_a_file_if_imp=2Efind=5Fmodule=28=29_doesn=27t?=
Message-ID: <3XF6Jq6JXgzQWD@mail.python.org>

http://hg.python.org/cpython/rev/a4a9c5717204
changeset:   78903:a4a9c5717204
user:        Brett Cannon <brett at python.org>
date:        Fri Aug 31 11:31:20 2012 -0400
summary:
  Issue #15828: Don't try to close a file if imp.find_module() doesn't
return one.

files:
  Lib/test/test_imp.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -211,7 +211,9 @@
         # and importlib couldn't handle C extensions
         example = "_heapq"
         x = imp.find_module(example)
-        self.addCleanup(x[0].close)
+        file_ = x[0]
+        if file_ is not None:
+            self.addCleanup(file_.close)
         mod = imp.load_module(example, *x)
         self.assertEqual(mod.__name__, example)
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:09 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Close_=2314223=3A_Fix_wind?=
 =?utf-8?q?ow=2Eaddch=28curses=2EACS=5FHLINE=29?=
Message-ID: <3XF6Js2RqRzQYq@mail.python.org>

http://hg.python.org/cpython/rev/d6d632f254ee
changeset:   78904:d6d632f254ee
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sat Sep 01 15:00:34 2012 +0200
summary:
  Close #14223: Fix window.addch(curses.ACS_HLINE)

Fix window.addch() of the curses module for special characters like
curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now
calling the C function waddch()/mvwaddch() (as it was done in Python 3.2),
instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still
calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
to libncursesw.

files:
  Misc/NEWS               |   7 +++++
  Modules/_cursesmodule.c |  34 +++++-----------------------
  2 files changed, 14 insertions(+), 27 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,13 @@
   always returning an integer. So it is now possible to distinguish special
   keys like keypad keys.
 
+- Issue #14223: Fix window.addch() of the curses module for special characters
+  like curses.ACS_HLINE: the Python function addch(int) and addch(bytes) is now
+  calling the C function waddch()/mvwaddch() (as it was done in Python 3.2),
+  instead of wadd_wch()/mvwadd_wch(). The Python function addch(str) is still
+  calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
+  to libncursesw.
+
 
 What's New in Python 3.3.0 Release Candidate 1?
 ===============================================
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -280,7 +280,6 @@
 #endif
                           )
 {
-    int ret = 0;
     long value;
 #ifdef HAVE_NCURSESW
     wchar_t buffer[2];
@@ -304,7 +303,6 @@
     }
     else if(PyBytes_Check(obj) && PyBytes_Size(obj) == 1) {
         value = (unsigned char)PyBytes_AsString(obj)[0];
-        ret = 1;
     }
     else if (PyLong_CheckExact(obj)) {
         int overflow;
@@ -314,11 +312,6 @@
                             "int doesn't fit in long");
             return 0;
         }
-#ifdef HAVE_NCURSESW
-        ret = 2;
-#else
-        ret = 1;
-#endif
     }
     else {
         PyErr_Format(PyExc_TypeError,
@@ -326,27 +319,14 @@
                      Py_TYPE(obj)->tp_name);
         return 0;
     }
-#ifdef HAVE_NCURSESW
-    if (ret == 2) {
-        memset(wch->chars, 0, sizeof(wch->chars));
-        wch->chars[0] = (wchar_t)value;
-        if ((long)wch->chars[0] != value) {
-            PyErr_Format(PyExc_OverflowError,
-                         "character doesn't fit in wchar_t");
-            return 0;
-        }
+
+    *ch = (chtype)value;
+    if ((long)*ch != value) {
+        PyErr_Format(PyExc_OverflowError,
+                     "byte doesn't fit in chtype");
+        return 0;
     }
-    else
-#endif
-    {
-        *ch = (chtype)value;
-        if ((long)*ch != value) {
-            PyErr_Format(PyExc_OverflowError,
-                         "byte doesn't fit in chtype");
-            return 0;
-        }
-    }
-    return ret;
+    return 1;
 }
 
 /* Convert an object to a byte string (char*) or a wide character string

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:10 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Compile_=5Fdecimal_without?=
 =?utf-8?q?_asserts_and_update_benchmark_results=2E?=
Message-ID: <3XF6Jt5gyPzQXl@mail.python.org>

http://hg.python.org/cpython/rev/0e6e86a6bfb7
changeset:   78905:0e6e86a6bfb7
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 01 14:21:22 2012 +0200
summary:
  Compile _decimal without asserts and update benchmark results.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  setup.py             |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1119,7 +1119,7 @@
    +---------+-------------+--------------+-------------+
    |         |  decimal.py |   _decimal   |   speedup   |
    +=========+=============+==============+=============+
-   |   pi    |    38.89s   |    0.38s     |    100x     |
+   |   pi    |    42.02    |    0.345     |    120x     |
    +---------+-------------+--------------+-------------+
    | telco   |   172.19s   |    5.68s     |     30x     |
    +---------+-------------+--------------+-------------+
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1897,7 +1897,7 @@
 
     def _decimal_ext(self):
         extra_compile_args = []
-        undef_macros = ['NDEBUG']
+        undef_macros = []
         if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
             include_dirs = []
             libraries = ['mpdec']

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:12 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_missing_unit=2E?=
Message-ID: <3XF6Jw2VTfzQYn@mail.python.org>

http://hg.python.org/cpython/rev/de409254d61b
changeset:   78906:de409254d61b
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 01 14:27:51 2012 +0200
summary:
  Add missing unit.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1119,7 +1119,7 @@
    +---------+-------------+--------------+-------------+
    |         |  decimal.py |   _decimal   |   speedup   |
    +=========+=============+==============+=============+
-   |   pi    |    42.02    |    0.345     |    120x     |
+   |   pi    |    42.02s   |    0.345s    |    120x     |
    +---------+-------------+--------------+-------------+
    | telco   |   172.19s   |    5.68s     |     30x     |
    +---------+-------------+--------------+-------------+

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:13 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315724=3A_Add_vers?=
 =?utf-8?q?ionchanged_tags_to_the_memoryview_documentation=2E?=
Message-ID: <3XF6Jx6flHzQYy@mail.python.org>

http://hg.python.org/cpython/rev/144d649764cf
changeset:   78907:144d649764cf
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Aug 30 12:09:09 2012 +0200
summary:
  Issue #15724: Add versionchanged tags to the memoryview documentation.

files:
  Doc/library/stdtypes.rst |  12 ++++++++++--
  1 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2450,6 +2450,8 @@
       ``v == w`` for memoryview objects.
 
       .. versionchanged:: 3.3
+         Previous versions compared the raw memory disregarding the item format
+         and the logical array structure.
 
    .. method:: tobytes()
 
@@ -2479,8 +2481,10 @@
          >>> m.tolist()
          [1.1, 2.2, 3.3]
 
-      :meth:`tolist` is currently restricted to single character native formats
-      in :mod:`struct` module syntax.
+      .. versionchanged:: 3.3
+         :meth:`tolist` now supports all single character native formats in
+         :mod:`struct` module syntax as well as multi-dimensional
+         representations.
 
    .. method:: release()
 
@@ -2664,6 +2668,10 @@
       arbitrary format strings, but some methods (e.g. :meth:`tolist`) are
       restricted to native single element formats.
 
+      .. versionchanged:: 3.3
+         format ``'B'`` is now handled according to the struct module syntax.
+         This means that ``memoryview(b'abc')[0] == b'abc'[0] == 97``.
+
    .. attribute:: itemsize
 
       The size in bytes of each element of the memoryview::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:15 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Document?=
 =?utf-8?q?_planned_restrictions_for_memoryview_hashes_in_3=2E3=2E1=2E?=
Message-ID: <3XF6Jz45V4zQY5@mail.python.org>

http://hg.python.org/cpython/rev/7734eb2707a1
changeset:   78908:7734eb2707a1
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 01 14:34:45 2012 +0200
summary:
  Issue #15814: Document planned restrictions for memoryview hashes in 3.3.1.

files:
  Doc/library/stdtypes.rst |  24 ++++++++----------------
  1 files changed, 8 insertions(+), 16 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2376,8 +2376,8 @@
       >>> data
       bytearray(b'z1spam')
 
-   Memoryviews of hashable (read-only) types are also hashable. The hash
-   is defined as ``hash(m) == hash(m.tobytes())``::
+   Memoryviews of hashable (read-only) types with formats 'B', 'b' or 'c'
+   are also hashable. The hash is defined as ``hash(m) == hash(m.tobytes())``::
 
       >>> v = memoryview(b'abcefg')
       >>> hash(v) == hash(b'abcefg')
@@ -2387,21 +2387,13 @@
       >>> hash(v[::-2]) == hash(b'abcefg'[::-2])
       True
 
-   Hashing of multi-dimensional objects is supported::
-
-      >>> buf = bytes(list(range(12)))
-      >>> x = memoryview(buf)
-      >>> y = x.cast('B', shape=[2,2,3])
-      >>> x.tolist()
-      [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
-      >>> y.tolist()
-      [[[0, 1, 2], [3, 4, 5]], [[6, 7, 8], [9, 10, 11]]]
-      >>> hash(x) == hash(y) == hash(y.tobytes())
-      True
-
    .. versionchanged:: 3.3
-      Memoryview objects are now hashable.
-
+      Memoryview objects with formats 'B', 'b' or 'c' are now hashable.
+
+   .. note::
+      Hashing of memoryviews with formats other than 'B', 'b' or 'c' is
+      possible in version 3.3.0, but will raise an error in 3.3.1 in order
+      to be compatible with the new memoryview equality definition.
 
    :class:`memoryview` has several methods:
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:17 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2310650=3A_Depreca?=
 =?utf-8?q?te_the_watchexp_parameter_of_Decimal=2Equantize=28=29=2E?=
Message-ID: <3XF6K11jdkzQYq@mail.python.org>

http://hg.python.org/cpython/rev/e4ca4edee8bd
changeset:   78909:e4ca4edee8bd
user:        Stefan Krah <skrah at bytereef.org>
date:        Thu Aug 30 12:33:55 2012 +0200
summary:
  Closes #10650: Deprecate the watchexp parameter of Decimal.quantize().

files:
  Doc/library/decimal.rst |  5 +++++
  Doc/whatsnew/3.3.rst    |  4 ++++
  Misc/NEWS               |  3 +++
  3 files changed, 12 insertions(+), 0 deletions(-)


diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -737,6 +737,11 @@
       resulting exponent is greater than :attr:`Emax` or less than
       :attr:`Etiny`.
 
+      .. deprecated:: 3.3
+         *watchexp* is an implementation detail from the pure Python version
+         and is not present in the C version. It will be removed in version
+         3.4, where it defaults to ``True``.
+
    .. method:: radix()
 
       Return ``Decimal(10)``, the radix (base) in which the :class:`Decimal`
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1190,6 +1190,10 @@
   changed to match the order displayed by :func:`repr`.
 
 
+* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method
+  is deprecated.
+
+
 ftplib
 ------
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,9 @@
 - Issue #15340: Fix importing the random module when /dev/urandom cannot
   be opened.  This was a regression caused by the hash randomization patch.
 
+- Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize()
+  method.
+
 - Issue #15785: Modify window.get_wch() API of the curses module: return
   a character for most keys, and an integer for special keys, instead of
   always returning an integer. So it is now possible to distinguish special

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:18 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_bug_with_argparse=2EPa?=
 =?utf-8?q?rser=2Eparse=5Fargs=28*args=29?=
Message-ID: <3XF6K24xHxzQQF@mail.python.org>

http://hg.python.org/cpython/rev/8c2e87aeb707
changeset:   78910:8c2e87aeb707
user:        Zbigniew J??drzejewski-Szmek <zbyszek at in.waw.pl>
date:        Sun Sep 02 14:59:19 2012 +0200
summary:
  Fix bug with argparse.Parser.parse_args(*args)

files:
  Lib/argparse.py           |   5 ++++-
  Lib/test/test_argparse.py |  18 ++++++++++++++++++
  2 files changed, 22 insertions(+), 1 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1709,9 +1709,12 @@
         return args
 
     def parse_known_args(self, args=None, namespace=None):
-        # args default to the system args
         if args is None:
+            # args default to the system args
             args = _sys.argv[1:]
+        else:
+            # make sure that args are mutable
+            args = list(args)
 
         # default Namespace built from parser defaults
         if namespace is None:
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4565,6 +4565,24 @@
 
 class TestParseKnownArgs(TestCase):
 
+    def test_arguments_tuple(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args(())
+
+    def test_arguments_list(self):
+        parser = argparse.ArgumentParser()
+        parser.parse_args([])
+
+    def test_arguments_tuple_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(('x',))
+
+    def test_arguments_list_positional(self):
+        parser = argparse.ArgumentParser()
+        parser.add_argument('x')
+        parser.parse_args(['x'])
+
     def test_optionals(self):
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:20 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Changelog_entry_for_8c2e87?=
	=?utf-8?q?aeb707=2E?=
Message-ID: <3XF6K411SszQYn@mail.python.org>

http://hg.python.org/cpython/rev/514007be0874
changeset:   78911:514007be0874
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 08 07:58:37 2012 +0200
summary:
  Changelog entry for 8c2e87aeb707.

files:
  Misc/NEWS |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,9 @@
 Library
 -------
 
+- Issue #15847: Fix a regression in argparse, which did not accept tuples
+  as argument lists anymore.
+
 - Issue #15828: Restore support for C extensions in imp.load_module().
 
 - Issue #15340: Fix importing the random module when /dev/urandom cannot

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:21 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2313992=3A_The_tras?=
 =?utf-8?q?hcan_mechanism_is_now_thread-safe=2E__This_eliminates?=
Message-ID: <3XF6K570s9zQZ5@mail.python.org>

http://hg.python.org/cpython/rev/5aa1bc2f00ad
changeset:   78912:5aa1bc2f00ad
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Sep 06 00:59:49 2012 +0200
summary:
  Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
sporadic crashes in multi-thread programs when several long deallocator
chains ran concurrently and involved subclasses of built-in container
types.

Because of this change, a couple extension modules compiled for 3.2.4
(those which use the trashcan mechanism, despite it being undocumented)
will not be loadable by 3.2.3 and earlier. However, extension modules
compiled for 3.2.3 and earlier will be loadable by 3.2.4.

files:
  Include/object.h     |  27 ++++++++----
  Include/pystate.h    |   3 +
  Lib/test/test_gc.py  |  69 ++++++++++++++++++++++++++++++++
  Misc/NEWS            |   5 ++
  Objects/object.c     |  37 +++++++++++++++++
  Objects/typeobject.c |   5 ++
  Python/pystate.c     |   3 +
  7 files changed, 140 insertions(+), 9 deletions(-)


diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -961,24 +961,33 @@
 with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL.
 */
 
+/* This is the old private API, invoked by the macros before 3.2.4.
+   Kept for binary compatibility of extensions. */
 PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
 PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
 PyAPI_DATA(int) _PyTrash_delete_nesting;
 PyAPI_DATA(PyObject *) _PyTrash_delete_later;
 
+/* The new thread-safe private API, invoked by the macros below. */
+PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*);
+PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void);
+
 #define PyTrash_UNWIND_LEVEL 50
 
 #define Py_TRASHCAN_SAFE_BEGIN(op) \
-    if (_PyTrash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
-        ++_PyTrash_delete_nesting;
-        /* The body of the deallocator is here. */
+    do { \
+        PyThreadState *_tstate = PyThreadState_GET(); \
+        if (_tstate->trash_delete_nesting < PyTrash_UNWIND_LEVEL) { \
+            ++_tstate->trash_delete_nesting;
+            /* The body of the deallocator is here. */
 #define Py_TRASHCAN_SAFE_END(op) \
-        --_PyTrash_delete_nesting; \
-        if (_PyTrash_delete_later && _PyTrash_delete_nesting <= 0) \
-            _PyTrash_destroy_chain(); \
-    } \
-    else \
-        _PyTrash_deposit_object((PyObject*)op);
+            --_tstate->trash_delete_nesting; \
+            if (_tstate->trash_delete_later && _tstate->trash_delete_nesting <= 0) \
+                _PyTrash_thread_destroy_chain(); \
+        } \
+        else \
+            _PyTrash_thread_deposit_object((PyObject*)op); \
+    } while (0);
 
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(void)
diff --git a/Include/pystate.h b/Include/pystate.h
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -114,6 +114,9 @@
     PyObject *async_exc; /* Asynchronous exception to raise */
     long thread_id; /* Thread id where this tstate was created */
 
+    int trash_delete_nesting;
+    PyObject *trash_delete_later;
+
     /* XXX signal handlers should also be here */
 
 } PyThreadState;
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
--- a/Lib/test/test_gc.py
+++ b/Lib/test/test_gc.py
@@ -2,9 +2,15 @@
 from test.support import (verbose, refcount_test, run_unittest,
                             strip_python_stderr)
 import sys
+import time
 import gc
 import weakref
 
+try:
+    import threading
+except ImportError:
+    threading = None
+
 ### Support code
 ###############################################################################
 
@@ -328,6 +334,69 @@
                 v = {1: v, 2: Ouch()}
         gc.disable()
 
+    @unittest.skipUnless(threading, "test meaningless on builds without threads")
+    def test_trashcan_threads(self):
+        # Issue #13992: trashcan mechanism should be thread-safe
+        NESTING = 60
+        N_THREADS = 2
+
+        def sleeper_gen():
+            """A generator that releases the GIL when closed or dealloc'ed."""
+            try:
+                yield
+            finally:
+                time.sleep(0.000001)
+
+        class C(list):
+            # Appending to a list is atomic, which avoids the use of a lock.
+            inits = []
+            dels = []
+            def __init__(self, alist):
+                self[:] = alist
+                C.inits.append(None)
+            def __del__(self):
+                # This __del__ is called by subtype_dealloc().
+                C.dels.append(None)
+                # `g` will release the GIL when garbage-collected.  This
+                # helps assert subtype_dealloc's behaviour when threads
+                # switch in the middle of it.
+                g = sleeper_gen()
+                next(g)
+                # Now that __del__ is finished, subtype_dealloc will proceed
+                # to call list_dealloc, which also uses the trashcan mechanism.
+
+        def make_nested():
+            """Create a sufficiently nested container object so that the
+            trashcan mechanism is invoked when deallocating it."""
+            x = C([])
+            for i in range(NESTING):
+                x = [C([x])]
+            del x
+
+        def run_thread():
+            """Exercise make_nested() in a loop."""
+            while not exit:
+                make_nested()
+
+        old_switchinterval = sys.getswitchinterval()
+        sys.setswitchinterval(1e-5)
+        try:
+            exit = False
+            threads = []
+            for i in range(N_THREADS):
+                t = threading.Thread(target=run_thread)
+                threads.append(t)
+            for t in threads:
+                t.start()
+            time.sleep(1.0)
+            exit = True
+            for t in threads:
+                t.join()
+        finally:
+            sys.setswitchinterval(old_switchinterval)
+        gc.collect()
+        self.assertEqual(len(C.inits), len(C.dels))
+
     def test_boom(self):
         class Boom:
             def __getattr__(self, someattribute):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,11 @@
 Core and Builtins
 -----------------
 
+- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
+  sporadic crashes in multi-thread programs when several long deallocator
+  chains ran concurrently and involved subclasses of built-in container
+  types.
+
 - Issue #15784: Modify OSError.__str__() to better distinguish between
   errno error numbers and Windows error numbers.
 
diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1954,6 +1954,18 @@
     _PyTrash_delete_later = op;
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_deposit_object(PyObject *op)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    assert(PyObject_IS_GC(op));
+    assert(_Py_AS_GC(op)->gc.gc_refs == _PyGC_REFS_UNTRACKED);
+    assert(op->ob_refcnt == 0);
+    _Py_AS_GC(op)->gc.gc_prev = (PyGC_Head *) tstate->trash_delete_later;
+    tstate->trash_delete_later = op;
+}
+
 /* Dealloccate all the objects in the _PyTrash_delete_later list.  Called when
  * the call-stack unwinds again.
  */
@@ -1980,6 +1992,31 @@
     }
 }
 
+/* The equivalent API, using per-thread state recursion info */
+void
+_PyTrash_thread_destroy_chain(void)
+{
+    PyThreadState *tstate = PyThreadState_GET();
+    while (tstate->trash_delete_later) {
+        PyObject *op = tstate->trash_delete_later;
+        destructor dealloc = Py_TYPE(op)->tp_dealloc;
+
+        tstate->trash_delete_later =
+            (PyObject*) _Py_AS_GC(op)->gc.gc_prev;
+
+        /* Call the deallocator directly.  This used to try to
+         * fool Py_DECREF into calling it indirectly, but
+         * Py_DECREF was already called on this object, and in
+         * assorted non-release builds calling Py_DECREF again ends
+         * up distorting allocation statistics.
+         */
+        assert(op->ob_refcnt == 0);
+        ++tstate->trash_delete_nesting;
+        (*dealloc)(op);
+        --tstate->trash_delete_nesting;
+    }
+}
+
 #ifndef Py_TRACE_REFS
 /* For Py_LIMITED_API, we need an out-of-line version of _Py_Dealloc.
    Define this here, so we can undefine the macro. */
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -891,6 +891,7 @@
 {
     PyTypeObject *type, *base;
     destructor basedealloc;
+    PyThreadState *tstate = PyThreadState_GET();
 
     /* Extract the type; we expect it to be a heap type */
     type = Py_TYPE(self);
@@ -940,8 +941,10 @@
     /* See explanation at end of function for full disclosure */
     PyObject_GC_UnTrack(self);
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_BEGIN(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
     /* DO NOT restore GC tracking at this point.  weakref callbacks
      * (if any, and whether directly here or indirectly in something we
      * call) may trigger GC, and if self is tracked at that point, it
@@ -1020,8 +1023,10 @@
 
   endlabel:
     ++_PyTrash_delete_nesting;
+    ++ tstate->trash_delete_nesting;
     Py_TRASHCAN_SAFE_END(self);
     --_PyTrash_delete_nesting;
+    -- tstate->trash_delete_nesting;
 
     /* Explanation of the weirdness around the trashcan macros:
 
diff --git a/Python/pystate.c b/Python/pystate.c
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -206,6 +206,9 @@
         tstate->c_profileobj = NULL;
         tstate->c_traceobj = NULL;
 
+        tstate->trash_delete_nesting = 0;
+        tstate->trash_delete_later = NULL;
+
         if (init)
             _PyThreadState_Init(tstate);
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:23 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315822=3A_Fix_inst?=
 =?utf-8?q?allation_of_lib2to3_grammar_pickles_to_ensure?=
Message-ID: <3XF6K737GBzQZ5@mail.python.org>

http://hg.python.org/cpython/rev/411d500e56a1
changeset:   78913:411d500e56a1
user:        Ned Deily <nad at acm.org>
date:        Sat Sep 08 19:04:47 2012 -0700
summary:
  Issue #15822: Fix installation of lib2to3 grammar pickles to ensure
they are created in the install locations and with the proper timestamp.
(Solution suggested by MvL)

files:
  Lib/lib2to3/pgen2/driver.py |  17 +++++++++++++++++
  Makefile.pre.in             |   8 +++++---
  Misc/NEWS                   |   3 +++
  3 files changed, 25 insertions(+), 3 deletions(-)


diff --git a/Lib/lib2to3/pgen2/driver.py b/Lib/lib2to3/pgen2/driver.py
--- a/Lib/lib2to3/pgen2/driver.py
+++ b/Lib/lib2to3/pgen2/driver.py
@@ -138,3 +138,20 @@
     if not os.path.exists(b):
         return True
     return os.path.getmtime(a) >= os.path.getmtime(b)
+
+
+def main(*args):
+    """Main program, when run as a script: produce grammar pickle files.
+
+    Calls load_grammar for each argument, a path to a grammar text file.
+    """
+    if not args:
+        args = sys.argv[1:]
+    logging.basicConfig(level=logging.INFO, stream=sys.stdout,
+                        format='%(message)s')
+    for gt in args:
+        load_grammar(gt, save=True, force=True)
+    return True
+
+if __name__ == "__main__":
+    sys.exit(int(not main()))
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1017,8 +1017,6 @@
 		venv venv/scripts venv/scripts/posix \
 		curses pydoc_data $(MACHDEPS)
 libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
-	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-		$(PYTHON_FOR_BUILD) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
 	@for i in $(SCRIPTDIR) $(LIBDEST); \
 	do \
 		if test ! -d $(DESTDIR)$$i; then \
@@ -1096,6 +1094,10 @@
 		$(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST)/site-packages -f \
 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
 
 # Create the PLATDIR source directory, if one wasn't distributed..
 $(srcdir)/Lib/$(PLATDIR):
@@ -1340,7 +1342,7 @@
 	find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';'
 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true
 	find build -name 'fficonfig.py' -exec rm -f {} ';' || true
-	-rm -f $(srcdir)/Lib/lib2to3/*Grammar*.pickle
+	-rm -f Lib/lib2to3/*Grammar*.pickle
 	-rm -f $(SYSCONFIGDATA)
 	-rm -f Modules/_testembed Modules/_freeze_importlib
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -141,6 +141,9 @@
 Tools/Demos
 -----------
 
+- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
+  (replaces fixes for Issue #15645).
+
 Documentation
 -------------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:24 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_NEWS_entry_location=2E?=
Message-ID: <3XF6K86K7PzQXB@mail.python.org>

http://hg.python.org/cpython/rev/c5bc19ce4d2b
changeset:   78914:c5bc19ce4d2b
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 08:31:16 2012 +0200
summary:
  Fix NEWS entry location.

files:
  Misc/NEWS |  9 ++++++---
  1 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -46,6 +46,12 @@
   calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
   to libncursesw.
 
+Build
+-----
+
+- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
+  (replaces fixes for Issue #15645).
+
 
 What's New in Python 3.3.0 Release Candidate 1?
 ===============================================
@@ -141,9 +147,6 @@
 Tools/Demos
 -----------
 
-- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
-  (replaces fixes for Issue #15645).
-
 Documentation
 -------------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:26 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Bump_to_3=2E3=2E0rc2=2E?=
Message-ID: <3XF6KB2WPMzQWD@mail.python.org>

http://hg.python.org/cpython/rev/1aa3fb9f761d
changeset:   78915:1aa3fb9f761d
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 08:56:46 2012 +0200
summary:
  Bump to 3.3.0rc2.

files:
  Include/patchlevel.h      |  4 ++--
  Lib/distutils/__init__.py |  2 +-
  Lib/idlelib/idlever.py    |  2 +-
  Misc/NEWS                 |  2 +-
  Misc/RPM/python-3.3.spec  |  2 +-
  README                    |  2 +-
  6 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	0
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_SERIAL	2
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc1+"
+#define PY_VERSION      	"3.3.0rc2"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc1"
+__version__ = "3.3.0rc2"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.0rc1"
+IDLE_VERSION = "3.3.0rc2"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,7 +5,7 @@
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 
-*Release date: XX-Sep-2012*
+*Release date: 09-Sep-2012*
 
 Core and Builtins
 -----------------
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
--- a/Misc/RPM/python-3.3.spec
+++ b/Misc/RPM/python-3.3.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0rc1
+%define version 3.3.0rc2
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.3.0 release candidate 1
+This is Python version 3.3.0 release candidate 2
 ================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:27 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Document?=
 =?utf-8?q?ation=3A_disallow_hashing_of_multi-dimensional_memoryviews=2E?=
Message-ID: <3XF6KC6qMlzQYK@mail.python.org>

http://hg.python.org/cpython/rev/71f4d80400f2
changeset:   78916:71f4d80400f2
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 02 14:50:56 2012 +0200
summary:
  Issue #15814: Documentation: disallow hashing of multi-dimensional memoryviews.

files:
  Doc/library/stdtypes.rst |  14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2376,8 +2376,9 @@
       >>> data
       bytearray(b'z1spam')
 
-   Memoryviews of hashable (read-only) types with formats 'B', 'b' or 'c'
-   are also hashable. The hash is defined as ``hash(m) == hash(m.tobytes())``::
+   One-dimensional memoryviews of hashable (read-only) types with formats
+   'B', 'b' or 'c' are also hashable. The hash is defined as
+   ``hash(m) == hash(m.tobytes())``::
 
       >>> v = memoryview(b'abcefg')
       >>> hash(v) == hash(b'abcefg')
@@ -2388,12 +2389,13 @@
       True
 
    .. versionchanged:: 3.3
-      Memoryview objects with formats 'B', 'b' or 'c' are now hashable.
+      One-dimensional memoryviews with formats 'B', 'b' or 'c' are now hashable.
 
    .. note::
-      Hashing of memoryviews with formats other than 'B', 'b' or 'c' is
-      possible in version 3.3.0, but will raise an error in 3.3.1 in order
-      to be compatible with the new memoryview equality definition.
+      Hashing of memoryviews with formats other than 'B', 'b' or 'c' as well
+      as hashing of multi-dimensional memoryviews is possible in version 3.3.0,
+      but will raise an error in 3.3.1 in order to be compatible with the new
+      memoryview equality definition.
 
    :class:`memoryview` has several methods:
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:29 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Add_NEWS?=
 =?utf-8?q?_entry_regarding_intended_memoryview_hashing_restrictions?=
Message-ID: <3XF6KF2xLzzQWD@mail.python.org>

http://hg.python.org/cpython/rev/3ffd6ad93fe4
changeset:   78917:3ffd6ad93fe4
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Mon Sep 03 21:46:33 2012 +1000
summary:
  Issue #15814: Add NEWS entry regarding intended memoryview hashing restrictions

files:
  Misc/NEWS |  8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,14 @@
 - Issue #15822: Really ensure 2to3 grammar pickles are properly installed
   (replaces fixes for Issue #15645).
 
+Documentation
+-------------
+
+- Issue #15814: The memoryview enhancements in 3.3.0 accidentally permitted
+  the hashing of multi-dimensional memorviews and memoryviews with multi-byte
+  item formats. The intended restrictions have now been documented - they
+  will be correctly enforced in 3.3.1
+
 
 What's New in Python 3.3.0 Release Candidate 1?
 ===============================================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:30 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315814=3A_Update_w?=
 =?utf-8?q?hatsnew_to_the_current_state_of_hashing_memoryviews=2E?=
Message-ID: <3XF6KG60yTzQXB@mail.python.org>

http://hg.python.org/cpython/rev/88a0792e8ba3
changeset:   78918:88a0792e8ba3
tag:         v3.3.0rc2
user:        Stefan Krah <skrah at bytereef.org>
date:        Sat Sep 08 15:35:01 2012 +0200
summary:
  Issue #15814: Update whatsnew to the current state of hashing memoryviews.

files:
  Doc/whatsnew/3.3.rst |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -158,9 +158,8 @@
 
 * Multi-dimensional comparisons are supported for any array type.
 
-* All array types are hashable if the exporting object is hashable
-  and the view is read-only. (Contributed by Antoine Pitrou in
-  :issue:`13411`)
+* One-dimensional memoryviews of hashable (read-only) types with formats B,
+  b or c are now hashable. (Contributed by Antoine Pitrou in :issue:`13411`)
 
 * Arbitrary slicing of any 1-D arrays type is supported. For example, it
   is now possible to reverse a memoryview in O(1) by using a negative step.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:32 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Added_tag_v3=2E3=2E0rc2_fo?=
	=?utf-8?q?r_changeset_88a0792e8ba3?=
Message-ID: <3XF6KJ1yV5zQQF@mail.python.org>

http://hg.python.org/cpython/rev/91d15845e472
changeset:   78919:91d15845e472
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 09:04:21 2012 +0200
summary:
  Added tag v3.3.0rc2 for changeset 88a0792e8ba3

files:
  .hgtags |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -106,3 +106,4 @@
 e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
+88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:33 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Post-release_updates_for_3?=
	=?utf-8?b?LjMuMHJjMi4=?=
Message-ID: <3XF6KK57RtzQXf@mail.python.org>

http://hg.python.org/cpython/rev/72598063c6c4
changeset:   78920:72598063c6c4
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 11:16:41 2012 +0200
summary:
  Post-release updates for 3.3.0rc2.

files:
  Include/patchlevel.h |   2 +-
  Misc/NEWS            |  12 ++++++++++++
  2 files changed, 13 insertions(+), 1 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,7 +23,7 @@
 #define PY_RELEASE_SERIAL	2
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc2"
+#define PY_VERSION      	"3.3.0rc2+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,18 @@
 Python News
 +++++++++++
 
+What's New in Python 3.3.0?
+===========================
+
+*Release date: XX-Sep-2012*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 11:19:35 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun,  9 Sep 2012 11:19:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_in_changes_from_3=2E3=2E0rc2_release_clone=2E?=
Message-ID: <3XF6KM2z5ZzQWZ@mail.python.org>

http://hg.python.org/cpython/rev/800507fb0a7e
changeset:   78921:800507fb0a7e
parent:      78897:a829889f96b0
parent:      78920:72598063c6c4
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 09 11:19:17 2012 +0200
summary:
  Merge in changes from 3.3.0rc2 release clone.

files:
  .hgtags                   |   1 +
  Include/patchlevel.h      |   4 +-
  Lib/distutils/__init__.py |   2 +-
  Lib/idlelib/idlever.py    |   2 +-
  Misc/NEWS                 |  40 +++++++++++++++++++-------
  Misc/RPM/python-3.3.spec  |   2 +-
  README                    |   2 +-
  7 files changed, 36 insertions(+), 17 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -106,3 +106,4 @@
 e15c554cd43eb23bc0a528a4e8741da9bbec9607 v3.3.0b1
 4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
+88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	0
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_SERIAL	2
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc1+"
+#define PY_VERSION      	"3.3.0rc2+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc1"
+__version__ = "3.3.0rc2"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.0rc1"
+IDLE_VERSION = "3.3.0rc2"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,11 +10,6 @@
 Core and Builtins
 -----------------
 
-- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
-  sporadic crashes in multi-thread programs when several long deallocator
-  chains ran concurrently and involved subclasses of built-in container
-  types.
-
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 
 - Issue #15846: Fix SystemError which happened when using ast.parse in an
@@ -62,9 +57,6 @@
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
-- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
-  (replaces fixes for Issue #15645).
-
 Documentation
 -------------
 
@@ -75,14 +67,31 @@
 -----------
 
 
+What's New in Python 3.3.0?
+===========================
+
+*Release date: XX-Sep-2012*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 
-*Release date: XX-Sep-2012*
+*Release date: 09-Sep-2012*
 
 Core and Builtins
 -----------------
 
+- Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
+  sporadic crashes in multi-thread programs when several long deallocator
+  chains ran concurrently and involved subclasses of built-in container
+  types.
+
 - Issue #15784: Modify OSError.__str__() to better distinguish between
   errno error numbers and Windows error numbers.
 
@@ -91,11 +100,14 @@
 Library
 -------
 
+- Issue #15847: Fix a regression in argparse, which did not accept tuples
+  as argument lists anymore.
+
+- Issue #15828: Restore support for C extensions in imp.load_module().
+
 - Issue #15340: Fix importing the random module when /dev/urandom cannot
   be opened.  This was a regression caused by the hash randomization patch.
 
-- Issue #15828: Restore support for C extensions in imp.load_module()
-
 - Issue #10650: Deprecate the watchexp parameter of the Decimal.quantize()
   method.
 
@@ -111,6 +123,12 @@
   calling the C function wadd_wch()/mvwadd_wch() if the Python curses is linked
   to libncursesw.
 
+Build
+-----
+
+- Issue #15822: Really ensure 2to3 grammar pickles are properly installed
+  (replaces fixes for Issue #15645).
+
 Documentation
 -------------
 
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
--- a/Misc/RPM/python-3.3.spec
+++ b/Misc/RPM/python-3.3.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0rc1
+%define version 3.3.0rc2
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.3.0 release candidate 1
+This is Python version 3.3.0 release candidate 2
 ================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 19:28:07 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  9 Sep 2012 19:28:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODgx?=
 =?utf-8?q?=3A_Fixed_atexit_hook_in_multiprocessing=2E?=
Message-ID: <3XFK934lnczQW8@mail.python.org>

http://hg.python.org/cpython/rev/27d410dd5431
changeset:   78922:27d410dd5431
branch:      3.2
parent:      78895:adc5e6aca251
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Sep 09 13:16:15 2012 -0400
summary:
  Issue #15881: Fixed atexit hook in multiprocessing.

files:
  Doc/ACKS.txt                |   1 +
  Lib/multiprocessing/util.py |  50 ++++++++++++++++++-------
  2 files changed, 37 insertions(+), 14 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -236,3 +236,4 @@
    * Moshe Zadka
    * Milan Zamazal
    * Cheng Zhang
+   * Chris McDonough
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -247,6 +247,12 @@
     Finalizers with highest priority are called first; finalizers with
     the same priority will be called in reverse order of creation.
     '''
+    if _finalizer_registry is None:
+        # This function may be called after this module's globals are
+        # destroyed.  See the _exit_function function in this module for more
+        # notes.
+        return
+    
     if minpriority is None:
         f = lambda p : p[0][0] is not None
     else:
@@ -278,24 +284,40 @@
 
 _exiting = False
 
-def _exit_function():
+def _exit_function(info=info, debug=debug, _run_finalizers=_run_finalizers,
+                   active_children=active_children,
+                   current_process=current_process):
+    # We hold on to references to functions in the arglist due to the
+    # situation described below, where this function is called after this
+    # module's globals are destroyed.
+
     global _exiting
 
-    info('process shutting down')
-    debug('running all "atexit" finalizers with priority >= 0')
-    _run_finalizers(0)
+    if not _exiting:
+        info('process shutting down')
+        debug('running all "atexit" finalizers with priority >= 0')
+        _run_finalizers(0)
+        if current_process() is not None:
+            # We check if the current process is None here because if
+            # it's None, any call to ``active_children()`` will throw an
+            # AttributeError (active_children winds up trying to get
+            # attributes from util._current_process).  This happens in a
+            # variety of shutdown circumstances that are not well-understood
+            # because module-scope variables are not apparently supposed to
+            # be destroyed until after this function is called.  However,
+            # they are indeed destroyed before this function is called.  See
+            # issues #9775 and #15881.  Also related: #4106, #9205, and #9207.
+            for p in active_children():
+                if p._daemonic:
+                    info('calling terminate() for daemon %s', p.name)
+                    p._popen.terminate()
 
-    for p in active_children():
-        if p._daemonic:
-            info('calling terminate() for daemon %s', p.name)
-            p._popen.terminate()
+            for p in active_children():
+                info('calling join() for process %s', p.name)
+                p.join()
 
-    for p in active_children():
-        info('calling join() for process %s', p.name)
-        p.join()
-
-    debug('running the remaining "atexit" finalizers')
-    _run_finalizers()
+        debug('running the remaining "atexit" finalizers')
+        _run_finalizers()
 
 atexit.register(_exit_function)
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 19:28:10 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  9 Sep 2012 19:28:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315881=3A_Fixed_at?=
 =?utf-8?q?exit_hook_in_multiprocessing=2E?=
Message-ID: <3XFK960MNrzQZC@mail.python.org>

http://hg.python.org/cpython/rev/08c680918ff8
changeset:   78923:08c680918ff8
parent:      78921:800507fb0a7e
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Sep 09 13:20:58 2012 -0400
summary:
  Issue #15881: Fixed atexit hook in multiprocessing.

files:
  Doc/ACKS.txt                |   1 +
  Lib/multiprocessing/util.py |  39 +++++++++++++++++++-----
  2 files changed, 32 insertions(+), 8 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -238,3 +238,4 @@
    * Moshe Zadka
    * Milan Zamazal
    * Cheng Zhang
+   * Chris McDonough
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -235,6 +235,12 @@
     Finalizers with highest priority are called first; finalizers with
     the same priority will be called in reverse order of creation.
     '''
+    if _finalizer_registry is None:
+        # This function may be called after this module's globals are
+        # destroyed.  See the _exit_function function in this module for more
+        # notes.
+        return
+    
     if minpriority is None:
         f = lambda p : p[0][0] is not None
     else:
@@ -266,7 +272,13 @@
 
 _exiting = False
 
-def _exit_function():
+def _exit_function(info=info, debug=debug, _run_finalizers=_run_finalizers,
+                   active_children=active_children,
+                   current_process=current_process):
+    # We hold on to references to functions in the arglist due to the
+    # situation described below, where this function is called after this
+    # module's globals are destroyed.
+
     global _exiting
 
     if not _exiting:
@@ -276,14 +288,25 @@
         debug('running all "atexit" finalizers with priority >= 0')
         _run_finalizers(0)
 
-        for p in active_children():
-            if p._daemonic:
-                info('calling terminate() for daemon %s', p.name)
-                p._popen.terminate()
+        if current_process() is not None:
+            # We check if the current process is None here because if
+            # it's None, any call to ``active_children()`` will throw an
+            # AttributeError (active_children winds up trying to get
+            # attributes from util._current_process).  This happens in a
+            # variety of shutdown circumstances that are not well-understood
+            # because module-scope variables are not apparently supposed to
+            # be destroyed until after this function is called.  However,
+            # they are indeed destroyed before this function is called.  See
+            # issues #9775 and #15881.  Also related: #4106, #9205, and #9207.
 
-        for p in active_children():
-            info('calling join() for process %s', p.name)
-            p.join()
+            for p in active_children():
+                if p._daemonic:
+                    info('calling terminate() for daemon %s', p.name)
+                    p._popen.terminate()
+
+            for p in active_children():
+                info('calling join() for process %s', p.name)
+                p.join()
 
         debug('running the remaining "atexit" finalizers')
         _run_finalizers()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 19:28:11 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  9 Sep 2012 19:28:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixed_whitespa?=
	=?utf-8?q?ce?=
Message-ID: <3XFK973Vp4zQYq@mail.python.org>

http://hg.python.org/cpython/rev/89a5169f2979
changeset:   78924:89a5169f2979
branch:      3.2
parent:      78922:27d410dd5431
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Sep 09 13:22:45 2012 -0400
summary:
  Fixed whitespace

files:
  Lib/multiprocessing/util.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -252,7 +252,7 @@
         # destroyed.  See the _exit_function function in this module for more
         # notes.
         return
-    
+
     if minpriority is None:
         f = lambda p : p[0][0] is not None
     else:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 19:28:13 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  9 Sep 2012 19:28:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_whitespace?=
Message-ID: <3XFK9937YlzQZt@mail.python.org>

http://hg.python.org/cpython/rev/6c4dc8f7e3e3
changeset:   78925:6c4dc8f7e3e3
parent:      78923:08c680918ff8
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Sep 09 13:25:06 2012 -0400
summary:
  Fixed whitespace

files:
  Lib/multiprocessing/util.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -240,7 +240,7 @@
         # destroyed.  See the _exit_function function in this module for more
         # notes.
         return
-    
+
     if minpriority is None:
         f = lambda p : p[0][0] is not None
     else:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 19:31:21 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  9 Sep 2012 19:31:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODgx?=
 =?utf-8?q?=3A_Fixed_3=2E2_backport=2E?=
Message-ID: <3XFKDn6btCzQZ5@mail.python.org>

http://hg.python.org/cpython/rev/db67b848ddc3
changeset:   78926:db67b848ddc3
branch:      3.2
parent:      78924:89a5169f2979
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Sep 09 13:31:08 2012 -0400
summary:
  Issue #15881: Fixed 3.2 backport.

files:
  Lib/multiprocessing/util.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -294,6 +294,8 @@
     global _exiting
 
     if not _exiting:
+        _exiting = True
+
         info('process shutting down')
         debug('running all "atexit" finalizers with priority >= 0')
         _run_finalizers(0)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep  9 20:12:02 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Sun,  9 Sep 2012 20:12:02 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODgx?=
 =?utf-8?q?=3A_Added_NEWS_entry_and_proper_credit=2E?=
Message-ID: <3XFL7k0m6bzQTf@mail.python.org>

http://hg.python.org/cpython/rev/b05547e8ff92
changeset:   78927:b05547e8ff92
branch:      3.2
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Sep 09 14:11:45 2012 -0400
summary:
  Issue #15881: Added NEWS entry and proper credit.

files:
  Doc/ACKS.txt |  1 -
  Misc/NEWS    |  3 +++
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -236,4 +236,3 @@
    * Moshe Zadka
    * Milan Zamazal
    * Cheng Zhang
-   * Chris McDonough
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,9 @@
 Library
 -------
 
+- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
+  by Chris McDonough.
+
 - Issue #15340: Fix importing the random module when /dev/urandom cannot
   be opened.  This was a regression caused by the hash randomization patch.
 

-- 
Repository URL: http://hg.python.org/cpython

From brett at python.org  Sun Sep  9 20:56:57 2012
From: brett at python.org (Brett Cannon)
Date: Sun, 9 Sep 2012 14:56:57 -0400
Subject: [Python-checkins] devguide: Update committers list location.
In-Reply-To: <3XF3gB6HtHzQNv@mail.python.org>
References: <3XF3gB6HtHzQNv@mail.python.org>
Message-ID: <CAP1=2W7CiVibh85+EzxZmPzTiDO+WYg0-GFHAQvfBRre65jEyQ@mail.gmail.com>

Did you mean to use http://docs.python.org/devguide/developers.html instead
of http://hg.python.org/committers.txt as the former lists why while the
latter just lists usernames?

On Sun, Sep 9, 2012 at 3:19 AM, georg.brandl <python-checkins at python.org>wrote:

> http://hg.python.org/devguide/rev/b40bfc99c54f
> changeset:   548:b40bfc99c54f
> user:        Georg Brandl <georg at python.org>
> date:        Sun Sep 09 09:20:23 2012 +0200
> summary:
>   Update committers list location.
>
> files:
>   coredev.rst |  4 ++--
>   faq.rst     |  2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
>
>
> diff --git a/coredev.rst b/coredev.rst
> --- a/coredev.rst
> +++ b/coredev.rst
> @@ -25,7 +25,7 @@
>  able to commit them without supervision.
>
>  A complete list of core developer usernames can be found at
> -http://www.python.org/dev/committers. :ref:`developers` lists when and
> why
> +http://hg.python.org/committers.txt. :ref:`developers` lists when and why
>  someone received commit privileges.
>
>
> @@ -68,7 +68,7 @@
>  This should match your username on the issue tracker.
>
>  You can verify your commit access by looking at
> -http://www.python.org/dev/committers which lists all core developers by
> +http://hg.python.org/committers.txt which lists all core developers by
>  username.  If you want to practice, there is a `test repository
>  <http://hg.python.org/test/>`_ where you can freely commit and push any
>  changes you like::
> diff --git a/faq.rst b/faq.rst
> --- a/faq.rst
> +++ b/faq.rst
> @@ -96,7 +96,7 @@
>  On the `issue tracker`_, most core developers will have the Python logo
>  appear next to their name.
>
> -.. _full list of developers: http://www.python.org/dev/committers
> +.. _full list of developers: http://hg.python.org/committers.txt
>
>
>  What standards of behaviour are expected in these communication channels?
>
> --
> Repository URL: http://hg.python.org/devguide
>
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-checkins/attachments/20120909/148f3b40/attachment.html>

From g.brandl at gmx.net  Sun Sep  9 21:45:41 2012
From: g.brandl at gmx.net (Georg Brandl)
Date: Sun, 09 Sep 2012 21:45:41 +0200
Subject: [Python-checkins] devguide: Update committers list location.
In-Reply-To: <CAP1=2W7CiVibh85+EzxZmPzTiDO+WYg0-GFHAQvfBRre65jEyQ@mail.gmail.com>
References: <3XF3gB6HtHzQNv@mail.python.org>
	<CAP1=2W7CiVibh85+EzxZmPzTiDO+WYg0-GFHAQvfBRre65jEyQ@mail.gmail.com>
Message-ID: <k2irjv$pe$1@ger.gmane.org>

No, I just updated the location.

Georg

On 09.09.2012 20:56, Brett Cannon wrote:
> Did you mean to use http://docs.python.org/devguide/developers.html instead
> of http://hg.python.org/committers.txt as the former lists why while the latter
> just lists usernames?
> 
> On Sun, Sep 9, 2012 at 3:19 AM, georg.brandl <python-checkins at python.org
> <mailto:python-checkins at python.org>> wrote:
> 
>     http://hg.python.org/devguide/rev/b40bfc99c54f
>     changeset:   548:b40bfc99c54f
>     user:        Georg Brandl <georg at python.org <mailto:georg at python.org>>
>     date:        Sun Sep 09 09:20:23 2012 +0200
>     summary:
>       Update committers list location.
> 
>     files:
>       coredev.rst |  4 ++--
>       faq.rst     |  2 +-
>       2 files changed, 3 insertions(+), 3 deletions(-)
> 
> 
>     diff --git a/coredev.rst b/coredev.rst
>     --- a/coredev.rst
>     +++ b/coredev.rst
>     @@ -25,7 +25,7 @@
>      able to commit them without supervision.
> 
>      A complete list of core developer usernames can be found at
>     -http://www.python.org/dev/committers. :ref:`developers` lists when and why
>     +http://hg.python.org/committers.txt. :ref:`developers` lists when and why
>      someone received commit privileges.
> 
> 
>     @@ -68,7 +68,7 @@
>      This should match your username on the issue tracker.
> 
>      You can verify your commit access by looking at
>     -http://www.python.org/dev/committers which lists all core developers by
>     +http://hg.python.org/committers.txt which lists all core developers by
>      username.  If you want to practice, there is a `test repository
>      <http://hg.python.org/test/>`_ where you can freely commit and push any
>      changes you like::
>     diff --git a/faq.rst b/faq.rst
>     --- a/faq.rst
>     +++ b/faq.rst
>     @@ -96,7 +96,7 @@
>      On the `issue tracker`_, most core developers will have the Python logo
>      appear next to their name.
> 
>     -.. _full list of developers: http://www.python.org/dev/committers
>     +.. _full list of developers: http://hg.python.org/committers.txt
> 
> 
>      What standards of behaviour are expected in these communication channels?
> 
>     --
>     Repository URL: http://hg.python.org/devguide
> 
>     _______________________________________________
>     Python-checkins mailing list
>     Python-checkins at python.org <mailto:Python-checkins at python.org>
>     http://mail.python.org/mailman/listinfo/python-checkins
> 
> 
> 
> 
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
> 



From python-checkins at python.org  Mon Sep 10 01:01:30 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Mon, 10 Sep 2012 01:01:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3XFSYk1xG8zQbJ@mail.python.org>

http://hg.python.org/cpython/rev/1ffc26c5122c
changeset:   78928:1ffc26c5122c
parent:      78925:6c4dc8f7e3e3
parent:      78927:b05547e8ff92
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Sun Sep 09 19:01:20 2012 -0400
summary:
  merge

files:
  Misc/NEWS |  7 +++++++
  1 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,8 +21,15 @@
 Library
 -------
 
+
 - Issue #15876: Fix a refleak in the curses module: window.encoding.
 
+- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
+  by Chris McDonough.
+
+- Issue #15340: Fix importing the random module when /dev/urandom cannot
+  be opened.  This was a regression caused by the hash randomization patch.
+
 - Issue #15841: The readable(), writable() and seekable() methods of BytesIO
   and StringIO objects now raise ValueError when the object has been closed.
   Patch by Alessandro Moura.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 01:24:45 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 01:24:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNTY3?=
 =?utf-8?q?6=3A_mmap=3A_add_empty_file_check_prior_to_offset_check?=
Message-ID: <3XFT4Y08nDzQZJ@mail.python.org>

http://hg.python.org/cpython/rev/d85f80b31b54
changeset:   78929:d85f80b31b54
branch:      3.2
parent:      78927:b05547e8ff92
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 00:27:55 2012 +0200
summary:
  Closes #15676: mmap: add empty file check prior to offset check

files:
  Lib/test/test_mmap.py |  9 +++++++++
  Misc/NEWS             |  3 +++
  Modules/mmapmodule.c  |  5 +++++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -459,6 +459,15 @@
         f.flush ()
         return mmap.mmap (f.fileno(), 0)
 
+    def test_empty_file (self):
+        f = open (TESTFN, 'w+b')
+        f.close()
+        f = open(TESTFN, "rb")
+        self.assertRaisesRegex(ValueError,
+                               "cannot mmap an empty file",
+                               mmap.mmap, f.fileno(), 0, access=mmap.ACCESS_READ)
+        f.close()
+
     def test_offset (self):
         f = open (TESTFN, 'w+b')
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -463,6 +463,9 @@
 Extension Modules
 -----------------
 
+- Issue #15676: Now "mmap" check for empty files before doing the
+  offset check.  Patch by Steven Willis.
+
 - Issue #6493: An issue in ctypes on Windows that caused structure bitfields
   of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed.
 
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1141,6 +1141,11 @@
     if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
         if (map_size == 0) {
             off_t calc_size;
+            if (st.st_size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= st.st_size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 01:24:46 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 01:24:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Closes_=2315676=3A_mmap=3A_add_empty_file_check_prior_to?=
 =?utf-8?q?_offset_check?=
Message-ID: <3XFT4Z52s4zQbL@mail.python.org>

http://hg.python.org/cpython/rev/f962ec8e47a1
changeset:   78930:f962ec8e47a1
parent:      78928:1ffc26c5122c
parent:      78929:d85f80b31b54
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 01:23:05 2012 +0200
summary:
  Closes #15676: mmap: add empty file check prior to offset check

files:
  Lib/test/test_mmap.py |  9 +++++++++
  Misc/NEWS             |  3 +++
  Modules/mmapmodule.c  |  5 +++++
  3 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -488,6 +488,15 @@
         f.flush ()
         return mmap.mmap (f.fileno(), 0)
 
+    def test_empty_file (self):
+        f = open (TESTFN, 'w+b')
+        f.close()
+        f = open(TESTFN, "rb")
+        self.assertRaisesRegex(ValueError,
+                               "cannot mmap an empty file",
+                               mmap.mmap, f.fileno(), 0, access=mmap.ACCESS_READ)
+        f.close()
+
     def test_offset (self):
         f = open (TESTFN, 'w+b')
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -544,6 +544,9 @@
 Extension Modules
 -----------------
 
+- Issue #15676: Now "mmap" check for empty files before doing the
+  offset check.  Patch by Steven Willis.
+
 - Issue #6493: An issue in ctypes on Windows that caused structure bitfields
   of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed.
 
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1163,6 +1163,11 @@
     if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
         if (map_size == 0) {
             off_t calc_size;
+            if (st.st_size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= st.st_size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 01:24:48 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 01:24:48 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNTY3?=
 =?utf-8?q?6=3A_mmap=3A_add_empty_file_check_prior_to_offset_check?=
Message-ID: <3XFT4c1kS9zQbT@mail.python.org>

http://hg.python.org/cpython/rev/27837a33790d
changeset:   78931:27837a33790d
branch:      2.7
parent:      78894:2def9ef683da
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 00:22:39 2012 +0200
summary:
  Closes #15676: mmap: add empty file check prior to offset check

files:
  Lib/test/test_mmap.py |  16 ++++++++++++++++
  Misc/NEWS             |   3 +++
  Modules/mmapmodule.c  |   5 +++++
  3 files changed, 24 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -466,6 +466,22 @@
         f.flush ()
         return mmap.mmap (f.fileno(), 0)
 
+    def test_empty_file (self):
+        f = open (TESTFN, 'w+b')
+        f.close()
+        f = open(TESTFN, "rb")
+        try:
+            m = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
+            m.close()
+            f.close()
+            self.fail("should not have been able to mmap empty file")
+        except ValueError as e:
+            f.close()
+            self.assertEqual(e.message, "cannot mmap an empty file")
+        except:
+            f.close()
+            self.fail("unexpected exception: " + str(e))
+
     def test_offset (self):
         f = open (TESTFN, 'w+b')
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,9 @@
 Library
 -------
 
+- Issue #15676: Now "mmap" check for empty files before doing the
+  offset check.  Patch by Steven Willis.
+
 - Issue #15340: Fix importing the random module when /dev/urandom cannot
   be opened.  This was a regression caused by the hash randomization patch.
 
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1189,6 +1189,11 @@
     if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
         if (map_size == 0) {
             off_t calc_size;
+            if (st.st_size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= st.st_size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 01:25:59 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 01:25:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Make_sure_that_*really*_no?=
 =?utf-8?q?_more_than_sizeof=28ifr=2Eifr=5Fname=29_chars_are_strcpy-ed?=
Message-ID: <3XFT5z6kCCzQZJ@mail.python.org>

http://hg.python.org/cpython/rev/80909b23ca1e
changeset:   78932:80909b23ca1e
parent:      78930:f962ec8e47a1
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 01:25:50 2012 +0200
summary:
  Make sure that *really* no more than sizeof(ifr.ifr_name) chars are strcpy-ed to ifr.ifr_name and that the string is *always* NUL terminated. New code shouldn't use strcpy(), too. CID 719692

files:
  Modules/socketmodule.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1674,7 +1674,8 @@
             if (len == 0) {
                 ifr.ifr_ifindex = 0;
             } else if (len < sizeof(ifr.ifr_name)) {
-                strcpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName));
+                strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
+                ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
                 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
                     s->errorhandler();
                     Py_DECREF(interfaceName);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 02:00:43 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 02:00:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_two_memory_leaks_in_?=
 =?utf-8?q?make=5Ffilename=28=29_in_zipimport=2Ec=2E_The_allocated_buffer?=
Message-ID: <3XFTt36v81zQTR@mail.python.org>

http://hg.python.org/cpython/rev/6bd9626b0cc6
changeset:   78933:6bd9626b0cc6
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 02:00:34 2012 +0200
summary:
  Fixed two memory leaks in make_filename() in zipimport.c. The allocated buffer wasn't cleaned up in two error cases. CID 486832

files:
  Modules/zipimport.c |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Modules/zipimport.c b/Modules/zipimport.c
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -236,12 +236,16 @@
         return NULL;
     }
 
-    if (!PyUnicode_AsUCS4(prefix, p, len, 0))
+    if (!PyUnicode_AsUCS4(prefix, p, len, 0)) {
+        PyMem_Free(buf);
         return NULL;
+    }
     p += PyUnicode_GET_LENGTH(prefix);
     len -= PyUnicode_GET_LENGTH(prefix);
-    if (!PyUnicode_AsUCS4(name, p, len, 1))
+    if (!PyUnicode_AsUCS4(name, p, len, 1)) {
+        PyMem_Free(buf);
         return NULL;
+    }
     for (; *p; p++) {
         if (*p == '.')
             *p = SEP;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 02:46:20 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 02:46:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogUHlfVFlQRSgpIGhh?=
 =?utf-8?q?s_already_dereferenced_self_before_the_NULL_check=2E_Moved_Py?=
 =?utf-8?b?X1RZUEUoKQ==?=
Message-ID: <3XFVth3ysyzQZZ@mail.python.org>

http://hg.python.org/cpython/rev/dcddbd41f08b
changeset:   78934:dcddbd41f08b
branch:      3.2
parent:      78929:d85f80b31b54
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 02:45:31 2012 +0200
summary:
  Py_TYPE() has already dereferenced self before the NULL check. Moved Py_TYPE() after the check for self == NULL

files:
  Objects/classobject.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Objects/classobject.c b/Objects/classobject.c
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -218,7 +218,7 @@
 {
     PyObject *self = a->im_self;
     PyObject *func = a->im_func;
-    PyObject *klass = (PyObject*)Py_TYPE(self);
+    PyObject *klass;
     PyObject *funcname = NULL ,*klassname = NULL, *result = NULL;
     char *defname = "?";
 
@@ -226,6 +226,7 @@
         PyErr_BadInternalCall();
         return NULL;
     }
+    klass = (PyObject*)Py_TYPE(self);
 
     funcname = PyObject_GetAttrString(func, "__name__");
     if (funcname == NULL) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 02:46:22 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 02:46:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Py=5FTYPE=28=29_has_already_dereferenced_self_before_the?=
 =?utf-8?q?_NULL_check=2E_Moved_Py=5FTYPE=28=29?=
Message-ID: <3XFVtk1jHjzQbT@mail.python.org>

http://hg.python.org/cpython/rev/39e3f06cf6f0
changeset:   78935:39e3f06cf6f0
parent:      78933:6bd9626b0cc6
parent:      78934:dcddbd41f08b
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 02:45:56 2012 +0200
summary:
  Py_TYPE() has already dereferenced self before the NULL check. Moved Py_TYPE() after the check for self == NULL

files:
  Objects/classobject.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Objects/classobject.c b/Objects/classobject.c
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -219,7 +219,7 @@
 {
     PyObject *self = a->im_self;
     PyObject *func = a->im_func;
-    PyObject *klass = (PyObject*)Py_TYPE(self);
+    PyObject *klass;
     PyObject *funcname = NULL ,*klassname = NULL, *result = NULL;
     char *defname = "?";
 
@@ -227,6 +227,7 @@
         PyErr_BadInternalCall();
         return NULL;
     }
+    klass = (PyObject*)Py_TYPE(self);
 
     funcname = _PyObject_GetAttrId(func, &PyId___name__);
     if (funcname == NULL) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 02:51:45 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 02:51:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_resource_leak_to_scr?=
 =?utf-8?q?atch_when_=5FPyUnicodeWriter=5FPrepare_fails?=
Message-ID: <3XFW0x0d9NzQbP@mail.python.org>

http://hg.python.org/cpython/rev/1349e9537f91
changeset:   78936:1349e9537f91
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 02:51:27 2012 +0200
summary:
  Fixed resource leak to scratch when _PyUnicodeWriter_Prepare fails

files:
  Objects/longobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -1628,8 +1628,10 @@
         strlen++;
     }
     if (writer) {
-        if (_PyUnicodeWriter_Prepare(writer, strlen, '9') == -1)
+        if (_PyUnicodeWriter_Prepare(writer, strlen, '9') == -1) {
+            Py_DECREF(scratch);
             return -1;
+        }
         kind = writer->kind;
         str = NULL;
     }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 02:55:48 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 02:55:48 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogUHlUdXBsZV9QYWNr?=
 =?utf-8?q?=28=29_was_missing_va=5Fend=28=29_in_its_error_branch_which_lea?=
 =?utf-8?q?d_to_a?=
Message-ID: <3XFW5c4RqmzQTX@mail.python.org>

http://hg.python.org/cpython/rev/bbc580e004d7
changeset:   78937:bbc580e004d7
branch:      3.2
parent:      78934:dcddbd41f08b
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 02:54:51 2012 +0200
summary:
  PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak.

files:
  Objects/tupleobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -194,8 +194,10 @@
 
     va_start(vargs, n);
     result = PyTuple_New(n);
-    if (result == NULL)
+    if (result == NULL) {
+        va_end(vargs);
         return NULL;
+    }
     items = ((PyTupleObject *)result)->ob_item;
     for (i = 0; i < n; i++) {
         o = va_arg(vargs, PyObject *);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 02:55:50 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 02:55:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_PyTuple=5FPack=28=29_was_missing_va=5Fend=28=29_in_its_e?=
 =?utf-8?q?rror_branch_which_lead_to_a?=
Message-ID: <3XFW5f1k7BzQTX@mail.python.org>

http://hg.python.org/cpython/rev/033b409f7cd6
changeset:   78938:033b409f7cd6
parent:      78936:1349e9537f91
parent:      78937:bbc580e004d7
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 02:55:13 2012 +0200
summary:
  PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak.

files:
  Objects/tupleobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -210,8 +210,10 @@
 
     va_start(vargs, n);
     result = PyTuple_New(n);
-    if (result == NULL)
+    if (result == NULL) {
+        va_end(vargs);
         return NULL;
+    }
     items = ((PyTupleObject *)result)->ob_item;
     for (i = 0; i < n; i++) {
         o = va_arg(vargs, PyObject *);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 02:55:51 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 02:55:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogUHlUdXBsZV9QYWNr?=
 =?utf-8?q?=28=29_was_missing_va=5Fend=28=29_in_its_error_branch_which_lea?=
 =?utf-8?q?d_to_a?=
Message-ID: <3XFW5g4xw2zQbp@mail.python.org>

http://hg.python.org/cpython/rev/bb0390c1d3d4
changeset:   78939:bb0390c1d3d4
branch:      2.7
parent:      78931:27837a33790d
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 02:54:51 2012 +0200
summary:
  PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak.

files:
  Objects/tupleobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -192,8 +192,10 @@
 
     va_start(vargs, n);
     result = PyTuple_New(n);
-    if (result == NULL)
+    if (result == NULL) {
+        va_end(vargs);
         return NULL;
+    }
     items = ((PyTupleObject *)result)->ob_item;
     for (i = 0; i < n; i++) {
         o = va_arg(vargs, PyObject *);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 03:02:04 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 03:02:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixed_possible?=
 =?utf-8?q?_reference_leak_to_mod_when_type=5Fname=28=29_returns_NULL?=
Message-ID: <3XFWDr4JLBzQTX@mail.python.org>

http://hg.python.org/cpython/rev/9f4e6c0c18e6
changeset:   78940:9f4e6c0c18e6
branch:      3.2
parent:      78937:bbc580e004d7
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:00:14 2012 +0200
summary:
  Fixed possible reference leak to mod when type_name() returns NULL

files:
  Objects/typeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -647,8 +647,10 @@
         mod = NULL;
     }
     name = type_name(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
 
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<class '%U.%U'>", mod, name);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 03:02:06 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 03:02:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Fixed_possible_reference_leak_to_mod_when_type=5Fname=28?=
 =?utf-8?q?=29_returns_NULL?=
Message-ID: <3XFWDt1MJ2zQTX@mail.python.org>

http://hg.python.org/cpython/rev/517aa5576ae3
changeset:   78941:517aa5576ae3
parent:      78938:033b409f7cd6
parent:      78940:9f4e6c0c18e6
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:01:16 2012 +0200
summary:
  Fixed possible reference leak to mod when type_name() returns NULL

files:
  Objects/typeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -691,8 +691,10 @@
         mod = NULL;
     }
     name = type_qualname(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
 
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<class '%U.%U'>", mod, name);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 03:02:07 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 03:02:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fixed_possible?=
 =?utf-8?q?_reference_leak_to_mod_when_type=5Fname=28=29_returns_NULL?=
Message-ID: <3XFWDv4CqrzQbd@mail.python.org>

http://hg.python.org/cpython/rev/2b611280ff36
changeset:   78942:2b611280ff36
branch:      2.7
parent:      78939:bb0390c1d3d4
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:00:14 2012 +0200
summary:
  Fixed possible reference leak to mod when type_name() returns NULL

files:
  Objects/typeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -686,8 +686,10 @@
         mod = NULL;
     }
     name = type_name(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
 
     if (type->tp_flags & Py_TPFLAGS_HEAPTYPE)
         kind = "class";

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 03:09:54 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 03:09:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Closed_referen?=
 =?utf-8?q?ce_leak_of_variable_=27k=27_in_function_ste=5Fnew_which_wasn=27?=
 =?utf-8?q?t_decrefed?=
Message-ID: <3XFWPt4nn7zQbP@mail.python.org>

http://hg.python.org/cpython/rev/ad3824a90261
changeset:   78943:ad3824a90261
branch:      3.2
parent:      78940:9f4e6c0c18e6
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:08:46 2012 +0200
summary:
  Closed reference leak of variable 'k' in function ste_new which wasn't decrefed in error cases

files:
  Python/symtable.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -28,7 +28,7 @@
         void *key, int lineno, int col_offset)
 {
     PySTEntryObject *ste = NULL;
-    PyObject *k;
+    PyObject *k = NULL;
 
     k = PyLong_FromVoidPtr(key);
     if (k == NULL)
@@ -83,6 +83,7 @@
 
     return ste;
  fail:
+    Py_XDECREF(k);
     Py_XDECREF(ste);
     return NULL;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 03:09:56 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 03:09:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Closed_referen?=
 =?utf-8?q?ce_leak_of_variable_=27k=27_in_function_ste=5Fnew_which_wasn=27?=
 =?utf-8?q?t_decrefed?=
Message-ID: <3XFWPw1RhMzQbk@mail.python.org>

http://hg.python.org/cpython/rev/61446e56f683
changeset:   78944:61446e56f683
branch:      2.7
parent:      78942:2b611280ff36
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:08:46 2012 +0200
summary:
  Closed reference leak of variable 'k' in function ste_new which wasn't decrefed in error cases

files:
  Python/symtable.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -22,7 +22,7 @@
               void *key, int lineno)
 {
     PySTEntryObject *ste = NULL;
-    PyObject *k;
+    PyObject *k = NULL;
 
     k = PyLong_FromVoidPtr(key);
     if (k == NULL)
@@ -75,6 +75,7 @@
 
     return ste;
  fail:
+    Py_XDECREF(k);
     Py_XDECREF(ste);
     return NULL;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 03:09:57 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 03:09:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Closed_reference_leak_of_variable_=27k=27_in_function_st?=
 =?utf-8?q?e=5Fnew_which_wasn=27t_decrefed?=
Message-ID: <3XFWPx4L7ZzQbd@mail.python.org>

http://hg.python.org/cpython/rev/a29854168241
changeset:   78945:a29854168241
parent:      78941:517aa5576ae3
parent:      78943:ad3824a90261
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:09:17 2012 +0200
summary:
  Closed reference leak of variable 'k' in function ste_new which wasn't decrefed in error cases

files:
  Python/symtable.c |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -24,7 +24,7 @@
         void *key, int lineno, int col_offset)
 {
     PySTEntryObject *ste = NULL;
-    PyObject *k;
+    PyObject *k = NULL;
 
     k = PyLong_FromVoidPtr(key);
     if (k == NULL)
@@ -79,6 +79,7 @@
 
     return ste;
  fail:
+    Py_XDECREF(k);
     Py_XDECREF(ste);
     return NULL;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 03:50:57 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 03:50:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_out-of-bounce_write_?=
 =?utf-8?q?to_rawmode_buffer=2E_The_fixed_size_buffer_wasn=27t?=
Message-ID: <3XFXKF18FXzNsb@mail.python.org>

http://hg.python.org/cpython/rev/85cb90f79cbf
changeset:   78946:85cb90f79cbf
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:50:48 2012 +0200
summary:
  Fixed out-of-bounce write to rawmode buffer. The fixed size buffer wasn't enlarged for the new 'x' flag. The buffer may contain the 5 flags xrwa+ and the \0 byte

files:
  Modules/_io/_iomodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -229,7 +229,7 @@
     int creating = 0, reading = 0, writing = 0, appending = 0, updating = 0;
     int text = 0, binary = 0, universal = 0;
 
-    char rawmode[5], *m;
+    char rawmode[6], *m;
     int line_buffering, isatty;
 
     PyObject *raw, *modeobj = NULL, *buffer = NULL, *wrapper = NULL;

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Mon Sep 10 06:04:01 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 10 Sep 2012 06:04:01 +0200
Subject: [Python-checkins] Daily reference leaks (a29854168241): sum=2
Message-ID: <E1TAvE9-0005T4-Vh@ap.vmr.nerim.net>

results for a29854168241 on branch "default"
--------------------------------------------

test_dbm leaked [0, 0, 2] references, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogPlcD_Z', '-x']

From python-checkins at python.org  Mon Sep 10 11:48:50 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 11:48:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_memory_leak_in_error?=
 =?utf-8?q?_branch_of_formatfloat=28=29=2E_CID_719687?=
Message-ID: <3XFkwf6VYPzQ8q@mail.python.org>

http://hg.python.org/cpython/rev/a3e194661b5f
changeset:   78947:a3e194661b5f
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 11:48:41 2012 +0200
summary:
  Fixed memory leak in error branch of formatfloat(). CID 719687

files:
  Objects/unicodeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13238,8 +13238,10 @@
         return -1;
     len = strlen(p);
     if (writer) {
-        if (_PyUnicodeWriter_Prepare(writer, len, 127) == -1)
+        if (_PyUnicodeWriter_Prepare(writer, len, 127) == -1) {
+            PyMem_Free(p);
             return -1;
+        }
         unicode_write_cstr(writer->buffer, writer->pos, p, len);
         writer->pos += len;
     }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 12:00:18 2012
From: python-checkins at python.org (matthias.klose)
Date: Mon, 10 Sep 2012 12:00:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogLSBNZW50aW9uIF9o?=
	=?utf-8?q?eapq_in_Setup=2Edist=2E?=
Message-ID: <3XFl9t3G6lzQh5@mail.python.org>

http://hg.python.org/cpython/rev/d261defe4613
changeset:   78948:d261defe4613
branch:      2.7
parent:      78944:61446e56f683
user:        doko at ubuntu.com
date:        Mon Sep 10 11:56:47 2012 +0200
summary:
  - Mention _heapq in Setup.dist.

files:
  Modules/Setup.dist |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Modules/Setup.dist b/Modules/Setup.dist
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -177,6 +177,7 @@
 #_testcapi _testcapimodule.c    # Python C API test module
 #_random _randommodule.c	# Random number generator
 #_collections _collectionsmodule.c # Container types
+#_heapq _heapqmodule.c		# Heapq type
 #itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
 #strop stropmodule.c		# String manipulations
 #_functools _functoolsmodule.c	# Tools for working with functions and callable objects

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 13:19:25 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 13:19:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Added_missing_?=
 =?utf-8?q?va=5Fend_in_error_branch_of_PyArg=5FUnpackTuple=28=29=2E_CID_48?=
 =?utf-8?q?6641?=
Message-ID: <3XFmx91SZQzPG3@mail.python.org>

http://hg.python.org/cpython/rev/71e854617297
changeset:   78949:71e854617297
branch:      3.2
parent:      78943:ad3824a90261
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 13:16:45 2012 +0200
summary:
  Added missing va_end in error branch of PyArg_UnpackTuple(). CID 486641

files:
  Python/getargs.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Python/getargs.c b/Python/getargs.c
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1725,6 +1725,7 @@
     assert(min >= 0);
     assert(min <= max);
     if (!PyTuple_Check(args)) {
+        va_end(vargs);
         PyErr_SetString(PyExc_SystemError,
             "PyArg_UnpackTuple() argument list is not a tuple");
         return 0;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 13:19:26 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 13:19:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Added_missing_va=5Fend_in_error_branch_of_PyArg=5FUnpack?=
 =?utf-8?q?Tuple=28=29=2E_CID_486641?=
Message-ID: <3XFmxB72TJzQgH@mail.python.org>

http://hg.python.org/cpython/rev/29abedd4f4bb
changeset:   78950:29abedd4f4bb
parent:      78947:a3e194661b5f
parent:      78949:71e854617297
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 13:17:23 2012 +0200
summary:
  Added missing va_end in error branch of PyArg_UnpackTuple(). CID 486641

files:
  Python/getargs.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Python/getargs.c b/Python/getargs.c
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1742,6 +1742,7 @@
     assert(min >= 0);
     assert(min <= max);
     if (!PyTuple_Check(args)) {
+        va_end(vargs);
         PyErr_SetString(PyExc_SystemError,
             "PyArg_UnpackTuple() argument list is not a tuple");
         return 0;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 13:19:28 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 13:19:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Added_missing_?=
 =?utf-8?q?va=5Fend_in_error_branch_of_PyArg=5FUnpackTuple=28=29=2E_CID_48?=
 =?utf-8?q?6641?=
Message-ID: <3XFmxD2mW6zQgW@mail.python.org>

http://hg.python.org/cpython/rev/aa804ef5a6ca
changeset:   78951:aa804ef5a6ca
branch:      2.7
parent:      78944:61446e56f683
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 13:16:45 2012 +0200
summary:
  Added missing va_end in error branch of PyArg_UnpackTuple(). CID 486641

files:
  Python/getargs.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Python/getargs.c b/Python/getargs.c
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1837,6 +1837,7 @@
     assert(min >= 0);
     assert(min <= max);
     if (!PyTuple_Check(args)) {
+        va_end(vargs);
         PyErr_SetString(PyExc_SystemError,
             "PyArg_UnpackTuple() argument list is not a tuple");
         return 0;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 13:19:30 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 13:19:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?=
	=?utf-8?q?_merge?=
Message-ID: <3XFmxG0mmgzQh3@mail.python.org>

http://hg.python.org/cpython/rev/9c30a69c72ec
changeset:   78952:9c30a69c72ec
branch:      2.7
parent:      78951:aa804ef5a6ca
parent:      78948:d261defe4613
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 13:19:15 2012 +0200
summary:
  merge

files:
  Modules/Setup.dist |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Modules/Setup.dist b/Modules/Setup.dist
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -177,6 +177,7 @@
 #_testcapi _testcapimodule.c    # Python C API test module
 #_random _randommodule.c	# Random number generator
 #_collections _collectionsmodule.c # Container types
+#_heapq _heapqmodule.c		# Heapq type
 #itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
 #strop stropmodule.c		# String manipulations
 #_functools _functoolsmodule.c	# Tools for working with functions and callable objects

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 14:08:03 2012
From: python-checkins at python.org (richard.oudkerk)
Date: Mon, 10 Sep 2012 14:08:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1OTAx?=
 =?utf-8?q?=3A_Change_example_to_use_byte_string_instead_of_string?=
Message-ID: <3XFp1H1B7mzQfW@mail.python.org>

http://hg.python.org/cpython/rev/ddb406904be1
changeset:   78953:ddb406904be1
branch:      3.2
parent:      78949:71e854617297
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Mon Sep 10 13:00:33 2012 +0100
summary:
  Issue #15901: Change example to use byte string instead of string

files:
  Doc/library/multiprocessing.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1093,7 +1093,7 @@
 
        n = Value('i', 7)
        x = Value(c_double, 1.0/3.0, lock=False)
-       s = Array('c', 'hello world', lock=lock)
+       s = Array('c', b'hello world', lock=lock)
        A = Array(Point, [(1.875,-6.25), (-5.75,2.0), (2.375,9.5)], lock=lock)
 
        p = Process(target=modify, args=(n, x, s, A))

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 14:08:04 2012
From: python-checkins at python.org (richard.oudkerk)
Date: Mon, 10 Sep 2012 14:08:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_Merge?=
Message-ID: <3XFp1J5gkSzQgJ@mail.python.org>

http://hg.python.org/cpython/rev/9def2209a839
changeset:   78954:9def2209a839
parent:      78950:29abedd4f4bb
parent:      78953:ddb406904be1
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Mon Sep 10 13:06:02 2012 +0100
summary:
  Merge

files:
  Doc/library/multiprocessing.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1147,7 +1147,7 @@
 
        n = Value('i', 7)
        x = Value(c_double, 1.0/3.0, lock=False)
-       s = Array('c', 'hello world', lock=lock)
+       s = Array('c', b'hello world', lock=lock)
        A = Array(Point, [(1.875,-6.25), (-5.75,2.0), (2.375,9.5)], lock=lock)
 
        p = Process(target=modify, args=(n, x, s, A))

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 14:23:11 2012
From: python-checkins at python.org (matthias.klose)
Date: Mon, 10 Sep 2012 14:23:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_backport_from_?=
 =?utf-8?q?the_trunk=2C_to_fix_test=5Ftools_with_srcdir_!=3D_builddir?=
Message-ID: <3XFpLl1fz7zQh6@mail.python.org>

http://hg.python.org/cpython/rev/5493299df0a0
changeset:   78955:5493299df0a0
branch:      3.2
parent:      78953:ddb406904be1
user:        doko at ubuntu.com
date:        Mon Sep 10 14:19:42 2012 +0200
summary:
  backport from the trunk, to fix test_tools with srcdir != builddir

	changeset:   77827:c23b442b5d5e
	user:        Antoine Pitrou <solipsis at pitrou.net>
	date:        Thu Jun 28 01:20:26 2012 +0200
	summary:     Avoid using scrdir, it's broken.

	changeset:   77826:f0e58e778215
	user:        Neil Schemenauer <nas at arctrix.com>
	date:        Wed Jun 27 15:58:37 2012 -0600
	summary:     Fix bug in test_tools that prevented building is separate directory.

files:
  Lib/test/test_tools.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_tools.py b/Lib/test/test_tools.py
--- a/Lib/test/test_tools.py
+++ b/Lib/test/test_tools.py
@@ -18,8 +18,8 @@
     # and run the tests in that case too?
     raise unittest.SkipTest('test irrelevant for an installed Python')
 
-srcdir = sysconfig.get_config_var('projectbase')
-basepath = os.path.join(os.getcwd(), srcdir, 'Tools')
+basepath = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),
+                        'Tools')
 scriptsdir = os.path.join(basepath, 'scripts')
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 14:38:10 2012
From: python-checkins at python.org (matthias.klose)
Date: Mon, 10 Sep 2012 14:38:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_backport_from_?=
 =?utf-8?q?the_trunk=2C_to_fix_test=5Ftools_with_srcdir_!=3D_builddir?=
Message-ID: <3XFph25b8ZzQWL@mail.python.org>

http://hg.python.org/cpython/rev/6d0c54b99ca9
changeset:   78956:6d0c54b99ca9
branch:      2.7
parent:      78952:9c30a69c72ec
user:        doko at ubuntu.com
date:        Mon Sep 10 14:34:42 2012 +0200
summary:
  backport from the trunk, to fix test_tools with srcdir != builddir

        changeset:   77827:c23b442b5d5e
        user:        Antoine Pitrou <solipsis at pitrou.net>
        date:        Thu Jun 28 01:20:26 2012 +0200
        summary:     Avoid using scrdir, it's broken.

        changeset:   77826:f0e58e778215
        user:        Neil Schemenauer <nas at arctrix.com>
        date:        Wed Jun 27 15:58:37 2012 -0600
        summary:     Fix bug in test_tools that prevented building is separate directory.

files:
  Lib/test/test_tools.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_tools.py b/Lib/test/test_tools.py
--- a/Lib/test/test_tools.py
+++ b/Lib/test/test_tools.py
@@ -15,8 +15,8 @@
     # and run the tests in that case too?
     raise unittest.SkipTest('test irrelevant for an installed Python')
 
-srcdir = sysconfig.get_config_var('projectbase')
-basepath = os.path.join(os.getcwd(), srcdir, 'Tools')
+basepath = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),
+                        'Tools')
 
 
 class ReindentTests(unittest.TestCase):

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 14:48:59 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 14:48:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Added_test_for_85cb90f79cb?=
 =?utf-8?q?f_and_see_how_the_code_handles_all_flags_at_once?=
Message-ID: <3XFpwW68Z2zQgJ@mail.python.org>

http://hg.python.org/cpython/rev/5a81a0836da1
changeset:   78957:5a81a0836da1
parent:      78954:9def2209a839
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 14:48:43 2012 +0200
summary:
  Added test for 85cb90f79cbf and see how the code handles all flags at once

files:
  Lib/test/test_io.py |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2887,6 +2887,11 @@
         with self.open(support.TESTFN, 'rb') as f:
             self.assertEqual(b"spam", f.read())
 
+    def test_open_allargs(self):
+        # there used to be a buffer overflow in the parser for rawmode
+        self.assertRaises(ValueError, self.open, support.TESTFN, 'rwax+')
+
+
 class CMiscIOTest(MiscIOTest):
     io = io
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 16:10:42 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon, 10 Sep 2012 16:10:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Null_merge_for_ddb406904be1_backport=2E?=
Message-ID: <3XFrkp3NyqzQg3@mail.python.org>

http://hg.python.org/cpython/rev/c18b15f2609e
changeset:   78958:c18b15f2609e
parent:      78957:5a81a0836da1
parent:      78955:5493299df0a0
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 10 10:10:13 2012 -0400
summary:
  Null merge for ddb406904be1 backport.

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 16:17:33 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon, 10 Sep 2012 16:17:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE0NjQ5OiBjbGFy?=
 =?utf-8?q?ify_DocTestSuite_error_when_there_are_no_docstrings=2E?=
Message-ID: <3XFrtj2bt4zM0Q@mail.python.org>

http://hg.python.org/cpython/rev/d012f645b8b2
changeset:   78959:d012f645b8b2
branch:      3.2
parent:      78955:5493299df0a0
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 10 10:15:58 2012 -0400
summary:
  #14649: clarify DocTestSuite error when there are no docstrings.

Also adds tests to verify the documented behavior (which is probably a bug, as
indicated in the added comments).

Patch by Chris Jerdonek.

files:
  Doc/library/doctest.rst                  |  10 ++++
  Lib/doctest.py                           |   7 ++-
  Lib/test/sample_doctest_no_docstrings.py |  12 +++++
  Lib/test/sample_doctest_no_doctests.py   |  15 +++++++
  Lib/test/test_doctest.py                 |  25 ++++++++++++
  Lib/test/test_zipimport_support.py       |  21 +++++++--
  6 files changed, 84 insertions(+), 6 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -1024,6 +1024,16 @@
 
    This function uses the same search technique as :func:`testmod`.
 
+   .. note::
+      Unlike :func:`testmod` and :class:`DocTestFinder`, this function raises
+      a :exc:`ValueError` if *module* contains no docstrings.  You can prevent
+      this error by passing a :class:`DocTestFinder` instance as the
+      *test_finder* argument with its *exclude_empty* keyword argument set
+      to ``False``::
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite(test_finder=finder)
+
 
 Under the covers, :func:`DocTestSuite` creates a :class:`unittest.TestSuite` out
 of :class:`doctest.DocTestCase` instances, and :class:`DocTestCase` is a
diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2333,7 +2333,12 @@
     elif not tests:
         # Why do we want to do this? Because it reveals a bug that might
         # otherwise be hidden.
-        raise ValueError(module, "has no tests")
+        # It is probably a bug that this exception is not also raised if the
+        # number of doctest examples in tests is zero (i.e. if no doctest
+        # examples were found).  However, we should probably not be raising
+        # an exception at all here, though it is too late to make this change
+        # for a maintenance release.  See also issue #14649.
+        raise ValueError(module, "has no docstrings")
 
     tests.sort()
     suite = unittest.TestSuite()
diff --git a/Lib/test/sample_doctest_no_docstrings.py b/Lib/test/sample_doctest_no_docstrings.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_docstrings.py
@@ -0,0 +1,12 @@
+# This is a sample module used for testing doctest.
+#
+# This module is for testing how doctest handles a module with no
+# docstrings.
+
+
+class Foo(object):
+
+    # A class with no docstring.
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/sample_doctest_no_doctests.py b/Lib/test/sample_doctest_no_doctests.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_doctests.py
@@ -0,0 +1,15 @@
+"""This is a sample module used for testing doctest.
+
+This module is for testing how doctest handles a module with docstrings
+but no doctest examples.
+
+"""
+
+
+class Foo(object):
+    """A docstring with no doctest examples.
+
+    """
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -1984,6 +1984,31 @@
          >>> suite.run(unittest.TestResult())
          <unittest.result.TestResult run=9 errors=0 failures=4>
 
+       The module need not contain any doctest examples:
+
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_doctests')
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
+       However, if DocTestSuite finds no docstrings, it raises an error:
+
+         >>> try:
+         ...     doctest.DocTestSuite('test.sample_doctest_no_docstrings')
+         ... except ValueError as e:
+         ...     error = e
+
+         >>> print(error.args[1])
+         has no docstrings
+
+       You can prevent this error by passing a DocTestFinder instance with
+       the `exclude_empty` keyword argument set to False:
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_docstrings',
+         ...                              test_finder=finder)
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
        We can use the current module:
 
          >>> suite = test.sample_doctest.test_suite()
diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py
--- a/Lib/test/test_zipimport_support.py
+++ b/Lib/test/test_zipimport_support.py
@@ -29,7 +29,8 @@
 #  test_cmd_line_script (covers the zipimport support in runpy)
 
 # Retrieve some helpers from other test cases
-from test import test_doctest, sample_doctest
+from test import (test_doctest, sample_doctest, sample_doctest_no_doctests,
+                  sample_doctest_no_docstrings)
 
 
 def _run_object_doctest(obj, module):
@@ -105,16 +106,26 @@
                                     "test_zipped_doctest")
         test_src = test_src.replace("test.sample_doctest",
                                     "sample_zipped_doctest")
-        sample_src = inspect.getsource(sample_doctest)
-        sample_src = sample_src.replace("test.test_doctest",
-                                        "test_zipped_doctest")
+        # The sample doctest files rewritten to include in the zipped version.
+        sample_sources = {}
+        for mod in [sample_doctest, sample_doctest_no_doctests,
+                    sample_doctest_no_docstrings]:
+            src = inspect.getsource(mod)
+            src = src.replace("test.test_doctest", "test_zipped_doctest")
+            # Rewrite the module name so that, for example,
+            # "test.sample_doctest" becomes "sample_zipped_doctest".
+            mod_name = mod.__name__.split(".")[-1]
+            mod_name = mod_name.replace("sample_", "sample_zipped_")
+            sample_sources[mod_name] = src
+
         with temp_dir() as d:
             script_name = make_script(d, 'test_zipped_doctest',
                                             test_src)
             zip_name, run_name = make_zip_script(d, 'test_zip',
                                                 script_name)
             z = zipfile.ZipFile(zip_name, 'a')
-            z.writestr("sample_zipped_doctest.py", sample_src)
+            for mod_name, src in sample_sources.items():
+                z.writestr(mod_name + ".py", src)
             z.close()
             if verbose:
                 zip_file = zipfile.ZipFile(zip_name, 'r')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 16:17:35 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon, 10 Sep 2012 16:17:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2314649=3A_clarify_DocTestSuite_error_when_there_?=
 =?utf-8?q?are_no_docstrings=2E?=
Message-ID: <3XFrtl1YSXzQVV@mail.python.org>

http://hg.python.org/cpython/rev/6544fc92b528
changeset:   78960:6544fc92b528
parent:      78958:c18b15f2609e
parent:      78959:d012f645b8b2
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 10 10:16:46 2012 -0400
summary:
  Merge #14649: clarify DocTestSuite error when there are no docstrings.

Also adds tests to verify the documented behavior (which is probably a bug, as
indicated in the added comments).

Patch by Chris Jerdonek.

files:
  Doc/library/doctest.rst                  |  10 ++++
  Lib/doctest.py                           |   7 ++-
  Lib/test/sample_doctest_no_docstrings.py |  12 +++++
  Lib/test/sample_doctest_no_doctests.py   |  15 +++++++
  Lib/test/test_doctest.py                 |  25 ++++++++++++
  Lib/test/test_zipimport_support.py       |  21 +++++++--
  6 files changed, 84 insertions(+), 6 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -1024,6 +1024,16 @@
 
    This function uses the same search technique as :func:`testmod`.
 
+   .. note::
+      Unlike :func:`testmod` and :class:`DocTestFinder`, this function raises
+      a :exc:`ValueError` if *module* contains no docstrings.  You can prevent
+      this error by passing a :class:`DocTestFinder` instance as the
+      *test_finder* argument with its *exclude_empty* keyword argument set
+      to ``False``::
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite(test_finder=finder)
+
 
 Under the covers, :func:`DocTestSuite` creates a :class:`unittest.TestSuite` out
 of :class:`doctest.DocTestCase` instances, and :class:`DocTestCase` is a
diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2334,7 +2334,12 @@
     elif not tests:
         # Why do we want to do this? Because it reveals a bug that might
         # otherwise be hidden.
-        raise ValueError(module, "has no tests")
+        # It is probably a bug that this exception is not also raised if the
+        # number of doctest examples in tests is zero (i.e. if no doctest
+        # examples were found).  However, we should probably not be raising
+        # an exception at all here, though it is too late to make this change
+        # for a maintenance release.  See also issue #14649.
+        raise ValueError(module, "has no docstrings")
 
     tests.sort()
     suite = unittest.TestSuite()
diff --git a/Lib/test/sample_doctest_no_docstrings.py b/Lib/test/sample_doctest_no_docstrings.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_docstrings.py
@@ -0,0 +1,12 @@
+# This is a sample module used for testing doctest.
+#
+# This module is for testing how doctest handles a module with no
+# docstrings.
+
+
+class Foo(object):
+
+    # A class with no docstring.
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/sample_doctest_no_doctests.py b/Lib/test/sample_doctest_no_doctests.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_doctests.py
@@ -0,0 +1,15 @@
+"""This is a sample module used for testing doctest.
+
+This module is for testing how doctest handles a module with docstrings
+but no doctest examples.
+
+"""
+
+
+class Foo(object):
+    """A docstring with no doctest examples.
+
+    """
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -1986,6 +1986,31 @@
          >>> suite.run(unittest.TestResult())
          <unittest.result.TestResult run=9 errors=0 failures=4>
 
+       The module need not contain any doctest examples:
+
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_doctests')
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
+       However, if DocTestSuite finds no docstrings, it raises an error:
+
+         >>> try:
+         ...     doctest.DocTestSuite('test.sample_doctest_no_docstrings')
+         ... except ValueError as e:
+         ...     error = e
+
+         >>> print(error.args[1])
+         has no docstrings
+
+       You can prevent this error by passing a DocTestFinder instance with
+       the `exclude_empty` keyword argument set to False:
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_docstrings',
+         ...                              test_finder=finder)
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
        We can use the current module:
 
          >>> suite = test.sample_doctest.test_suite()
diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py
--- a/Lib/test/test_zipimport_support.py
+++ b/Lib/test/test_zipimport_support.py
@@ -29,7 +29,8 @@
 #  test_cmd_line_script (covers the zipimport support in runpy)
 
 # Retrieve some helpers from other test cases
-from test import test_doctest, sample_doctest
+from test import (test_doctest, sample_doctest, sample_doctest_no_doctests,
+                  sample_doctest_no_docstrings)
 
 
 def _run_object_doctest(obj, module):
@@ -105,16 +106,26 @@
                                     "test_zipped_doctest")
         test_src = test_src.replace("test.sample_doctest",
                                     "sample_zipped_doctest")
-        sample_src = inspect.getsource(sample_doctest)
-        sample_src = sample_src.replace("test.test_doctest",
-                                        "test_zipped_doctest")
+        # The sample doctest files rewritten to include in the zipped version.
+        sample_sources = {}
+        for mod in [sample_doctest, sample_doctest_no_doctests,
+                    sample_doctest_no_docstrings]:
+            src = inspect.getsource(mod)
+            src = src.replace("test.test_doctest", "test_zipped_doctest")
+            # Rewrite the module name so that, for example,
+            # "test.sample_doctest" becomes "sample_zipped_doctest".
+            mod_name = mod.__name__.split(".")[-1]
+            mod_name = mod_name.replace("sample_", "sample_zipped_")
+            sample_sources[mod_name] = src
+
         with temp_dir() as d:
             script_name = make_script(d, 'test_zipped_doctest',
                                             test_src)
             zip_name, run_name = make_zip_script(d, 'test_zip',
                                                 script_name)
             z = zipfile.ZipFile(zip_name, 'a')
-            z.writestr("sample_zipped_doctest.py", sample_src)
+            for mod_name, src in sample_sources.items():
+                z.writestr(mod_name + ".py", src)
             z.close()
             if verbose:
                 zip_file = zipfile.ZipFile(zip_name, 'r')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 16:17:36 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon, 10 Sep 2012 16:17:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE0NjQ5OiBjbGFy?=
 =?utf-8?q?ify_DocTestSuite_error_when_there_are_no_docstrings=2E?=
Message-ID: <3XFrtm6NG4zQVV@mail.python.org>

http://hg.python.org/cpython/rev/b48ef168d8c5
changeset:   78961:b48ef168d8c5
branch:      2.7
parent:      78956:6d0c54b99ca9
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 10 10:17:13 2012 -0400
summary:
  #14649: clarify DocTestSuite error when there are no docstrings.

Also adds tests to verify the documented behavior (which is probably a bug, as
indicated in the added comments).

Patch by Chris Jerdonek.

files:
  Doc/library/doctest.rst            |  10 +++++++
  Lib/doctest.py                     |   7 ++++-
  Lib/test/test_doctest.py           |  25 ++++++++++++++++++
  Lib/test/test_zipimport_support.py |  21 +++++++++++---
  4 files changed, 57 insertions(+), 6 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -1060,6 +1060,16 @@
    .. versionchanged:: 2.5
       The parameter *encoding* was added.
 
+   .. note::
+      Unlike :func:`testmod` and :class:`DocTestFinder`, this function raises
+      a :exc:`ValueError` if *module* contains no docstrings.  You can prevent
+      this error by passing a :class:`DocTestFinder` instance as the
+      *test_finder* argument with its *exclude_empty* keyword argument set
+      to ``False``::
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite(test_finder=finder)
+
 
 .. function:: DocTestSuite([module][, globs][, extraglobs][, test_finder][, setUp][, tearDown][, checker])
 
diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2381,7 +2381,12 @@
     elif not tests:
         # Why do we want to do this? Because it reveals a bug that might
         # otherwise be hidden.
-        raise ValueError(module, "has no tests")
+        # It is probably a bug that this exception is not also raised if the
+        # number of doctest examples in tests is zero (i.e. if no doctest
+        # examples were found).  However, we should probably not be raising
+        # an exception at all here, though it is too late to make this change
+        # for a maintenance release.  See also issue #14649.
+        raise ValueError(module, "has no docstrings")
 
     tests.sort()
     suite = unittest.TestSuite()
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2006,6 +2006,31 @@
          >>> suite.run(unittest.TestResult())
          <unittest.result.TestResult run=9 errors=0 failures=4>
 
+       The module need not contain any doctest examples:
+
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_doctests')
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
+       However, if DocTestSuite finds no docstrings, it raises an error:
+
+         >>> try:
+         ...     doctest.DocTestSuite('test.sample_doctest_no_docstrings')
+         ... except ValueError as e:
+         ...     error = e
+
+         >>> print(error.args[1])
+         has no docstrings
+
+       You can prevent this error by passing a DocTestFinder instance with
+       the `exclude_empty` keyword argument set to False:
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_docstrings',
+         ...                              test_finder=finder)
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
        We can use the current module:
 
          >>> suite = test.sample_doctest.test_suite()
diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py
--- a/Lib/test/test_zipimport_support.py
+++ b/Lib/test/test_zipimport_support.py
@@ -29,7 +29,8 @@
 #  test_cmd_line_script (covers the zipimport support in runpy)
 
 # Retrieve some helpers from other test cases
-from test import test_doctest, sample_doctest
+from test import (test_doctest, sample_doctest, sample_doctest_no_doctests,
+                  sample_doctest_no_docstrings)
 from test.test_importhooks import ImportHooksBaseTestCase
 
 
@@ -99,16 +100,26 @@
                                     "test_zipped_doctest")
         test_src = test_src.replace("test.sample_doctest",
                                     "sample_zipped_doctest")
-        sample_src = inspect.getsource(sample_doctest)
-        sample_src = sample_src.replace("test.test_doctest",
-                                        "test_zipped_doctest")
+        # The sample doctest files rewritten to include in the zipped version.
+        sample_sources = {}
+        for mod in [sample_doctest, sample_doctest_no_doctests,
+                    sample_doctest_no_docstrings]:
+            src = inspect.getsource(mod)
+            src = src.replace("test.test_doctest", "test_zipped_doctest")
+            # Rewrite the module name so that, for example,
+            # "test.sample_doctest" becomes "sample_zipped_doctest".
+            mod_name = mod.__name__.split(".")[-1]
+            mod_name = mod_name.replace("sample_", "sample_zipped_")
+            sample_sources[mod_name] = src
+
         with temp_dir() as d:
             script_name = make_script(d, 'test_zipped_doctest',
                                             test_src)
             zip_name, run_name = make_zip_script(d, 'test_zip',
                                                 script_name)
             z = zipfile.ZipFile(zip_name, 'a')
-            z.writestr("sample_zipped_doctest.py", sample_src)
+            for mod_name, src in sample_sources.items():
+                z.writestr(mod_name + ".py", src)
             z.close()
             if verbose:
                 zip_file = zipfile.ZipFile(zip_name, 'r')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 16:54:14 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 16:54:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixed_memory_l?=
 =?utf-8?q?eak_in_error_branch_of_parsestrplus=2E_CID_715374_Variable_s_go?=
 =?utf-8?q?ing?=
Message-ID: <3XFsj220RtzQFd@mail.python.org>

http://hg.python.org/cpython/rev/4a343636c8ca
changeset:   78962:4a343636c8ca
branch:      3.2
parent:      78959:d012f645b8b2
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 16:52:42 2012 +0200
summary:
  Fixed memory leak in error branch of parsestrplus. CID 715374 Variable s going out of scope leaks the storage it points to.

files:
  Python/ast.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -3395,6 +3395,7 @@
                 goto onError;
             if (*bytesmode != subbm) {
                 ast_error(n, "cannot mix bytes and nonbytes literals");
+                Py_DECREF(s);
                 goto onError;
             }
             if (PyBytes_Check(v) && PyBytes_Check(s)) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 16:54:15 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 16:54:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Fixed_memory_leak_in_error_branch_of_parsestrplus=2E_CID?=
 =?utf-8?q?_715374_Variable_s_going?=
Message-ID: <3XFsj36sHDzQXs@mail.python.org>

http://hg.python.org/cpython/rev/2c9f1a578861
changeset:   78963:2c9f1a578861
parent:      78960:6544fc92b528
parent:      78962:4a343636c8ca
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 16:53:28 2012 +0200
summary:
  Fixed memory leak in error branch of parsestrplus. CID 715374 Variable s going out of scope leaks the storage it points to.

files:
  Python/ast.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -3846,6 +3846,7 @@
                 goto onError;
             if (*bytesmode != subbm) {
                 ast_error(c, n, "cannot mix bytes and nonbytes literals");
+                Py_DECREF(s);
                 goto onError;
             }
             if (PyBytes_Check(v) && PyBytes_Check(s)) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 17:01:40 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 17:01:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixed_memory_l?=
 =?utf-8?q?eak_in_error_branch_of_object=5Frepr_which_may_leak_a_reference?=
 =?utf-8?q?_to?=
Message-ID: <3XFssc1ClQzQhR@mail.python.org>

http://hg.python.org/cpython/rev/302561c9387a
changeset:   78964:302561c9387a
branch:      3.2
parent:      78962:4a343636c8ca
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 16:57:36 2012 +0200
summary:
  Fixed memory leak in error branch of object_repr which may leak a reference to mod when type_name returns NULL. CID 715371

files:
  Objects/typeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2925,8 +2925,10 @@
         mod = NULL;
     }
     name = type_name(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<%U.%U object at %p>", mod, name, self);
     else

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 17:01:41 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 17:01:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fixed_memory_l?=
 =?utf-8?q?eak_in_error_branch_of_object=5Frepr_which_may_leak_a_reference?=
 =?utf-8?q?_to?=
Message-ID: <3XFssd57Q9zQjS@mail.python.org>

http://hg.python.org/cpython/rev/a1671c795934
changeset:   78965:a1671c795934
branch:      2.7
parent:      78956:6d0c54b99ca9
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 16:57:36 2012 +0200
summary:
  Fixed memory leak in error branch of object_repr which may leak a reference to mod when type_name returns NULL. CID 715371

files:
  Objects/typeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2984,8 +2984,10 @@
         mod = NULL;
     }
     name = type_name(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
     if (mod != NULL && strcmp(PyString_AS_STRING(mod), "__builtin__"))
         rtn = PyString_FromFormat("<%s.%s object at %p>",
                                   PyString_AS_STRING(mod),

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 17:01:43 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 17:01:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Fixed_memory_leak_in_error_branch_of_object=5Frepr_which?=
 =?utf-8?q?_may_leak_a_reference_to?=
Message-ID: <3XFssg16GvzQjj@mail.python.org>

http://hg.python.org/cpython/rev/f9b95ffd24ce
changeset:   78966:f9b95ffd24ce
parent:      78963:2c9f1a578861
parent:      78964:302561c9387a
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 17:00:30 2012 +0200
summary:
  Fixed memory leak in error branch of object_repr which may leak a reference to mod when type_qualname returns NULL. CID 715371

files:
  Objects/typeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3130,8 +3130,10 @@
         mod = NULL;
     }
     name = type_qualname(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<%U.%U object at %p>", mod, name, self);
     else

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 17:01:44 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 17:01:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?=
	=?utf-8?q?_merge?=
Message-ID: <3XFssh5HL4zQhT@mail.python.org>

http://hg.python.org/cpython/rev/cac191b37e78
changeset:   78967:cac191b37e78
branch:      2.7
parent:      78965:a1671c795934
parent:      78961:b48ef168d8c5
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 17:01:21 2012 +0200
summary:
  merge

files:
  Doc/library/doctest.rst            |  10 +++++++
  Lib/doctest.py                     |   7 ++++-
  Lib/test/test_doctest.py           |  25 ++++++++++++++++++
  Lib/test/test_zipimport_support.py |  21 +++++++++++---
  4 files changed, 57 insertions(+), 6 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -1060,6 +1060,16 @@
    .. versionchanged:: 2.5
       The parameter *encoding* was added.
 
+   .. note::
+      Unlike :func:`testmod` and :class:`DocTestFinder`, this function raises
+      a :exc:`ValueError` if *module* contains no docstrings.  You can prevent
+      this error by passing a :class:`DocTestFinder` instance as the
+      *test_finder* argument with its *exclude_empty* keyword argument set
+      to ``False``::
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite(test_finder=finder)
+
 
 .. function:: DocTestSuite([module][, globs][, extraglobs][, test_finder][, setUp][, tearDown][, checker])
 
diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2381,7 +2381,12 @@
     elif not tests:
         # Why do we want to do this? Because it reveals a bug that might
         # otherwise be hidden.
-        raise ValueError(module, "has no tests")
+        # It is probably a bug that this exception is not also raised if the
+        # number of doctest examples in tests is zero (i.e. if no doctest
+        # examples were found).  However, we should probably not be raising
+        # an exception at all here, though it is too late to make this change
+        # for a maintenance release.  See also issue #14649.
+        raise ValueError(module, "has no docstrings")
 
     tests.sort()
     suite = unittest.TestSuite()
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2006,6 +2006,31 @@
          >>> suite.run(unittest.TestResult())
          <unittest.result.TestResult run=9 errors=0 failures=4>
 
+       The module need not contain any doctest examples:
+
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_doctests')
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
+       However, if DocTestSuite finds no docstrings, it raises an error:
+
+         >>> try:
+         ...     doctest.DocTestSuite('test.sample_doctest_no_docstrings')
+         ... except ValueError as e:
+         ...     error = e
+
+         >>> print(error.args[1])
+         has no docstrings
+
+       You can prevent this error by passing a DocTestFinder instance with
+       the `exclude_empty` keyword argument set to False:
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_docstrings',
+         ...                              test_finder=finder)
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
        We can use the current module:
 
          >>> suite = test.sample_doctest.test_suite()
diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py
--- a/Lib/test/test_zipimport_support.py
+++ b/Lib/test/test_zipimport_support.py
@@ -29,7 +29,8 @@
 #  test_cmd_line_script (covers the zipimport support in runpy)
 
 # Retrieve some helpers from other test cases
-from test import test_doctest, sample_doctest
+from test import (test_doctest, sample_doctest, sample_doctest_no_doctests,
+                  sample_doctest_no_docstrings)
 from test.test_importhooks import ImportHooksBaseTestCase
 
 
@@ -99,16 +100,26 @@
                                     "test_zipped_doctest")
         test_src = test_src.replace("test.sample_doctest",
                                     "sample_zipped_doctest")
-        sample_src = inspect.getsource(sample_doctest)
-        sample_src = sample_src.replace("test.test_doctest",
-                                        "test_zipped_doctest")
+        # The sample doctest files rewritten to include in the zipped version.
+        sample_sources = {}
+        for mod in [sample_doctest, sample_doctest_no_doctests,
+                    sample_doctest_no_docstrings]:
+            src = inspect.getsource(mod)
+            src = src.replace("test.test_doctest", "test_zipped_doctest")
+            # Rewrite the module name so that, for example,
+            # "test.sample_doctest" becomes "sample_zipped_doctest".
+            mod_name = mod.__name__.split(".")[-1]
+            mod_name = mod_name.replace("sample_", "sample_zipped_")
+            sample_sources[mod_name] = src
+
         with temp_dir() as d:
             script_name = make_script(d, 'test_zipped_doctest',
                                             test_src)
             zip_name, run_name = make_zip_script(d, 'test_zip',
                                                 script_name)
             z = zipfile.ZipFile(zip_name, 'a')
-            z.writestr("sample_zipped_doctest.py", sample_src)
+            for mod_name, src in sample_sources.items():
+                z.writestr(mod_name + ".py", src)
             z.close()
             if verbose:
                 zip_file = zipfile.ZipFile(zip_name, 'r')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 17:20:58 2012
From: python-checkins at python.org (r.david.murray)
Date: Mon, 10 Sep 2012 17:20:58 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE0NjQ5OiBhZGQg?=
 =?utf-8?q?sample_files_omitted_from_previous_checkin=2E?=
Message-ID: <3XFtHt5H7tzQhj@mail.python.org>

http://hg.python.org/cpython/rev/c5fc49bc7a5f
changeset:   78968:c5fc49bc7a5f
branch:      2.7
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 10 11:20:47 2012 -0400
summary:
  #14649: add sample files omitted from previous checkin.

files:
  Lib/test/sample_doctest_no_docstrings.py |  12 +++++++++
  Lib/test/sample_doctest_no_doctests.py   |  15 ++++++++++++
  2 files changed, 27 insertions(+), 0 deletions(-)


diff --git a/Lib/test/sample_doctest_no_docstrings.py b/Lib/test/sample_doctest_no_docstrings.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_docstrings.py
@@ -0,0 +1,12 @@
+# This is a sample module used for testing doctest.
+#
+# This module is for testing how doctest handles a module with no
+# docstrings.
+
+
+class Foo(object):
+
+    # A class with no docstring.
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/sample_doctest_no_doctests.py b/Lib/test/sample_doctest_no_doctests.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_doctests.py
@@ -0,0 +1,15 @@
+"""This is a sample module used for testing doctest.
+
+This module is for testing how doctest handles a module with docstrings
+but no doctest examples.
+
+"""
+
+
+class Foo(object):
+    """A docstring with no doctest examples.
+
+    """
+
+    def __init__(self):
+        pass

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 17:46:57 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 10 Sep 2012 17:46:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_reference_leak_in_er?=
 =?utf-8?q?ror_branch_of_=5Fbufferedreader=5Fread=5Fall=28=29=2E_The?=
Message-ID: <3XFtss5GDgzNgN@mail.python.org>

http://hg.python.org/cpython/rev/71d94e79b0c3
changeset:   78969:71d94e79b0c3
parent:      78966:f9b95ffd24ce
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 17:46:09 2012 +0200
summary:
  Fixed reference leak in error branch of _bufferedreader_read_all(). The variable data can contain a bytes object but it wasn't cleaned up when PyList_New() failed. CID 715364

files:
  Modules/_io/bufferedio.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -1499,8 +1499,10 @@
     }
 
     chunks = PyList_New(0);
-    if (chunks == NULL)
+    if (chunks == NULL) {
+        Py_XDECREF(data);
         return NULL;
+    }
 
     while (1) {
         if (data) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 19:42:06 2012
From: python-checkins at python.org (stefan.krah)
Date: Mon, 10 Sep 2012 19:42:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315882=3A_Change_?=
 =?utf-8?q?=5Fdecimal_to_accept_any_coefficient_tuple_when?=
Message-ID: <3XFxQk5GjlzNsb@mail.python.org>

http://hg.python.org/cpython/rev/97e53273f423
changeset:   78970:97e53273f423
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Sep 10 19:34:58 2012 +0200
summary:
  Issue #15882: Change _decimal to accept any coefficient tuple when
constructing infinities. This is done for backwards compatibility
with decimal.py: Infinity coefficients are undefined in _decimal
(in accordance with the specification).

files:
  Lib/test/test_decimal.py    |  17 ++++++++++-------
  Misc/NEWS                   |   4 ++++
  Modules/_decimal/_decimal.c |   7 +++++++
  3 files changed, 21 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -1992,7 +1992,8 @@
         d = Decimal("-4.34913534E-17")
         self.assertEqual(d.as_tuple(), (1, (4, 3, 4, 9, 1, 3, 5, 3, 4), -25) )
 
-        # XXX non-compliant infinity payload.
+        # The '0' coefficient is implementation specific to decimal.py.
+        # It has no meaning in the C-version and is ignored there.
         d = Decimal("Infinity")
         self.assertEqual(d.as_tuple(), (0, (0,), 'F') )
 
@@ -2012,12 +2013,14 @@
         d = Decimal( (1, (), 'n') )
         self.assertEqual(d.as_tuple(), (1, (), 'n') )
 
-        # XXX coefficient in infinity should raise an error
-        if self.decimal == P:
-            d = Decimal( (0, (4, 5, 3, 4), 'F') )
-            self.assertEqual(d.as_tuple(), (0, (0,), 'F'))
-            d = Decimal( (1, (0, 2, 7, 1), 'F') )
-            self.assertEqual(d.as_tuple(), (1, (0,), 'F'))
+        # For infinities, decimal.py has always silently accepted any
+        # coefficient tuple.
+        d = Decimal( (0, (0,), 'F') )
+        self.assertEqual(d.as_tuple(), (0, (0,), 'F'))
+        d = Decimal( (0, (4, 5, 3, 4), 'F') )
+        self.assertEqual(d.as_tuple(), (0, (0,), 'F'))
+        d = Decimal( (1, (0, 2, 7, 1), 'F') )
+        self.assertEqual(d.as_tuple(), (1, (0,), 'F'))
 
     def test_subclassing(self):
         # Different behaviours when subclassing Decimal
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,10 @@
 Library
 -------
 
+- Issue #15882: Change _decimal to accept any coefficient tuple when
+  constructing infinities. This is done for backwards compatibility
+  with decimal.py: Infinity coefficients are undefined in _decimal
+  (in accordance with the specification).
 
 - Issue #15876: Fix a refleak in the curses module: window.encoding.
 
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2364,6 +2364,7 @@
     long sign, l;
     mpd_ssize_t exp = 0;
     Py_ssize_t i, mem, tsize;
+    int is_infinite = 0;
     int n;
 
     assert(PyTuple_Check(dectuple));
@@ -2399,6 +2400,7 @@
         /* special */
         if (PyUnicode_CompareWithASCIIString(tmp, "F") == 0) {
             strcat(sign_special, "Inf");
+            is_infinite = 1;
         }
         else if (PyUnicode_CompareWithASCIIString(tmp, "n") == 0) {
             strcat(sign_special, "NaN");
@@ -2470,6 +2472,11 @@
                 "coefficient must be a tuple of digits");
             goto error;
         }
+        if (is_infinite) {
+            /* accept but ignore any well-formed coefficient for compatibility
+               with decimal.py */
+            continue;
+        }
         *cp++ = (char)l + '0';
     }
     *cp = '\0';

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 20:20:19 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 20:20:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1Njc2OiBQcm9w?=
 =?utf-8?q?er_attribution_in_Misc/ACKS?=
Message-ID: <3XFyGq1QmdzQ4M@mail.python.org>

http://hg.python.org/cpython/rev/9ed2e8307e60
changeset:   78971:9ed2e8307e60
branch:      2.7
parent:      78968:c5fc49bc7a5f
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 20:18:43 2012 +0200
summary:
  #15676: Proper attribution in Misc/ACKS

files:
  Misc/ACKS |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -939,6 +939,7 @@
 John Williams
 Sue Williams
 Gerald S. Williams
+Steven Willis
 Frank Willison
 Greg V. Wilson
 J Derek Wilson

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 20:20:20 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 20:20:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1Njc2OiBQcm9w?=
 =?utf-8?q?er_attribution_in_Misc/ACKS?=
Message-ID: <3XFyGr4Sh4zQ4M@mail.python.org>

http://hg.python.org/cpython/rev/4f21f7532038
changeset:   78972:4f21f7532038
branch:      3.2
parent:      78964:302561c9387a
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 20:19:25 2012 +0200
summary:
  #15676: Proper attribution in Misc/ACKS

files:
  Misc/ACKS |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1029,6 +1029,7 @@
 John Williams
 Sue Williams
 Gerald S. Williams
+Steven Willis
 Frank Willison
 Greg V. Wilson
 J Derek Wilson

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 20:20:22 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 20:20:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_MERGE=3A_=2315676=3A_Proper_attribution_in_Misc/ACKS?=
Message-ID: <3XFyGt0VxFzQ7J@mail.python.org>

http://hg.python.org/cpython/rev/4fdc6c501e63
changeset:   78973:4fdc6c501e63
parent:      78970:97e53273f423
parent:      78972:4f21f7532038
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 20:20:02 2012 +0200
summary:
  MERGE: #15676: Proper attribution in Misc/ACKS

files:
  Misc/ACKS |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1139,6 +1139,7 @@
 Jason Williams
 John Williams
 Sue Williams
+Steven Willis
 Frank Willison
 Greg V. Wilson
 J Derek Wilson

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 21:04:58 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 21:04:58 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNTkw?=
 =?utf-8?q?8=3A_SHA1_crashes_in_64_bits_when_the_string_to_hash_is_bigger_?=
 =?utf-8?q?than?=
Message-ID: <3XFzGL5w97zQD6@mail.python.org>

http://hg.python.org/cpython/rev/a13bfc238f27
changeset:   78974:a13bfc238f27
branch:      2.7
parent:      78971:9ed2e8307e60
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 21:04:42 2012 +0200
summary:
  Closes #15908: SHA1 crashes in 64 bits when the string to hash is bigger than 2**32 bytes

files:
  Lib/test/test_hashlib.py |   8 ++++++++
  Misc/NEWS                |   3 +++
  Modules/shamodule.c      |  19 ++++++++++++++++---
  3 files changed, 27 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -228,6 +228,14 @@
         self.check('sha1', "a" * 1000000,
                    "34aa973cd4c4daa4f61eeb2bdbad27316534016f")
 
+    @precisionbigmemtest(size=_4G + 5, memuse=1)
+    def test_case_sha1_huge(self, size):
+        if size == _4G + 5:
+            try:
+                self.check('sha1', 'A'*size,
+                        '87d745c50e6b2879ffa0fb2c930e9fbfe0dc9a5b')
+            except OverflowError:
+                pass # 32-bit arch
 
     # use the examples from Federal Information Processing Standards
     # Publication 180-2, Secure Hash Standard,  2002 August 1
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -244,6 +244,9 @@
 - Issue #14888: Fix misbehaviour of the _md5 module when called on data
   larger than 2**32 bytes.
 
+- Issue #15908: Fix misbehaviour of the sha1 module when called on data
+  larger than 2**32 bytes.
+
 - Issue #14875: Use float('inf') instead of float('1e66666') in the json module.
 
 - Issue #14572: Prevent build failures with pre-3.5.0 versions of
diff --git a/Modules/shamodule.c b/Modules/shamodule.c
--- a/Modules/shamodule.c
+++ b/Modules/shamodule.c
@@ -536,6 +536,8 @@
     static char *kwlist[] = {"string", NULL};
     SHAobject *new;
     Py_buffer view = { 0 };
+    Py_ssize_t n;
+    unsigned char *buf;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s*:new", kwlist,
                                      &view)) {
@@ -554,10 +556,21 @@
         PyBuffer_Release(&view);
         return NULL;
     }
-    if (view.len > 0) {
-        sha_update(new, (unsigned char*)view.buf,
-                   Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int));
+
+    n = view.len;
+    buf = (unsigned char *) view.buf;
+    while (n > 0) {
+        Py_ssize_t nbytes;
+        if (n > INT_MAX)
+            nbytes = INT_MAX;
+        else
+            nbytes = n;
+        sha_update(new, buf,
+                   Py_SAFE_DOWNCAST(nbytes, Py_ssize_t, unsigned int));
+        buf += nbytes;
+        n -= nbytes;
     }
+
     PyBuffer_Release(&view);
 
     return (PyObject *)new;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 21:39:27 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 21:39:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNTkx?=
 =?utf-8?q?0=3A_MD5_and_SHA1_crash_when_=22updated=22_with_strings_bigger_?=
 =?utf-8?q?than_2**32?=
Message-ID: <3XG02721QZzQKy@mail.python.org>

http://hg.python.org/cpython/rev/4d36e56b56d9
changeset:   78975:4d36e56b56d9
branch:      2.7
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 21:39:07 2012 +0200
summary:
  Closes #15910: MD5 and SHA1 crash when "updated" with strings bigger than 2**32 bytes

files:
  Lib/test/test_hashlib.py |  33 ++++++++++++++++++++++++++++
  Misc/NEWS                |   3 ++
  Modules/md5module.c      |  17 ++++++++++++-
  Modules/shamodule.c      |  17 ++++++++++++-
  4 files changed, 66 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py
--- a/Lib/test/test_hashlib.py
+++ b/Lib/test/test_hashlib.py
@@ -167,6 +167,21 @@
                     % (name, hash_object_constructor,
                        computed, len(data), digest))
 
+    def check_update(self, name, data, digest):
+        constructors = self.constructors_to_test[name]
+        # 2 is for hashlib.name(...) and hashlib.new(name, ...)
+        self.assertGreaterEqual(len(constructors), 2)
+        for hash_object_constructor in constructors:
+            h = hash_object_constructor()
+            h.update(data)
+            computed = h.hexdigest()
+            self.assertEqual(
+                    computed, digest,
+                    "Hash algorithm %s using %s when updated returned hexdigest"
+                    " %r for %d byte input data that should have hashed to %r."
+                    % (name, hash_object_constructor,
+                       computed, len(data), digest))
+
     def check_unicode(self, algorithm_name):
         # Unicode objects are not allowed as input.
         expected = hashlib.new(algorithm_name, str(u'spam')).hexdigest()
@@ -200,6 +215,15 @@
             except OverflowError:
                 pass # 32-bit arch
 
+    @precisionbigmemtest(size=_4G + 5, memuse=1)
+    def test_case_md5_huge_update(self, size):
+        if size == _4G + 5:
+            try:
+                self.check_update('md5', 'A'*size,
+                        'c9af2dff37468ce5dfee8f2cfc0a9c6d')
+            except OverflowError:
+                pass # 32-bit arch
+
     @precisionbigmemtest(size=_4G - 1, memuse=1)
     def test_case_md5_uintmax(self, size):
         if size == _4G - 1:
@@ -237,6 +261,15 @@
             except OverflowError:
                 pass # 32-bit arch
 
+    @precisionbigmemtest(size=_4G + 5, memuse=1)
+    def test_case_sha1_huge_update(self, size):
+        if size == _4G + 5:
+            try:
+                self.check_update('sha1', 'A'*size,
+                        '87d745c50e6b2879ffa0fb2c930e9fbfe0dc9a5b')
+            except OverflowError:
+                pass # 32-bit arch
+
     # use the examples from Federal Information Processing Standards
     # Publication 180-2, Secure Hash Standard,  2002 August 1
     # http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -247,6 +247,9 @@
 - Issue #15908: Fix misbehaviour of the sha1 module when called on data
   larger than 2**32 bytes.
 
+- Issue #15910: Fix misbehaviour of _md5 and sha1 modules when "updating"
+  on data larger than 2**32 bytes.
+
 - Issue #14875: Use float('inf') instead of float('1e66666') in the json module.
 
 - Issue #14572: Prevent build failures with pre-3.5.0 versions of
diff --git a/Modules/md5module.c b/Modules/md5module.c
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -51,12 +51,25 @@
 md5_update(md5object *self, PyObject *args)
 {
     Py_buffer view;
+    Py_ssize_t n;
+    unsigned char *buf;
 
     if (!PyArg_ParseTuple(args, "s*:update", &view))
         return NULL;
 
-    md5_append(&self->md5, (unsigned char*)view.buf,
-               Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int));
+    n = view.len;
+    buf = (unsigned char *) view.buf;
+    while (n > 0) {
+        Py_ssize_t nbytes;
+        if (n > INT_MAX)
+            nbytes = INT_MAX;
+        else
+            nbytes = n;
+        md5_append(&self->md5, buf,
+                   Py_SAFE_DOWNCAST(nbytes, Py_ssize_t, unsigned int));
+        buf += nbytes;
+        n -= nbytes;
+    }
 
     PyBuffer_Release(&view);
     Py_RETURN_NONE;
diff --git a/Modules/shamodule.c b/Modules/shamodule.c
--- a/Modules/shamodule.c
+++ b/Modules/shamodule.c
@@ -429,12 +429,25 @@
 SHA_update(SHAobject *self, PyObject *args)
 {
     Py_buffer view;
+    Py_ssize_t n;
+    unsigned char *buf;
 
     if (!PyArg_ParseTuple(args, "s*:update", &view))
         return NULL;
 
-    sha_update(self, (unsigned char*)view.buf,
-               Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int));
+    n = view.len;
+    buf = (unsigned char *) view.buf;
+    while (n > 0) {
+        Py_ssize_t nbytes;
+        if (n > INT_MAX)
+            nbytes = INT_MAX;
+        else
+            nbytes = n;
+        sha_update(self, buf,
+                   Py_SAFE_DOWNCAST(nbytes, Py_ssize_t, unsigned int));
+        buf += nbytes;
+        n -= nbytes;
+    }
 
     PyBuffer_Release(&view);
     Py_RETURN_NONE;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 22:46:01 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 22:46:01 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1Njc2OiBtbWFw?=
 =?utf-8?q?=3A_add_empty_file_check_prior_to_offset_check_=3C-_Previous_pa?=
 =?utf-8?q?tch_was?=
Message-ID: <3XG1Vx0vK8zQXw@mail.python.org>

http://hg.python.org/cpython/rev/25d477647a2d
changeset:   78976:25d477647a2d
branch:      2.7
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 22:45:47 2012 +0200
summary:
  #15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete

files:
  Lib/test/test_mmap.py |  21 +++++++++------------
  Modules/mmapmodule.c  |   5 +++++
  2 files changed, 14 insertions(+), 12 deletions(-)


diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -469,18 +469,15 @@
     def test_empty_file (self):
         f = open (TESTFN, 'w+b')
         f.close()
-        f = open(TESTFN, "rb")
-        try:
-            m = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
-            m.close()
-            f.close()
-            self.fail("should not have been able to mmap empty file")
-        except ValueError as e:
-            f.close()
-            self.assertEqual(e.message, "cannot mmap an empty file")
-        except:
-            f.close()
-            self.fail("unexpected exception: " + str(e))
+        with open(TESTFN, "rb") as f :
+            try:
+                m = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
+                m.close()
+                self.fail("should not have been able to mmap empty file")
+            except ValueError as e:
+                self.assertEqual(e.message, "cannot mmap an empty file")
+            except:
+                self.fail("unexpected exception: " + str(e))
 
     def test_offset (self):
         f = open (TESTFN, 'w+b')
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1388,6 +1388,11 @@
             }
 
             size = (((PY_LONG_LONG) high) << 32) + low;
+            if (size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 22:50:45 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 22:50:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1Njc2OiBtbWFw?=
 =?utf-8?q?=3A_add_empty_file_check_prior_to_offset_check_=3C-_Previous_pa?=
 =?utf-8?q?tch_was?=
Message-ID: <3XG1cP1mD2zQXK@mail.python.org>

http://hg.python.org/cpython/rev/88a88c32661e
changeset:   78977:88a88c32661e
branch:      3.2
parent:      78972:4f21f7532038
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 22:49:50 2012 +0200
summary:
  #15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete

files:
  Lib/test/test_mmap.py |  10 +++++-----
  Modules/mmapmodule.c  |   5 +++++
  2 files changed, 10 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -462,11 +462,11 @@
     def test_empty_file (self):
         f = open (TESTFN, 'w+b')
         f.close()
-        f = open(TESTFN, "rb")
-        self.assertRaisesRegex(ValueError,
-                               "cannot mmap an empty file",
-                               mmap.mmap, f.fileno(), 0, access=mmap.ACCESS_READ)
-        f.close()
+        with open(TESTFN, "rb") as f :
+            self.assertRaisesRegex(ValueError,
+                                   "cannot mmap an empty file",
+                                   mmap.mmap, f.fileno(), 0,
+                                   access=mmap.ACCESS_READ)
 
     def test_offset (self):
         f = open (TESTFN, 'w+b')
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1342,6 +1342,11 @@
             }
 
             size = (((PY_LONG_LONG) high) << 32) + low;
+            if (size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 22:50:46 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 22:50:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_=2315676=3A_mmap=3A_add_empty_file_check_prior_to_offset?=
 =?utf-8?q?_check_=3C-_Previous_patch_was?=
Message-ID: <3XG1cQ6CXBzQZR@mail.python.org>

http://hg.python.org/cpython/rev/0ac94ae29abe
changeset:   78978:0ac94ae29abe
parent:      78973:4fdc6c501e63
parent:      78977:88a88c32661e
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 22:50:21 2012 +0200
summary:
  #15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete

files:
  Lib/test/test_mmap.py |  10 +++++-----
  Modules/mmapmodule.c  |   5 +++++
  2 files changed, 10 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -491,11 +491,11 @@
     def test_empty_file (self):
         f = open (TESTFN, 'w+b')
         f.close()
-        f = open(TESTFN, "rb")
-        self.assertRaisesRegex(ValueError,
-                               "cannot mmap an empty file",
-                               mmap.mmap, f.fileno(), 0, access=mmap.ACCESS_READ)
-        f.close()
+        with open(TESTFN, "rb") as f :
+            self.assertRaisesRegex(ValueError,
+                                   "cannot mmap an empty file",
+                                   mmap.mmap, f.fileno(), 0,
+                                   access=mmap.ACCESS_READ)
 
     def test_offset (self):
         f = open (TESTFN, 'w+b')
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1364,6 +1364,11 @@
             }
 
             size = (((PY_LONG_LONG) high) << 32) + low;
+            if (size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 22:58:51 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 22:58:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1Njc2OiBtbWFw?=
 =?utf-8?q?=3A_add_empty_file_check_prior_to_offset_check_=3C-_Previous_pa?=
 =?utf-8?q?tch_was?=
Message-ID: <3XG1nl3qmKzQVD@mail.python.org>

http://hg.python.org/cpython/rev/39efccf7a167
changeset:   78979:39efccf7a167
branch:      2.7
parent:      78976:25d477647a2d
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 22:57:34 2012 +0200
summary:
  #15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete (fix 2)

files:
  Modules/mmapmodule.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1391,6 +1391,7 @@
             if (size == 0) {
                 PyErr_SetString(PyExc_ValueError,
                                 "cannot mmap an empty file");
+                Py_DECREF(m_obj);
                 return NULL;
             }
             if (offset >= size) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 22:58:53 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 22:58:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1Njc2OiBtbWFw?=
 =?utf-8?q?=3A_add_empty_file_check_prior_to_offset_check_=3C-_Previous_pa?=
 =?utf-8?q?tch_was?=
Message-ID: <3XG1nn0J4NzQY5@mail.python.org>

http://hg.python.org/cpython/rev/56a2e862561c
changeset:   78980:56a2e862561c
branch:      3.2
parent:      78977:88a88c32661e
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 22:58:07 2012 +0200
summary:
  #15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete (fix 2)

files:
  Modules/mmapmodule.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1345,6 +1345,7 @@
             if (size == 0) {
                 PyErr_SetString(PyExc_ValueError,
                                 "cannot mmap an empty file");
+                Py_DECREF(m_obj);
                 return NULL;
             }
             if (offset >= size) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 10 22:58:54 2012
From: python-checkins at python.org (jesus.cea)
Date: Mon, 10 Sep 2012 22:58:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_MERGE=3A_=2315676=3A_mmap=3A_add_empty_file_check_prior_?=
 =?utf-8?q?to_offset_check_=3C-_Previous?=
Message-ID: <3XG1np4v0FzQVD@mail.python.org>

http://hg.python.org/cpython/rev/306b2ecb1a3e
changeset:   78981:306b2ecb1a3e
parent:      78978:0ac94ae29abe
parent:      78980:56a2e862561c
user:        Jesus Cea <jcea at jcea.es>
date:        Mon Sep 10 22:58:35 2012 +0200
summary:
  MERGE: #15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete (fix 2)

files:
  Modules/mmapmodule.c |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1367,6 +1367,7 @@
             if (size == 0) {
                 PyErr_SetString(PyExc_ValueError,
                                 "cannot mmap an empty file");
+                Py_DECREF(m_obj);
                 return NULL;
             }
             if (offset >= size) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 02:23:59 2012
From: python-checkins at python.org (jesus.cea)
Date: Tue, 11 Sep 2012 02:23:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNTc5?=
 =?utf-8?q?3=3A_Stack_corruption_in_ssl=2ERAND=5Fegd=28=29=2E_Python_2=2E7?=
 =?utf-8?q?_hasn=27t_any_issue?=
Message-ID: <3XG6LR18W7zP53@mail.python.org>

http://hg.python.org/cpython/rev/706115cb2cdb
changeset:   78982:706115cb2cdb
branch:      2.7
parent:      78979:39efccf7a167
user:        Jesus Cea <jcea at jcea.es>
date:        Tue Sep 11 01:55:04 2012 +0200
summary:
  Closes #15793: Stack corruption in ssl.RAND_egd(). Python 2.7 hasn't any issue about this, but add a test just to be sure

files:
  Lib/test/test_ssl.py |  8 ++------
  1 files changed, 2 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -95,12 +95,8 @@
             sys.stdout.write("\n RAND_status is %d (%s)\n"
                              % (v, (v and "sufficient randomness") or
                                 "insufficient randomness"))
-        try:
-            ssl.RAND_egd(1)
-        except TypeError:
-            pass
-        else:
-            print "didn't raise TypeError"
+        self.assertRaises(TypeError, ssl.RAND_egd, 1)
+        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
         ssl.RAND_add("this is a random string", 75.0)
 
     def test_parse_cert(self):

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 02:24:00 2012
From: python-checkins at python.org (jesus.cea)
Date: Tue, 11 Sep 2012 02:24:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNTc5?=
 =?utf-8?q?3=3A_Stack_corruption_in_ssl=2ERAND=5Fegd=28=29?=
Message-ID: <3XG6LS6drtzPpX@mail.python.org>

http://hg.python.org/cpython/rev/827bb0554f1f
changeset:   78983:827bb0554f1f
branch:      3.2
parent:      78980:56a2e862561c
user:        Jesus Cea <jcea at jcea.es>
date:        Tue Sep 11 02:00:58 2012 +0200
summary:
  Closes #15793: Stack corruption in ssl.RAND_egd()

files:
  Lib/test/test_ssl.py |  8 ++------
  Misc/NEWS            |  3 +++
  Modules/_ssl.c       |  2 +-
  3 files changed, 6 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -103,12 +103,8 @@
             sys.stdout.write("\n RAND_status is %d (%s)\n"
                              % (v, (v and "sufficient randomness") or
                                 "insufficient randomness"))
-        try:
-            ssl.RAND_egd(1)
-        except TypeError:
-            pass
-        else:
-            print("didn't raise TypeError")
+        self.assertRaises(TypeError, ssl.RAND_egd, 1)
+        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
         ssl.RAND_add("this is a random string", 75.0)
 
     def test_parse_cert(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -154,6 +154,9 @@
 
 - Issue #13579: string.Formatter now understands the 'a' conversion specifier.
 
+- Issue #15793: Stack corruption in ssl.RAND_egd().
+  Patch by Serhiy Storchaka.
+
 - Issue #15595: Fix subprocess.Popen(universal_newlines=True)
   for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek.
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1917,7 +1917,7 @@
     PyObject *path;
     int bytes;
 
-    if (!PyArg_ParseTuple(args, "O&|i:RAND_egd",
+    if (!PyArg_ParseTuple(args, "O&:RAND_egd",
                           PyUnicode_FSConverter, &path))
         return NULL;
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 02:24:03 2012
From: python-checkins at python.org (jesus.cea)
Date: Tue, 11 Sep 2012 02:24:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_MERGE=3A_Closes_=2315793=3A_Stack_corruption_in_ssl=2ERA?=
 =?utf-8?b?TkRfZWdkKCk=?=
Message-ID: <3XG6LW0KkVzPpX@mail.python.org>

http://hg.python.org/cpython/rev/7619a400d318
changeset:   78984:7619a400d318
parent:      78981:306b2ecb1a3e
parent:      78983:827bb0554f1f
user:        Jesus Cea <jcea at jcea.es>
date:        Tue Sep 11 02:08:48 2012 +0200
summary:
  MERGE: Closes #15793: Stack corruption in ssl.RAND_egd()

files:
  Lib/test/test_ssl.py |  8 ++------
  Misc/NEWS            |  3 +++
  Modules/_ssl.c       |  2 +-
  3 files changed, 6 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -125,12 +125,8 @@
         else:
             self.assertRaises(ssl.SSLError, ssl.RAND_bytes, 16)
 
-        try:
-            ssl.RAND_egd(1)
-        except TypeError:
-            pass
-        else:
-            print("didn't raise TypeError")
+        self.assertRaises(TypeError, ssl.RAND_egd, 1)
+        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
         ssl.RAND_add("this is a random string", 75.0)
 
     def test_parse_cert(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -210,6 +210,9 @@
 
 - Issue #13579: string.Formatter now understands the 'a' conversion specifier.
 
+- Issue #15793: Stack corruption in ssl.RAND_egd().
+  Patch by Serhiy Storchaka.
+
 - Issue #15595: Fix subprocess.Popen(universal_newlines=True)
   for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek.
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2481,7 +2481,7 @@
     PyObject *path;
     int bytes;
 
-    if (!PyArg_ParseTuple(args, "O&|i:RAND_egd",
+    if (!PyArg_ParseTuple(args, "O&:RAND_egd",
                           PyUnicode_FSConverter, &path))
         return NULL;
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 03:09:13 2012
From: python-checkins at python.org (r.david.murray)
Date: Tue, 11 Sep 2012 03:09:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2315886=3A_remove_redunda?=
	=?utf-8?q?nt_phrase?=
Message-ID: <3XG7Ld0FfkzPGC@mail.python.org>

http://hg.python.org/cpython/rev/d7ea7ec671ba
changeset:   78985:d7ea7ec671ba
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Sep 10 21:08:50 2012 -0400
summary:
  #15886: remove redundant phrase

files:
  Doc/library/os.rst |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1855,9 +1855,8 @@
    :attr:`st_mtime`, :attr:`st_ctime`. More items may be added at the end by
    some implementations.
 
-   This function can support :ref:`specifying a file descriptor
-   <path_fd>`, :ref:`specifying a file descriptor <path_fd>` and :ref:`not
-   following symlinks <follow_symlinks>`.
+   This function can support :ref:`specifying a file descriptor <path_fd>` and
+   :ref:`not following symlinks <follow_symlinks>`.
 
    .. index:: module: stat
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 04:28:41 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 11 Sep 2012 04:28:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?hooks=3A_Remove_unused_import_and_cle?=
	=?utf-8?q?an_up_whitespace=2E?=
Message-ID: <3XG96K1XlNzPS8@mail.python.org>

http://hg.python.org/hooks/rev/72aaeb80a55a
changeset:   83:72aaeb80a55a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Sep 11 05:28:30 2012 +0300
summary:
  Remove unused import and clean up whitespace.

files:
  checkheads.py |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/checkheads.py b/checkheads.py
--- a/checkheads.py
+++ b/checkheads.py
@@ -9,8 +9,6 @@
 pretxnchangegroup.checkheads = python:/home/hg/repos/hooks/checkheads.py:hook
 """
 
-from collections import defaultdict
-
 from mercurial.node import bin, nullrev
 from mercurial import util
 
@@ -24,7 +22,7 @@
     newcsets = range(start, end)
     # The rev numbers of the changegroup parents (not in the changegroup)
     parents = set()
-    
+
     for n in newcsets:
         for p in changelog.parentrevs(n):
             if p == nullrev:
@@ -51,5 +49,3 @@
             ui.warn('* Please run "hg pull" and then merge at least two of:\n')
             ui.warn('* ' + ', '.join(str(repo[h]) for h in pheads) + '\n')
             return True
-
-

-- 
Repository URL: http://hg.python.org/hooks

From solipsis at pitrou.net  Tue Sep 11 06:05:26 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 11 Sep 2012 06:05:26 +0200
Subject: [Python-checkins] Daily reference leaks (d7ea7ec671ba): sum=0
Message-ID: <E1TBHj4-0006Ml-MQ@ap.vmr.nerim.net>

results for d7ea7ec671ba on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogwKpx7J', '-x']

From python-checkins at python.org  Tue Sep 11 12:20:31 2012
From: python-checkins at python.org (senthil.kumaran)
Date: Tue, 11 Sep 2012 12:20:31 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogRml4IGlzc3VlICMx?=
 =?utf-8?q?5899=3A_Make_the_unicode=2Erst_doctests_pass=2E_Patch_by_Chris_?=
 =?utf-8?q?Jerdonek=2E?=
Message-ID: <3XGMZl5cCKzQB3@mail.python.org>

http://hg.python.org/cpython/rev/8a40bc71c072
changeset:   78986:8a40bc71c072
branch:      3.2
parent:      78983:827bb0554f1f
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 11 03:17:52 2012 -0700
summary:
  Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek.

files:
  Doc/howto/unicode.rst |  27 +++++++++++++--------------
  1 files changed, 13 insertions(+), 14 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -257,13 +257,13 @@
 'REPLACEMENT CHARACTER'), or 'ignore' (just leave the character out of the
 Unicode result).  The following examples show the differences::
 
-    >>> b'\x80abc'.decode("utf-8", "strict")
+    >>> b'\x80abc'.decode("utf-8", "strict")  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeDecodeError: 'utf8' codec can't decode byte 0x80 in position 0:
-                        unexpected code byte
+        ...
+    UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
+      invalid start byte
     >>> b'\x80abc'.decode("utf-8", "replace")
-    '?abc'
+    '?abc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 
@@ -301,11 +301,11 @@
     >>> u = chr(40960) + 'abcd' + chr(1972)
     >>> u.encode('utf-8')
     b'\xea\x80\x80abcd\xde\xb4'
-    >>> u.encode('ascii')
+    >>> u.encode('ascii')  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+        ...
     UnicodeEncodeError: 'ascii' codec can't encode character '\ua000' in
-                        position 0: ordinal not in range(128)
+      position 0: ordinal not in range(128)
     >>> u.encode('ascii', 'ignore')
     b'abcd'
     >>> u.encode('ascii', 'replace')
@@ -331,12 +331,11 @@
 not four::
 
     >>> s = "a\xac\u1234\u20ac\U00008000"
-              ^^^^ two-digit hex escape
-                   ^^^^^ four-digit Unicode escape
-                              ^^^^^^^^^^ eight-digit Unicode escape
-    >>> for c in s:  print(ord(c), end=" ")
-    ...
-    97 172 4660 8364 32768
+    ... #     ^^^^ two-digit hex escape
+    ... #         ^^^^^^ four-digit Unicode escape
+    ... #                     ^^^^^^^^^^ eight-digit Unicode escape
+    >>> [ord(c) for c in s]
+    [97, 172, 4660, 8364, 32768]
 
 Using escape sequences for code points greater than 127 is fine in small doses,
 but becomes an annoyance if you're using many accented characters, as you would

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 12:20:33 2012
From: python-checkins at python.org (senthil.kumaran)
Date: Tue, 11 Sep 2012 12:20:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_merge=2E__Fix_issue_=2315899=3A_Make_the_unicode=2Erst_d?=
 =?utf-8?q?octests_pass=2E_Patch_by_Chris?=
Message-ID: <3XGMZn2jX4zQ9X@mail.python.org>

http://hg.python.org/cpython/rev/1d9e89f6abec
changeset:   78987:1d9e89f6abec
parent:      78985:d7ea7ec671ba
parent:      78986:8a40bc71c072
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 11 03:20:22 2012 -0700
summary:
  merge.  Fix issue #15899: Make the unicode.rst doctests pass. Patch by Chris Jerdonek.

files:
  Doc/howto/unicode.rst |  27 +++++++++++++--------------
  1 files changed, 13 insertions(+), 14 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -257,13 +257,13 @@
 'REPLACEMENT CHARACTER'), or 'ignore' (just leave the character out of the
 Unicode result).  The following examples show the differences::
 
-    >>> b'\x80abc'.decode("utf-8", "strict")
+    >>> b'\x80abc'.decode("utf-8", "strict")  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeDecodeError: 'utf8' codec can't decode byte 0x80 in position 0:
-                        unexpected code byte
+        ...
+    UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
+      invalid start byte
     >>> b'\x80abc'.decode("utf-8", "replace")
-    '?abc'
+    '?abc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 
@@ -301,11 +301,11 @@
     >>> u = chr(40960) + 'abcd' + chr(1972)
     >>> u.encode('utf-8')
     b'\xea\x80\x80abcd\xde\xb4'
-    >>> u.encode('ascii')
+    >>> u.encode('ascii')  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+        ...
     UnicodeEncodeError: 'ascii' codec can't encode character '\ua000' in
-                        position 0: ordinal not in range(128)
+      position 0: ordinal not in range(128)
     >>> u.encode('ascii', 'ignore')
     b'abcd'
     >>> u.encode('ascii', 'replace')
@@ -331,12 +331,11 @@
 not four::
 
     >>> s = "a\xac\u1234\u20ac\U00008000"
-              ^^^^ two-digit hex escape
-                   ^^^^^ four-digit Unicode escape
-                              ^^^^^^^^^^ eight-digit Unicode escape
-    >>> for c in s:  print(ord(c), end=" ")
-    ...
-    97 172 4660 8364 32768
+    ... #     ^^^^ two-digit hex escape
+    ... #         ^^^^^^ four-digit Unicode escape
+    ... #                     ^^^^^^^^^^ eight-digit Unicode escape
+    >>> [ord(c) for c in s]
+    [97, 172, 4660, 8364, 32768]
 
 Using escape sequences for code points greater than 127 is fine in small doses,
 but becomes an annoyance if you're using many accented characters, as you would

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 14:03:35 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 11 Sep 2012 14:03:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315900=3A_Fixed_re?=
 =?utf-8?q?ference_leak_in_PyUnicode=5FTranslateCharmap=28=29?=
Message-ID: <3XGPsg2V1nzQKb@mail.python.org>

http://hg.python.org/cpython/rev/4f2811e5e462
changeset:   78988:4f2811e5e462
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 14:03:25 2012 +0200
summary:
  Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap()

files:
  Misc/NEWS               |   2 ++
  Objects/unicodeobject.c |  11 +++++------
  2 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap().
+
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 
 - Issue #15846: Fix SystemError which happened when using ast.parse in an
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8585,10 +8585,13 @@
                            PyObject *mapping,
                            const char *errors)
 {
+    PyObject *result;
     PyObject *unicode = PyUnicode_FromUnicode(p, size);
     if (!unicode)
         return NULL;
-    return _PyUnicode_TranslateCharmap(unicode, mapping, errors);
+    result = _PyUnicode_TranslateCharmap(unicode, mapping, errors);
+    Py_DECREF(unicode);
+    return result;
 }
 
 PyObject *
@@ -8600,14 +8603,10 @@
 
     str = PyUnicode_FromObject(str);
     if (str == NULL)
-        goto onError;
+        return NULL;
     result = _PyUnicode_TranslateCharmap(str, mapping, errors);
     Py_DECREF(str);
     return result;
-
-  onError:
-    Py_XDECREF(str);
-    return NULL;
 }
 
 static Py_UCS4

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 14:12:33 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 11 Sep 2012 14:12:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Spelling_past_tense_-=3E_p?=
	=?utf-8?q?resent_tense?=
Message-ID: <3XGQ412cBbzQM4@mail.python.org>

http://hg.python.org/cpython/rev/f1a31d9d36e6
changeset:   78989:f1a31d9d36e6
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 14:08:49 2012 +0200
summary:
  Spelling past tense -> present tense

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,7 +10,7 @@
 Core and Builtins
 -----------------
 
-- Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap().
+- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
 
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 14:12:35 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 11 Sep 2012 14:12:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315895=3A_Fix_FILE?=
 =?utf-8?q?_pointer_leak_in_PyRun=5FSimpleFileExFlags=28=29_when_filename?=
Message-ID: <3XGQ436sptzQQH@mail.python.org>

http://hg.python.org/cpython/rev/4754c4a710e6
changeset:   78990:4754c4a710e6
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 14:11:03 2012 +0200
summary:
  Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file and closeit is false.

files:
  Misc/NEWS          |  3 +++
  Python/pythonrun.c |  6 +++++-
  2 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when
+  filename points to a pyc/pyo file and closeit is false.
+
 - Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
 
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1385,7 +1385,7 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, ret;
+    int set_file_name = 0, close_own_fp = 0, ret;
     size_t len;
 
     m = PyImport_AddModule("__main__");
@@ -1419,6 +1419,7 @@
             ret = -1;
             goto done;
         }
+        close_own_fp = 1;
         /* Turn on optimization if a .pyo file is given */
         if (strcmp(ext, ".pyo") == 0)
             Py_OptimizeFlag = 1;
@@ -1449,6 +1450,9 @@
     Py_DECREF(v);
     ret = 0;
   done:
+    if (close_own_fp) {
+        fclose(fp);
+    }
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
     return ret;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 15:47:39 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 11 Sep 2012 15:47:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315895=3A_my_analy?=
 =?utf-8?q?sis_was_slightly_off=2E_The_FILE_pointer_is_only_leaked?=
Message-ID: <3XGS9l6DmxzQVY@mail.python.org>

http://hg.python.org/cpython/rev/c3539eb02470
changeset:   78991:c3539eb02470
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 15:47:28 2012 +0200
summary:
  Issue #15895: my analysis was slightly off. The FILE pointer is only leaked when set_main_loader() fails for a pyc file with closeit=0. In the success case run_pyc_file() does its own cleanup of the fp. I've changed the code to use another FILE ptr for pyc files and moved the fclose() to PyRun_SimpleFileExFlags() to make it more obvious what's happening.

files:
  Misc/NEWS          |   3 ++-
  Python/pythonrun.c |  14 ++++++--------
  2 files changed, 8 insertions(+), 9 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,7 +10,8 @@
 Core and Builtins
 -----------------
 
-- Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when
+- Issue #15895: Fix FILE pointer leak in one error branch of
+   PyRun_SimpleFileExFlags() when
   filename points to a pyc/pyo file and closeit is false.
 
 - Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1385,7 +1385,7 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, close_own_fp = 0, ret;
+    int set_file_name = 0, ret;
     size_t len;
 
     m = PyImport_AddModule("__main__");
@@ -1411,15 +1411,15 @@
     len = strlen(filename);
     ext = filename + len - (len > 4 ? 4 : 0);
     if (maybe_pyc_file(fp, filename, ext, closeit)) {
+        FILE *pyc_fp;
         /* Try to run a pyc file. First, re-open in binary */
         if (closeit)
             fclose(fp);
-        if ((fp = fopen(filename, "rb")) == NULL) {
+        if ((pyc_fp = fopen(filename, "rb")) == NULL) {
             fprintf(stderr, "python: Can't reopen .pyc file\n");
             ret = -1;
             goto done;
         }
-        close_own_fp = 1;
         /* Turn on optimization if a .pyo file is given */
         if (strcmp(ext, ".pyo") == 0)
             Py_OptimizeFlag = 1;
@@ -1427,9 +1427,11 @@
         if (set_main_loader(d, filename, "SourcelessFileLoader") < 0) {
             fprintf(stderr, "python: failed to set __main__.__loader__\n");
             ret = -1;
+            fclose(pyc_fp);
             goto done;
         }
-        v = run_pyc_file(fp, filename, d, d, flags);
+        v = run_pyc_file(pyc_fp, filename, d, d, flags);
+        fclose(pyc_fp);
     } else {
         /* When running from stdin, leave __main__.__loader__ alone */
         if (strcmp(filename, "<stdin>") != 0 &&
@@ -1450,9 +1452,6 @@
     Py_DECREF(v);
     ret = 0;
   done:
-    if (close_own_fp) {
-        fclose(fp);
-    }
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
     return ret;
@@ -1999,7 +1998,6 @@
     (void) PyMarshal_ReadLongFromFile(fp);
     (void) PyMarshal_ReadLongFromFile(fp);
     v = PyMarshal_ReadLastObjectFromFile(fp);
-    fclose(fp);
     if (v == NULL || !PyCode_Check(v)) {
         Py_XDECREF(v);
         PyErr_SetString(PyExc_RuntimeError,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 17:31:29 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 11 Sep 2012 17:31:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_null_point?=
 =?utf-8?q?er_dereferencing_in_structmember=2Ec_PyMember=5FSetOne=28=29_fo?=
 =?utf-8?b?ciBUX0NIQVIu?=
Message-ID: <3XGVTY2dm9zQFB@mail.python.org>

http://hg.python.org/cpython/rev/afe55cd04119
changeset:   78992:afe55cd04119
branch:      3.2
parent:      78986:8a40bc71c072
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 17:30:53 2012 +0200
summary:
  Fix null pointer dereferencing in structmember.c PyMember_SetOne() for T_CHAR. _PyUnicode_AsStringAndSize() can return NULL without touching the len argument. Also remove unnecessary PyUnicode_Check(), _PyUnicode_AsStringAndSize() performance the test again. CID 486815

files:
  Python/structmember.c |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/Python/structmember.c b/Python/structmember.c
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -254,12 +254,8 @@
         char *string;
         Py_ssize_t len;
 
-        if (!PyUnicode_Check(v)) {
-            PyErr_BadArgument();
-            return -1;
-        }
         string = _PyUnicode_AsStringAndSize(v, &len);
-        if (len != 1) {
+        if (string == NULL || len != 1) {
             PyErr_BadArgument();
             return -1;
         }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 17:31:32 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 11 Sep 2012 17:31:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Fix_null_pointer_dereferencing_in_structmember=2Ec_PyMem?=
 =?utf-8?b?YmVyX1NldE9uZSgpIGZvciBUX0NIQVIu?=
Message-ID: <3XGVTc5zkyzQNr@mail.python.org>

http://hg.python.org/cpython/rev/59ec0b9ff724
changeset:   78993:59ec0b9ff724
parent:      78991:c3539eb02470
parent:      78992:afe55cd04119
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 17:31:08 2012 +0200
summary:
  Fix null pointer dereferencing in structmember.c PyMember_SetOne() for T_CHAR. _PyUnicode_AsStringAndSize() can return NULL without touching the len argument. Also remove unnecessary PyUnicode_Check(), _PyUnicode_AsStringAndSize() performance the test again. CID 486815

files:
  Python/structmember.c |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/Python/structmember.c b/Python/structmember.c
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -254,12 +254,8 @@
         char *string;
         Py_ssize_t len;
 
-        if (!PyUnicode_Check(v)) {
-            PyErr_BadArgument();
-            return -1;
-        }
         string = _PyUnicode_AsStringAndSize(v, &len);
-        if (len != 1) {
+        if (string == NULL || len != 1) {
             PyErr_BadArgument();
             return -1;
         }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 18:05:24 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 11 Sep 2012 18:05:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_remove_useless_and_defined?=
 =?utf-8?q?_initialization_=28closes_=2315921=29?=
Message-ID: <3XGWDh4bFrzQXX@mail.python.org>

http://hg.python.org/cpython/rev/6cdc72f4d82c
changeset:   78994:6cdc72f4d82c
parent:      78991:c3539eb02470
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 11 12:05:05 2012 -0400
summary:
  remove useless and defined initialization (closes #15921)

files:
  Modules/selectmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -239,7 +239,7 @@
 #else
         /* 64-bit OS X has struct timeval.tv_usec as an int (and thus still 4
            bytes as required), but no longer defined by a long. */
-        long tv_usec = tv.tv_usec;
+        long tv_usec;
         if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv_usec) == -1)
             return NULL;
         tv.tv_usec = tv_usec;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 18:05:26 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 11 Sep 2012 18:05:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XGWDk0RdGzQb3@mail.python.org>

http://hg.python.org/cpython/rev/8042b87bb762
changeset:   78995:8042b87bb762
parent:      78994:6cdc72f4d82c
parent:      78993:59ec0b9ff724
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 11 12:05:18 2012 -0400
summary:
  merge heads

files:
  Python/structmember.c |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/Python/structmember.c b/Python/structmember.c
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -254,12 +254,8 @@
         char *string;
         Py_ssize_t len;
 
-        if (!PyUnicode_Check(v)) {
-            PyErr_BadArgument();
-            return -1;
-        }
         string = _PyUnicode_AsStringAndSize(v, &len);
-        if (len != 1) {
+        if (string == NULL || len != 1) {
             PyErr_BadArgument();
             return -1;
         }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 19:02:27 2012
From: python-checkins at python.org (r.david.murray)
Date: Tue, 11 Sep 2012 19:02:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE0NjE3OiBjbGFy?=
 =?utf-8?q?ify_discussion_of_interrelationship_of_=5F=5Feq=5F=5F_and_=5F?=
 =?utf-8?b?X2hhc2hfXy4=?=
Message-ID: <3XGXVW5l5NzQSX@mail.python.org>

http://hg.python.org/cpython/rev/957e1eef3296
changeset:   78996:957e1eef3296
branch:      3.2
parent:      78992:afe55cd04119
user:        R David Murray <rdmurray at bitdance.com>
date:        Tue Sep 11 13:01:43 2012 -0400
summary:
  #14617: clarify discussion of interrelationship of __eq__ and __hash__.

files:
  Doc/reference/datamodel.rst |  26 ++++++++++++------------
  1 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1255,22 +1255,22 @@
    by default; with them, all objects compare unequal (except with themselves)
    and ``x.__hash__()`` returns ``id(x)``.
 
-   Classes which inherit a :meth:`__hash__` method from a parent class but
-   change the meaning of :meth:`__eq__` such that the hash value returned is no
-   longer appropriate (e.g. by switching to a value-based concept of equality
-   instead of the default identity based equality) can explicitly flag
-   themselves as being unhashable by setting ``__hash__ = None`` in the class
-   definition. Doing so means that not only will instances of the class raise an
-   appropriate :exc:`TypeError` when a program attempts to retrieve their hash
-   value, but they will also be correctly identified as unhashable when checking
-   ``isinstance(obj, collections.Hashable)`` (unlike classes which define their
-   own :meth:`__hash__` to explicitly raise :exc:`TypeError`).
+   A class that overrides :meth:`__eq__` and does not define :meth:`__hash__`
+   will have its :meth:`__hash__` implicitly set to ``None``.  When the
+   :meth:`__hash__` method of a class is ``None``, instances of the class will
+   raise an appropriate :exc:`TypeError` when a program attempts to retrieve
+   their hash value, and will also be correctly identified as unhashable when
+   checking ``isinstance(obj, collections.Hashable``).
 
    If a class that overrides :meth:`__eq__` needs to retain the implementation
    of :meth:`__hash__` from a parent class, the interpreter must be told this
-   explicitly by setting ``__hash__ = <ParentClass>.__hash__``. Otherwise the
-   inheritance of :meth:`__hash__` will be blocked, just as if :attr:`__hash__`
-   had been explicitly set to :const:`None`.
+   explicitly by setting ``__hash__ = <ParentClass>.__hash__``.
+
+   If a class that does not override :meth:`__eq__` wishes to suppress hash
+   support, it should include ``__hash__ = None`` in the class definition.
+   A class which defines its own :meth:`__hash__` that explicitly raises
+   a :exc:`TypeError` would be incorrectly identified as hashable by
+   an ``isinstance(obj, collections.Hashable)`` call.
 
    See also the :option:`-R` command-line option.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 19:02:29 2012
From: python-checkins at python.org (r.david.murray)
Date: Tue, 11 Sep 2012 19:02:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2314617=3A_clarify_discussion_of_interrelationshi?=
 =?utf-8?b?cCBvZiBfX2VxX18gYW5kIF9faGFzaF9fLg==?=
Message-ID: <3XGXVY29dHzQNy@mail.python.org>

http://hg.python.org/cpython/rev/c8d60d0c736b
changeset:   78997:c8d60d0c736b
parent:      78995:8042b87bb762
parent:      78996:957e1eef3296
user:        R David Murray <rdmurray at bitdance.com>
date:        Tue Sep 11 13:02:13 2012 -0400
summary:
  Merge #14617: clarify discussion of interrelationship of __eq__ and __hash__.

files:
  Doc/reference/datamodel.rst |  26 ++++++++++++------------
  1 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1271,22 +1271,22 @@
    and ``x.__hash__()`` returns an appropriate value such that ``x == y``
    implies both that ``x is y`` and ``hash(x) == hash(y)``.
 
-   Classes which inherit a :meth:`__hash__` method from a parent class but
-   change the meaning of :meth:`__eq__` such that the hash value returned is no
-   longer appropriate (e.g. by switching to a value-based concept of equality
-   instead of the default identity based equality) can explicitly flag
-   themselves as being unhashable by setting ``__hash__ = None`` in the class
-   definition. Doing so means that not only will instances of the class raise an
-   appropriate :exc:`TypeError` when a program attempts to retrieve their hash
-   value, but they will also be correctly identified as unhashable when checking
-   ``isinstance(obj, collections.Hashable)`` (unlike classes which define their
-   own :meth:`__hash__` to explicitly raise :exc:`TypeError`).
+   A class that overrides :meth:`__eq__` and does not define :meth:`__hash__`
+   will have its :meth:`__hash__` implicitly set to ``None``.  When the
+   :meth:`__hash__` method of a class is ``None``, instances of the class will
+   raise an appropriate :exc:`TypeError` when a program attempts to retrieve
+   their hash value, and will also be correctly identified as unhashable when
+   checking ``isinstance(obj, collections.Hashable``).
 
    If a class that overrides :meth:`__eq__` needs to retain the implementation
    of :meth:`__hash__` from a parent class, the interpreter must be told this
-   explicitly by setting ``__hash__ = <ParentClass>.__hash__``. Otherwise the
-   inheritance of :meth:`__hash__` will be blocked, just as if :attr:`__hash__`
-   had been explicitly set to :const:`None`.
+   explicitly by setting ``__hash__ = <ParentClass>.__hash__``.
+
+   If a class that does not override :meth:`__eq__` wishes to suppress hash
+   support, it should include ``__hash__ = None`` in the class definition.
+   A class which defines its own :meth:`__hash__` that explicitly raises
+   a :exc:`TypeError` would be incorrectly identified as hashable by
+   an ``isinstance(obj, collections.Hashable)`` call.
 
 
    .. note::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 11 19:28:53 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 11 Sep 2012 19:28:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Updates_NEWS_for_issue_=23?=
	=?utf-8?q?15895?=
Message-ID: <3XGY511gdDzQ7Z@mail.python.org>

http://hg.python.org/cpython/rev/6fea947edead
changeset:   78998:6fea947edead
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 19:28:42 2012 +0200
summary:
  Updates NEWS for issue #15895

files:
  Misc/NEWS |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -11,8 +11,8 @@
 -----------------
 
 - Issue #15895: Fix FILE pointer leak in one error branch of
-   PyRun_SimpleFileExFlags() when
-  filename points to a pyc/pyo file and closeit is false.
+  PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
+  is false an and set_main_loader() fails.
 
 - Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
 

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Wed Sep 12 06:02:22 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 12 Sep 2012 06:02:22 +0200
Subject: [Python-checkins] Daily reference leaks (6fea947edead): sum=0
Message-ID: <E1TBe9e-0007hb-Uy@ap.vmr.nerim.net>

results for 6fea947edead on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogEvFzzU', '-x']

From python-checkins at python.org  Wed Sep 12 06:12:44 2012
From: python-checkins at python.org (barry.warsaw)
Date: Wed, 12 Sep 2012 06:12:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogLSBJc3N1ZSAjMTU5?=
 =?utf-8?q?06=3A_Fix_a_regression_in_argparse_caused_by_the_preceding_chan?=
 =?utf-8?b?Z2Us?=
Message-ID: <3XGqMw3YzRzQb1@mail.python.org>

http://hg.python.org/cpython/rev/739606bdcba4
changeset:   78999:739606bdcba4
branch:      2.7
parent:      78982:706115cb2cdb
user:        Barry Warsaw <barry at python.org>
date:        Tue Sep 11 21:06:29 2012 -0400
summary:
  - Issue #15906: Fix a regression in argparse caused by the preceding change,
  when action='append', type='str' and default=[].

files:
  Lib/argparse.py           |   1 +
  Lib/test/test_argparse.py |  10 ++++++++++
  Misc/NEWS                 |   3 +++
  3 files changed, 14 insertions(+), 0 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1948,6 +1948,7 @@
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
+                            isinstance(action, _StoreAction) and
                             hasattr(namespace, action.dest) and
                             action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4480,6 +4480,16 @@
         args = parser.parse_args([])
         self.assertEqual(NS(foo='foo_converted'), args)
 
+    def test_issue_15906(self):
+        # Issue #15906: When action='append', type=str, default=[] are
+        # providing, the dest value was the string representation "[]" when it
+        # should have been an empty list.
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', dest='test', type=str,
+                            default=[], action='append')
+        args = parser.parse_args([])
+        self.assertEqual(args.test, [])
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -119,6 +119,9 @@
   especially problematic for the FileType type, as a default file would always
   be opened, even if a file argument was specified on the command line.
 
+- Issue #15906: Fix a regression in argparse caused by the preceding change,
+  when action='append', type='str' and default=[].
+
 - Issue #13370: Ensure that ctypes works on Mac OS X when Python is
   compiled using the clang compiler
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 06:13:16 2012
From: python-checkins at python.org (barry.warsaw)
Date: Wed, 12 Sep 2012 06:13:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogLSBJc3N1ZSAjMTU5?=
 =?utf-8?q?06=3A_Fix_a_regression_in_argparse_caused_by_the_preceding_chan?=
 =?utf-8?b?Z2Us?=
Message-ID: <3XGqNX0SYJzQZq@mail.python.org>

http://hg.python.org/cpython/rev/bc342cd7ed96
changeset:   79000:bc342cd7ed96
branch:      3.2
parent:      78996:957e1eef3296
user:        Barry Warsaw <barry at python.org>
date:        Tue Sep 11 22:38:47 2012 -0400
summary:
  - Issue #15906: Fix a regression in argparse caused by the preceding change,
  when action='append', type='str' and default=[].

files:
  Lib/argparse.py           |   1 +
  Lib/test/test_argparse.py |  10 ++++++++++
  Misc/NEWS                 |   3 +++
  3 files changed, 14 insertions(+), 0 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1957,6 +1957,7 @@
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
+                            isinstance(action, _StoreAction) and
                             hasattr(namespace, action.dest) and
                             action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4516,6 +4516,16 @@
         args = parser.parse_args([])
         self.assertEqual(NS(foo='foo_converted'), args)
 
+    def test_issue_15906(self):
+        # Issue #15906: When action='append', type=str, default=[] are
+        # providing, the dest value was the string representation "[]" when it
+        # should have been an empty list.
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', dest='test', type=str,
+                            default=[], action='append')
+        args = parser.parse_args([])
+        self.assertEqual(args.test, [])
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,9 @@
   especially problematic for the FileType type, as a default file would always
   be opened, even if a file argument was specified on the command line.
 
+- Issue #15906: Fix a regression in argparse caused by the preceding change,
+  when action='append', type='str' and default=[].
+
 - Issue #13370: Ensure that ctypes works on Mac OS X when Python is
   compiled using the clang compiler
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 06:13:47 2012
From: python-checkins at python.org (barry.warsaw)
Date: Wed, 12 Sep 2012 06:13:47 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_-_Issue_=2315906=3A_Fix_a_regression_in_argparse_caused_?=
 =?utf-8?q?by_the_preceding_change=2C?=
Message-ID: <3XGqP73SvPzML8@mail.python.org>

http://hg.python.org/cpython/rev/25e41fdc4e60
changeset:   79001:25e41fdc4e60
parent:      78998:6fea947edead
parent:      79000:bc342cd7ed96
user:        Barry Warsaw <barry at python.org>
date:        Wed Sep 12 00:12:29 2012 -0400
summary:
  - Issue #15906: Fix a regression in argparse caused by the preceding change,
  when action='append', type='str' and default=[].

files:
  Lib/argparse.py           |   1 +
  Lib/test/test_argparse.py |  10 ++++++++++
  Misc/NEWS                 |   3 +++
  3 files changed, 14 insertions(+), 0 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1961,6 +1961,7 @@
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
+                        isinstance(action, _StoreAction) and
                         hasattr(namespace, action.dest) and
                         action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4607,6 +4607,16 @@
         args = parser.parse_args([])
         self.assertEqual(NS(foo='foo_converted'), args)
 
+    def test_issue_15906(self):
+        # Issue #15906: When action='append', type=str, default=[] are
+        # providing, the dest value was the string representation "[]" when it
+        # should have been an empty list.
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', dest='test', type=str,
+                            default=[], action='append')
+        args = parser.parse_args([])
+        self.assertEqual(args.test, [])
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -56,6 +56,9 @@
   especially problematic for the FileType type, as a default file would always
   be opened, even if a file argument was specified on the command line.
 
+- Issue #15906: Fix a regression in argparse caused by the preceding change,
+  when action='append', type='str' and default=[].
+
 Extension Modules
 -----------------
 

-- 
Repository URL: http://hg.python.org/cpython

From chris.jerdonek at gmail.com  Wed Sep 12 06:30:57 2012
From: chris.jerdonek at gmail.com (Chris Jerdonek)
Date: Tue, 11 Sep 2012 21:30:57 -0700
Subject: [Python-checkins] cpython (merge 3.2 -> default): - Issue
 #15906: Fix a regression in argparse caused by the preceding change, 
In-Reply-To: <3XGqP73SvPzML8@mail.python.org>
References: <3XGqP73SvPzML8@mail.python.org>
Message-ID: <CAOTb1wdj2ka71KA299a3eLGd=CnodCsazLubJXfV+X5Dj8wN+Q@mail.gmail.com>

On Tue, Sep 11, 2012 at 9:13 PM, barry.warsaw
<python-checkins at python.org> wrote:
> http://hg.python.org/cpython/rev/25e41fdc4e60
> changeset:   79001:25e41fdc4e60
> parent:      78998:6fea947edead
> parent:      79000:bc342cd7ed96
> user:        Barry Warsaw <barry at python.org>
> date:        Wed Sep 12 00:12:29 2012 -0400
> summary:
>   - Issue #15906: Fix a regression in argparse caused by the preceding change,
>   when action='append', type='str' and default=[].

I didn't have time to respond Barry's e-mail from four hours ago
before this was committed.  I think this change may be problematic.
At the least, I think people should have an opportunity to air their
specific concerns and talk through the implications.

Also, from the discussion it seemed like the sentiment was leaning
towards a different approach for the fix.

I made a comment on the issue with some more extended remarks:

http://bugs.python.org/msg170351

--Chris


>
> files:
>   Lib/argparse.py           |   1 +
>   Lib/test/test_argparse.py |  10 ++++++++++
>   Misc/NEWS                 |   3 +++
>   3 files changed, 14 insertions(+), 0 deletions(-)
>
>
> diff --git a/Lib/argparse.py b/Lib/argparse.py
> --- a/Lib/argparse.py
> +++ b/Lib/argparse.py
> @@ -1961,6 +1961,7 @@
>                      # twice (which may fail) if the argument was given, but
>                      # only if it was defined already in the namespace
>                      if (action.default is not None and
> +                        isinstance(action, _StoreAction) and
>                          hasattr(namespace, action.dest) and
>                          action.default is getattr(namespace, action.dest)):
>                          setattr(namespace, action.dest,
> diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
> --- a/Lib/test/test_argparse.py
> +++ b/Lib/test/test_argparse.py
> @@ -4607,6 +4607,16 @@
>          args = parser.parse_args([])
>          self.assertEqual(NS(foo='foo_converted'), args)
>
> +    def test_issue_15906(self):
> +        # Issue #15906: When action='append', type=str, default=[] are
> +        # providing, the dest value was the string representation "[]" when it
> +        # should have been an empty list.
> +        parser = argparse.ArgumentParser()
> +        parser.add_argument('--test', dest='test', type=str,
> +                            default=[], action='append')
> +        args = parser.parse_args([])
> +        self.assertEqual(args.test, [])
> +
>  # ======================
>  # parse_known_args tests
>  # ======================
> diff --git a/Misc/NEWS b/Misc/NEWS
> --- a/Misc/NEWS
> +++ b/Misc/NEWS
> @@ -56,6 +56,9 @@
>    especially problematic for the FileType type, as a default file would always
>    be opened, even if a file argument was specified on the command line.
>
> +- Issue #15906: Fix a regression in argparse caused by the preceding change,
> +  when action='append', type='str' and default=[].
> +
>  Extension Modules
>  -----------------
>
>
> --
> Repository URL: http://hg.python.org/cpython
>
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>

From python-checkins at python.org  Wed Sep 12 07:17:22 2012
From: python-checkins at python.org (senthil.kumaran)
Date: Wed, 12 Sep 2012 07:17:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogRml4IGlzc3VlICMx?=
 =?utf-8?q?5899_-__howto/unicode=2Erst_doctest_corrections_for_2=2E7_branc?=
 =?utf-8?q?h=2E?=
Message-ID: <3XGrpV3qKmzQYt@mail.python.org>

http://hg.python.org/cpython/rev/142fbadd0ae1
changeset:   79002:142fbadd0ae1
branch:      2.7
parent:      78982:706115cb2cdb
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 11 22:14:23 2012 -0700
summary:
  Fix issue #15899 -  howto/unicode.rst doctest corrections for 2.7 branch.

files:
  Doc/howto/unicode.rst |  32 ++++++++++++++++--------------
  1 files changed, 17 insertions(+), 15 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -253,11 +253,11 @@
     >>> s = unicode('abcdef')
     >>> type(s)
     <type 'unicode'>
-    >>> unicode('abcdef' + chr(255))
+    >>> unicode('abcdef' + chr(255))    #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+    ...
     UnicodeDecodeError: 'ascii' codec can't decode byte 0xff in position 6:
-                        ordinal not in range(128)
+    ordinal not in range(128)
 
 The ``errors`` argument specifies the response when the input string can't be
 converted according to the encoding's rules.  Legal values for this argument are
@@ -265,11 +265,11 @@
 'REPLACEMENT CHARACTER'), or 'ignore' (just leave the character out of the
 Unicode result).  The following examples show the differences::
 
-    >>> unicode('\x80abc', errors='strict')
+    >>> unicode('\x80abc', errors='strict')     #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+        ...
     UnicodeDecodeError: 'ascii' codec can't decode byte 0x80 in position 0:
-                        ordinal not in range(128)
+    ordinal not in range(128)
     >>> unicode('\x80abc', errors='replace')
     u'\ufffdabc'
     >>> unicode('\x80abc', errors='ignore')
@@ -312,10 +312,11 @@
 operation; Python's default ASCII encoding will be used, so characters greater
 than 127 will cause an exception::
 
-    >>> s.find('Was\x9f')
+    >>> s.find('Was\x9f')                   #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeDecodeError: 'ascii' codec can't decode byte 0x9f in position 3: ordinal not in range(128)
+        ...
+    UnicodeDecodeError: 'ascii' codec can't decode byte 0x9f in position 3:
+    ordinal not in range(128)
     >>> s.find(u'Was\x9f')
     -1
 
@@ -333,10 +334,11 @@
     >>> u = unichr(40960) + u'abcd' + unichr(1972)
     >>> u.encode('utf-8')
     '\xea\x80\x80abcd\xde\xb4'
-    >>> u.encode('ascii')
+    >>> u.encode('ascii')                       #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeEncodeError: 'ascii' codec can't encode character '\ua000' in position 0: ordinal not in range(128)
+        ...
+    UnicodeEncodeError: 'ascii' codec can't encode character u'\ua000' in
+    position 0: ordinal not in range(128)
     >>> u.encode('ascii', 'ignore')
     'abcd'
     >>> u.encode('ascii', 'replace')
@@ -384,9 +386,9 @@
 ::
 
     >>> s = u"a\xac\u1234\u20ac\U00008000"
-               ^^^^ two-digit hex escape
-                   ^^^^^^ four-digit Unicode escape
-                               ^^^^^^^^^^ eight-digit Unicode escape
+    ... #      ^^^^ two-digit hex escape
+    ... #          ^^^^^^ four-digit Unicode escape
+    ... #                      ^^^^^^^^^^ eight-digit Unicode escape
     >>> for c in s:  print ord(c),
     ...
     97 172 4660 8364 32768

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 07:17:53 2012
From: python-checkins at python.org (senthil.kumaran)
Date: Wed, 12 Sep 2012 07:17:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?=
 =?utf-8?q?_Automated_merge_with_file=3A///home/vagrant/3=2E2?=
Message-ID: <3XGrq56pZvzQQk@mail.python.org>

http://hg.python.org/cpython/rev/befd752a3218
changeset:   79003:befd752a3218
branch:      2.7
parent:      78999:739606bdcba4
parent:      79002:142fbadd0ae1
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 11 22:16:58 2012 -0700
summary:
  Automated merge with file:///home/vagrant/3.2

files:
  Doc/howto/unicode.rst |  32 ++++++++++++++++--------------
  1 files changed, 17 insertions(+), 15 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -253,11 +253,11 @@
     >>> s = unicode('abcdef')
     >>> type(s)
     <type 'unicode'>
-    >>> unicode('abcdef' + chr(255))
+    >>> unicode('abcdef' + chr(255))    #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+    ...
     UnicodeDecodeError: 'ascii' codec can't decode byte 0xff in position 6:
-                        ordinal not in range(128)
+    ordinal not in range(128)
 
 The ``errors`` argument specifies the response when the input string can't be
 converted according to the encoding's rules.  Legal values for this argument are
@@ -265,11 +265,11 @@
 'REPLACEMENT CHARACTER'), or 'ignore' (just leave the character out of the
 Unicode result).  The following examples show the differences::
 
-    >>> unicode('\x80abc', errors='strict')
+    >>> unicode('\x80abc', errors='strict')     #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+        ...
     UnicodeDecodeError: 'ascii' codec can't decode byte 0x80 in position 0:
-                        ordinal not in range(128)
+    ordinal not in range(128)
     >>> unicode('\x80abc', errors='replace')
     u'\ufffdabc'
     >>> unicode('\x80abc', errors='ignore')
@@ -312,10 +312,11 @@
 operation; Python's default ASCII encoding will be used, so characters greater
 than 127 will cause an exception::
 
-    >>> s.find('Was\x9f')
+    >>> s.find('Was\x9f')                   #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeDecodeError: 'ascii' codec can't decode byte 0x9f in position 3: ordinal not in range(128)
+        ...
+    UnicodeDecodeError: 'ascii' codec can't decode byte 0x9f in position 3:
+    ordinal not in range(128)
     >>> s.find(u'Was\x9f')
     -1
 
@@ -333,10 +334,11 @@
     >>> u = unichr(40960) + u'abcd' + unichr(1972)
     >>> u.encode('utf-8')
     '\xea\x80\x80abcd\xde\xb4'
-    >>> u.encode('ascii')
+    >>> u.encode('ascii')                       #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeEncodeError: 'ascii' codec can't encode character '\ua000' in position 0: ordinal not in range(128)
+        ...
+    UnicodeEncodeError: 'ascii' codec can't encode character u'\ua000' in
+    position 0: ordinal not in range(128)
     >>> u.encode('ascii', 'ignore')
     'abcd'
     >>> u.encode('ascii', 'replace')
@@ -384,9 +386,9 @@
 ::
 
     >>> s = u"a\xac\u1234\u20ac\U00008000"
-               ^^^^ two-digit hex escape
-                   ^^^^^^ four-digit Unicode escape
-                               ^^^^^^^^^^ eight-digit Unicode escape
+    ... #      ^^^^ two-digit hex escape
+    ... #          ^^^^^^ four-digit Unicode escape
+    ... #                      ^^^^^^^^^^ eight-digit Unicode escape
     >>> for c in s:  print ord(c),
     ...
     97 172 4660 8364 32768

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 15:32:51 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 15:32:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_out_of_bou?=
 =?utf-8?q?nds_read_in_long=5Fnew=28=29_for_empty_bytes_with_an_explicit_b?=
 =?utf-8?q?ase=2E?=
Message-ID: <3XH3pC3dN3zQdg@mail.python.org>

http://hg.python.org/cpython/rev/3d5db784821f
changeset:   79004:3d5db784821f
branch:      3.2
parent:      79000:bc342cd7ed96
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 15:31:43 2012 +0200
summary:
  Fix out of bounds read in long_new() for empty bytes with an explicit base. int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359

files:
  Objects/longobject.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -4149,8 +4149,8 @@
             string = PyByteArray_AS_STRING(x);
         else
             string = PyBytes_AS_STRING(x);
-        if (strlen(string) != (size_t)size) {
-            /* We only see this if there's a null byte in x,
+        if (strlen(string) != (size_t)size || !size) {
+            /* We only see this if there's a null byte in x or x is empty,
                x is a bytes or buffer, *and* a base is given. */
             PyErr_Format(PyExc_ValueError,
                          "invalid literal for int() with base %d: %R",

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 15:33:23 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 15:33:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Fix_out_of_bounds_read_in_long=5Fnew=28=29_for_empty_byt?=
 =?utf-8?q?es_with_an_explicit_base=2E?=
Message-ID: <3XH3pq1Xy6zQbQ@mail.python.org>

http://hg.python.org/cpython/rev/2fa7c104f909
changeset:   79005:2fa7c104f909
parent:      79001:25e41fdc4e60
parent:      79004:3d5db784821f
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 15:32:06 2012 +0200
summary:
  Fix out of bounds read in long_new() for empty bytes with an explicit base. int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359

files:
  Objects/longobject.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -4285,8 +4285,8 @@
             string = PyByteArray_AS_STRING(x);
         else
             string = PyBytes_AS_STRING(x);
-        if (strlen(string) != (size_t)size) {
-            /* We only see this if there's a null byte in x,
+        if (strlen(string) != (size_t)size || !size) {
+            /* We only see this if there's a null byte in x or x is empty,
                x is a bytes or buffer, *and* a base is given. */
             PyErr_Format(PyExc_ValueError,
                          "invalid literal for int() with base %d: %R",

-- 
Repository URL: http://hg.python.org/cpython

From barry at python.org  Wed Sep 12 16:06:35 2012
From: barry at python.org (Barry Warsaw)
Date: Wed, 12 Sep 2012 10:06:35 -0400
Subject: [Python-checkins] [Python-Dev] cpython (merge 3.2 -> default):
 - Issue #15906: Fix a regression in argparse caused by the preceding change,
In-Reply-To: <CAOTb1wdj2ka71KA299a3eLGd=CnodCsazLubJXfV+X5Dj8wN+Q@mail.gmail.com>
References: <3XGqP73SvPzML8@mail.python.org>
	<CAOTb1wdj2ka71KA299a3eLGd=CnodCsazLubJXfV+X5Dj8wN+Q@mail.gmail.com>
Message-ID: <20120912100635.5ad0fe45@limelight.wooz.org>

On Sep 11, 2012, at 09:30 PM, Chris Jerdonek wrote:

>I didn't have time to respond Barry's e-mail from four hours ago
>before this was committed.  I think this change may be problematic.
>At the least, I think people should have an opportunity to air their
>specific concerns and talk through the implications.
>
>Also, from the discussion it seemed like the sentiment was leaning
>towards a different approach for the fix.
>
>I made a comment on the issue with some more extended remarks:
>
>http://bugs.python.org/msg170351

The alternative suggested fix breaks the test suite (yes I tried it).  So
maybe we have to go back and decide whether the original fix for #12776 and
#11839 is correct.

More detail in the tracker issue.

-Barry

From stefan at bytereef.org  Wed Sep 12 16:00:03 2012
From: stefan at bytereef.org (Stefan Krah)
Date: Wed, 12 Sep 2012 16:00:03 +0200
Subject: [Python-checkins] cpython (merge 3.2 -> default): Fix out of
 bounds read in long_new() for empty bytes with an explicit base.
In-Reply-To: <3XH3pq1Xy6zQbQ@mail.python.org>
References: <3XH3pq1Xy6zQbQ@mail.python.org>
Message-ID: <20120912140003.GA29860@sleipnir.bytereef.org>

christian.heimes <python-checkins at python.org> wrote:
>   Fix out of bounds read in long_new() for empty bytes with an explicit base. int(b'', somebase) calls PyLong_FromString() with char* of length 1 but the function accesses the first argument at offset 1. CID 715359
> 
> files:
>   Objects/longobject.c |  4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/Objects/longobject.c b/Objects/longobject.c
> --- a/Objects/longobject.c
> +++ b/Objects/longobject.c
> @@ -4285,8 +4285,8 @@
>              string = PyByteArray_AS_STRING(x);
>          else
>              string = PyBytes_AS_STRING(x);
> -        if (strlen(string) != (size_t)size) {
> -            /* We only see this if there's a null byte in x,
> +        if (strlen(string) != (size_t)size || !size) {
> +            /* We only see this if there's a null byte in x or x is empty,
>                 x is a bytes or buffer, *and* a base is given. */
>              PyErr_Format(PyExc_ValueError,
>                           "invalid literal for int() with base %d: %R",



This is a false positive: 

    Assumption: string == ""

    Call:  PyLong_FromString("", NULL, (int)base);

        Now: str == ""

        Coverity claims an invalid access at str[1]:

            if (str[0] == '0' &&
                ((base == 16 && (str[1] == 'x' || str[1] == 'X')) ||
                (base == 8  && (str[1] == 'o' || str[1] == 'O')) ||
                (base == 2  && (str[1] == 'b' || str[1] == 'B'))))

        But str[1] is never accessed due to shortcut evaluation.


Coverity appears to have serious problems with shortcut evaluations in many
places.


Stefan Krah



From python-checkins at python.org  Wed Sep 12 17:54:06 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 17:54:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Partly_revert_?=
 =?utf-8?q?ad3824a90261_and_add_comment_about_reference_ownership?=
Message-ID: <3XH6xB6s3RzQY5@mail.python.org>

http://hg.python.org/cpython/rev/2888356cdd4e
changeset:   79006:2888356cdd4e
branch:      3.2
parent:      79004:3d5db784821f
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 17:52:46 2012 +0200
summary:
  Partly revert ad3824a90261 and add comment about reference ownership

files:
  Python/symtable.c |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -37,7 +37,7 @@
     if (ste == NULL)
         goto fail;
     ste->ste_table = st;
-    ste->ste_id = k;
+    ste->ste_id = k; /* ste owns reference to k */
 
     ste->ste_name = name;
     Py_INCREF(name);
@@ -83,7 +83,6 @@
 
     return ste;
  fail:
-    Py_XDECREF(k);
     Py_XDECREF(ste);
     return NULL;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 17:54:08 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 17:54:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Partly_revert_ad3824a90261_and_add_comment_about_referen?=
 =?utf-8?q?ce_ownership?=
Message-ID: <3XH6xD2Z0xzQZQ@mail.python.org>

http://hg.python.org/cpython/rev/c1b950541e46
changeset:   79007:c1b950541e46
parent:      79005:2fa7c104f909
parent:      79006:2888356cdd4e
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 17:53:15 2012 +0200
summary:
  Partly revert ad3824a90261 and add comment about reference ownership

files:
  Python/symtable.c |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -33,7 +33,7 @@
     if (ste == NULL)
         goto fail;
     ste->ste_table = st;
-    ste->ste_id = k;
+    ste->ste_id = k; /* ste owns reference to k */
 
     ste->ste_name = name;
     Py_INCREF(name);
@@ -79,7 +79,6 @@
 
     return ste;
  fail:
-    Py_XDECREF(k);
     Py_XDECREF(ste);
     return NULL;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 17:54:09 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 17:54:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Partly_revert_?=
 =?utf-8?q?ad3824a90261_and_add_comment_about_reference_ownership?=
Message-ID: <3XH6xF5N0WzQZg@mail.python.org>

http://hg.python.org/cpython/rev/f19b84915c17
changeset:   79008:f19b84915c17
branch:      2.7
parent:      79003:befd752a3218
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 17:52:46 2012 +0200
summary:
  Partly revert ad3824a90261 and add comment about reference ownership

files:
  Python/symtable.c |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -31,7 +31,7 @@
     if (ste == NULL)
         goto fail;
     ste->ste_table = st;
-    ste->ste_id = k;
+    ste->ste_id = k; /* ste owns reference to k */
 
     ste->ste_name = name;
     Py_INCREF(name);
@@ -75,7 +75,6 @@
 
     return ste;
  fail:
-    Py_XDECREF(k);
     Py_XDECREF(ste);
     return NULL;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 17:59:09 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 17:59:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xlYW51cCAnaycg?=
 =?utf-8?q?when_the_creation_of_PySTEntryObject_fails=2E_ad3824a90261_used?=
 =?utf-8?q?_to?=
Message-ID: <3XH7315TZ7zM20@mail.python.org>

http://hg.python.org/cpython/rev/99ab7006e466
changeset:   79009:99ab7006e466
branch:      3.2
parent:      79006:2888356cdd4e
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 17:58:10 2012 +0200
summary:
  Cleanup 'k' when the creation of PySTEntryObject fails. ad3824a90261 used to decref 'k' in too many error cases.

files:
  Python/symtable.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -34,8 +34,10 @@
     if (k == NULL)
         goto fail;
     ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
-    if (ste == NULL)
+    if (ste == NULL) {
+        Py_DECREF(k);
         goto fail;
+    }
     ste->ste_table = st;
     ste->ste_id = k; /* ste owns reference to k */
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 17:59:11 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 17:59:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Cleanup_=27k=27_when_the_creation_of_PySTEntryObject_fai?=
 =?utf-8?q?ls=2E_ad3824a90261_used_to?=
Message-ID: <3XH7331w8czQY4@mail.python.org>

http://hg.python.org/cpython/rev/5b64fefbc16b
changeset:   79010:5b64fefbc16b
parent:      79007:c1b950541e46
parent:      79009:99ab7006e466
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 17:58:20 2012 +0200
summary:
  Cleanup 'k' when the creation of PySTEntryObject fails. ad3824a90261 used to decref 'k' in too many error cases.

files:
  Python/symtable.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -30,8 +30,10 @@
     if (k == NULL)
         goto fail;
     ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
-    if (ste == NULL)
+    if (ste == NULL) {
+        Py_DECREF(k);
         goto fail;
+    }
     ste->ste_table = st;
     ste->ste_id = k; /* ste owns reference to k */
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 17:59:12 2012
From: python-checkins at python.org (christian.heimes)
Date: Wed, 12 Sep 2012 17:59:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xlYW51cCAnaycg?=
 =?utf-8?q?when_the_creation_of_PySTEntryObject_fails=2E_ad3824a90261_used?=
 =?utf-8?q?_to?=
Message-ID: <3XH7344vjfzQbQ@mail.python.org>

http://hg.python.org/cpython/rev/128fa8755e55
changeset:   79011:128fa8755e55
branch:      2.7
parent:      79008:f19b84915c17
user:        Christian Heimes <christian at cheimes.de>
date:        Wed Sep 12 17:58:10 2012 +0200
summary:
  Cleanup 'k' when the creation of PySTEntryObject fails. ad3824a90261 used to decref 'k' in too many error cases.

files:
  Python/symtable.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -28,8 +28,10 @@
     if (k == NULL)
         goto fail;
     ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
-    if (ste == NULL)
+    if (ste == NULL) {
+        Py_DECREF(k);
         goto fail;
+    }
     ste->ste_table = st;
     ste->ste_id = k; /* ste owns reference to k */
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 18:02:46 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Wed, 12 Sep 2012 18:02:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315926=3A_Fix_cras?=
 =?utf-8?q?h_after_multiple_reinitializations_of_the_interpreter=2E?=
Message-ID: <3XH77B1Ft4zQYl@mail.python.org>

http://hg.python.org/cpython/rev/8d22d9528164
changeset:   79012:8d22d9528164
parent:      79005:2fa7c104f909
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Sep 12 18:01:36 2012 +0200
summary:
  Issue #15926: Fix crash after multiple reinitializations of the interpreter.

files:
  Misc/NEWS             |  2 ++
  Modules/posixmodule.c |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #15926: Fix crash after multiple reinitializations of the interpreter.
+
 - Issue #15895: Fix FILE pointer leak in one error branch of
   PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
   is false an and set_main_loader() fails.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -11852,7 +11852,6 @@
 
         /* initialize TerminalSize_info */
         PyStructSequence_InitType(&TerminalSizeType, &TerminalSize_desc);
-        Py_INCREF(&TerminalSizeType);
     }
 #if defined(HAVE_WAITID) && !defined(__APPLE__)
     Py_INCREF((PyObject*) &WaitidResultType);
@@ -11915,6 +11914,7 @@
 
 #endif /* __APPLE__ */
 
+    Py_INCREF(&TerminalSizeType);
     PyModule_AddObject(m, "terminal_size", (PyObject*) &TerminalSizeType);
 
     billion = PyLong_FromLong(1000000000);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 18:02:47 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Wed, 12 Sep 2012 18:02:47 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_Merge?=
Message-ID: <3XH77C4N0TzQc1@mail.python.org>

http://hg.python.org/cpython/rev/0191dd144be5
changeset:   79013:0191dd144be5
parent:      79012:8d22d9528164
parent:      79010:5b64fefbc16b
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Sep 12 18:02:18 2012 +0200
summary:
  Merge

files:
  Python/symtable.c |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -30,10 +30,12 @@
     if (k == NULL)
         goto fail;
     ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
-    if (ste == NULL)
+    if (ste == NULL) {
+        Py_DECREF(k);
         goto fail;
+    }
     ste->ste_table = st;
-    ste->ste_id = k;
+    ste->ste_id = k; /* ste owns reference to k */
 
     ste->ste_name = name;
     Py_INCREF(name);
@@ -79,7 +81,6 @@
 
     return ste;
  fail:
-    Py_XDECREF(k);
     Py_XDECREF(ste);
     return NULL;
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 21:31:54 2012
From: python-checkins at python.org (barry.warsaw)
Date: Wed, 12 Sep 2012 21:31:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_A_follow_up_fo?=
 =?utf-8?q?r_issue_=2315906=3A_change_the_test_for_calling_the_type_conver?=
 =?utf-8?q?sion?=
Message-ID: <3XHCmV6wxJzQYl@mail.python.org>

http://hg.python.org/cpython/rev/8f847f66a49f
changeset:   79014:8f847f66a49f
branch:      2.7
parent:      79011:128fa8755e55
user:        Barry Warsaw <barry at python.org>
date:        Wed Sep 12 14:34:50 2012 -0400
summary:
  A follow up for issue #15906: change the test for calling the type conversion
on the action's default, reverting it back to previous behavior.  Conversion
is only done on string defaults.

Add a test for this and another test that ensures such type conversions are
only called once.

files:
  Lib/argparse.py           |   2 +-
  Lib/test/test_argparse.py |  33 ++++++++++++++++++++++----
  2 files changed, 29 insertions(+), 6 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1948,7 +1948,7 @@
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
-                            isinstance(action, _StoreAction) and
+                            isinstance(action.default, basestring) and
                             hasattr(namespace, action.dest) and
                             action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4464,11 +4464,11 @@
         args = parser.parse_args('--foo spam!'.split())
         self.assertEqual(NS(foo='foo_converted'), args)
 
-# ================================================================
-# Check that the type function is called with a non-string default
-# ================================================================
-
-class TestTypeFunctionCallWithNonStringDefault(TestCase):
+# ==================================================================
+# Check semantics regarding the default argument and type conversion
+# ==================================================================
+
+class TestTypeFunctionCalledOnDefault(TestCase):
 
     def test_type_function_call_with_non_string_default(self):
         def spam(int_to_convert):
@@ -4478,8 +4478,31 @@
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo', type=spam, default=0)
         args = parser.parse_args([])
+        # foo should *not* be converted because its default is not a string.
+        self.assertEqual(NS(foo=0), args)
+
+    def test_type_function_call_with_string_default(self):
+        def spam(int_to_convert):
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='0')
+        args = parser.parse_args([])
+        # foo is converted because its default is a string.
         self.assertEqual(NS(foo='foo_converted'), args)
 
+    def test_no_double_type_conversion_of_default(self):
+        def extend(str_to_convert):
+            return str_to_convert + '*'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', type=extend, default='*')
+        args = parser.parse_args([])
+        # The test argument will be two stars, one coming from the default
+        # value and one coming from the type conversion being called exactly
+        # once.
+        self.assertEqual(NS(test='**'), args)
+
     def test_issue_15906(self):
         # Issue #15906: When action='append', type=str, default=[] are
         # providing, the dest value was the string representation "[]" when it

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 21:31:56 2012
From: python-checkins at python.org (barry.warsaw)
Date: Wed, 12 Sep 2012 21:31:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_A_follow_up_fo?=
 =?utf-8?q?r_issue_=2315906=3A_change_the_test_for_calling_the_type_conver?=
 =?utf-8?q?sion?=
Message-ID: <3XHCmX4BdczQZq@mail.python.org>

http://hg.python.org/cpython/rev/088b16bd6396
changeset:   79015:088b16bd6396
branch:      3.2
parent:      79009:99ab7006e466
user:        Barry Warsaw <barry at python.org>
date:        Wed Sep 12 14:34:50 2012 -0400
summary:
  A follow up for issue #15906: change the test for calling the type conversion
on the action's default, reverting it back to previous behavior.  Conversion
is only done on string defaults.

Add a test for this and another test that ensures such type conversions are
only called once.

files:
  Lib/argparse.py           |   2 +-
  Lib/test/test_argparse.py |  33 ++++++++++++++++++++++----
  2 files changed, 29 insertions(+), 6 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1957,7 +1957,7 @@
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
-                            isinstance(action, _StoreAction) and
+                            isinstance(action.default, basestring) and
                             hasattr(namespace, action.dest) and
                             action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4500,11 +4500,11 @@
         args = parser.parse_args('--foo spam!'.split())
         self.assertEqual(NS(foo='foo_converted'), args)
 
-# ================================================================
-# Check that the type function is called with a non-string default
-# ================================================================
-
-class TestTypeFunctionCallWithNonStringDefault(TestCase):
+# ==================================================================
+# Check semantics regarding the default argument and type conversion
+# ==================================================================
+
+class TestTypeFunctionCalledOnDefault(TestCase):
 
     def test_type_function_call_with_non_string_default(self):
         def spam(int_to_convert):
@@ -4514,8 +4514,31 @@
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo', type=spam, default=0)
         args = parser.parse_args([])
+        # foo should *not* be converted because its default is not a string.
+        self.assertEqual(NS(foo=0), args)
+
+    def test_type_function_call_with_string_default(self):
+        def spam(int_to_convert):
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='0')
+        args = parser.parse_args([])
+        # foo is converted because its default is a string.
         self.assertEqual(NS(foo='foo_converted'), args)
 
+    def test_no_double_type_conversion_of_default(self):
+        def extend(str_to_convert):
+            return str_to_convert + '*'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', type=extend, default='*')
+        args = parser.parse_args([])
+        # The test argument will be two stars, one coming from the default
+        # value and one coming from the type conversion being called exactly
+        # once.
+        self.assertEqual(NS(test='**'), args)
+
     def test_issue_15906(self):
         # Issue #15906: When action='append', type=str, default=[] are
         # providing, the dest value was the string representation "[]" when it

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 21:31:57 2012
From: python-checkins at python.org (barry.warsaw)
Date: Wed, 12 Sep 2012 21:31:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Update_merge_f?=
 =?utf-8?q?rom_2=2E7=3A_s/basetring/str?=
Message-ID: <3XHCmY75mfzQgC@mail.python.org>

http://hg.python.org/cpython/rev/5c754e7559ff
changeset:   79016:5c754e7559ff
branch:      3.2
user:        Barry Warsaw <barry at python.org>
date:        Wed Sep 12 14:42:34 2012 -0400
summary:
  Update merge from 2.7: s/basetring/str

files:
  Lib/argparse.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1957,7 +1957,7 @@
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
-                            isinstance(action.default, basestring) and
+                            isinstance(action.default, str) and
                             hasattr(namespace, action.dest) and
                             action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 21:31:59 2012
From: python-checkins at python.org (barry.warsaw)
Date: Wed, 12 Sep 2012 21:31:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_3=2E2_fix_updates_and_tests_for_issue_=2315906=2E?=
Message-ID: <3XHCmb2rrhzQcm@mail.python.org>

http://hg.python.org/cpython/rev/9ae9326cd79a
changeset:   79017:9ae9326cd79a
parent:      79013:0191dd144be5
parent:      79016:5c754e7559ff
user:        Barry Warsaw <barry at python.org>
date:        Wed Sep 12 15:31:38 2012 -0400
summary:
  Merge 3.2 fix updates and tests for issue #15906.

files:
  Lib/argparse.py           |   2 +-
  Lib/test/test_argparse.py |  33 ++++++++++++++++++++++----
  2 files changed, 29 insertions(+), 6 deletions(-)


diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1961,7 +1961,7 @@
                     # twice (which may fail) if the argument was given, but
                     # only if it was defined already in the namespace
                     if (action.default is not None and
-                        isinstance(action, _StoreAction) and
+                        isinstance(action.default, str) and
                         hasattr(namespace, action.dest) and
                         action.default is getattr(namespace, action.dest)):
                         setattr(namespace, action.dest,
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -4591,11 +4591,11 @@
         args = parser.parse_args('--foo spam!'.split())
         self.assertEqual(NS(foo='foo_converted'), args)
 
-# ================================================================
-# Check that the type function is called with a non-string default
-# ================================================================
-
-class TestTypeFunctionCallWithNonStringDefault(TestCase):
+# ==================================================================
+# Check semantics regarding the default argument and type conversion
+# ==================================================================
+
+class TestTypeFunctionCalledOnDefault(TestCase):
 
     def test_type_function_call_with_non_string_default(self):
         def spam(int_to_convert):
@@ -4605,8 +4605,31 @@
         parser = argparse.ArgumentParser()
         parser.add_argument('--foo', type=spam, default=0)
         args = parser.parse_args([])
+        # foo should *not* be converted because its default is not a string.
+        self.assertEqual(NS(foo=0), args)
+
+    def test_type_function_call_with_string_default(self):
+        def spam(int_to_convert):
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='0')
+        args = parser.parse_args([])
+        # foo is converted because its default is a string.
         self.assertEqual(NS(foo='foo_converted'), args)
 
+    def test_no_double_type_conversion_of_default(self):
+        def extend(str_to_convert):
+            return str_to_convert + '*'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', type=extend, default='*')
+        args = parser.parse_args([])
+        # The test argument will be two stars, one coming from the default
+        # value and one coming from the type conversion being called exactly
+        # once.
+        self.assertEqual(NS(test='**'), args)
+
     def test_issue_15906(self):
         # Issue #15906: When action='append', type=str, default=[] are
         # providing, the dest value was the string representation "[]" when it

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 12 21:37:55 2012
From: python-checkins at python.org (stefan.krah)
Date: Wed, 12 Sep 2012 21:37:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315599=3A_FreeBSD_?=
 =?utf-8?q?on_KVM_cannot_handle_a_very_low_switch_interval=2E?=
Message-ID: <3XHCvR4YdZzQW3@mail.python.org>

http://hg.python.org/cpython/rev/9b40d018e4cf
changeset:   79018:9b40d018e4cf
user:        Stefan Krah <skrah at bytereef.org>
date:        Wed Sep 12 21:30:09 2012 +0200
summary:
  Issue #15599: FreeBSD on KVM cannot handle a very low switch interval.

files:
  Lib/test/test_threaded_import.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -225,9 +225,11 @@
 @reap_threads
 def test_main():
     old_switchinterval = None
+    # Issue #15599: FreeBSD/KVM cannot handle gil_interval == 1.
+    new_switchinterval = 0.00001 if 'freebsd' in sys.platform else 0.00000001
     try:
         old_switchinterval = sys.getswitchinterval()
-        sys.setswitchinterval(0.00000001)
+        sys.setswitchinterval(new_switchinterval)
     except AttributeError:
         pass
     try:

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Thu Sep 13 05:57:27 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 13 Sep 2012 05:57:27 +0200
Subject: [Python-checkins] Daily reference leaks (9b40d018e4cf): sum=0
Message-ID: <E1TC0YR-0000Vh-O8@ap.vmr.nerim.net>

results for 9b40d018e4cf on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogRSBmfj', '-x']

From python-checkins at python.org  Thu Sep 13 18:28:18 2012
From: python-checkins at python.org (richard.oudkerk)
Date: Thu, 13 Sep 2012 18:28:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315881=3A_Clarify_?=
	=?utf-8?q?comment_in_exit_function?=
Message-ID: <3XHlfB6GngzQkH@mail.python.org>

http://hg.python.org/cpython/rev/2b79b4848f44
changeset:   79019:2b79b4848f44
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Thu Sep 13 17:27:15 2012 +0100
summary:
  Issue #15881: Clarify comment in exit function

files:
  Lib/multiprocessing/util.py |  19 +++++++++++--------
  1 files changed, 11 insertions(+), 8 deletions(-)


diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -290,14 +290,17 @@
 
         if current_process() is not None:
             # We check if the current process is None here because if
-            # it's None, any call to ``active_children()`` will throw an
-            # AttributeError (active_children winds up trying to get
-            # attributes from util._current_process).  This happens in a
-            # variety of shutdown circumstances that are not well-understood
-            # because module-scope variables are not apparently supposed to
-            # be destroyed until after this function is called.  However,
-            # they are indeed destroyed before this function is called.  See
-            # issues #9775 and #15881.  Also related: #4106, #9205, and #9207.
+            # it's None, any call to ``active_children()`` will throw
+            # an AttributeError (active_children winds up trying to
+            # get attributes from util._current_process).  One
+            # situation where this can happen is if someone has
+            # manipulated sys.modules, causing this module to be
+            # garbage collected.  The destructor for the module type
+            # then replaces all values in the module dict with None.
+            # For instance, after setuptools runs a test it replaces
+            # sys.modules with a copy created earlier.  See issues
+            # #9775 and #15881.  Also related: #4106, #9205, and
+            # #9207.
 
             for p in active_children():
                 if p._daemonic:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 14 01:00:36 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 14 Sep 2012 01:00:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1NDM3LCAjMTU0?=
 =?utf-8?q?39=3A_merge_Doc/ACKS=2Etxt_with_Misc/ACKS_and_modify_Doc/about?=
 =?utf-8?q?=2Erst?=
Message-ID: <3XHwLr547zzQjv@mail.python.org>

http://hg.python.org/cpython/rev/76dd082d332e
changeset:   79022:76dd082d332e
branch:      2.7
parent:      79014:8f847f66a49f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 14 01:58:33 2012 +0300
summary:
  #15437, #15439: merge Doc/ACKS.txt with Misc/ACKS and modify Doc/about.rst accordingly.

files:
  Doc/ACKS.txt  |  231 --------------------------------------
  Doc/about.rst |    9 +-
  Misc/ACKS     |  119 ++++++++++++++++++-
  3 files changed, 122 insertions(+), 237 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
deleted file mode 100644
--- a/Doc/ACKS.txt
+++ /dev/null
@@ -1,231 +0,0 @@
-Contributors to the Python Documentation
-----------------------------------------
-
-This section lists people who have contributed in some way to the Python
-documentation.  It is probably not complete -- if you feel that you or
-anyone else should be on this list, please let us know (send email to
-docs at python.org), and we'll be glad to correct the problem.
-
-.. acks::
-
-   * Aahz
-   * Michael Abbott
-   * Steve Alexander
-   * Jim Ahlstrom
-   * Fred Allen
-   * A. Amoroso
-   * Pehr Anderson
-   * Oliver Andrich
-   * Heidi Annexstad
-   * Jes?s Cea Avi?n
-   * Manuel Balsera
-   * Daniel Barclay
-   * Chris Barker
-   * Don Bashford
-   * Anthony Baxter
-   * Alexander Belopolsky
-   * Bennett Benson
-   * Jonathan Black
-   * Robin Boerdijk
-   * Michal Bozon
-   * Aaron Brancotti
-   * Georg Brandl
-   * Keith Briggs
-   * Ian Bruntlett
-   * Lee Busby
-   * Arnaud Calmettes
-   * Lorenzo M. Catucci
-   * Carl Cerecke
-   * Mauro Cicognini
-   * Gilles Civario
-   * Mike Clarkson
-   * Steve Clift
-   * Dave Cole
-   * Matthew Cowles
-   * Jeremy Craven
-   * Andrew Dalke
-   * Ben Darnell
-   * L. Peter Deutsch
-   * Robert Donohue
-   * Fred L. Drake, Jr.
-   * Josip Dzolonga
-   * Jeff Epler
-   * Michael Ernst
-   * Blame Andy Eskilsson
-   * Carey Evans
-   * Martijn Faassen
-   * Carl Feynman
-   * Dan Finnie
-   * Hern?n Mart?nez Foffani
-   * Stefan Franke
-   * Jim Fulton
-   * Peter Funk
-   * Lele Gaifax
-   * Matthew Gallagher
-   * Gabriel Genellina
-   * Ben Gertzfield
-   * Nadim Ghaznavi
-   * Jonathan Giddy
-   * Shelley Gooch
-   * Nathaniel Gray
-   * Grant Griffin
-   * Thomas Guettler
-   * Anders Hammarquist
-   * Mark Hammond
-   * Harald Hanche-Olsen
-   * Manus Hand
-   * Gerhard H?ring
-   * Travis B. Hartwell
-   * Tim Hatch
-   * Janko Hauser
-   * Ben Hayden
-   * Thomas Heller
-   * Bernhard Herzog
-   * Magnus L. Hetland
-   * Konrad Hinsen
-   * Stefan Hoffmeister
-   * Albert Hofkamp
-   * Gregor Hoffleit
-   * Steve Holden
-   * Thomas Holenstein
-   * Gerrit Holl
-   * Rob Hooft
-   * Brian Hooper
-   * Randall Hopper
-   * Mike Hoy
-   * Michael Hudson
-   * Eric Huss
-   * Jeremy Hylton
-   * Roger Irwin
-   * Jack Jansen
-   * Philip H. Jensen
-   * Pedro Diaz Jimenez
-   * Kent Johnson
-   * Lucas de Jonge
-   * Andreas Jung
-   * Robert Kern
-   * Jim Kerr
-   * Jan Kim
-   * Kamil Kisiel
-   * Greg Kochanski
-   * Guido Kollerie
-   * Peter A. Koren
-   * Daniel Kozan
-   * Andrew M. Kuchling
-   * Dave Kuhlman
-   * Erno Kuusela
-   * Ross Lagerwall
-   * Thomas Lamb
-   * Detlef Lannert
-   * Piers Lauder
-   * Glyph Lefkowitz
-   * Robert Lehmann
-   * Marc-Andr? Lemburg
-   * Ross Light
-   * Ulf A. Lindgren
-   * Everett Lipman
-   * Mirko Liss
-   * Martin von L?wis
-   * Fredrik Lundh
-   * Jeff MacDonald
-   * John Machin
-   * Andrew MacIntyre
-   * Vladimir Marangozov
-   * Vincent Marchetti
-   * Westley Mart?nez
-   * Laura Matson
-   * Daniel May
-   * Rebecca McCreary
-   * Doug Mennella
-   * Paolo Milani
-   * Skip Montanaro
-   * Paul Moore
-   * Ross Moore
-   * Sjoerd Mullender
-   * Dale Nagata
-   * Michal Nowikowski
-   * Steffen Daode Nurpmeso
-   * Ng Pheng Siong
-   * Koray Oner
-   * Tomas Oppelstrup
-   * Denis S. Otkidach
-   * Zooko O'Whielacronx
-   * Shriphani Palakodety
-   * William Park
-   * Joonas Paalasmaa
-   * Harri Pasanen
-   * Bo Peng
-   * Tim Peters
-   * Benjamin Peterson
-   * Christopher Petrilli
-   * Justin D. Pettit
-   * Chris Phoenix
-   * Fran?ois Pinard
-   * Paul Prescod
-   * Eric S. Raymond
-   * Edward K. Ream
-   * Terry J. Reedy
-   * Sean Reifschneider
-   * Bernhard Reiter
-   * Armin Rigo
-   * Wes Rishel
-   * Armin Ronacher
-   * Jim Roskind
-   * Guido van Rossum
-   * Donald Wallace Rouse II
-   * Mark Russell
-   * Nick Russo
-   * Chris Ryland
-   * Constantina S.
-   * Hugh Sasse
-   * Bob Savage
-   * Scott Schram
-   * Neil Schemenauer
-   * Barry Scott
-   * Joakim Sernbrant
-   * Justin Sheehy
-   * Charlie Shepherd
-   * Yue Shuaijie
-   * Michael Simcich
-   * Ionel Simionescu
-   * Michael Sloan
-   * Gregory P. Smith
-   * Roy Smith
-   * Clay Spence
-   * Nicholas Spies
-   * Tage Stabell-Kulo
-   * Frank Stajano
-   * Anthony Starks
-   * Greg Stein
-   * Peter Stoehr
-   * Mark Summerfield
-   * Reuben Sumner
-   * Kalle Svensson
-   * Jim Tittsler
-   * David Turner
-   * Sandro Tosi
-   * Ville Vainio
-   * Martijn Vries
-   * Charles G. Waldman
-   * Greg Ward
-   * Barry Warsaw
-   * Corran Webster
-   * Glyn Webster
-   * Bob Weiner
-   * Eddy Welbourne
-   * Jeff Wheeler
-   * Mats Wichmann
-   * Gerry Wiener
-   * Timothy Wild
-   * Paul Winkler
-   * Collin Winter
-   * Blake Winton
-   * Dan Wolfe
-   * Adam Woodbeck
-   * Steven Work
-   * Thomas Wouters
-   * Ka-Ping Yee
-   * Rory Yorke
-   * Moshe Zadka
-   * Milan Zamazal
-   * Cheng Zhang
diff --git a/Doc/about.rst b/Doc/about.rst
--- a/Doc/about.rst
+++ b/Doc/about.rst
@@ -29,8 +29,13 @@
 See :ref:`reporting-bugs` for information how to report bugs in this
 documentation, or Python itself.
 
-.. including the ACKS file here so that it can be maintained separately
-.. include:: ACKS.txt
+
+Contributors to the Python Documentation
+----------------------------------------
+
+Many people have contributed to the Python language, the Python standard
+library, and the Python documentation.  See :source:`Misc/ACKS` in the Python
+source distribution for a partial list of contributors.
 
 It is only with the input and contributions of the Python community
 that Python has such wonderful documentation -- Thank You!
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -11,25 +11,33 @@
 PS: In the standard Python distribution, this file is encoded in UTF-8
 and the list is in rough alphabetical order by last names.
 
+Aahz
+Michael Abbott
 David Abrahams
 Jim Ahlstrom
 Farhan Ahmad
 Nir Aides
 Yaniv Aknin
 Jyrki Alakuijala
+Steve Alexander
+Fred Allen
 Billy G. Allie
 Kevin Altis
 Joe Amenta
+A. Amoroso
 Mark Anacker
 Anders Andersen
 John Anderson
+Pehr Anderson
 Erik Anders?n
 Oliver Andrich
 Ross Andrus
+Heidi Annexstad
 ?ric Araujo
 Jason Asbahr
 David Ascher
 Chris AtLee
+Jes?s Cea Avi?n
 John Aycock
 Jan-Hein B?hrman
 Donovan Baarda
@@ -41,8 +49,10 @@
 Greg Ball
 Luigi Ballabio
 Jeff Balogh
+Manuel Balsera
 Matt Bandy
 Michael J. Barber
+Daniel Barclay
 Chris Barker
 Anton Barkovsky
 Nick Barnes
@@ -51,6 +61,7 @@
 Cesar Eduardo Barros
 Des Barry
 Ulf Bartelt
+Don Bashford
 Nick Bastin
 Jeff Bauer
 Mike Bayer
@@ -69,6 +80,7 @@
 Alexander ?????? Belopolsky
 Andrew Bennetts
 Andy Bensky
+Bennett Benson
 Michel Van den Bergh
 Eric Beser
 Steven Bethard
@@ -80,6 +92,7 @@
 Philippe Biondi
 Stuart Bishop
 Roy Bixler
+Jonathan Black
 Mike Bland
 Martin Bless
 Pablo Bleyer
@@ -88,6 +101,7 @@
 Finn Bock
 Paul Boddie
 Matthew Boedicker
+Robin Boerdijk
 David Bolen
 Gawain Bolton
 Gregory Bond
@@ -96,13 +110,16 @@
 Eric Bouck
 Thierry Bousch
 Sebastian Boving
+Michal Bozon
 Jeff Bradberry
+Aaron Brancotti
 Monty Brandenberg
 Georg Brandl
 Christopher Brannon
 Terrence Brannon
 Dave Brennan
 Tom Bridgman
+Keith Briggs
 Richard Brodie
 Michael Broghton
 Daniel Brotsky
@@ -111,6 +128,7 @@
 Oleg Broytmann
 Dave Brueck
 Francisco Mart?n Brugu?
+Ian Bruntlett
 Stan Bubrouski
 Erik de Bueger
 Dick Bulterman
@@ -134,6 +152,7 @@
 Donn Cave
 Charles Cazabon
 Per Cederqvist
+Carl Cerecke
 Octavian Cerna
 Pascal Chambon
 John Chandler
@@ -151,8 +170,10 @@
 Anders Chrigstr?m
 Tom Christiansen
 Vadim Chugunov
+Mauro Cicognini
 David Cinege
 Craig Citro
+Gilles Civario
 Mike Clarkson
 Andrew Clegg
 Brad Clements
@@ -180,6 +201,7 @@
 Matthew Dixon Cowles
 Ryan Coyner
 Christopher A. Craig
+Jeremy Craven
 Laura Creighton
 Simon Cross
 Drew Csillag
@@ -202,6 +224,7 @@
 Arnaud Delobelle
 Erik Demaine
 John Dennis
+L. Peter Deutsch
 Roger Dev
 Philippe Devalkeneer
 Raghuram Devarakonda
@@ -215,6 +238,7 @@
 Daniel Dittmar
 Jaromir Dolecek
 Ismail Donmez
+Robert Donohue
 Marcos Donolo
 Dima Dorfman
 Cesar Douady
@@ -263,10 +287,12 @@
 Mark Favas
 Niels Ferguson
 Sebastian Fernandez
+Carl Feynman
 Vincent Fiack
 Tomer Filiba
 Jeffrey Finkelstein
 Russell Finn
+Dan Finnie
 Nils Fischbeck
 Frederik Fix
 Matt Fleming
@@ -276,6 +302,7 @@
 Amaury Forgeot d'Arc
 Doug Fort
 John Fouhy
+Stefan Franke
 Martin Franklin
 Robin Friedrich
 Bradley Froehle
@@ -293,6 +320,7 @@
 Lele Gaifax
 Santiago Gala
 Yitzchak Gale
+Matthew Gallagher
 Quentin Gallet-Gilles
 Raymund Galvin
 Nitin Ganatra
@@ -308,6 +336,7 @@
 Gabriel Genellina
 Christos Georgiou
 Ben Gertzfield
+Nadim Ghaznavi
 Dinu Gherman
 Jonathan Giddy
 Johannes Gijsbers
@@ -315,14 +344,18 @@
 Christoph Gohlke
 Tim Golden
 Chris Gonnerman
+Shelley Gooch
 David Goodger
 Hans de Graaff
+Nathaniel Gray
 Eddy De Greef
+Grant Griffin
 Duncan Grisby
 Fabian Groffen
 John S. Gruber
 Dag Gruneau
 Filip Gruszczy?ski
+Thomas Guettler
 Michael Guravage
 Lars Gust?bel
 Thomas G?ttler
@@ -335,7 +368,9 @@
 Bob Halley
 Jesse Hallio
 Jun Hamano
+Anders Hammarquist
 Mark Hammond
+Harald Hanche-Olsen
 Manus Hand
 Milton L. Hankins
 Stephen Hansen
@@ -343,9 +378,13 @@
 Lynda Hardman
 Derek Harland
 Jason Harper
+Travis B. Hartwell
 Larry Hastings
+Tim Hatch
 Shane Hathaway
+Janko Hauser
 Rycharde Hawkes
+Ben Hayden
 Jochen Hayek
 Christian Heimes
 Thomas Heller
@@ -371,10 +410,13 @@
 Joerg-Cyril Hoehle
 Gregor Hoffleit
 Chris Hoffman
+Stefan Hoffmeister
 Albert Hofkamp
 Tomas Hoger
 Jonathan Hogg
+Steve Holden
 Akintayo Holder
+Thomas Holenstein
 Gerrit Holl
 Shane Holloway
 Rune Holm
@@ -389,6 +431,7 @@
 Jan Hosang
 Ken Howard
 Brad Howes
+Mike Hoy
 Chih-Hao Huang
 Lawrence Hudson
 Michael Hudson
@@ -407,6 +450,7 @@
 Tony Ingraldi
 John Interrante
 Bob Ippolito
+Roger Irwin
 Atsuo Ishimoto
 Paul Jackson
 Ben Jackson
@@ -419,12 +463,15 @@
 Thomas Jarosch
 Drew Jenkins
 Flemming Kj?r Jensen
+Philip H. Jensen
 Philip Jenvey
 Chris Jerdonek
 Jiba
+Pedro Diaz Jimenez
 Orjan Johansen
 Fredrik Johansson
 Gregory K. Johnson
+Kent Johnson
 Simon Johnston
 Nicolas Joly
 Evan Jones
@@ -450,17 +497,20 @@
 Ryan Kelly
 Robert Kern
 Randall Kern
+Jim Kerr
 Magnus Kessler
 Lawrence Kesteloot
 Rafe Kettler
 Vivek Khera
-Akira Kitada
 Mads Kiilerich
+Jan Kim
 Taek Joo Kim
 W. Trevor King
 Paul Kippes
 Steve Kirsch
 Sebastian Kirsche
+Kamil Kisiel
+Akira Kitada
 Ron Klatchko
 Bastian Kleineidam
 Bob Kline
@@ -474,7 +524,10 @@
 Greg Kochanski
 Damon Kohler
 Marko Kohtala
+Guido Kollerie
+Peter A. Koren
 Joseph Koshy
+Daniel Kozan
 Jerzy Kozera
 Maksim Kozyarchuk
 Stefan Krah
@@ -488,10 +541,13 @@
 Ivan Krsti?
 Andrew Kuchling
 Ralf W. Grosse-Kunstleve
+Dave Kuhlman
 Vladimir Kushnir
+Erno Kuusela
 Kirill Kuzminykh (?????? ?????????)
 Ross Lagerwall
 Cameron Laird
+Thomas Lamb
 Torsten Landschoff
 ?ukasz Langa
 Tino Lange
@@ -508,6 +564,7 @@
 Thomas Lee
 Christopher Lee
 Luc Lefebvre
+Glyph Lefkowitz
 Vincent Legoll
 Kip Lehman
 Joerg Lehmann
@@ -515,7 +572,7 @@
 Petri Lehtinen
 Luke Kenneth Casson Leighton
 Tshepang Lekhonkhobe
-Marc-Andre Lemburg
+Marc-Andr? Lemburg
 John Lenton
 Christopher Tur Lesniewski-Laas
 Mark Levinson
@@ -526,10 +583,13 @@
 Shawn Ligocki
 Martin Ligr
 Christopher Lindblad
+Ulf A. Lindgren
 Bj?rn Lindqvist
 Per Lindqvist
 Eric Lindvall
 Gregor Lingl
+Everett Lipman
+Mirko Liss
 Nick Lockwood
 Stephanie Lockwood
 Anne Lord
@@ -545,6 +605,8 @@
 Jim Lynch
 Mikael Lyngvig
 Martin von L?wis
+Jeff MacDonald
+John Machin
 Andrew I MacIntyre
 Tim MacKenzie
 Nick Maclaren
@@ -553,17 +615,22 @@
 David Malcolm
 Ken Manheimer
 Vladimir Marangozov
+Vincent Marchetti
 David Marek
 Doug Marien
 Sven Marnach
 Alex Martelli
 Anthony Martin
+Westley Mart?nez
 S?bastien Martini
 Roger Masse
 Nick Mathewson
+Laura Matson
 Graham Matthews
 Dieter Maurer
+Daniel May
 Arnaud Mazin
+Rebecca McCreary
 Kirk McDonald
 Chris McDonough
 Greg McFarlane
@@ -578,6 +645,7 @@
 Bill van Melle
 Lucas Prado Melo
 Ezio Melotti
+Doug Mennella
 Brian Merrell
 Luke Mewburn
 Carl Meyer
@@ -587,6 +655,7 @@
 Tom Middleton
 Stan Mihai
 Aristotelis Mikropoulos
+Paolo Milani
 Damien Miller
 Chad Miller
 Jason V. Miller
@@ -600,6 +669,7 @@
 The Dragon De Monsyne
 Skip Montanaro
 Paul Moore
+Ross Moore
 Derek Morr
 James A Morrison
 Alessandro Moura
@@ -611,6 +681,7 @@
 Neil Muller
 R. David Murray
 Piotr Meyer
+Dale Nagata
 John Nagle
 Takahiro Nakayama
 Travers Naran
@@ -639,11 +710,14 @@
 Nigel O'Brian
 Kevin O'Connor
 Tim O'Malley
+Zooko O'Whielacronx
 Pascal Oberndoerfer
 Jeffrey Ollie
 Adam Olsen
 Grant Olson
+Koray Oner
 Piet van Oostrum
+Tomas Oppelstrup
 Jason Orendorff
 Douglas Orr
 Michele Orr?
@@ -652,6 +726,8 @@
 Michael Otteneder
 R. M. Oudkerk
 Russel Owen
+Joonas Paalasmaa
+Shriphani Palakodety
 Ondrej Palkovsky
 Mike Pall
 Todd R. Palmer
@@ -661,11 +737,13 @@
 Peter Parente
 Alexandre Parenteau
 Dan Parisien
+William Park
 Harri Pasanen
 Randy Pausch
 Samuele Pedroni
 Marcel van der Peijl
 Steven Pemberton
+Bo Peng
 Santiago Peres?n
 Mark Perrego
 Trevor Perrin
@@ -674,6 +752,7 @@
 Benjamin Peterson
 Chris Petrilli
 Bjorn Pettersen
+Justin D. Pettit
 Geoff Philbrick
 Gavrie Philipson
 Adrian Phillips
@@ -705,12 +784,12 @@
 Brodie Rao
 Antti Rasinen
 Sridhar Ratnakumar
-Eric Raymond
+Eric S. Raymond
 Edward K. Ream
 Chris Rebert
 Marc Recht
 John Redford
-Terry Reedy
+Terry J. Reedy
 Gareth Rees
 Steve Reeves
 Lennart Regebro
@@ -727,6 +806,7 @@
 Nicholas Riley
 Jean-Claude Rimbault
 Vlad Riscutia
+Wes Rishel
 Juan M. Bello Rivas
 Davide Rizzo
 Anthony Roach
@@ -742,6 +822,7 @@
 Case Roole
 Timothy Roscoe
 Jim Roskind
+Guido van Rossum
 Just van Rossum
 Hugo van Rossum
 Saskia van Rossum
@@ -757,6 +838,8 @@
 Sam Rushing
 Mark Russell
 Nick Russo
+Chris Ryland
+Constantina S.
 S?bastien Sabl?
 Suman Saha
 Hajime Saitou
@@ -766,6 +849,8 @@
 Ilya Sandler
 Mark Sapiro
 Ty Sarna
+Hugh Sasse
+Bob Savage
 Ben Sayer
 sbt
 Marco Scataglini
@@ -778,6 +863,7 @@
 Michael Schneider
 Peter Schneider-Kamp
 Arvin Schnell
+Scott Schram
 Chad J. Schroeder
 Sam Schulenburg
 Stefan Schwarzer
@@ -789,6 +875,7 @@
 ?iga Seilnach
 Fred Sells
 Jiwon Seo
+Joakim Sernbrant
 Roger Serwy
 Jerry Seutter
 Denis Severson
@@ -796,6 +883,8 @@
 Ha Shao
 Mark Shannon
 Richard Shapiro
+Justin Sheehy
+Charlie Shepherd
 Bruce Sherwood
 Alexander Shigin
 Pete Shinners
@@ -803,31 +892,40 @@
 John W. Shipman
 Joel Shprentz
 Itamar Shtull-Trauring
+Yue Shuaijie
 Eric Siegerman
 Paul Sijben
 Tim Silk
+Michael Simcich
+Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
 Janne Sinkkonen
+Ng Pheng Siong
 George Sipe
 J. Sipprell
 Kragen Sitaker
+Michael Sloan
 Eric V. Smith
 Christopher Smith
 Gregory P. Smith
+Roy Smith
 Rafal Smotrzyk
 Dirk Soede
 Paul Sokolovsky
 Cody Somerville
 Clay Spence
 Stefan Sperling
+Nicholas Spies
 Per Spilling
 Joshua Spoerri
 Noah Spurrier
 Nathan Srebro
 RajGopal Srinivasan
+Tage Stabell-Kulo
 Quentin Stafford-Fraser
 Frank Stajano
+Anthony Starks
 Oliver Steele
 Greg Stein
 Chris Stern
@@ -844,6 +942,7 @@
 Andreas St?hrk
 Nathan Sullivan
 Mark Summerfield
+Reuben Sumner
 Hisao Suzuki
 Andrew Svetlov
 Kalle Svensson
@@ -871,6 +970,7 @@
 Oren Tirosh
 Jason Tishler
 Christian Tismer
+Jim Tittsler
 Frank J. Tobin
 R Lindsay Todd
 Bennett Todd
@@ -881,6 +981,7 @@
 John Tromp
 Jason Trowbridge
 Anthony Tuininga
+David Turner
 Stephen Turner
 Theodore Turocy
 Bill Tutt
@@ -890,6 +991,7 @@
 Roger Upole
 Michael Urman
 Hector Urtubia
+Ville Vainio
 Andi Vajda
 Case Van Horsen
 Kyle VanderBeek
@@ -907,6 +1009,7 @@
 Norman Vine
 Frank Visser
 Johannes Vogel
+Martijn Vries
 Niki W. Waibel
 Wojtek Walczak
 Charles Waldman
@@ -921,8 +1024,10 @@
 Aaron Watters
 Henrik Weber
 Corran Webster
+Glyn Webster
 Stefan Wehr
 Zack Weinberg
+Bob Weiner
 Edward Welbourne
 Cliff Wells
 Rickard Westman
@@ -935,6 +1040,7 @@
 Gerry Wiener
 Frank Wierzbicki
 Bryce "Zooko" Wilcox-O'Hearn
+Timothy Wild
 Jason Williams
 John Williams
 Sue Williams
@@ -943,6 +1049,7 @@
 Frank Willison
 Greg V. Wilson
 J Derek Wilson
+Paul Winkler
 Jody Winston
 Collin Winter
 Dik Winter
@@ -956,6 +1063,8 @@
 Klaus-Juergen Wolf
 Dan Wolfe
 Richard Wolff
+Adam Woodbeck
+Steven Work
 Darren Worrall
 Gordon Worley
 Thomas Wouters
@@ -966,6 +1075,7 @@
 Ka-Ping Yee
 Bob Yodlowski
 Danny Yoo
+Rory Yorke
 George Yoshida
 Masazumi Yoshikawa
 Arnaud Ysmal
@@ -976,5 +1086,6 @@
 Mike Zarnstorff
 Siebren van der Zee
 Uwe Zessin
+Cheng Zhang
 Tarek Ziad?
 Peter ?strand

-- 
Repository URL: http://hg.python.org/cpython

From chris.jerdonek at gmail.com  Fri Sep 14 01:22:09 2012
From: chris.jerdonek at gmail.com (Chris Jerdonek)
Date: Thu, 13 Sep 2012 16:22:09 -0700
Subject: [Python-checkins] cpython (2.7): #15437,
 #15439: merge Doc/ACKS.txt with Misc/ACKS and modify Doc/about.rst
In-Reply-To: <3XHwLr547zzQjv@mail.python.org>
References: <3XHwLr547zzQjv@mail.python.org>
Message-ID: <CAOTb1wdkqmvHdYx_LbX=qz5tCKQKYg+WJrOKydtCELkE14-HfA@mail.gmail.com>

On Thu, Sep 13, 2012 at 4:00 PM, ezio.melotti
<python-checkins at python.org> wrote:
> http://hg.python.org/cpython/rev/76dd082d332e
> changeset:   79022:76dd082d332e
> branch:      2.7
> parent:      79014:8f847f66a49f
> user:        Ezio Melotti <ezio.melotti at gmail.com>
> date:        Fri Sep 14 01:58:33 2012 +0300
> summary:
>   #15437, #15439: merge Doc/ACKS.txt with Misc/ACKS and modify Doc/about.rst accordingly.

I also contributed to this. :)

--Chris



> files:
>   Doc/ACKS.txt  |  231 --------------------------------------
>   Doc/about.rst |    9 +-
>   Misc/ACKS     |  119 ++++++++++++++++++-
>   3 files changed, 122 insertions(+), 237 deletions(-)
>
>
> diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
> deleted file mode 100644
> --- a/Doc/ACKS.txt
> +++ /dev/null
> @@ -1,231 +0,0 @@
> -Contributors to the Python Documentation
> -----------------------------------------
> -
> -This section lists people who have contributed in some way to the Python
> -documentation.  It is probably not complete -- if you feel that you or
> -anyone else should be on this list, please let us know (send email to
> -docs at python.org), and we'll be glad to correct the problem.
> -
> -.. acks::
> -
> -   * Aahz
> -   * Michael Abbott
> -   * Steve Alexander
> -   * Jim Ahlstrom
> -   * Fred Allen
> -   * A. Amoroso
> -   * Pehr Anderson
> -   * Oliver Andrich
> -   * Heidi Annexstad
> -   * Jes?s Cea Avi?n
> -   * Manuel Balsera
> -   * Daniel Barclay
> -   * Chris Barker
> -   * Don Bashford
> -   * Anthony Baxter
> -   * Alexander Belopolsky
> -   * Bennett Benson
> -   * Jonathan Black
> -   * Robin Boerdijk
> -   * Michal Bozon
> -   * Aaron Brancotti
> -   * Georg Brandl
> -   * Keith Briggs
> -   * Ian Bruntlett
> -   * Lee Busby
> -   * Arnaud Calmettes
> -   * Lorenzo M. Catucci
> -   * Carl Cerecke
> -   * Mauro Cicognini
> -   * Gilles Civario
> -   * Mike Clarkson
> -   * Steve Clift
> -   * Dave Cole
> -   * Matthew Cowles
> -   * Jeremy Craven
> -   * Andrew Dalke
> -   * Ben Darnell
> -   * L. Peter Deutsch
> -   * Robert Donohue
> -   * Fred L. Drake, Jr.
> -   * Josip Dzolonga
> -   * Jeff Epler
> -   * Michael Ernst
> -   * Blame Andy Eskilsson
> -   * Carey Evans
> -   * Martijn Faassen
> -   * Carl Feynman
> -   * Dan Finnie
> -   * Hern?n Mart?nez Foffani
> -   * Stefan Franke
> -   * Jim Fulton
> -   * Peter Funk
> -   * Lele Gaifax
> -   * Matthew Gallagher
> -   * Gabriel Genellina
> -   * Ben Gertzfield
> -   * Nadim Ghaznavi
> -   * Jonathan Giddy
> -   * Shelley Gooch
> -   * Nathaniel Gray
> -   * Grant Griffin
> -   * Thomas Guettler
> -   * Anders Hammarquist
> -   * Mark Hammond
> -   * Harald Hanche-Olsen
> -   * Manus Hand
> -   * Gerhard H?ring
> -   * Travis B. Hartwell
> -   * Tim Hatch
> -   * Janko Hauser
> -   * Ben Hayden
> -   * Thomas Heller
> -   * Bernhard Herzog
> -   * Magnus L. Hetland
> -   * Konrad Hinsen
> -   * Stefan Hoffmeister
> -   * Albert Hofkamp
> -   * Gregor Hoffleit
> -   * Steve Holden
> -   * Thomas Holenstein
> -   * Gerrit Holl
> -   * Rob Hooft
> -   * Brian Hooper
> -   * Randall Hopper
> -   * Mike Hoy
> -   * Michael Hudson
> -   * Eric Huss
> -   * Jeremy Hylton
> -   * Roger Irwin
> -   * Jack Jansen
> -   * Philip H. Jensen
> -   * Pedro Diaz Jimenez
> -   * Kent Johnson
> -   * Lucas de Jonge
> -   * Andreas Jung
> -   * Robert Kern
> -   * Jim Kerr
> -   * Jan Kim
> -   * Kamil Kisiel
> -   * Greg Kochanski
> -   * Guido Kollerie
> -   * Peter A. Koren
> -   * Daniel Kozan
> -   * Andrew M. Kuchling
> -   * Dave Kuhlman
> -   * Erno Kuusela
> -   * Ross Lagerwall
> -   * Thomas Lamb
> -   * Detlef Lannert
> -   * Piers Lauder
> -   * Glyph Lefkowitz
> -   * Robert Lehmann
> -   * Marc-Andr? Lemburg
> -   * Ross Light
> -   * Ulf A. Lindgren
> -   * Everett Lipman
> -   * Mirko Liss
> -   * Martin von L?wis
> -   * Fredrik Lundh
> -   * Jeff MacDonald
> -   * John Machin
> -   * Andrew MacIntyre
> -   * Vladimir Marangozov
> -   * Vincent Marchetti
> -   * Westley Mart?nez
> -   * Laura Matson
> -   * Daniel May
> -   * Rebecca McCreary
> -   * Doug Mennella
> -   * Paolo Milani
> -   * Skip Montanaro
> -   * Paul Moore
> -   * Ross Moore
> -   * Sjoerd Mullender
> -   * Dale Nagata
> -   * Michal Nowikowski
> -   * Steffen Daode Nurpmeso
> -   * Ng Pheng Siong
> -   * Koray Oner
> -   * Tomas Oppelstrup
> -   * Denis S. Otkidach
> -   * Zooko O'Whielacronx
> -   * Shriphani Palakodety
> -   * William Park
> -   * Joonas Paalasmaa
> -   * Harri Pasanen
> -   * Bo Peng
> -   * Tim Peters
> -   * Benjamin Peterson
> -   * Christopher Petrilli
> -   * Justin D. Pettit
> -   * Chris Phoenix
> -   * Fran?ois Pinard
> -   * Paul Prescod
> -   * Eric S. Raymond
> -   * Edward K. Ream
> -   * Terry J. Reedy
> -   * Sean Reifschneider
> -   * Bernhard Reiter
> -   * Armin Rigo
> -   * Wes Rishel
> -   * Armin Ronacher
> -   * Jim Roskind
> -   * Guido van Rossum
> -   * Donald Wallace Rouse II
> -   * Mark Russell
> -   * Nick Russo
> -   * Chris Ryland
> -   * Constantina S.
> -   * Hugh Sasse
> -   * Bob Savage
> -   * Scott Schram
> -   * Neil Schemenauer
> -   * Barry Scott
> -   * Joakim Sernbrant
> -   * Justin Sheehy
> -   * Charlie Shepherd
> -   * Yue Shuaijie
> -   * Michael Simcich
> -   * Ionel Simionescu
> -   * Michael Sloan
> -   * Gregory P. Smith
> -   * Roy Smith
> -   * Clay Spence
> -   * Nicholas Spies
> -   * Tage Stabell-Kulo
> -   * Frank Stajano
> -   * Anthony Starks
> -   * Greg Stein
> -   * Peter Stoehr
> -   * Mark Summerfield
> -   * Reuben Sumner
> -   * Kalle Svensson
> -   * Jim Tittsler
> -   * David Turner
> -   * Sandro Tosi
> -   * Ville Vainio
> -   * Martijn Vries
> -   * Charles G. Waldman
> -   * Greg Ward
> -   * Barry Warsaw
> -   * Corran Webster
> -   * Glyn Webster
> -   * Bob Weiner
> -   * Eddy Welbourne
> -   * Jeff Wheeler
> -   * Mats Wichmann
> -   * Gerry Wiener
> -   * Timothy Wild
> -   * Paul Winkler
> -   * Collin Winter
> -   * Blake Winton
> -   * Dan Wolfe
> -   * Adam Woodbeck
> -   * Steven Work
> -   * Thomas Wouters
> -   * Ka-Ping Yee
> -   * Rory Yorke
> -   * Moshe Zadka
> -   * Milan Zamazal
> -   * Cheng Zhang
> diff --git a/Doc/about.rst b/Doc/about.rst
> --- a/Doc/about.rst
> +++ b/Doc/about.rst
> @@ -29,8 +29,13 @@
>  See :ref:`reporting-bugs` for information how to report bugs in this
>  documentation, or Python itself.
>
> -.. including the ACKS file here so that it can be maintained separately
> -.. include:: ACKS.txt
> +
> +Contributors to the Python Documentation
> +----------------------------------------
> +
> +Many people have contributed to the Python language, the Python standard
> +library, and the Python documentation.  See :source:`Misc/ACKS` in the Python
> +source distribution for a partial list of contributors.
>
>  It is only with the input and contributions of the Python community
>  that Python has such wonderful documentation -- Thank You!
> diff --git a/Misc/ACKS b/Misc/ACKS
> --- a/Misc/ACKS
> +++ b/Misc/ACKS
> @@ -11,25 +11,33 @@
>  PS: In the standard Python distribution, this file is encoded in UTF-8
>  and the list is in rough alphabetical order by last names.
>
> +Aahz
> +Michael Abbott
>  David Abrahams
>  Jim Ahlstrom
>  Farhan Ahmad
>  Nir Aides
>  Yaniv Aknin
>  Jyrki Alakuijala
> +Steve Alexander
> +Fred Allen
>  Billy G. Allie
>  Kevin Altis
>  Joe Amenta
> +A. Amoroso
>  Mark Anacker
>  Anders Andersen
>  John Anderson
> +Pehr Anderson
>  Erik Anders?n
>  Oliver Andrich
>  Ross Andrus
> +Heidi Annexstad
>  ?ric Araujo
>  Jason Asbahr
>  David Ascher
>  Chris AtLee
> +Jes?s Cea Avi?n
>  John Aycock
>  Jan-Hein B?hrman
>  Donovan Baarda
> @@ -41,8 +49,10 @@
>  Greg Ball
>  Luigi Ballabio
>  Jeff Balogh
> +Manuel Balsera
>  Matt Bandy
>  Michael J. Barber
> +Daniel Barclay
>  Chris Barker
>  Anton Barkovsky
>  Nick Barnes
> @@ -51,6 +61,7 @@
>  Cesar Eduardo Barros
>  Des Barry
>  Ulf Bartelt
> +Don Bashford
>  Nick Bastin
>  Jeff Bauer
>  Mike Bayer
> @@ -69,6 +80,7 @@
>  Alexander ?????? Belopolsky
>  Andrew Bennetts
>  Andy Bensky
> +Bennett Benson
>  Michel Van den Bergh
>  Eric Beser
>  Steven Bethard
> @@ -80,6 +92,7 @@
>  Philippe Biondi
>  Stuart Bishop
>  Roy Bixler
> +Jonathan Black
>  Mike Bland
>  Martin Bless
>  Pablo Bleyer
> @@ -88,6 +101,7 @@
>  Finn Bock
>  Paul Boddie
>  Matthew Boedicker
> +Robin Boerdijk
>  David Bolen
>  Gawain Bolton
>  Gregory Bond
> @@ -96,13 +110,16 @@
>  Eric Bouck
>  Thierry Bousch
>  Sebastian Boving
> +Michal Bozon
>  Jeff Bradberry
> +Aaron Brancotti
>  Monty Brandenberg
>  Georg Brandl
>  Christopher Brannon
>  Terrence Brannon
>  Dave Brennan
>  Tom Bridgman
> +Keith Briggs
>  Richard Brodie
>  Michael Broghton
>  Daniel Brotsky
> @@ -111,6 +128,7 @@
>  Oleg Broytmann
>  Dave Brueck
>  Francisco Mart?n Brugu?
> +Ian Bruntlett
>  Stan Bubrouski
>  Erik de Bueger
>  Dick Bulterman
> @@ -134,6 +152,7 @@
>  Donn Cave
>  Charles Cazabon
>  Per Cederqvist
> +Carl Cerecke
>  Octavian Cerna
>  Pascal Chambon
>  John Chandler
> @@ -151,8 +170,10 @@
>  Anders Chrigstr?m
>  Tom Christiansen
>  Vadim Chugunov
> +Mauro Cicognini
>  David Cinege
>  Craig Citro
> +Gilles Civario
>  Mike Clarkson
>  Andrew Clegg
>  Brad Clements
> @@ -180,6 +201,7 @@
>  Matthew Dixon Cowles
>  Ryan Coyner
>  Christopher A. Craig
> +Jeremy Craven
>  Laura Creighton
>  Simon Cross
>  Drew Csillag
> @@ -202,6 +224,7 @@
>  Arnaud Delobelle
>  Erik Demaine
>  John Dennis
> +L. Peter Deutsch
>  Roger Dev
>  Philippe Devalkeneer
>  Raghuram Devarakonda
> @@ -215,6 +238,7 @@
>  Daniel Dittmar
>  Jaromir Dolecek
>  Ismail Donmez
> +Robert Donohue
>  Marcos Donolo
>  Dima Dorfman
>  Cesar Douady
> @@ -263,10 +287,12 @@
>  Mark Favas
>  Niels Ferguson
>  Sebastian Fernandez
> +Carl Feynman
>  Vincent Fiack
>  Tomer Filiba
>  Jeffrey Finkelstein
>  Russell Finn
> +Dan Finnie
>  Nils Fischbeck
>  Frederik Fix
>  Matt Fleming
> @@ -276,6 +302,7 @@
>  Amaury Forgeot d'Arc
>  Doug Fort
>  John Fouhy
> +Stefan Franke
>  Martin Franklin
>  Robin Friedrich
>  Bradley Froehle
> @@ -293,6 +320,7 @@
>  Lele Gaifax
>  Santiago Gala
>  Yitzchak Gale
> +Matthew Gallagher
>  Quentin Gallet-Gilles
>  Raymund Galvin
>  Nitin Ganatra
> @@ -308,6 +336,7 @@
>  Gabriel Genellina
>  Christos Georgiou
>  Ben Gertzfield
> +Nadim Ghaznavi
>  Dinu Gherman
>  Jonathan Giddy
>  Johannes Gijsbers
> @@ -315,14 +344,18 @@
>  Christoph Gohlke
>  Tim Golden
>  Chris Gonnerman
> +Shelley Gooch
>  David Goodger
>  Hans de Graaff
> +Nathaniel Gray
>  Eddy De Greef
> +Grant Griffin
>  Duncan Grisby
>  Fabian Groffen
>  John S. Gruber
>  Dag Gruneau
>  Filip Gruszczy?ski
> +Thomas Guettler
>  Michael Guravage
>  Lars Gust?bel
>  Thomas G?ttler
> @@ -335,7 +368,9 @@
>  Bob Halley
>  Jesse Hallio
>  Jun Hamano
> +Anders Hammarquist
>  Mark Hammond
> +Harald Hanche-Olsen
>  Manus Hand
>  Milton L. Hankins
>  Stephen Hansen
> @@ -343,9 +378,13 @@
>  Lynda Hardman
>  Derek Harland
>  Jason Harper
> +Travis B. Hartwell
>  Larry Hastings
> +Tim Hatch
>  Shane Hathaway
> +Janko Hauser
>  Rycharde Hawkes
> +Ben Hayden
>  Jochen Hayek
>  Christian Heimes
>  Thomas Heller
> @@ -371,10 +410,13 @@
>  Joerg-Cyril Hoehle
>  Gregor Hoffleit
>  Chris Hoffman
> +Stefan Hoffmeister
>  Albert Hofkamp
>  Tomas Hoger
>  Jonathan Hogg
> +Steve Holden
>  Akintayo Holder
> +Thomas Holenstein
>  Gerrit Holl
>  Shane Holloway
>  Rune Holm
> @@ -389,6 +431,7 @@
>  Jan Hosang
>  Ken Howard
>  Brad Howes
> +Mike Hoy
>  Chih-Hao Huang
>  Lawrence Hudson
>  Michael Hudson
> @@ -407,6 +450,7 @@
>  Tony Ingraldi
>  John Interrante
>  Bob Ippolito
> +Roger Irwin
>  Atsuo Ishimoto
>  Paul Jackson
>  Ben Jackson
> @@ -419,12 +463,15 @@
>  Thomas Jarosch
>  Drew Jenkins
>  Flemming Kj?r Jensen
> +Philip H. Jensen
>  Philip Jenvey
>  Chris Jerdonek
>  Jiba
> +Pedro Diaz Jimenez
>  Orjan Johansen
>  Fredrik Johansson
>  Gregory K. Johnson
> +Kent Johnson
>  Simon Johnston
>  Nicolas Joly
>  Evan Jones
> @@ -450,17 +497,20 @@
>  Ryan Kelly
>  Robert Kern
>  Randall Kern
> +Jim Kerr
>  Magnus Kessler
>  Lawrence Kesteloot
>  Rafe Kettler
>  Vivek Khera
> -Akira Kitada
>  Mads Kiilerich
> +Jan Kim
>  Taek Joo Kim
>  W. Trevor King
>  Paul Kippes
>  Steve Kirsch
>  Sebastian Kirsche
> +Kamil Kisiel
> +Akira Kitada
>  Ron Klatchko
>  Bastian Kleineidam
>  Bob Kline
> @@ -474,7 +524,10 @@
>  Greg Kochanski
>  Damon Kohler
>  Marko Kohtala
> +Guido Kollerie
> +Peter A. Koren
>  Joseph Koshy
> +Daniel Kozan
>  Jerzy Kozera
>  Maksim Kozyarchuk
>  Stefan Krah
> @@ -488,10 +541,13 @@
>  Ivan Krsti?
>  Andrew Kuchling
>  Ralf W. Grosse-Kunstleve
> +Dave Kuhlman
>  Vladimir Kushnir
> +Erno Kuusela
>  Kirill Kuzminykh (?????? ?????????)
>  Ross Lagerwall
>  Cameron Laird
> +Thomas Lamb
>  Torsten Landschoff
>  ?ukasz Langa
>  Tino Lange
> @@ -508,6 +564,7 @@
>  Thomas Lee
>  Christopher Lee
>  Luc Lefebvre
> +Glyph Lefkowitz
>  Vincent Legoll
>  Kip Lehman
>  Joerg Lehmann
> @@ -515,7 +572,7 @@
>  Petri Lehtinen
>  Luke Kenneth Casson Leighton
>  Tshepang Lekhonkhobe
> -Marc-Andre Lemburg
> +Marc-Andr? Lemburg
>  John Lenton
>  Christopher Tur Lesniewski-Laas
>  Mark Levinson
> @@ -526,10 +583,13 @@
>  Shawn Ligocki
>  Martin Ligr
>  Christopher Lindblad
> +Ulf A. Lindgren
>  Bj?rn Lindqvist
>  Per Lindqvist
>  Eric Lindvall
>  Gregor Lingl
> +Everett Lipman
> +Mirko Liss
>  Nick Lockwood
>  Stephanie Lockwood
>  Anne Lord
> @@ -545,6 +605,8 @@
>  Jim Lynch
>  Mikael Lyngvig
>  Martin von L?wis
> +Jeff MacDonald
> +John Machin
>  Andrew I MacIntyre
>  Tim MacKenzie
>  Nick Maclaren
> @@ -553,17 +615,22 @@
>  David Malcolm
>  Ken Manheimer
>  Vladimir Marangozov
> +Vincent Marchetti
>  David Marek
>  Doug Marien
>  Sven Marnach
>  Alex Martelli
>  Anthony Martin
> +Westley Mart?nez
>  S?bastien Martini
>  Roger Masse
>  Nick Mathewson
> +Laura Matson
>  Graham Matthews
>  Dieter Maurer
> +Daniel May
>  Arnaud Mazin
> +Rebecca McCreary
>  Kirk McDonald
>  Chris McDonough
>  Greg McFarlane
> @@ -578,6 +645,7 @@
>  Bill van Melle
>  Lucas Prado Melo
>  Ezio Melotti
> +Doug Mennella
>  Brian Merrell
>  Luke Mewburn
>  Carl Meyer
> @@ -587,6 +655,7 @@
>  Tom Middleton
>  Stan Mihai
>  Aristotelis Mikropoulos
> +Paolo Milani
>  Damien Miller
>  Chad Miller
>  Jason V. Miller
> @@ -600,6 +669,7 @@
>  The Dragon De Monsyne
>  Skip Montanaro
>  Paul Moore
> +Ross Moore
>  Derek Morr
>  James A Morrison
>  Alessandro Moura
> @@ -611,6 +681,7 @@
>  Neil Muller
>  R. David Murray
>  Piotr Meyer
> +Dale Nagata
>  John Nagle
>  Takahiro Nakayama
>  Travers Naran
> @@ -639,11 +710,14 @@
>  Nigel O'Brian
>  Kevin O'Connor
>  Tim O'Malley
> +Zooko O'Whielacronx
>  Pascal Oberndoerfer
>  Jeffrey Ollie
>  Adam Olsen
>  Grant Olson
> +Koray Oner
>  Piet van Oostrum
> +Tomas Oppelstrup
>  Jason Orendorff
>  Douglas Orr
>  Michele Orr?
> @@ -652,6 +726,8 @@
>  Michael Otteneder
>  R. M. Oudkerk
>  Russel Owen
> +Joonas Paalasmaa
> +Shriphani Palakodety
>  Ondrej Palkovsky
>  Mike Pall
>  Todd R. Palmer
> @@ -661,11 +737,13 @@
>  Peter Parente
>  Alexandre Parenteau
>  Dan Parisien
> +William Park
>  Harri Pasanen
>  Randy Pausch
>  Samuele Pedroni
>  Marcel van der Peijl
>  Steven Pemberton
> +Bo Peng
>  Santiago Peres?n
>  Mark Perrego
>  Trevor Perrin
> @@ -674,6 +752,7 @@
>  Benjamin Peterson
>  Chris Petrilli
>  Bjorn Pettersen
> +Justin D. Pettit
>  Geoff Philbrick
>  Gavrie Philipson
>  Adrian Phillips
> @@ -705,12 +784,12 @@
>  Brodie Rao
>  Antti Rasinen
>  Sridhar Ratnakumar
> -Eric Raymond
> +Eric S. Raymond
>  Edward K. Ream
>  Chris Rebert
>  Marc Recht
>  John Redford
> -Terry Reedy
> +Terry J. Reedy
>  Gareth Rees
>  Steve Reeves
>  Lennart Regebro
> @@ -727,6 +806,7 @@
>  Nicholas Riley
>  Jean-Claude Rimbault
>  Vlad Riscutia
> +Wes Rishel
>  Juan M. Bello Rivas
>  Davide Rizzo
>  Anthony Roach
> @@ -742,6 +822,7 @@
>  Case Roole
>  Timothy Roscoe
>  Jim Roskind
> +Guido van Rossum
>  Just van Rossum
>  Hugo van Rossum
>  Saskia van Rossum
> @@ -757,6 +838,8 @@
>  Sam Rushing
>  Mark Russell
>  Nick Russo
> +Chris Ryland
> +Constantina S.
>  S?bastien Sabl?
>  Suman Saha
>  Hajime Saitou
> @@ -766,6 +849,8 @@
>  Ilya Sandler
>  Mark Sapiro
>  Ty Sarna
> +Hugh Sasse
> +Bob Savage
>  Ben Sayer
>  sbt
>  Marco Scataglini
> @@ -778,6 +863,7 @@
>  Michael Schneider
>  Peter Schneider-Kamp
>  Arvin Schnell
> +Scott Schram
>  Chad J. Schroeder
>  Sam Schulenburg
>  Stefan Schwarzer
> @@ -789,6 +875,7 @@
>  ?iga Seilnach
>  Fred Sells
>  Jiwon Seo
> +Joakim Sernbrant
>  Roger Serwy
>  Jerry Seutter
>  Denis Severson
> @@ -796,6 +883,8 @@
>  Ha Shao
>  Mark Shannon
>  Richard Shapiro
> +Justin Sheehy
> +Charlie Shepherd
>  Bruce Sherwood
>  Alexander Shigin
>  Pete Shinners
> @@ -803,31 +892,40 @@
>  John W. Shipman
>  Joel Shprentz
>  Itamar Shtull-Trauring
> +Yue Shuaijie
>  Eric Siegerman
>  Paul Sijben
>  Tim Silk
> +Michael Simcich
> +Ionel Simionescu
>  Kirill Simonov
>  Nathan Paul Simons
>  Janne Sinkkonen
> +Ng Pheng Siong
>  George Sipe
>  J. Sipprell
>  Kragen Sitaker
> +Michael Sloan
>  Eric V. Smith
>  Christopher Smith
>  Gregory P. Smith
> +Roy Smith
>  Rafal Smotrzyk
>  Dirk Soede
>  Paul Sokolovsky
>  Cody Somerville
>  Clay Spence
>  Stefan Sperling
> +Nicholas Spies
>  Per Spilling
>  Joshua Spoerri
>  Noah Spurrier
>  Nathan Srebro
>  RajGopal Srinivasan
> +Tage Stabell-Kulo
>  Quentin Stafford-Fraser
>  Frank Stajano
> +Anthony Starks
>  Oliver Steele
>  Greg Stein
>  Chris Stern
> @@ -844,6 +942,7 @@
>  Andreas St?hrk
>  Nathan Sullivan
>  Mark Summerfield
> +Reuben Sumner
>  Hisao Suzuki
>  Andrew Svetlov
>  Kalle Svensson
> @@ -871,6 +970,7 @@
>  Oren Tirosh
>  Jason Tishler
>  Christian Tismer
> +Jim Tittsler
>  Frank J. Tobin
>  R Lindsay Todd
>  Bennett Todd
> @@ -881,6 +981,7 @@
>  John Tromp
>  Jason Trowbridge
>  Anthony Tuininga
> +David Turner
>  Stephen Turner
>  Theodore Turocy
>  Bill Tutt
> @@ -890,6 +991,7 @@
>  Roger Upole
>  Michael Urman
>  Hector Urtubia
> +Ville Vainio
>  Andi Vajda
>  Case Van Horsen
>  Kyle VanderBeek
> @@ -907,6 +1009,7 @@
>  Norman Vine
>  Frank Visser
>  Johannes Vogel
> +Martijn Vries
>  Niki W. Waibel
>  Wojtek Walczak
>  Charles Waldman
> @@ -921,8 +1024,10 @@
>  Aaron Watters
>  Henrik Weber
>  Corran Webster
> +Glyn Webster
>  Stefan Wehr
>  Zack Weinberg
> +Bob Weiner
>  Edward Welbourne
>  Cliff Wells
>  Rickard Westman
> @@ -935,6 +1040,7 @@
>  Gerry Wiener
>  Frank Wierzbicki
>  Bryce "Zooko" Wilcox-O'Hearn
> +Timothy Wild
>  Jason Williams
>  John Williams
>  Sue Williams
> @@ -943,6 +1049,7 @@
>  Frank Willison
>  Greg V. Wilson
>  J Derek Wilson
> +Paul Winkler
>  Jody Winston
>  Collin Winter
>  Dik Winter
> @@ -956,6 +1063,8 @@
>  Klaus-Juergen Wolf
>  Dan Wolfe
>  Richard Wolff
> +Adam Woodbeck
> +Steven Work
>  Darren Worrall
>  Gordon Worley
>  Thomas Wouters
> @@ -966,6 +1075,7 @@
>  Ka-Ping Yee
>  Bob Yodlowski
>  Danny Yoo
> +Rory Yorke
>  George Yoshida
>  Masazumi Yoshikawa
>  Arnaud Ysmal
> @@ -976,5 +1086,6 @@
>  Mike Zarnstorff
>  Siebren van der Zee
>  Uwe Zessin
> +Cheng Zhang
>  Tarek Ziad?
>  Peter ?strand
>
> --
> Repository URL: http://hg.python.org/cpython
>
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>

From ezio.melotti at gmail.com  Fri Sep 14 01:50:47 2012
From: ezio.melotti at gmail.com (Ezio Melotti)
Date: Fri, 14 Sep 2012 02:50:47 +0300
Subject: [Python-checkins] [Python-Dev]  cpython (2.7): #15437,
 #15439: merge Doc/ACKS.txt with Misc/ACKS and modify Doc/about.rst
In-Reply-To: <CAOTb1wdkqmvHdYx_LbX=qz5tCKQKYg+WJrOKydtCELkE14-HfA@mail.gmail.com>
References: <3XHwLr547zzQjv@mail.python.org>
	<CAOTb1wdkqmvHdYx_LbX=qz5tCKQKYg+WJrOKydtCELkE14-HfA@mail.gmail.com>
Message-ID: <CACBhJdGDAO97Ub=8X9DX8mWDkNrtJby4aV0Zm_M77fMne+cOLg@mail.gmail.com>

On Fri, Sep 14, 2012 at 2:22 AM, Chris Jerdonek
<chris.jerdonek at gmail.com> wrote:
> On Thu, Sep 13, 2012 at 4:00 PM, ezio.melotti
> <python-checkins at python.org> wrote:
>> http://hg.python.org/cpython/rev/76dd082d332e
>> changeset:   79022:76dd082d332e
>> branch:      2.7
>> parent:      79014:8f847f66a49f
>> user:        Ezio Melotti <ezio.melotti at gmail.com>
>> date:        Fri Sep 14 01:58:33 2012 +0300
>> summary:
>>   #15437, #15439: merge Doc/ACKS.txt with Misc/ACKS and modify Doc/about.rst accordingly.
>
> I also contributed to this. :)
>

Yes, with all these ACKS and names I forgot to mention yours in the
commit message :)
Thanks again for writing the script that automatically merged all the names!

Best Regards,
Ezio Melotti

> --Chris
>

From python-checkins at python.org  Fri Sep 14 06:00:33 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 14 Sep 2012 06:00:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1ODMxOiBkb2N1?=
 =?utf-8?q?ment_multiple_signatures_on_different_lines=2E__Patch_by_Chris?=
Message-ID: <3XJ30x71f7zQhN@mail.python.org>

http://hg.python.org/cpython/rev/b01eb870f84f
changeset:   79023:b01eb870f84f
branch:      3.2
parent:      79020:48185b0f7b8a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 14 06:32:35 2012 +0300
summary:
  #15831: document multiple signatures on different lines.  Patch by Chris Jerdonek.

files:
  Doc/library/argparse.rst        |   9 ++-
  Doc/library/configparser.rst    |   3 +-
  Doc/library/curses.rst          |  44 ++++++++++++++------
  Doc/library/functions.rst       |  38 +++++++++++------
  Doc/library/http.client.rst     |   8 ++-
  Doc/library/itertools.rst       |   3 +-
  Doc/library/multiprocessing.rst |   2 +-
  Doc/library/optparse.rst        |   6 +-
  Doc/library/ossaudiodev.rst     |   3 +-
  Doc/library/random.rst          |  11 ++--
  Doc/library/socket.rst          |   3 +-
  Doc/library/syslog.rst          |   3 +-
  Doc/library/tkinter.tix.rst     |   2 +-
  13 files changed, 89 insertions(+), 46 deletions(-)


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -130,9 +130,12 @@
 ArgumentParser objects
 ----------------------
 
-.. class:: ArgumentParser([description], [epilog], [prog], [usage], [add_help], \
-                          [argument_default], [parents], [prefix_chars], \
-                          [conflict_handler], [formatter_class])
+.. class:: ArgumentParser(prog=None, usage=None, description=None, \
+                          epilog=None, parents=[], \
+                          formatter_class=argparse.HelpFormatter, \
+                          prefix_chars='-', fromfile_prefix_chars=None, \
+                          argument_default=None, conflict_handler='error', \
+                          add_help=True)
 
    Create a new :class:`ArgumentParser` object.  Each parameter has its own more
    detailed description below, but in short they are:
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1051,7 +1051,8 @@
       *fallback*.
 
 
-   .. method:: items([section], raw=False, vars=None)
+   .. method:: items(raw=False, vars=None)
+               items(section, raw=False, vars=None)
 
       When *section* is not given, return a list of *section_name*,
       *section_proxy* pairs, including DEFAULTSECT.
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -377,7 +377,8 @@
    is to be displayed.
 
 
-.. function:: newwin([nlines, ncols,] begin_y, begin_x)
+.. function:: newwin(begin_y, begin_x)
+              newwin(nlines, ncols, begin_y, begin_x)
 
    Return a new window, whose left-upper corner is at  ``(begin_y, begin_x)``, and
    whose height/width is  *nlines*/*ncols*.
@@ -645,7 +646,8 @@
 the following methods:
 
 
-.. method:: window.addch([y, x,] ch[, attr])
+.. method:: window.addch(ch[, attr])
+            window.addch(y, x, ch[, attr])
 
    .. note::
 
@@ -659,13 +661,15 @@
    position and attributes are the current settings for the window object.
 
 
-.. method:: window.addnstr([y, x,] str, n[, attr])
+.. method:: window.addnstr(str, n[, attr])
+            window.addnstr(y, x, str, n[, attr])
 
    Paint at most *n* characters of the  string *str* at ``(y, x)`` with attributes
    *attr*, overwriting anything previously on the display.
 
 
-.. method:: window.addstr([y, x,] str[, attr])
+.. method:: window.addstr(str[, attr])
+            window.addstr(y, x, str[, attr])
 
    Paint the string *str* at ``(y, x)`` with attributes *attr*, overwriting
    anything previously on the display.
@@ -752,7 +756,10 @@
    *bs* are *horch*.  The default corner characters are always used by this function.
 
 
-.. method:: window.chgat([y, x, ] [num,] attr)
+.. method:: window.chgat(attr)
+            window.chgat(num, attr)
+            window.chgat(y, x, attr)
+            window.chgat(y, x, num, attr)
 
    Set the attributes of *num* characters at the current cursor position, or at
    position ``(y, x)`` if supplied. If no value of *num* is given or *num* = -1,
@@ -801,7 +808,8 @@
    Delete the line under the cursor. All following lines are moved up by one line.
 
 
-.. method:: window.derwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.derwin(begin_y, begin_x)
+            window.derwin(nlines, ncols, begin_y, begin_x)
 
    An abbreviation for "derive window", :meth:`derwin` is the same as calling
    :meth:`subwin`, except that *begin_y* and *begin_x* are relative to the origin
@@ -876,7 +884,8 @@
    upper-left corner.
 
 
-.. method:: window.hline([y, x,] ch, n)
+.. method:: window.hline(ch, n)
+            window.hline(y, x, ch, n)
 
    Display a horizontal line starting at ``(y, x)`` with length *n* consisting of
    the character *ch*.
@@ -910,7 +919,8 @@
    the character proper, and upper bits are the attributes.
 
 
-.. method:: window.insch([y, x,] ch[, attr])
+.. method:: window.insch(ch[, attr])
+            window.insch(y, x, ch[, attr])
 
    Paint character *ch* at ``(y, x)`` with attributes *attr*, moving the line from
    position *x* right by one character.
@@ -931,7 +941,8 @@
    line.
 
 
-.. method:: window.insnstr([y, x,] str, n [, attr])
+.. method:: window.insnstr(str, n[, attr])
+            window.insnstr(y, x, str, n[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor, up to *n* characters.   If *n* is zero or
@@ -940,7 +951,8 @@
    The cursor position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.insstr([y, x, ] str [, attr])
+.. method:: window.insstr(str[, attr])
+            window.insstr(y, x, str[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor.  All characters to the right of the cursor are
@@ -948,7 +960,8 @@
    position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.instr([y, x] [, n])
+.. method:: window.instr([n])
+            window.instr(y, x[, n])
 
    Return a string of characters, extracted from the window starting at the
    current cursor position, or at *y*, *x* if specified. Attributes are stripped
@@ -1123,13 +1136,15 @@
    Turn on attribute *A_STANDOUT*.
 
 
-.. method:: window.subpad([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subpad(begin_y, begin_x)
+            window.subpad(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
 
 
-.. method:: window.subwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subwin(begin_y, begin_x)
+            window.subwin(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
@@ -1186,7 +1201,8 @@
    :meth:`refresh`.
 
 
-.. method:: window.vline([y, x,] ch, n)
+.. method:: window.vline(ch, n)
+            window.vline(y, x, ch, n)
 
    Display a vertical line starting at ``(y, x)`` with length *n* consisting of the
    character *ch*.
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -727,11 +727,16 @@
    already arranged into argument tuples, see :func:`itertools.starmap`\.
 
 
-.. function:: max(iterable[, args...], *[, key])
+.. function:: max(iterable, *[, key])
+              max(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the largest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the largest of the arguments.
+   Return the largest item in an iterable or the largest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The largest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the largest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -750,11 +755,16 @@
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable[, args...], *[, key])
+.. function:: min(iterable, *[, key])
+              min(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the smallest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the smallest of the arguments.
+   Return the smallest item in an iterable or the smallest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The smallest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the smallest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -957,16 +967,16 @@
    must be of integer types, and *y* must be non-negative.
 
 
-.. function:: print([object, ...], *, sep=' ', end='\\n', file=sys.stdout)
+.. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout)
 
-   Print *object*\(s) to the stream *file*, separated by *sep* and followed by
+   Print *objects* to the stream *file*, separated by *sep* and followed by
    *end*.  *sep*, *end* and *file*, if present, must be given as keyword
    arguments.
 
    All non-keyword arguments are converted to strings like :func:`str` does and
    written to the stream, separated by *sep* and followed by *end*.  Both *sep*
    and *end* must be strings; they can also be ``None``, which means to use the
-   default values.  If no *object* is given, :func:`print` will just write
+   default values.  If no *objects* are given, :func:`print` will just write
    *end*.
 
    The *file* argument must be an object with a ``write(string)`` method; if it
@@ -1045,7 +1055,8 @@
 
 
 .. XXX does accept objects with __index__ too
-.. function:: range([start,] stop[, step])
+.. function:: range(stop)
+              range(start, stop[, step])
 
    This is a versatile function to create iterables yielding arithmetic
    progressions.  It is most often used in :keyword:`for` loops.  The arguments
@@ -1160,7 +1171,8 @@
    ``x.foobar = 123``.
 
 
-.. function:: slice([start,] stop[, step])
+.. function:: slice(stop)
+              slice(start, stop[, step])
 
    .. index:: single: Numerical Python
 
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -27,7 +27,8 @@
 The module provides the following classes:
 
 
-.. class:: HTTPConnection(host, port=None[, strict[, timeout[, source_address]]])
+.. class:: HTTPConnection(host, port=None[, strict][, timeout], \
+                          source_address=None)
 
    An :class:`HTTPConnection` instance represents one transaction with an HTTP
    server.  It should be instantiated passing it a host and optional port
@@ -55,7 +56,10 @@
       are not supported anymore.
 
 
-.. class:: HTTPSConnection(host, port=None, key_file=None, cert_file=None[, strict[, timeout[, source_address]]], *, context=None, check_hostname=None)
+.. class:: HTTPSConnection(host, port=None, key_file=None, \
+                           cert_file=None[, strict][, timeout], \
+                           source_address=None, *, context=None, \
+                           check_hostname=None)
 
    A subclass of :class:`HTTPConnection` that uses SSL for communication with
    secure servers.  Default port is ``443``.  If *context* is specified, it
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -363,7 +363,8 @@
                   self.currkey = self.keyfunc(self.currvalue)
 
 
-.. function:: islice(iterable, [start,] stop [, step])
+.. function:: islice(iterable, stop)
+              islice(iterable, start, stop[, step])
 
    Make an iterator that returns selected elements from the iterable. If *start* is
    non-zero, then elements from the iterable are skipped until start is reached.
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -298,7 +298,7 @@
 :class:`Process` and exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. class:: Process([group[, target[, name[, args[, kwargs]]]]])
+.. class:: Process(group=None, target=None, name=None, args=(), kwargs={})
 
    Process objects represent activity that is run in a separate process. The
    :class:`Process` class has equivalents of all the methods of
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -273,7 +273,8 @@
 strings as you like (including zero), as long as there is at least one option
 string overall.
 
-The option strings passed to :meth:`add_option` are effectively labels for the
+The option strings passed to :meth:`OptionParser.add_option` are effectively
+labels for the
 option defined by that call.  For brevity, we will frequently refer to
 *encountering an option* on the command line; in reality, :mod:`optparse`
 encounters *option strings* and looks up options from them.
@@ -892,7 +893,8 @@
 The canonical way to create an :class:`Option` instance is with the
 :meth:`add_option` method of :class:`OptionParser`.
 
-.. method:: OptionParser.add_option(opt_str[, ...], attr=value, ...)
+.. method:: OptionParser.add_option(option)
+            OptionParser.add_option(*opt_str, attr=value, ...)
 
    To define an option with only a short option string::
 
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -63,7 +63,8 @@
    ``ossaudiodev.error``.)
 
 
-.. function:: open([device, ]mode)
+.. function:: open(mode)
+              open(device, mode)
 
    Open an audio device and return an OSS audio device object.  This object
    supports many file-like methods, such as :meth:`read`, :meth:`write`, and
diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -46,20 +46,20 @@
 
 Bookkeeping functions:
 
-.. function:: seed([x], version=2)
+.. function:: seed(a=None, version=2)
 
    Initialize the random number generator.
 
-   If *x* is omitted or ``None``, the current system time is used.  If
+   If *a* is omitted or ``None``, the current system time is used.  If
    randomness sources are provided by the operating system, they are used
    instead of the system time (see the :func:`os.urandom` function for details
    on availability).
 
-   If *x* is an int, it is used directly.
+   If *a* is an int, it is used directly.
 
    With version 2 (the default), a :class:`str`, :class:`bytes`, or :class:`bytearray`
    object gets converted to an :class:`int` and all of its bits are used.  With version 1,
-   the :func:`hash` of *x* is used instead.
+   the :func:`hash` of *a* is used instead.
 
    .. versionchanged:: 3.2
       Moved to the version 2 scheme which uses all of the bits in a string seed.
@@ -87,7 +87,8 @@
 
 Functions for integers:
 
-.. function:: randrange([start,] stop[, step])
+.. function:: randrange(stop)
+              randrange(start, stop[, step])
 
    Return a randomly selected element from ``range(start, stop, step)``.  This is
    equivalent to ``choice(range(start, stop, step))``, but doesn't actually build a
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -745,7 +745,8 @@
    much data, if any, was successfully sent.
 
 
-.. method:: socket.sendto(bytes[, flags], address)
+.. method:: socket.sendto(bytes, address)
+            socket.sendto(bytes, flags, address)
 
    Send data to the socket.  The socket should not be connected to a remote socket,
    since the destination socket is specified by *address*.  The optional *flags*
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -17,7 +17,8 @@
 The module defines the following functions:
 
 
-.. function:: syslog([priority,] message)
+.. function:: syslog(message)
+              syslog(priority, message)
 
    Send the string *message* to the system logger.  A trailing newline is added
    if necessary.  Each message is tagged with a priority composed of a
diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst
--- a/Doc/library/tkinter.tix.rst
+++ b/Doc/library/tkinter.tix.rst
@@ -504,7 +504,7 @@
       print(root.tix_configure())
 
 
-.. method:: tixCommand.tix_configure([cnf,] **kw)
+.. method:: tixCommand.tix_configure(cnf=None, **kw)
 
    Query or modify the configuration options of the Tix application context. If no
    option is specified, returns a dictionary all of the available options.  If

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 14 06:01:06 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 14 Sep 2012 06:01:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_=2315831=3A_merge_with_3=2E2?=
Message-ID: <3XJ31Z0kkBzQm8@mail.python.org>

http://hg.python.org/cpython/rev/0ed61ee823d8
changeset:   79024:0ed61ee823d8
parent:      79021:2b4a89f82485
parent:      79023:b01eb870f84f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 14 06:35:09 2012 +0300
summary:
  #15831: merge with 3.2

files:
  Doc/library/argparse.rst        |   9 ++-
  Doc/library/configparser.rst    |   3 +-
  Doc/library/curses.rst          |  44 ++++++++++++++------
  Doc/library/functions.rst       |  38 +++++++++++------
  Doc/library/http.client.rst     |   8 ++-
  Doc/library/inspect.rst         |   4 +-
  Doc/library/itertools.rst       |   3 +-
  Doc/library/multiprocessing.rst |   3 +-
  Doc/library/optparse.rst        |   6 +-
  Doc/library/ossaudiodev.rst     |   3 +-
  Doc/library/random.rst          |  11 ++--
  Doc/library/socket.rst          |   3 +-
  Doc/library/stdtypes.rst        |   3 +-
  Doc/library/syslog.rst          |   3 +-
  Doc/library/tkinter.tix.rst     |   2 +-
  15 files changed, 94 insertions(+), 49 deletions(-)


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -130,9 +130,12 @@
 ArgumentParser objects
 ----------------------
 
-.. class:: ArgumentParser([description], [epilog], [prog], [usage], [add_help], \
-                          [argument_default], [parents], [prefix_chars], \
-                          [conflict_handler], [formatter_class])
+.. class:: ArgumentParser(prog=None, usage=None, description=None, \
+                          epilog=None, parents=[], \
+                          formatter_class=argparse.HelpFormatter, \
+                          prefix_chars='-', fromfile_prefix_chars=None, \
+                          argument_default=None, conflict_handler='error', \
+                          add_help=True)
 
    Create a new :class:`ArgumentParser` object.  Each parameter has its own more
    detailed description below, but in short they are:
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1051,7 +1051,8 @@
       *fallback*.
 
 
-   .. method:: items([section], raw=False, vars=None)
+   .. method:: items(raw=False, vars=None)
+               items(section, raw=False, vars=None)
 
       When *section* is not given, return a list of *section_name*,
       *section_proxy* pairs, including DEFAULTSECT.
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -377,7 +377,8 @@
    is to be displayed.
 
 
-.. function:: newwin([nlines, ncols,] begin_y, begin_x)
+.. function:: newwin(begin_y, begin_x)
+              newwin(nlines, ncols, begin_y, begin_x)
 
    Return a new window, whose left-upper corner is at  ``(begin_y, begin_x)``, and
    whose height/width is  *nlines*/*ncols*.
@@ -656,7 +657,8 @@
 the following methods and attributes:
 
 
-.. method:: window.addch([y, x,] ch[, attr])
+.. method:: window.addch(ch[, attr])
+            window.addch(y, x, ch[, attr])
 
    .. note::
 
@@ -670,13 +672,15 @@
    position and attributes are the current settings for the window object.
 
 
-.. method:: window.addnstr([y, x,] str, n[, attr])
+.. method:: window.addnstr(str, n[, attr])
+            window.addnstr(y, x, str, n[, attr])
 
    Paint at most *n* characters of the  string *str* at ``(y, x)`` with attributes
    *attr*, overwriting anything previously on the display.
 
 
-.. method:: window.addstr([y, x,] str[, attr])
+.. method:: window.addstr(str[, attr])
+            window.addstr(y, x, str[, attr])
 
    Paint the string *str* at ``(y, x)`` with attributes *attr*, overwriting
    anything previously on the display.
@@ -763,7 +767,10 @@
    *bs* are *horch*.  The default corner characters are always used by this function.
 
 
-.. method:: window.chgat([y, x, ] [num,] attr)
+.. method:: window.chgat(attr)
+            window.chgat(num, attr)
+            window.chgat(y, x, attr)
+            window.chgat(y, x, num, attr)
 
    Set the attributes of *num* characters at the current cursor position, or at
    position ``(y, x)`` if supplied. If no value of *num* is given or *num* = -1,
@@ -812,7 +819,8 @@
    Delete the line under the cursor. All following lines are moved up by one line.
 
 
-.. method:: window.derwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.derwin(begin_y, begin_x)
+            window.derwin(nlines, ncols, begin_y, begin_x)
 
    An abbreviation for "derive window", :meth:`derwin` is the same as calling
    :meth:`subwin`, except that *begin_y* and *begin_x* are relative to the origin
@@ -906,7 +914,8 @@
    upper-left corner.
 
 
-.. method:: window.hline([y, x,] ch, n)
+.. method:: window.hline(ch, n)
+            window.hline(y, x, ch, n)
 
    Display a horizontal line starting at ``(y, x)`` with length *n* consisting of
    the character *ch*.
@@ -940,7 +949,8 @@
    the character proper, and upper bits are the attributes.
 
 
-.. method:: window.insch([y, x,] ch[, attr])
+.. method:: window.insch(ch[, attr])
+            window.insch(y, x, ch[, attr])
 
    Paint character *ch* at ``(y, x)`` with attributes *attr*, moving the line from
    position *x* right by one character.
@@ -961,7 +971,8 @@
    line.
 
 
-.. method:: window.insnstr([y, x,] str, n [, attr])
+.. method:: window.insnstr(str, n[, attr])
+            window.insnstr(y, x, str, n[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor, up to *n* characters.   If *n* is zero or
@@ -970,7 +981,8 @@
    The cursor position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.insstr([y, x, ] str [, attr])
+.. method:: window.insstr(str[, attr])
+            window.insstr(y, x, str[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor.  All characters to the right of the cursor are
@@ -978,7 +990,8 @@
    position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.instr([y, x] [, n])
+.. method:: window.instr([n])
+            window.instr(y, x[, n])
 
    Return a string of characters, extracted from the window starting at the
    current cursor position, or at *y*, *x* if specified. Attributes are stripped
@@ -1153,13 +1166,15 @@
    Turn on attribute *A_STANDOUT*.
 
 
-.. method:: window.subpad([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subpad(begin_y, begin_x)
+            window.subpad(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
 
 
-.. method:: window.subwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subwin(begin_y, begin_x)
+            window.subwin(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
@@ -1216,7 +1231,8 @@
    :meth:`refresh`.
 
 
-.. method:: window.vline([y, x,] ch, n)
+.. method:: window.vline(ch, n)
+            window.vline(y, x, ch, n)
 
    Display a vertical line starting at ``(y, x)`` with length *n* consisting of the
    character *ch*.
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -725,11 +725,16 @@
    already arranged into argument tuples, see :func:`itertools.starmap`\.
 
 
-.. function:: max(iterable[, args...], *[, key])
+.. function:: max(iterable, *[, key])
+              max(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the largest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the largest of the arguments.
+   Return the largest item in an iterable or the largest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The largest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the largest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -748,11 +753,16 @@
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable[, args...], *[, key])
+.. function:: min(iterable, *[, key])
+              min(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the smallest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the smallest of the arguments.
+   Return the smallest item in an iterable or the smallest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The smallest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the smallest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -970,16 +980,16 @@
    must be of integer types, and *y* must be non-negative.
 
 
-.. function:: print([object, ...], *, sep=' ', end='\\n', file=sys.stdout, flush=False)
+.. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout, flush=False)
 
-   Print *object*\(s) to the stream *file*, separated by *sep* and followed by
+   Print *objects* to the stream *file*, separated by *sep* and followed by
    *end*.  *sep*, *end* and *file*, if present, must be given as keyword
    arguments.
 
    All non-keyword arguments are converted to strings like :func:`str` does and
    written to the stream, separated by *sep* and followed by *end*.  Both *sep*
    and *end* must be strings; they can also be ``None``, which means to use the
-   default values.  If no *object* is given, :func:`print` will just write
+   default values.  If no *objects* are given, :func:`print` will just write
    *end*.
 
    The *file* argument must be an object with a ``write(string)`` method; if it
@@ -1061,7 +1071,8 @@
 
 
 .. _func-range:
-.. function:: range([start,] stop[, step])
+.. function:: range(stop)
+              range(start, stop[, step])
    :noindex:
 
    Rather than being a function, :class:`range` is actually an immutable
@@ -1126,7 +1137,8 @@
    ``x.foobar = 123``.
 
 
-.. function:: slice([start,] stop[, step])
+.. function:: slice(stop)
+              slice(start, stop[, step])
 
    .. index:: single: Numerical Python
 
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -27,7 +27,8 @@
 The module provides the following classes:
 
 
-.. class:: HTTPConnection(host, port=None[, strict[, timeout[, source_address]]])
+.. class:: HTTPConnection(host, port=None[, strict][, timeout], \
+                          source_address=None)
 
    An :class:`HTTPConnection` instance represents one transaction with an HTTP
    server.  It should be instantiated passing it a host and optional port
@@ -55,7 +56,10 @@
       are not supported anymore.
 
 
-.. class:: HTTPSConnection(host, port=None, key_file=None, cert_file=None[, strict[, timeout[, source_address]]], *, context=None, check_hostname=None)
+.. class:: HTTPSConnection(host, port=None, key_file=None, \
+                           cert_file=None[, strict][, timeout], \
+                           source_address=None, *, context=None, \
+                           check_hostname=None)
 
    A subclass of :class:`HTTPConnection` that uses SSL for communication with
    secure servers.  Default port is ``443``.  If *context* is specified, it
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -471,7 +471,7 @@
       Returns :class:`BoundArguments`, or raises a :exc:`TypeError` if the
       passed arguments do not match the signature.
 
-   .. method:: Signature.replace([parameters], *, [return_annotation])
+   .. method:: Signature.replace(*[, parameters][, return_annotation])
 
       Create a new Signature instance based on the instance replace was invoked
       on.  It is possible to pass different ``parameters`` and/or
@@ -565,7 +565,7 @@
          ...         print('Parameter:', param)
          Parameter: c
 
-   .. method:: Parameter.replace(*, [name], [kind], [default], [annotation])
+   .. method:: Parameter.replace(*[, name][, kind][, default][, annotation])
 
       Create a new Parameter instance based on the instance replaced was invoked
       on.  To override a :class:`Parameter` attribute, pass the corresponding
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -401,7 +401,8 @@
                   self.currkey = self.keyfunc(self.currvalue)
 
 
-.. function:: islice(iterable, [start,] stop [, step])
+.. function:: islice(iterable, stop)
+              islice(iterable, start, stop[, step])
 
    Make an iterator that returns selected elements from the iterable. If *start* is
    non-zero, then elements from the iterable are skipped until start is reached.
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -295,7 +295,8 @@
 :class:`Process` and exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. class:: Process([group[, target[, name[, args[, kwargs]]]]], *, daemon=None)
+.. class:: Process(group=None, target=None, name=None, args=(), kwargs={}, \
+                   *, daemon=None)
 
    Process objects represent activity that is run in a separate process. The
    :class:`Process` class has equivalents of all the methods of
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -273,7 +273,8 @@
 strings as you like (including zero), as long as there is at least one option
 string overall.
 
-The option strings passed to :meth:`add_option` are effectively labels for the
+The option strings passed to :meth:`OptionParser.add_option` are effectively
+labels for the
 option defined by that call.  For brevity, we will frequently refer to
 *encountering an option* on the command line; in reality, :mod:`optparse`
 encounters *option strings* and looks up options from them.
@@ -892,7 +893,8 @@
 The canonical way to create an :class:`Option` instance is with the
 :meth:`add_option` method of :class:`OptionParser`.
 
-.. method:: OptionParser.add_option(opt_str[, ...], attr=value, ...)
+.. method:: OptionParser.add_option(option)
+            OptionParser.add_option(*opt_str, attr=value, ...)
 
    To define an option with only a short option string::
 
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -67,7 +67,8 @@
    ``ossaudiodev.error``.)
 
 
-.. function:: open([device, ]mode)
+.. function:: open(mode)
+              open(device, mode)
 
    Open an audio device and return an OSS audio device object.  This object
    supports many file-like methods, such as :meth:`read`, :meth:`write`, and
diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -52,20 +52,20 @@
 
 Bookkeeping functions:
 
-.. function:: seed([x], version=2)
+.. function:: seed(a=None, version=2)
 
    Initialize the random number generator.
 
-   If *x* is omitted or ``None``, the current system time is used.  If
+   If *a* is omitted or ``None``, the current system time is used.  If
    randomness sources are provided by the operating system, they are used
    instead of the system time (see the :func:`os.urandom` function for details
    on availability).
 
-   If *x* is an int, it is used directly.
+   If *a* is an int, it is used directly.
 
    With version 2 (the default), a :class:`str`, :class:`bytes`, or :class:`bytearray`
    object gets converted to an :class:`int` and all of its bits are used.  With version 1,
-   the :func:`hash` of *x* is used instead.
+   the :func:`hash` of *a* is used instead.
 
    .. versionchanged:: 3.2
       Moved to the version 2 scheme which uses all of the bits in a string seed.
@@ -93,7 +93,8 @@
 
 Functions for integers:
 
-.. function:: randrange([start,] stop[, step])
+.. function:: randrange(stop)
+              randrange(start, stop[, step])
 
    Return a randomly selected element from ``range(start, stop, step)``.  This is
    equivalent to ``choice(range(start, stop, step))``, but doesn't actually build a
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1005,7 +1005,8 @@
    much data, if any, was successfully sent.
 
 
-.. method:: socket.sendto(bytes[, flags], address)
+.. method:: socket.sendto(bytes, address)
+            socket.sendto(bytes, flags, address)
 
    Send data to the socket.  The socket should not be connected to a remote socket,
    since the destination socket is specified by *address*.  The optional *flags*
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1235,7 +1235,8 @@
 commonly used for looping a specific number of times in :keyword:`for`
 loops.
 
-.. class:: range([start, ]stop[, step])
+.. class:: range(stop)
+           range(start, stop[, step])
 
    The arguments to the range constructor must be integers (either built-in
    :class:`int` or any object that implements the ``__index__`` special
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -17,7 +17,8 @@
 The module defines the following functions:
 
 
-.. function:: syslog([priority,] message)
+.. function:: syslog(message)
+              syslog(priority, message)
 
    Send the string *message* to the system logger.  A trailing newline is added
    if necessary.  Each message is tagged with a priority composed of a
diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst
--- a/Doc/library/tkinter.tix.rst
+++ b/Doc/library/tkinter.tix.rst
@@ -504,7 +504,7 @@
       print(root.tix_configure())
 
 
-.. method:: tixCommand.tix_configure([cnf,] **kw)
+.. method:: tixCommand.tix_configure(cnf=None, **kw)
 
    Query or modify the configuration options of the Tix application context. If no
    option is specified, returns a dictionary all of the available options.  If

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 14 06:01:37 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 14 Sep 2012 06:01:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1ODMxOiBkb2N1?=
 =?utf-8?q?ment_multiple_signatures_on_different_lines=2E__Patch_by_Chris?=
Message-ID: <3XJ3294zv7zQhW@mail.python.org>

http://hg.python.org/cpython/rev/2291aff20a05
changeset:   79025:2291aff20a05
branch:      2.7
parent:      79022:76dd082d332e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 14 06:48:32 2012 +0300
summary:
  #15831: document multiple signatures on different lines.  Patch by Chris Jerdonek.

files:
  Doc/library/argparse.rst        |   9 ++-
  Doc/library/curses.rst          |  44 ++++++++++++++------
  Doc/library/functions.rst       |  41 ++++++++++++------
  Doc/library/itertools.rst       |   3 +-
  Doc/library/multiprocessing.rst |   2 +-
  Doc/library/optparse.rst        |   6 +-
  Doc/library/ossaudiodev.rst     |   3 +-
  Doc/library/random.rst          |   3 +-
  Doc/library/socket.rst          |   3 +-
  Doc/library/syslog.rst          |   3 +-
  Doc/library/tix.rst             |   2 +-
  11 files changed, 79 insertions(+), 40 deletions(-)


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -130,9 +130,12 @@
 ArgumentParser objects
 ----------------------
 
-.. class:: ArgumentParser([description], [epilog], [prog], [usage], [add_help], \
-                          [argument_default], [parents], [prefix_chars], \
-                          [conflict_handler], [formatter_class])
+.. class:: ArgumentParser(prog=None, usage=None, description=None, \
+                          epilog=None, parents=[], \
+                          formatter_class=argparse.HelpFormatter, \
+                          prefix_chars='-', fromfile_prefix_chars=None, \
+                          argument_default=None, conflict_handler='error', \
+                          add_help=True)
 
    Create a new :class:`ArgumentParser` object.  Each parameter has its own more
    detailed description below, but in short they are:
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -380,7 +380,8 @@
    is to be displayed.
 
 
-.. function:: newwin([nlines, ncols,] begin_y, begin_x)
+.. function:: newwin(begin_y, begin_x)
+              newwin(nlines, ncols, begin_y, begin_x)
 
    Return a new window, whose left-upper corner is at  ``(begin_y, begin_x)``, and
    whose height/width is  *nlines*/*ncols*.
@@ -648,7 +649,8 @@
 the following methods:
 
 
-.. method:: window.addch([y, x,] ch[, attr])
+.. method:: window.addch(ch[, attr])
+            window.addch(y, x, ch[, attr])
 
    .. note::
 
@@ -662,13 +664,15 @@
    position and attributes are the current settings for the window object.
 
 
-.. method:: window.addnstr([y, x,] str, n[, attr])
+.. method:: window.addnstr(str, n[, attr])
+            window.addnstr(y, x, str, n[, attr])
 
    Paint at most *n* characters of the  string *str* at ``(y, x)`` with attributes
    *attr*, overwriting anything previously on the display.
 
 
-.. method:: window.addstr([y, x,] str[, attr])
+.. method:: window.addstr(str[, attr])
+            window.addstr(y, x, str[, attr])
 
    Paint the string *str* at ``(y, x)`` with attributes *attr*, overwriting
    anything previously on the display.
@@ -755,7 +759,10 @@
    *bs* are *horch*.  The default corner characters are always used by this function.
 
 
-.. method:: window.chgat([y, x, ] [num,] attr)
+.. method:: window.chgat(attr)
+            window.chgat(num, attr)
+            window.chgat(y, x, attr)
+            window.chgat(y, x, num, attr)
 
    Set the attributes of *num* characters at the current cursor position, or at
    position ``(y, x)`` if supplied. If no value of *num* is given or *num* = -1,
@@ -804,7 +811,8 @@
    Delete the line under the cursor. All following lines are moved up by one line.
 
 
-.. method:: window.derwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.derwin(begin_y, begin_x)
+            window.derwin(nlines, ncols, begin_y, begin_x)
 
    An abbreviation for "derive window", :meth:`derwin` is the same as calling
    :meth:`subwin`, except that *begin_y* and *begin_x* are relative to the origin
@@ -879,7 +887,8 @@
    upper-left corner.
 
 
-.. method:: window.hline([y, x,] ch, n)
+.. method:: window.hline(ch, n)
+            window.hline(y, x, ch, n)
 
    Display a horizontal line starting at ``(y, x)`` with length *n* consisting of
    the character *ch*.
@@ -913,7 +922,8 @@
    the character proper, and upper bits are the attributes.
 
 
-.. method:: window.insch([y, x,] ch[, attr])
+.. method:: window.insch(ch[, attr])
+            window.insch(y, x, ch[, attr])
 
    Paint character *ch* at ``(y, x)`` with attributes *attr*, moving the line from
    position *x* right by one character.
@@ -934,7 +944,8 @@
    line.
 
 
-.. method:: window.insnstr([y, x,] str, n [, attr])
+.. method:: window.insnstr(str, n[, attr])
+            window.insnstr(y, x, str, n[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor, up to *n* characters.   If *n* is zero or
@@ -943,7 +954,8 @@
    The cursor position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.insstr([y, x, ] str [, attr])
+.. method:: window.insstr(str[, attr])
+            window.insstr(y, x, str[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor.  All characters to the right of the cursor are
@@ -951,7 +963,8 @@
    position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.instr([y, x] [, n])
+.. method:: window.instr([n])
+            window.instr(y, x[, n])
 
    Return a string of characters, extracted from the window starting at the
    current cursor position, or at *y*, *x* if specified. Attributes are stripped
@@ -1126,13 +1139,15 @@
    Turn on attribute *A_STANDOUT*.
 
 
-.. method:: window.subpad([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subpad(begin_y, begin_x)
+            window.subpad(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
 
 
-.. method:: window.subwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subwin(begin_y, begin_x)
+            window.subwin(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
@@ -1189,7 +1204,8 @@
    :meth:`refresh`.
 
 
-.. method:: window.vline([y, x,] ch, n)
+.. method:: window.vline(ch, n)
+            window.vline(y, x, ch, n)
 
    Display a vertical line starting at ``(y, x)`` with length *n* consisting of the
    character *ch*.
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -753,11 +753,16 @@
    the result is always a list.
 
 
-.. function:: max(iterable[, args...][key])
+.. function:: max(iterable[, key])
+              max(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the largest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the largest of the arguments.
+   Return the largest item in an iterable or the largest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The largest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the largest of the positional arguments is returned.
 
    The optional *key* argument specifies a one-argument ordering function like that
    used for :meth:`list.sort`.  The *key* argument, if supplied, must be in keyword
@@ -774,11 +779,16 @@
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable[, args...][key])
+.. function:: min(iterable, *[, key])
+              min(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the smallest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the smallest of the arguments.
+   Return the smallest item in an iterable or the smallest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The smallest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the smallest of the positional arguments is returned.
 
    The optional *key* argument specifies a one-argument ordering function like that
    used for :meth:`list.sort`.  The *key* argument, if supplied, must be in keyword
@@ -918,16 +928,16 @@
    accidents.)
 
 
-.. function:: print([object, ...], sep=' ', end='\\n', file=sys.stdout)
+.. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout)
 
-   Print *object*\(s) to the stream *file*, separated by *sep* and followed by
+   Print *objects* to the stream *file*, separated by *sep* and followed by
    *end*.  *sep*, *end* and *file*, if present, must be given as keyword
    arguments.
 
    All non-keyword arguments are converted to strings like :func:`str` does and
    written to the stream, separated by *sep* and followed by *end*.  Both *sep*
    and *end* must be strings; they can also be ``None``, which means to use the
-   default values.  If no *object* is given, :func:`print` will just write
+   default values.  If no *objects* are given, :func:`print` will just write
    *end*.
 
    The *file* argument must be an object with a ``write(string)`` method; if it
@@ -1025,7 +1035,8 @@
       The ``getter``, ``setter``, and ``deleter`` attributes were added.
 
 
-.. function:: range([start,] stop[, step])
+.. function:: range(stop)
+              range(start, stop[, step])
 
    This is a versatile function to create lists containing arithmetic progressions.
    It is most often used in :keyword:`for` loops.  The arguments must be plain
@@ -1221,7 +1232,8 @@
    ``x.foobar = 123``.
 
 
-.. function:: slice([start,] stop[, step])
+.. function:: slice(stop)
+              slice(start, stop[, step])
 
    .. index:: single: Numerical Python
 
@@ -1497,7 +1509,8 @@
    dictionary are ignored.
 
 
-.. function:: xrange([start,] stop[, step])
+.. function:: xrange(stop)
+              xrange(start, stop[, step])
 
    This function is very similar to :func:`range`, but returns an "xrange object"
    instead of a list.  This is an opaque sequence type which yields the same values
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -393,7 +393,8 @@
                   yield function(*args)
 
 
-.. function:: islice(iterable, [start,] stop [, step])
+.. function:: islice(iterable, stop)
+              islice(iterable, start, stop[, step])
 
    Make an iterator that returns selected elements from the iterable. If *start* is
    non-zero, then elements from the iterable are skipped until start is reached.
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -298,7 +298,7 @@
 :class:`Process` and exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. class:: Process([group[, target[, name[, args[, kwargs]]]]])
+.. class:: Process(group=None, target=None, name=None, args=(), kwargs={})
 
    Process objects represent activity that is run in a separate process. The
    :class:`Process` class has equivalents of all the methods of
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -275,7 +275,8 @@
 strings as you like (including zero), as long as there is at least one option
 string overall.
 
-The option strings passed to :meth:`add_option` are effectively labels for the
+The option strings passed to :meth:`OptionParser.add_option` are effectively
+labels for the
 option defined by that call.  For brevity, we will frequently refer to
 *encountering an option* on the command line; in reality, :mod:`optparse`
 encounters *option strings* and looks up options from them.
@@ -895,7 +896,8 @@
 The canonical way to create an :class:`Option` instance is with the
 :meth:`add_option` method of :class:`OptionParser`.
 
-.. method:: OptionParser.add_option(opt_str[, ...], attr=value, ...)
+.. method:: OptionParser.add_option(option)
+            OptionParser.add_option(*opt_str, attr=value, ...)
 
    To define an option with only a short option string::
 
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -66,7 +66,8 @@
    ``ossaudiodev.error``.)
 
 
-.. function:: open([device, ]mode)
+.. function:: open(mode)
+              open(device, mode)
 
    Open an audio device and return an OSS audio device object.  This object
    supports many file-like methods, such as :meth:`read`, :meth:`write`, and
diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -124,7 +124,8 @@
 Functions for integers:
 
 
-.. function:: randrange([start,] stop[, step])
+.. function:: randrange(stop)
+              randrange(start, stop[, step])
 
    Return a randomly selected element from ``range(start, stop, step)``.  This is
    equivalent to ``choice(range(start, stop, step))``, but doesn't actually build a
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -739,7 +739,8 @@
    much data, if any, was successfully sent.
 
 
-.. method:: socket.sendto(string[, flags], address)
+.. method:: socket.sendto(string, address)
+            socket.sendto(string, flags, address)
 
    Send data to the socket.  The socket should not be connected to a remote socket,
    since the destination socket is specified by *address*.  The optional *flags*
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -17,7 +17,8 @@
 The module defines the following functions:
 
 
-.. function:: syslog([priority,] message)
+.. function:: syslog(message)
+              syslog(priority, message)
 
    Send the string *message* to the system logger.  A trailing newline is added
    if necessary.  Each message is tagged with a priority composed of a
diff --git a/Doc/library/tix.rst b/Doc/library/tix.rst
--- a/Doc/library/tix.rst
+++ b/Doc/library/tix.rst
@@ -514,7 +514,7 @@
       print root.tix_configure()
 
 
-.. method:: tixCommand.tix_configure([cnf,] **kw)
+.. method:: tixCommand.tix_configure(cnf=None **kw)
 
    Query or modify the configuration options of the Tix application context. If no
    option is specified, returns a dictionary all of the available options.  If

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Fri Sep 14 06:05:58 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 14 Sep 2012 06:05:58 +0200
Subject: [Python-checkins] Daily reference leaks (2b4a89f82485): sum=0
Message-ID: <E1TCNAE-0001Gs-Gm@ap.vmr.nerim.net>

results for 2b4a89f82485 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogRmaFc3', '-x']

From python-checkins at python.org  Fri Sep 14 17:34:18 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri, 14 Sep 2012 17:34:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1ODQy?=
 =?utf-8?q?=3A_the_SocketIO=2E=7Breadable=2Cwritable=2Cseekable=7D_methods?=
 =?utf-8?q?_now_raise?=
Message-ID: <3XJLPQ06Q3zLw8@mail.python.org>

http://hg.python.org/cpython/rev/fad797916266
changeset:   79026:fad797916266
branch:      3.2
parent:      79023:b01eb870f84f
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Sep 14 17:28:10 2012 +0200
summary:
  Issue #15842: the SocketIO.{readable,writable,seekable} methods now raise ValueError when the file-like object is closed.
Patch by Alessandro Moura.

files:
  Lib/socket.py           |  15 +++++++++++++--
  Lib/test/test_socket.py |  11 +++++++++++
  Misc/NEWS               |   4 ++++
  3 files changed, 28 insertions(+), 2 deletions(-)


diff --git a/Lib/socket.py b/Lib/socket.py
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -315,12 +315,23 @@
     def readable(self):
         """True if the SocketIO is open for reading.
         """
-        return self._reading and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._reading
 
     def writable(self):
         """True if the SocketIO is open for writing.
         """
-        return self._writing and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._writing
+
+    def seekable(self):
+        """True if the SocketIO is open for seeking.
+        """
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return super().seekable()
 
     def fileno(self):
         """Return the file descriptor of the underlying socket.
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -839,6 +839,17 @@
             fp.close()
             self.assertEqual(repr(fp), "<_io.BufferedReader name=-1>")
 
+    def test_unusable_closed_socketio(self):
+        with socket.socket() as sock:
+            fp = sock.makefile("rb", buffering=0)
+            self.assertTrue(fp.readable())
+            self.assertFalse(fp.writable())
+            self.assertFalse(fp.seekable())
+            fp.close()
+            self.assertRaises(ValueError, fp.readable)
+            self.assertRaises(ValueError, fp.writable)
+            self.assertRaises(ValueError, fp.seekable)
+
     def testListenBacklog0(self):
         srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         srv.bind((HOST, 0))
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,10 @@
 Library
 -------
 
+- Issue #15842: the SocketIO.{readable,writable,seekable} methods now
+  raise ValueError when the file-like object is closed.  Patch by Alessandro
+  Moura.
+
 - Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
   by Chris McDonough.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 14 17:34:19 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Fri, 14 Sep 2012 17:34:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315842=3A_the_SocketIO=2E=7Breadable=2Cwritable?=
 =?utf-8?q?=2Cseekable=7D_methods_now_raise?=
Message-ID: <3XJLPR4YZ4zQ4v@mail.python.org>

http://hg.python.org/cpython/rev/3b0e20f71d8a
changeset:   79027:3b0e20f71d8a
parent:      79024:0ed61ee823d8
parent:      79026:fad797916266
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Fri Sep 14 17:30:31 2012 +0200
summary:
  Issue #15842: the SocketIO.{readable,writable,seekable} methods now raise ValueError when the file-like object is closed.
Patch by Alessandro Moura.

files:
  Lib/socket.py           |  15 +++++++++++++--
  Lib/test/test_socket.py |  11 +++++++++++
  Misc/NEWS               |   4 ++++
  3 files changed, 28 insertions(+), 2 deletions(-)


diff --git a/Lib/socket.py b/Lib/socket.py
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -324,12 +324,23 @@
     def readable(self):
         """True if the SocketIO is open for reading.
         """
-        return self._reading and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._reading
 
     def writable(self):
         """True if the SocketIO is open for writing.
         """
-        return self._writing and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._writing
+
+    def seekable(self):
+        """True if the SocketIO is open for seeking.
+        """
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return super().seekable()
 
     def fileno(self):
         """Return the file descriptor of the underlying socket.
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1245,6 +1245,17 @@
             fp.close()
             self.assertEqual(repr(fp), "<_io.BufferedReader name=-1>")
 
+    def test_unusable_closed_socketio(self):
+        with socket.socket() as sock:
+            fp = sock.makefile("rb", buffering=0)
+            self.assertTrue(fp.readable())
+            self.assertFalse(fp.writable())
+            self.assertFalse(fp.seekable())
+            fp.close()
+            self.assertRaises(ValueError, fp.readable)
+            self.assertRaises(ValueError, fp.writable)
+            self.assertRaises(ValueError, fp.seekable)
+
     def test_pickle(self):
         sock = socket.socket()
         with sock:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,10 @@
 Library
 -------
 
+- Issue #15842: the SocketIO.{readable,writable,seekable} methods now
+  raise ValueError when the file-like object is closed.  Patch by Alessandro
+  Moura.
+
 - Issue #15882: Change _decimal to accept any coefficient tuple when
   constructing infinities. This is done for backwards compatibility
   with decimal.py: Infinity coefficients are undefined in _decimal

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 15 00:12:07 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_chaos_ben?=
	=?utf-8?q?chmark=2E?=
Message-ID: <3XJWDR1m2yzQ6B@mail.python.org>

http://hg.python.org/benchmarks/rev/853737d363da
changeset:   165:853737d363da
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 10:23:19 2012 -0400
summary:
  Port PyPy's chaos benchmark.

files:
  perf.py                 |   12 +-
  performance/bm_chaos.py |  264 ++++++++++++++++++++++++++++
  2 files changed, 274 insertions(+), 2 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1614,10 +1614,18 @@
     bm_path = Relative("performance/bm_nqueens.py")
     return MeasureGeneric(python, options, bm_path)
 
-
 def BM_NQueens(*args, **kwargs):
     return SimpleBenchmark(MeasureNQueens, *args, **kwargs)
 
+
+def MeasureChaos(python, options):
+    bm_path = Relative("performance/bm_chaos.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Chaos(*args, **kwargs):
+    return SimpleBenchmark(MeasureChaos, *args, **kwargs)
+
+
 def MeasureLogging(python, options, extra_args):
     """Test the performance of Python's logging module.
 
@@ -2004,7 +2012,7 @@
                 "template" : ["slowspitfire", "django", "mako"],
                 "logging": ["silent_logging", "simple_logging", "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
-                "2n3": ["calls", "math", "fastpickle", "fastunpickle",
+                "2n3": ["calls", "chaos", "math", "fastpickle", "fastunpickle",
                         "json_dump", "json_load", "regex", "threading",
                         "nqueens", "unpack_sequence", "richards",
                         "logging", "normal_startup", "startup_nosite",
diff --git a/performance/bm_chaos.py b/performance/bm_chaos.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_chaos.py
@@ -0,0 +1,264 @@
+#   Copyright (C) 2005 Carl Friedrich Bolz
+
+"""create chaosgame-like fractals
+"""
+
+from __future__ import division
+
+import operator
+import optparse
+import random
+random.seed(1234)
+import math
+import os
+import sys
+import time
+
+from compat import print_, reduce, xrange
+
+class GVector(object):
+    def __init__(self, x = 0, y = 0, z = 0):
+        self.x = x
+        self.y = y
+        self.z = z
+
+    def Mag(self):
+        return math.sqrt(self.x ** 2 + self.y ** 2 + self.z ** 2)
+
+    def dist(self, other):
+        return math.sqrt((self.x - other.x) ** 2 +
+                         (self.y - other.y) ** 2 +
+                         (self.z - other.z) ** 2)
+
+    def __add__(self, other):
+        if not isinstance(other, GVector):
+            raise ValueError("Can't add GVector to " + str(type(other)))
+        v = GVector(self.x + other.x, self.y + other.y, self.z + other.z)
+        return v
+
+    def __sub__(self, other):
+        return self + other * -1
+
+    def __mul__(self, other):
+        v = GVector(self.x * other, self.y * other, self.z * other)
+        return v
+    __rmul__ = __mul__
+
+    def linear_combination(self, other, l1, l2=None):
+        if l2 is None:
+            l2 = 1 - l1
+        v = GVector(self.x * l1 + other.x * l2,
+                    self.y * l1 + other.y * l2,
+                    self.z * l1 + other.z * l2)
+        return v
+
+
+    def __str__(self):
+        return "<%f, %f, %f>" % (self.x, self.y, self.z)
+
+    def __repr__(self):
+        return "GVector(%f, %f, %f)" % (self.x, self.y, self.z)
+
+def GetKnots(points, degree):
+    knots = [0] * degree + range(1, len(points) - degree)
+    knots += [len(points) - degree] * degree
+    return knots
+
+class Spline(object):
+    """Class for representing B-Splines and NURBS of arbitrary degree"""
+    def __init__(self, points, degree = 3, knots = None):
+        """Creates a Spline. points is a list of GVector, degree is the
+degree of the Spline."""
+        if knots == None:
+            self.knots = GetKnots(points, degree)
+        else:
+            if len(points) > len(knots) - degree + 1:
+                raise ValueError("too many control points")
+            elif len(points) < len(knots) - degree + 1:
+                raise ValueError("not enough control points")
+            last = knots[0]
+            for cur in knots[1:]:
+                if cur < last:
+                    raise ValueError("knots not strictly increasing")
+                last = cur
+            self.knots = knots
+        self.points = points
+        self.degree = degree
+
+    def GetDomain(self):
+        """Returns the domain of the B-Spline"""
+        return (self.knots[self.degree - 1],
+                self.knots[len(self.knots) - self.degree])
+
+    def __call__(self, u):
+        """Calculates a point of the B-Spline using de Boors Algorithm"""
+        dom = self.GetDomain()
+        if u < dom[0] or u > dom[1]:
+            raise ValueError("Function value not in domain")
+        if u == dom[0]:
+            return self.points[0]
+        if u == dom[1]:
+            return self.points[-1]
+        I = self.GetIndex(u)
+        d = [self.points[I - self.degree + 1 + ii]
+             for ii in range(self.degree + 1)]
+        U = self.knots
+        for ik in range(1, self.degree + 1):
+            for ii in range(I - self.degree + ik + 1, I + 2):
+                ua = U[ii + self.degree - ik]
+                ub = U[ii - 1]
+                co1 = (ua - u) / (ua - ub)
+                co2 = (u - ub) / (ua - ub)
+                index = ii - I + self.degree - ik - 1
+                d[index] = d[index].linear_combination(d[index + 1], co1, co2)
+        return d[0]
+
+    def GetIndex(self, u):
+        dom = self.GetDomain()
+        for ii in range(self.degree - 1, len(self.knots) - self.degree):
+            if u >= self.knots[ii] and u < self.knots[ii + 1]:
+                I = ii
+                break
+        else:
+             I = dom[1] - 1
+        return I
+
+    def __len__(self):
+        return len(self.points)
+
+    def __repr__(self):
+        return "Spline(%r, %r, %r)" % (self.points, self.degree, self.knots)
+
+
+class Chaosgame(object):
+    def __init__(self, splines, thickness=0.1):
+        self.splines = splines
+        self.thickness = thickness
+        self.minx = min([p.x for spl in splines for p in spl.points])
+        self.miny = min([p.y for spl in splines for p in spl.points])
+        self.maxx = max([p.x for spl in splines for p in spl.points])
+        self.maxy = max([p.y for spl in splines for p in spl.points])
+        self.height = self.maxy - self.miny
+        self.width = self.maxx - self.minx
+        self.num_trafos = []
+        maxlength = thickness * self.width / self.height
+        for spl in splines:
+            length = 0
+            curr = spl(0)
+            for i in range(1, 1000):
+                last = curr
+                t = 1 / 999 * i
+                curr = spl(t)
+                length += curr.dist(last)
+            self.num_trafos.append(max(1, int(length / maxlength * 1.5)))
+        self.num_total = reduce(operator.add, self.num_trafos, 0)
+
+
+    def get_random_trafo(self):
+        r = random.randrange(int(self.num_total) + 1)
+        l = 0
+        for i in range(len(self.num_trafos)):
+            if r >= l and r < l + self.num_trafos[i]:
+                return i, random.randrange(self.num_trafos[i])
+            l += self.num_trafos[i]
+        return len(self.num_trafos) - 1, random.randrange(self.num_trafos[-1])
+
+    def transform_point(self, point, trafo=None):
+        x = (point.x - self.minx) / self.width
+        y = (point.y - self.miny) / self.height
+        if trafo is None:
+            trafo = self.get_random_trafo()
+        start, end = self.splines[trafo[0]].GetDomain()
+        length = end - start
+        seg_length = length / self.num_trafos[trafo[0]]
+        t = start + seg_length * trafo[1] + seg_length * x
+        basepoint = self.splines[trafo[0]](t)
+        if t + 1/50000 > end:
+            neighbour = self.splines[trafo[0]](t - 1/50000)
+            derivative = neighbour - basepoint
+        else:
+            neighbour = self.splines[trafo[0]](t + 1/50000)
+            derivative = basepoint - neighbour
+        if derivative.Mag() != 0:
+            basepoint.x += derivative.y / derivative.Mag() * (y - 0.5) * \
+                           self.thickness
+            basepoint.y += -derivative.x / derivative.Mag() * (y - 0.5) * \
+                           self.thickness
+        else:
+            print_("r", end='')
+        self.truncate(basepoint)
+        return basepoint
+
+    def truncate(self, point):
+        if point.x >= self.maxx:
+            point.x = self.maxx
+        if point.y >= self.maxy:
+            point.y = self.maxy
+        if point.x < self.minx:
+            point.x = self.minx
+        if point.y < self.miny:
+            point.y = self.miny
+
+    def create_image_chaos(self, w, h, n):
+        im = [[1] * h for i in range(w)]
+        point = GVector((self.maxx + self.minx) / 2,
+                        (self.maxy + self.miny) / 2, 0)
+        colored = 0
+        times = []
+        for _ in range(n):
+            t1 = time.time()
+            for i in xrange(5000):
+                point = self.transform_point(point)
+                x = (point.x - self.minx) / self.width * w
+                y = (point.y - self.miny) / self.height * h
+                x = int(x)
+                y = int(y)
+                if x == w:
+                    x -= 1
+                if y == h:
+                    y -= 1
+                im[x][h - y - 1] = 0
+            t2 = time.time()
+            times.append(t2 - t1)
+        return times
+
+
+def main(n):
+    splines = [
+        Spline([
+            GVector(1.597350, 3.304460, 0.000000),
+            GVector(1.575810, 4.123260, 0.000000),
+            GVector(1.313210, 5.288350, 0.000000),
+            GVector(1.618900, 5.329910, 0.000000),
+            GVector(2.889940, 5.502700, 0.000000),
+            GVector(2.373060, 4.381830, 0.000000),
+            GVector(1.662000, 4.360280, 0.000000)],
+            3, [0, 0, 0, 1, 1, 1, 2, 2, 2]),
+        Spline([
+            GVector(2.804500, 4.017350, 0.000000),
+            GVector(2.550500, 3.525230, 0.000000),
+            GVector(1.979010, 2.620360, 0.000000),
+            GVector(1.979010, 2.620360, 0.000000)],
+            3, [0, 0, 0, 1, 1, 1]),
+        Spline([
+            GVector(2.001670, 4.011320, 0.000000),
+            GVector(2.335040, 3.312830, 0.000000),
+            GVector(2.366800, 3.233460, 0.000000),
+            GVector(2.366800, 3.233460, 0.000000)],
+            3, [0, 0, 0, 1, 1, 1])
+        ]
+    c = Chaosgame(splines, 0.25)
+    return c.create_image_chaos(1000, 1200, n)
+
+
+
+if __name__ == "__main__":
+    import util
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the Chaos benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)
+

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:08 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Remove_dead_file=2E?=
Message-ID: <3XJWDS3yrbzQCt@mail.python.org>

http://hg.python.org/benchmarks/rev/29b7da4ef90b
changeset:   166:29b7da4ef90b
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 10:23:45 2012 -0400
summary:
  Remove dead file.

files:
  performance/test_bm_ai.py |  31 ---------------------------
  1 files changed, 0 insertions(+), 31 deletions(-)


diff --git a/performance/test_bm_ai.py b/performance/test_bm_ai.py
deleted file mode 100644
--- a/performance/test_bm_ai.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-
-"""Brief tests for bm_ai.py"""
-
-__author__ = "collinwinter at google.com (Collin Winter)"
-
-# Python imports
-import unittest
-
-# Local imports
-import bm_ai
-
-
-class AiTests(unittest.TestCase):
-
-    def test_permutations(self):
-        result = set(bm_ai.permutations(range(3), 2))
-        correct = set([(0, 1), (0, 2), (1, 0), (1, 2), (2, 0), (2, 1)])
-        self.assertEqual(result, correct)
-
-    def test_alphametics(self):
-        result = set(bm_ai.alphametics("ABAB + BABA == CCCC"))
-        self.assertTrue("2727 + 7272 == 9999" in result, result)
-
-    def test_n_queens(self):
-        result = set(bm_ai.n_queens(4))
-        correct = set([(1, 3, 0, 2), (2, 0, 3, 1)])
-        self.assertEqual(result, correct)
-
-if __name__ == "__main__":
-    unittest.main()

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:09 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_fannkuch_?=
	=?utf-8?q?benchmark=2E?=
Message-ID: <3XJWDT6XLczQNT@mail.python.org>

http://hg.python.org/benchmarks/rev/5ebfddd6a81e
changeset:   167:5ebfddd6a81e
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 10:49:27 2012 -0400
summary:
  Port PyPy's fannkuch benchmark.

files:
  perf.py                    |  10 +++-
  performance/bm_fannkuch.py |  72 ++++++++++++++++++++++++++
  2 files changed, 81 insertions(+), 1 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1626,6 +1626,14 @@
     return SimpleBenchmark(MeasureChaos, *args, **kwargs)
 
 
+def MeasureFannkuch(python, options):
+    bm_path = Relative("performance/bm_fannkuch.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Fannkuch(*args, **kwargs):
+    return SimpleBenchmark(MeasureChaos, *args, **kwargs)
+
+
 def MeasureLogging(python, options, extra_args):
     """Test the performance of Python's logging module.
 
@@ -2016,7 +2024,7 @@
                         "json_dump", "json_load", "regex", "threading",
                         "nqueens", "unpack_sequence", "richards",
                         "logging", "normal_startup", "startup_nosite",
-                        "pathlib"],
+                        "pathlib", "fannkuch"],
                 # After 2to3-conversion
                 "py3k": ["2to3", "2n3", "mako"]
                }
diff --git a/performance/bm_fannkuch.py b/performance/bm_fannkuch.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_fannkuch.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# The Computer Language Benchmarks Game
+# http://shootout.alioth.debian.org/
+#
+# contributed by Sokolov Yura
+# modified by Tupteq
+
+from compat import xrange
+import optparse
+import time
+import util
+
+def fannkuch(n):
+    count = list(range(1, n+1))
+    max_flips = 0
+    m = n-1
+    r = n
+    check = 0
+    perm1 = list(range(n))
+    perm = list(range(n))
+    perm1_ins = perm1.insert
+    perm1_pop = perm1.pop
+
+    while 1:
+        if check < 30:
+            #print "".join(str(i+1) for i in perm1)
+            check += 1
+
+        while r != 1:
+            count[r-1] = r
+            r -= 1
+
+        if perm1[0] != 0 and perm1[m] != m:
+            perm = perm1[:]
+            flips_count = 0
+            k = perm[0]
+            while k:
+                perm[:k+1] = perm[k::-1]
+                flips_count += 1
+                k = perm[0]
+
+            if flips_count > max_flips:
+                max_flips = flips_count
+
+        while r != n:
+            perm1_ins(r, perm1_pop(0))
+            count[r] -= 1
+            if count[r] > 0:
+                break
+            r += 1
+        else:
+            return max_flips
+
+DEFAULT_ARG = 9
+
+def main(n):
+    times = []
+    for i in range(n):
+        t0 = time.time()
+        fannkuch(DEFAULT_ARG)
+        tk = time.time()
+        times.append(tk - t0)
+    return times
+    
+if __name__ == "__main__":
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the Float benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:11 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Tweak_import_order_to_f?=
 =?utf-8?q?ollow_style_of_other_modules=2E?=
Message-ID: <3XJWDW1dcNzQVk@mail.python.org>

http://hg.python.org/benchmarks/rev/55f65f914a65
changeset:   168:55f65f914a65
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 10:52:12 2012 -0400
summary:
  Tweak import order to follow style of other modules.

files:
  performance/bm_fannkuch.py |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/performance/bm_fannkuch.py b/performance/bm_fannkuch.py
--- a/performance/bm_fannkuch.py
+++ b/performance/bm_fannkuch.py
@@ -1,15 +1,16 @@
-# -*- coding: utf-8 -*-
 # The Computer Language Benchmarks Game
 # http://shootout.alioth.debian.org/
 #
 # contributed by Sokolov Yura
 # modified by Tupteq
 
-from compat import xrange
 import optparse
 import time
 import util
 
+from compat import xrange
+
+
 def fannkuch(n):
     count = list(range(1, n+1))
     max_flips = 0

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:12 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_float_ben?=
	=?utf-8?q?chmark=2E?=
Message-ID: <3XJWDX3tw3zQHY@mail.python.org>

http://hg.python.org/benchmarks/rev/21dbe371dfdc
changeset:   169:21dbe371dfdc
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 10:54:44 2012 -0400
summary:
  Port PyPy's float benchmark.

files:
  performance/bm_float.py |  81 ++++++++++++----------------
  1 files changed, 35 insertions(+), 46 deletions(-)


diff --git a/performance/bm_float.py b/performance/bm_float.py
--- a/performance/bm_float.py
+++ b/performance/bm_float.py
@@ -1,79 +1,68 @@
-#! /usr/bin/env python
+from compat import xrange
+import util
 
-"""
-Semi-micro benchmark for floating point performance.
-
-This is a Python implementation of a floating point benchmark originally on the
-Factor language blog:
-http://factor-language.blogspot.com/2009/08/performance-comparison-between-factor.html
-
-Local changes:
-- Reduced the number of points from 5000000 to 20000. This reduces individual
-  iteration times, but we compensate by increasing the number of iterations.
-"""
-
-__author__ = "alex.gaynor at gmail.com (Alex Gaynor)"
-
-# Python imports
+from math import sin, cos, sqrt
 import optparse
 import time
-from math import sin, cos, sqrt
-
-# Local imports
-import util
-from compat import xrange, next
-
 
 class Point(object):
+
     def __init__(self, i):
         self.x = x = sin(i)
         self.y = cos(i) * 3
         self.z = (x * x) / 2
 
+    def __repr__(self):
+        return "<Point: x=%s, y=%s, z=%s>" % (self.x, self.y, self.z)
+
     def normalize(self):
-        norm = sqrt(self.x ** 2 + self.y ** 2 + self.z ** 2)
-        self.x = self.x / norm
-        self.y = self.y / norm
-        self.z = self.z / norm
+        x = self.x
+        y = self.y
+        z = self.z
+        norm = sqrt(x * x + y * y + z * z)
+        self.x /= norm
+        self.y /= norm
+        self.z /= norm
 
     def maximize(self, other):
         self.x = self.x if self.x > other.x else other.x
         self.y = self.y if self.y > other.y else other.y
         self.z = self.z if self.z > other.z else other.z
+        return self
 
 
 def maximize(points):
-    points = iter(points)
-    cur = next(points)
-    for p in points:
-        cur.maximize(p)
-    return cur
+    next = points[0]
+    for p in points[1:]:
+        next = next.maximize(p)
+    return next
 
-
-def benchmark():
-    points = []
-    for i in xrange(20000):
-        points.append(Point(i))
+def benchmark(n):
+    points = [None] * n
+    for i in xrange(n):
+        points[i] = Point(i)
     for p in points:
         p.normalize()
-    maximize(points)
+    return maximize(points)
 
+POINTS = 100000
 
-def test_float(count):
+def main(arg):
+    # XXX warmup
+    
     times = []
-    for _ in xrange(count):
+    for i in xrange(arg):
         t0 = time.time()
-        benchmark()
-        t1 = time.time()
-        times.append(t1 - t0)
+        o = benchmark(POINTS)
+        tk = time.time()
+        times.append(tk - t0)
     return times
-
-
+    
 if __name__ == "__main__":
     parser = optparse.OptionParser(
         usage="%prog [options]",
-        description="Test the performance of various floating point ops")
+        description="Test the performance of the Float benchmark")
     util.add_standard_options_to(parser)
     options, args = parser.parse_args()
 
-    util.run_benchmark(options, options.num_runs, test_float)
+    util.run_benchmark(options, options.num_runs, main)

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:14 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_meteor-co?=
	=?utf-8?q?ntest_benchmark=2E?=
Message-ID: <3XJWDZ09MQzQDx@mail.python.org>

http://hg.python.org/benchmarks/rev/4a1cb20b9560
changeset:   170:4a1cb20b9560
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 11:01:08 2012 -0400
summary:
  Port PyPy's meteor-contest benchmark.

files:
  perf.py                          |   12 +-
  performance/bm_meteor_contest.py |  161 +++++++++++++++++++
  2 files changed, 171 insertions(+), 2 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1344,7 +1344,7 @@
 
 def MeasureFloat(python, options):
     bm_path = Relative("performance/bm_float.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=5)
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
 
 def BM_Float(*args, **kwargs):
     return SimpleBenchmark(MeasureFloat, *args, **kwargs)
@@ -1634,6 +1634,14 @@
     return SimpleBenchmark(MeasureChaos, *args, **kwargs)
 
 
+def MeasureMeteor_Contest(python, options):
+    bm_path = Relative("performance/bm_meteor_contest.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Meteor_Contest(*args, **kwargs):
+    return SimpleBenchmark(MeasureChaos, *args, **kwargs)
+
+
 def MeasureLogging(python, options, extra_args):
     """Test the performance of Python's logging module.
 
@@ -2024,7 +2032,7 @@
                         "json_dump", "json_load", "regex", "threading",
                         "nqueens", "unpack_sequence", "richards",
                         "logging", "normal_startup", "startup_nosite",
-                        "pathlib", "fannkuch"],
+                        "pathlib", "fannkuch", "meteor_contest"],
                 # After 2to3-conversion
                 "py3k": ["2to3", "2n3", "mako"]
                }
diff --git a/performance/bm_meteor_contest.py b/performance/bm_meteor_contest.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_meteor_contest.py
@@ -0,0 +1,161 @@
+# The Computer Language Benchmarks Game
+# http://shootout.alioth.debian.org/
+#
+# contributed by Daniel Nanz, 2008-08-21
+
+import optparse
+import sys
+import time
+from bisect import bisect
+
+from compat import xrange
+import util
+
+w, h = 5, 10
+dir_no = 6
+S, E = w * h, 2
+SE = S + (E / 2)
+SW = SE - E
+W, NW, NE = -E, -SE, -SW
+
+
+def rotate(ido, rd={E: NE, NE: NW, NW: W, W: SW, SW: SE, SE: E}):
+    return [rd[o] for o in ido]
+
+def flip(ido, fd={E: E, NE: SE, NW: SW, W: W, SW: NW, SE: NE}):
+    return [fd[o] for o in ido]
+
+
+def permute(ido, r_ido, rotate=rotate, flip=flip):
+
+    ps = [ido]
+    for r in xrange(dir_no - 1):
+        ps.append(rotate(ps[-1]))
+        if ido == r_ido:                 # C2-symmetry
+            ps = ps[0:dir_no//2]
+    for pp in ps[:]:
+        ps.append(flip(pp))
+    return ps
+
+
+def convert(ido):
+    '''incremental direction offsets -> "coordinate offsets" '''
+    out = [0]
+    for o in ido:
+        out.append(out[-1] + o)
+    return list(set(out))
+
+
+def get_footprints(board, cti, pieces):
+
+    fps = [[[] for p in xrange(len(pieces))] for ci in xrange(len(board))]
+    for c in board:
+        for pi, p in enumerate(pieces):
+            for pp in p:
+                fp = frozenset([cti[c + o] for o in pp if (c + o) in cti])
+                if len(fp) == 5:
+                    fps[min(fp)][pi].append(fp)
+    return fps
+
+
+def get_senh(board, cti):
+    '''-> south-east neighborhood'''
+    se_nh = []
+    nh = [E, SW, SE]
+    for c in board:
+        se_nh.append(frozenset([cti[c + o] for o in nh if (c + o) in cti]))
+    return se_nh
+
+
+def get_puzzle(w=w, h=h):
+
+    board = [E*x + S*y + (y%2) for y in xrange(h) for x in xrange(w)]
+    cti = dict((board[i], i) for i in xrange(len(board)))
+
+    idos = [[E, E, E, SE],         # incremental direction offsets
+            [SE, SW, W, SW],
+            [W, W, SW, SE],
+            [E, E, SW, SE],
+            [NW, W, NW, SE, SW],
+            [E, E, NE, W],
+            [NW, NE, NE, W],
+            [NE, SE, E, NE],
+            [SE, SE, E, SE],
+            [E, NW, NW, NW]]
+
+    perms = (permute(p, idos[3]) for p in idos)    # restrict piece 4
+    pieces = [[convert(pp) for pp in p] for p in perms]
+    return (board, cti, pieces)
+
+
+def print_board(board, w=w, h=h):
+
+    for y in xrange(h):
+        for x in xrange(w):
+            print(board[x + y * w])
+        print('')
+        if y % 2 == 0:
+            print('')
+    print()
+
+
+board, cti, pieces = get_puzzle()
+fps = get_footprints(board, cti, pieces)
+se_nh = get_senh(board, cti)
+
+
+def solve(n, i_min, free, curr_board, pieces_left, solutions,
+          fps=fps, se_nh=se_nh, bisect=bisect):
+    fp_i_cands = fps[i_min]
+    for p in pieces_left:
+        fp_cands = fp_i_cands[p]
+        for fp in fp_cands:
+            if fp <= free:
+                n_curr_board = curr_board[:]
+                for ci in fp:
+                    n_curr_board[ci] = p
+                if len(pieces_left) > 1:
+                    n_free = free - fp
+                    n_i_min = min(n_free)
+                    if len(n_free & se_nh[n_i_min]) > 0:
+                        n_pieces_left = pieces_left[:]
+                        n_pieces_left.remove(p)
+                        solve(n, n_i_min, n_free, n_curr_board,
+                              n_pieces_left, solutions)
+                else:
+                    s = ''.join(map(str, n_curr_board))
+                    solutions.insert(bisect(solutions, s), s)
+                    rs = s[::-1]
+                    solutions.insert(bisect(solutions, rs), rs)
+                    if len(solutions) >= n:
+                        return
+        if len(solutions) >= n:
+            return
+    return
+
+SOLVE_ARG = 60
+
+def main(n):
+    times = []
+    for i in xrange(n):
+        t0 = time.time()
+        free = frozenset(xrange(len(board)))
+        curr_board = [-1] * len(board)
+        pieces_left = list(range(len(pieces)))
+        solutions = []
+        solve(SOLVE_ARG, 0, free, curr_board, pieces_left, solutions)
+        #print len(solutions),  'solutions found\n'
+        #for i in (0, -1): print_board(solutions[i])
+        tk = time.time()
+        times.append(tk - t0)
+    return times
+    
+if __name__ == "__main__":
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the Float benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)
+

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:15 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_spectral?=
	=?utf-8?q?=5Fnorm_benchmark=2E?=
Message-ID: <3XJWDb3gvMzQ6q@mail.python.org>

http://hg.python.org/benchmarks/rev/0d00cf856dc8
changeset:   171:0d00cf856dc8
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 11:23:41 2012 -0400
summary:
  Port PyPy's spectral_norm benchmark.

files:
  perf.py                         |  18 ++++-
  performance/bm_spectral_norm.py |  68 +++++++++++++++++++++
  2 files changed, 81 insertions(+), 5 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1641,6 +1641,13 @@
 def BM_Meteor_Contest(*args, **kwargs):
     return SimpleBenchmark(MeasureChaos, *args, **kwargs)
 
+def MeasureMeteor_Contest(python, options):
+    bm_path = Relative("performance/bm_spectral_norm.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Spectral_Norm(*args, **kwargs):
+    return SimpleBenchmark(MeasureChaos, *args, **kwargs)
+
 
 def MeasureLogging(python, options, extra_args):
     """Test the performance of Python's logging module.
@@ -2028,11 +2035,12 @@
                 "template" : ["slowspitfire", "django", "mako"],
                 "logging": ["silent_logging", "simple_logging", "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
-                "2n3": ["calls", "chaos", "math", "fastpickle", "fastunpickle",
-                        "json_dump", "json_load", "regex", "threading",
-                        "nqueens", "unpack_sequence", "richards",
-                        "logging", "normal_startup", "startup_nosite",
-                        "pathlib", "fannkuch", "meteor_contest"],
+                "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
+                        "fastunpickle", "json_dump", "json_load", "math",
+                        "logging", "meteor_contest", "normal_startup",
+                        "nqueens", "pathlib", "regex", "spectral_norm",
+                        "startup_nosite", "richards", "threading",
+                        "unpack_sequence"],
                 # After 2to3-conversion
                 "py3k": ["2to3", "2n3", "mako"]
                }
diff --git a/performance/bm_spectral_norm.py b/performance/bm_spectral_norm.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_spectral_norm.py
@@ -0,0 +1,68 @@
+# The Computer Language Benchmarks Game
+# http://shootout.alioth.debian.org/
+# Contributed by Sebastien Loisel
+# Fixed by Isaac Gouy
+# Sped up by Josh Goldfoot
+# Dirtily sped up by Simon Descarpentries
+# Concurrency by Jason Stitt
+
+from math import sqrt
+import time
+import itertools
+import optparse
+
+from compat import izip, xrange
+import util
+
+def eval_A(i, j):
+    return 1.0 / ((i + j) * (i + j + 1) / 2 + i + 1)
+
+def eval_times_u(func, u):
+    return map(func, ((i,u) for i in xrange(len(list(u)))))
+
+def eval_AtA_times_u(u):
+    return eval_times_u(part_At_times_u, eval_times_u(part_A_times_u, u))
+
+def part_A_times_u(i_u):
+    i, u = i_u
+    partial_sum = 0
+    for j, u_j in enumerate(u):
+        partial_sum += eval_A(i, j) * u_j
+    return partial_sum
+
+def part_At_times_u(i_u):
+    i, u = i_u
+    partial_sum = 0
+    for j, u_j in enumerate(u):
+        partial_sum += eval_A(j, i) * u_j
+    return partial_sum
+
+DEFAULT_N = 130
+
+def main(n):
+    times = []
+    for i in xrange(n):
+        t0 = time.time()
+        u = [1] * DEFAULT_N
+
+        for dummy in xrange(10):
+            v = eval_AtA_times_u(u)
+            u = eval_AtA_times_u(v)
+
+        vBv = vv = 0
+
+        for ue, ve in izip(u, v):
+            vBv += ue * ve
+            vv  += ve * ve
+        tk = time.time()
+        times.append(tk - t0)
+    return times
+    
+if __name__ == "__main__":
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the Float benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:17 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Add_the_Telco_benchmark?=
 =?utf-8?q?_and_fix_some_stupid_errors_in_perf=2Epy=2E?=
Message-ID: <3XJWDd0HkGzQNv@mail.python.org>

http://hg.python.org/benchmarks/rev/92ae96f805ce
changeset:   172:92ae96f805ce
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 11:37:08 2012 -0400
summary:
  Add the Telco benchmark and fix some stupid errors in perf.py.

files:
  perf.py                        |   25 +++-
  performance/bm_telco.py        |   97 +++++++++++++++++++++
  performance/data/telco-bench.b |  Bin 
  3 files changed, 114 insertions(+), 8 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1631,22 +1631,31 @@
     return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
 
 def BM_Fannkuch(*args, **kwargs):
-    return SimpleBenchmark(MeasureChaos, *args, **kwargs)
-
-
-def MeasureMeteor_Contest(python, options):
+    return SimpleBenchmark(MeasureFannkuch, *args, **kwargs)
+
+
+def MeasureMeteorContest(python, options):
     bm_path = Relative("performance/bm_meteor_contest.py")
     return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
 
 def BM_Meteor_Contest(*args, **kwargs):
-    return SimpleBenchmark(MeasureChaos, *args, **kwargs)
-
-def MeasureMeteor_Contest(python, options):
+    return SimpleBenchmark(MeasureMeteorContest, *args, **kwargs)
+
+
+def MeasureSpectralNorm(python, options):
     bm_path = Relative("performance/bm_spectral_norm.py")
     return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
 
 def BM_Spectral_Norm(*args, **kwargs):
-    return SimpleBenchmark(MeasureChaos, *args, **kwargs)
+    return SimpleBenchmark(MeasureSpectralNorm, *args, **kwargs)
+
+
+def MeasureTelco(python, options):
+    bm_path = Relative("performance/bm_telco.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Telco(*args, **kwargs):
+    return SimpleBenchmark(MeasureTelco, *args, **kwargs)
 
 
 def MeasureLogging(python, options, extra_args):
diff --git a/performance/bm_telco.py b/performance/bm_telco.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_telco.py
@@ -0,0 +1,97 @@
+#-*- coding: UTF-8 -*-
+""" Telco Benchmark for measuring the performance of decimal calculations
+
+http://www2.hursley.ibm.com/decimal/telco.html
+http://www2.hursley.ibm.com/decimal/telcoSpec.html
+
+A call type indicator, c, is set from the bottom (least significant) bit of the duration (hence c is 0 or 1).
+A r, r, is determined from the call type. Those calls with c=0 have a low r: 0.0013; the remainder (?distance calls?) have a ?premium? r: 0.00894. (The rates are, very roughly, in Euros or dollarates per second.)
+A price, p, for the call is then calculated (p=r*n). This is rounded to exactly 2 fractional digits using round-half-even (Banker?s round to nearest).
+A basic tax, b, is calculated: b=p*0.0675 (6.75%). This is truncated to exactly 2 fractional digits (round-down), and the total basic tax variable is then incremented (sumB=sumB+b).
+For distance calls: a distance tax, d, is calculated: d=p*0.0341 (3.41%). This is truncated to exactly 2 fractional digits (round-down), and then the total distance tax variable is incremented (sumD=sumD+d).
+The total price, t, is calculated (t=p+b, and, if a distance call, t=t+d).
+The total prices variable is incremented (sumT=sumT+t).
+The total price, t, is converted to a string, s.
+
+"""
+
+import contextlib
+from decimal import *
+import os
+from struct import unpack
+import sys
+from time import clock as time
+
+from compat import xrange
+
+
+def rel_path(*path):
+    return os.path.join(os.path.dirname(__file__), *path)
+
+test = False
+
+filename = rel_path("data", "telco-bench.b")
+
+def run():
+    getcontext().rounding = ROUND_DOWN
+    rates = list(map(Decimal, ('0.0013', '0.00894')))
+    twodig = Decimal('0.01')
+    Banker = Context(rounding=ROUND_HALF_EVEN)
+    basictax = Decimal("0.0675")
+    disttax = Decimal("0.0341")
+
+    infil = open(filename, "rb")
+    start = time()
+
+    sumT = Decimal("0")   # sum of total prices
+    sumB = Decimal("0")   # sum of basic tax
+    sumD = Decimal("0")   # sum of 'distance' tax
+
+    with open(filename, "rb") as infil:
+        for i in xrange(5000):
+            datum = infil.read(8)
+            if datum == '': break
+            n, =  unpack('>Q', datum)
+
+            calltype = n & 1
+            r = rates[calltype]
+
+            p = Banker.quantize(r * n, twodig)
+
+            b = p * basictax
+            b = b.quantize(twodig)
+            sumB += b
+
+            t = p + b
+
+            if calltype:
+                d = p * disttax
+                d = d.quantize(twodig)
+                sumD += d
+                t += d
+
+            sumT += t
+
+    infil.close()
+    end = time()
+    return end - start
+
+def main(n):
+    run() # warmup
+    times = []
+    for i in xrange(n):
+        times.append(run())
+    return times
+
+
+
+if __name__ == "__main__":
+    import optparse
+    import util
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the Telco decimal benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)
diff --git a/performance/data/telco-bench.b b/performance/data/telco-bench.b
new file mode 100644
index 0000000000000000000000000000000000000000..2c7085d0732e087ac33e3cc9887b88304a826ab5
GIT binary patch
[stripped]

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:25 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_tweaked_b?=
 =?utf-8?q?m=5Fmako_benchmark_as_bm=5Fmako=5Fv2=2E?=
Message-ID: <3XJWDn5ZyWzQDx@mail.python.org>

http://hg.python.org/benchmarks/rev/ffd4fb31b562
changeset:   173:ffd4fb31b562
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 12:25:24 2012 -0400
summary:
  Port PyPy's tweaked bm_mako benchmark as bm_mako_v2.

files:
  lib/mako/.hgignore                                            |     0 
  lib/mako/CHANGES                                              |     0 
  lib/mako/LICENSE                                              |     0 
  lib/mako/MANIFEST.in                                          |     0 
  lib/mako/README                                               |     0 
  lib/mako/README.py3k                                          |     0 
  lib/mako/distribute_setup.py                                  |     0 
  lib/mako/doc/build/Makefile                                   |     0 
  lib/mako/doc/build/builder/builders.py                        |     0 
  lib/mako/doc/build/builder/util.py                            |     0 
  lib/mako/doc/build/caching.rst                                |     0 
  lib/mako/doc/build/conf.py                                    |     0 
  lib/mako/doc/build/defs.rst                                   |     0 
  lib/mako/doc/build/filtering.rst                              |     0 
  lib/mako/doc/build/index.rst                                  |     0 
  lib/mako/doc/build/inheritance.rst                            |     0 
  lib/mako/doc/build/namespaces.rst                             |     0 
  lib/mako/doc/build/runtime.rst                                |     0 
  lib/mako/doc/build/static/docs.css                            |     0 
  lib/mako/doc/build/syntax.rst                                 |     0 
  lib/mako/doc/build/templates/genindex.mako                    |     0 
  lib/mako/doc/build/templates/layout.mako                      |     0 
  lib/mako/doc/build/templates/page.mako                        |     0 
  lib/mako/doc/build/templates/search.mako                      |     0 
  lib/mako/doc/build/templates/site_base.mako                   |     0 
  lib/mako/doc/build/templates/static_base.mako                 |     0 
  lib/mako/doc/build/unicode.rst                                |     0 
  lib/mako/doc/build/usage.rst                                  |     0 
  lib/mako/examples/bench/basic.py                              |     0 
  lib/mako/examples/bench/basic.py.orig                         |     0 
  lib/mako/examples/bench/cheetah/footer.tmpl                   |     0 
  lib/mako/examples/bench/cheetah/header.tmpl                   |     0 
  lib/mako/examples/bench/cheetah/template.tmpl                 |     0 
  lib/mako/examples/bench/django/templates/base.html            |     0 
  lib/mako/examples/bench/django/templates/template.html        |     0 
  lib/mako/examples/bench/django/templatetags/bench.py          |     0 
  lib/mako/examples/bench/genshi/base.html                      |     0 
  lib/mako/examples/bench/genshi/template.html                  |     0 
  lib/mako/examples/bench/kid/base.kid                          |     0 
  lib/mako/examples/bench/kid/template.kid                      |     0 
  lib/mako/examples/bench/mako/footer.html                      |     0 
  lib/mako/examples/bench/mako/header.html                      |     0 
  lib/mako/examples/bench/mako/template.html                    |     0 
  lib/mako/examples/bench/mako_inheritance/base.html            |     0 
  lib/mako/examples/bench/mako_inheritance/template.html        |     0 
  lib/mako/examples/bench/myghty/base.myt                       |     0 
  lib/mako/examples/bench/myghty/template.myt                   |     0 
  lib/mako/examples/wsgi/htdocs/index.html                      |     0 
  lib/mako/examples/wsgi/run_wsgi.py                            |     0 
  lib/mako/examples/wsgi/templates/root.html                    |     0 
  lib/mako/mako/__init__.py                                     |     0 
  lib/mako/mako/_ast_util.py                                    |     0 
  lib/mako/mako/ast.py                                          |     0 
  lib/mako/mako/cache.py                                        |     0 
  lib/mako/mako/codegen.py                                      |     0 
  lib/mako/mako/exceptions.py                                   |     0 
  lib/mako/mako/ext/autohandler.py                              |     0 
  lib/mako/mako/ext/babelplugin.py                              |     0 
  lib/mako/mako/ext/preprocessors.py                            |     0 
  lib/mako/mako/ext/pygmentplugin.py                            |     0 
  lib/mako/mako/ext/turbogears.py                               |     0 
  lib/mako/mako/filters.py                                      |     0 
  lib/mako/mako/lexer.py                                        |     0 
  lib/mako/mako/lookup.py                                       |     0 
  lib/mako/mako/parsetree.py                                    |     0 
  lib/mako/mako/pygen.py                                        |     0 
  lib/mako/mako/pyparser.py                                     |     0 
  lib/mako/mako/runtime.py                                      |     0 
  lib/mako/mako/template.py                                     |     0 
  lib/mako/mako/util.py                                         |     0 
  lib/mako/scripts/mako-render                                  |     0 
  lib/mako/setup.cfg                                            |     0 
  lib/mako/setup.py                                             |     0 
  lib/mako/test/__init__.py                                     |     0 
  lib/mako/test/foo/test_ns.py                                  |     0 
  lib/mako/test/sample_module_namespace.py                      |     0 
  lib/mako/test/templates/badbom.html                           |     0 
  lib/mako/test/templates/bom.html                              |     0 
  lib/mako/test/templates/bommagic.html                         |     0 
  lib/mako/test/templates/chs_unicode.html                      |     0 
  lib/mako/test/templates/chs_unicode_py3k.html                 |     0 
  lib/mako/test/templates/chs_utf8.html                         |     0 
  lib/mako/test/templates/crlf.html                             |     0 
  lib/mako/test/templates/foo/modtest.html.py                   |     0 
  lib/mako/test/templates/gettext.mako                          |     0 
  lib/mako/test/templates/index.html                            |     0 
  lib/mako/test/templates/internationalization.html             |     0 
  lib/mako/test/templates/modtest.html                          |     0 
  lib/mako/test/templates/read_unicode.html                     |     0 
  lib/mako/test/templates/read_unicode_py3k.html                |     0 
  lib/mako/test/templates/runtimeerr.html                       |     0 
  lib/mako/test/templates/runtimeerr_py3k.html                  |     0 
  lib/mako/test/templates/subdir/foo/modtest.html.py            |     0 
  lib/mako/test/templates/subdir/incl.html                      |     0 
  lib/mako/test/templates/subdir/index.html                     |     0 
  lib/mako/test/templates/subdir/modtest.html                   |     0 
  lib/mako/test/templates/unicode.html                          |     0 
  lib/mako/test/templates/unicode_arguments.html                |     0 
  lib/mako/test/templates/unicode_arguments_py3k.html           |     0 
  lib/mako/test/templates/unicode_code.html                     |     0 
  lib/mako/test/templates/unicode_code_py3k.html                |     0 
  lib/mako/test/templates/unicode_expr.html                     |     0 
  lib/mako/test/templates/unicode_expr_py3k.html                |     0 
  lib/mako/test/templates/unicode_runtime_error.html            |     0 
  lib/mako/test/templates/unicode_syntax_error.html             |     0 
  lib/mako/test/test_ast.py                                     |     0 
  lib/mako/test/test_babelplugin.py                             |     0 
  lib/mako/test/test_cache.py                                   |     0 
  lib/mako/test/test_call.py                                    |     0 
  lib/mako/test/test_decorators.py                              |     0 
  lib/mako/test/test_def.py                                     |     0 
  lib/mako/test/test_exceptions.py                              |     0 
  lib/mako/test/test_filters.py                                 |     0 
  lib/mako/test/test_inheritance.py                             |     0 
  lib/mako/test/test_lexer.py                                   |     0 
  lib/mako/test/test_lookup.py                                  |     0 
  lib/mako/test/test_lru.py                                     |     0 
  lib/mako/test/test_namespace.py                               |     0 
  lib/mako/test/test_pygen.py                                   |     0 
  lib/mako/test/test_template.py                                |     0 
  lib/mako/test/test_tgplugin.py                                |     0 
  lib/mako/test/util.py                                         |     0 
  lib/mako-0.7.2/CHANGES                                        |   825 ++++++
  lib/mako-0.7.2/LICENSE                                        |    20 +
  lib/mako-0.7.2/MANIFEST.in                                    |    11 +
  lib/mako-0.7.2/Mako.egg-info/PKG-INFO                         |    71 +
  lib/mako-0.7.2/Mako.egg-info/SOURCES.txt                      |   171 +
  lib/mako-0.7.2/Mako.egg-info/dependency_links.txt             |     1 +
  lib/mako-0.7.2/Mako.egg-info/entry_points.txt                 |    14 +
  lib/mako-0.7.2/Mako.egg-info/not-zip-safe                     |     1 +
  lib/mako-0.7.2/Mako.egg-info/requires.txt                     |     4 +
  lib/mako-0.7.2/Mako.egg-info/top_level.txt                    |     1 +
  lib/mako-0.7.2/PKG-INFO                                       |    71 +
  lib/mako-0.7.2/README.rst                                     |    52 +
  lib/mako-0.7.2/distribute_setup.py                            |   485 +++
  lib/mako-0.7.2/doc/_sources/caching.txt                       |   393 +++
  lib/mako-0.7.2/doc/_sources/defs.txt                          |   622 +++++
  lib/mako-0.7.2/doc/_sources/filtering.txt                     |   344 ++
  lib/mako-0.7.2/doc/_sources/index.txt                         |    22 +
  lib/mako-0.7.2/doc/_sources/inheritance.txt                   |   534 ++++
  lib/mako-0.7.2/doc/_sources/namespaces.txt                    |   349 ++
  lib/mako-0.7.2/doc/_sources/runtime.txt                       |   448 +++
  lib/mako-0.7.2/doc/_sources/syntax.txt                        |   469 +++
  lib/mako-0.7.2/doc/_sources/unicode.txt                       |   345 ++
  lib/mako-0.7.2/doc/_sources/usage.txt                         |   520 ++++
  lib/mako-0.7.2/doc/_static/basic.css                          |   540 ++++
  lib/mako-0.7.2/doc/_static/comment-bright.png                 |   Bin 
  lib/mako-0.7.2/doc/_static/comment-close.png                  |   Bin 
  lib/mako-0.7.2/doc/_static/comment.png                        |   Bin 
  lib/mako-0.7.2/doc/_static/default.css                        |   256 ++
  lib/mako-0.7.2/doc/_static/docs.css                           |   438 +++
  lib/mako-0.7.2/doc/_static/doctools.js                        |   247 +
  lib/mako-0.7.2/doc/_static/down-pressed.png                   |   Bin 
  lib/mako-0.7.2/doc/_static/down.png                           |   Bin 
  lib/mako-0.7.2/doc/_static/file.png                           |   Bin 
  lib/mako-0.7.2/doc/_static/jquery.js                          |   154 +
  lib/mako-0.7.2/doc/_static/makoLogo.png                       |   Bin 
  lib/mako-0.7.2/doc/_static/minus.png                          |   Bin 
  lib/mako-0.7.2/doc/_static/plus.png                           |   Bin 
  lib/mako-0.7.2/doc/_static/pygments.css                       |    62 +
  lib/mako-0.7.2/doc/_static/searchtools.js                     |   560 ++++
  lib/mako-0.7.2/doc/_static/sidebar.js                         |   151 +
  lib/mako-0.7.2/doc/_static/site.css                           |    82 +
  lib/mako-0.7.2/doc/_static/underscore.js                      |    23 +
  lib/mako-0.7.2/doc/_static/up-pressed.png                     |   Bin 
  lib/mako-0.7.2/doc/_static/up.png                             |   Bin 
  lib/mako-0.7.2/doc/_static/websupport.js                      |   808 ++++++
  lib/mako-0.7.2/doc/build/Makefile                             |   137 +
  lib/mako-0.7.2/doc/build/builder/__init__.py                  |     0 
  lib/mako-0.7.2/doc/build/builder/builders.py                  |    97 +
  lib/mako-0.7.2/doc/build/builder/util.py                      |    12 +
  lib/mako-0.7.2/doc/build/caching.rst                          |   393 +++
  lib/mako-0.7.2/doc/build/conf.py                              |   287 ++
  lib/mako-0.7.2/doc/build/defs.rst                             |   622 +++++
  lib/mako-0.7.2/doc/build/filtering.rst                        |   344 ++
  lib/mako-0.7.2/doc/build/index.rst                            |    22 +
  lib/mako-0.7.2/doc/build/inheritance.rst                      |   534 ++++
  lib/mako-0.7.2/doc/build/namespaces.rst                       |   349 ++
  lib/mako-0.7.2/doc/build/runtime.rst                          |   448 +++
  lib/mako-0.7.2/doc/build/static/docs.css                      |   438 +++
  lib/mako-0.7.2/doc/build/static/makoLogo.png                  |   Bin 
  lib/mako-0.7.2/doc/build/static/site.css                      |    82 +
  lib/mako-0.7.2/doc/build/syntax.rst                           |   469 +++
  lib/mako-0.7.2/doc/build/templates/base.mako                  |    51 +
  lib/mako-0.7.2/doc/build/templates/genindex.mako              |    77 +
  lib/mako-0.7.2/doc/build/templates/layout.mako                |   199 +
  lib/mako-0.7.2/doc/build/templates/page.mako                  |     2 +
  lib/mako-0.7.2/doc/build/templates/rtd_layout.mako            |   174 +
  lib/mako-0.7.2/doc/build/templates/search.mako                |    25 +
  lib/mako-0.7.2/doc/build/unicode.rst                          |   345 ++
  lib/mako-0.7.2/doc/build/usage.rst                            |   520 ++++
  lib/mako-0.7.2/doc/caching.html                               |   777 ++++++
  lib/mako-0.7.2/doc/defs.html                                  |   726 +++++
  lib/mako-0.7.2/doc/filtering.html                             |   476 +++
  lib/mako-0.7.2/doc/genindex.html                              |   914 +++++++
  lib/mako-0.7.2/doc/index.html                                 |   228 +
  lib/mako-0.7.2/doc/inheritance.html                           |   671 +++++
  lib/mako-0.7.2/doc/namespaces.html                            |   647 +++++
  lib/mako-0.7.2/doc/runtime.html                               |   708 +++++
  lib/mako-0.7.2/doc/search.html                                |   160 +
  lib/mako-0.7.2/doc/searchindex.js                             |     1 +
  lib/mako-0.7.2/doc/syntax.html                                |   594 ++++
  lib/mako-0.7.2/doc/unicode.html                               |   474 +++
  lib/mako-0.7.2/doc/usage.html                                 |  1055 ++++++++
  lib/mako-0.7.2/examples/bench/basic.py                        |   191 +
  lib/mako-0.7.2/examples/bench/cheetah/footer.tmpl             |     2 +
  lib/mako-0.7.2/examples/bench/cheetah/header.tmpl             |     5 +
  lib/mako-0.7.2/examples/bench/cheetah/template.tmpl           |    31 +
  lib/mako-0.7.2/examples/bench/django/templatetags/__init__.py |     0 
  lib/mako-0.7.2/examples/bench/django/templatetags/bench.py    |     8 +
  lib/mako-0.7.2/examples/bench/kid/base.kid                    |    15 +
  lib/mako-0.7.2/examples/bench/kid/template.kid                |    22 +
  lib/mako-0.7.2/examples/bench/myghty/base.myt                 |    29 +
  lib/mako-0.7.2/examples/bench/myghty/template.myt             |    30 +
  lib/mako-0.7.2/examples/wsgi/run_wsgi.py                      |    78 +
  lib/mako-0.7.2/mako/__init__.py                               |     9 +
  lib/mako-0.7.2/mako/_ast_util.py                              |   839 ++++++
  lib/mako-0.7.2/mako/ast.py                                    |   151 +
  lib/mako-0.7.2/mako/cache.py                                  |   236 +
  lib/mako-0.7.2/mako/codegen.py                                |  1209 +++++++++
  lib/mako-0.7.2/mako/exceptions.py                             |   362 ++
  lib/mako-0.7.2/mako/ext/__init__.py                           |     0 
  lib/mako-0.7.2/mako/ext/autohandler.py                        |    65 +
  lib/mako-0.7.2/mako/ext/babelplugin.py                        |   132 +
  lib/mako-0.7.2/mako/ext/beaker_cache.py                       |    70 +
  lib/mako-0.7.2/mako/ext/preprocessors.py                      |    20 +
  lib/mako-0.7.2/mako/ext/pygmentplugin.py                      |   122 +
  lib/mako-0.7.2/mako/ext/turbogears.py                         |    57 +
  lib/mako-0.7.2/mako/filters.py                                |   189 +
  lib/mako-0.7.2/mako/lexer.py                                  |   442 +++
  lib/mako-0.7.2/mako/lookup.py                                 |   354 ++
  lib/mako-0.7.2/mako/parsetree.py                              |   589 ++++
  lib/mako-0.7.2/mako/pygen.py                                  |   283 ++
  lib/mako-0.7.2/mako/pyparser.py                               |   535 ++++
  lib/mako-0.7.2/mako/runtime.py                                |   841 ++++++
  lib/mako-0.7.2/mako/template.py                               |   650 +++++
  lib/mako-0.7.2/mako/util.py                                   |   436 +++
  lib/mako-0.7.2/scripts/mako-render                            |    46 +
  lib/mako-0.7.2/setup.cfg                                      |     5 +
  lib/mako-0.7.2/setup.py                                       |    62 +
  lib/mako-0.7.2/test/__init__.py                               |   135 +
  lib/mako-0.7.2/test/foo/__init__.py                           |     0 
  lib/mako-0.7.2/test/foo/test_ns.py                            |     7 +
  lib/mako-0.7.2/test/sample_module_namespace.py                |     7 +
  lib/mako-0.7.2/test/templates/badbom.html                     |     2 +
  lib/mako-0.7.2/test/templates/bom.html                        |     1 +
  lib/mako-0.7.2/test/templates/bommagic.html                   |     2 +
  lib/mako-0.7.2/test/templates/chs_unicode.html                |    11 +
  lib/mako-0.7.2/test/templates/chs_unicode_py3k.html           |    11 +
  lib/mako-0.7.2/test/templates/chs_utf8.html                   |    17 +
  lib/mako-0.7.2/test/templates/crlf.html                       |    19 +
  lib/mako-0.7.2/test/templates/foo/modtest.html.py             |    25 +
  lib/mako-0.7.2/test/templates/gettext.mako                    |    89 +
  lib/mako-0.7.2/test/templates/index.html                      |     1 +
  lib/mako-0.7.2/test/templates/internationalization.html       |   920 +++++++
  lib/mako-0.7.2/test/templates/modtest.html                    |     1 +
  lib/mako-0.7.2/test/templates/othersubdir/foo.html            |     0 
  lib/mako-0.7.2/test/templates/read_unicode.html               |    10 +
  lib/mako-0.7.2/test/templates/read_unicode_py3k.html          |    10 +
  lib/mako-0.7.2/test/templates/runtimeerr.html                 |     4 +
  lib/mako-0.7.2/test/templates/runtimeerr_py3k.html            |     4 +
  lib/mako-0.7.2/test/templates/subdir/foo/modtest.html.py      |    25 +
  lib/mako-0.7.2/test/templates/subdir/incl.html                |     2 +
  lib/mako-0.7.2/test/templates/subdir/index.html               |     3 +
  lib/mako-0.7.2/test/templates/subdir/modtest.html             |     1 +
  lib/mako-0.7.2/test/templates/unicode.html                    |     2 +
  lib/mako-0.7.2/test/templates/unicode_arguments.html          |    10 +
  lib/mako-0.7.2/test/templates/unicode_arguments_py3k.html     |    10 +
  lib/mako-0.7.2/test/templates/unicode_code.html               |     7 +
  lib/mako-0.7.2/test/templates/unicode_code_py3k.html          |     7 +
  lib/mako-0.7.2/test/templates/unicode_expr.html               |     2 +
  lib/mako-0.7.2/test/templates/unicode_expr_py3k.html          |     2 +
  lib/mako-0.7.2/test/templates/unicode_runtime_error.html      |     2 +
  lib/mako-0.7.2/test/templates/unicode_syntax_error.html       |     2 +
  lib/mako-0.7.2/test/test_ast.py                               |   322 ++
  lib/mako-0.7.2/test/test_babelplugin.py                       |    44 +
  lib/mako-0.7.2/test/test_block.py                             |   569 ++++
  lib/mako-0.7.2/test/test_cache.py                             |   557 ++++
  lib/mako-0.7.2/test/test_call.py                              |   515 ++++
  lib/mako-0.7.2/test/test_decorators.py                        |   110 +
  lib/mako-0.7.2/test/test_def.py                               |   678 +++++
  lib/mako-0.7.2/test/test_exceptions.py                        |   296 ++
  lib/mako-0.7.2/test/test_filters.py                           |   322 ++
  lib/mako-0.7.2/test/test_inheritance.py                       |   350 ++
  lib/mako-0.7.2/test/test_lexer.py                             |   871 +++++++
  lib/mako-0.7.2/test/test_lookup.py                            |   104 +
  lib/mako-0.7.2/test/test_loop.py                              |   295 ++
  lib/mako-0.7.2/test/test_lru.py                               |   111 +
  lib/mako-0.7.2/test/test_namespace.py                         |   792 ++++++
  lib/mako-0.7.2/test/test_pygen.py                             |   252 ++
  lib/mako-0.7.2/test/test_template.py                          |  1241 ++++++++++
  lib/mako-0.7.2/test/test_tgplugin.py                          |    42 +
  lib/mako-0.7.2/test/test_util.py                              |    41 +
  lib/mako-0.7.2/test/util.py                                   |     7 +
  make_perf3.sh                                                 |     2 +-
  perf.py                                                       |    17 +-
  performance/bm_mako_v2.py                                     |   154 +
  297 files changed, 39306 insertions(+), 4 deletions(-)


diff --git a/lib/mako/.hgignore b/lib/mako-0.3.6/.hgignore
rename from lib/mako/.hgignore
rename to lib/mako-0.3.6/.hgignore
diff --git a/lib/mako/CHANGES b/lib/mako-0.3.6/CHANGES
rename from lib/mako/CHANGES
rename to lib/mako-0.3.6/CHANGES
diff --git a/lib/mako/LICENSE b/lib/mako-0.3.6/LICENSE
rename from lib/mako/LICENSE
rename to lib/mako-0.3.6/LICENSE
diff --git a/lib/mako/MANIFEST.in b/lib/mako-0.3.6/MANIFEST.in
rename from lib/mako/MANIFEST.in
rename to lib/mako-0.3.6/MANIFEST.in
diff --git a/lib/mako/README b/lib/mako-0.3.6/README
rename from lib/mako/README
rename to lib/mako-0.3.6/README
diff --git a/lib/mako/README.py3k b/lib/mako-0.3.6/README.py3k
rename from lib/mako/README.py3k
rename to lib/mako-0.3.6/README.py3k
diff --git a/lib/mako/distribute_setup.py b/lib/mako-0.3.6/distribute_setup.py
rename from lib/mako/distribute_setup.py
rename to lib/mako-0.3.6/distribute_setup.py
diff --git a/lib/mako/doc/build/Makefile b/lib/mako-0.3.6/doc/build/Makefile
rename from lib/mako/doc/build/Makefile
rename to lib/mako-0.3.6/doc/build/Makefile
diff --git a/lib/mako/doc/build/builder/builders.py b/lib/mako-0.3.6/doc/build/builder/builders.py
rename from lib/mako/doc/build/builder/builders.py
rename to lib/mako-0.3.6/doc/build/builder/builders.py
diff --git a/lib/mako/doc/build/builder/util.py b/lib/mako-0.3.6/doc/build/builder/util.py
rename from lib/mako/doc/build/builder/util.py
rename to lib/mako-0.3.6/doc/build/builder/util.py
diff --git a/lib/mako/doc/build/caching.rst b/lib/mako-0.3.6/doc/build/caching.rst
rename from lib/mako/doc/build/caching.rst
rename to lib/mako-0.3.6/doc/build/caching.rst
diff --git a/lib/mako/doc/build/conf.py b/lib/mako-0.3.6/doc/build/conf.py
rename from lib/mako/doc/build/conf.py
rename to lib/mako-0.3.6/doc/build/conf.py
diff --git a/lib/mako/doc/build/defs.rst b/lib/mako-0.3.6/doc/build/defs.rst
rename from lib/mako/doc/build/defs.rst
rename to lib/mako-0.3.6/doc/build/defs.rst
diff --git a/lib/mako/doc/build/filtering.rst b/lib/mako-0.3.6/doc/build/filtering.rst
rename from lib/mako/doc/build/filtering.rst
rename to lib/mako-0.3.6/doc/build/filtering.rst
diff --git a/lib/mako/doc/build/index.rst b/lib/mako-0.3.6/doc/build/index.rst
rename from lib/mako/doc/build/index.rst
rename to lib/mako-0.3.6/doc/build/index.rst
diff --git a/lib/mako/doc/build/inheritance.rst b/lib/mako-0.3.6/doc/build/inheritance.rst
rename from lib/mako/doc/build/inheritance.rst
rename to lib/mako-0.3.6/doc/build/inheritance.rst
diff --git a/lib/mako/doc/build/namespaces.rst b/lib/mako-0.3.6/doc/build/namespaces.rst
rename from lib/mako/doc/build/namespaces.rst
rename to lib/mako-0.3.6/doc/build/namespaces.rst
diff --git a/lib/mako/doc/build/runtime.rst b/lib/mako-0.3.6/doc/build/runtime.rst
rename from lib/mako/doc/build/runtime.rst
rename to lib/mako-0.3.6/doc/build/runtime.rst
diff --git a/lib/mako/doc/build/static/docs.css b/lib/mako-0.3.6/doc/build/static/docs.css
rename from lib/mako/doc/build/static/docs.css
rename to lib/mako-0.3.6/doc/build/static/docs.css
diff --git a/lib/mako/doc/build/syntax.rst b/lib/mako-0.3.6/doc/build/syntax.rst
rename from lib/mako/doc/build/syntax.rst
rename to lib/mako-0.3.6/doc/build/syntax.rst
diff --git a/lib/mako/doc/build/templates/genindex.mako b/lib/mako-0.3.6/doc/build/templates/genindex.mako
rename from lib/mako/doc/build/templates/genindex.mako
rename to lib/mako-0.3.6/doc/build/templates/genindex.mako
diff --git a/lib/mako/doc/build/templates/layout.mako b/lib/mako-0.3.6/doc/build/templates/layout.mako
rename from lib/mako/doc/build/templates/layout.mako
rename to lib/mako-0.3.6/doc/build/templates/layout.mako
diff --git a/lib/mako/doc/build/templates/page.mako b/lib/mako-0.3.6/doc/build/templates/page.mako
rename from lib/mako/doc/build/templates/page.mako
rename to lib/mako-0.3.6/doc/build/templates/page.mako
diff --git a/lib/mako/doc/build/templates/search.mako b/lib/mako-0.3.6/doc/build/templates/search.mako
rename from lib/mako/doc/build/templates/search.mako
rename to lib/mako-0.3.6/doc/build/templates/search.mako
diff --git a/lib/mako/doc/build/templates/site_base.mako b/lib/mako-0.3.6/doc/build/templates/site_base.mako
rename from lib/mako/doc/build/templates/site_base.mako
rename to lib/mako-0.3.6/doc/build/templates/site_base.mako
diff --git a/lib/mako/doc/build/templates/static_base.mako b/lib/mako-0.3.6/doc/build/templates/static_base.mako
rename from lib/mako/doc/build/templates/static_base.mako
rename to lib/mako-0.3.6/doc/build/templates/static_base.mako
diff --git a/lib/mako/doc/build/unicode.rst b/lib/mako-0.3.6/doc/build/unicode.rst
rename from lib/mako/doc/build/unicode.rst
rename to lib/mako-0.3.6/doc/build/unicode.rst
diff --git a/lib/mako/doc/build/usage.rst b/lib/mako-0.3.6/doc/build/usage.rst
rename from lib/mako/doc/build/usage.rst
rename to lib/mako-0.3.6/doc/build/usage.rst
diff --git a/lib/mako/examples/bench/basic.py b/lib/mako-0.3.6/examples/bench/basic.py
rename from lib/mako/examples/bench/basic.py
rename to lib/mako-0.3.6/examples/bench/basic.py
diff --git a/lib/mako/examples/bench/basic.py.orig b/lib/mako-0.3.6/examples/bench/basic.py.orig
rename from lib/mako/examples/bench/basic.py.orig
rename to lib/mako-0.3.6/examples/bench/basic.py.orig
diff --git a/lib/mako/examples/bench/cheetah/footer.tmpl b/lib/mako-0.3.6/examples/bench/cheetah/footer.tmpl
rename from lib/mako/examples/bench/cheetah/footer.tmpl
rename to lib/mako-0.3.6/examples/bench/cheetah/footer.tmpl
diff --git a/lib/mako/examples/bench/cheetah/header.tmpl b/lib/mako-0.3.6/examples/bench/cheetah/header.tmpl
rename from lib/mako/examples/bench/cheetah/header.tmpl
rename to lib/mako-0.3.6/examples/bench/cheetah/header.tmpl
diff --git a/lib/mako/examples/bench/cheetah/template.tmpl b/lib/mako-0.3.6/examples/bench/cheetah/template.tmpl
rename from lib/mako/examples/bench/cheetah/template.tmpl
rename to lib/mako-0.3.6/examples/bench/cheetah/template.tmpl
diff --git a/lib/mako/examples/bench/django/templates/base.html b/lib/mako-0.3.6/examples/bench/django/templates/base.html
rename from lib/mako/examples/bench/django/templates/base.html
rename to lib/mako-0.3.6/examples/bench/django/templates/base.html
diff --git a/lib/mako/examples/bench/django/templates/template.html b/lib/mako-0.3.6/examples/bench/django/templates/template.html
rename from lib/mako/examples/bench/django/templates/template.html
rename to lib/mako-0.3.6/examples/bench/django/templates/template.html
diff --git a/lib/mako/examples/bench/django/templatetags/bench.py b/lib/mako-0.3.6/examples/bench/django/templatetags/bench.py
rename from lib/mako/examples/bench/django/templatetags/bench.py
rename to lib/mako-0.3.6/examples/bench/django/templatetags/bench.py
diff --git a/lib/mako/examples/bench/genshi/base.html b/lib/mako-0.3.6/examples/bench/genshi/base.html
rename from lib/mako/examples/bench/genshi/base.html
rename to lib/mako-0.3.6/examples/bench/genshi/base.html
diff --git a/lib/mako/examples/bench/genshi/template.html b/lib/mako-0.3.6/examples/bench/genshi/template.html
rename from lib/mako/examples/bench/genshi/template.html
rename to lib/mako-0.3.6/examples/bench/genshi/template.html
diff --git a/lib/mako/examples/bench/kid/base.kid b/lib/mako-0.3.6/examples/bench/kid/base.kid
rename from lib/mako/examples/bench/kid/base.kid
rename to lib/mako-0.3.6/examples/bench/kid/base.kid
diff --git a/lib/mako/examples/bench/kid/template.kid b/lib/mako-0.3.6/examples/bench/kid/template.kid
rename from lib/mako/examples/bench/kid/template.kid
rename to lib/mako-0.3.6/examples/bench/kid/template.kid
diff --git a/lib/mako/examples/bench/mako/footer.html b/lib/mako-0.3.6/examples/bench/mako/footer.html
rename from lib/mako/examples/bench/mako/footer.html
rename to lib/mako-0.3.6/examples/bench/mako/footer.html
diff --git a/lib/mako/examples/bench/mako/header.html b/lib/mako-0.3.6/examples/bench/mako/header.html
rename from lib/mako/examples/bench/mako/header.html
rename to lib/mako-0.3.6/examples/bench/mako/header.html
diff --git a/lib/mako/examples/bench/mako/template.html b/lib/mako-0.3.6/examples/bench/mako/template.html
rename from lib/mako/examples/bench/mako/template.html
rename to lib/mako-0.3.6/examples/bench/mako/template.html
diff --git a/lib/mako/examples/bench/mako_inheritance/base.html b/lib/mako-0.3.6/examples/bench/mako_inheritance/base.html
rename from lib/mako/examples/bench/mako_inheritance/base.html
rename to lib/mako-0.3.6/examples/bench/mako_inheritance/base.html
diff --git a/lib/mako/examples/bench/mako_inheritance/template.html b/lib/mako-0.3.6/examples/bench/mako_inheritance/template.html
rename from lib/mako/examples/bench/mako_inheritance/template.html
rename to lib/mako-0.3.6/examples/bench/mako_inheritance/template.html
diff --git a/lib/mako/examples/bench/myghty/base.myt b/lib/mako-0.3.6/examples/bench/myghty/base.myt
rename from lib/mako/examples/bench/myghty/base.myt
rename to lib/mako-0.3.6/examples/bench/myghty/base.myt
diff --git a/lib/mako/examples/bench/myghty/template.myt b/lib/mako-0.3.6/examples/bench/myghty/template.myt
rename from lib/mako/examples/bench/myghty/template.myt
rename to lib/mako-0.3.6/examples/bench/myghty/template.myt
diff --git a/lib/mako/examples/wsgi/htdocs/index.html b/lib/mako-0.3.6/examples/wsgi/htdocs/index.html
rename from lib/mako/examples/wsgi/htdocs/index.html
rename to lib/mako-0.3.6/examples/wsgi/htdocs/index.html
diff --git a/lib/mako/examples/wsgi/run_wsgi.py b/lib/mako-0.3.6/examples/wsgi/run_wsgi.py
rename from lib/mako/examples/wsgi/run_wsgi.py
rename to lib/mako-0.3.6/examples/wsgi/run_wsgi.py
diff --git a/lib/mako/examples/wsgi/templates/root.html b/lib/mako-0.3.6/examples/wsgi/templates/root.html
rename from lib/mako/examples/wsgi/templates/root.html
rename to lib/mako-0.3.6/examples/wsgi/templates/root.html
diff --git a/lib/mako/mako/__init__.py b/lib/mako-0.3.6/mako/__init__.py
rename from lib/mako/mako/__init__.py
rename to lib/mako-0.3.6/mako/__init__.py
diff --git a/lib/mako/mako/_ast_util.py b/lib/mako-0.3.6/mako/_ast_util.py
rename from lib/mako/mako/_ast_util.py
rename to lib/mako-0.3.6/mako/_ast_util.py
diff --git a/lib/mako/mako/ast.py b/lib/mako-0.3.6/mako/ast.py
rename from lib/mako/mako/ast.py
rename to lib/mako-0.3.6/mako/ast.py
diff --git a/lib/mako/mako/cache.py b/lib/mako-0.3.6/mako/cache.py
rename from lib/mako/mako/cache.py
rename to lib/mako-0.3.6/mako/cache.py
diff --git a/lib/mako/mako/codegen.py b/lib/mako-0.3.6/mako/codegen.py
rename from lib/mako/mako/codegen.py
rename to lib/mako-0.3.6/mako/codegen.py
diff --git a/lib/mako/mako/exceptions.py b/lib/mako-0.3.6/mako/exceptions.py
rename from lib/mako/mako/exceptions.py
rename to lib/mako-0.3.6/mako/exceptions.py
diff --git a/lib/mako/mako/ext/autohandler.py b/lib/mako-0.3.6/mako/ext/autohandler.py
rename from lib/mako/mako/ext/autohandler.py
rename to lib/mako-0.3.6/mako/ext/autohandler.py
diff --git a/lib/mako/mako/ext/babelplugin.py b/lib/mako-0.3.6/mako/ext/babelplugin.py
rename from lib/mako/mako/ext/babelplugin.py
rename to lib/mako-0.3.6/mako/ext/babelplugin.py
diff --git a/lib/mako/mako/ext/preprocessors.py b/lib/mako-0.3.6/mako/ext/preprocessors.py
rename from lib/mako/mako/ext/preprocessors.py
rename to lib/mako-0.3.6/mako/ext/preprocessors.py
diff --git a/lib/mako/mako/ext/pygmentplugin.py b/lib/mako-0.3.6/mako/ext/pygmentplugin.py
rename from lib/mako/mako/ext/pygmentplugin.py
rename to lib/mako-0.3.6/mako/ext/pygmentplugin.py
diff --git a/lib/mako/mako/ext/turbogears.py b/lib/mako-0.3.6/mako/ext/turbogears.py
rename from lib/mako/mako/ext/turbogears.py
rename to lib/mako-0.3.6/mako/ext/turbogears.py
diff --git a/lib/mako/mako/filters.py b/lib/mako-0.3.6/mako/filters.py
rename from lib/mako/mako/filters.py
rename to lib/mako-0.3.6/mako/filters.py
diff --git a/lib/mako/mako/lexer.py b/lib/mako-0.3.6/mako/lexer.py
rename from lib/mako/mako/lexer.py
rename to lib/mako-0.3.6/mako/lexer.py
diff --git a/lib/mako/mako/lookup.py b/lib/mako-0.3.6/mako/lookup.py
rename from lib/mako/mako/lookup.py
rename to lib/mako-0.3.6/mako/lookup.py
diff --git a/lib/mako/mako/parsetree.py b/lib/mako-0.3.6/mako/parsetree.py
rename from lib/mako/mako/parsetree.py
rename to lib/mako-0.3.6/mako/parsetree.py
diff --git a/lib/mako/mako/pygen.py b/lib/mako-0.3.6/mako/pygen.py
rename from lib/mako/mako/pygen.py
rename to lib/mako-0.3.6/mako/pygen.py
diff --git a/lib/mako/mako/pyparser.py b/lib/mako-0.3.6/mako/pyparser.py
rename from lib/mako/mako/pyparser.py
rename to lib/mako-0.3.6/mako/pyparser.py
diff --git a/lib/mako/mako/runtime.py b/lib/mako-0.3.6/mako/runtime.py
rename from lib/mako/mako/runtime.py
rename to lib/mako-0.3.6/mako/runtime.py
diff --git a/lib/mako/mako/template.py b/lib/mako-0.3.6/mako/template.py
rename from lib/mako/mako/template.py
rename to lib/mako-0.3.6/mako/template.py
diff --git a/lib/mako/mako/util.py b/lib/mako-0.3.6/mako/util.py
rename from lib/mako/mako/util.py
rename to lib/mako-0.3.6/mako/util.py
diff --git a/lib/mako/scripts/mako-render b/lib/mako-0.3.6/scripts/mako-render
rename from lib/mako/scripts/mako-render
rename to lib/mako-0.3.6/scripts/mako-render
diff --git a/lib/mako/setup.cfg b/lib/mako-0.3.6/setup.cfg
rename from lib/mako/setup.cfg
rename to lib/mako-0.3.6/setup.cfg
diff --git a/lib/mako/setup.py b/lib/mako-0.3.6/setup.py
rename from lib/mako/setup.py
rename to lib/mako-0.3.6/setup.py
diff --git a/lib/mako/test/__init__.py b/lib/mako-0.3.6/test/__init__.py
rename from lib/mako/test/__init__.py
rename to lib/mako-0.3.6/test/__init__.py
diff --git a/lib/mako/test/foo/test_ns.py b/lib/mako-0.3.6/test/foo/test_ns.py
rename from lib/mako/test/foo/test_ns.py
rename to lib/mako-0.3.6/test/foo/test_ns.py
diff --git a/lib/mako/test/sample_module_namespace.py b/lib/mako-0.3.6/test/sample_module_namespace.py
rename from lib/mako/test/sample_module_namespace.py
rename to lib/mako-0.3.6/test/sample_module_namespace.py
diff --git a/lib/mako/test/templates/badbom.html b/lib/mako-0.3.6/test/templates/badbom.html
rename from lib/mako/test/templates/badbom.html
rename to lib/mako-0.3.6/test/templates/badbom.html
diff --git a/lib/mako/test/templates/bom.html b/lib/mako-0.3.6/test/templates/bom.html
rename from lib/mako/test/templates/bom.html
rename to lib/mako-0.3.6/test/templates/bom.html
diff --git a/lib/mako/test/templates/bommagic.html b/lib/mako-0.3.6/test/templates/bommagic.html
rename from lib/mako/test/templates/bommagic.html
rename to lib/mako-0.3.6/test/templates/bommagic.html
diff --git a/lib/mako/test/templates/chs_unicode.html b/lib/mako-0.3.6/test/templates/chs_unicode.html
rename from lib/mako/test/templates/chs_unicode.html
rename to lib/mako-0.3.6/test/templates/chs_unicode.html
diff --git a/lib/mako/test/templates/chs_unicode_py3k.html b/lib/mako-0.3.6/test/templates/chs_unicode_py3k.html
rename from lib/mako/test/templates/chs_unicode_py3k.html
rename to lib/mako-0.3.6/test/templates/chs_unicode_py3k.html
diff --git a/lib/mako/test/templates/chs_utf8.html b/lib/mako-0.3.6/test/templates/chs_utf8.html
rename from lib/mako/test/templates/chs_utf8.html
rename to lib/mako-0.3.6/test/templates/chs_utf8.html
diff --git a/lib/mako/test/templates/crlf.html b/lib/mako-0.3.6/test/templates/crlf.html
rename from lib/mako/test/templates/crlf.html
rename to lib/mako-0.3.6/test/templates/crlf.html
diff --git a/lib/mako/test/templates/foo/modtest.html.py b/lib/mako-0.3.6/test/templates/foo/modtest.html.py
rename from lib/mako/test/templates/foo/modtest.html.py
rename to lib/mako-0.3.6/test/templates/foo/modtest.html.py
diff --git a/lib/mako/test/templates/gettext.mako b/lib/mako-0.3.6/test/templates/gettext.mako
rename from lib/mako/test/templates/gettext.mako
rename to lib/mako-0.3.6/test/templates/gettext.mako
diff --git a/lib/mako/test/templates/index.html b/lib/mako-0.3.6/test/templates/index.html
rename from lib/mako/test/templates/index.html
rename to lib/mako-0.3.6/test/templates/index.html
diff --git a/lib/mako/test/templates/internationalization.html b/lib/mako-0.3.6/test/templates/internationalization.html
rename from lib/mako/test/templates/internationalization.html
rename to lib/mako-0.3.6/test/templates/internationalization.html
diff --git a/lib/mako/test/templates/modtest.html b/lib/mako-0.3.6/test/templates/modtest.html
rename from lib/mako/test/templates/modtest.html
rename to lib/mako-0.3.6/test/templates/modtest.html
diff --git a/lib/mako/test/templates/read_unicode.html b/lib/mako-0.3.6/test/templates/read_unicode.html
rename from lib/mako/test/templates/read_unicode.html
rename to lib/mako-0.3.6/test/templates/read_unicode.html
diff --git a/lib/mako/test/templates/read_unicode_py3k.html b/lib/mako-0.3.6/test/templates/read_unicode_py3k.html
rename from lib/mako/test/templates/read_unicode_py3k.html
rename to lib/mako-0.3.6/test/templates/read_unicode_py3k.html
diff --git a/lib/mako/test/templates/runtimeerr.html b/lib/mako-0.3.6/test/templates/runtimeerr.html
rename from lib/mako/test/templates/runtimeerr.html
rename to lib/mako-0.3.6/test/templates/runtimeerr.html
diff --git a/lib/mako/test/templates/runtimeerr_py3k.html b/lib/mako-0.3.6/test/templates/runtimeerr_py3k.html
rename from lib/mako/test/templates/runtimeerr_py3k.html
rename to lib/mako-0.3.6/test/templates/runtimeerr_py3k.html
diff --git a/lib/mako/test/templates/subdir/foo/modtest.html.py b/lib/mako-0.3.6/test/templates/subdir/foo/modtest.html.py
rename from lib/mako/test/templates/subdir/foo/modtest.html.py
rename to lib/mako-0.3.6/test/templates/subdir/foo/modtest.html.py
diff --git a/lib/mako/test/templates/subdir/incl.html b/lib/mako-0.3.6/test/templates/subdir/incl.html
rename from lib/mako/test/templates/subdir/incl.html
rename to lib/mako-0.3.6/test/templates/subdir/incl.html
diff --git a/lib/mako/test/templates/subdir/index.html b/lib/mako-0.3.6/test/templates/subdir/index.html
rename from lib/mako/test/templates/subdir/index.html
rename to lib/mako-0.3.6/test/templates/subdir/index.html
diff --git a/lib/mako/test/templates/subdir/modtest.html b/lib/mako-0.3.6/test/templates/subdir/modtest.html
rename from lib/mako/test/templates/subdir/modtest.html
rename to lib/mako-0.3.6/test/templates/subdir/modtest.html
diff --git a/lib/mako/test/templates/unicode.html b/lib/mako-0.3.6/test/templates/unicode.html
rename from lib/mako/test/templates/unicode.html
rename to lib/mako-0.3.6/test/templates/unicode.html
diff --git a/lib/mako/test/templates/unicode_arguments.html b/lib/mako-0.3.6/test/templates/unicode_arguments.html
rename from lib/mako/test/templates/unicode_arguments.html
rename to lib/mako-0.3.6/test/templates/unicode_arguments.html
diff --git a/lib/mako/test/templates/unicode_arguments_py3k.html b/lib/mako-0.3.6/test/templates/unicode_arguments_py3k.html
rename from lib/mako/test/templates/unicode_arguments_py3k.html
rename to lib/mako-0.3.6/test/templates/unicode_arguments_py3k.html
diff --git a/lib/mako/test/templates/unicode_code.html b/lib/mako-0.3.6/test/templates/unicode_code.html
rename from lib/mako/test/templates/unicode_code.html
rename to lib/mako-0.3.6/test/templates/unicode_code.html
diff --git a/lib/mako/test/templates/unicode_code_py3k.html b/lib/mako-0.3.6/test/templates/unicode_code_py3k.html
rename from lib/mako/test/templates/unicode_code_py3k.html
rename to lib/mako-0.3.6/test/templates/unicode_code_py3k.html
diff --git a/lib/mako/test/templates/unicode_expr.html b/lib/mako-0.3.6/test/templates/unicode_expr.html
rename from lib/mako/test/templates/unicode_expr.html
rename to lib/mako-0.3.6/test/templates/unicode_expr.html
diff --git a/lib/mako/test/templates/unicode_expr_py3k.html b/lib/mako-0.3.6/test/templates/unicode_expr_py3k.html
rename from lib/mako/test/templates/unicode_expr_py3k.html
rename to lib/mako-0.3.6/test/templates/unicode_expr_py3k.html
diff --git a/lib/mako/test/templates/unicode_runtime_error.html b/lib/mako-0.3.6/test/templates/unicode_runtime_error.html
rename from lib/mako/test/templates/unicode_runtime_error.html
rename to lib/mako-0.3.6/test/templates/unicode_runtime_error.html
diff --git a/lib/mako/test/templates/unicode_syntax_error.html b/lib/mako-0.3.6/test/templates/unicode_syntax_error.html
rename from lib/mako/test/templates/unicode_syntax_error.html
rename to lib/mako-0.3.6/test/templates/unicode_syntax_error.html
diff --git a/lib/mako/test/test_ast.py b/lib/mako-0.3.6/test/test_ast.py
rename from lib/mako/test/test_ast.py
rename to lib/mako-0.3.6/test/test_ast.py
diff --git a/lib/mako/test/test_babelplugin.py b/lib/mako-0.3.6/test/test_babelplugin.py
rename from lib/mako/test/test_babelplugin.py
rename to lib/mako-0.3.6/test/test_babelplugin.py
diff --git a/lib/mako/test/test_cache.py b/lib/mako-0.3.6/test/test_cache.py
rename from lib/mako/test/test_cache.py
rename to lib/mako-0.3.6/test/test_cache.py
diff --git a/lib/mako/test/test_call.py b/lib/mako-0.3.6/test/test_call.py
rename from lib/mako/test/test_call.py
rename to lib/mako-0.3.6/test/test_call.py
diff --git a/lib/mako/test/test_decorators.py b/lib/mako-0.3.6/test/test_decorators.py
rename from lib/mako/test/test_decorators.py
rename to lib/mako-0.3.6/test/test_decorators.py
diff --git a/lib/mako/test/test_def.py b/lib/mako-0.3.6/test/test_def.py
rename from lib/mako/test/test_def.py
rename to lib/mako-0.3.6/test/test_def.py
diff --git a/lib/mako/test/test_exceptions.py b/lib/mako-0.3.6/test/test_exceptions.py
rename from lib/mako/test/test_exceptions.py
rename to lib/mako-0.3.6/test/test_exceptions.py
diff --git a/lib/mako/test/test_filters.py b/lib/mako-0.3.6/test/test_filters.py
rename from lib/mako/test/test_filters.py
rename to lib/mako-0.3.6/test/test_filters.py
diff --git a/lib/mako/test/test_inheritance.py b/lib/mako-0.3.6/test/test_inheritance.py
rename from lib/mako/test/test_inheritance.py
rename to lib/mako-0.3.6/test/test_inheritance.py
diff --git a/lib/mako/test/test_lexer.py b/lib/mako-0.3.6/test/test_lexer.py
rename from lib/mako/test/test_lexer.py
rename to lib/mako-0.3.6/test/test_lexer.py
diff --git a/lib/mako/test/test_lookup.py b/lib/mako-0.3.6/test/test_lookup.py
rename from lib/mako/test/test_lookup.py
rename to lib/mako-0.3.6/test/test_lookup.py
diff --git a/lib/mako/test/test_lru.py b/lib/mako-0.3.6/test/test_lru.py
rename from lib/mako/test/test_lru.py
rename to lib/mako-0.3.6/test/test_lru.py
diff --git a/lib/mako/test/test_namespace.py b/lib/mako-0.3.6/test/test_namespace.py
rename from lib/mako/test/test_namespace.py
rename to lib/mako-0.3.6/test/test_namespace.py
diff --git a/lib/mako/test/test_pygen.py b/lib/mako-0.3.6/test/test_pygen.py
rename from lib/mako/test/test_pygen.py
rename to lib/mako-0.3.6/test/test_pygen.py
diff --git a/lib/mako/test/test_template.py b/lib/mako-0.3.6/test/test_template.py
rename from lib/mako/test/test_template.py
rename to lib/mako-0.3.6/test/test_template.py
diff --git a/lib/mako/test/test_tgplugin.py b/lib/mako-0.3.6/test/test_tgplugin.py
rename from lib/mako/test/test_tgplugin.py
rename to lib/mako-0.3.6/test/test_tgplugin.py
diff --git a/lib/mako/test/util.py b/lib/mako-0.3.6/test/util.py
rename from lib/mako/test/util.py
rename to lib/mako-0.3.6/test/util.py
diff --git a/lib/mako-0.7.2/CHANGES b/lib/mako-0.7.2/CHANGES
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/CHANGES
@@ -0,0 +1,825 @@
+0.7.2
+- [bug] Fixed regression in 0.7.1 where AST
+  parsing for Py2.4 was broken.
+  [ticket:193]
+
+0.7.1
+- [feature] Control lines with no bodies will
+  now succeed, as "pass" is added for these
+  when no statements are otherwise present.
+  Courtesy Ben Trofatter [ticket:146]
+
+- [bug] Fixed some long-broken scoping behavior
+  involving variables declared in defs and such,
+  which only became apparent when
+  the strict_undefined flag was turned on.
+  [ticket:192]
+
+- [bug] Can now use strict_undefined at the
+  same time args passed to def() are used
+  by other elements of the <%def> tag.
+  [ticket:191]
+
+0.7.0
+- [feature] Added new "loop" variable to templates,
+  is provided within a % for block to provide
+  info about the loop such as index, first/last,
+  odd/even, etc.  A migration path is also provided
+  for legacy templates via the "enable_loop" argument
+  available on Template, TemplateLookup, and <%page>.
+  Thanks to Ben Trofatter for all
+  the work on this [ticket:125]
+
+- [feature] Added a real check for "reserved"
+  names, that is names which are never pulled
+  from the context and cannot be passed to
+  the template.render() method.  Current names
+  are "context", "loop", "UNDEFINED".
+
+- [feature] The html_error_template() will now
+  apply Pygments highlighting to the source
+  code displayed in the traceback, if Pygments
+  if available.  Courtesy Ben Trofatter
+  [ticket:95]
+
+- [feature] Added support for context managers,
+  i.e. "% with x as e:/ % endwith" support.
+  Courtesy Ben Trofatter [ticket:147]
+
+- [feature] Added class-level flag to CacheImpl
+  "pass_context"; when True, the keyword argument
+  'context' will be passed to get_or_create()
+  containing the Mako Context object.
+  [ticket:185]
+
+- [bug] Fixed some Py3K resource warnings due
+  to filehandles being implicitly closed.
+  [ticket:182]
+
+- [bug] Fixed endless recursion bug when
+  nesting multiple def-calls with content.
+  Thanks to Jeff Dairiki. [ticket:186]
+
+- [feature] Added Jinja2 to the example
+  benchmark suite, courtesy Vincent F?rotin
+
+0.6.2
+- [bug] The ${{"foo":"bar"}} parsing issue is fixed!!
+  The legendary Eevee has slain the dragon!
+  [ticket:20].  Also fixes quoting issue
+  at [ticket:86].
+
+0.6.1
+- [bug] Added special compatibility for the 0.5.0
+  Cache() constructor, which was preventing file
+  version checks and not allowing Mako 0.6 to
+  recompile the module files.
+
+0.6.0
+
+- [feature] Template caching has been converted into a plugin
+  system, whereby the usage of Beaker is just the
+  default plugin.   Template and TemplateLookup
+  now accept a string "cache_impl" parameter which
+  refers to the name of a cache plugin, defaulting
+  to the name 'beaker'.  New plugins can be
+  registered as pkg_resources entrypoints under
+  the group "mako.cache", or registered directly
+  using mako.cache.register_plugin().  The
+  core plugin is the mako.cache.CacheImpl
+  class.
+
+- [feature] Added support for Beaker cache regions
+  in templates.   Usage of regions should be considered
+  as superseding the very obsolete idea of passing in
+  backend options, timeouts, etc. within templates.
+
+- [feature] The 'put' method on Cache is now
+  'set'.  'put' is there for backwards compatibility.
+
+- [feature] The <%def>, <%block> and <%page> tags now accept
+  any argument named "cache_*", and the key
+  minus the "cache_" prefix will be passed as keyword
+  arguments to the CacheImpl methods.
+
+- [feature] Template and TemplateLookup now accept an argument
+  cache_args, which refers to a dictionary containing
+  cache parameters.  The cache_dir, cache_url, cache_type,
+  cache_timeout arguments are deprecated (will probably
+  never be removed, however) and can be passed
+  now as cache_args={'url':<some url>, 'type':'memcached',
+  'timeout':50, 'dir':'/path/to/some/directory'}
+
+- [feature/bug] Can now refer to context variables
+  within extra arguments to <%block>, <%def>, i.e.
+  <%block name="foo" cache_key="${somekey}">.
+  Filters can also be used in this way, i.e.
+  <%def name="foo()" filter="myfilter">
+  then template.render(myfilter=some_callable)
+  [ticket:180]
+
+- [feature] Added "--var name=value" option to the mako-render
+  script, allows passing of kw to the template from
+  the command line. [ticket:178]
+
+- [feature] Added module_writer argument to Template,
+  TemplateLookup, allows a callable to be passed which
+  takes over the writing of the template's module source
+  file, so that special environment-specific steps
+  can be taken.  [ticket:181]
+
+- [bug] The exception message in the html_error_template
+  is now escaped with the HTML filter. [ticket:142]
+
+- [bug] Added "white-space:pre" style to html_error_template()
+  for code blocks so that indentation is preserved
+  [ticket:173]
+
+- [bug] The "benchmark" example is now Python 3 compatible
+  (even though several of those old template libs aren't
+  available on Py3K, so YMMV) [ticket:175]
+
+0.5
+- A Template is explicitly disallowed
+  from having a url that normalizes to relative outside
+  of the root.   That is, if the Lookup is based
+  at /home/mytemplates, an include that would place
+  the ultimate template at
+  /home/mytemplates/../some_other_directory,
+  i.e. outside of /home/mytemplates,
+  is disallowed.   This usage was never intended
+  despite the lack of an explicit check.
+  The main issue this causes
+  is that module files can be written outside
+  of the module root (or raise an error, if file perms aren't
+  set up), and can also lead to the same template being
+  cached in the lookup under multiple, relative roots.
+  TemplateLookup instead has always supported multiple
+  file roots for this purpose.
+  [ticket:174]
+
+0.4.2
+- Fixed bug regarding <%call>/def calls w/ content
+  whereby the identity of the "caller" callable
+  inside the <%def> would be corrupted by the
+  presence of another <%call> in the same block.
+  [ticket:170]
+
+- Fixed the babel plugin to accommodate <%block>
+  [ticket:169]
+
+0.4.1
+- New tag: <%block>.  A variant on <%def> that
+  evaluates its contents in-place.
+  Can be named or anonymous,
+  the named version is intended for inheritance
+  layouts where any given section can be
+  surrounded by the <%block> tag in order for
+  it to become overrideable by inheriting
+  templates, without the need to specify a
+  top-level <%def> plus explicit call.
+  Modified scoping and argument rules as well as a
+  more strictly enforced usage scheme make it ideal
+  for this purpose without at all replacing most
+  other things that defs are still good for.
+  Lots of new docs. [ticket:164]
+
+- a slight adjustment to the "highlight" logic
+  for generating template bound stacktraces.
+  Will stick to known template source lines
+  without any extra guessing. [ticket:165]
+
+0.4.0
+- A 20% speedup for a basic two-page
+  inheritance setup rendering
+  a table of escaped data
+  (see http://techspot.zzzeek.org/2010/11/19/quick-mako-vs.-jinja-speed-test/).
+  A few configurational changes which
+  affect those in the I-don't-do-unicode
+  camp should be noted below.
+
+- The FastEncodingBuffer is now used
+  by default instead of cStringIO or StringIO,
+  regardless of whether output_encoding
+  is set to None or not.  FEB is faster than
+  both.  Only StringIO allows bytestrings
+  of unknown encoding to pass right
+  through, however - while it is of course
+  not recommended to send bytestrings of unknown
+  encoding to the output stream, this
+  mode of usage can be re-enabled by
+  setting the flag bytestring_passthrough
+  to True.
+
+- disable_unicode mode requires that
+  output_encoding be set to None - it also
+  forces the bytestring_passthrough flag
+  to True.
+
+- the <%namespace> tag raises an error
+  if the 'template' and 'module' attributes
+  are specified at the same time in
+  one tag.  A different class is used
+  for each case which allows a reduction in
+  runtime conditional logic and function
+  call overhead. [ticket:156]
+
+- the keys() in the Context, as well as
+  it's internal _data dictionary, now
+  include just what was specified to
+  render() as well as Mako builtins
+  'caller', 'capture'.  The contents
+  of __builtin__ are no longer copied.
+  Thanks to Daniel Lopez for pointing
+  this out. [ticket:159]
+
+0.3.6
+- Documentation is on Sphinx.
+  [ticket:126]
+
+- Beaker is now part of "extras" in
+  setup.py instead of "install_requires".
+  This to produce a lighter weight install
+  for those who don't use the caching
+  as well as to conform to Pyramid
+  deployment practices.  [ticket:154]
+
+- The Beaker import (or attempt thereof)
+  is delayed until actually needed;
+  this to remove the performance penalty
+  from startup, particularly for
+  "single execution" environments
+  such as shell scripts. [ticket:153]
+
+- Patch to lexer to not generate an empty
+  '' write in the case of backslash-ended
+  lines.  [ticket:155]
+
+- Fixed missing **extra collection in
+  setup.py which prevented setup.py
+  from running 2to3 on install.
+  [ticket:148]
+
+- New flag on Template, TemplateLookup -
+  strict_undefined=True, will cause
+  variables not found in the context to
+  raise a NameError immediately, instead of
+  defaulting to the UNDEFINED value.
+
+- The range of Python identifiers that
+  are considered "undefined", meaning they
+  are pulled from the context, has been
+  trimmed back to not include variables
+  declared inside of expressions (i.e. from
+  list comprehensions), as well as
+  in the argument list of lambdas.  This
+  to better support the strict_undefined
+  feature.  The change should be
+  fully backwards-compatible but involved
+  a little bit of tinkering in the AST code,
+  which hadn't really been touched for
+  a couple of years, just FYI.
+
+0.3.5
+- The <%namespace> tag allows expressions
+  for the `file` argument, i.e. with ${}.
+  The `context` variable, if needed,
+  must be referenced explicitly.
+  [ticket:141]
+
+- ${} expressions embedded in tags,
+  such as <%foo:bar x="${...}">, now
+  allow multiline Python expressions.
+
+- Fixed previously non-covered regular
+  expression, such that using a ${} expression
+  inside of a tag element that doesn't allow
+  them raises a CompileException instead of
+  silently failing.
+
+- Added a try/except around "import markupsafe".
+  This to support GAE which can't run markupsafe.
+  [ticket:151] No idea whatsoever if the
+  install_requires in setup.py also breaks GAE,
+  couldn't get an answer on this.
+
+0.3.4
+- Now using MarkupSafe for HTML escaping,
+  i.e. in place of cgi.escape().  Faster
+  C-based implementation and also escapes
+  single quotes for additional security.
+  Supports the __html__ attribute for
+  the given expression as well.
+
+  When using "disable_unicode" mode,
+  a pure Python HTML escaper function
+  is used which also quotes single quotes.
+
+  Note that Pylons by default doesn't
+  use Mako's filter - check your
+  environment.py file.
+
+- Fixed call to "unicode.strip" in
+  exceptions.text_error_template which
+  is not Py3k compatible.  [ticket:137]
+
+0.3.3
+- Added conditional to RichTraceback
+  such that if no traceback is passed
+  and sys.exc_info() has been reset,
+  the formatter just returns blank
+  for the "traceback" portion.
+  [ticket:135]
+
+- Fixed sometimes incorrect usage of
+  exc.__class__.__name__
+  in html/text error templates when using
+  Python 2.4 [ticket:131]
+
+- Fixed broken @property decorator on
+  template.last_modified
+
+- Fixed error formatting when a stacktrace
+  line contains no line number, as in when
+  inside an eval/exec-generated function.
+  [ticket:132]
+
+- When a .py is being created, the tempfile
+  where the source is stored temporarily is
+  now made in the same directory as that of
+  the .py file.  This ensures that the two
+  files share the same filesystem, thus
+  avoiding cross-filesystem synchronization
+  issues.  Thanks to Charles Cazabon.
+
+0.3.2
+- Calling a def from the top, via
+  template.get_def(...).render() now checks the
+  argument signature the same way as it did in
+  0.2.5, so that TypeError is not raised.
+  reopen of [ticket:116]
+
+
+0.3.1
+- Fixed incorrect dir name in setup.py
+  [ticket:129]
+
+0.3
+- Python 2.3 support is dropped. [ticket:123]
+
+- Python 3 support is added ! See README.py3k
+  for installation and testing notes.
+  [ticket:119]
+
+- Unit tests now run with nose.  [ticket:127]
+
+- Source code escaping has been simplified.
+  In particular, module source files are now
+  generated with the Python "magic encoding
+  comment", and source code is passed through
+  mostly unescaped, except for that code which
+  is regenerated from parsed Python source.
+  This fixes usage of unicode in
+  <%namespace:defname> tags.  [ticket:99]
+
+- RichTraceback(), html_error_template().render(),
+  text_error_template().render() now accept "error"
+  and "traceback" as optional arguments, and
+  these are now actually used.  [ticket:122]
+
+- The exception output generated when
+  format_exceptions=True will now be as a Python
+  unicode if it occurred during render_unicode(),
+  or an encoded string if during render().
+
+- A percent sign can be emitted as the first
+  non-whitespace character on a line by escaping
+  it as in "%%". [ticket:112]
+
+- Template accepts empty control structure, i.e.
+  % if: %endif, etc. [ticket:94]
+
+- The <%page args> tag can now be used in a base
+  inheriting template - the full set of render()
+  arguments are passed down through the inherits
+  chain.  Undeclared arguments go into **pageargs
+  as usual.  [ticket:116]
+
+- defs declared within a <%namespace> section, an
+  uncommon feature, have been improved.  The defs
+  no longer get doubly-rendered in the body() scope,
+  and now allow local variable assignment without
+  breakage.  [ticket:109]
+
+- Windows paths are handled correctly if a Template
+  is passed only an absolute filename (i.e. with c:
+  drive etc.)  and no URI - the URI is converted
+  to a forward-slash path and module_directory
+  is treated as a windows path.  [ticket:128]
+
+- TemplateLookup raises TopLevelLookupException for
+  a given path that is a directory, not a filename,
+  instead of passing through to the template to
+  generate IOError.  [ticket:73]
+
+0.2.6
+
+- Fix mako function decorators to preserve the
+  original function's name in all cases. Patch
+  from Scott Torborg.
+
+- Support the <%namespacename:defname> syntax in
+  the babel extractor. [ticket:118]
+
+- Further fixes to unicode handling of .py files with the
+  html_error_template. [ticket:88]
+
+0.2.5
+- Added a "decorator" kw argument to <%def>,
+  allows custom decoration functions to wrap
+  rendering callables.  Mainly intended for
+  custom caching algorithms, not sure what
+  other uses there may be (but there may be).
+  Examples are in the "filtering" docs.
+
+- When Mako creates subdirectories in which
+  to store templates, it uses the more
+  permissive mode of 0775 instead of 0750,
+  helping out with certain multi-process
+  scenarios. Note that the mode is always
+  subject to the restrictions of the existing
+  umask. [ticket:101]
+
+- Fixed namespace.__getattr__() to raise
+  AttributeError on attribute not found
+  instead of RuntimeError.  [ticket:104]
+
+- Added last_modified accessor to Template,
+  returns the time.time() when the module
+  was created. [ticket:97]
+
+- Fixed lexing support for whitespace
+  around '=' sign in defs. [ticket:102]
+
+- Removed errant "lower()" in the lexer which
+  was causing tags to compile with
+  case-insensitive names, thus messing up
+  custom <%call> names. [ticket:108]
+
+- added "mako.__version__" attribute to
+  the base module.  [ticket:110]
+
+0.2.4
+- Fixed compatibility with Jython 2.5b1.
+
+0.2.3
+- the <%namespacename:defname> syntax described at
+  http://techspot.zzzeek.org/?p=28 has now
+  been added as a built in syntax, and is recommended
+  as a more modern syntax versus <%call expr="expression">.
+  The %call tag itself will always remain,
+  with <%namespacename:defname> presenting a more HTML-like
+  alternative to calling defs, both plain and
+  nested.  Many examples of the new syntax are in the
+  "Calling a def with embedded content" section
+  of the docs.
+
+- added support for Jython 2.5.
+
+- cache module now uses Beaker's CacheManager
+  object directly, so that all cache types are included.
+  memcached is available as both "ext:memcached" and
+  "memcached", the latter for backwards compatibility.
+
+- added "cache" accessor to Template, Namespace.
+  e.g.  ${local.cache.get('somekey')} or
+  template.cache.invalidate_body()
+
+- added "cache_enabled=True" flag to Template,
+  TemplateLookup.  Setting this to False causes cache
+  operations to "pass through" and execute every time;
+  this flag should be integrated in Pylons with its own
+  cache_enabled configuration setting.
+
+- the Cache object now supports invalidate_def(name),
+  invalidate_body(), invalidate_closure(name),
+  invalidate(key), which will remove the given key
+  from the cache, if it exists.  The cache arguments
+  (i.e. storage type) are derived from whatever has
+  been already persisted for that template.
+  [ticket:92]
+
+- For cache changes to work fully, Beaker 1.1 is required.
+  1.0.1 and up will work as well with the exception of
+  cache expiry.  Note that Beaker 1.1 is **required**
+  for applications which use dynamically generated keys,
+  since previous versions will permanently store state in memory
+  for each individual key, thus consuming all available
+  memory for an arbitrarily large number of distinct
+  keys.
+
+- fixed bug whereby an <%included> template with
+  <%page> args named the same as a __builtin__ would not
+  honor the default value specified in <%page> [ticket:93]
+
+- fixed the html_error_template not handling tracebacks from
+  normal .py files with a magic encoding comment [ticket:88]
+
+- RichTraceback() now accepts an optional traceback object
+  to be used in place of sys.exc_info()[2].  html_error_template()
+  and text_error_template() accept an optional
+  render()-time argument "traceback" which is passed to the
+  RichTraceback object.
+
+- added ModuleTemplate class, which allows the construction
+  of a Template given a Python module generated by a previous
+  Template.   This allows Python modules alone to be used
+  as templates with no compilation step.   Source code
+  and template source are optional but allow error reporting
+  to work correctly.
+
+- fixed Python 2.3 compat. in mako.pyparser [ticket:90]
+
+- fix Babel 0.9.3 compatibility; stripping comment tags is now
+  optional (and enabled by default).
+
+
+0.2.2
+- cached blocks now use the current context when rendering
+an expired section, instead of the original context
+passed in [ticket:87]
+- fixed a critical issue regarding caching, whereby
+a cached block would raise an error when called within a
+cache-refresh operation that was initiated after the
+initiating template had completed rendering.
+
+0.2.1
+- fixed bug where 'output_encoding' parameter would prevent
+render_unicode() from returning a unicode object.
+- bumped magic number, which forces template recompile for
+this version (fixes incompatible compile symbols from 0.1
+series).
+- added a few docs for cache options, specifically those that
+help with memcached.
+
+0.2.0
+- Speed improvements (as though we needed them, but people
+  contributed and there you go):
+
+  - added "bytestring passthru" mode, via
+    `disable_unicode=True` argument passed to Template or
+    TemplateLookup. All unicode-awareness and filtering is
+    turned off, and template modules are generated with
+    the appropriate magic encoding comment. In this mode,
+    template expressions can only receive raw bytestrings
+    or Unicode objects which represent straight ASCII, and
+    render_unicode() may not be used if multibyte
+    characters are present. When enabled, speed
+    improvement around 10-20%. [ticket:77] (courtesy
+    anonymous guest)
+
+  - inlined the "write" function of Context into a local
+    template variable. This affords a 12-30% speedup in
+    template render time. (idea courtesy same anonymous
+    guest) [ticket:76]
+
+- New Features, API changes:
+
+  - added "attr" accessor to namespaces. Returns
+    attributes configured as module level attributes, i.e.
+    within <%! %> sections.  [ticket:62] i.e.:
+
+    # somefile.html
+    <%!
+        foo = 27
+    %>
+
+    # some other template
+    <%namespace name="myns" file="somefile.html"/>
+    ${myns.attr.foo}
+
+    The slight backwards incompatibility here is, you
+    can't have namespace defs named "attr" since the
+    "attr" descriptor will occlude it.
+
+  - cache_key argument can now render arguments passed
+    directly to the %page or %def, i.e. <%def
+    name="foo(x)" cached="True" cache_key="${x}"/>
+    [ticket:78]
+
+  - some functions on Context are now private:
+    _push_buffer(), _pop_buffer(),
+    caller_stack._push_frame(), caller_stack._pop_frame().
+
+  - added a runner script "mako-render" which renders
+    standard input as a template to stdout [ticket:81]
+    [ticket:56]
+
+- Bugfixes:
+  - can now use most names from __builtins__ as variable
+    names without explicit declaration (i.e. 'id',
+    'exception', 'range', etc.) [ticket:83] [ticket:84]
+
+  - can also use builtin names as local variable names
+    (i.e. dict, locals) (came from fix for [ticket:84])
+
+  - fixed bug in python generation when variable names are
+    used with identifiers like "else", "finally", etc.
+    inside them [ticket:68]
+
+  - fixed codegen bug which occured when using <%page>
+    level caching, combined with an expression-based
+    cache_key, combined with the usage of <%namespace
+    import="*"/> - fixed lexer exceptions not cleaning up
+    temporary files, which could lead to a maximum number
+    of file descriptors used in the process [ticket:69]
+
+  - fixed issue with inline format_exceptions that was
+    producing blank exception pages when an inheriting
+    template is present [ticket:71]
+
+  - format_exceptions will apply the encoding options of
+    html_error_template() to the buffered output
+
+  - rewrote the "whitespace adjuster" function to work
+    with more elaborate combinations of quotes and
+    comments [ticket:75]
+
+0.1.10
+- fixed propagation of 'caller' such that nested %def calls
+  within a <%call> tag's argument list propigates 'caller'
+  to the %call function itself (propigates to the inner
+  calls too, this is a slight side effect which previously
+  existed anyway)
+- fixed bug where local.get_namespace() could put an
+  incorrect "self" in the current context
+- fixed another namespace bug where the namespace functions
+  did not have access to the correct context containing
+  their 'self' and 'parent'
+
+0.1.9
+- filters.Decode filter can also accept a non-basestring
+object and will call str() + unicode() on it [ticket:47]
+- comments can be placed at the end of control lines,
+i.e. if foo: # a comment, [ticket:53], thanks to
+Paul Colomiets
+- fixed expressions and page tag arguments and with embedded
+newlines in CRLF templates, follow up to [ticket:16], thanks
+Eric Woroshow
+- added an IOError catch for source file not found in RichTraceback
+exception reporter [ticket:51]
+
+0.1.8
+- variable names declared in render methods by internal
+codegen prefixed by "__M_" to prevent name collisions
+with user code
+- added a Babel (http://babel.edgewall.org/) extractor entry
+point, allowing extraction of gettext messages directly from
+mako templates via Babel [ticket:45]
+- fix to turbogears plugin to work with dot-separated names
+(i.e. load_template('foo.bar')).  also takes file extension
+as a keyword argument (default is 'mak').
+- more tg fix:  fixed [ticket:35], allowing string-based
+templates with tgplugin even if non-compatible args were sent
+
+0.1.7
+- one small fix to the unit tests to support python 2.3
+- a slight hack to how cache.py detects Beaker's memcached,
+works around unexplained import behavior observed on some
+python 2.3 installations
+
+0.1.6
+- caching is now supplied directly by Beaker, which has
+  all of MyghtyUtils merged into it now.  The latest Beaker
+  (0.7.1) also fixes a bug related to how Mako was using the
+  cache API.
+- fix to module_directory path generation when the path is "./"
+  [ticket:34]
+- TGPlugin passes options to string-based templates [ticket:35]
+- added an explicit stack frame step to template runtime, which
+  allows much simpler and hopefully bug-free tracking of 'caller',
+  fixes #28
+- if plain Python defs are used with <%call>, a decorator
+  @runtime.supports_callable exists to ensure that the "caller"
+  stack is properly handled for the def.
+- fix to RichTraceback and exception reporting to get template
+  source code as a unicode object #37
+- html_error_template includes options "full=True", "css=True"
+  which control generation of HTML tags, CSS [ticket:39]
+- added the 'encoding_errors' parameter to Template/TemplateLookup
+  for specifying the error handler associated with encoding to
+  'output_encoding' [ticket:40]
+- the Template returned by html_error_template now defaults to
+  output_encoding=sys.getdefaultencoding(),
+  encoding_errors='htmlentityreplace' [ticket:37]
+- control lines, i.e. % lines, support backslashes to continue long
+  lines (#32)
+- fixed codegen bug when defining <%def> within <%call> within <%call>
+- leading utf-8 BOM in template files is honored according to pep-0263
+
+0.1.5
+- AST expression generation - added in just about everything
+  expression-wise from the AST module  [ticket:26]
+- AST parsing, properly detects imports of the form "import foo.bar"
+  [ticket:27]
+- fix to lexing of <%docs> tag nested in other tags
+- fix to context-arguments inside of <%include> tag which broke
+during 0.1.4 [ticket:29]
+- added "n" filter, disables *all* filters normally applied to an expression
+via <%page> or default_filters (but not those within the filter)
+- added buffer_filters argument, defines filters applied to the return value
+of buffered/cached/filtered %defs, after all filters defined with the %def
+itself have been applied.  allows the creation of default expression filters
+that let the output of return-valued %defs "opt out" of that filtering
+via passing special attributes or objects.
+
+0.1.4
+- got defs-within-defs to be cacheable
+- fixes to code parsing/whitespace adjusting where plain python comments
+  may contain quote characters [ticket:23]
+- fix to variable scoping for identifiers only referenced within
+  functions
+- added a path normalization step to lookup so URIs like
+  "/foo/bar/../etc/../foo" pre-process the ".." tokens before checking
+  the filesystem
+- fixed/improved "caller" semantics so that undefined caller is
+  "UNDEFINED", propigates __nonzero__ method so it evaulates to False if
+  not present, True otherwise. this way you can say % if caller:\n
+  ${caller.body()}\n% endif
+- <%include> has an "args" attribute that can pass arguments to the
+  called template (keyword arguments only, must be declared in that
+  page's <%page> tag.)
+- <%include> plus arguments is also programmatically available via
+  self.include_file(<filename>, **kwargs)
+- further escaping added for multibyte expressions in %def, %call
+  attributes [ticket:24]
+
+
+0.1.3
+- ***Small Syntax Change*** - the single line comment character is now
+*two* hash signs, i.e. "## this is a comment".  This avoids a common
+collection with CSS selectors.
+- the magic "coding" comment (i.e. # coding:utf-8) will still work with
+either one "#" sign or two for now; two is preferred going forward, i.e.
+## coding:<someencoding>.
+- new multiline comment form: "<%doc> a comment </%doc>"
+- UNDEFINED evaluates to False
+- improvement to scoping of "caller" variable when using <%call> tag
+- added lexer error for unclosed control-line (%) line
+- added "preprocessor" argument to Template, TemplateLookup - is a single
+  callable or list of callables which will be applied to the template text
+  before lexing.  given the text as an argument, returns the new text.
+- added mako.ext.preprocessors package, contains one preprocessor so far:
+  'convert_comments', which will convert single # comments to the new ##
+  format
+
+0.1.2
+- fix to parsing of code/expression blocks to insure that non-ascii
+  characters, combined with a template that indicates a non-standard
+  encoding, are expanded into backslash-escaped glyphs before being AST
+  parsed [ticket:11]
+- all template lexing converts the template to unicode first, to
+  immediately catch any encoding issues and ensure internal unicode
+  representation.
+- added module_filename argument to Template to allow specification of a
+  specific module file
+- added modulename_callable to TemplateLookup to allow a function to
+  determine module filenames (takes filename, uri arguments). used for
+  [ticket:14]
+- added optional input_encoding flag to Template, to allow sending a
+  unicode() object with no magic encoding comment
+- "expression_filter" argument in <%page> applies only to expressions
+- added "default_filters" argument to Template, TemplateLookup. applies only
+  to expressions, gets prepended to "expression_filter" arg from <%page>.
+  defaults to ["unicode"], so that all expressions get stringified into u''
+  by default (this is what Mako already does). By setting to [], expressions
+  are passed through raw.
+- added "imports" argument to Template, TemplateLookup. so you can predefine
+  a list of import statements at the top of the template. can be used in
+  conjunction with default_filters.
+- support for CRLF templates...whoops ! welcome to all the windows users.
+  [ticket:16]
+- small fix to local variable propigation for locals that are conditionally
+  declared
+- got "top level" def calls to work, i.e. template.get_def("somedef").render()
+
+0.1.1
+- buffet plugin supports string-based templates, allows ToscaWidgets to work
+  [ticket:8]
+- AST parsing fixes: fixed TryExcept identifier parsing
+- removed textmate tmbundle from contrib and into separate SVN location;
+  windows users cant handle those files, setuptools not very good at
+  "pruning" certain directories
+- fix so that "cache_timeout" parameter is propigated
+- fix to expression filters so that string conversion (actually unicode)
+  properly occurs before filtering
+- better error message when a lookup is attempted with a template that has no
+  lookup
+- implemented "module" attribute for namespace
+- fix to code generation to correctly track multiple defs with the same name
+- "directories" can be passed to TemplateLookup as a scalar in which case it
+  gets converted to a list [ticket:9]
+
+0.1.0
+
+Initial release.
diff --git a/lib/mako-0.7.2/LICENSE b/lib/mako-0.7.2/LICENSE
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/LICENSE
@@ -0,0 +1,20 @@
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright (C) 2006-2012 the Mako authors and contributors <see AUTHORS file>.
+Mako is a trademark of Michael Bayer.
+
+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 the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/lib/mako-0.7.2/MANIFEST.in b/lib/mako-0.7.2/MANIFEST.in
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/MANIFEST.in
@@ -0,0 +1,11 @@
+# any kind of "*" pulls in __init__.pyc files,
+# so all extensions are explicit.
+
+recursive-include doc *.html *.css *.txt *.js *.png *.py Makefile *.rst *.mako
+recursive-include examples *.py *.xml *.mako *.myt *.kid *.tmpl
+recursive-include test *.py *.html *.mako
+
+include README* LICENSE distribute_setup.py ez_setup.py CHANGES*
+
+prune doc/build/output
+
diff --git a/lib/mako-0.7.2/Mako.egg-info/PKG-INFO b/lib/mako-0.7.2/Mako.egg-info/PKG-INFO
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/Mako.egg-info/PKG-INFO
@@ -0,0 +1,71 @@
+Metadata-Version: 1.0
+Name: Mako
+Version: 0.7.2
+Summary: A super-fast templating language that borrows the  best ideas from the existing templating languages.
+Home-page: http://www.makotemplates.org/
+Author: Mike Bayer
+Author-email: mike at zzzcomputing.com
+License: MIT
+Description: =========================
+        Mako Templates for Python
+        =========================
+        
+        Mako is a template library written in Python. It provides a familiar, non-XML 
+        syntax which compiles into Python modules for maximum performance. Mako's 
+        syntax and API borrows from the best ideas of many others, including Django
+        templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded 
+        Python (i.e. Python Server Page) language, which refines the familiar ideas
+        of componentized layout and inheritance to produce one of the most 
+        straightforward and flexible models available, while also maintaining close 
+        ties to Python calling and scoping semantics.
+        
+        Nutshell
+        ========
+        
+        ::
+        
+            <%inherit file="base.html"/>
+            <%
+                rows = [[v for v in range(0,10)] for row in range(0,10)]
+            %>
+            <table>
+                % for row in rows:
+                    ${makerow(row)}
+                % endfor
+            </table>
+        
+            <%def name="makerow(row)">
+                <tr>
+                % for name in row:
+                    <td>${name}</td>\
+                % endfor
+                </tr>
+            </%def>
+        
+        Philosophy
+        ===========
+        
+        Python is a great scripting language. Don't reinvent the wheel...your templates can handle it !
+        
+        Documentation
+        ==============
+        
+        See documentation for Mako at http://www.makotemplates.org/docs/
+        
+        License
+        ========
+        
+        Mako is licensed under an MIT-style license (see LICENSE).
+        Other incorporated projects may be licensed under different licenses.
+        All licenses allow for non-commercial and commercial use.
+        
+Keywords: templates
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
diff --git a/lib/mako-0.7.2/Mako.egg-info/SOURCES.txt b/lib/mako-0.7.2/Mako.egg-info/SOURCES.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/Mako.egg-info/SOURCES.txt
@@ -0,0 +1,171 @@
+CHANGES
+LICENSE
+MANIFEST.in
+README.rst
+distribute_setup.py
+setup.cfg
+setup.py
+Mako.egg-info/PKG-INFO
+Mako.egg-info/SOURCES.txt
+Mako.egg-info/dependency_links.txt
+Mako.egg-info/entry_points.txt
+Mako.egg-info/not-zip-safe
+Mako.egg-info/requires.txt
+Mako.egg-info/top_level.txt
+doc/caching.html
+doc/defs.html
+doc/filtering.html
+doc/genindex.html
+doc/index.html
+doc/inheritance.html
+doc/namespaces.html
+doc/runtime.html
+doc/search.html
+doc/searchindex.js
+doc/syntax.html
+doc/unicode.html
+doc/usage.html
+doc/_sources/caching.txt
+doc/_sources/defs.txt
+doc/_sources/filtering.txt
+doc/_sources/index.txt
+doc/_sources/inheritance.txt
+doc/_sources/namespaces.txt
+doc/_sources/runtime.txt
+doc/_sources/syntax.txt
+doc/_sources/unicode.txt
+doc/_sources/usage.txt
+doc/_static/basic.css
+doc/_static/comment-bright.png
+doc/_static/comment-close.png
+doc/_static/comment.png
+doc/_static/default.css
+doc/_static/docs.css
+doc/_static/doctools.js
+doc/_static/down-pressed.png
+doc/_static/down.png
+doc/_static/file.png
+doc/_static/jquery.js
+doc/_static/makoLogo.png
+doc/_static/minus.png
+doc/_static/plus.png
+doc/_static/pygments.css
+doc/_static/searchtools.js
+doc/_static/sidebar.js
+doc/_static/site.css
+doc/_static/underscore.js
+doc/_static/up-pressed.png
+doc/_static/up.png
+doc/_static/websupport.js
+doc/build/Makefile
+doc/build/caching.rst
+doc/build/conf.py
+doc/build/defs.rst
+doc/build/filtering.rst
+doc/build/index.rst
+doc/build/inheritance.rst
+doc/build/namespaces.rst
+doc/build/runtime.rst
+doc/build/syntax.rst
+doc/build/unicode.rst
+doc/build/usage.rst
+doc/build/builder/__init__.py
+doc/build/builder/builders.py
+doc/build/builder/util.py
+doc/build/static/docs.css
+doc/build/static/makoLogo.png
+doc/build/static/site.css
+doc/build/templates/base.mako
+doc/build/templates/genindex.mako
+doc/build/templates/layout.mako
+doc/build/templates/page.mako
+doc/build/templates/rtd_layout.mako
+doc/build/templates/search.mako
+examples/bench/basic.py
+examples/bench/cheetah/footer.tmpl
+examples/bench/cheetah/header.tmpl
+examples/bench/cheetah/template.tmpl
+examples/bench/django/templatetags/__init__.py
+examples/bench/django/templatetags/bench.py
+examples/bench/kid/base.kid
+examples/bench/kid/template.kid
+examples/bench/myghty/base.myt
+examples/bench/myghty/template.myt
+examples/wsgi/run_wsgi.py
+mako/__init__.py
+mako/_ast_util.py
+mako/ast.py
+mako/cache.py
+mako/codegen.py
+mako/exceptions.py
+mako/filters.py
+mako/lexer.py
+mako/lookup.py
+mako/parsetree.py
+mako/pygen.py
+mako/pyparser.py
+mako/runtime.py
+mako/template.py
+mako/util.py
+mako/ext/__init__.py
+mako/ext/autohandler.py
+mako/ext/babelplugin.py
+mako/ext/beaker_cache.py
+mako/ext/preprocessors.py
+mako/ext/pygmentplugin.py
+mako/ext/turbogears.py
+scripts/mako-render
+test/__init__.py
+test/sample_module_namespace.py
+test/test_ast.py
+test/test_babelplugin.py
+test/test_block.py
+test/test_cache.py
+test/test_call.py
+test/test_decorators.py
+test/test_def.py
+test/test_exceptions.py
+test/test_filters.py
+test/test_inheritance.py
+test/test_lexer.py
+test/test_lookup.py
+test/test_loop.py
+test/test_lru.py
+test/test_namespace.py
+test/test_pygen.py
+test/test_template.py
+test/test_tgplugin.py
+test/test_util.py
+test/util.py
+test/foo/__init__.py
+test/foo/test_ns.py
+test/templates/badbom.html
+test/templates/bom.html
+test/templates/bommagic.html
+test/templates/chs_unicode.html
+test/templates/chs_unicode_py3k.html
+test/templates/chs_utf8.html
+test/templates/crlf.html
+test/templates/gettext.mako
+test/templates/index.html
+test/templates/internationalization.html
+test/templates/modtest.html
+test/templates/read_unicode.html
+test/templates/read_unicode_py3k.html
+test/templates/runtimeerr.html
+test/templates/runtimeerr_py3k.html
+test/templates/unicode.html
+test/templates/unicode_arguments.html
+test/templates/unicode_arguments_py3k.html
+test/templates/unicode_code.html
+test/templates/unicode_code_py3k.html
+test/templates/unicode_expr.html
+test/templates/unicode_expr_py3k.html
+test/templates/unicode_runtime_error.html
+test/templates/unicode_syntax_error.html
+test/templates/foo/modtest.html.py
+test/templates/othersubdir/foo.html
+test/templates/subdir/incl.html
+test/templates/subdir/index.html
+test/templates/subdir/modtest.html
+test/templates/subdir/foo/modtest.html.py
\ No newline at end of file
diff --git a/lib/mako-0.7.2/Mako.egg-info/dependency_links.txt b/lib/mako-0.7.2/Mako.egg-info/dependency_links.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/Mako.egg-info/dependency_links.txt
@@ -0,0 +1,1 @@
+
diff --git a/lib/mako-0.7.2/Mako.egg-info/entry_points.txt b/lib/mako-0.7.2/Mako.egg-info/entry_points.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/Mako.egg-info/entry_points.txt
@@ -0,0 +1,14 @@
+
+      [python.templating.engines]
+      mako = mako.ext.turbogears:TGPlugin
+ 
+      [pygments.lexers]
+      mako = mako.ext.pygmentplugin:MakoLexer
+      html+mako = mako.ext.pygmentplugin:MakoHtmlLexer
+      xml+mako = mako.ext.pygmentplugin:MakoXmlLexer
+      js+mako = mako.ext.pygmentplugin:MakoJavascriptLexer
+      css+mako = mako.ext.pygmentplugin:MakoCssLexer
+
+      [babel.extractors]
+      mako = mako.ext.babelplugin:extract
+      
\ No newline at end of file
diff --git a/lib/mako-0.7.2/Mako.egg-info/not-zip-safe b/lib/mako-0.7.2/Mako.egg-info/not-zip-safe
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/Mako.egg-info/not-zip-safe
@@ -0,0 +1,1 @@
+
diff --git a/lib/mako-0.7.2/Mako.egg-info/requires.txt b/lib/mako-0.7.2/Mako.egg-info/requires.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/Mako.egg-info/requires.txt
@@ -0,0 +1,4 @@
+MarkupSafe>=0.9.2
+
+[beaker]
+Beaker>=1.1
\ No newline at end of file
diff --git a/lib/mako-0.7.2/Mako.egg-info/top_level.txt b/lib/mako-0.7.2/Mako.egg-info/top_level.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/Mako.egg-info/top_level.txt
@@ -0,0 +1,1 @@
+mako
diff --git a/lib/mako-0.7.2/PKG-INFO b/lib/mako-0.7.2/PKG-INFO
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/PKG-INFO
@@ -0,0 +1,71 @@
+Metadata-Version: 1.0
+Name: Mako
+Version: 0.7.2
+Summary: A super-fast templating language that borrows the  best ideas from the existing templating languages.
+Home-page: http://www.makotemplates.org/
+Author: Mike Bayer
+Author-email: mike at zzzcomputing.com
+License: MIT
+Description: =========================
+        Mako Templates for Python
+        =========================
+        
+        Mako is a template library written in Python. It provides a familiar, non-XML 
+        syntax which compiles into Python modules for maximum performance. Mako's 
+        syntax and API borrows from the best ideas of many others, including Django
+        templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded 
+        Python (i.e. Python Server Page) language, which refines the familiar ideas
+        of componentized layout and inheritance to produce one of the most 
+        straightforward and flexible models available, while also maintaining close 
+        ties to Python calling and scoping semantics.
+        
+        Nutshell
+        ========
+        
+        ::
+        
+            <%inherit file="base.html"/>
+            <%
+                rows = [[v for v in range(0,10)] for row in range(0,10)]
+            %>
+            <table>
+                % for row in rows:
+                    ${makerow(row)}
+                % endfor
+            </table>
+        
+            <%def name="makerow(row)">
+                <tr>
+                % for name in row:
+                    <td>${name}</td>\
+                % endfor
+                </tr>
+            </%def>
+        
+        Philosophy
+        ===========
+        
+        Python is a great scripting language. Don't reinvent the wheel...your templates can handle it !
+        
+        Documentation
+        ==============
+        
+        See documentation for Mako at http://www.makotemplates.org/docs/
+        
+        License
+        ========
+        
+        Mako is licensed under an MIT-style license (see LICENSE).
+        Other incorporated projects may be licensed under different licenses.
+        All licenses allow for non-commercial and commercial use.
+        
+Keywords: templates
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
diff --git a/lib/mako-0.7.2/README.rst b/lib/mako-0.7.2/README.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/README.rst
@@ -0,0 +1,52 @@
+=========================
+Mako Templates for Python
+=========================
+
+Mako is a template library written in Python. It provides a familiar, non-XML 
+syntax which compiles into Python modules for maximum performance. Mako's 
+syntax and API borrows from the best ideas of many others, including Django
+templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded 
+Python (i.e. Python Server Page) language, which refines the familiar ideas
+of componentized layout and inheritance to produce one of the most 
+straightforward and flexible models available, while also maintaining close 
+ties to Python calling and scoping semantics.
+
+Nutshell
+========
+
+::
+
+    <%inherit file="base.html"/>
+    <%
+        rows = [[v for v in range(0,10)] for row in range(0,10)]
+    %>
+    <table>
+        % for row in rows:
+            ${makerow(row)}
+        % endfor
+    </table>
+
+    <%def name="makerow(row)">
+        <tr>
+        % for name in row:
+            <td>${name}</td>\
+        % endfor
+        </tr>
+    </%def>
+
+Philosophy
+===========
+
+Python is a great scripting language. Don't reinvent the wheel...your templates can handle it !
+
+Documentation
+==============
+
+See documentation for Mako at http://www.makotemplates.org/docs/
+
+License
+========
+
+Mako is licensed under an MIT-style license (see LICENSE).
+Other incorporated projects may be licensed under different licenses.
+All licenses allow for non-commercial and commercial use.
diff --git a/lib/mako-0.7.2/distribute_setup.py b/lib/mako-0.7.2/distribute_setup.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/distribute_setup.py
@@ -0,0 +1,485 @@
+#!python
+"""Bootstrap distribute installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import os
+import sys
+import time
+import fnmatch
+import tempfile
+import tarfile
+from distutils import log
+
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
+try:
+    import subprocess
+
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        return subprocess.call(args) == 0
+
+except ImportError:
+    # will be used for python 2.3
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        # quoting arguments if windows
+        if sys.platform == 'win32':
+            def quote(arg):
+                if ' ' in arg:
+                    return '"%s"' % arg
+                return arg
+            args = [quote(arg) for arg in args]
+        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
+
+DEFAULT_VERSION = "0.6.13"
+DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+SETUPTOOLS_FAKED_VERSION = "0.6c11"
+
+SETUPTOOLS_PKG_INFO = """\
+Metadata-Version: 1.0
+Name: setuptools
+Version: %s
+Summary: xxxx
+Home-page: xxx
+Author: xxx
+Author-email: xxx
+License: xxx
+Description: xxx
+""" % SETUPTOOLS_FAKED_VERSION
+
+
+def _install(tarball):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # installing
+        log.warn('Installing Distribute')
+        if not _python_cmd('setup.py', 'install'):
+            log.warn('Something went wrong during the installation.')
+            log.warn('See the error message above.')
+    finally:
+        os.chdir(old_wd)
+
+
+def _build_egg(egg, tarball, to_dir):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # building an egg
+        log.warn('Building a Distribute egg in %s', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+
+    finally:
+        os.chdir(old_wd)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
+
+
+def _do_download(version, download_base, to_dir, download_delay):
+    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
+                       % (version, sys.version_info[0], sys.version_info[1]))
+    if not os.path.exists(egg):
+        tarball = download_setuptools(version, download_base,
+                                      to_dir, download_delay)
+        _build_egg(egg, tarball, to_dir)
+    sys.path.insert(0, egg)
+    import setuptools
+    setuptools.bootstrap_install_from = egg
+
+
+def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                   to_dir=os.curdir, download_delay=15, no_fake=True):
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    was_imported = 'pkg_resources' in sys.modules or \
+        'setuptools' in sys.modules
+    try:
+        try:
+            import pkg_resources
+            if not hasattr(pkg_resources, '_distribute'):
+                if not no_fake:
+                    _fake_setuptools()
+                raise ImportError
+        except ImportError:
+            return _do_download(version, download_base, to_dir, download_delay)
+        try:
+            pkg_resources.require("distribute>="+version)
+            return
+        except pkg_resources.VersionConflict:
+            e = sys.exc_info()[1]
+            if was_imported:
+                sys.stderr.write(
+                "The required version of distribute (>=%s) is not available,\n"
+                "and can't be installed while this script is running. Please\n"
+                "install a more recent version first, using\n"
+                "'easy_install -U distribute'."
+                "\n\n(Currently using %r)\n" % (version, e.args[0]))
+                sys.exit(2)
+            else:
+                del pkg_resources, sys.modules['pkg_resources']    # reload ok
+                return _do_download(version, download_base, to_dir,
+                                    download_delay)
+        except pkg_resources.DistributionNotFound:
+            return _do_download(version, download_base, to_dir,
+                                download_delay)
+    finally:
+        if not no_fake:
+            _create_fake_setuptools_pkg_info(to_dir)
+
+def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                        to_dir=os.curdir, delay=15):
+    """Download distribute from a specified location and return its filename
+
+    `version` should be a valid distribute version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    `delay` is the number of seconds to pause before an actual download
+    attempt.
+    """
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
+    tgz_name = "distribute-%s.tar.gz" % version
+    url = download_base + tgz_name
+    saveto = os.path.join(to_dir, tgz_name)
+    src = dst = None
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            log.warn("Downloading %s", url)
+            src = urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = src.read()
+            dst = open(saveto, "wb")
+            dst.write(data)
+        finally:
+            if src:
+                src.close()
+            if dst:
+                dst.close()
+    return os.path.realpath(saveto)
+
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            if not hasattr(DirectorySandbox, '_old'):
+                def violation(*args):
+                    pass
+                DirectorySandbox._old = DirectorySandbox._violation
+                DirectorySandbox._violation = violation
+                patched = True
+            else:
+                patched = False
+        except ImportError:
+            patched = False
+
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
+
+    return __no_sandbox
+
+def _patch_file(path, content):
+    """Will backup the file then patch it"""
+    existing_content = open(path).read()
+    if existing_content == content:
+        # already patched
+        log.warn('Already patched.')
+        return False
+    log.warn('Patching...')
+    _rename_path(path)
+    f = open(path, 'w')
+    try:
+        f.write(content)
+    finally:
+        f.close()
+    return True
+
+_patch_file = _no_sandbox(_patch_file)
+
+def _same_content(path, content):
+    return open(path).read() == content
+
+def _rename_path(path):
+    new_name = path + '.OLD.%s' % time.time()
+    log.warn('Renaming %s into %s', path, new_name)
+    os.rename(path, new_name)
+    return new_name
+
+def _remove_flat_installation(placeholder):
+    if not os.path.isdir(placeholder):
+        log.warn('Unkown installation at %s', placeholder)
+        return False
+    found = False
+    for file in os.listdir(placeholder):
+        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
+            found = True
+            break
+    if not found:
+        log.warn('Could not locate setuptools*.egg-info')
+        return
+
+    log.warn('Removing elements out of the way...')
+    pkg_info = os.path.join(placeholder, file)
+    if os.path.isdir(pkg_info):
+        patched = _patch_egg_dir(pkg_info)
+    else:
+        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
+
+    if not patched:
+        log.warn('%s already patched.', pkg_info)
+        return False
+    # now let's move the files out of the way
+    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
+        element = os.path.join(placeholder, element)
+        if os.path.exists(element):
+            _rename_path(element)
+        else:
+            log.warn('Could not find the %s element of the '
+                     'Setuptools distribution', element)
+    return True
+
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
+
+def _after_install(dist):
+    log.warn('After install bootstrap.')
+    placeholder = dist.get_command_obj('install').install_purelib
+    _create_fake_setuptools_pkg_info(placeholder)
+
+def _create_fake_setuptools_pkg_info(placeholder):
+    if not placeholder or not os.path.exists(placeholder):
+        log.warn('Could not find the install location')
+        return
+    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+            (SETUPTOOLS_FAKED_VERSION, pyver)
+    pkg_info = os.path.join(placeholder, setuptools_file)
+    if os.path.exists(pkg_info):
+        log.warn('%s already exists', pkg_info)
+        return
+
+    log.warn('Creating %s', pkg_info)
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+
+    pth_file = os.path.join(placeholder, 'setuptools.pth')
+    log.warn('Creating %s', pth_file)
+    f = open(pth_file, 'w')
+    try:
+        f.write(os.path.join(os.curdir, setuptools_file))
+    finally:
+        f.close()
+
+_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
+
+def _patch_egg_dir(path):
+    # let's check if it's already patched
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    if os.path.exists(pkg_info):
+        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
+            log.warn('%s already patched.', pkg_info)
+            return False
+    _rename_path(path)
+    os.mkdir(path)
+    os.mkdir(os.path.join(path, 'EGG-INFO'))
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+    return True
+
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
+
+def _before_install():
+    log.warn('Before install bootstrap.')
+    _fake_setuptools()
+
+
+def _under_prefix(location):
+    if 'install' not in sys.argv:
+        return True
+    args = sys.argv[sys.argv.index('install')+1:]
+    for index, arg in enumerate(args):
+        for option in ('--root', '--prefix'):
+            if arg.startswith('%s=' % option):
+                top_dir = arg.split('root=')[-1]
+                return location.startswith(top_dir)
+            elif arg == option:
+                if len(args) > index:
+                    top_dir = args[index+1]
+                    return location.startswith(top_dir)
+        if arg == '--user' and USER_SITE is not None:
+            return location.startswith(USER_SITE)
+    return True
+
+
+def _fake_setuptools():
+    log.warn('Scanning installed packages')
+    try:
+        import pkg_resources
+    except ImportError:
+        # we're cool
+        log.warn('Setuptools or Distribute does not seem to be installed.')
+        return
+    ws = pkg_resources.working_set
+    try:
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
+                                  replacement=False))
+    except TypeError:
+        # old distribute API
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
+
+    if setuptools_dist is None:
+        log.warn('No setuptools distribution found')
+        return
+    # detecting if it was already faked
+    setuptools_location = setuptools_dist.location
+    log.warn('Setuptools installation detected at %s', setuptools_location)
+
+    # if --root or --preix was provided, and if
+    # setuptools is not located in them, we don't patch it
+    if not _under_prefix(setuptools_location):
+        log.warn('Not patching, --root or --prefix is installing Distribute'
+                 ' in another location')
+        return
+
+    # let's see if its an egg
+    if not setuptools_location.endswith('.egg'):
+        log.warn('Non-egg installation')
+        res = _remove_flat_installation(setuptools_location)
+        if not res:
+            return
+    else:
+        log.warn('Egg installation')
+        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
+        if (os.path.exists(pkg_info) and
+            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
+            log.warn('Already patched.')
+            return
+        log.warn('Patching...')
+        # let's create a fake egg replacing setuptools one
+        res = _patch_egg_dir(setuptools_location)
+        if not res:
+            return
+    log.warn('Patched done.')
+    _relaunch()
+
+
+def _relaunch():
+    log.warn('Relaunching...')
+    # we have to relaunch the process
+    # pip marker to avoid a relaunch bug
+    if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
+        sys.argv[0] = 'setup.py'
+    args = [sys.executable] + sys.argv
+    sys.exit(subprocess.call(args))
+
+
+def _extractall(self, path=".", members=None):
+    """Extract all members from the archive to the current working
+       directory and set owner, modification time and permissions on
+       directories afterwards. `path' specifies a different directory
+       to extract to. `members' is optional and must be a subset of the
+       list returned by getmembers().
+    """
+    import copy
+    import operator
+    from tarfile import ExtractError
+    directories = []
+
+    if members is None:
+        members = self
+
+    for tarinfo in members:
+        if tarinfo.isdir():
+            # Extract directories with a safe mode.
+            directories.append(tarinfo)
+            tarinfo = copy.copy(tarinfo)
+            tarinfo.mode = 448 # decimal for oct 0700
+        self.extract(tarinfo, path)
+
+    # Reverse sort directories.
+    if sys.version_info < (2, 4):
+        def sorter(dir1, dir2):
+            return cmp(dir1.name, dir2.name)
+        directories.sort(sorter)
+        directories.reverse()
+    else:
+        directories.sort(key=operator.attrgetter('name'), reverse=True)
+
+    # Set correct owner, mtime and filemode on directories.
+    for tarinfo in directories:
+        dirpath = os.path.join(path, tarinfo.name)
+        try:
+            self.chown(tarinfo, dirpath)
+            self.utime(tarinfo, dirpath)
+            self.chmod(tarinfo, dirpath)
+        except ExtractError:
+            e = sys.exc_info()[1]
+            if self.errorlevel > 1:
+                raise
+            else:
+                self._dbg(1, "tarfile: %s" % e)
+
+
+def main(argv, version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    tarball = download_setuptools()
+    _install(tarball)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/lib/mako-0.7.2/doc/_sources/caching.txt b/lib/mako-0.7.2/doc/_sources/caching.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/caching.txt
@@ -0,0 +1,393 @@
+.. _caching_toplevel:
+
+=======
+Caching
+=======
+
+Any template or component can be cached using the ``cache``
+argument to the ``<%page>``, ``<%def>`` or ``<%block>`` directives:
+
+.. sourcecode:: mako
+
+    <%page cached="True"/>
+
+    template text
+
+The above template, after being executed the first time, will
+store its content within a cache that by default is scoped
+within memory. Subsequent calls to the template's :meth:`~.Template.render`
+method will return content directly from the cache. When the
+:class:`.Template` object itself falls out of scope, its corresponding
+cache is garbage collected along with the template.
+
+By default, caching requires that the `Beaker <http://beaker.readthedocs.org/>`_ package be installed on the
+system, however the mechanism of caching can be customized to use
+any third party or user defined system -- see :ref:`cache_plugins`.
+
+In addition to being available on the ``<%page>`` tag, the caching flag and all
+its options can be used with the ``<%def>`` tag as well:
+
+.. sourcecode:: mako
+
+    <%def name="mycomp" cached="True" cache_timeout="60">
+        other text
+    </%def>
+
+... and equivalently with the ``<%block>`` tag, anonymous or named:
+
+.. sourcecode:: mako
+
+    <%block cached="True" cache_timeout="60">
+        other text
+    </%block>
+
+Cache Arguments
+===============
+
+Mako has two cache arguments available on tags that are
+available in all cases.   The rest of the arguments
+available are specific to a backend.
+
+The two generic tags arguments are:
+
+* ``cached="True"`` - enable caching for this ``<%page>``,
+  ``<%def>``, or ``<%block>``.
+* ``cache_key`` - the "key" used to uniquely identify this content
+  in the cache.   Usually, this key is chosen automatically
+  based on the name of the rendering callable (i.e. ``body``
+  when used in ``<%page>``, the name of the def when using ``<%def>``,
+  the explicit or internally-generated name when using ``<%block>``).
+  Using the ``cache_key`` parameter, the key can be overridden
+  using a fixed or programmatically generated value.
+
+  For example, here's a page
+  that caches any page which inherits from it, based on the
+  filename of the calling template:
+
+  .. sourcecode:: mako
+
+     <%page cached="True" cache_key="${self.filename}"/>
+
+     ${next.body()}
+
+     ## rest of template
+
+On a :class:`.Template` or :class:`.TemplateLookup`, the
+caching can be configured using these arguments:
+
+* ``cache_enabled`` - Setting this
+  to ``False`` will disable all caching functionality
+  when the template renders.  Defaults to ``True``.
+  e.g.:
+
+  .. sourcecode:: python
+
+      lookup = TemplateLookup(
+                      directories='/path/to/templates',
+                      cache_enabled = False
+                      )
+
+* ``cache_impl`` - The string name of the cache backend
+  to use.   This defaults to ``'beaker'``, which has historically
+  been the only cache backend supported by Mako.
+
+  .. versionadded:: 0.6.0
+
+  For example, here's how to use the upcoming
+  `dogpile.cache <http://dogpilecache.readthedocs.org>`_
+  backend:
+
+  .. sourcecode:: python
+
+      lookup = TemplateLookup(
+                      directories='/path/to/templates',
+                      cache_impl = 'dogpile.cache',
+                      cache_args = {'regions':my_dogpile_regions}
+                      )
+
+* ``cache_args`` - A dictionary of cache parameters that
+  will be consumed by the cache backend.   See
+  :ref:`beaker_backend` for examples.
+
+  .. versionadded:: 0.6.0
+
+Backend-Specific Cache Arguments
+--------------------------------
+
+The ``<%page>``, ``<%def>``, and ``<%block>`` tags
+accept any named argument that starts with the prefix ``"cache_"``.
+Those arguments are then packaged up and passed along to the
+underlying caching implementation, minus the ``"cache_"`` prefix.
+
+The actual arguments understood are determined by the backend.
+
+* :ref:`beaker_backend` - Includes arguments understood by
+  Beaker.
+* :ref:`dogpile.cache_backend` - Includes arguments understood by
+  dogpile.cache.
+
+.. _beaker_backend:
+
+Using the Beaker Cache Backend
+------------------------------
+
+When using Beaker, new implementations will want to make usage
+of **cache regions** so that cache configurations can be maintained
+externally to templates.  These configurations live under
+named "regions" that can be referred to within templates themselves.
+
+.. versionadded:: 0.6.0
+   Support for Beaker cache regions.
+
+For example, suppose we would like two regions.  One is a "short term"
+region that will store content in a memory-based dictionary,
+expiring after 60 seconds.   The other is a Memcached region,
+where values should expire in five minutes.   To configure
+our :class:`.TemplateLookup`, first we get a handle to a
+:class:`beaker.cache.CacheManager`:
+
+.. sourcecode:: python
+
+    from beaker.cache import CacheManager
+
+    manager = CacheManager(cache_regions={
+        'short_term':{
+            'type': 'memory',
+            'expire': 60
+        },
+        'long_term':{
+            'type': 'ext:memcached',
+            'url': '127.0.0.1:11211',
+            'expire': 300
+        }
+    })
+
+    lookup = TemplateLookup(
+                    directories=['/path/to/templates'],
+                    module_directory='/path/to/modules',
+                    cache_impl='beaker',
+                    cache_args={
+                        'manager':manager
+                    }
+            )
+
+Our templates can then opt to cache data in one of either region,
+using the ``cache_region`` argument.   Such as using ``short_term``
+at the ``<%page>`` level:
+
+.. sourcecode:: mako
+
+    <%page cached="True" cache_region="short_term">
+
+    ## ...
+
+Or, ``long_term`` at the ``<%block>`` level:
+
+.. sourcecode:: mako
+
+    <%block name="header" cached="True" cache_region="long_term">
+        other text
+    </%block>
+
+The Beaker backend also works without regions.   There are a
+variety of arguments that can be passed to the ``cache_args``
+dictionary, which are also allowable in templates via the
+``<%page>``, ``<%block>``,
+and ``<%def>`` tags specific to those sections.   The values
+given override those specified at the  :class:`.TemplateLookup`
+or :class:`.Template` level.
+
+With the possible exception
+of ``cache_timeout``, these arguments are probably better off
+staying at the template configuration level.  Each argument
+specified as ``cache_XYZ`` in a template tag is specified
+without the ``cache_`` prefix in the ``cache_args`` dictionary:
+
+* ``cache_timeout`` - number of seconds in which to invalidate the
+  cached data.  After this timeout, the content is re-generated
+  on the next call.  Available as ``timeout`` in the ``cache_args``
+  dictionary.
+* ``cache_type`` - type of caching. ``'memory'``, ``'file'``, ``'dbm'``, or
+  ``'ext:memcached'`` (note that  the string ``memcached`` is
+  also accepted by the dogpile.cache Mako plugin, though not by Beaker itself).
+  Available as ``type`` in the ``cache_args`` dictionary.
+* ``cache_url`` - (only used for ``memcached`` but required) a single
+  IP address or a semi-colon separated list of IP address of
+  memcache servers to use.  Available as ``url`` in the ``cache_args``
+  dictionary.
+* ``cache_dir`` - in the case of the ``'file'`` and ``'dbm'`` cache types,
+  this is the filesystem directory with which to store data
+  files. If this option is not present, the value of
+  ``module_directory`` is used (i.e. the directory where compiled
+  template modules are stored). If neither option is available
+  an exception is thrown.  Available as ``dir`` in the
+  ``cache_args`` dictionary.
+
+.. _dogpile.cache_backend:
+
+Using the dogpile.cache Backend
+-------------------------------
+
+`dogpile.cache`_ is a new replacement for Beaker.   It provides
+a modernized, slimmed down interface and is generally easier to use
+than Beaker.   As of this writing it has not yet been released.  dogpile.cache
+includes its own Mako cache plugin -- see :mod:`dogpile.cache.plugins.mako_cache` in the
+dogpile.cache documentation.
+
+Programmatic Cache Access
+=========================
+
+The :class:`.Template`, as well as any template-derived :class:`.Namespace`, has
+an accessor called ``cache`` which returns the :class:`.Cache` object
+for that template. This object is a facade on top of the underlying
+:class:`.CacheImpl` object, and provides some very rudimental
+capabilities, such as the ability to get and put arbitrary
+values:
+
+.. sourcecode:: mako
+
+    <%
+        local.cache.set("somekey", type="memory", "somevalue")
+    %>
+
+Above, the cache associated with the ``local`` namespace is
+accessed and a key is placed within a memory cache.
+
+More commonly, the ``cache`` object is used to invalidate cached
+sections programmatically:
+
+.. sourcecode:: python
+
+    template = lookup.get_template('/sometemplate.html')
+
+    # invalidate the "body" of the template
+    template.cache.invalidate_body()
+
+    # invalidate an individual def
+    template.cache.invalidate_def('somedef')
+
+    # invalidate an arbitrary key
+    template.cache.invalidate('somekey')
+
+You can access any special method or attribute of the :class:`.CacheImpl`
+itself using the :attr:`impl <.Cache.impl>` attribute:
+
+.. sourcecode:: python
+
+    template.cache.impl.do_something_special()
+
+Note that using implementation-specific methods will mean you can't
+swap in a different kind of :class:`.CacheImpl` implementation at a
+later time.
+
+.. _cache_plugins:
+
+Cache Plugins
+=============
+
+The mechanism used by caching can be plugged in
+using a :class:`.CacheImpl` subclass.    This class implements
+the rudimental methods Mako needs to implement the caching
+API.   Mako includes the :class:`.BeakerCacheImpl` class to
+provide the default implementation.  A :class:`.CacheImpl` class
+is acquired by Mako using a ``pkg_resources`` entrypoint, using
+the name given as the ``cache_impl`` argument to :class:`.Template`
+or :class:`.TemplateLookup`.    This entry point can be
+installed via the standard `setuptools`/``setup()`` procedure, underneath
+the `EntryPoint` group named ``"mako.cache"``.  It can also be
+installed at runtime via a convenience installer :func:`.register_plugin`
+which accomplishes essentially the same task.
+
+An example plugin that implements a local dictionary cache:
+
+.. sourcecode:: python
+
+    from mako.cache import Cacheimpl, register_plugin
+
+    class SimpleCacheImpl(CacheImpl):
+        def __init__(self, cache):
+            super(SimpleCacheImpl, self).__init__(cache)
+            self._cache = {}
+
+        def get_or_create(self, key, creation_function, **kw):
+            if key in self._cache:
+                return self._cache[key]
+            else:
+                self._cache[key] = value = creation_function()
+                return value
+
+        def set(self, key, value, **kwargs):
+            self._cache[key] = value
+
+        def get(self, key, **kwargs):
+            return self._cache.get(key)
+
+        def invalidate(self, key, **kwargs):
+            self._cache.pop(key, None)
+
+    # optional - register the class locally
+    register_plugin("simple", __name__, "SimpleCacheImpl")
+
+Enabling the above plugin in a template would look like:
+
+.. sourcecode:: python
+
+    t = Template("mytemplate",
+                 file="mytemplate.html",
+                 cache_impl='simple')
+
+Guidelines for Writing Cache Plugins
+------------------------------------
+
+* The :class:`.CacheImpl` is created on a per-:class:`.Template` basis.  The
+  class should ensure that only data for the parent :class:`.Template` is
+  persisted or returned by the cache methods.    The actual :class:`.Template`
+  is available via the ``self.cache.template`` attribute.   The ``self.cache.id``
+  attribute, which is essentially the unique modulename of the template, is
+  a good value to use in order to represent a unique namespace of keys specific
+  to the template.
+* Templates only use the :meth:`.CacheImpl.get_or_create()` method
+  in an implicit fashion.  The :meth:`.CacheImpl.set`,
+  :meth:`.CacheImpl.get`, and :meth:`.CacheImpl.invalidate` methods are
+  only used in response to direct programmatic access to the corresponding
+  methods on the :class:`.Cache` object.
+* :class:`.CacheImpl` will be accessed in a multithreaded fashion if the
+  :class:`.Template` itself is used multithreaded.  Care should be taken
+  to ensure caching implementations are threadsafe.
+* A library like `Dogpile <http://pypi.python.org/pypi/dogpile.core>`_, which
+  is a minimal locking system derived from Beaker, can be used to help
+  implement the :meth:`.CacheImpl.get_or_create` method in a threadsafe
+  way that can maximize effectiveness across multiple threads as well
+  as processes. :meth:`.CacheImpl.get_or_create` is the
+  key method used by templates.
+* All arguments passed to ``**kw`` come directly from the parameters
+  inside the ``<%def>``, ``<%block>``, or ``<%page>`` tags directly,
+  minus the ``"cache_"`` prefix, as strings, with the exception of
+  the argument ``cache_timeout``, which is passed to the plugin
+  as the name ``timeout`` with the value converted to an integer.
+  Arguments present in ``cache_args`` on :class:`.Template` or
+  :class:`.TemplateLookup` are passed directly, but are superseded
+  by those present in the most specific template tag.
+* The directory where :class:`.Template` places module files can
+  be acquired using the accessor ``self.cache.template.module_directory``.
+  This directory can be a good place to throw cache-related work
+  files, underneath a prefix like ``_my_cache_work`` so that name
+  conflicts with generated modules don't occur.
+
+API Reference
+=============
+
+.. autoclass:: mako.cache.Cache
+    :members:
+    :show-inheritance:
+
+.. autoclass:: mako.cache.CacheImpl
+    :members:
+    :show-inheritance:
+
+.. autofunction:: mako.cache.register_plugin
+
+.. autoclass:: mako.ext.beaker_cache.BeakerCacheImpl
+    :members:
+    :show-inheritance:
+
diff --git a/lib/mako-0.7.2/doc/_sources/defs.txt b/lib/mako-0.7.2/doc/_sources/defs.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/defs.txt
@@ -0,0 +1,622 @@
+.. _defs_toplevel:
+
+===============
+Defs and Blocks
+===============
+
+``<%def>`` and ``<%block>`` are two tags that both demarcate any block of text
+and/or code.   They both exist within generated Python as a callable function,
+i.e., a Python ``def``.   They differ in their scope and calling semantics.
+Whereas ``<%def>`` provides a construct that is very much like a named Python
+``def``, the ``<%block>`` is more layout oriented.
+
+Using Defs
+==========
+
+The ``<%def>`` tag requires a ``name`` attribute, where the ``name`` references
+a Python function signature:
+
+.. sourcecode:: mako
+
+    <%def name="hello()">
+        hello world
+    </%def>
+
+To invoke the ``<%def>``, it is normally called as an expression:
+
+.. sourcecode:: mako
+
+    the def:  ${hello()}
+
+If the ``<%def>`` is not nested inside of another ``<%def>``,
+it's known as a **top level def** and can be accessed anywhere in
+the template, including above where it was defined.
+
+All defs, top level or not, have access to the current
+contextual namespace in exactly the same way their containing
+template does. Suppose the template below is executed with the
+variables ``username`` and ``accountdata`` inside the context:
+
+.. sourcecode:: mako
+
+    Hello there ${username}, how are ya.  Lets see what your account says:
+
+    ${account()}
+
+    <%def name="account()">
+        Account for ${username}:<br/>
+
+        % for row in accountdata:
+            Value: ${row}<br/>
+        % endfor
+    </%def>
+
+The ``username`` and ``accountdata`` variables are present
+within the main template body as well as the body of the
+``account()`` def.
+
+Since defs are just Python functions, you can define and pass
+arguments to them as well:
+
+.. sourcecode:: mako
+
+    ${account(accountname='john')}
+
+    <%def name="account(accountname, type='regular')">
+        account name: ${accountname}, type: ${type}
+    </%def>
+
+When you declare an argument signature for your def, they are
+required to follow normal Python conventions (i.e., all
+arguments are required except keyword arguments with a default
+value). This is in contrast to using context-level variables,
+which evaluate to ``UNDEFINED`` if you reference a name that
+does not exist.
+
+Calling Defs from Other Files
+-----------------------------
+
+Top level ``<%def>``\ s are **exported** by your template's
+module, and can be called from the outside; including from other
+templates, as well as normal Python code. Calling a ``<%def>``
+from another template is something like using an ``<%include>``
+-- except you are calling a specific function within the
+template, not the whole template.
+
+The remote ``<%def>`` call is also a little bit like calling
+functions from other modules in Python. There is an "import"
+step to pull the names from another template into your own
+template; then the function or functions are available.
+
+To import another template, use the ``<%namespace>`` tag:
+
+.. sourcecode:: mako
+
+    <%namespace name="mystuff" file="mystuff.html"/>
+
+The above tag adds a local variable ``mystuff`` to the current
+scope.
+
+Then, just call the defs off of ``mystuff``:
+
+.. sourcecode:: mako
+
+    ${mystuff.somedef(x=5,y=7)}
+
+The ``<%namespace>`` tag also supports some of the other
+semantics of Python's ``import`` statement, including pulling
+names into the local variable space, or using ``*`` to represent
+all names, using the ``import`` attribute:
+
+.. sourcecode:: mako
+
+    <%namespace file="mystuff.html" import="foo, bar"/>
+
+This is just a quick intro to the concept of a **namespace**,
+which is a central Mako concept that has its own chapter in
+these docs. For more detail and examples, see
+:ref:`namespaces_toplevel`.
+
+Calling Defs Programmatically
+-----------------------------
+
+You can call defs programmatically from any :class:`.Template` object
+using the :meth:`~.Template.get_def()` method, which returns a :class:`.DefTemplate`
+object. This is a :class:`.Template` subclass which the parent
+:class:`.Template` creates, and is usable like any other template:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    template = Template("""
+        <%def name="hi(name)">
+            hi ${name}!
+        </%def>
+
+        <%def name="bye(name)">
+            bye ${name}!
+        </%def>
+    """)
+
+    print template.get_def("hi").render(name="ed")
+    print template.get_def("bye").render(name="ed")
+
+Defs within Defs
+----------------
+
+The def model follows regular Python rules for closures.
+Declaring ``<%def>`` inside another ``<%def>`` declares it
+within the parent's **enclosing scope**:
+
+.. sourcecode:: mako
+
+    <%def name="mydef()">
+        <%def name="subdef()">
+            a sub def
+        </%def>
+
+        i'm the def, and the subcomponent is ${subdef()}
+    </%def>
+
+Just like Python, names that exist outside the inner ``<%def>``
+exist inside it as well:
+
+.. sourcecode:: mako
+
+    <%
+        x = 12
+    %>
+    <%def name="outer()">
+        <%
+            y = 15
+        %>
+        <%def name="inner()">
+            inner, x is ${x}, y is ${y}
+        </%def>
+
+        outer, x is ${x}, y is ${y}
+    </%def>
+
+Assigning to a name inside of a def declares that name as local
+to the scope of that def (again, like Python itself). This means
+the following code will raise an error:
+
+.. sourcecode:: mako
+
+    <%
+        x = 10
+    %>
+    <%def name="somedef()">
+        ## error !
+        somedef, x is ${x}
+        <%
+            x = 27
+        %>
+    </%def>
+
+...because the assignment to ``x`` declares ``x`` as local to the
+scope of ``somedef``, rendering the "outer" version unreachable
+in the expression that tries to render it.
+
+.. _defs_with_content:
+
+Calling a Def with Embedded Content and/or Other Defs
+-----------------------------------------------------
+
+A flip-side to def within def is a def call with content. This
+is where you call a def, and at the same time declare a block of
+content (or multiple blocks) that can be used by the def being
+called. The main point of such a call is to create custom,
+nestable tags, just like any other template language's
+custom-tag creation system -- where the external tag controls the
+execution of the nested tags and can communicate state to them.
+Only with Mako, you don't have to use any external Python
+modules, you can define arbitrarily nestable tags right in your
+templates.
+
+To achieve this, the target def is invoked using the form
+``<%namepacename:defname>`` instead of the normal ``${}``
+syntax. This syntax, introduced in Mako 0.2.3, is functionally
+equivalent to another tag known as ``%call``, which takes the form
+``<%call expr='namespacename.defname(args)'>``. While ``%call``
+is available in all versions of Mako, the newer style is
+probably more familiar looking. The ``namespace`` portion of the
+call is the name of the **namespace** in which the def is
+defined -- in the most simple cases, this can be ``local`` or
+``self`` to reference the current template's namespace (the
+difference between ``local`` and ``self`` is one of inheritance
+-- see :ref:`namespaces_builtin` for details).
+
+When the target def is invoked, a variable ``caller`` is placed
+in its context which contains another namespace containing the
+body and other defs defined by the caller. The body itself is
+referenced by the method ``body()``. Below, we build a ``%def``
+that operates upon ``caller.body()`` to invoke the body of the
+custom tag:
+
+.. sourcecode:: mako
+
+    <%def name="buildtable()">
+        <table>
+            <tr><td>
+                ${caller.body()}
+            </td></tr>
+        </table>
+    </%def>
+
+    <%self:buildtable>
+        I am the table body.
+    </%self:buildtable>
+
+This produces the output (whitespace formatted):
+
+.. sourcecode:: html
+
+    <table>
+        <tr><td>
+            I am the table body.
+        </td></tr>
+    </table>
+
+Using the older ``%call`` syntax looks like:
+
+.. sourcecode:: mako
+
+    <%def name="buildtable()">
+        <table>
+            <tr><td>
+                ${caller.body()}
+            </td></tr>
+        </table>
+    </%def>
+
+    <%call expr="buildtable()">
+        I am the table body.
+    </%call>
+
+The ``body()`` can be executed multiple times or not at all.
+This means you can use def-call-with-content to build iterators,
+conditionals, etc:
+
+.. sourcecode:: mako
+
+    <%def name="lister(count)">
+        % for x in range(count):
+            ${caller.body()}
+        % endfor
+    </%def>
+
+    <%self:lister count="${3}">
+        hi
+    </%self:lister>
+
+Produces:
+
+.. sourcecode:: html
+
+    hi
+    hi
+    hi
+
+Notice above we pass ``3`` as a Python expression, so that it
+remains as an integer.
+
+A custom "conditional" tag:
+
+.. sourcecode:: mako
+
+    <%def name="conditional(expression)">
+        % if expression:
+            ${caller.body()}
+        % endif
+    </%def>
+
+    <%self:conditional expression="${4==4}">
+        i'm the result
+    </%self:conditional>
+
+Produces:
+
+.. sourcecode:: html
+
+    i'm the result
+
+But that's not all. The ``body()`` function also can handle
+arguments, which will augment the local namespace of the body
+callable. The caller must define the arguments which it expects
+to receive from its target def using the ``args`` attribute,
+which is a comma-separated list of argument names. Below, our
+``<%def>`` calls the ``body()`` of its caller, passing in an
+element of data from its argument:
+
+.. sourcecode:: mako
+
+    <%def name="layoutdata(somedata)">
+        <table>
+        % for item in somedata:
+            <tr>
+            % for col in item:
+                <td>${caller.body(col=col)}</td>
+            % endfor
+            </tr>
+        % endfor
+        </table>
+    </%def>
+
+    <%self:layoutdata somedata="${[[1,2,3],[4,5,6],[7,8,9]]}" args="col">\
+    Body data: ${col}\
+    </%self:layoutdata>
+
+Produces:
+
+.. sourcecode:: html
+
+    <table>
+        <tr>
+            <td>Body data: 1</td>
+            <td>Body data: 2</td>
+            <td>Body data: 3</td>
+        </tr>
+        <tr>
+            <td>Body data: 4</td>
+            <td>Body data: 5</td>
+            <td>Body data: 6</td>
+        </tr>
+        <tr>
+            <td>Body data: 7</td>
+            <td>Body data: 8</td>
+            <td>Body data: 9</td>
+        </tr>
+    </table>
+
+You don't have to stick to calling just the ``body()`` function.
+The caller can define any number of callables, allowing the
+``<%call>`` tag to produce whole layouts:
+
+.. sourcecode:: mako
+
+    <%def name="layout()">
+        ## a layout def
+        <div class="mainlayout">
+            <div class="header">
+                ${caller.header()}
+            </div>
+
+            <div class="sidebar">
+                ${caller.sidebar()}
+            </div>
+
+            <div class="content">
+                ${caller.body()}
+            </div>
+        </div>
+    </%def>
+
+    ## calls the layout def
+    <%self:layout>
+        <%def name="header()">
+            I am the header
+        </%def>
+        <%def name="sidebar()">
+            <ul>
+                <li>sidebar 1</li>
+                <li>sidebar 2</li>
+            </ul>
+        </%def>
+
+            this is the body
+    </%self:layout>
+
+The above layout would produce:
+
+.. sourcecode:: html
+
+    <div class="mainlayout">
+        <div class="header">
+        I am the header
+        </div>
+
+        <div class="sidebar">
+        <ul>
+            <li>sidebar 1</li>
+            <li>sidebar 2</li>
+        </ul>
+        </div>
+
+        <div class="content">
+        this is the body
+        </div>
+    </div>
+
+The number of things you can do with ``<%call>`` and/or the
+``<%namespacename:defname>`` calling syntax is enormous. You can
+create form widget libraries, such as an enclosing ``<FORM>``
+tag and nested HTML input elements, or portable wrapping schemes
+using ``<div>`` or other elements. You can create tags that
+interpret rows of data, such as from a database, providing the
+individual columns of each row to a ``body()`` callable which
+lays out the row any way it wants. Basically anything you'd do
+with a "custom tag" or tag library in some other system, Mako
+provides via ``<%def>`` tags and plain Python callables which are
+invoked via ``<%namespacename:defname>`` or ``<%call>``.
+
+.. _blocks:
+
+Using Blocks
+============
+
+The ``<%block>`` tag introduces some new twists on the
+``<%def>`` tag which make it more closely tailored towards layout.
+
+.. versionadded:: 0.4.1
+
+An example of a block:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+            <%block>
+                this is a block.
+            </%block>
+        </body>
+    </html>
+
+In the above example, we define a simple block.  The block renders its content in the place
+that it's defined.  Since the block is called for us, it doesn't need a name and the above
+is referred to as an **anonymous block**.  So the output of the above template will be:
+
+.. sourcecode:: html
+
+    <html>
+        <body>
+                this is a block.
+        </body>
+    </html>
+
+So in fact the above block has absolutely no effect.  Its usefulness comes when we start
+using modifiers.  Such as, we can apply a filter to our block:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+            <%block filter="h">
+                <html>this is some escaped html.</html>
+            </%block>
+        </body>
+    </html>
+
+or perhaps a caching directive:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+            <%block cached="True" cache_timeout="60">
+                This content will be cached for 60 seconds.
+            </%block>
+        </body>
+    </html>
+
+Blocks also work in iterations, conditionals, just like defs:
+
+.. sourcecode:: mako
+
+    % if some_condition:
+        <%block>condition is met</%block>
+    % endif
+
+While the block renders at the point it is defined in the template,
+the underlying function is present in the generated Python code only
+once, so there's no issue with placing a block inside of a loop or
+similar. Anonymous blocks are defined as closures in the local
+rendering body, so have access to local variable scope:
+
+.. sourcecode:: mako
+
+    % for i in range(1, 4):
+        <%block>i is ${i}</%block>
+    % endfor
+
+Using Named Blocks
+------------------
+
+Possibly the more important area where blocks are useful is when we
+do actually give them names. Named blocks are tailored to behave
+somewhat closely to Jinja2's block tag, in that they define an area
+of a layout which can be overridden by an inheriting template. In
+sharp contrast to the ``<%def>`` tag, the name given to a block is
+global for the entire template regardless of how deeply it's nested:
+
+.. sourcecode:: mako
+
+    <html>
+    <%block name="header">
+        <head>
+            <title>
+                <%block name="title">Title</%block>
+            </title>
+        </head>
+    </%block>
+    <body>
+        ${next.body()}
+    </body>
+    </html>
+
+The above example has two named blocks "``header``" and "``title``", both of which can be referred to
+by an inheriting template. A detailed walkthrough of this usage can be found at :ref:`inheritance_toplevel`.
+
+Note above that named blocks don't have any argument declaration the way defs do. They still implement themselves
+as Python functions, however, so they can be invoked additional times beyond their initial definition:
+
+.. sourcecode:: mako
+
+    <div name="page">
+        <%block name="pagecontrol">
+            <a href="">previous page</a> |
+            <a href="">next page</a>
+        </%block>
+
+        <table>
+            ## some content
+        </table>
+
+        ${pagecontrol()}
+    </div>
+
+The content referenced by ``pagecontrol`` above will be rendered both above and below the ``<table>`` tags.
+
+To keep things sane, named blocks have restrictions that defs do not:
+
+* The ``<%block>`` declaration cannot have any argument signature.
+* The name of a ``<%block>`` can only be defined once in a template -- an error is raised if two blocks of the same
+  name occur anywhere in a single template, regardless of nesting.  A similar error is raised if a top level def
+  shares the same name as that of a block.
+* A named ``<%block>`` cannot be defined within a ``<%def>``, or inside the body of a "call", i.e.
+  ``<%call>`` or ``<%namespacename:defname>`` tag.  Anonymous blocks can, however.
+
+Using Page Arguments in Named Blocks
+------------------------------------
+
+A named block is very much like a top level def. It has a similar
+restriction to these types of defs in that arguments passed to the
+template via the ``<%page>`` tag aren't automatically available.
+Using arguments with the ``<%page>`` tag is described in the section
+:ref:`namespaces_body`, and refers to scenarios such as when the
+``body()`` method of a template is called from an inherited template passing
+arguments, or the template is invoked from an ``<%include>`` tag
+with arguments. To allow a named block to share the same arguments
+passed to the page, the ``args`` attribute can be used:
+
+.. sourcecode:: mako
+
+    <%page args="post"/>
+
+    <a name="${post.title}" />
+
+    <span class="post_prose">
+        <%block name="post_prose" args="post">
+            ${post.content}
+        </%block>
+    </span>
+
+Where above, if the template is called via a directive like
+``<%include file="post.mako" args="post=post" />``, the ``post``
+variable is available both in the main body as well as the
+``post_prose`` block.
+
+Similarly, the ``**pageargs`` variable is present, in named blocks only,
+for those arguments not explicit in the ``<%page>`` tag:
+
+.. sourcecode:: mako
+
+    <%block name="post_prose">
+        ${pageargs['post'].content}
+    </%block>
+
+The ``args`` attribute is only allowed with named blocks. With
+anonymous blocks, the Python function is always rendered in the same
+scope as the call itself, so anything available directly outside the
+anonymous block is available inside as well.
diff --git a/lib/mako-0.7.2/doc/_sources/filtering.txt b/lib/mako-0.7.2/doc/_sources/filtering.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/filtering.txt
@@ -0,0 +1,344 @@
+.. _filtering_toplevel:
+
+=======================
+Filtering and Buffering
+=======================
+
+Expression Filtering
+====================
+
+As described in the chapter :ref:`syntax_toplevel`, the "``|``" operator can be
+applied to a "``${}``" expression to apply escape filters to the
+output:
+
+.. sourcecode:: mako
+
+    ${"this is some text" | u}
+
+The above expression applies URL escaping to the expression, and
+produces ``this+is+some+text``.
+
+The built-in escape flags are:
+
+* ``u`` : URL escaping, provided by
+  ``urllib.quote_plus(string.encode('utf-8'))``
+* ``h`` : HTML escaping, provided by
+  ``markupsafe.escape(string)``
+
+  .. versionadded:: 0.3.4
+     Prior versions use ``cgi.escape(string, True)``.
+
+* ``x`` : XML escaping
+* ``trim`` : whitespace trimming, provided by ``string.strip()``
+* ``entity`` : produces HTML entity references for applicable
+  strings, derived from ``htmlentitydefs``
+* ``unicode`` (``str`` on Python 3): produces a Python unicode
+  string (this function is applied by default)
+* ``decode.<some encoding>``: decode input into a Python
+  unicode with the specified encoding
+* ``n`` : disable all default filtering; only filters specified
+  in the local expression tag will be applied.
+
+To apply more than one filter, separate them by a comma:
+
+.. sourcecode:: mako
+
+    ${" <tag>some value</tag> " | h,trim}
+
+The above produces ``&lt;tag&gt;some value&lt;/tag&gt;``, with
+no leading or trailing whitespace. The HTML escaping function is
+applied first, the "trim" function second.
+
+Naturally, you can make your own filters too. A filter is just a
+Python function that accepts a single string argument, and
+returns the filtered result. The expressions after the ``|``
+operator draw upon the local namespace of the template in which
+they appear, meaning you can define escaping functions locally:
+
+.. sourcecode:: mako
+
+    <%!
+        def myescape(text):
+            return "<TAG>" + text + "</TAG>"
+    %>
+
+    Here's some tagged text: ${"text" | myescape}
+
+Or from any Python module:
+
+.. sourcecode:: mako
+
+    <%!
+        import myfilters
+    %>
+
+    Here's some tagged text: ${"text" | myfilters.tagfilter}
+
+A page can apply a default set of filters to all expression tags
+using the ``expression_filter`` argument to the ``%page`` tag:
+
+.. sourcecode:: mako
+
+    <%page expression_filter="h"/>
+
+    Escaped text:  ${"<html>some html</html>"}
+
+Result:
+
+.. sourcecode:: html
+
+    Escaped text: &lt;html&gt;some html&lt;/html&gt;
+
+.. _filtering_default_filters:
+
+The ``default_filters`` Argument
+--------------------------------
+
+In addition to the ``expression_filter`` argument, the
+``default_filters`` argument to both :class:`.Template` and
+:class:`.TemplateLookup` can specify filtering for all expression tags
+at the programmatic level. This array-based argument, when given
+its default argument of ``None``, will be internally set to
+``["unicode"]`` (or ``["str"]`` on Python 3), except when
+``disable_unicode=True`` is set in which case it defaults to
+``["str"]``:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'], default_filters=['unicode'])
+
+To replace the usual ``unicode``/``str`` function with a
+specific encoding, the ``decode`` filter can be substituted:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'], default_filters=['decode.utf8'])
+
+To disable ``default_filters`` entirely, set it to an empty
+list:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'], default_filters=[])
+
+Any string name can be added to ``default_filters`` where it
+will be added to all expressions as a filter. The filters are
+applied from left to right, meaning the leftmost filter is
+applied first.
+
+.. sourcecode:: python
+
+    t = Template(templatetext, default_filters=['unicode', 'myfilter'])
+
+To ease the usage of ``default_filters`` with custom filters,
+you can also add imports (or other code) to all templates using
+the ``imports`` argument:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'],
+                       default_filters=['unicode', 'myfilter'],
+                       imports=['from mypackage import myfilter'])
+
+The above will generate templates something like this:
+
+.. sourcecode:: python
+
+    # ....
+    from mypackage import myfilter
+
+    def render_body(context):
+        context.write(myfilter(unicode("some text")))
+
+Turning off Filtering with the ``n`` Filter
+-------------------------------------------
+
+In all cases the special ``n`` filter, used locally within an
+expression, will **disable** all filters declared in the
+``<%page>`` tag as well as in ``default_filters``. Such as:
+
+.. sourcecode:: mako
+
+    ${'myexpression' | n}
+
+will render ``myexpression`` with no filtering of any kind, and:
+
+.. sourcecode:: mako
+
+    ${'myexpression' | n,trim}
+
+will render ``myexpression`` using the ``trim`` filter only.
+
+Filtering Defs and Blocks
+=========================
+
+The ``%def`` and ``%block`` tags have an argument called ``filter`` which will apply the
+given list of filter functions to the output of the ``%def``:
+
+.. sourcecode:: mako
+
+    <%def name="foo()" filter="h, trim">
+        <b>this is bold</b>
+    </%def>
+
+When the ``filter`` attribute is applied to a def as above, the def
+is automatically **buffered** as well. This is described next.
+
+Buffering
+=========
+
+One of Mako's central design goals is speed. To this end, all of
+the textual content within a template and its various callables
+is by default piped directly to the single buffer that is stored
+within the :class:`.Context` object. While this normally is easy to
+miss, it has certain side effects. The main one is that when you
+call a def using the normal expression syntax, i.e.
+``${somedef()}``, it may appear that the return value of the
+function is the content it produced, which is then delivered to
+your template just like any other expression substitution,
+except that normally, this is not the case; the return value of
+``${somedef()}`` is simply the empty string ``''``. By the time
+you receive this empty string, the output of ``somedef()`` has
+been sent to the underlying buffer.
+
+You may not want this effect, if for example you are doing
+something like this:
+
+.. sourcecode:: mako
+
+    ${" results " + somedef() + " more results "}
+
+If the ``somedef()`` function produced the content "``somedef's
+results``", the above template would produce this output:
+
+.. sourcecode:: html
+
+    somedef's results results more results
+
+This is because ``somedef()`` fully executes before the
+expression returns the results of its concatenation; the
+concatenation in turn receives just the empty string as its
+middle expression.
+
+Mako provides two ways to work around this. One is by applying
+buffering to the ``%def`` itself:
+
+.. sourcecode:: mako
+
+    <%def name="somedef()" buffered="True">
+        somedef's results
+    </%def>
+
+The above definition will generate code similar to this:
+
+.. sourcecode:: python
+
+    def somedef():
+        context.push_buffer()
+        try:
+            context.write("somedef's results")
+        finally:
+            buf = context.pop_buffer()
+        return buf.getvalue()
+
+So that the content of ``somedef()`` is sent to a second buffer,
+which is then popped off the stack and its value returned. The
+speed hit inherent in buffering the output of a def is also
+apparent.
+
+Note that the ``filter`` argument on ``%def`` also causes the def to
+be buffered. This is so that the final content of the ``%def`` can
+be delivered to the escaping function in one batch, which
+reduces method calls and also produces more deterministic
+behavior for the filtering function itself, which can possibly
+be useful for a filtering function that wishes to apply a
+transformation to the text as a whole.
+
+The other way to buffer the output of a def or any Mako callable
+is by using the built-in ``capture`` function. This function
+performs an operation similar to the above buffering operation
+except it is specified by the caller.
+
+.. sourcecode:: mako
+
+    ${" results " + capture(somedef) + " more results "}
+
+Note that the first argument to the ``capture`` function is
+**the function itself**, not the result of calling it. This is
+because the ``capture`` function takes over the job of actually
+calling the target function, after setting up a buffered
+environment. To send arguments to the function, just send them
+to ``capture`` instead:
+
+.. sourcecode:: mako
+
+    ${capture(somedef, 17, 'hi', use_paging=True)}
+
+The above call is equivalent to the unbuffered call:
+
+.. sourcecode:: mako
+
+    ${somedef(17, 'hi', use_paging=True)}
+
+Decorating
+==========
+
+.. versionadded:: 0.2.5
+
+Somewhat like a filter for a ``%def`` but more flexible, the ``decorator``
+argument to ``%def`` allows the creation of a function that will
+work in a similar manner to a Python decorator. The function can
+control whether or not the function executes. The original
+intent of this function is to allow the creation of custom cache
+logic, but there may be other uses as well.
+
+``decorator`` is intended to be used with a regular Python
+function, such as one defined in a library module. Here we'll
+illustrate the python function defined in the template for
+simplicities' sake:
+
+.. sourcecode:: mako
+
+    <%!
+        def bar(fn):
+            def decorate(context, *args, **kw):
+                context.write("BAR")
+                fn(*args, **kw)
+                context.write("BAR")
+                return ''
+            return decorate
+    %>
+
+    <%def name="foo()" decorator="bar">
+        this is foo
+    </%def>
+
+    ${foo()}
+
+The above template will return, with more whitespace than this,
+``"BAR this is foo BAR"``. The function is the render callable
+itself (or possibly a wrapper around it), and by default will
+write to the context. To capture its output, use the :func:`.capture`
+callable in the ``mako.runtime`` module (available in templates
+as just ``runtime``):
+
+.. sourcecode:: mako
+
+    <%!
+        def bar(fn):
+            def decorate(context, *args, **kw):
+                return "BAR" + runtime.capture(context, fn, *args, **kw) + "BAR"
+            return decorate
+    %>
+
+    <%def name="foo()" decorator="bar">
+        this is foo
+    </%def>
+
+    ${foo()}
+
+The decorator can be used with top-level defs as well as nested
+defs, and blocks too. Note that when calling a top-level def from the
+:class:`.Template` API, i.e. ``template.get_def('somedef').render()``,
+the decorator has to write the output to the ``context``, i.e.
+as in the first example. The return value gets discarded.
diff --git a/lib/mako-0.7.2/doc/_sources/index.txt b/lib/mako-0.7.2/doc/_sources/index.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/index.txt
@@ -0,0 +1,22 @@
+Table of Contents
+=================
+
+.. toctree::
+    :maxdepth: 2
+
+    usage
+    syntax
+    defs
+    runtime
+    namespaces
+    inheritance
+    filtering
+    unicode
+    caching
+
+Indices and Tables
+------------------
+
+* :ref:`genindex`
+* :ref:`search`
+
diff --git a/lib/mako-0.7.2/doc/_sources/inheritance.txt b/lib/mako-0.7.2/doc/_sources/inheritance.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/inheritance.txt
@@ -0,0 +1,534 @@
+.. _inheritance_toplevel:
+
+===========
+Inheritance
+===========
+
+.. note::  Most of the inheritance examples here take advantage of a feature that's
+    new in Mako as of version 0.4.1 called the "block".  This tag is very similar to
+    the "def" tag but is more streamlined for usage with inheritance.  Note that
+    all of the examples here which use blocks can also use defs instead.  Contrasting
+    usages will be illustrated.
+
+Using template inheritance, two or more templates can organize
+themselves into an **inheritance chain**, where content and
+functions from all involved templates can be intermixed. The
+general paradigm of template inheritance is this: if a template
+``A`` inherits from template ``B``, then template ``A`` agrees
+to send the executional control to template ``B`` at runtime
+(``A`` is called the **inheriting** template). Template ``B``,
+the **inherited** template, then makes decisions as to what
+resources from ``A`` shall be executed.
+
+In practice, it looks like this. Here's a hypothetical inheriting
+template, ``index.html``:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+
+    <%block name="header">
+        this is some header content
+    </%block>
+
+    this is the body content.
+
+And ``base.html``, the inherited template:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                <%block name="header"/>
+            </div>
+
+            ${self.body()}
+
+            <div class="footer">
+                <%block name="footer">
+                    this is the footer
+                </%block>
+            </div>
+        </body>
+    </html>
+
+Here is a breakdown of the execution:
+
+#. When ``index.html`` is rendered, control immediately passes to
+   ``base.html``.
+#. ``base.html`` then renders the top part of an HTML document,
+   then invokes the ``<%block name="header">`` block.  It invokes the
+   underlying ``header()`` function off of a built-in namespace
+   called ``self`` (this namespace was first introduced in the
+   :doc:`Namespaces chapter <namespaces>` in :ref:`namespace_self`). Since
+   ``index.html`` is the topmost template and also defines a block
+   called ``header``, it's this ``header`` block that ultimately gets
+   executed -- instead of the one that's present in ``base.html``.
+#. Control comes back to ``base.html``. Some more HTML is
+   rendered.
+#. ``base.html`` executes ``self.body()``. The ``body()``
+   function on all template-based namespaces refers to the main
+   body of the template, therefore the main body of
+   ``index.html`` is rendered.
+#. When ``<%block name="header">`` is encountered in ``index.html`` 
+   during the ``self.body()`` call, a conditional is checked -- does the
+   current inherited template, i.e. ``base.html``, also define this block? If yes,
+   the ``<%block>`` is **not** executed here -- the inheritance
+   mechanism knows that the parent template is responsible for rendering
+   this block (and in fact it already has).  In other words a block
+   only renders in its *basemost scope*.
+#. Control comes back to ``base.html``. More HTML is rendered,
+   then the ``<%block name="footer">`` expression is invoked.
+#. The ``footer`` block is only defined in ``base.html``, so being
+   the topmost definition of ``footer``, it's the one that
+   executes. If ``index.html`` also specified ``footer``, then
+   its version would **override** that of the base.
+#. ``base.html`` finishes up rendering its HTML and the template
+   is complete, producing:
+
+   .. sourcecode:: html
+
+        <html>
+            <body>
+                <div class="header">
+                    this is some header content
+                </div>
+
+                this is the body content.
+
+                <div class="footer">
+                    this is the footer
+                </div>
+            </body>
+        </html>
+
+...and that is template inheritance in a nutshell. The main idea
+is that the methods that you call upon ``self`` always
+correspond to the topmost definition of that method. Very much
+the way ``self`` works in a Python class, even though Mako is
+not actually using Python class inheritance to implement this
+functionality. (Mako doesn't take the "inheritance" metaphor too
+seriously; while useful to setup some commonly recognized
+semantics, a textual template is not very much like an
+object-oriented class construct in practice).
+
+Nesting Blocks
+==============
+
+The named blocks defined in an inherited template can also be nested within
+other blocks.  The name given to each block is globally accessible via any inheriting
+template.  We can add a new block ``title`` to our ``header`` block:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                <%block name="header">
+                    <h2>
+                        <%block name="title"/>
+                    </h2>
+                </%block>
+            </div>
+
+            ${self.body()}
+
+            <div class="footer">
+                <%block name="footer">
+                    this is the footer
+                </%block>
+            </div>
+        </body>
+    </html>
+
+The inheriting template can name either or both of ``header`` and ``title``, separately
+or nested themselves:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+
+    <%block name="header">
+        this is some header content
+        ${parent.header()}
+    </%block>
+
+    <%block name="title">
+        this is the title
+    </%block>
+
+    this is the body content.
+
+Note when we overrode ``header``, we added an extra call ``${parent.header()}`` in order to invoke
+the parent's ``header`` block in addition to our own.  That's described in more detail below,
+in :ref:`parent_namespace`.
+
+Rendering a Named Block Multiple Times
+======================================
+
+Recall from the section :ref:`blocks` that a named block is just like a ``<%def>``,
+with some different usage rules.  We can call one of our named sections distinctly, for example
+a section that is used more than once, such as the title of a page:
+
+.. sourcecode:: mako
+
+    <html>
+        <head>
+            <title>${self.title()}</title>
+        </head>
+        <body>
+        <%block name="header">
+            <h2><%block name="title"/></h2>
+        </%block>
+        ${self.body()}
+        </body>
+    </html>
+
+Where above an inheriting template can define ``<%block name="title">`` just once, and it will be
+used in the base template both in the ``<title>`` section as well as the ``<h2>``.
+
+But what about Defs?
+====================
+
+The previous example used the ``<%block>`` tag to produce areas of content
+to be overridden.  Before Mako 0.4.1, there wasn't any such tag -- instead
+there was only the ``<%def>`` tag.   As it turns out, named blocks and defs are
+largely interchangeable.  The def simply doesn't call itself automatically,
+and has more open-ended naming and scoping rules that are more flexible and similar
+to Python itself, but less suited towards layout.  The first example from
+this chapter using defs would look like:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+
+    <%def name="header()">
+        this is some header content
+    </%def>
+
+    this is the body content.
+
+And ``base.html``, the inherited template:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                ${self.header()}
+            </div>
+
+            ${self.body()}
+
+            <div class="footer">
+                ${self.footer()}
+            </div>
+        </body>
+    </html>
+
+    <%def name="header()"/>
+    <%def name="footer()">
+        this is the footer
+    </%def>
+
+Above, we illustrate that defs differ from blocks in that their definition
+and invocation are defined in two separate places, instead of at once. You can *almost* do exactly what a
+block does if you put the two together:
+
+.. sourcecode:: mako
+
+    <div class="header">
+        <%def name="header()"></%def>${self.header()}
+    </div>
+
+The ``<%block>`` is obviously more streamlined than the ``<%def>`` for this kind
+of usage.  In addition,
+the above "inline" approach with ``<%def>`` does not work with nesting:
+
+.. sourcecode:: mako
+
+    <head>
+        <%def name="header()">
+            <title>
+            ## this won't work !
+            <%def name="title()">default title</%def>${self.title()}
+            </title>
+        </%def>${self.header()}
+    </head>
+
+Where above, the ``title()`` def, because it's a def within a def, is not part of the
+template's exported namespace and will not be part of ``self``.  If the inherited template
+did define its own ``title`` def at the top level, it would be called, but the "default title"
+above is not present at all on ``self`` no matter what.  For this to work as expected
+you'd instead need to say:
+
+.. sourcecode:: mako
+
+    <head>
+        <%def name="header()">
+            <title>
+            ${self.title()}
+            </title>
+        </%def>${self.header()}
+
+        <%def name="title()"/>
+    </head>
+
+That is, ``title`` is defined outside of any other defs so that it is in the ``self`` namespace.
+It works, but the definition needs to be potentially far away from the point of render.
+
+A named block is always placed in the ``self`` namespace, regardless of nesting,
+so this restriction is lifted:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <head>
+        <%block name="header">
+            <title>
+            <%block name="title"/>
+            </title>
+        </%block>
+    </head>
+
+The above template defines ``title`` inside of ``header``, and an inheriting template can define
+one or both in **any** configuration, nested inside each other or not, in order for them to be used:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+    <%block name="title">
+        the title
+    </%block>
+    <%block name="header">
+        the header
+    </%block>
+
+So while the ``<%block>`` tag lifts the restriction of nested blocks not being available externally,
+in order to achieve this it *adds* the restriction that all block names in a single template need
+to be globally unique within the template, and additionally that a ``<%block>`` can't be defined
+inside of a ``<%def>``. It's a more restricted tag suited towards a more specific use case than ``<%def>``.
+
+Using the ``next`` Namespace to Produce Content Wrapping
+========================================================
+
+Sometimes you have an inheritance chain that spans more than two
+templates. Or maybe you don't, but you'd like to build your
+system such that extra inherited templates can be inserted in
+the middle of a chain where they would be smoothly integrated.
+If each template wants to define its layout just within its main
+body, you can't just call ``self.body()`` to get at the
+inheriting template's body, since that is only the topmost body.
+To get at the body of the *next* template, you call upon the
+namespace ``next``, which is the namespace of the template
+**immediately following** the current template.
+
+Lets change the line in ``base.html`` which calls upon
+``self.body()`` to instead call upon ``next.body()``:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                <%block name="header"/>
+            </div>
+
+            ${next.body()}
+
+            <div class="footer">
+                <%block name="footer">
+                    this is the footer
+                </%block>
+            </div>
+        </body>
+    </html>
+
+
+Lets also add an intermediate template called ``layout.html``,
+which inherits from ``base.html``:
+
+.. sourcecode:: mako
+
+    ## layout.html
+    <%inherit file="base.html"/>
+    <ul>
+        <%block name="toolbar">
+            <li>selection 1</li>
+            <li>selection 2</li>
+            <li>selection 3</li>
+        </%block>
+    </ul>
+    <div class="mainlayout">
+        ${next.body()}
+    </div>
+
+And finally change ``index.html`` to inherit from
+``layout.html`` instead:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="layout.html"/>
+
+    ## .. rest of template
+
+In this setup, each call to ``next.body()`` will render the body
+of the next template in the inheritance chain (which can be
+written as ``base.html -> layout.html -> index.html``). Control
+is still first passed to the bottommost template ``base.html``,
+and ``self`` still references the topmost definition of any
+particular def.
+
+The output we get would be:
+
+.. sourcecode:: html
+
+    <html>
+        <body>
+            <div class="header">
+                this is some header content
+            </div>
+
+            <ul>
+                <li>selection 1</li>
+                <li>selection 2</li>
+                <li>selection 3</li>
+            </ul>
+
+            <div class="mainlayout">
+            this is the body content.
+            </div>
+
+            <div class="footer">
+                this is the footer
+            </div>
+        </body>
+    </html>
+
+So above, we have the ``<html>``, ``<body>`` and
+``header``/``footer`` layout of ``base.html``, we have the
+``<ul>`` and ``mainlayout`` section of ``layout.html``, and the
+main body of ``index.html`` as well as its overridden ``header``
+def. The ``layout.html`` template is inserted into the middle of
+the chain without ``base.html`` having to change anything.
+Without the ``next`` namespace, only the main body of
+``index.html`` could be used; there would be no way to call
+``layout.html``'s body content.
+
+.. _parent_namespace:
+
+Using the ``parent`` Namespace to Augment Defs
+==============================================
+
+Lets now look at the other inheritance-specific namespace, the
+opposite of ``next`` called ``parent``. ``parent`` is the
+namespace of the template **immediately preceding** the current
+template. What's useful about this namespace is that
+defs or blocks can call upon their overridden versions.
+This is not as hard as it sounds and
+is very much like using the ``super`` keyword in Python. Lets
+modify ``index.html`` to augment the list of selections provided
+by the ``toolbar`` function in ``layout.html``:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="layout.html"/>
+
+    <%block name="header">
+        this is some header content
+    </%block>
+
+    <%block name="toolbar">
+        ## call the parent's toolbar first
+        ${parent.toolbar()}
+        <li>selection 4</li>
+        <li>selection 5</li>
+    </%block>
+
+    this is the body content.
+
+Above, we implemented a ``toolbar()`` function, which is meant
+to override the definition of ``toolbar`` within the inherited
+template ``layout.html``. However, since we want the content
+from that of ``layout.html`` as well, we call it via the
+``parent`` namespace whenever we want it's content, in this case
+before we add our own selections. So the output for the whole
+thing is now:
+
+.. sourcecode:: html
+
+    <html>
+        <body>
+            <div class="header">
+                this is some header content
+            </div>
+
+            <ul>
+                <li>selection 1</li>
+                <li>selection 2</li>
+                <li>selection 3</li>
+                <li>selection 4</li>
+                <li>selection 5</li>
+            </ul>
+
+            <div class="mainlayout">
+            this is the body content.
+            </div>
+
+            <div class="footer">
+                this is the footer
+            </div>
+        </body>
+    </html>
+
+and you're now a template inheritance ninja!
+
+Inheritable Attributes
+======================
+
+The :attr:`attr <.Namespace.attr>` accessor of the :class:`.Namespace` object
+allows access to module level variables declared in a template. By accessing
+``self.attr``, you can access regular attributes from the
+inheritance chain as declared in ``<%! %>`` sections. Such as:
+
+.. sourcecode:: mako
+
+    <%!
+        class_ = "grey"
+    %>
+
+    <div class="${self.attr.class_}">
+        ${self.body()}
+    </div>
+
+If an inheriting template overrides ``class_`` to be
+``"white"``, as in:
+
+.. sourcecode:: mako
+
+    <%!
+        class_ = "white"
+    %>
+    <%inherit file="parent.html"/>
+
+    This is the body
+
+you'll get output like:
+
+.. sourcecode:: html
+
+    <div class="white">
+        This is the body
+    </div>
+
diff --git a/lib/mako-0.7.2/doc/_sources/namespaces.txt b/lib/mako-0.7.2/doc/_sources/namespaces.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/namespaces.txt
@@ -0,0 +1,349 @@
+.. _namespaces_toplevel:
+
+==========
+Namespaces
+==========
+
+Namespaces are used to organize groups of defs into
+categories, and also to "import" defs from other files.
+
+If the file ``components.html`` defines these two defs:
+
+.. sourcecode:: mako
+
+    ## components.html
+    <%def name="comp1()">
+        this is comp1
+    </%def>
+
+    <%def name="comp2(x)">
+        this is comp2, x is ${x}
+    </%def>
+
+you can make another file, for example ``index.html``, that
+pulls those two defs into a namespace called ``comp``:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%namespace name="comp" file="components.html"/>
+
+    Here's comp1:  ${comp.comp1()}
+    Here's comp2:  ${comp.comp2(x=5)}
+
+The ``comp`` variable above is an instance of
+:class:`.Namespace`, a **proxy object** which delivers
+method calls to the underlying template callable using the
+current context.
+
+``<%namespace>`` also provides an ``import`` attribute which can
+be used to pull the names into the local namespace, removing the
+need to call it via the "``.``" operator. When ``import`` is used, the
+``name`` attribute is optional.
+
+.. sourcecode:: mako
+
+    <%namespace file="components.html" import="comp1, comp2"/>
+
+    Heres comp1:  ${comp1()}
+    Heres comp2:  ${comp2(x=5)}
+
+``import`` also supports the "``*``" operator:
+
+.. sourcecode:: mako
+
+    <%namespace file="components.html" import="*"/>
+
+    Heres comp1:  ${comp1()}
+    Heres comp2:  ${comp2(x=5)}
+
+The names imported by the ``import`` attribute take precedence
+over any names that exist within the current context.
+
+.. note:: In current versions of Mako, usage of ``import='*'`` is
+   known to decrease performance of the template. This will be
+   fixed in a future release.
+
+The ``file`` argument allows expressions -- if looking for
+context variables, the ``context`` must be named explicitly:
+
+.. sourcecode:: mako
+
+    <%namespace name="dyn" file="${context['namespace_name']}"/>
+
+Ways to Call Namespaces
+=======================
+
+There are essentially four ways to call a function from a
+namespace.
+
+The "expression" format, as described previously. Namespaces are
+just Python objects with functions on them, and can be used in
+expressions like any other function:
+
+.. sourcecode:: mako
+
+    ${mynamespace.somefunction('some arg1', 'some arg2', arg3='some arg3', arg4='some arg4')}
+
+Synonymous with the "expression" format is the "custom tag"
+format, when a "closed" tag is used. This format, introduced in
+Mako 0.2.3, allows the usage of a "custom" Mako tag, with the
+function arguments passed in using named attributes:
+
+.. sourcecode:: mako
+
+    <%mynamespace:somefunction arg1="some arg1" arg2="some arg2" arg3="some arg3" arg4="some arg4"/>
+
+When using tags, the values of the arguments are taken as
+literal strings by default. To embed Python expressions as
+arguments, use the embedded expression format:
+
+.. sourcecode:: mako
+
+    <%mynamespace:somefunction arg1="${someobject.format()}" arg2="${somedef(5, 12)}"/>
+
+The "custom tag" format is intended mainly for namespace
+functions which recognize body content, which in Mako is known
+as a "def with embedded content":
+
+.. sourcecode:: mako
+
+    <%mynamespace:somefunction arg1="some argument" args="x, y">
+        Some record: ${x}, ${y}
+    </%mynamespace:somefunction>
+
+The "classic" way to call defs with embedded content is the ``<%call>`` tag:
+
+.. sourcecode:: mako
+
+    <%call expr="mynamespace.somefunction(arg1='some argument')" args="x, y">
+        Some record: ${x}, ${y}
+    </%call>
+
+For information on how to construct defs that embed content from
+the caller, see :ref:`defs_with_content`.
+
+.. _namespaces_python_modules:
+
+Namespaces from Regular Python Modules
+======================================
+
+Namespaces can also import regular Python functions from
+modules. These callables need to take at least one argument,
+``context``, an instance of :class:`.Context`. A module file 
+``some/module.py`` might contain the callable:
+
+.. sourcecode:: python
+
+    def my_tag(context):
+        context.write("hello world")
+        return ''
+
+A template can use this module via:
+
+.. sourcecode:: mako
+
+    <%namespace name="hw" module="some.module"/>
+
+    ${hw.my_tag()}
+
+Note that the ``context`` argument is not needed in the call;
+the :class:`.Namespace` tag creates a locally-scoped callable which
+takes care of it. The ``return ''`` is so that the def does not
+dump a ``None`` into the output stream -- the return value of any
+def is rendered after the def completes, in addition to whatever
+was passed to :meth:`.Context.write` within its body.
+
+If your def is to be called in an "embedded content" context,
+that is as described in :ref:`defs_with_content`, you should use
+the :func:`.supports_caller` decorator, which will ensure that Mako
+will ensure the correct "caller" variable is available when your
+def is called, supporting embedded content:
+
+.. sourcecode:: python
+
+    from mako.runtime import supports_caller
+
+    @supports_caller
+    def my_tag(context):
+        context.write("<div>")
+        context['caller'].body()
+        context.write("</div>")
+        return ''
+
+Capturing of output is available as well, using the
+outside-of-templates version of the :func:`.capture` function,
+which accepts the "context" as its first argument:
+
+.. sourcecode:: python
+
+    from mako.runtime import supports_caller, capture
+
+    @supports_caller
+    def my_tag(context):
+        return "<div>%s</div>" % \
+                capture(context, context['caller'].body, x="foo", y="bar")
+
+Declaring Defs in Namespaces
+============================
+
+The ``<%namespace>`` tag supports the definition of ``<%def>``\ s
+directly inside the tag. These defs become part of the namespace
+like any other function, and will override the definitions
+pulled in from a remote template or module:
+
+.. sourcecode:: mako
+
+    ## define a namespace
+    <%namespace name="stuff">
+        <%def name="comp1()">
+            comp1
+        </%def>
+    </%namespace>
+
+    ## then call it
+    ${stuff.comp1()}
+
+.. _namespaces_body:
+
+The ``body()`` Method
+=====================
+
+Every namespace that is generated from a template contains a
+method called ``body()``. This method corresponds to the main
+body of the template, and plays its most important roles when
+using inheritance relationships as well as
+def-calls-with-content.
+
+Since the ``body()`` method is available from a namespace just
+like all the other defs defined in a template, what happens if
+you send arguments to it? By default, the ``body()`` method
+accepts no positional arguments, and for usefulness in
+inheritance scenarios will by default dump all keyword arguments
+into a dictionary called ``pageargs``. But if you actually want
+to get at the keyword arguments, Mako recommends you define your
+own argument signature explicitly. You do this via using the
+``<%page>`` tag:
+
+.. sourcecode:: mako
+
+    <%page args="x, y, someval=8, scope='foo', **kwargs"/>
+
+A template which defines the above signature requires that the
+variables ``x`` and ``y`` are defined, defines default values
+for ``someval`` and ``scope``, and sets up ``**kwargs`` to
+receive all other keyword arguments. If ``**kwargs`` or similar
+is not present, the argument ``**pageargs`` gets tacked on by
+Mako. When the template is called as a top-level template (i.e.
+via :meth:`~.Template.render`) or via the ``<%include>`` tag, the
+values for these arguments will be pulled from the ``Context``.
+In all other cases, i.e. via calling the ``body()`` method, the
+arguments are taken as ordinary arguments from the method call.
+So above, the body might be called as:
+
+.. sourcecode:: mako
+
+    ${self.body(5, y=10, someval=15, delta=7)}
+
+The :class:`.Context` object also supplies a :attr:`~.Context.kwargs` accessor, for
+cases when you'd like to pass along whatever is in the context to
+a ``body()`` callable:
+
+.. sourcecode:: mako
+
+    ${next.body(**context.kwargs)}
+
+The usefulness of calls like the above become more apparent when
+one works with inheriting templates. For more information on
+this, as well as the meanings of the names ``self`` and
+``next``, see :ref:`inheritance_toplevel`.
+
+.. _namespaces_builtin:
+
+Built-in Namespaces
+===================
+
+The namespace is so great that Mako gives your template one (or
+two) for free. The names of these namespaces are ``local`` and
+``self``. Other built-in namespaces include ``parent`` and
+``next``, which are optional and are described in
+:ref:`inheritance_toplevel`.
+
+.. _namespace_local:
+
+``local``
+---------
+
+The ``local`` namespace is basically the namespace for the
+currently executing template. This means that all of the top
+level defs defined in your template, as well as your template's
+``body()`` function, are also available off of the ``local``
+namespace.
+
+The ``local`` namespace is also where properties like ``uri``,
+``filename``, and ``module`` and the ``get_namespace`` method
+can be particularly useful.
+
+.. _namespace_self:
+
+``self``
+--------
+
+The ``self`` namespace, in the case of a template that does not
+use inheritance, is synonymous with ``local``. If inheritance is
+used, then ``self`` references the topmost template in the
+inheritance chain, where it is most useful for providing the
+ultimate form of various "method" calls which may have been
+overridden at various points in an inheritance chain. See
+:ref:`inheritance_toplevel`.
+
+Inheritable Namespaces
+======================
+
+The ``<%namespace>`` tag includes an optional attribute
+``inheritable="True"``, which will cause the namespace to be
+attached to the ``self`` namespace. Since ``self`` is globally
+available throughout an inheritance chain (described in the next
+section), all the templates in an inheritance chain can get at
+the namespace imported in a super-template via ``self``.
+
+.. sourcecode:: mako
+
+    ## base.html
+    <%namespace name="foo" file="foo.html" inheritable="True"/>
+
+    ${next.body()}
+
+    ## somefile.html
+    <%inherit file="base.html"/>
+
+    ${self.foo.bar()}
+
+This allows a super-template to load a whole bunch of namespaces
+that its inheriting templates can get to, without them having to
+explicitly load those namespaces themselves.
+
+The ``import="*"`` part of the ``<%namespace>`` tag doesn't yet
+interact with the ``inheritable`` flag, so currently you have to
+use the explicit namespace name off of ``self``, followed by the
+desired function name. But more on this in a future release.
+
+API Reference
+=============
+
+.. autoclass:: mako.runtime.Namespace
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.TemplateNamespace
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.ModuleNamespace
+    :show-inheritance:
+    :members:
+ 
+.. autofunction:: mako.runtime.supports_caller
+
+.. autofunction:: mako.runtime.capture
+
diff --git a/lib/mako-0.7.2/doc/_sources/runtime.txt b/lib/mako-0.7.2/doc/_sources/runtime.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/runtime.txt
@@ -0,0 +1,448 @@
+.. _runtime_toplevel:
+
+============================
+The Mako Runtime Environment
+============================
+
+This section describes a little bit about the objects and
+built-in functions that are available in templates.
+
+.. _context:
+
+Context
+=======
+
+The :class:`.Context` is the central object that is created when
+a template is first executed, and is responsible for handling
+all communication with the outside world.  Within the template
+environment, it is available via the :ref:`reserved name <reserved_names>`
+``context``.  The :class:`.Context` includes two
+major components, one of which is the output buffer, which is a
+file-like object such as Python's ``StringIO`` or similar, and
+the other a dictionary of variables that can be freely
+referenced within a template; this dictionary is a combination
+of the arguments sent to the :meth:`~.Template.render` function and
+some built-in variables provided by Mako's runtime environment.
+
+The Buffer
+----------
+
+The buffer is stored within the :class:`.Context`, and writing
+to it is achieved by calling the :meth:`~.Context.write` method
+-- in a template this looks like ``context.write('some string')``.
+You usually don't need to care about this, as all text within a template, as
+well as all expressions provided by ``${}``, automatically send
+everything to this method. The cases you might want to be aware
+of its existence are if you are dealing with various
+filtering/buffering scenarios, which are described in
+:ref:`filtering_toplevel`, or if you want to programmatically
+send content to the output stream, such as within a ``<% %>``
+block.
+
+.. sourcecode:: mako
+
+    <%
+        context.write("some programmatic text")
+    %>
+
+The actual buffer may or may not be the original buffer sent to
+the :class:`.Context` object, as various filtering/caching
+scenarios may "push" a new buffer onto the context's underlying
+buffer stack. For this reason, just stick with
+``context.write()`` and content will always go to the topmost
+buffer.
+
+.. _context_vars:
+
+Context Variables
+-----------------
+
+When your template is compiled into a Python module, the body
+content is enclosed within a Python function called
+``render_body``. Other top-level defs defined in the template are
+defined within their own function bodies which are named after
+the def's name with the prefix ``render_`` (i.e. ``render_mydef``).
+One of the first things that happens within these functions is
+that all variable names that are referenced within the function
+which are not defined in some other way (i.e. such as via
+assignment, module level imports, etc.) are pulled from the
+:class:`.Context` object's dictionary of variables. This is how you're
+able to freely reference variable names in a template which
+automatically correspond to what was passed into the current
+:class:`.Context`.
+
+* **What happens if I reference a variable name that is not in
+  the current context?** - The value you get back is a special
+  value called ``UNDEFINED``, or if the ``strict_undefined=True`` flag
+  is used a ``NameError`` is raised. ``UNDEFINED`` is just a simple global
+  variable with the class :class:`mako.runtime.Undefined`. The
+  ``UNDEFINED`` object throws an error when you call ``str()`` on
+  it, which is what happens if you try to use it in an
+  expression.
+* **UNDEFINED makes it hard for me to find what name is missing** - An alternative
+  is to specify the option ``strict_undefined=True``
+  to the :class:`.Template` or :class:`.TemplateLookup`.  This will cause
+  any non-present variables to raise an immediate ``NameError``
+  which includes the name of the variable in its message
+  when :meth:`~.Template.render` is called -- ``UNDEFINED`` is not used.
+
+  .. versionadded:: 0.3.6
+
+* **Why not just return None?** Using ``UNDEFINED``, or
+  raising a ``NameError`` is more
+  explicit and allows differentiation between a value of ``None``
+  that was explicitly passed to the :class:`.Context` and a value that
+  wasn't present at all.
+* **Why raise an exception when you call str() on it ? Why not
+  just return a blank string?** - Mako tries to stick to the
+  Python philosophy of "explicit is better than implicit". In
+  this case, it's decided that the template author should be made
+  to specifically handle a missing value rather than
+  experiencing what may be a silent failure. Since ``UNDEFINED``
+  is a singleton object just like Python's ``True`` or ``False``,
+  you can use the ``is`` operator to check for it:
+
+  .. sourcecode:: mako
+
+        % if someval is UNDEFINED:
+            someval is: no value
+        % else:
+            someval is: ${someval}
+        % endif
+
+Another facet of the :class:`.Context` is that its dictionary of
+variables is **immutable**. Whatever is set when
+:meth:`~.Template.render` is called is what stays. Of course, since
+its Python, you can hack around this and change values in the
+context's internal dictionary, but this will probably will not
+work as well as you'd think. The reason for this is that Mako in
+many cases creates copies of the :class:`.Context` object, which
+get sent to various elements of the template and inheriting
+templates used in an execution. So changing the value in your
+local :class:`.Context` will not necessarily make that value
+available in other parts of the template's execution. Examples
+of where Mako creates copies of the :class:`.Context` include
+within top-level def calls from the main body of the template
+(the context is used to propagate locally assigned variables
+into the scope of defs; since in the template's body they appear
+as inlined functions, Mako tries to make them act that way), and
+within an inheritance chain (each template in an inheritance
+chain has a different notion of ``parent`` and ``next``, which
+are all stored in unique :class:`.Context` instances).
+
+* **So what if I want to set values that are global to everyone
+  within a template request?** - All you have to do is provide a
+  dictionary to your :class:`.Context` when the template first
+  runs, and everyone can just get/set variables from that. Lets
+  say its called ``attributes``.
+
+  Running the template looks like:
+
+  .. sourcecode:: python
+
+      output = template.render(attributes={})
+
+  Within a template, just reference the dictionary:
+
+  .. sourcecode:: mako
+
+      <%
+          attributes['foo'] = 'bar'
+      %>
+      'foo' attribute is: ${attributes['foo']}
+
+* **Why can't "attributes" be a built-in feature of the
+  Context?** - This is an area where Mako is trying to make as
+  few decisions about your application as it possibly can.
+  Perhaps you don't want your templates to use this technique of
+  assigning and sharing data, or perhaps you have a different
+  notion of the names and kinds of data structures that should
+  be passed around. Once again Mako would rather ask the user to
+  be explicit.
+
+Context Methods and Accessors
+-----------------------------
+
+Significant members of :class:`.Context` include:
+
+* ``context[key]`` / ``context.get(key, default=None)`` -
+  dictionary-like accessors for the context. Normally, any
+  variable you use in your template is automatically pulled from
+  the context if it isn't defined somewhere already. Use the
+  dictionary accessor and/or ``get`` method when you want a
+  variable that *is* already defined somewhere else, such as in
+  the local arguments sent to a ``%def`` call. If a key is not
+  present, like a dictionary it raises ``KeyError``.
+* ``keys()`` - all the names defined within this context.
+* ``kwargs`` - this returns a **copy** of the context's
+  dictionary of variables. This is useful when you want to
+  propagate the variables in the current context to a function
+  as keyword arguments, i.e.:
+
+  .. sourcecode:: mako
+
+        ${next.body(**context.kwargs)}
+
+* ``write(text)`` - write some text to the current output
+  stream.
+* ``lookup`` - returns the :class:`.TemplateLookup` instance that is
+  used for all file-lookups within the current execution (even
+  though individual :class:`.Template` instances can conceivably have
+  different instances of a :class:`.TemplateLookup`, only the
+  :class:`.TemplateLookup` of the originally-called :class:`.Template` gets
+  used in a particular execution).
+
+.. _loop_context:
+
+The Loop Context
+================
+
+Within ``% for`` blocks, the :ref:`reserved name<reserved_names>` ``loop``
+is available.  ``loop`` tracks the progress of
+the ``for`` loop and makes it easy to use the iteration state to control
+template behavior:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for a in ("one", "two", "three"):
+        <li>Item ${loop.index}: ${a}</li>
+    % endfor
+    </ul>
+
+.. versionadded:: 0.7
+
+Iterations
+----------
+
+Regardless of the type of iterable you're looping over, ``loop`` always tracks
+the 0-indexed iteration count (available at ``loop.index``), its parity
+(through the ``loop.even`` and ``loop.odd`` bools), and ``loop.first``, a bool
+indicating whether the loop is on its first iteration.  If your iterable
+provides a ``__len__`` method, ``loop`` also provides access to
+a count of iterations remaining at ``loop.reverse_index`` and ``loop.last``,
+a bool indicating whether the loop is on its last iteration; accessing these
+without ``__len__`` will raise a ``TypeError``.
+
+Cycling
+-------
+
+Cycling is available regardless of whether the iterable you're using provides
+a ``__len__`` method.  Prior to Mako 0.7, you might have generated a simple
+zebra striped list using ``enumerate``:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for i, item in enumerate(('spam', 'ham', 'eggs')):
+      <li class="${'odd' if i % 2 else 'even'}">${item}</li>
+    % endfor
+    </ul>
+
+With ``loop.cycle``, you get the same results with cleaner code and less prep work:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for item in ('spam', 'ham', 'eggs'):
+      <li class="${loop.cycle('even', 'odd')}">${item}</li>
+    % endfor
+    </ul>
+
+Both approaches produce output like the following:
+
+.. sourcecode:: html
+
+    <ul>
+      <li class="even">spam</li>
+      <li class="odd">ham</li>
+      <li class="even">eggs</li>
+    </ul>
+
+Parent Loops
+------------
+
+Loop contexts can also be transparently nested, and the Mako runtime will do
+the right thing and manage the scope for you.  You can access the parent loop
+context through ``loop.parent``.
+
+This allows you to reach all the way back up through the loop stack by
+chaining ``parent`` attribute accesses, i.e. ``loop.parent.parent....`` as
+long as the stack depth isn't exceeded.  For example, you can use the parent
+loop to make a checkered table:
+
+.. sourcecode:: mako
+
+    <table>
+    % for consonant in 'pbj':
+      <tr>
+      % for vowel in 'iou':
+        <td class="${'black' if (loop.parent.even == loop.even) else 'red'}">
+          ${consonant + vowel}t
+        </td>
+      % endfor
+      </tr>
+    % endfor
+    </table>
+
+.. sourcecode:: html
+
+    <table>
+      <tr>
+        <td class="black">
+          pit
+        </td>
+        <td class="red">
+          pot
+        </td>
+        <td class="black">
+          put
+        </td>
+      </tr>
+      <tr>
+        <td class="red">
+          bit
+        </td>
+        <td class="black">
+          bot
+        </td>
+        <td class="red">
+          but
+        </td>
+      </tr>
+      <tr>
+        <td class="black">
+          jit
+        </td>
+        <td class="red">
+          jot
+        </td>
+        <td class="black">
+          jut
+        </td>
+      </tr>
+    </table>
+
+.. _migrating_loop:
+
+Migrating Legacy Templates that Use the Word "loop"
+---------------------------------------------------
+
+.. versionchanged:: 0.7
+   The ``loop`` name is now :ref:`reserved <reserved_names>` in Mako,
+   which means a template that refers to a variable named ``loop``
+   won't function correctly when used in Mako 0.7.
+
+To ease the transition for such systems, the feature can be disabled across the board for
+all templates, then re-enabled on a per-template basis for those templates which wish
+to make use of the new system.
+
+First, the ``enable_loop=False`` flag is passed to either the :class:`.TemplateLookup`
+or :class:`.Template` object in use:
+
+.. sourcecode:: python
+
+    lookup = TemplateLookup(directories=['/docs'], enable_loop=False)
+
+or:
+
+.. sourcecode:: python
+
+    template = Template("some template", enable_loop=False)
+
+An individual template can make usage of the feature when ``enable_loop`` is set to
+``False`` by switching it back on within the ``<%page>`` tag:
+
+.. sourcecode:: mako
+
+    <%page enable_loop="True"/>
+
+    % for i in collection:
+        ${i} ${loop.index}
+    % endfor
+
+Using the above scheme, it's safe to pass the name ``loop`` to the :meth:`.Template.render`
+method as well as to freely make usage of a variable named ``loop`` within a template, provided
+the ``<%page>`` tag doesn't override it.  New templates that want to use the ``loop`` context
+can then set up ``<%page enable_loop="True"/>`` to use the new feature without affecting
+old templates.
+
+All the Built-in Names
+======================
+
+A one-stop shop for all the names Mako defines. Most of these
+names are instances of :class:`.Namespace`, which are described
+in the next section, :ref:`namespaces_toplevel`. Also, most of
+these names other than ``context``, ``UNDEFINED``, and ``loop`` are
+also present *within* the :class:`.Context` itself.   The names
+``context``, ``loop`` and ``UNDEFINED`` themselves can't be passed
+to the context and can't be substituted -- see the section :ref:`reserved_names`.
+
+* ``context`` - this is the :class:`.Context` object, introduced
+  at :ref:`context`.
+* ``local`` - the namespace of the current template, described
+  in :ref:`namespaces_builtin`.
+* ``self`` - the namespace of the topmost template in an
+  inheritance chain (if any, otherwise the same as ``local``),
+  mostly described in :ref:`inheritance_toplevel`.
+* ``parent`` - the namespace of the parent template in an
+  inheritance chain (otherwise undefined); see
+  :ref:`inheritance_toplevel`.
+* ``next`` - the namespace of the next template in an
+  inheritance chain (otherwise undefined); see
+  :ref:`inheritance_toplevel`.
+* ``caller`` - a "mini" namespace created when using the
+  ``<%call>`` tag to define a "def call with content"; described
+  in :ref:`defs_with_content`.
+* ``loop`` - this provides access to :class:`.LoopContext` objects when
+  they are requested within ``% for`` loops, introduced at :ref:`loop_context`.
+* ``capture`` - a function that calls a given def and captures
+  its resulting content into a string, which is returned. Usage
+  is described in :ref:`filtering_toplevel`.
+* ``UNDEFINED`` - a global singleton that is applied to all
+  otherwise uninitialized template variables that were not
+  located within the :class:`.Context` when rendering began,
+  unless the :class:`.Template` flag ``strict_undefined``
+  is set to ``True``. ``UNDEFINED`` is
+  an instance of :class:`.Undefined`, and raises an
+  exception when its ``__str__()`` method is called.
+* ``pageargs`` - this is a dictionary which is present in a
+  template which does not define any ``**kwargs`` section in its
+  ``<%page>`` tag. All keyword arguments sent to the ``body()``
+  function of a template (when used via namespaces) go here by
+  default unless otherwise defined as a page argument. If this
+  makes no sense, it shouldn't; read the section
+  :ref:`namespaces_body`.
+
+.. _reserved_names:
+
+Reserved Names
+--------------
+
+Mako has a few names that are considered to be "reserved" and can't be used
+as variable names.
+
+.. versionchanged:: 0.7
+   Mako raises an error if these words are found passed to the template
+   as context arguments, whereas in previous versions they'd be silently
+   ignored or lead to other error messages.
+
+* ``context`` - see :ref:`context`.
+* ``UNDEFINED`` - see :ref:`context_vars`.
+* ``loop`` - see :ref:`loop_context`.  Note this can be disabled for legacy templates
+  via the ``enable_loop=False`` argument; see :ref:`migrating_loop`.
+
+API Reference
+=============
+
+.. autoclass:: mako.runtime.Context
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.LoopContext
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.Undefined
+    :show-inheritance:
+
diff --git a/lib/mako-0.7.2/doc/_sources/syntax.txt b/lib/mako-0.7.2/doc/_sources/syntax.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/syntax.txt
@@ -0,0 +1,469 @@
+.. _syntax_toplevel:
+
+======
+Syntax
+======
+
+A Mako template is parsed from a text stream containing any kind
+of content, XML, HTML, email text, etc. The template can further
+contain Mako-specific directives which represent variable and/or
+expression substitutions, control structures (i.e. conditionals
+and loops), server-side comments, full blocks of Python code, as
+well as various tags that offer additional functionality. All of
+these constructs compile into real Python code. This means that
+you can leverage the full power of Python in almost every aspect
+of a Mako template.
+
+Expression Substitution
+=======================
+
+The simplest expression is just a variable substitution. The
+syntax for this is the ``${}`` construct, which is inspired by
+Perl, Genshi, JSP EL, and others:
+
+.. sourcecode:: mako
+
+    this is x: ${x}
+
+Above, the string representation of ``x`` is applied to the
+template's output stream. If you're wondering where ``x`` comes
+from, it's usually from the :class:`.Context` supplied to the
+template's rendering function. If ``x`` was not supplied to the
+template and was not otherwise assigned locally, it evaluates to
+a special value ``UNDEFINED``. More on that later.
+
+The contents within the ``${}`` tag are evaluated by Python
+directly, so full expressions are OK:
+
+.. sourcecode:: mako
+
+    pythagorean theorem:  ${pow(x,2) + pow(y,2)}
+
+The results of the expression are evaluated into a string result
+in all cases before being rendered to the output stream, such as
+the above example where the expression produces a numeric
+result.
+
+Expression Escaping
+===================
+
+Mako includes a number of built-in escaping mechanisms,
+including HTML, URI and XML escaping, as well as a "trim"
+function. These escapes can be added to an expression
+substitution using the ``|`` operator:
+
+.. sourcecode:: mako
+
+    ${"this is some text" | u}
+
+The above expression applies URL escaping to the expression, and
+produces ``this+is+some+text``. The ``u`` name indicates URL
+escaping, whereas ``h`` represents HTML escaping, ``x``
+represents XML escaping, and ``trim`` applies a trim function.
+
+Read more about built-in filtering functions, including how to
+make your own filter functions, in :ref:`filtering_toplevel`.
+
+Control Structures
+==================
+
+A control structure refers to all those things that control the
+flow of a program -- conditionals (i.e. ``if``/``else``), loops (like
+``while`` and ``for``), as well as things like ``try``/``except``. In Mako,
+control structures are written using the ``%`` marker followed
+by a regular Python control expression, and are "closed" by
+using another ``%`` marker with the tag "``end<name>``", where
+"``<name>``" is the keyword of the expression:
+
+.. sourcecode:: mako
+
+    % if x==5:
+        this is some output
+    % endif
+
+The ``%`` can appear anywhere on the line as long as no text
+precedes it; indentation is not significant. The full range of
+Python "colon" expressions are allowed here, including
+``if``/``elif``/``else``, ``while``, ``for``, and even ``def``, although
+Mako has a built-in tag for defs which is more full-featured.
+
+.. sourcecode:: mako
+
+    % for a in ['one', 'two', 'three', 'four', 'five']:
+        % if a[0] == 't':
+        its two or three
+        % elif a[0] == 'f':
+        four/five
+        % else:
+        one
+        % endif
+    % endfor
+
+The ``%`` sign can also be "escaped", if you actually want to
+emit a percent sign as the first non whitespace character on a
+line, by escaping it as in ``%%``:
+
+.. sourcecode:: mako
+
+    %% some text
+
+        %% some more text
+
+The Loop Context
+----------------
+
+The **loop context** provides additional information about a loop
+while inside of a ``% for`` structure:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for a in ("one", "two", "three"):
+        <li>Item ${loop.index}: ${a}</li>
+    % endfor
+    </ul>
+
+See :ref:`loop_context` for more information on this feature.
+
+.. versionadded:: 0.7
+
+Comments
+========
+
+Comments come in two varieties. The single line comment uses
+``##`` as the first non-space characters on a line:
+
+.. sourcecode:: mako
+
+    ## this is a comment.
+    ...text ...
+
+A multiline version exists using ``<%doc> ...text... </%doc>``:
+
+.. sourcecode:: mako
+
+    <%doc>
+        these are comments
+        more comments
+    </%doc>
+
+Newline Filters
+===============
+
+The backslash ("``\``") character, placed at the end of any
+line, will consume the newline character before continuing to
+the next line:
+
+.. sourcecode:: mako
+
+    here is a line that goes onto \
+    another line.
+
+The above text evaluates to:
+
+.. sourcecode:: text
+
+    here is a line that goes onto another line.
+
+Python Blocks
+=============
+
+Any arbitrary block of python can be dropped in using the ``<%
+%>`` tags:
+
+.. sourcecode:: mako
+
+    this is a template
+    <%
+        x = db.get_resource('foo')
+        y = [z.element for z in x if x.frobnizzle==5]
+    %>
+    % for elem in y:
+        element: ${elem}
+    % endfor
+
+Within ``<% %>``, you're writing a regular block of Python code.
+While the code can appear with an arbitrary level of preceding
+whitespace, it has to be consistently formatted with itself.
+Mako's compiler will adjust the block of Python to be consistent
+with the surrounding generated Python code.
+
+Module-level Blocks
+===================
+
+A variant on ``<% %>`` is the module-level code block, denoted
+by ``<%! %>``. Code within these tags is executed at the module
+level of the template, and not within the rendering function of
+the template. Therefore, this code does not have access to the
+template's context and is only executed when the template is
+loaded into memory (which can be only once per application, or
+more, depending on the runtime environment). Use the ``<%! %>``
+tags to declare your template's imports, as well as any
+pure-Python functions you might want to declare:
+
+.. sourcecode:: mako
+
+    <%!
+        import mylib
+        import re
+
+        def filter(text):
+            return re.sub(r'^@', '', text)
+    %>
+
+Any number of ``<%! %>`` blocks can be declared anywhere in a
+template; they will be rendered in the resulting module 
+in a single contiguous block above all render callables,
+in the order in which they appear in the source template.
+
+Tags
+====
+
+The rest of what Mako offers takes place in the form of tags.
+All tags use the same syntax, which is similar to an XML tag
+except that the first character of the tag name is a ``%``
+character. The tag is closed either by a contained slash
+character, or an explicit closing tag:
+
+.. sourcecode:: mako
+
+    <%include file="foo.txt"/>
+
+    <%def name="foo" buffered="True">
+        this is a def
+    </%def>
+
+All tags have a set of attributes which are defined for each
+tag. Some of these attributes are required. Also, many
+attributes support **evaluation**, meaning you can embed an
+expression (using ``${}``) inside the attribute text:
+
+.. sourcecode:: mako
+
+    <%include file="/foo/bar/${myfile}.txt"/>
+
+Whether or not an attribute accepts runtime evaluation depends
+on the type of tag and how that tag is compiled into the
+template. The best way to find out if you can stick an
+expression in is to try it! The lexer will tell you if it's not
+valid.
+
+Heres a quick summary of all the tags:
+
+``<%page>``
+-----------
+
+This tag defines general characteristics of the template,
+including caching arguments, and optional lists of arguments
+which the template expects when invoked.
+
+.. sourcecode:: mako
+
+    <%page args="x, y, z='default'"/>
+
+Or a page tag that defines caching characteristics:
+
+.. sourcecode:: mako
+
+    <%page cached="True" cache_type="memory"/>
+
+Currently, only one ``<%page>`` tag gets used per template, the
+rest get ignored. While this will be improved in a future
+release, for now make sure you have only one ``<%page>`` tag
+defined in your template, else you may not get the results you
+want. The details of what ``<%page>`` is used for are described
+further in :ref:`namespaces_body` as well as :ref:`caching_toplevel`.
+
+``<%include>``
+--------------
+
+A tag that is familiar from other template languages, ``%include``
+is a regular joe that just accepts a file argument and calls in
+the rendered result of that file:
+
+.. sourcecode:: mako
+
+    <%include file="header.html"/>
+
+        hello world
+
+    <%include file="footer.html"/>
+
+Include also accepts arguments which are available as ``<%page>`` arguments in the receiving template:
+
+.. sourcecode:: mako
+
+    <%include file="toolbar.html" args="current_section='members', username='ed'"/>
+
+``<%def>``
+----------
+
+The ``%def`` tag defines a Python function which contains a set
+of content, that can be called at some other point in the
+template. The basic idea is simple:
+
+.. sourcecode:: mako
+
+    <%def name="myfunc(x)">
+        this is myfunc, x is ${x}
+    </%def>
+
+    ${myfunc(7)}
+
+The ``%def`` tag is a lot more powerful than a plain Python ``def``, as
+the Mako compiler provides many extra services with ``%def`` that
+you wouldn't normally have, such as the ability to export defs
+as template "methods", automatic propagation of the current
+:class:`.Context`, buffering/filtering/caching flags, and def calls
+with content, which enable packages of defs to be sent as
+arguments to other def calls (not as hard as it sounds). Get the
+full deal on what ``%def`` can do in :ref:`defs_toplevel`.
+
+``<%block>``
+------------
+
+``%block`` is a tag that is close to a ``%def``,
+except executes itself immediately in its base-most scope,
+and can also be anonymous (i.e. with no name):
+
+.. sourcecode:: mako
+
+    <%block filter="h">
+        some <html> stuff.
+    </%block>
+
+Inspired by Jinja2 blocks, named blocks offer a syntactically pleasing way
+to do inheritance:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+        <%block name="header">
+            <h2><%block name="title"/></h2>
+        </%block>
+        ${self.body()}
+        </body>
+    </html>
+
+Blocks are introduced in :ref:`blocks` and further described in :ref:`inheritance_toplevel`.
+
+.. versionadded:: 0.4.1
+
+``<%namespace>``
+----------------
+
+``%namespace`` is Mako's equivalent of Python's ``import``
+statement. It allows access to all the rendering functions and
+metadata of other template files, plain Python modules, as well
+as locally defined "packages" of functions.
+
+.. sourcecode:: mako
+
+    <%namespace file="functions.html" import="*"/>
+
+The underlying object generated by ``%namespace``, an instance of
+:class:`.mako.runtime.Namespace`, is a central construct used in
+templates to reference template-specific information such as the
+current URI, inheritance structures, and other things that are
+not as hard as they sound right here. Namespaces are described
+in :ref:`namespaces_toplevel`.
+
+``<%inherit>``
+--------------
+
+Inherit allows templates to arrange themselves in **inheritance
+chains**. This is a concept familiar in many other template
+languages.
+
+.. sourcecode:: mako
+
+    <%inherit file="base.html"/>
+
+When using the ``%inherit`` tag, control is passed to the topmost
+inherited template first, which then decides how to handle
+calling areas of content from its inheriting templates. Mako
+offers a lot of flexibility in this area, including dynamic
+inheritance, content wrapping, and polymorphic method calls.
+Check it out in :ref:`inheritance_toplevel`.
+
+``<%``\ nsname\ ``:``\ defname\ ``>``
+-------------------------------------
+
+Any user-defined "tag" can be created against
+a namespace by using a tag with a name of the form
+``<%<namespacename>:<defname>>``. The closed and open formats of such a
+tag are equivalent to an inline expression and the ``<%call>``
+tag, respectively.
+
+.. sourcecode:: mako
+
+    <%mynamespace:somedef param="some value">
+        this is the body
+    </%mynamespace:somedef>
+
+To create custom tags which accept a body, see
+:ref:`defs_with_content`.
+
+.. versionadded:: 0.2.3
+
+``<%call>``
+-----------
+
+The call tag is the "classic" form of a user-defined tag, and is
+roughly equivalent to the ``<%namespacename:defname>`` syntax
+described above. This tag is also described in :ref:`defs_with_content`.
+
+``<%doc>``
+----------
+
+The ``%doc`` tag handles multiline comments:
+
+.. sourcecode:: mako
+
+    <%doc>
+        these are comments
+        more comments
+    </%doc>
+
+Also the ``##`` symbol as the first non-space characters on a line can be used for single line comments.
+
+``<%text>``
+-----------
+
+This tag suspends the Mako lexer's normal parsing of Mako
+template directives, and returns its entire body contents as
+plain text. It is used pretty much to write documentation about
+Mako:
+
+.. sourcecode:: mako
+
+    <%text filter="h">
+        heres some fake mako ${syntax}
+        <%def name="x()">${x}</%def>
+    </%text>
+
+Returning Early from a Template
+===============================
+
+Sometimes you want to stop processing a template or ``<%def>``
+method in the middle and just use the text you've accumulated so
+far. You can use a ``return`` statement inside a Python
+block to do that.
+
+.. sourcecode:: mako
+
+    % if not len(records):
+        No records found.
+        <% return %>
+    % endif
+
+Or perhaps:
+
+.. sourcecode:: mako
+
+    <%
+        if not len(records):
+            return
+    %>
+
diff --git a/lib/mako-0.7.2/doc/_sources/unicode.txt b/lib/mako-0.7.2/doc/_sources/unicode.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/unicode.txt
@@ -0,0 +1,345 @@
+.. _unicode_toplevel:
+
+===================
+The Unicode Chapter
+===================
+
+The Python language supports two ways of representing what we
+know as "strings", i.e. series of characters. In Python 2, the
+two types are ``string`` and ``unicode``, and in Python 3 they are
+``bytes`` and ``string``. A key aspect of the Python 2 ``string`` and
+Python 3 ``bytes`` types are that they contain no information
+regarding what **encoding** the data is stored in. For this
+reason they were commonly referred to as **byte strings** on
+Python 2, and Python 3 makes this name more explicit. The
+origins of this come from Python's background of being developed
+before the Unicode standard was even available, back when
+strings were C-style strings and were just that, a series of
+bytes. Strings that had only values below 128 just happened to
+be **ASCII** strings and were printable on the console, whereas
+strings with values above 128 would produce all kinds of
+graphical characters and bells.
+
+Contrast the "byte-string" type with the "unicode/string" type.
+Objects of this latter type are created whenever you say something like
+``u"hello world"`` (or in Python 3, just ``"hello world"``). In this
+case, Python represents each character in the string internally
+using multiple bytes per character (something similar to
+UTF-16). What's important is that when using the
+``unicode``/``string`` type to store strings, Python knows the
+data's encoding; it's in its own internal format. Whereas when
+using the ``string``/``bytes`` type, it does not.
+
+When Python 2 attempts to treat a byte-string as a string, which
+means it's attempting to compare/parse its characters, to coerce
+it into another encoding, or to decode it to a unicode object,
+it has to guess what the encoding is. In this case, it will
+pretty much always guess the encoding as ``ascii``... and if the
+byte-string contains bytes above value 128, you'll get an error.
+Python 3 eliminates much of this confusion by just raising an
+error unconditionally if a byte-string is used in a
+character-aware context.
+
+There is one operation that Python *can* do with a non-ASCII
+byte-string, and it's a great source of confusion: it can dump the
+byte-string straight out to a stream or a file, with nary a care
+what the encoding is. To Python, this is pretty much like
+dumping any other kind of binary data (like an image) to a
+stream somewhere. In Python 2, it is common to see programs that
+embed all kinds of international characters and encodings into
+plain byte-strings (i.e. using ``"hello world"`` style literals)
+can fly right through their run, sending reams of strings out to
+wherever they are going, and the programmer, seeing the same
+output as was expressed in the input, is now under the illusion
+that his or her program is Unicode-compliant. In fact, their
+program has no unicode awareness whatsoever, and similarly has
+no ability to interact with libraries that *are* unicode aware.
+Python 3 makes this much less likely by defaulting to unicode as
+the storage format for strings.
+
+The "pass through encoded data" scheme is what template
+languages like Cheetah and earlier versions of Myghty do by
+default. Mako as of version 0.2 also supports this mode of
+operation when using Python 2, using the ``disable_unicode=True``
+flag. However, when using Mako in its default mode of
+unicode-aware, it requires explicitness when dealing with
+non-ASCII encodings. Additionally, if you ever need to handle
+unicode strings and other kinds of encoding conversions more
+intelligently, the usage of raw byte-strings quickly becomes a
+nightmare, since you are sending the Python interpreter
+collections of bytes for which it can make no intelligent
+decisions with regards to encoding. In Python 3 Mako only allows
+usage of native, unicode strings.
+
+In normal Mako operation, all parsed template constructs and
+output streams are handled internally as Python ``unicode``
+objects. It's only at the point of :meth:`~.Template.render` that this unicode
+stream may be rendered into whatever the desired output encoding
+is. The implication here is that the template developer must
+:ensure that :ref:`the encoding of all non-ASCII templates is explicit
+<set_template_file_encoding>` (still required in Python 3),
+that :ref:`all non-ASCII-encoded expressions are in one way or another
+converted to unicode <handling_non_ascii_expressions>`
+(not much of a burden in Python 3), and that :ref:`the output stream of the
+template is handled as a unicode stream being encoded to some
+encoding <defining_output_encoding>` (still required in Python 3).
+
+.. _set_template_file_encoding:
+
+Specifying the Encoding of a Template File
+==========================================
+
+This is the most basic encoding-related setting, and it is
+equivalent to Python's "magic encoding comment", as described in
+`pep-0263 <http://www.python.org/dev/peps/pep-0263/>`_. Any
+template that contains non-ASCII characters requires that this
+comment be present so that Mako can decode to unicode (and also
+make usage of Python's AST parsing services). Mako's lexer will
+use this encoding in order to convert the template source into a
+``unicode`` object before continuing its parsing:
+
+.. sourcecode:: mako
+
+    ## -*- coding: utf-8 -*-
+
+    Alors vous imaginez ma surprise, au lever du jour, quand 
+    une dr?le de petite voix m?a r?veill?. Elle disait:
+     ? S?il vous pla?t? dessine-moi un mouton! ?
+
+For the picky, the regular expression used is derived from that
+of the above mentioned pep:
+
+.. sourcecode:: python
+
+    #.*coding[:=]\s*([-\w.]+).*\n
+
+The lexer will convert to unicode in all cases, so that if any
+characters exist in the template that are outside of the
+specified encoding (or the default of ``ascii``), the error will
+be immediate.
+
+As an alternative, the template encoding can be specified
+programmatically to either :class:`.Template` or :class:`.TemplateLookup` via
+the ``input_encoding`` parameter:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['./'], input_encoding='utf-8')
+
+The above will assume all located templates specify ``utf-8``
+encoding, unless the template itself contains its own magic
+encoding comment, which takes precedence.
+
+.. _handling_non_ascii_expressions:
+
+Handling Expressions
+====================
+
+The next area that encoding comes into play is in expression
+constructs. By default, Mako's treatment of an expression like
+this:
+
+.. sourcecode:: mako
+
+    ${"hello world"}
+
+looks something like this:
+
+.. sourcecode:: python
+
+    context.write(unicode("hello world"))
+
+In Python 3, it's just:
+
+.. sourcecode:: python
+
+    context.write(str("hello world"))
+
+That is, **the output of all expressions is run through the
+``unicode`` built-in**. This is the default setting, and can be
+modified to expect various encodings. The ``unicode`` step serves
+both the purpose of rendering non-string expressions into
+strings (such as integers or objects which contain ``__str()__``
+methods), and to ensure that the final output stream is
+constructed as a unicode object. The main implication of this is
+that **any raw byte-strings that contain an encoding other than
+ASCII must first be decoded to a Python unicode object**. It
+means you can't say this in Python 2:
+
+.. sourcecode:: mako
+
+    ${"voix m?a r?veill?."}  ## error in Python 2!
+
+You must instead say this:
+
+.. sourcecode:: mako
+
+    ${u"voix m?a r?veill?."}  ## OK !
+
+Similarly, if you are reading data from a file that is streaming
+bytes, or returning data from some object that is returning a
+Python byte-string containing a non-ASCII encoding, you have to
+explicitly decode to unicode first, such as:
+
+.. sourcecode:: mako
+
+    ${call_my_object().decode('utf-8')}
+
+Note that filehandles acquired by ``open()`` in Python 3 default
+to returning "text", that is the decoding is done for you. See
+Python 3's documentation for the ``open()`` built-in for details on
+this.
+
+If you want a certain encoding applied to *all* expressions,
+override the ``unicode`` builtin with the ``decode`` built-in at the
+:class:`.Template` or :class:`.TemplateLookup` level:
+
+.. sourcecode:: python
+
+    t = Template(templatetext, default_filters=['decode.utf8'])
+
+Note that the built-in ``decode`` object is slower than the
+``unicode`` function, since unlike ``unicode`` it's not a Python
+built-in, and it also checks the type of the incoming data to
+determine if string conversion is needed first.
+
+The ``default_filters`` argument can be used to entirely customize
+the filtering process of expressions. This argument is described
+in :ref:`filtering_default_filters`.
+
+.. _defining_output_encoding:
+
+Defining Output Encoding
+========================
+
+Now that we have a template which produces a pure unicode output
+stream, all the hard work is done. We can take the output and do
+anything with it.
+
+As stated in the :doc:`"Usage" chapter <usage>`, both :class:`.Template` and
+:class:`.TemplateLookup` accept ``output_encoding`` and ``encoding_errors``
+parameters which can be used to encode the output in any Python
+supported codec:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'], output_encoding='utf-8', encoding_errors='replace')
+
+    mytemplate = mylookup.get_template("foo.txt")
+    print mytemplate.render()
+
+:meth:`~.Template.render` will return a ``bytes`` object in Python 3 if an output
+encoding is specified. By default it performs no encoding and
+returns a native string.
+
+:meth:`~.Template.render_unicode` will return the template output as a Python
+``unicode`` object (or ``string`` in Python 3):
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode()
+
+The above method disgards the output encoding keyword argument;
+you can encode yourself by saying:
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode().encode('utf-8', 'replace')
+
+Buffer Selection
+----------------
+
+Mako does play some games with the style of buffering used
+internally, to maximize performance. Since the buffer is by far
+the most heavily used object in a render operation, it's
+important!
+
+When calling :meth:`~.Template.render` on a template that does not specify any
+output encoding (i.e. it's ``ascii``), Python's ``cStringIO`` module,
+which cannot handle encoding of non-ASCII ``unicode`` objects
+(even though it can send raw byte-strings through), is used for
+buffering. Otherwise, a custom Mako class called
+``FastEncodingBuffer`` is used, which essentially is a super
+dumbed-down version of ``StringIO`` that gathers all strings into
+a list and uses ``u''.join(elements)`` to produce the final output
+-- it's markedly faster than ``StringIO``.
+
+.. _unicode_disabled:
+
+Saying to Heck with It: Disabling the Usage of Unicode Entirely
+===============================================================
+
+Some segments of Mako's userbase choose to make no usage of
+Unicode whatsoever, and instead would prefer the "pass through"
+approach; all string expressions in their templates return
+encoded byte-strings, and they would like these strings to pass
+right through. The only advantage to this approach is that
+templates need not use ``u""`` for literal strings; there's an
+arguable speed improvement as well since raw byte-strings
+generally perform slightly faster than unicode objects in
+Python. For these users, assuming they're sticking with Python
+2, they can hit the ``disable_unicode=True`` flag as so:
+
+.. sourcecode:: python
+
+    # -*- encoding:utf-8 -*-
+    from mako.template import Template
+
+    t = Template("dr?le de petite voix m?a r?veill?.", disable_unicode=True, input_encoding='utf-8')
+    print t.code
+
+The ``disable_unicode`` mode is strictly a Python 2 thing. It is
+not supported at all in Python 3.
+
+The generated module source code will contain elements like
+these:
+
+.. sourcecode:: python
+
+    # -*- encoding:utf-8 -*-
+    #  ...more generated code ...
+
+    def render_body(context,**pageargs):
+        context.caller_stack.push_frame()
+        try:
+            __M_locals = dict(pageargs=pageargs)
+            # SOURCE LINE 1
+            context.write('dr\xc3\xb4le de petite voix m\xe2\x80\x99a r\xc3\xa9veill\xc3\xa9.')
+            return ''
+        finally:
+            context.caller_stack.pop_frame()
+
+Where above that the string literal used within :meth:`.Context.write`
+is a regular byte-string.
+
+When ``disable_unicode=True`` is turned on, the ``default_filters``
+argument which normally defaults to ``["unicode"]`` now defaults
+to ``["str"]`` instead. Setting ``default_filters`` to the empty list
+``[]`` can remove the overhead of the ``str`` call. Also, in this
+mode you **cannot** safely call :meth:`~.Template.render_unicode` -- you'll get
+unicode/decode errors.
+
+The ``h`` filter (HTML escape) uses a less performant pure Python
+escape function in non-unicode mode. This because
+MarkupSafe only supports Python unicode objects for non-ASCII
+strings.
+
+.. versionchanged:: 0.3.4
+   In prior versions, it used ``cgi.escape()``, which has been replaced
+   with a function that also escapes single quotes.
+
+Rules for using ``disable_unicode=True``
+----------------------------------------
+
+* Don't use this mode unless you really, really want to and you
+  absolutely understand what you're doing.
+* Don't use this option just because you don't want to learn to
+  use Unicode properly; we aren't supporting user issues in this
+  mode of operation. We will however offer generous help for the
+  vast majority of users who stick to the Unicode program.
+* Python 3 is unicode by default, and the flag is not available
+  when running on Python 3.
+
diff --git a/lib/mako-0.7.2/doc/_sources/usage.txt b/lib/mako-0.7.2/doc/_sources/usage.txt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_sources/usage.txt
@@ -0,0 +1,520 @@
+.. _usage_toplevel:
+
+=====
+Usage
+=====
+
+Basic Usage
+===========
+
+This section describes the Python API for Mako templates. If you
+are using Mako within a web framework such as Pylons, the work
+of integrating Mako's API is already done for you, in which case
+you can skip to the next section, :ref:`syntax_toplevel`.
+
+The most basic way to create a template and render it is through
+the :class:`.Template` class:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template("hello world!")
+    print mytemplate.render()
+
+Above, the text argument to :class:`.Template` is **compiled** into a
+Python module representation. This module contains a function
+called ``render_body()``, which produces the output of the
+template. When ``mytemplate.render()`` is called, Mako sets up a
+runtime environment for the template and calls the
+``render_body()`` function, capturing the output into a buffer and
+returning its string contents.
+
+
+The code inside the ``render_body()`` function has access to a
+namespace of variables. You can specify these variables by
+sending them as additional keyword arguments to the :meth:`~.Template.render`
+method:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template("hello, ${name}!")
+    print mytemplate.render(name="jack")
+
+The :meth:`~.Template.render` method calls upon Mako to create a
+:class:`.Context` object, which stores all the variable names accessible
+to the template and also stores a buffer used to capture output.
+You can create this :class:`.Context` yourself and have the template
+render with it, using the :meth:`~.Template.render_context` method:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.runtime import Context
+    from StringIO import StringIO
+
+    mytemplate = Template("hello, ${name}!")
+    buf = StringIO()
+    ctx = Context(buf, name="jack")
+    mytemplate.render_context(ctx)
+    print buf.getvalue()
+
+Using File-Based Templates
+==========================
+
+A :class:`.Template` can also load its template source code from a file,
+using the ``filename`` keyword argument:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template(filename='/docs/mytmpl.txt')
+    print mytemplate.render()
+
+For improved performance, a :class:`.Template` which is loaded from a
+file can also cache the source code to its generated module on
+the filesystem as a regular Python module file (i.e. a ``.py``
+file). To do this, just add the ``module_directory`` argument to
+the template:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template(filename='/docs/mytmpl.txt', module_directory='/tmp/mako_modules')
+    print mytemplate.render()
+
+When the above code is rendered, a file
+``/tmp/mako_modules/docs/mytmpl.txt.py`` is created containing the
+source code for the module. The next time a :class:`.Template` with the
+same arguments is created, this module file will be
+automatically re-used.
+
+.. _usage_templatelookup:
+
+Using ``TemplateLookup``
+========================
+
+All of the examples thus far have dealt with the usage of a
+single :class:`.Template` object. If the code within those templates
+tries to locate another template resource, it will need some way
+to find them, using simple URI strings. For this need, the
+resolution of other templates from within a template is
+accomplished by the :class:`.TemplateLookup` class. This class is
+constructed given a list of directories in which to search for
+templates, as well as keyword arguments that will be passed to
+the :class:`.Template` objects it creates:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'])
+    mytemplate = Template("""<%include file="header.txt"/> hello world!""", lookup=mylookup)
+
+Above, we created a textual template which includes the file
+``"header.txt"``. In order for it to have somewhere to look for
+``"header.txt"``, we passed a :class:`.TemplateLookup` object to it, which
+will search in the directory ``/docs`` for the file ``"header.txt"``.
+
+Usually, an application will store most or all of its templates
+as text files on the filesystem. So far, all of our examples
+have been a little bit contrived in order to illustrate the
+basic concepts. But a real application would get most or all of
+its templates directly from the :class:`.TemplateLookup`, using the
+aptly named :meth:`~.TemplateLookup.get_template` method, which accepts the URI of the
+desired template:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'], module_directory='/tmp/mako_modules')
+
+    def serve_template(templatename, **kwargs):
+        mytemplate = mylookup.get_template(templatename)
+        print mytemplate.render(**kwargs)
+
+In the example above, we create a :class:`.TemplateLookup` which will
+look for templates in the ``/docs`` directory, and will store
+generated module files in the ``/tmp/mako_modules`` directory. The
+lookup locates templates by appending the given URI to each of
+its search directories; so if you gave it a URI of
+``/etc/beans/info.txt``, it would search for the file
+``/docs/etc/beans/info.txt``, else raise a :class:`.TopLevelNotFound`
+exception, which is a custom Mako exception.
+
+When the lookup locates templates, it will also assign a ``uri``
+property to the :class:`.Template` which is the URI passed to the
+:meth:`~.TemplateLookup.get_template()` call. :class:`.Template` uses this URI to calculate the
+name of its module file. So in the above example, a
+``templatename`` argument of ``/etc/beans/info.txt`` will create a
+module file ``/tmp/mako_modules/etc/beans/info.txt.py``.
+
+Setting the Collection Size
+---------------------------
+
+The :class:`.TemplateLookup` also serves the important need of caching a
+fixed set of templates in memory at a given time, so that
+successive URI lookups do not result in full template
+compilations and/or module reloads on each request. By default,
+the :class:`.TemplateLookup` size is unbounded. You can specify a fixed
+size using the ``collection_size`` argument:
+
+.. sourcecode:: python
+
+    mylookup = TemplateLookup(directories=['/docs'],
+                    module_directory='/tmp/mako_modules', collection_size=500)
+
+The above lookup will continue to load templates into memory
+until it reaches a count of around 500. At that point, it will
+clean out a certain percentage of templates using a least
+recently used scheme.
+
+Setting Filesystem Checks
+-------------------------
+
+Another important flag on :class:`.TemplateLookup` is
+``filesystem_checks``. This defaults to ``True``, and says that each
+time a template is returned by the :meth:`~.TemplateLookup.get_template()` method, the
+revision time of the original template file is checked against
+the last time the template was loaded, and if the file is newer
+will reload its contents and recompile the template. On a
+production system, setting ``filesystem_checks`` to ``False`` can
+afford a small to moderate performance increase (depending on
+the type of filesystem used).
+
+.. _usage_unicode:
+
+Using Unicode and Encoding
+==========================
+
+Both :class:`.Template` and :class:`.TemplateLookup` accept ``output_encoding``
+and ``encoding_errors`` parameters which can be used to encode the
+output in any Python supported codec:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'], output_encoding='utf-8', encoding_errors='replace')
+
+    mytemplate = mylookup.get_template("foo.txt")
+    print mytemplate.render()
+
+When using Python 3, the :meth:`~.Template.render` method will return a ``bytes``
+object, **if** ``output_encoding`` is set. Otherwise it returns a
+``string``.
+
+Additionally, the :meth:`~.Template.render_unicode()` method exists which will
+return the template output as a Python ``unicode`` object, or in
+Python 3 a ``string``:
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode()
+
+The above method disregards the output encoding keyword
+argument; you can encode yourself by saying:
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode().encode('utf-8', 'replace')
+
+Note that Mako's ability to return data in any encoding and/or
+``unicode`` implies that the underlying output stream of the
+template is a Python unicode object. This behavior is described
+fully in :ref:`unicode_toplevel`.
+
+.. _handling_exceptions:
+
+Handling Exceptions
+===================
+
+Template exceptions can occur in two distinct places. One is
+when you **lookup, parse and compile** the template, the other
+is when you **run** the template. Within the running of a
+template, exceptions are thrown normally from whatever Python
+code originated the issue. Mako has its own set of exception
+classes which mostly apply to the lookup and lexer/compiler
+stages of template construction. Mako provides some library
+routines that can be used to help provide Mako-specific
+information about any exception's stack trace, as well as
+formatting the exception within textual or HTML format. In all
+cases, the main value of these handlers is that of converting
+Python filenames, line numbers, and code samples into Mako
+template filenames, line numbers, and code samples. All lines
+within a stack trace which correspond to a Mako template module
+will be converted to be against the originating template file.
+
+To format exception traces, the :func:`.text_error_template` and
+:func:`.html_error_template` functions are provided. They make usage of
+``sys.exc_info()`` to get at the most recently thrown exception.
+Usage of these handlers usually looks like:
+
+.. sourcecode:: python
+
+    from mako import exceptions
+
+    try:
+        template = lookup.get_template(uri)
+        print template.render()
+    except:
+        print exceptions.text_error_template().render()
+
+Or for the HTML render function:
+
+.. sourcecode:: python
+
+    from mako import exceptions
+
+    try:
+        template = lookup.get_template(uri)
+        print template.render()
+    except:
+        print exceptions.html_error_template().render()
+
+The :func:`.html_error_template` template accepts two options:
+specifying ``full=False`` causes only a section of an HTML
+document to be rendered. Specifying ``css=False`` will disable the
+default stylesheet from being rendered.
+
+E.g.:
+
+.. sourcecode:: python
+
+    print exceptions.html_error_template().render(full=False)
+
+The HTML render function is also available built-in to
+:class:`.Template` using the ``format_exceptions`` flag. In this case, any
+exceptions raised within the **render** stage of the template
+will result in the output being substituted with the output of
+:func:`.html_error_template`:
+
+.. sourcecode:: python
+
+    template = Template(filename="/foo/bar", format_exceptions=True)
+    print template.render()
+
+Note that the compile stage of the above template occurs when
+you construct the :class:`.Template` itself, and no output stream is
+defined. Therefore exceptions which occur within the
+lookup/parse/compile stage will not be handled and will
+propagate normally. While the pre-render traceback usually will
+not include any Mako-specific lines anyway, it will mean that
+exceptions which occur previous to rendering and those which
+occur within rendering will be handled differently... so the
+``try``/``except`` patterns described previously are probably of more
+general use.
+
+The underlying object used by the error template functions is
+the :class:`.RichTraceback` object. This object can also be used
+directly to provide custom error views. Here's an example usage
+which describes its general API:
+
+.. sourcecode:: python
+
+    from mako.exceptions import RichTraceback
+
+    try:
+        template = lookup.get_template(uri)
+        print template.render()
+    except:
+        traceback = RichTraceback()
+        for (filename, lineno, function, line) in traceback.traceback:
+            print "File %s, line %s, in %s" % (filename, lineno, function)
+            print line, "\n"
+        print "%s: %s" % (str(traceback.error.__class__.__name__), traceback.error)
+
+Common Framework Integrations
+=============================
+
+The Mako distribution includes a little bit of helper code for
+the purpose of using Mako in some popular web framework
+scenarios. This is a brief description of what's included.
+
+WSGI
+----
+
+A sample WSGI application is included in the distribution in the
+file ``examples/wsgi/run_wsgi.py``. This runner is set up to pull
+files from a `templates` as well as an `htdocs` directory and
+includes a rudimental two-file layout. The WSGI runner acts as a
+fully functional standalone web server, using ``wsgiutils`` to run
+itself, and propagates GET and POST arguments from the request
+into the :class:`.Context`, can serve images, CSS files and other kinds
+of files, and also displays errors using Mako's included
+exception-handling utilities.
+
+Pygments
+--------
+
+A `Pygments <http://pygments.pocoo.org>`_-compatible syntax
+highlighting module is included under :mod:`mako.ext.pygmentplugin`.
+This module is used in the generation of Mako documentation and
+also contains various `setuptools` entry points under the heading
+``pygments.lexers``, including ``mako``, ``html+mako``, ``xml+mako``
+(see the ``setup.py`` file for all the entry points).
+
+Babel
+-----
+
+Mako provides support for extracting `gettext` messages from
+templates via a `Babel`_ extractor
+entry point under ``mako.ext.babelplugin``.
+
+`Gettext` messages are extracted from all Python code sections,
+including those of control lines and expressions embedded
+in tags.
+
+`Translator
+comments <http://babel.edgewall.org/wiki/Documentation/messages.html#comments-tags-and-translator-comments-explanation>`_
+may also be extracted from Mako templates when a comment tag is
+specified to `Babel`_ (such as with
+the ``-c`` option).
+
+For example, a project ``"myproj"`` contains the following Mako
+template at ``myproj/myproj/templates/name.html``:
+
+.. sourcecode:: mako
+
+    <div id="name">
+      Name:
+      ## TRANSLATORS: This is a proper name. See the gettext
+      ## manual, section Names.
+      ${_('Francois Pinard')}
+    </div>
+
+To extract gettext messages from this template the project needs
+a Mako section in its `Babel Extraction Method Mapping
+file <http://babel.edgewall.org/wiki/Documentation/messages.html#extraction-method-mapping-and-configuration>`_
+(typically located at ``myproj/babel.cfg``):
+
+.. sourcecode:: cfg
+
+    # Extraction from Python source files
+
+    [python: myproj/**.py]
+
+    # Extraction from Mako templates
+
+    [mako: myproj/templates/**.html]
+    input_encoding = utf-8
+
+The Mako extractor supports an optional ``input_encoding``
+parameter specifying the encoding of the templates (identical to
+:class:`.Template`/:class:`.TemplateLookup`'s ``input_encoding`` parameter).
+
+Invoking `Babel`_'s extractor at the
+command line in the project's root directory:
+
+.. sourcecode:: sh
+
+    myproj$ pybabel extract -F babel.cfg -c "TRANSLATORS:" .
+
+will output a `gettext` catalog to `stdout` including the following:
+
+.. sourcecode:: pot
+
+    #. TRANSLATORS: This is a proper name. See the gettext
+    #. manual, section Names.
+    #: myproj/templates/name.html:5
+    msgid "Francois Pinard"
+    msgstr ""
+
+This is only a basic example:
+`Babel`_ can be invoked from ``setup.py``
+and its command line options specified in the accompanying
+``setup.cfg`` via `Babel Distutils/Setuptools
+Integration <http://babel.edgewall.org/wiki/Documentation/setup.html>`_.
+
+Comments must immediately precede a `gettext` message to be
+extracted. In the following case the ``TRANSLATORS:`` comment would
+not have been extracted:
+
+.. sourcecode:: mako
+
+    <div id="name">
+      ## TRANSLATORS: This is a proper name. See the gettext
+      ## manual, section Names.
+      Name: ${_('Francois Pinard')}
+    </div>
+
+See the `Babel User
+Guide <http://babel.edgewall.org/wiki/Documentation/index.html>`_
+for more information.
+
+.. _babel: http://babel.edgewall.org/
+
+
+API Reference
+=============
+
+.. autoclass:: mako.template.Template
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.template.DefTemplate
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.lookup.TemplateCollection
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.lookup.TemplateLookup
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.exceptions.RichTraceback
+    :show-inheritance:
+
+    .. py:attribute:: error
+
+       the exception instance.
+
+    .. py:attribute:: message
+
+       the exception error message as unicode.
+
+    .. py:attribute:: source
+
+       source code of the file where the error occurred.
+       If the error occurred within a compiled template,
+       this is the template source.
+
+    .. py:attribute:: lineno
+
+       line number where the error occurred.  If the error
+       occurred within a compiled template, the line number
+       is adjusted to that of the template source.
+
+    .. py:attribute:: records
+
+       a list of 8-tuples containing the original
+       python traceback elements, plus the
+       filename, line number, source line, and full template source
+       for the traceline mapped back to its originating source
+       template, if any for that traceline (else the fields are ``None``).
+
+    .. py:attribute:: reverse_records
+
+       the list of records in reverse
+       traceback -- a list of 4-tuples, in the same format as a regular
+       python traceback, with template-corresponding
+       traceback records replacing the originals.
+
+    .. py:attribute:: reverse_traceback
+
+       the traceback list in reverse.
+
+.. autofunction:: mako.exceptions.html_error_template
+
+.. autofunction:: mako.exceptions.text_error_template
+
diff --git a/lib/mako-0.7.2/doc/_static/basic.css b/lib/mako-0.7.2/doc/_static/basic.css
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/basic.css
@@ -0,0 +1,540 @@
+/*
+ * basic.css
+ * ~~~~~~~~~
+ *
+ * Sphinx stylesheet -- basic theme.
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/* -- main layout ----------------------------------------------------------- */
+
+div.clearer {
+    clear: both;
+}
+
+/* -- relbar ---------------------------------------------------------------- */
+
+div.related {
+    width: 100%;
+    font-size: 90%;
+}
+
+div.related h3 {
+    display: none;
+}
+
+div.related ul {
+    margin: 0;
+    padding: 0 0 0 10px;
+    list-style: none;
+}
+
+div.related li {
+    display: inline;
+}
+
+div.related li.right {
+    float: right;
+    margin-right: 5px;
+}
+
+/* -- sidebar --------------------------------------------------------------- */
+
+div.sphinxsidebarwrapper {
+    padding: 10px 5px 0 10px;
+}
+
+div.sphinxsidebar {
+    float: left;
+    width: 230px;
+    margin-left: -100%;
+    font-size: 90%;
+}
+
+div.sphinxsidebar ul {
+    list-style: none;
+}
+
+div.sphinxsidebar ul ul,
+div.sphinxsidebar ul.want-points {
+    margin-left: 20px;
+    list-style: square;
+}
+
+div.sphinxsidebar ul ul {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+div.sphinxsidebar form {
+    margin-top: 10px;
+}
+
+div.sphinxsidebar input {
+    border: 1px solid #98dbcc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar #searchbox input[type="text"] {
+    width: 170px;
+}
+
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width: 30px;
+}
+
+img {
+    border: 0;
+}
+
+/* -- search page ----------------------------------------------------------- */
+
+ul.search {
+    margin: 10px 0 0 20px;
+    padding: 0;
+}
+
+ul.search li {
+    padding: 5px 0 5px 20px;
+    background-image: url(file.png);
+    background-repeat: no-repeat;
+    background-position: 0 7px;
+}
+
+ul.search li a {
+    font-weight: bold;
+}
+
+ul.search li div.context {
+    color: #888;
+    margin: 2px 0 0 30px;
+    text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+    font-weight: bold;
+}
+
+/* -- index page ------------------------------------------------------------ */
+
+table.contentstable {
+    width: 90%;
+}
+
+table.contentstable p.biglink {
+    line-height: 150%;
+}
+
+a.biglink {
+    font-size: 1.3em;
+}
+
+span.linkdescr {
+    font-style: italic;
+    padding-top: 5px;
+    font-size: 90%;
+}
+
+/* -- general index --------------------------------------------------------- */
+
+table.indextable {
+    width: 100%;
+}
+
+table.indextable td {
+    text-align: left;
+    vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+    height: 10px;
+}
+
+table.indextable tr.cap {
+    margin-top: 10px;
+    background-color: #f2f2f2;
+}
+
+img.toggler {
+    margin-right: 3px;
+    margin-top: 3px;
+    cursor: pointer;
+}
+
+div.modindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+div.genindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+/* -- general body styles --------------------------------------------------- */
+
+a.headerlink {
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+    visibility: visible;
+}
+
+div.body p.caption {
+    text-align: inherit;
+}
+
+div.body td {
+    text-align: left;
+}
+
+.field-list ul {
+    padding-left: 1em;
+}
+
+.first {
+    margin-top: 0 !important;
+}
+
+p.rubric {
+    margin-top: 30px;
+    font-weight: bold;
+}
+
+img.align-left, .figure.align-left, object.align-left {
+    clear: left;
+    float: left;
+    margin-right: 1em;
+}
+
+img.align-right, .figure.align-right, object.align-right {
+    clear: right;
+    float: right;
+    margin-left: 1em;
+}
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+    text-align: left;
+}
+
+.align-center {
+    text-align: center;
+}
+
+.align-right {
+    text-align: right;
+}
+
+/* -- sidebars -------------------------------------------------------------- */
+
+div.sidebar {
+    margin: 0 0 0.5em 1em;
+    border: 1px solid #ddb;
+    padding: 7px 7px 0 7px;
+    background-color: #ffe;
+    width: 40%;
+    float: right;
+}
+
+p.sidebar-title {
+    font-weight: bold;
+}
+
+/* -- topics ---------------------------------------------------------------- */
+
+div.topic {
+    border: 1px solid #ccc;
+    padding: 7px 7px 0 7px;
+    margin: 10px 0 10px 0;
+}
+
+p.topic-title {
+    font-size: 1.1em;
+    font-weight: bold;
+    margin-top: 10px;
+}
+
+/* -- admonitions ----------------------------------------------------------- */
+
+div.admonition {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    padding: 7px;
+}
+
+div.admonition dt {
+    font-weight: bold;
+}
+
+div.admonition dl {
+    margin-bottom: 0;
+}
+
+p.admonition-title {
+    margin: 0px 10px 5px 0px;
+    font-weight: bold;
+}
+
+div.body p.centered {
+    text-align: center;
+    margin-top: 25px;
+}
+
+/* -- tables ---------------------------------------------------------------- */
+
+table.docutils {
+    border: 0;
+    border-collapse: collapse;
+}
+
+table.docutils td, table.docutils th {
+    padding: 1px 8px 1px 5px;
+    border-top: 0;
+    border-left: 0;
+    border-right: 0;
+    border-bottom: 1px solid #aaa;
+}
+
+table.field-list td, table.field-list th {
+    border: 0 !important;
+}
+
+table.footnote td, table.footnote th {
+    border: 0 !important;
+}
+
+th {
+    text-align: left;
+    padding-right: 5px;
+}
+
+table.citation {
+    border-left: solid 1px gray;
+    margin-left: 1px;
+}
+
+table.citation td {
+    border-bottom: none;
+}
+
+/* -- other body styles ----------------------------------------------------- */
+
+ol.arabic {
+    list-style: decimal;
+}
+
+ol.loweralpha {
+    list-style: lower-alpha;
+}
+
+ol.upperalpha {
+    list-style: upper-alpha;
+}
+
+ol.lowerroman {
+    list-style: lower-roman;
+}
+
+ol.upperroman {
+    list-style: upper-roman;
+}
+
+dl {
+    margin-bottom: 15px;
+}
+
+dd p {
+    margin-top: 0px;
+}
+
+dd ul, dd table {
+    margin-bottom: 10px;
+}
+
+dd {
+    margin-top: 3px;
+    margin-bottom: 10px;
+    margin-left: 30px;
+}
+
+dt:target, .highlighted {
+    background-color: #fbe54e;
+}
+
+dl.glossary dt {
+    font-weight: bold;
+    font-size: 1.1em;
+}
+
+.field-list ul {
+    margin: 0;
+    padding-left: 1em;
+}
+
+.field-list p {
+    margin: 0;
+}
+
+.refcount {
+    color: #060;
+}
+
+.optional {
+    font-size: 1.3em;
+}
+
+.versionmodified {
+    font-style: italic;
+}
+
+.system-message {
+    background-color: #fda;
+    padding: 5px;
+    border: 3px solid red;
+}
+
+.footnote:target  {
+    background-color: #ffa;
+}
+
+.line-block {
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+.line-block .line-block {
+    margin-top: 0;
+    margin-bottom: 0;
+    margin-left: 1.5em;
+}
+
+.guilabel, .menuselection {
+    font-family: sans-serif;
+}
+
+.accelerator {
+    text-decoration: underline;
+}
+
+.classifier {
+    font-style: oblique;
+}
+
+abbr, acronym {
+    border-bottom: dotted 1px;
+    cursor: help;
+}
+
+/* -- code displays --------------------------------------------------------- */
+
+pre {
+    overflow: auto;
+    overflow-y: hidden;  /* fixes display issues on Chrome browsers */
+}
+
+td.linenos pre {
+    padding: 5px 0px;
+    border: 0;
+    background-color: transparent;
+    color: #aaa;
+}
+
+table.highlighttable {
+    margin-left: 0.5em;
+}
+
+table.highlighttable td {
+    padding: 0 0.5em 0 0.5em;
+}
+
+tt.descname {
+    background-color: transparent;
+    font-weight: bold;
+    font-size: 1.2em;
+}
+
+tt.descclassname {
+    background-color: transparent;
+}
+
+tt.xref, a tt {
+    background-color: transparent;
+    font-weight: bold;
+}
+
+h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+    background-color: transparent;
+}
+
+.viewcode-link {
+    float: right;
+}
+
+.viewcode-back {
+    float: right;
+    font-family: sans-serif;
+}
+
+div.viewcode-block:target {
+    margin: -1px -10px;
+    padding: 0 10px;
+}
+
+/* -- math display ---------------------------------------------------------- */
+
+img.math {
+    vertical-align: middle;
+}
+
+div.body div.math p {
+    text-align: center;
+}
+
+span.eqno {
+    float: right;
+}
+
+/* -- printout stylesheet --------------------------------------------------- */
+
+ at media print {
+    div.document,
+    div.documentwrapper,
+    div.bodywrapper {
+        margin: 0 !important;
+        width: 100%;
+    }
+
+    div.sphinxsidebar,
+    div.related,
+    div.footer,
+    #top-link {
+        display: none;
+    }
+}
\ No newline at end of file
diff --git a/lib/mako-0.7.2/doc/_static/comment-bright.png b/lib/mako-0.7.2/doc/_static/comment-bright.png
new file mode 100644
index 0000000000000000000000000000000000000000..551517b8c83b76f734ff791f847829a760ad1903
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/comment-close.png b/lib/mako-0.7.2/doc/_static/comment-close.png
new file mode 100644
index 0000000000000000000000000000000000000000..09b54be46da3f0d4a5061da289dc91d8a2cdbc9c
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/comment.png b/lib/mako-0.7.2/doc/_static/comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..92feb52b8824c6b0f59b658b1196c61de9162a95
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/default.css b/lib/mako-0.7.2/doc/_static/default.css
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/default.css
@@ -0,0 +1,256 @@
+/*
+ * default.css_t
+ * ~~~~~~~~~~~~~
+ *
+ * Sphinx stylesheet -- default theme.
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+ at import url("basic.css");
+
+/* -- page layout ----------------------------------------------------------- */
+
+body {
+    font-family: sans-serif;
+    font-size: 100%;
+    background-color: #11303d;
+    color: #000;
+    margin: 0;
+    padding: 0;
+}
+
+div.document {
+    background-color: #1c4e63;
+}
+
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 230px;
+}
+
+div.body {
+    background-color: #ffffff;
+    color: #000000;
+    padding: 0 20px 30px 20px;
+}
+
+div.footer {
+    color: #ffffff;
+    width: 100%;
+    padding: 9px 0 9px 0;
+    text-align: center;
+    font-size: 75%;
+}
+
+div.footer a {
+    color: #ffffff;
+    text-decoration: underline;
+}
+
+div.related {
+    background-color: #133f52;
+    line-height: 30px;
+    color: #ffffff;
+}
+
+div.related a {
+    color: #ffffff;
+}
+
+div.sphinxsidebar {
+}
+
+div.sphinxsidebar h3 {
+    font-family: 'Trebuchet MS', sans-serif;
+    color: #ffffff;
+    font-size: 1.4em;
+    font-weight: normal;
+    margin: 0;
+    padding: 0;
+}
+
+div.sphinxsidebar h3 a {
+    color: #ffffff;
+}
+
+div.sphinxsidebar h4 {
+    font-family: 'Trebuchet MS', sans-serif;
+    color: #ffffff;
+    font-size: 1.3em;
+    font-weight: normal;
+    margin: 5px 0 0 0;
+    padding: 0;
+}
+
+div.sphinxsidebar p {
+    color: #ffffff;
+}
+
+div.sphinxsidebar p.topless {
+    margin: 5px 10px 10px 10px;
+}
+
+div.sphinxsidebar ul {
+    margin: 10px;
+    padding: 0;
+    color: #ffffff;
+}
+
+div.sphinxsidebar a {
+    color: #98dbcc;
+}
+
+div.sphinxsidebar input {
+    border: 1px solid #98dbcc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+
+
+/* -- hyperlink styles ------------------------------------------------------ */
+
+a {
+    color: #355f7c;
+    text-decoration: none;
+}
+
+a:visited {
+    color: #355f7c;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+
+
+/* -- body styles ----------------------------------------------------------- */
+
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: 'Trebuchet MS', sans-serif;
+    background-color: #f2f2f2;
+    font-weight: normal;
+    color: #20435c;
+    border-bottom: 1px solid #ccc;
+    margin: 20px -20px 10px -20px;
+    padding: 3px 0 3px 10px;
+}
+
+div.body h1 { margin-top: 0; font-size: 200%; }
+div.body h2 { font-size: 160%; }
+div.body h3 { font-size: 140%; }
+div.body h4 { font-size: 120%; }
+div.body h5 { font-size: 110%; }
+div.body h6 { font-size: 100%; }
+
+a.headerlink {
+    color: #c60f0f;
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+}
+
+a.headerlink:hover {
+    background-color: #c60f0f;
+    color: white;
+}
+
+div.body p, div.body dd, div.body li {
+    text-align: justify;
+    line-height: 130%;
+}
+
+div.admonition p.admonition-title + p {
+    display: inline;
+}
+
+div.admonition p {
+    margin-bottom: 5px;
+}
+
+div.admonition pre {
+    margin-bottom: 5px;
+}
+
+div.admonition ul, div.admonition ol {
+    margin-bottom: 5px;
+}
+
+div.note {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+
+div.topic {
+    background-color: #eee;
+}
+
+div.warning {
+    background-color: #ffe4e4;
+    border: 1px solid #f66;
+}
+
+p.admonition-title {
+    display: inline;
+}
+
+p.admonition-title:after {
+    content: ":";
+}
+
+pre {
+    padding: 5px;
+    background-color: #eeffcc;
+    color: #333333;
+    line-height: 120%;
+    border: 1px solid #ac9;
+    border-left: none;
+    border-right: none;
+}
+
+tt {
+    background-color: #ecf0f3;
+    padding: 0 1px 0 1px;
+    font-size: 0.95em;
+}
+
+th {
+    background-color: #ede;
+}
+
+.warning tt {
+    background: #efc2c2;
+}
+
+.note tt {
+    background: #d6d6d6;
+}
+
+.viewcode-back {
+    font-family: sans-serif;
+}
+
+div.viewcode-block:target {
+    background-color: #f4debf;
+    border-top: 1px solid #ac9;
+    border-bottom: 1px solid #ac9;
+}
\ No newline at end of file
diff --git a/lib/mako-0.7.2/doc/_static/docs.css b/lib/mako-0.7.2/doc/_static/docs.css
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/docs.css
@@ -0,0 +1,438 @@
+/* global */
+
+body {
+  background-color: #FDFBFC;
+  margin:38px;
+  color:#333333;
+}
+
+a {
+    font-weight:normal; 
+    text-decoration:none;
+}
+
+form {
+    display:inline;
+}
+
+/* hyperlinks */
+
+a:link, a:visited, a:active {
+    color:#0000FF;
+}
+a:hover {
+    color:#700000;
+    text-decoration:underline;
+}
+
+/* paragraph links after sections.
+   These aren't visible until hovering
+   over the <h> tag, then have a 
+   "reverse video" effect over the actual
+   link
+ */
+
+a.headerlink {
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+    visibility: visible;
+}
+
+a.headerlink:hover {
+    background-color: #990000;
+    color: white;
+}
+
+
+/* Container setup */
+
+#docs-container {
+  max-width:1000px;
+}
+
+
+/* header/footer elements */
+
+#docs-header h1 {
+    font-size:20px;
+    color: #222222;
+    margin: 0;
+    padding: 0;
+}
+
+#docs-header {
+  font-family:Tahoma, Geneva,sans-serif;
+
+  font-size:.9em;
+
+}
+
+#docs-top-navigation,
+#docs-bottom-navigation {
+  font-family: Tahoma, Geneva, sans-serif;
+  background-color: #EEE;
+  border: solid 1px #CCC;
+  padding:10px;
+  font-size:.9em;
+}
+
+#docs-top-navigation {
+  margin:10px 0px 10px 0px;
+  line-height:1.2em;
+}
+
+.docs-navigation-links {
+  font-family:Tahoma, Geneva,sans-serif;
+}
+
+#docs-bottom-navigation {
+    float:right;
+    margin: 1em 0 1em 5px;
+}
+
+#docs-copyright {
+    font-size:.85em;
+    padding:5px 0px;
+}
+
+#docs-header h1,
+#docs-top-navigation h1,
+#docs-top-navigation h2 {
+  font-family:Tahoma,Geneva,sans-serif;
+  font-weight:normal;
+}
+
+#docs-top-navigation h2 {
+    margin:16px 4px 7px 5px;
+    font-size:2em;
+}
+
+#docs-search {
+    float:right;
+}
+
+#docs-top-page-control {
+  float:right;
+  width:350px;
+}
+
+#docs-top-page-control ul {
+  padding:0;
+  margin:0;
+}
+
+#docs-top-page-control li {
+    list-style-type:none;
+    padding:1px 8px;
+}
+
+
+#docs-container .version-num {
+    font-weight: bold;
+}
+
+
+/* content container, sidebar */
+
+#docs-body-container {
+  background-color:#EFEFEF;
+  border: solid 1px #CCC;
+
+}
+
+#docs-body,
+#docs-sidebar
+ {
+  /*font-family: helvetica, arial, sans-serif;
+  font-size:.9em;*/
+
+  font-family: Tahoma, Geneva, sans-serif;
+  /*font-size:.85em;*/
+  line-height:1.5em;
+
+}
+
+#docs-sidebar > ul {
+  font-size:.9em;
+}
+
+#docs-sidebar {
+  float:left;
+  width:212px;
+  padding: 10px 0 0 15px;
+  /*font-size:.85em;*/
+}
+
+#docs-sidebar h3, #docs-sidebar h4 {
+    background-color: #DDDDDD;
+    color: #222222;
+    font-family: Tahoma, Geneva,sans-serif;
+    font-size: 1.1em;
+    font-weight: normal;
+    margin: 10px 0 0 -15px;
+    padding: 5px 10px 5px 10px;
+    text-shadow: 1px 1px 0 white;
+    width:210px;
+}
+
+#docs-sidebar h3 a, #docs-sidebar h4 a {
+  color: #222222;
+}
+#docs-sidebar ul {
+  margin: 10px 10px 10px 0px;
+  padding: 0;
+  list-style: none outside none;
+}
+
+
+#docs-sidebar ul ul {
+    margin-bottom: 0;
+    margin-top: 0;
+    list-style: square outside none;
+    margin-left: 20px;
+}
+
+#docs-body {
+  background-color:#FFFFFF;
+  padding:1px 10px 10px 10px;
+}
+
+#docs-body.withsidebar {
+  margin: 0 0 0 230px;
+  border-left:3px solid #DFDFDF;
+}
+
+#docs-body h1,
+#docs-body h2,
+#docs-body h3,
+#docs-body h4 {
+  font-family:Tahoma, Geneva, sans-serif;
+}
+
+#docs-body h1 {
+  /* hide the <h1> for each content section. */
+  display:none;
+  font-size:1.8em;
+}
+
+#docs-body h2 {
+  font-size:1.6em;
+}
+
+#docs-body h3 {
+  font-size:1.4em;
+}
+
+/* SQL popup, code styles */
+
+.highlight {
+  background:none;
+}
+
+#docs-container pre {
+  font-size:1.2em;
+}
+
+#docs-container .pre {
+  font-size:1.1em;
+}
+
+#docs-container pre {
+  background-color: #f0f0f0;  
+  border: solid 1px #ccc;
+  box-shadow: 2px 2px 3px #DFDFDF;
+  padding:10px;
+  margin: 5px 0px 5px 0px;
+  overflow:auto;
+  line-height:1.3em;
+}
+
+.popup_sql, .show_sql
+{
+    background-color: #FBFBEE;
+    padding:5px 10px;
+    margin:10px -5px;
+    border:1px dashed;
+}
+
+/* the [SQL] links used to display SQL */
+#docs-container .sql_link
+{
+  font-weight:normal;
+  font-family: arial, sans-serif;
+  font-size:.9em;
+  text-transform: uppercase;
+  color:#990000;
+  border:1px solid;
+  padding:1px 2px 1px 2px;
+  margin:0px 10px 0px 15px;
+  float:right;
+  line-height:1.2em;
+}
+
+#docs-container a.sql_link, 
+#docs-container .sql_link
+{
+    text-decoration: none;
+    padding:1px 2px;
+}
+
+#docs-container a.sql_link:hover {
+    text-decoration: none;
+    color:#fff;
+    border:1px solid #900;
+    background-color: #900;
+}
+
+/* docutils-specific elements */
+
+th.field-name {
+    text-align:right;
+}
+
+div.note, div.warning, p.deprecated, div.topic  {
+    background-color:#EEFFEF;
+}
+
+
+div.admonition, div.topic, p.deprecated, p.versionadded, p.versionchanged {
+    border:1px solid #CCCCCC;
+    padding:5px 10px;
+    font-size:.9em;
+    box-shadow: 2px 2px 3px #DFDFDF;
+}
+
+div.warning .admonition-title {
+    color:#FF0000;
+}
+
+div.admonition .admonition-title, div.topic .topic-title {
+    font-weight:bold;
+}
+
+.viewcode-back, .viewcode-link {
+    float:right;
+}
+
+dl.function > dt,
+dl.attribute > dt,
+dl.classmethod > dt,
+dl.method > dt,
+dl.class > dt,
+dl.exception > dt
+{
+    background-color:#F0F0F0;
+    margin:25px -10px 10px 10px;
+    padding: 0px 10px;
+}
+
+p.versionadded span.versionmodified,
+p.versionchanged span.versionmodified,
+p.deprecated span.versionmodified {
+    background-color: #F0F0F0;
+    font-style: italic;
+}
+
+dt:target, span.highlight {
+    background-color:#FBE54E;
+}
+
+a.headerlink {
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+    visibility: visible;
+}
+
+a.headerlink:hover {
+    background-color: #00f;
+    color: white;
+}
+
+.clearboth {
+    clear:both;
+}
+
+tt.descname {
+    background-color:transparent;
+    font-size:1.2em;
+    font-weight:bold;
+}
+
+tt.descclassname {
+    background-color:transparent;
+}
+
+tt {
+    background-color:#ECF0F3;
+    padding:0 1px;
+}
+
+/* syntax highlighting overrides */
+.k, .kn {color:#0908CE;}
+.o {color:#BF0005;}
+.go {color:#804049;}
+
+
+/* special "index page" sections 
+   with specific formatting
+*/
+
+div#sqlalchemy-documentation {
+  font-size:.95em;
+}
+div#sqlalchemy-documentation em {
+  font-style:normal;
+}
+div#sqlalchemy-documentation .rubric{
+  font-size:14px;
+  background-color:#EEFFEF;
+  padding:5px;
+  border:1px solid #BFBFBF;
+}
+div#sqlalchemy-documentation a, div#sqlalchemy-documentation li {
+  padding:5px 0px;
+}
+
+div#getting-started {
+  border-bottom:1px solid;
+}
+
+div#sqlalchemy-documentation div#sqlalchemy-orm {
+  float:left;
+  width:48%;
+}
+
+div#sqlalchemy-documentation div#sqlalchemy-core {
+  float:left;
+  width:48%;
+  margin:0;
+  padding-left:10px;
+  border-left:1px solid;
+}
+
+div#dialect-documentation {
+  border-top:1px solid;
+  /*clear:left;*/
+}
diff --git a/lib/mako-0.7.2/doc/_static/doctools.js b/lib/mako-0.7.2/doc/_static/doctools.js
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/doctools.js
@@ -0,0 +1,247 @@
+/*
+ * doctools.js
+ * ~~~~~~~~~~~
+ *
+ * Sphinx JavaScript utilities for all documentation.
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/**
+ * select a different prefix for underscore
+ */
+$u = _.noConflict();
+
+/**
+ * make the code below compatible with browsers without
+ * an installed firebug like debugger
+if (!window.console || !console.firebug) {
+  var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
+    "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
+    "profile", "profileEnd"];
+  window.console = {};
+  for (var i = 0; i < names.length; ++i)
+    window.console[names[i]] = function() {};
+}
+ */
+
+/**
+ * small helper function to urldecode strings
+ */
+jQuery.urldecode = function(x) {
+  return decodeURIComponent(x).replace(/\+/g, ' ');
+}
+
+/**
+ * small helper function to urlencode strings
+ */
+jQuery.urlencode = encodeURIComponent;
+
+/**
+ * This function returns the parsed url parameters of the
+ * current request. Multiple values per key are supported,
+ * it will always return arrays of strings for the value parts.
+ */
+jQuery.getQueryParameters = function(s) {
+  if (typeof s == 'undefined')
+    s = document.location.search;
+  var parts = s.substr(s.indexOf('?') + 1).split('&');
+  var result = {};
+  for (var i = 0; i < parts.length; i++) {
+    var tmp = parts[i].split('=', 2);
+    var key = jQuery.urldecode(tmp[0]);
+    var value = jQuery.urldecode(tmp[1]);
+    if (key in result)
+      result[key].push(value);
+    else
+      result[key] = [value];
+  }
+  return result;
+};
+
+/**
+ * small function to check if an array contains
+ * a given item.
+ */
+jQuery.contains = function(arr, item) {
+  for (var i = 0; i < arr.length; i++) {
+    if (arr[i] == item)
+      return true;
+  }
+  return false;
+};
+
+/**
+ * highlight a given string on a jquery object by wrapping it in
+ * span elements with the given class name.
+ */
+jQuery.fn.highlightText = function(text, className) {
+  function highlight(node) {
+    if (node.nodeType == 3) {
+      var val = node.nodeValue;
+      var pos = val.toLowerCase().indexOf(text);
+      if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
+        var span = document.createElement("span");
+        span.className = className;
+        span.appendChild(document.createTextNode(val.substr(pos, text.length)));
+        node.parentNode.insertBefore(span, node.parentNode.insertBefore(
+          document.createTextNode(val.substr(pos + text.length)),
+          node.nextSibling));
+        node.nodeValue = val.substr(0, pos);
+      }
+    }
+    else if (!jQuery(node).is("button, select, textarea")) {
+      jQuery.each(node.childNodes, function() {
+        highlight(this);
+      });
+    }
+  }
+  return this.each(function() {
+    highlight(this);
+  });
+};
+
+/**
+ * Small JavaScript module for the documentation.
+ */
+var Documentation = {
+
+  init : function() {
+    this.fixFirefoxAnchorBug();
+    this.highlightSearchWords();
+    this.initIndexTable();
+  },
+
+  /**
+   * i18n support
+   */
+  TRANSLATIONS : {},
+  PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
+  LOCALE : 'unknown',
+
+  // gettext and ngettext don't access this so that the functions
+  // can safely bound to a different name (_ = Documentation.gettext)
+  gettext : function(string) {
+    var translated = Documentation.TRANSLATIONS[string];
+    if (typeof translated == 'undefined')
+      return string;
+    return (typeof translated == 'string') ? translated : translated[0];
+  },
+
+  ngettext : function(singular, plural, n) {
+    var translated = Documentation.TRANSLATIONS[singular];
+    if (typeof translated == 'undefined')
+      return (n == 1) ? singular : plural;
+    return translated[Documentation.PLURALEXPR(n)];
+  },
+
+  addTranslations : function(catalog) {
+    for (var key in catalog.messages)
+      this.TRANSLATIONS[key] = catalog.messages[key];
+    this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
+    this.LOCALE = catalog.locale;
+  },
+
+  /**
+   * add context elements like header anchor links
+   */
+  addContextElements : function() {
+    $('div[id] > :header:first').each(function() {
+      $('<a class="headerlink">\u00B6</a>').
+      attr('href', '#' + this.id).
+      attr('title', _('Permalink to this headline')).
+      appendTo(this);
+    });
+    $('dt[id]').each(function() {
+      $('<a class="headerlink">\u00B6</a>').
+      attr('href', '#' + this.id).
+      attr('title', _('Permalink to this definition')).
+      appendTo(this);
+    });
+  },
+
+  /**
+   * workaround a firefox stupidity
+   */
+  fixFirefoxAnchorBug : function() {
+    if (document.location.hash && $.browser.mozilla)
+      window.setTimeout(function() {
+        document.location.href += '';
+      }, 10);
+  },
+
+  /**
+   * highlight the search words provided in the url in the text
+   */
+  highlightSearchWords : function() {
+    var params = $.getQueryParameters();
+    var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
+    if (terms.length) {
+      var body = $('div.body');
+      window.setTimeout(function() {
+        $.each(terms, function() {
+          body.highlightText(this.toLowerCase(), 'highlighted');
+        });
+      }, 10);
+      $('<p class="highlight-link"><a href="javascript:Documentation.' +
+        'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
+          .appendTo($('#searchbox'));
+    }
+  },
+
+  /**
+   * init the domain index toggle buttons
+   */
+  initIndexTable : function() {
+    var togglers = $('img.toggler').click(function() {
+      var src = $(this).attr('src');
+      var idnum = $(this).attr('id').substr(7);
+      $('tr.cg-' + idnum).toggle();
+      if (src.substr(-9) == 'minus.png')
+        $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
+      else
+        $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
+    }).css('display', '');
+    if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
+        togglers.click();
+    }
+  },
+
+  /**
+   * helper function to hide the search marks again
+   */
+  hideSearchWords : function() {
+    $('#searchbox .highlight-link').fadeOut(300);
+    $('span.highlighted').removeClass('highlighted');
+  },
+
+  /**
+   * make the url absolute
+   */
+  makeURL : function(relativeURL) {
+    return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
+  },
+
+  /**
+   * get the current relative url
+   */
+  getCurrentURL : function() {
+    var path = document.location.pathname;
+    var parts = path.split(/\//);
+    $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
+      if (this == '..')
+        parts.pop();
+    });
+    var url = parts.join('/');
+    return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
+  }
+};
+
+// quick alias for translations
+_ = Documentation.gettext;
+
+$(document).ready(function() {
+  Documentation.init();
+});
diff --git a/lib/mako-0.7.2/doc/_static/down-pressed.png b/lib/mako-0.7.2/doc/_static/down-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7ad782782e4f8e39b0c6e15c7344700cdd2527
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/down.png b/lib/mako-0.7.2/doc/_static/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..3003a88770de3977d47a2ba69893436a2860f9e7
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/file.png b/lib/mako-0.7.2/doc/_static/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..d18082e397e7e54f20721af768c4c2983258f1b4
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/jquery.js b/lib/mako-0.7.2/doc/_static/jquery.js
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/jquery.js
@@ -0,0 +1,154 @@
+/*!
+ * jQuery JavaScript Library v1.4.2
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Sat Feb 13 22:33:48 2010 -0500
+ */
+(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
+e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
+j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
+"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
+true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
+Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
+(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
+a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
+"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
+function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
+c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
+L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
+"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
+d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
+a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
+!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
+true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
+parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
+false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
+s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
+applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
+else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
+a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
+w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
+cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
+i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
+" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
+this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
+e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
+c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
+a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
+function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
+k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
+C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
+null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
+e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
+f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
+if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
+"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
+a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
+isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
+{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
+if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
+e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
+"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
+d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
+!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
+toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
+u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
+function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
+if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
+t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
+g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
+for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
+1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
+CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
+relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
+l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
+h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
+CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
+g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
+text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
+setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
+h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
+m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
+"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
+h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
+!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
+h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
+q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
+if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
+(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
+function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
+gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
+c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
+{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
+"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
+d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
+a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
+1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
+a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
+""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
+this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
+u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
+1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
+return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
+""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
+c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
+c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
+function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
+Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
+"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
+a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
+a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
+"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
+serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
+function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
+global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
+e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
+"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
+false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
+false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
+c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
+d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
+g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
+1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
+"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
+if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
+this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
+"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
+animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
+j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
+this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
+"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
+c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
+this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
+this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
+e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
+c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
+function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
+this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
+k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
+f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
+c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
+d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
+f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
+"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
+e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/lib/mako-0.7.2/doc/_static/makoLogo.png b/lib/mako-0.7.2/doc/_static/makoLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c43c087eb48ebfc2223b76cf3df2fa7868c2a72b
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/minus.png b/lib/mako-0.7.2/doc/_static/minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..da1c5620d10c047525a467a425abe9ff5269cfc2
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/plus.png b/lib/mako-0.7.2/doc/_static/plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3cb37425ea68b39ffa7b2e5fb69161275a87541
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/pygments.css b/lib/mako-0.7.2/doc/_static/pygments.css
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/pygments.css
@@ -0,0 +1,62 @@
+.highlight .hll { background-color: #ffffcc }
+.highlight  { background: #eeffcc; }
+.highlight .c { color: #408090; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #007020; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #007020 } /* Comment.Preproc */
+.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #303030 } /* Generic.Output */
+.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #007020 } /* Keyword.Pseudo */
+.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #902000 } /* Keyword.Type */
+.highlight .m { color: #208050 } /* Literal.Number */
+.highlight .s { color: #4070a0 } /* Literal.String */
+.highlight .na { color: #4070a0 } /* Name.Attribute */
+.highlight .nb { color: #007020 } /* Name.Builtin */
+.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
+.highlight .no { color: #60add5 } /* Name.Constant */
+.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
+.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #007020 } /* Name.Exception */
+.highlight .nf { color: #06287e } /* Name.Function */
+.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
+.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #bb60d5 } /* Name.Variable */
+.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #208050 } /* Literal.Number.Float */
+.highlight .mh { color: #208050 } /* Literal.Number.Hex */
+.highlight .mi { color: #208050 } /* Literal.Number.Integer */
+.highlight .mo { color: #208050 } /* Literal.Number.Oct */
+.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
+.highlight .sc { color: #4070a0 } /* Literal.String.Char */
+.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
+.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
+.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
+.highlight .sx { color: #c65d09 } /* Literal.String.Other */
+.highlight .sr { color: #235388 } /* Literal.String.Regex */
+.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
+.highlight .ss { color: #517918 } /* Literal.String.Symbol */
+.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
+.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
+.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
+.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/lib/mako-0.7.2/doc/_static/searchtools.js b/lib/mako-0.7.2/doc/_static/searchtools.js
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/searchtools.js
@@ -0,0 +1,560 @@
+/*
+ * searchtools.js_t
+ * ~~~~~~~~~~~~~~~~
+ *
+ * Sphinx JavaScript utilties for the full-text search.
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/**
+ * helper function to return a node containing the
+ * search summary for a given text. keywords is a list
+ * of stemmed words, hlwords is the list of normal, unstemmed
+ * words. the first one is used to find the occurance, the
+ * latter for highlighting it.
+ */
+
+jQuery.makeSearchSummary = function(text, keywords, hlwords) {
+  var textLower = text.toLowerCase();
+  var start = 0;
+  $.each(keywords, function() {
+    var i = textLower.indexOf(this.toLowerCase());
+    if (i > -1)
+      start = i;
+  });
+  start = Math.max(start - 120, 0);
+  var excerpt = ((start > 0) ? '...' : '') +
+  $.trim(text.substr(start, 240)) +
+  ((start + 240 - text.length) ? '...' : '');
+  var rv = $('<div class="context"></div>').text(excerpt);
+  $.each(hlwords, function() {
+    rv = rv.highlightText(this, 'highlighted');
+  });
+  return rv;
+}
+
+
+/**
+ * Porter Stemmer
+ */
+var Stemmer = function() {
+
+  var step2list = {
+    ational: 'ate',
+    tional: 'tion',
+    enci: 'ence',
+    anci: 'ance',
+    izer: 'ize',
+    bli: 'ble',
+    alli: 'al',
+    entli: 'ent',
+    eli: 'e',
+    ousli: 'ous',
+    ization: 'ize',
+    ation: 'ate',
+    ator: 'ate',
+    alism: 'al',
+    iveness: 'ive',
+    fulness: 'ful',
+    ousness: 'ous',
+    aliti: 'al',
+    iviti: 'ive',
+    biliti: 'ble',
+    logi: 'log'
+  };
+
+  var step3list = {
+    icate: 'ic',
+    ative: '',
+    alize: 'al',
+    iciti: 'ic',
+    ical: 'ic',
+    ful: '',
+    ness: ''
+  };
+
+  var c = "[^aeiou]";          // consonant
+  var v = "[aeiouy]";          // vowel
+  var C = c + "[^aeiouy]*";    // consonant sequence
+  var V = v + "[aeiou]*";      // vowel sequence
+
+  var mgr0 = "^(" + C + ")?" + V + C;                      // [C]VC... is m>0
+  var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$";    // [C]VC[V] is m=1
+  var mgr1 = "^(" + C + ")?" + V + C + V + C;              // [C]VCVC... is m>1
+  var s_v   = "^(" + C + ")?" + v;                         // vowel in stem
+
+  this.stemWord = function (w) {
+    var stem;
+    var suffix;
+    var firstch;
+    var origword = w;
+
+    if (w.length < 3)
+      return w;
+
+    var re;
+    var re2;
+    var re3;
+    var re4;
+
+    firstch = w.substr(0,1);
+    if (firstch == "y")
+      w = firstch.toUpperCase() + w.substr(1);
+
+    // Step 1a
+    re = /^(.+?)(ss|i)es$/;
+    re2 = /^(.+?)([^s])s$/;
+
+    if (re.test(w))
+      w = w.replace(re,"$1$2");
+    else if (re2.test(w))
+      w = w.replace(re2,"$1$2");
+
+    // Step 1b
+    re = /^(.+?)eed$/;
+    re2 = /^(.+?)(ed|ing)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      re = new RegExp(mgr0);
+      if (re.test(fp[1])) {
+        re = /.$/;
+        w = w.replace(re,"");
+      }
+    }
+    else if (re2.test(w)) {
+      var fp = re2.exec(w);
+      stem = fp[1];
+      re2 = new RegExp(s_v);
+      if (re2.test(stem)) {
+        w = stem;
+        re2 = /(at|bl|iz)$/;
+        re3 = new RegExp("([^aeiouylsz])\\1$");
+        re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+        if (re2.test(w))
+          w = w + "e";
+        else if (re3.test(w)) {
+          re = /.$/;
+          w = w.replace(re,"");
+        }
+        else if (re4.test(w))
+          w = w + "e";
+      }
+    }
+
+    // Step 1c
+    re = /^(.+?)y$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      re = new RegExp(s_v);
+      if (re.test(stem))
+        w = stem + "i";
+    }
+
+    // Step 2
+    re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      suffix = fp[2];
+      re = new RegExp(mgr0);
+      if (re.test(stem))
+        w = stem + step2list[suffix];
+    }
+
+    // Step 3
+    re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      suffix = fp[2];
+      re = new RegExp(mgr0);
+      if (re.test(stem))
+        w = stem + step3list[suffix];
+    }
+
+    // Step 4
+    re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
+    re2 = /^(.+?)(s|t)(ion)$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      re = new RegExp(mgr1);
+      if (re.test(stem))
+        w = stem;
+    }
+    else if (re2.test(w)) {
+      var fp = re2.exec(w);
+      stem = fp[1] + fp[2];
+      re2 = new RegExp(mgr1);
+      if (re2.test(stem))
+        w = stem;
+    }
+
+    // Step 5
+    re = /^(.+?)e$/;
+    if (re.test(w)) {
+      var fp = re.exec(w);
+      stem = fp[1];
+      re = new RegExp(mgr1);
+      re2 = new RegExp(meq1);
+      re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+      if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
+        w = stem;
+    }
+    re = /ll$/;
+    re2 = new RegExp(mgr1);
+    if (re.test(w) && re2.test(w)) {
+      re = /.$/;
+      w = w.replace(re,"");
+    }
+
+    // and turn initial Y back to y
+    if (firstch == "y")
+      w = firstch.toLowerCase() + w.substr(1);
+    return w;
+  }
+}
+
+
+/**
+ * Search Module
+ */
+var Search = {
+
+  _index : null,
+  _queued_query : null,
+  _pulse_status : -1,
+
+  init : function() {
+      var params = $.getQueryParameters();
+      if (params.q) {
+          var query = params.q[0];
+          $('input[name="q"]')[0].value = query;
+          this.performSearch(query);
+      }
+  },
+
+  loadIndex : function(url) {
+    $.ajax({type: "GET", url: url, data: null, success: null,
+            dataType: "script", cache: true});
+  },
+
+  setIndex : function(index) {
+    var q;
+    this._index = index;
+    if ((q = this._queued_query) !== null) {
+      this._queued_query = null;
+      Search.query(q);
+    }
+  },
+
+  hasIndex : function() {
+      return this._index !== null;
+  },
+
+  deferQuery : function(query) {
+      this._queued_query = query;
+  },
+
+  stopPulse : function() {
+      this._pulse_status = 0;
+  },
+
+  startPulse : function() {
+    if (this._pulse_status >= 0)
+        return;
+    function pulse() {
+      Search._pulse_status = (Search._pulse_status + 1) % 4;
+      var dotString = '';
+      for (var i = 0; i < Search._pulse_status; i++)
+        dotString += '.';
+      Search.dots.text(dotString);
+      if (Search._pulse_status > -1)
+        window.setTimeout(pulse, 500);
+    };
+    pulse();
+  },
+
+  /**
+   * perform a search for something
+   */
+  performSearch : function(query) {
+    // create the required interface elements
+    this.out = $('#search-results');
+    this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
+    this.dots = $('<span></span>').appendTo(this.title);
+    this.status = $('<p style="display: none"></p>').appendTo(this.out);
+    this.output = $('<ul class="search"/>').appendTo(this.out);
+
+    $('#search-progress').text(_('Preparing search...'));
+    this.startPulse();
+
+    // index already loaded, the browser was quick!
+    if (this.hasIndex())
+      this.query(query);
+    else
+      this.deferQuery(query);
+  },
+
+  query : function(query) {
+    var stopwords = ["and","then","into","it","as","are","in","if","for","no","there","their","was","is","be","to","that","but","they","not","such","with","by","a","on","these","of","will","this","near","the","or","at"];
+
+    // Stem the searchterms and add them to the correct list
+    var stemmer = new Stemmer();
+    var searchterms = [];
+    var excluded = [];
+    var hlterms = [];
+    var tmp = query.split(/\s+/);
+    var objectterms = [];
+    for (var i = 0; i < tmp.length; i++) {
+      if (tmp[i] != "") {
+          objectterms.push(tmp[i].toLowerCase());
+      }
+
+      if ($u.indexOf(stopwords, tmp[i]) != -1 || tmp[i].match(/^\d+$/) ||
+          tmp[i] == "") {
+        // skip this "word"
+        continue;
+      }
+      // stem the word
+      var word = stemmer.stemWord(tmp[i]).toLowerCase();
+      // select the correct list
+      if (word[0] == '-') {
+        var toAppend = excluded;
+        word = word.substr(1);
+      }
+      else {
+        var toAppend = searchterms;
+        hlterms.push(tmp[i].toLowerCase());
+      }
+      // only add if not already in the list
+      if (!$.contains(toAppend, word))
+        toAppend.push(word);
+    };
+    var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
+
+    // console.debug('SEARCH: searching for:');
+    // console.info('required: ', searchterms);
+    // console.info('excluded: ', excluded);
+
+    // prepare search
+    var filenames = this._index.filenames;
+    var titles = this._index.titles;
+    var terms = this._index.terms;
+    var fileMap = {};
+    var files = null;
+    // different result priorities
+    var importantResults = [];
+    var objectResults = [];
+    var regularResults = [];
+    var unimportantResults = [];
+    $('#search-progress').empty();
+
+    // lookup as object
+    for (var i = 0; i < objectterms.length; i++) {
+      var others = [].concat(objectterms.slice(0,i),
+                             objectterms.slice(i+1, objectterms.length))
+      var results = this.performObjectSearch(objectterms[i], others);
+      // Assume first word is most likely to be the object,
+      // other words more likely to be in description.
+      // Therefore put matches for earlier words first.
+      // (Results are eventually used in reverse order).
+      objectResults = results[0].concat(objectResults);
+      importantResults = results[1].concat(importantResults);
+      unimportantResults = results[2].concat(unimportantResults);
+    }
+
+    // perform the search on the required terms
+    for (var i = 0; i < searchterms.length; i++) {
+      var word = searchterms[i];
+      // no match but word was a required one
+      if ((files = terms[word]) == null)
+        break;
+      if (files.length == undefined) {
+        files = [files];
+      }
+      // create the mapping
+      for (var j = 0; j < files.length; j++) {
+        var file = files[j];
+        if (file in fileMap)
+          fileMap[file].push(word);
+        else
+          fileMap[file] = [word];
+      }
+    }
+
+    // now check if the files don't contain excluded terms
+    for (var file in fileMap) {
+      var valid = true;
+
+      // check if all requirements are matched
+      if (fileMap[file].length != searchterms.length)
+        continue;
+
+      // ensure that none of the excluded terms is in the
+      // search result.
+      for (var i = 0; i < excluded.length; i++) {
+        if (terms[excluded[i]] == file ||
+            $.contains(terms[excluded[i]] || [], file)) {
+          valid = false;
+          break;
+        }
+      }
+
+      // if we have still a valid result we can add it
+      // to the result list
+      if (valid)
+        regularResults.push([filenames[file], titles[file], '', null]);
+    }
+
+    // delete unused variables in order to not waste
+    // memory until list is retrieved completely
+    delete filenames, titles, terms;
+
+    // now sort the regular results descending by title
+    regularResults.sort(function(a, b) {
+      var left = a[1].toLowerCase();
+      var right = b[1].toLowerCase();
+      return (left > right) ? -1 : ((left < right) ? 1 : 0);
+    });
+
+    // combine all results
+    var results = unimportantResults.concat(regularResults)
+      .concat(objectResults).concat(importantResults);
+
+    // print the results
+    var resultCount = results.length;
+    function displayNextItem() {
+      // results left, load the summary and display it
+      if (results.length) {
+        var item = results.pop();
+        var listItem = $('<li style="display:none"></li>');
+        if (DOCUMENTATION_OPTIONS.FILE_SUFFIX == '') {
+          // dirhtml builder
+          var dirname = item[0] + '/';
+          if (dirname.match(/\/index\/$/)) {
+            dirname = dirname.substring(0, dirname.length-6);
+          } else if (dirname == 'index/') {
+            dirname = '';
+          }
+          listItem.append($('<a/>').attr('href',
+            DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
+            highlightstring + item[2]).html(item[1]));
+        } else {
+          // normal html builders
+          listItem.append($('<a/>').attr('href',
+            item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
+            highlightstring + item[2]).html(item[1]));
+        }
+        if (item[3]) {
+          listItem.append($('<span> (' + item[3] + ')</span>'));
+          Search.output.append(listItem);
+          listItem.slideDown(5, function() {
+            displayNextItem();
+          });
+        } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
+          $.get(DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' +
+                item[0] + '.txt', function(data) {
+            if (data != '') {
+              listItem.append($.makeSearchSummary(data, searchterms, hlterms));
+              Search.output.append(listItem);
+            }
+            listItem.slideDown(5, function() {
+              displayNextItem();
+            });
+          }, "text");
+        } else {
+          // no source available, just display title
+          Search.output.append(listItem);
+          listItem.slideDown(5, function() {
+            displayNextItem();
+          });
+        }
+      }
+      // search finished, update title and status message
+      else {
+        Search.stopPulse();
+        Search.title.text(_('Search Results'));
+        if (!resultCount)
+          Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
+        else
+            Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
+        Search.status.fadeIn(500);
+      }
+    }
+    displayNextItem();
+  },
+
+  performObjectSearch : function(object, otherterms) {
+    var filenames = this._index.filenames;
+    var objects = this._index.objects;
+    var objnames = this._index.objnames;
+    var titles = this._index.titles;
+
+    var importantResults = [];
+    var objectResults = [];
+    var unimportantResults = [];
+
+    for (var prefix in objects) {
+      for (var name in objects[prefix]) {
+        var fullname = (prefix ? prefix + '.' : '') + name;
+        if (fullname.toLowerCase().indexOf(object) > -1) {
+          var match = objects[prefix][name];
+          var objname = objnames[match[1]][2];
+          var title = titles[match[0]];
+          // If more than one term searched for, we require other words to be
+          // found in the name/title/description
+          if (otherterms.length > 0) {
+            var haystack = (prefix + ' ' + name + ' ' +
+                            objname + ' ' + title).toLowerCase();
+            var allfound = true;
+            for (var i = 0; i < otherterms.length; i++) {
+              if (haystack.indexOf(otherterms[i]) == -1) {
+                allfound = false;
+                break;
+              }
+            }
+            if (!allfound) {
+              continue;
+            }
+          }
+          var descr = objname + _(', in ') + title;
+          anchor = match[3];
+          if (anchor == '')
+            anchor = fullname;
+          else if (anchor == '-')
+            anchor = objnames[match[1]][1] + '-' + fullname;
+          result = [filenames[match[0]], fullname, '#'+anchor, descr];
+          switch (match[2]) {
+          case 1: objectResults.push(result); break;
+          case 0: importantResults.push(result); break;
+          case 2: unimportantResults.push(result); break;
+          }
+        }
+      }
+    }
+
+    // sort results descending
+    objectResults.sort(function(a, b) {
+      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
+    });
+
+    importantResults.sort(function(a, b) {
+      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
+    });
+
+    unimportantResults.sort(function(a, b) {
+      return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
+    });
+
+    return [importantResults, objectResults, unimportantResults]
+  }
+}
+
+$(document).ready(function() {
+  Search.init();
+});
\ No newline at end of file
diff --git a/lib/mako-0.7.2/doc/_static/sidebar.js b/lib/mako-0.7.2/doc/_static/sidebar.js
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/sidebar.js
@@ -0,0 +1,151 @@
+/*
+ * sidebar.js
+ * ~~~~~~~~~~
+ *
+ * This script makes the Sphinx sidebar collapsible.
+ *
+ * .sphinxsidebar contains .sphinxsidebarwrapper.  This script adds
+ * in .sphixsidebar, after .sphinxsidebarwrapper, the #sidebarbutton
+ * used to collapse and expand the sidebar.
+ *
+ * When the sidebar is collapsed the .sphinxsidebarwrapper is hidden
+ * and the width of the sidebar and the margin-left of the document
+ * are decreased. When the sidebar is expanded the opposite happens.
+ * This script saves a per-browser/per-session cookie used to
+ * remember the position of the sidebar among the pages.
+ * Once the browser is closed the cookie is deleted and the position
+ * reset to the default (expanded).
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+$(function() {
+  // global elements used by the functions.
+  // the 'sidebarbutton' element is defined as global after its
+  // creation, in the add_sidebar_button function
+  var bodywrapper = $('.bodywrapper');
+  var sidebar = $('.sphinxsidebar');
+  var sidebarwrapper = $('.sphinxsidebarwrapper');
+
+  // for some reason, the document has no sidebar; do not run into errors
+  if (!sidebar.length) return;
+
+  // original margin-left of the bodywrapper and width of the sidebar
+  // with the sidebar expanded
+  var bw_margin_expanded = bodywrapper.css('margin-left');
+  var ssb_width_expanded = sidebar.width();
+
+  // margin-left of the bodywrapper and width of the sidebar
+  // with the sidebar collapsed
+  var bw_margin_collapsed = '.8em';
+  var ssb_width_collapsed = '.8em';
+
+  // colors used by the current theme
+  var dark_color = $('.related').css('background-color');
+  var light_color = $('.document').css('background-color');
+
+  function sidebar_is_collapsed() {
+    return sidebarwrapper.is(':not(:visible)');
+  }
+
+  function toggle_sidebar() {
+    if (sidebar_is_collapsed())
+      expand_sidebar();
+    else
+      collapse_sidebar();
+  }
+
+  function collapse_sidebar() {
+    sidebarwrapper.hide();
+    sidebar.css('width', ssb_width_collapsed);
+    bodywrapper.css('margin-left', bw_margin_collapsed);
+    sidebarbutton.css({
+        'margin-left': '0',
+        'height': bodywrapper.height()
+    });
+    sidebarbutton.find('span').text('?');
+    sidebarbutton.attr('title', _('Expand sidebar'));
+    document.cookie = 'sidebar=collapsed';
+  }
+
+  function expand_sidebar() {
+    bodywrapper.css('margin-left', bw_margin_expanded);
+    sidebar.css('width', ssb_width_expanded);
+    sidebarwrapper.show();
+    sidebarbutton.css({
+        'margin-left': ssb_width_expanded-12,
+        'height': bodywrapper.height()
+    });
+    sidebarbutton.find('span').text('?');
+    sidebarbutton.attr('title', _('Collapse sidebar'));
+    document.cookie = 'sidebar=expanded';
+  }
+
+  function add_sidebar_button() {
+    sidebarwrapper.css({
+        'float': 'left',
+        'margin-right': '0',
+        'width': ssb_width_expanded - 28
+    });
+    // create the button
+    sidebar.append(
+        '<div id="sidebarbutton"><span>&laquo;</span></div>'
+    );
+    var sidebarbutton = $('#sidebarbutton');
+    light_color = sidebarbutton.css('background-color');
+    // find the height of the viewport to center the '<<' in the page
+    var viewport_height;
+    if (window.innerHeight)
+ 	  viewport_height = window.innerHeight;
+    else
+	  viewport_height = $(window).height();
+    sidebarbutton.find('span').css({
+        'display': 'block',
+        'margin-top': (viewport_height - sidebar.position().top - 20) / 2
+    });
+
+    sidebarbutton.click(toggle_sidebar);
+    sidebarbutton.attr('title', _('Collapse sidebar'));
+    sidebarbutton.css({
+        'color': '#FFFFFF',
+        'border-left': '1px solid ' + dark_color,
+        'font-size': '1.2em',
+        'cursor': 'pointer',
+        'height': bodywrapper.height(),
+        'padding-top': '1px',
+        'margin-left': ssb_width_expanded - 12
+    });
+
+    sidebarbutton.hover(
+      function () {
+          $(this).css('background-color', dark_color);
+      },
+      function () {
+          $(this).css('background-color', light_color);
+      }
+    );
+  }
+
+  function set_position_from_cookie() {
+    if (!document.cookie)
+      return;
+    var items = document.cookie.split(';');
+    for(var k=0; k<items.length; k++) {
+      var key_val = items[k].split('=');
+      var key = key_val[0];
+      if (key == 'sidebar') {
+        var value = key_val[1];
+        if ((value == 'collapsed') && (!sidebar_is_collapsed()))
+          collapse_sidebar();
+        else if ((value == 'expanded') && (sidebar_is_collapsed()))
+          expand_sidebar();
+      }
+    }
+  }
+
+  add_sidebar_button();
+  var sidebarbutton = $('#sidebarbutton');
+  set_position_from_cookie();
+});
diff --git a/lib/mako-0.7.2/doc/_static/site.css b/lib/mako-0.7.2/doc/_static/site.css
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/site.css
@@ -0,0 +1,82 @@
+body { 
+    font-family: Tahoma, Geneva, sans-serif;
+    line-height:1.4em;
+    margin:15px;
+    background-color:#FFFFFF;
+}
+img {border:none;}
+a { text-decoration: none;}
+a:visited  { color: #2929ff;}
+a:hover { color: #0000ff;}
+
+#wrap {
+    margin:0 auto;
+    max-width:1024px;
+    min-width:480px;
+    position:relative;
+    
+}
+h1 {
+    font-size:1.6em;
+    font-weight:bold;
+}
+
+h2 {
+    font-size:1.1em;
+    font-weight:bold;
+    margin:10px 0px 10px 0px;
+}
+
+.clearfix{
+    clear:both;
+}
+
+.red {
+	font-weight:bold;
+	color:#FF0000;
+}
+.rightbar {
+    float:right;
+    margin:10px 30px 10px 30px;
+}
+.slogan {
+    margin-top:10px;
+}
+.toolbar {
+    margin-top:20px;
+}
+.copyright {
+    font-size:.8em;
+    text-align:center;
+    color:909090;
+}
+.pylogo {
+	text-align:right;
+	float:right;
+}
+.code {
+    font-family:monospace;
+}
+
+li {
+    margin:1px 0px 1px 0px;
+}
+
+.speedchart td {
+    font-size:small;
+}
+
+pre.codesample { 
+    margin: 1.5em; 
+    padding: .5em; 
+    font-size: .95em; 
+    line-height:1em;
+    background-color: #eee;
+    border: 1px solid #ccc;
+    width:450px;
+    overflow:auto;
+}
+
+#speedchart {
+    margin:5px 10px 5px 10px;
+}
diff --git a/lib/mako-0.7.2/doc/_static/underscore.js b/lib/mako-0.7.2/doc/_static/underscore.js
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/underscore.js
@@ -0,0 +1,23 @@
+// Underscore.js 0.5.5
+// (c) 2009 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the terms of the MIT license.
+// Portions of Underscore are inspired by or borrowed from Prototype.js,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore/
+(function(){var j=this,n=j._,i=function(a){this._wrapped=a},m=typeof StopIteration!=="undefined"?StopIteration:"__break__",b=j._=function(a){return new i(a)};if(typeof exports!=="undefined")exports._=b;var k=Array.prototype.slice,o=Array.prototype.unshift,p=Object.prototype.toString,q=Object.prototype.hasOwnProperty,r=Object.prototype.propertyIsEnumerable;b.VERSION="0.5.5";b.each=function(a,c,d){try{if(a.forEach)a.forEach(c,d);else if(b.isArray(a)||b.isArguments(a))for(var e=0,f=a.length;e<f;e++)c.call(d,
+a[e],e,a);else{var g=b.keys(a);f=g.length;for(e=0;e<f;e++)c.call(d,a[g[e]],g[e],a)}}catch(h){if(h!=m)throw h;}return a};b.map=function(a,c,d){if(a&&b.isFunction(a.map))return a.map(c,d);var e=[];b.each(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(a&&b.isFunction(a.reduce))return a.reduce(b.bind(d,e),c);b.each(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(a&&b.isFunction(a.reduceRight))return a.reduceRight(b.bind(d,e),c);
+var f=b.clone(b.toArray(a)).reverse();b.each(f,function(g,h){c=d.call(e,c,g,h,a)});return c};b.detect=function(a,c,d){var e;b.each(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.select=function(a,c,d){if(a&&b.isFunction(a.filter))return a.filter(c,d);var e=[];b.each(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];b.each(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.all=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.every))return a.every(c,
+d);var e=true;b.each(a,function(f,g,h){(e=e&&c.call(d,f,g,h))||b.breakLoop()});return e};b.any=function(a,c,d){c=c||b.identity;if(a&&b.isFunction(a.some))return a.some(c,d);var e=false;b.each(a,function(f,g,h){if(e=c.call(d,f,g,h))b.breakLoop()});return e};b.include=function(a,c){if(b.isArray(a))return b.indexOf(a,c)!=-1;var d=false;b.each(a,function(e){if(d=e===c)b.breakLoop()});return d};b.invoke=function(a,c){var d=b.rest(arguments,2);return b.map(a,function(e){return(c?e[c]:e).apply(e,d)})};b.pluck=
+function(a,c){return b.map(a,function(d){return d[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g>=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g<e.computed&&(e={value:f,computed:g})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,
+function(e,f,g){return{value:e,criteria:c.call(d,e,f,g)}}).sort(function(e,f){e=e.criteria;f=f.criteria;return e<f?-1:e>f?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d||b.identity;for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?(e=g+1):(f=g)}return e};b.toArray=function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return k.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=function(a,c,d){return c&&!d?k.call(a,
+0,c):a[0]};b.rest=function(a,c,d){return k.call(a,b.isUndefined(c)||d?1:c)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.select(a,function(c){return!!c})};b.flatten=function(a){return b.reduce(a,[],function(c,d){if(b.isArray(d))return c.concat(b.flatten(d));c.push(d);return c})};b.without=function(a){var c=b.rest(arguments);return b.select(a,function(d){return!b.include(c,d)})};b.uniq=function(a,c){return b.reduce(a,[],function(d,e,f){if(0==f||(c===true?b.last(d)!=e:!b.include(d,
+e)))d.push(e);return d})};b.intersect=function(a){var c=b.rest(arguments);return b.select(b.uniq(a),function(d){return b.all(c,function(e){return b.indexOf(e,d)>=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e<c;e++)d[e]=b.pluck(a,String(e));return d};b.indexOf=function(a,c){if(a.indexOf)return a.indexOf(c);for(var d=0,e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,c){if(a.lastIndexOf)return a.lastIndexOf(c);for(var d=
+a.length;d--;)if(a[d]===c)return d;return-1};b.range=function(a,c,d){var e=b.toArray(arguments),f=e.length<=1;a=f?0:e[0];c=f?e[0]:e[1];d=e[2]||1;e=Math.ceil((c-a)/d);if(e<=0)return[];e=new Array(e);f=a;for(var g=0;1;f+=d){if((d>0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c||j,d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);b.each(c,function(d){a[d]=b.bind(a[d],a)});
+return a};b.delay=function(a,c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=function(a){if(b.isArray(a))return b.range(0,a.length);
+var c=[];for(var d in a)q.call(a,d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.select(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a,c){for(var d in c)a[d]=c[d];return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c||a&&!c)return false;
+if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a){return b.keys(a).length==
+0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=function(a){return!!(a&&a.concat&&a.unshift)};b.isArguments=function(a){return a&&b.isNumber(a.length)&&!b.isArray(a)&&!r.call(a,"length")};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return p.call(a)==="[object Number]"};b.isDate=function(a){return!!(a&&a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=function(a){return!!(a&&
+a.test&&a.exec&&(a.ignoreCase||a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){j._=n;return this};b.identity=function(a){return a};b.breakLoop=function(){throw m;};var s=0;b.uniqueId=function(a){var c=s++;return a?a+c:c};b.template=function(a,c){a=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g,
+" ").replace(/'(?=[^%]*%>)/g,"\t").split("'").join("\\'").split("\t").join("'").replace(/<%=(.+?)%>/g,"',$1,'").split("<%").join("');").split("%>").join("p.push('")+"');}return p.join('');");return c?a(c):a};b.forEach=b.each;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.filter=b.select;b.every=b.all;b.some=b.any;b.head=b.first;b.tail=b.rest;b.methods=b.functions;var l=function(a,c){return c?b(a).chain():a};b.each(b.functions(b),function(a){var c=b[a];i.prototype[a]=function(){var d=b.toArray(arguments);
+o.call(d,this._wrapped);return l(c.apply(b,d),this._chain)}});b.each(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){c.apply(this._wrapped,arguments);return l(this._wrapped,this._chain)}});b.each(["concat","join","slice"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){return l(c.apply(this._wrapped,arguments),this._chain)}});i.prototype.chain=function(){this._chain=true;return this};i.prototype.value=function(){return this._wrapped}})();
diff --git a/lib/mako-0.7.2/doc/_static/up-pressed.png b/lib/mako-0.7.2/doc/_static/up-pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd587afee2fe38989383ff82010147ea56b93dd
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/up.png b/lib/mako-0.7.2/doc/_static/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..b94625680b4a4b9647c3a6f3f283776930696aa9
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/_static/websupport.js b/lib/mako-0.7.2/doc/_static/websupport.js
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/_static/websupport.js
@@ -0,0 +1,808 @@
+/*
+ * websupport.js
+ * ~~~~~~~~~~~~~
+ *
+ * sphinx.websupport utilties for all documentation.
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+(function($) {
+  $.fn.autogrow = function() {
+    return this.each(function() {
+    var textarea = this;
+
+    $.fn.autogrow.resize(textarea);
+
+    $(textarea)
+      .focus(function() {
+        textarea.interval = setInterval(function() {
+          $.fn.autogrow.resize(textarea);
+        }, 500);
+      })
+      .blur(function() {
+        clearInterval(textarea.interval);
+      });
+    });
+  };
+
+  $.fn.autogrow.resize = function(textarea) {
+    var lineHeight = parseInt($(textarea).css('line-height'), 10);
+    var lines = textarea.value.split('\n');
+    var columns = textarea.cols;
+    var lineCount = 0;
+    $.each(lines, function() {
+      lineCount += Math.ceil(this.length / columns) || 1;
+    });
+    var height = lineHeight * (lineCount + 1);
+    $(textarea).css('height', height);
+  };
+})(jQuery);
+
+(function($) {
+  var comp, by;
+
+  function init() {
+    initEvents();
+    initComparator();
+  }
+
+  function initEvents() {
+    $('a.comment-close').live("click", function(event) {
+      event.preventDefault();
+      hide($(this).attr('id').substring(2));
+    });
+    $('a.vote').live("click", function(event) {
+      event.preventDefault();
+      handleVote($(this));
+    });
+    $('a.reply').live("click", function(event) {
+      event.preventDefault();
+      openReply($(this).attr('id').substring(2));
+    });
+    $('a.close-reply').live("click", function(event) {
+      event.preventDefault();
+      closeReply($(this).attr('id').substring(2));
+    });
+    $('a.sort-option').live("click", function(event) {
+      event.preventDefault();
+      handleReSort($(this));
+    });
+    $('a.show-proposal').live("click", function(event) {
+      event.preventDefault();
+      showProposal($(this).attr('id').substring(2));
+    });
+    $('a.hide-proposal').live("click", function(event) {
+      event.preventDefault();
+      hideProposal($(this).attr('id').substring(2));
+    });
+    $('a.show-propose-change').live("click", function(event) {
+      event.preventDefault();
+      showProposeChange($(this).attr('id').substring(2));
+    });
+    $('a.hide-propose-change').live("click", function(event) {
+      event.preventDefault();
+      hideProposeChange($(this).attr('id').substring(2));
+    });
+    $('a.accept-comment').live("click", function(event) {
+      event.preventDefault();
+      acceptComment($(this).attr('id').substring(2));
+    });
+    $('a.delete-comment').live("click", function(event) {
+      event.preventDefault();
+      deleteComment($(this).attr('id').substring(2));
+    });
+    $('a.comment-markup').live("click", function(event) {
+      event.preventDefault();
+      toggleCommentMarkupBox($(this).attr('id').substring(2));
+    });
+  }
+
+  /**
+   * Set comp, which is a comparator function used for sorting and
+   * inserting comments into the list.
+   */
+  function setComparator() {
+    // If the first three letters are "asc", sort in ascending order
+    // and remove the prefix.
+    if (by.substring(0,3) == 'asc') {
+      var i = by.substring(3);
+      comp = function(a, b) { return a[i] - b[i]; };
+    } else {
+      // Otherwise sort in descending order.
+      comp = function(a, b) { return b[by] - a[by]; };
+    }
+
+    // Reset link styles and format the selected sort option.
+    $('a.sel').attr('href', '#').removeClass('sel');
+    $('a.by' + by).removeAttr('href').addClass('sel');
+  }
+
+  /**
+   * Create a comp function. If the user has preferences stored in
+   * the sortBy cookie, use those, otherwise use the default.
+   */
+  function initComparator() {
+    by = 'rating'; // Default to sort by rating.
+    // If the sortBy cookie is set, use that instead.
+    if (document.cookie.length > 0) {
+      var start = document.cookie.indexOf('sortBy=');
+      if (start != -1) {
+        start = start + 7;
+        var end = document.cookie.indexOf(";", start);
+        if (end == -1) {
+          end = document.cookie.length;
+          by = unescape(document.cookie.substring(start, end));
+        }
+      }
+    }
+    setComparator();
+  }
+
+  /**
+   * Show a comment div.
+   */
+  function show(id) {
+    $('#ao' + id).hide();
+    $('#ah' + id).show();
+    var context = $.extend({id: id}, opts);
+    var popup = $(renderTemplate(popupTemplate, context)).hide();
+    popup.find('textarea[name="proposal"]').hide();
+    popup.find('a.by' + by).addClass('sel');
+    var form = popup.find('#cf' + id);
+    form.submit(function(event) {
+      event.preventDefault();
+      addComment(form);
+    });
+    $('#s' + id).after(popup);
+    popup.slideDown('fast', function() {
+      getComments(id);
+    });
+  }
+
+  /**
+   * Hide a comment div.
+   */
+  function hide(id) {
+    $('#ah' + id).hide();
+    $('#ao' + id).show();
+    var div = $('#sc' + id);
+    div.slideUp('fast', function() {
+      div.remove();
+    });
+  }
+
+  /**
+   * Perform an ajax request to get comments for a node
+   * and insert the comments into the comments tree.
+   */
+  function getComments(id) {
+    $.ajax({
+     type: 'GET',
+     url: opts.getCommentsURL,
+     data: {node: id},
+     success: function(data, textStatus, request) {
+       var ul = $('#cl' + id);
+       var speed = 100;
+       $('#cf' + id)
+         .find('textarea[name="proposal"]')
+         .data('source', data.source);
+
+       if (data.comments.length === 0) {
+         ul.html('<li>No comments yet.</li>');
+         ul.data('empty', true);
+       } else {
+         // If there are comments, sort them and put them in the list.
+         var comments = sortComments(data.comments);
+         speed = data.comments.length * 100;
+         appendComments(comments, ul);
+         ul.data('empty', false);
+       }
+       $('#cn' + id).slideUp(speed + 200);
+       ul.slideDown(speed);
+     },
+     error: function(request, textStatus, error) {
+       showError('Oops, there was a problem retrieving the comments.');
+     },
+     dataType: 'json'
+    });
+  }
+
+  /**
+   * Add a comment via ajax and insert the comment into the comment tree.
+   */
+  function addComment(form) {
+    var node_id = form.find('input[name="node"]').val();
+    var parent_id = form.find('input[name="parent"]').val();
+    var text = form.find('textarea[name="comment"]').val();
+    var proposal = form.find('textarea[name="proposal"]').val();
+
+    if (text == '') {
+      showError('Please enter a comment.');
+      return;
+    }
+
+    // Disable the form that is being submitted.
+    form.find('textarea,input').attr('disabled', 'disabled');
+
+    // Send the comment to the server.
+    $.ajax({
+      type: "POST",
+      url: opts.addCommentURL,
+      dataType: 'json',
+      data: {
+        node: node_id,
+        parent: parent_id,
+        text: text,
+        proposal: proposal
+      },
+      success: function(data, textStatus, error) {
+        // Reset the form.
+        if (node_id) {
+          hideProposeChange(node_id);
+        }
+        form.find('textarea')
+          .val('')
+          .add(form.find('input'))
+          .removeAttr('disabled');
+	var ul = $('#cl' + (node_id || parent_id));
+        if (ul.data('empty')) {
+          $(ul).empty();
+          ul.data('empty', false);
+        }
+        insertComment(data.comment);
+        var ao = $('#ao' + node_id);
+        ao.find('img').attr({'src': opts.commentBrightImage});
+        if (node_id) {
+          // if this was a "root" comment, remove the commenting box
+          // (the user can get it back by reopening the comment popup)
+          $('#ca' + node_id).slideUp();
+        }
+      },
+      error: function(request, textStatus, error) {
+        form.find('textarea,input').removeAttr('disabled');
+        showError('Oops, there was a problem adding the comment.');
+      }
+    });
+  }
+
+  /**
+   * Recursively append comments to the main comment list and children
+   * lists, creating the comment tree.
+   */
+  function appendComments(comments, ul) {
+    $.each(comments, function() {
+      var div = createCommentDiv(this);
+      ul.append($(document.createElement('li')).html(div));
+      appendComments(this.children, div.find('ul.comment-children'));
+      // To avoid stagnating data, don't store the comments children in data.
+      this.children = null;
+      div.data('comment', this);
+    });
+  }
+
+  /**
+   * After adding a new comment, it must be inserted in the correct
+   * location in the comment tree.
+   */
+  function insertComment(comment) {
+    var div = createCommentDiv(comment);
+
+    // To avoid stagnating data, don't store the comments children in data.
+    comment.children = null;
+    div.data('comment', comment);
+
+    var ul = $('#cl' + (comment.node || comment.parent));
+    var siblings = getChildren(ul);
+
+    var li = $(document.createElement('li'));
+    li.hide();
+
+    // Determine where in the parents children list to insert this comment.
+    for(i=0; i < siblings.length; i++) {
+      if (comp(comment, siblings[i]) <= 0) {
+        $('#cd' + siblings[i].id)
+          .parent()
+          .before(li.html(div));
+        li.slideDown('fast');
+        return;
+      }
+    }
+
+    // If we get here, this comment rates lower than all the others,
+    // or it is the only comment in the list.
+    ul.append(li.html(div));
+    li.slideDown('fast');
+  }
+
+  function acceptComment(id) {
+    $.ajax({
+      type: 'POST',
+      url: opts.acceptCommentURL,
+      data: {id: id},
+      success: function(data, textStatus, request) {
+        $('#cm' + id).fadeOut('fast');
+        $('#cd' + id).removeClass('moderate');
+      },
+      error: function(request, textStatus, error) {
+        showError('Oops, there was a problem accepting the comment.');
+      }
+    });
+  }
+
+  function deleteComment(id) {
+    $.ajax({
+      type: 'POST',
+      url: opts.deleteCommentURL,
+      data: {id: id},
+      success: function(data, textStatus, request) {
+        var div = $('#cd' + id);
+        if (data == 'delete') {
+          // Moderator mode: remove the comment and all children immediately
+          div.slideUp('fast', function() {
+            div.remove();
+          });
+          return;
+        }
+        // User mode: only mark the comment as deleted
+        div
+          .find('span.user-id:first')
+          .text('[deleted]').end()
+          .find('div.comment-text:first')
+          .text('[deleted]').end()
+          .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id +
+                ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id)
+          .remove();
+        var comment = div.data('comment');
+        comment.username = '[deleted]';
+        comment.text = '[deleted]';
+        div.data('comment', comment);
+      },
+      error: function(request, textStatus, error) {
+        showError('Oops, there was a problem deleting the comment.');
+      }
+    });
+  }
+
+  function showProposal(id) {
+    $('#sp' + id).hide();
+    $('#hp' + id).show();
+    $('#pr' + id).slideDown('fast');
+  }
+
+  function hideProposal(id) {
+    $('#hp' + id).hide();
+    $('#sp' + id).show();
+    $('#pr' + id).slideUp('fast');
+  }
+
+  function showProposeChange(id) {
+    $('#pc' + id).hide();
+    $('#hc' + id).show();
+    var textarea = $('#pt' + id);
+    textarea.val(textarea.data('source'));
+    $.fn.autogrow.resize(textarea[0]);
+    textarea.slideDown('fast');
+  }
+
+  function hideProposeChange(id) {
+    $('#hc' + id).hide();
+    $('#pc' + id).show();
+    var textarea = $('#pt' + id);
+    textarea.val('').removeAttr('disabled');
+    textarea.slideUp('fast');
+  }
+
+  function toggleCommentMarkupBox(id) {
+    $('#mb' + id).toggle();
+  }
+
+  /** Handle when the user clicks on a sort by link. */
+  function handleReSort(link) {
+    var classes = link.attr('class').split(/\s+/);
+    for (var i=0; i<classes.length; i++) {
+      if (classes[i] != 'sort-option') {
+	by = classes[i].substring(2);
+      }
+    }
+    setComparator();
+    // Save/update the sortBy cookie.
+    var expiration = new Date();
+    expiration.setDate(expiration.getDate() + 365);
+    document.cookie= 'sortBy=' + escape(by) +
+                     ';expires=' + expiration.toUTCString();
+    $('ul.comment-ul').each(function(index, ul) {
+      var comments = getChildren($(ul), true);
+      comments = sortComments(comments);
+      appendComments(comments, $(ul).empty());
+    });
+  }
+
+  /**
+   * Function to process a vote when a user clicks an arrow.
+   */
+  function handleVote(link) {
+    if (!opts.voting) {
+      showError("You'll need to login to vote.");
+      return;
+    }
+
+    var id = link.attr('id');
+    if (!id) {
+      // Didn't click on one of the voting arrows.
+      return;
+    }
+    // If it is an unvote, the new vote value is 0,
+    // Otherwise it's 1 for an upvote, or -1 for a downvote.
+    var value = 0;
+    if (id.charAt(1) != 'u') {
+      value = id.charAt(0) == 'u' ? 1 : -1;
+    }
+    // The data to be sent to the server.
+    var d = {
+      comment_id: id.substring(2),
+      value: value
+    };
+
+    // Swap the vote and unvote links.
+    link.hide();
+    $('#' + id.charAt(0) + (id.charAt(1) == 'u' ? 'v' : 'u') + d.comment_id)
+      .show();
+
+    // The div the comment is displayed in.
+    var div = $('div#cd' + d.comment_id);
+    var data = div.data('comment');
+
+    // If this is not an unvote, and the other vote arrow has
+    // already been pressed, unpress it.
+    if ((d.value !== 0) && (data.vote === d.value * -1)) {
+      $('#' + (d.value == 1 ? 'd' : 'u') + 'u' + d.comment_id).hide();
+      $('#' + (d.value == 1 ? 'd' : 'u') + 'v' + d.comment_id).show();
+    }
+
+    // Update the comments rating in the local data.
+    data.rating += (data.vote === 0) ? d.value : (d.value - data.vote);
+    data.vote = d.value;
+    div.data('comment', data);
+
+    // Change the rating text.
+    div.find('.rating:first')
+      .text(data.rating + ' point' + (data.rating == 1 ? '' : 's'));
+
+    // Send the vote information to the server.
+    $.ajax({
+      type: "POST",
+      url: opts.processVoteURL,
+      data: d,
+      error: function(request, textStatus, error) {
+        showError('Oops, there was a problem casting that vote.');
+      }
+    });
+  }
+
+  /**
+   * Open a reply form used to reply to an existing comment.
+   */
+  function openReply(id) {
+    // Swap out the reply link for the hide link
+    $('#rl' + id).hide();
+    $('#cr' + id).show();
+
+    // Add the reply li to the children ul.
+    var div = $(renderTemplate(replyTemplate, {id: id})).hide();
+    $('#cl' + id)
+      .prepend(div)
+      // Setup the submit handler for the reply form.
+      .find('#rf' + id)
+      .submit(function(event) {
+        event.preventDefault();
+        addComment($('#rf' + id));
+        closeReply(id);
+      })
+      .find('input[type=button]')
+      .click(function() {
+        closeReply(id);
+      });
+    div.slideDown('fast', function() {
+      $('#rf' + id).find('textarea').focus();
+    });
+  }
+
+  /**
+   * Close the reply form opened with openReply.
+   */
+  function closeReply(id) {
+    // Remove the reply div from the DOM.
+    $('#rd' + id).slideUp('fast', function() {
+      $(this).remove();
+    });
+
+    // Swap out the hide link for the reply link
+    $('#cr' + id).hide();
+    $('#rl' + id).show();
+  }
+
+  /**
+   * Recursively sort a tree of comments using the comp comparator.
+   */
+  function sortComments(comments) {
+    comments.sort(comp);
+    $.each(comments, function() {
+      this.children = sortComments(this.children);
+    });
+    return comments;
+  }
+
+  /**
+   * Get the children comments from a ul. If recursive is true,
+   * recursively include childrens' children.
+   */
+  function getChildren(ul, recursive) {
+    var children = [];
+    ul.children().children("[id^='cd']")
+      .each(function() {
+        var comment = $(this).data('comment');
+        if (recursive)
+          comment.children = getChildren($(this).find('#cl' + comment.id), true);
+        children.push(comment);
+      });
+    return children;
+  }
+
+  /** Create a div to display a comment in. */
+  function createCommentDiv(comment) {
+    if (!comment.displayed && !opts.moderator) {
+      return $('<div class="moderate">Thank you!  Your comment will show up '
+               + 'once it is has been approved by a moderator.</div>');
+    }
+    // Prettify the comment rating.
+    comment.pretty_rating = comment.rating + ' point' +
+      (comment.rating == 1 ? '' : 's');
+    // Make a class (for displaying not yet moderated comments differently)
+    comment.css_class = comment.displayed ? '' : ' moderate';
+    // Create a div for this comment.
+    var context = $.extend({}, opts, comment);
+    var div = $(renderTemplate(commentTemplate, context));
+
+    // If the user has voted on this comment, highlight the correct arrow.
+    if (comment.vote) {
+      var direction = (comment.vote == 1) ? 'u' : 'd';
+      div.find('#' + direction + 'v' + comment.id).hide();
+      div.find('#' + direction + 'u' + comment.id).show();
+    }
+
+    if (opts.moderator || comment.text != '[deleted]') {
+      div.find('a.reply').show();
+      if (comment.proposal_diff)
+        div.find('#sp' + comment.id).show();
+      if (opts.moderator && !comment.displayed)
+        div.find('#cm' + comment.id).show();
+      if (opts.moderator || (opts.username == comment.username))
+        div.find('#dc' + comment.id).show();
+    }
+    return div;
+  }
+
+  /**
+   * A simple template renderer. Placeholders such as <%id%> are replaced
+   * by context['id'] with items being escaped. Placeholders such as <#id#>
+   * are not escaped.
+   */
+  function renderTemplate(template, context) {
+    var esc = $(document.createElement('div'));
+
+    function handle(ph, escape) {
+      var cur = context;
+      $.each(ph.split('.'), function() {
+        cur = cur[this];
+      });
+      return escape ? esc.text(cur || "").html() : cur;
+    }
+
+    return template.replace(/<([%#])([\w\.]*)\1>/g, function() {
+      return handle(arguments[2], arguments[1] == '%' ? true : false);
+    });
+  }
+
+  /** Flash an error message briefly. */
+  function showError(message) {
+    $(document.createElement('div')).attr({'class': 'popup-error'})
+      .append($(document.createElement('div'))
+               .attr({'class': 'error-message'}).text(message))
+      .appendTo('body')
+      .fadeIn("slow")
+      .delay(2000)
+      .fadeOut("slow");
+  }
+
+  /** Add a link the user uses to open the comments popup. */
+  $.fn.comment = function() {
+    return this.each(function() {
+      var id = $(this).attr('id').substring(1);
+      var count = COMMENT_METADATA[id];
+      var title = count + ' comment' + (count == 1 ? '' : 's');
+      var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
+      var addcls = count == 0 ? ' nocomment' : '';
+      $(this)
+        .append(
+          $(document.createElement('a')).attr({
+            href: '#',
+            'class': 'sphinx-comment-open' + addcls,
+            id: 'ao' + id
+          })
+            .append($(document.createElement('img')).attr({
+              src: image,
+              alt: 'comment',
+              title: title
+            }))
+            .click(function(event) {
+              event.preventDefault();
+              show($(this).attr('id').substring(2));
+            })
+        )
+        .append(
+          $(document.createElement('a')).attr({
+            href: '#',
+            'class': 'sphinx-comment-close hidden',
+            id: 'ah' + id
+          })
+            .append($(document.createElement('img')).attr({
+              src: opts.closeCommentImage,
+              alt: 'close',
+              title: 'close'
+            }))
+            .click(function(event) {
+              event.preventDefault();
+              hide($(this).attr('id').substring(2));
+            })
+        );
+    });
+  };
+
+  var opts = {
+    processVoteURL: '/_process_vote',
+    addCommentURL: '/_add_comment',
+    getCommentsURL: '/_get_comments',
+    acceptCommentURL: '/_accept_comment',
+    deleteCommentURL: '/_delete_comment',
+    commentImage: '/static/_static/comment.png',
+    closeCommentImage: '/static/_static/comment-close.png',
+    loadingImage: '/static/_static/ajax-loader.gif',
+    commentBrightImage: '/static/_static/comment-bright.png',
+    upArrow: '/static/_static/up.png',
+    downArrow: '/static/_static/down.png',
+    upArrowPressed: '/static/_static/up-pressed.png',
+    downArrowPressed: '/static/_static/down-pressed.png',
+    voting: false,
+    moderator: false
+  };
+
+  if (typeof COMMENT_OPTIONS != "undefined") {
+    opts = jQuery.extend(opts, COMMENT_OPTIONS);
+  }
+
+  var popupTemplate = '\
+    <div class="sphinx-comments" id="sc<%id%>">\
+      <p class="sort-options">\
+        Sort by:\
+        <a href="#" class="sort-option byrating">best rated</a>\
+        <a href="#" class="sort-option byascage">newest</a>\
+        <a href="#" class="sort-option byage">oldest</a>\
+      </p>\
+      <div class="comment-header">Comments</div>\
+      <div class="comment-loading" id="cn<%id%>">\
+        loading comments... <img src="<%loadingImage%>" alt="" /></div>\
+      <ul id="cl<%id%>" class="comment-ul"></ul>\
+      <div id="ca<%id%>">\
+      <p class="add-a-comment">Add a comment\
+        (<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
+      <div class="comment-markup-box" id="mb<%id%>">\
+        reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
+        <tt>``code``</tt>, \
+        code blocks: <tt>::</tt> and an indented block after blank line</div>\
+      <form method="post" id="cf<%id%>" class="comment-form" action="">\
+        <textarea name="comment" cols="80"></textarea>\
+        <p class="propose-button">\
+          <a href="#" id="pc<%id%>" class="show-propose-change">\
+            Propose a change &#9657;\
+          </a>\
+          <a href="#" id="hc<%id%>" class="hide-propose-change">\
+            Propose a change &#9663;\
+          </a>\
+        </p>\
+        <textarea name="proposal" id="pt<%id%>" cols="80"\
+                  spellcheck="false"></textarea>\
+        <input type="submit" value="Add comment" />\
+        <input type="hidden" name="node" value="<%id%>" />\
+        <input type="hidden" name="parent" value="" />\
+      </form>\
+      </div>\
+    </div>';
+
+  var commentTemplate = '\
+    <div id="cd<%id%>" class="sphinx-comment<%css_class%>">\
+      <div class="vote">\
+        <div class="arrow">\
+          <a href="#" id="uv<%id%>" class="vote" title="vote up">\
+            <img src="<%upArrow%>" />\
+          </a>\
+          <a href="#" id="uu<%id%>" class="un vote" title="vote up">\
+            <img src="<%upArrowPressed%>" />\
+          </a>\
+        </div>\
+        <div class="arrow">\
+          <a href="#" id="dv<%id%>" class="vote" title="vote down">\
+            <img src="<%downArrow%>" id="da<%id%>" />\
+          </a>\
+          <a href="#" id="du<%id%>" class="un vote" title="vote down">\
+            <img src="<%downArrowPressed%>" />\
+          </a>\
+        </div>\
+      </div>\
+      <div class="comment-content">\
+        <p class="tagline comment">\
+          <span class="user-id"><%username%></span>\
+          <span class="rating"><%pretty_rating%></span>\
+          <span class="delta"><%time.delta%></span>\
+        </p>\
+        <div class="comment-text comment"><#text#></div>\
+        <p class="comment-opts comment">\
+          <a href="#" class="reply hidden" id="rl<%id%>">reply &#9657;</a>\
+          <a href="#" class="close-reply" id="cr<%id%>">reply &#9663;</a>\
+          <a href="#" id="sp<%id%>" class="show-proposal">proposal &#9657;</a>\
+          <a href="#" id="hp<%id%>" class="hide-proposal">proposal &#9663;</a>\
+          <a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
+          <span id="cm<%id%>" class="moderation hidden">\
+            <a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
+          </span>\
+        </p>\
+        <pre class="proposal" id="pr<%id%>">\
+<#proposal_diff#>\
+        </pre>\
+          <ul class="comment-children" id="cl<%id%>"></ul>\
+        </div>\
+        <div class="clearleft"></div>\
+      </div>\
+    </div>';
+
+  var replyTemplate = '\
+    <li>\
+      <div class="reply-div" id="rd<%id%>">\
+        <form id="rf<%id%>">\
+          <textarea name="comment" cols="80"></textarea>\
+          <input type="submit" value="Add reply" />\
+          <input type="button" value="Cancel" />\
+          <input type="hidden" name="parent" value="<%id%>" />\
+          <input type="hidden" name="node" value="" />\
+        </form>\
+      </div>\
+    </li>';
+
+  $(document).ready(function() {
+    init();
+  });
+})(jQuery);
+
+$(document).ready(function() {
+  // add comment anchors for all paragraphs that are commentable
+  $('.sphinx-has-comment').comment();
+
+  // highlight search words in search results
+  $("div.context").each(function() {
+    var params = $.getQueryParameters();
+    var terms = (params.q) ? params.q[0].split(/\s+/) : [];
+    var result = $(this);
+    $.each(terms, function() {
+      result.highlightText(this.toLowerCase(), 'highlighted');
+    });
+  });
+
+  // directly open comment window if requested
+  var anchor = document.location.hash;
+  if (anchor.substring(0, 9) == '#comment-') {
+    $('#ao' + anchor.substring(9)).click();
+    document.location.hash = '#s' + anchor.substring(9);
+  }
+});
diff --git a/lib/mako-0.7.2/doc/build/Makefile b/lib/mako-0.7.2/doc/build/Makefile
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/Makefile
@@ -0,0 +1,137 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = output
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest dist-html site-mako
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dist-html  same as html, but places files in /doc"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html -A mako_layout=html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dist-html:
+	$(SPHINXBUILD) -b html -A mako_layout=html $(ALLSPHINXOPTS) ..
+	@echo
+	@echo "Build finished.  The HTML pages are in ../."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SQLAlchemy.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SQLAlchemy.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/SQLAlchemy"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SQLAlchemy"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	cp texinputs/* $(BUILDDIR)/latex/
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	make -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) .
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/lib/mako-0.7.2/doc/build/builder/__init__.py b/lib/mako-0.7.2/doc/build/builder/__init__.py
new file mode 100644
diff --git a/lib/mako-0.7.2/doc/build/builder/builders.py b/lib/mako-0.7.2/doc/build/builder/builders.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/builder/builders.py
@@ -0,0 +1,97 @@
+from sphinx.application import TemplateBridge
+from sphinx.builders.html import StandaloneHTMLBuilder
+from sphinx.highlighting import PygmentsBridge
+from sphinx.jinja2glue import BuiltinTemplateLoader
+from pygments import highlight
+from pygments.lexer import RegexLexer, bygroups, using
+from pygments.token import *
+from pygments.filter import Filter, apply_filters
+from pygments.lexers import PythonLexer, PythonConsoleLexer
+from pygments.formatters import HtmlFormatter, LatexFormatter
+import re
+import os
+from mako.lookup import TemplateLookup
+from mako.template import Template
+from mako.ext.pygmentplugin import MakoLexer
+
+rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+class MakoBridge(TemplateBridge):
+    def init(self, builder, *args, **kw):
+        self.jinja2_fallback = BuiltinTemplateLoader()
+        self.jinja2_fallback.init(builder, *args, **kw)
+
+        builder.config.html_context['site_base'] = builder.config['site_base']
+
+        self.lookup = TemplateLookup(
+            directories=builder.config.templates_path,
+            imports=[
+                "from builder import util"
+            ]
+        )
+
+    def render(self, template, context):
+        template = template.replace(".html", ".mako")
+        context['prevtopic'] = context.pop('prev', None)
+        context['nexttopic'] = context.pop('next', None)
+
+        # RTD layout
+        if rtd:
+            # add variables if not present, such 
+            # as if local test of READTHEDOCS variable
+            if 'MEDIA_URL' not in context:
+                context['MEDIA_URL'] = "http://media.readthedocs.org/"
+            if 'slug' not in context:
+                context['slug'] = "mako-test-slug"
+            if 'url' not in context:
+                context['url'] = "/some/test/url"
+            if 'current_version' not in context:
+                context['current_version'] = "some_version"
+            if 'versions' not in context:
+                context['versions'] = [('default', '/default/')]
+
+            context['docs_base'] = "http://readthedocs.org"
+            context['toolbar'] = True
+            context['layout'] = "rtd_layout.mako"
+            context['pdf_url'] = "%spdf/%s/%s/%s.pdf" % (
+                    context['MEDIA_URL'],
+                    context['slug'],
+                    context['current_version'],
+                    context['slug']
+            )
+        # local docs layout
+        else:
+            context['toolbar'] = False
+            context['docs_base'] = "/"
+            context['layout'] = "layout.mako"
+
+        context.setdefault('_', lambda x:x)
+        return self.lookup.get_template(template).render_unicode(**context)
+
+    def render_string(self, template, context):
+        # this is used for  .js, .css etc. and we don't have
+        # local copies of that stuff here so use the jinja render.
+        return self.jinja2_fallback.render_string(template, context)
+
+class StripDocTestFilter(Filter):
+    def filter(self, lexer, stream):
+        for ttype, value in stream:
+            if ttype is Token.Comment and re.match(r'#\s*doctest:', value):
+                continue
+            yield ttype, value
+
+
+def autodoc_skip_member(app, what, name, obj, skip, options):
+    if what == 'class' and skip and name == '__init__':
+        return False
+    else:
+        return skip
+
+def setup(app):
+#    app.connect('autodoc-skip-member', autodoc_skip_member)
+    # Mako is already in Pygments, adding the local
+    # lexer here so that the latest syntax is available
+    app.add_lexer('mako', MakoLexer())
+    app.add_config_value('site_base', "", True)
+ 
+ 
\ No newline at end of file
diff --git a/lib/mako-0.7.2/doc/build/builder/util.py b/lib/mako-0.7.2/doc/build/builder/util.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/builder/util.py
@@ -0,0 +1,12 @@
+import re
+
+def striptags(text):
+    return re.compile(r'<[^>]*>').sub('', text)
+
+def go(m):
+    # .html with no anchor if present, otherwise "#" for top of page
+    return m.group(1) or '#'
+ 
+def strip_toplevel_anchors(text):
+    return re.compile(r'(\.html)?#[-\w]+-toplevel').sub(go, text)
+ 
diff --git a/lib/mako-0.7.2/doc/build/caching.rst b/lib/mako-0.7.2/doc/build/caching.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/caching.rst
@@ -0,0 +1,393 @@
+.. _caching_toplevel:
+
+=======
+Caching
+=======
+
+Any template or component can be cached using the ``cache``
+argument to the ``<%page>``, ``<%def>`` or ``<%block>`` directives:
+
+.. sourcecode:: mako
+
+    <%page cached="True"/>
+
+    template text
+
+The above template, after being executed the first time, will
+store its content within a cache that by default is scoped
+within memory. Subsequent calls to the template's :meth:`~.Template.render`
+method will return content directly from the cache. When the
+:class:`.Template` object itself falls out of scope, its corresponding
+cache is garbage collected along with the template.
+
+By default, caching requires that the `Beaker <http://beaker.readthedocs.org/>`_ package be installed on the
+system, however the mechanism of caching can be customized to use
+any third party or user defined system -- see :ref:`cache_plugins`.
+
+In addition to being available on the ``<%page>`` tag, the caching flag and all
+its options can be used with the ``<%def>`` tag as well:
+
+.. sourcecode:: mako
+
+    <%def name="mycomp" cached="True" cache_timeout="60">
+        other text
+    </%def>
+
+... and equivalently with the ``<%block>`` tag, anonymous or named:
+
+.. sourcecode:: mako
+
+    <%block cached="True" cache_timeout="60">
+        other text
+    </%block>
+
+Cache Arguments
+===============
+
+Mako has two cache arguments available on tags that are
+available in all cases.   The rest of the arguments
+available are specific to a backend.
+
+The two generic tags arguments are:
+
+* ``cached="True"`` - enable caching for this ``<%page>``,
+  ``<%def>``, or ``<%block>``.
+* ``cache_key`` - the "key" used to uniquely identify this content
+  in the cache.   Usually, this key is chosen automatically
+  based on the name of the rendering callable (i.e. ``body``
+  when used in ``<%page>``, the name of the def when using ``<%def>``,
+  the explicit or internally-generated name when using ``<%block>``).
+  Using the ``cache_key`` parameter, the key can be overridden
+  using a fixed or programmatically generated value.
+
+  For example, here's a page
+  that caches any page which inherits from it, based on the
+  filename of the calling template:
+
+  .. sourcecode:: mako
+
+     <%page cached="True" cache_key="${self.filename}"/>
+
+     ${next.body()}
+
+     ## rest of template
+
+On a :class:`.Template` or :class:`.TemplateLookup`, the
+caching can be configured using these arguments:
+
+* ``cache_enabled`` - Setting this
+  to ``False`` will disable all caching functionality
+  when the template renders.  Defaults to ``True``.
+  e.g.:
+
+  .. sourcecode:: python
+
+      lookup = TemplateLookup(
+                      directories='/path/to/templates',
+                      cache_enabled = False
+                      )
+
+* ``cache_impl`` - The string name of the cache backend
+  to use.   This defaults to ``'beaker'``, which has historically
+  been the only cache backend supported by Mako.
+
+  .. versionadded:: 0.6.0
+
+  For example, here's how to use the upcoming
+  `dogpile.cache <http://dogpilecache.readthedocs.org>`_
+  backend:
+
+  .. sourcecode:: python
+
+      lookup = TemplateLookup(
+                      directories='/path/to/templates',
+                      cache_impl = 'dogpile.cache',
+                      cache_args = {'regions':my_dogpile_regions}
+                      )
+
+* ``cache_args`` - A dictionary of cache parameters that
+  will be consumed by the cache backend.   See
+  :ref:`beaker_backend` for examples.
+
+  .. versionadded:: 0.6.0
+
+Backend-Specific Cache Arguments
+--------------------------------
+
+The ``<%page>``, ``<%def>``, and ``<%block>`` tags
+accept any named argument that starts with the prefix ``"cache_"``.
+Those arguments are then packaged up and passed along to the
+underlying caching implementation, minus the ``"cache_"`` prefix.
+
+The actual arguments understood are determined by the backend.
+
+* :ref:`beaker_backend` - Includes arguments understood by
+  Beaker.
+* :ref:`dogpile.cache_backend` - Includes arguments understood by
+  dogpile.cache.
+
+.. _beaker_backend:
+
+Using the Beaker Cache Backend
+------------------------------
+
+When using Beaker, new implementations will want to make usage
+of **cache regions** so that cache configurations can be maintained
+externally to templates.  These configurations live under
+named "regions" that can be referred to within templates themselves.
+
+.. versionadded:: 0.6.0
+   Support for Beaker cache regions.
+
+For example, suppose we would like two regions.  One is a "short term"
+region that will store content in a memory-based dictionary,
+expiring after 60 seconds.   The other is a Memcached region,
+where values should expire in five minutes.   To configure
+our :class:`.TemplateLookup`, first we get a handle to a
+:class:`beaker.cache.CacheManager`:
+
+.. sourcecode:: python
+
+    from beaker.cache import CacheManager
+
+    manager = CacheManager(cache_regions={
+        'short_term':{
+            'type': 'memory',
+            'expire': 60
+        },
+        'long_term':{
+            'type': 'ext:memcached',
+            'url': '127.0.0.1:11211',
+            'expire': 300
+        }
+    })
+
+    lookup = TemplateLookup(
+                    directories=['/path/to/templates'],
+                    module_directory='/path/to/modules',
+                    cache_impl='beaker',
+                    cache_args={
+                        'manager':manager
+                    }
+            )
+
+Our templates can then opt to cache data in one of either region,
+using the ``cache_region`` argument.   Such as using ``short_term``
+at the ``<%page>`` level:
+
+.. sourcecode:: mako
+
+    <%page cached="True" cache_region="short_term">
+
+    ## ...
+
+Or, ``long_term`` at the ``<%block>`` level:
+
+.. sourcecode:: mako
+
+    <%block name="header" cached="True" cache_region="long_term">
+        other text
+    </%block>
+
+The Beaker backend also works without regions.   There are a
+variety of arguments that can be passed to the ``cache_args``
+dictionary, which are also allowable in templates via the
+``<%page>``, ``<%block>``,
+and ``<%def>`` tags specific to those sections.   The values
+given override those specified at the  :class:`.TemplateLookup`
+or :class:`.Template` level.
+
+With the possible exception
+of ``cache_timeout``, these arguments are probably better off
+staying at the template configuration level.  Each argument
+specified as ``cache_XYZ`` in a template tag is specified
+without the ``cache_`` prefix in the ``cache_args`` dictionary:
+
+* ``cache_timeout`` - number of seconds in which to invalidate the
+  cached data.  After this timeout, the content is re-generated
+  on the next call.  Available as ``timeout`` in the ``cache_args``
+  dictionary.
+* ``cache_type`` - type of caching. ``'memory'``, ``'file'``, ``'dbm'``, or
+  ``'ext:memcached'`` (note that  the string ``memcached`` is
+  also accepted by the dogpile.cache Mako plugin, though not by Beaker itself).
+  Available as ``type`` in the ``cache_args`` dictionary.
+* ``cache_url`` - (only used for ``memcached`` but required) a single
+  IP address or a semi-colon separated list of IP address of
+  memcache servers to use.  Available as ``url`` in the ``cache_args``
+  dictionary.
+* ``cache_dir`` - in the case of the ``'file'`` and ``'dbm'`` cache types,
+  this is the filesystem directory with which to store data
+  files. If this option is not present, the value of
+  ``module_directory`` is used (i.e. the directory where compiled
+  template modules are stored). If neither option is available
+  an exception is thrown.  Available as ``dir`` in the
+  ``cache_args`` dictionary.
+
+.. _dogpile.cache_backend:
+
+Using the dogpile.cache Backend
+-------------------------------
+
+`dogpile.cache`_ is a new replacement for Beaker.   It provides
+a modernized, slimmed down interface and is generally easier to use
+than Beaker.   As of this writing it has not yet been released.  dogpile.cache
+includes its own Mako cache plugin -- see :mod:`dogpile.cache.plugins.mako_cache` in the
+dogpile.cache documentation.
+
+Programmatic Cache Access
+=========================
+
+The :class:`.Template`, as well as any template-derived :class:`.Namespace`, has
+an accessor called ``cache`` which returns the :class:`.Cache` object
+for that template. This object is a facade on top of the underlying
+:class:`.CacheImpl` object, and provides some very rudimental
+capabilities, such as the ability to get and put arbitrary
+values:
+
+.. sourcecode:: mako
+
+    <%
+        local.cache.set("somekey", type="memory", "somevalue")
+    %>
+
+Above, the cache associated with the ``local`` namespace is
+accessed and a key is placed within a memory cache.
+
+More commonly, the ``cache`` object is used to invalidate cached
+sections programmatically:
+
+.. sourcecode:: python
+
+    template = lookup.get_template('/sometemplate.html')
+
+    # invalidate the "body" of the template
+    template.cache.invalidate_body()
+
+    # invalidate an individual def
+    template.cache.invalidate_def('somedef')
+
+    # invalidate an arbitrary key
+    template.cache.invalidate('somekey')
+
+You can access any special method or attribute of the :class:`.CacheImpl`
+itself using the :attr:`impl <.Cache.impl>` attribute:
+
+.. sourcecode:: python
+
+    template.cache.impl.do_something_special()
+
+Note that using implementation-specific methods will mean you can't
+swap in a different kind of :class:`.CacheImpl` implementation at a
+later time.
+
+.. _cache_plugins:
+
+Cache Plugins
+=============
+
+The mechanism used by caching can be plugged in
+using a :class:`.CacheImpl` subclass.    This class implements
+the rudimental methods Mako needs to implement the caching
+API.   Mako includes the :class:`.BeakerCacheImpl` class to
+provide the default implementation.  A :class:`.CacheImpl` class
+is acquired by Mako using a ``pkg_resources`` entrypoint, using
+the name given as the ``cache_impl`` argument to :class:`.Template`
+or :class:`.TemplateLookup`.    This entry point can be
+installed via the standard `setuptools`/``setup()`` procedure, underneath
+the `EntryPoint` group named ``"mako.cache"``.  It can also be
+installed at runtime via a convenience installer :func:`.register_plugin`
+which accomplishes essentially the same task.
+
+An example plugin that implements a local dictionary cache:
+
+.. sourcecode:: python
+
+    from mako.cache import Cacheimpl, register_plugin
+
+    class SimpleCacheImpl(CacheImpl):
+        def __init__(self, cache):
+            super(SimpleCacheImpl, self).__init__(cache)
+            self._cache = {}
+
+        def get_or_create(self, key, creation_function, **kw):
+            if key in self._cache:
+                return self._cache[key]
+            else:
+                self._cache[key] = value = creation_function()
+                return value
+
+        def set(self, key, value, **kwargs):
+            self._cache[key] = value
+
+        def get(self, key, **kwargs):
+            return self._cache.get(key)
+
+        def invalidate(self, key, **kwargs):
+            self._cache.pop(key, None)
+
+    # optional - register the class locally
+    register_plugin("simple", __name__, "SimpleCacheImpl")
+
+Enabling the above plugin in a template would look like:
+
+.. sourcecode:: python
+
+    t = Template("mytemplate",
+                 file="mytemplate.html",
+                 cache_impl='simple')
+
+Guidelines for Writing Cache Plugins
+------------------------------------
+
+* The :class:`.CacheImpl` is created on a per-:class:`.Template` basis.  The
+  class should ensure that only data for the parent :class:`.Template` is
+  persisted or returned by the cache methods.    The actual :class:`.Template`
+  is available via the ``self.cache.template`` attribute.   The ``self.cache.id``
+  attribute, which is essentially the unique modulename of the template, is
+  a good value to use in order to represent a unique namespace of keys specific
+  to the template.
+* Templates only use the :meth:`.CacheImpl.get_or_create()` method
+  in an implicit fashion.  The :meth:`.CacheImpl.set`,
+  :meth:`.CacheImpl.get`, and :meth:`.CacheImpl.invalidate` methods are
+  only used in response to direct programmatic access to the corresponding
+  methods on the :class:`.Cache` object.
+* :class:`.CacheImpl` will be accessed in a multithreaded fashion if the
+  :class:`.Template` itself is used multithreaded.  Care should be taken
+  to ensure caching implementations are threadsafe.
+* A library like `Dogpile <http://pypi.python.org/pypi/dogpile.core>`_, which
+  is a minimal locking system derived from Beaker, can be used to help
+  implement the :meth:`.CacheImpl.get_or_create` method in a threadsafe
+  way that can maximize effectiveness across multiple threads as well
+  as processes. :meth:`.CacheImpl.get_or_create` is the
+  key method used by templates.
+* All arguments passed to ``**kw`` come directly from the parameters
+  inside the ``<%def>``, ``<%block>``, or ``<%page>`` tags directly,
+  minus the ``"cache_"`` prefix, as strings, with the exception of
+  the argument ``cache_timeout``, which is passed to the plugin
+  as the name ``timeout`` with the value converted to an integer.
+  Arguments present in ``cache_args`` on :class:`.Template` or
+  :class:`.TemplateLookup` are passed directly, but are superseded
+  by those present in the most specific template tag.
+* The directory where :class:`.Template` places module files can
+  be acquired using the accessor ``self.cache.template.module_directory``.
+  This directory can be a good place to throw cache-related work
+  files, underneath a prefix like ``_my_cache_work`` so that name
+  conflicts with generated modules don't occur.
+
+API Reference
+=============
+
+.. autoclass:: mako.cache.Cache
+    :members:
+    :show-inheritance:
+
+.. autoclass:: mako.cache.CacheImpl
+    :members:
+    :show-inheritance:
+
+.. autofunction:: mako.cache.register_plugin
+
+.. autoclass:: mako.ext.beaker_cache.BeakerCacheImpl
+    :members:
+    :show-inheritance:
+
diff --git a/lib/mako-0.7.2/doc/build/conf.py b/lib/mako-0.7.2/doc/build/conf.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/conf.py
@@ -0,0 +1,287 @@
+# -*- coding: utf-8 -*-
+#
+# Mako documentation build configuration file
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('../..'))
+sys.path.insert(0, os.path.abspath('.'))
+
+import mako
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+#extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode',
+#                'sphinx.ext.doctest', 'builder.builders']
+
+extensions = ['sphinx.ext.autodoc','sphinx.ext.intersphinx',
+                'sphinx.ext.doctest', 'builder.builders']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['templates']
+
+nitpicky = True
+
+site_base = "http://www.makotemplates.org"
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+template_bridge = "builder.builders.MakoBridge"
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Mako'
+copyright = u'the Mako authors and contributors'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = mako.__version__
+# The full version, including alpha/beta/rc tags.
+release = mako.__version__
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The style sheet to use for HTML and HTML Help pages. A file of that name
+# must exist either in Sphinx' static/ path, or in one of the custom paths
+# given in html_static_path.
+html_style = 'default.css'
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+html_title = "%s %s Documentation" % (project, release)
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+html_last_updated_fmt = '%m/%d/%Y %H:%M:%S'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+html_domain_indices = False
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, the reST sources are included in the HTML build as _sources/<name>.
+#html_copy_source = True
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Makodoc'
+
+#autoclass_content = 'both'
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'mako_%s.tex' % release.replace('.', '_'), ur'Mako Documentation',
+   ur'Mike Bayer', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+# sets TOC depth to 2.
+latex_preamble = '\setcounter{tocdepth}{3}'
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+#latex_elements = {
+#    'papersize': 'letterpaper',
+#    'pointsize': '10pt',
+#}
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'mako', u'Mako Documentation',
+     [u'Mako authors'], 1)
+]
+
+
+# -- Options for Epub output ---------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = u'Mako'
+epub_author = u'Mako authors'
+epub_publisher = u'Mako authors'
+epub_copyright = u'Mako authors'
+
+# The language of the text. It defaults to the language option
+# or en if the language is not set.
+#epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+#epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#epub_identifier = ''
+
+# A unique identification for the text.
+#epub_uid = ''
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_pre_files = []
+
+# HTML files shat should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+#epub_exclude_files = []
+
+# The depth of the table of contents in toc.ncx.
+#epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#epub_tocdup = True
+
+intersphinx_mapping = {
+    'dogpilecache':('http://dogpilecache.readthedocs.org/en/latest', None),
+    'beaker':('http://beaker.readthedocs.org/en/latest',None),
+}
diff --git a/lib/mako-0.7.2/doc/build/defs.rst b/lib/mako-0.7.2/doc/build/defs.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/defs.rst
@@ -0,0 +1,622 @@
+.. _defs_toplevel:
+
+===============
+Defs and Blocks
+===============
+
+``<%def>`` and ``<%block>`` are two tags that both demarcate any block of text
+and/or code.   They both exist within generated Python as a callable function,
+i.e., a Python ``def``.   They differ in their scope and calling semantics.
+Whereas ``<%def>`` provides a construct that is very much like a named Python
+``def``, the ``<%block>`` is more layout oriented.
+
+Using Defs
+==========
+
+The ``<%def>`` tag requires a ``name`` attribute, where the ``name`` references
+a Python function signature:
+
+.. sourcecode:: mako
+
+    <%def name="hello()">
+        hello world
+    </%def>
+
+To invoke the ``<%def>``, it is normally called as an expression:
+
+.. sourcecode:: mako
+
+    the def:  ${hello()}
+
+If the ``<%def>`` is not nested inside of another ``<%def>``,
+it's known as a **top level def** and can be accessed anywhere in
+the template, including above where it was defined.
+
+All defs, top level or not, have access to the current
+contextual namespace in exactly the same way their containing
+template does. Suppose the template below is executed with the
+variables ``username`` and ``accountdata`` inside the context:
+
+.. sourcecode:: mako
+
+    Hello there ${username}, how are ya.  Lets see what your account says:
+
+    ${account()}
+
+    <%def name="account()">
+        Account for ${username}:<br/>
+
+        % for row in accountdata:
+            Value: ${row}<br/>
+        % endfor
+    </%def>
+
+The ``username`` and ``accountdata`` variables are present
+within the main template body as well as the body of the
+``account()`` def.
+
+Since defs are just Python functions, you can define and pass
+arguments to them as well:
+
+.. sourcecode:: mako
+
+    ${account(accountname='john')}
+
+    <%def name="account(accountname, type='regular')">
+        account name: ${accountname}, type: ${type}
+    </%def>
+
+When you declare an argument signature for your def, they are
+required to follow normal Python conventions (i.e., all
+arguments are required except keyword arguments with a default
+value). This is in contrast to using context-level variables,
+which evaluate to ``UNDEFINED`` if you reference a name that
+does not exist.
+
+Calling Defs from Other Files
+-----------------------------
+
+Top level ``<%def>``\ s are **exported** by your template's
+module, and can be called from the outside; including from other
+templates, as well as normal Python code. Calling a ``<%def>``
+from another template is something like using an ``<%include>``
+-- except you are calling a specific function within the
+template, not the whole template.
+
+The remote ``<%def>`` call is also a little bit like calling
+functions from other modules in Python. There is an "import"
+step to pull the names from another template into your own
+template; then the function or functions are available.
+
+To import another template, use the ``<%namespace>`` tag:
+
+.. sourcecode:: mako
+
+    <%namespace name="mystuff" file="mystuff.html"/>
+
+The above tag adds a local variable ``mystuff`` to the current
+scope.
+
+Then, just call the defs off of ``mystuff``:
+
+.. sourcecode:: mako
+
+    ${mystuff.somedef(x=5,y=7)}
+
+The ``<%namespace>`` tag also supports some of the other
+semantics of Python's ``import`` statement, including pulling
+names into the local variable space, or using ``*`` to represent
+all names, using the ``import`` attribute:
+
+.. sourcecode:: mako
+
+    <%namespace file="mystuff.html" import="foo, bar"/>
+
+This is just a quick intro to the concept of a **namespace**,
+which is a central Mako concept that has its own chapter in
+these docs. For more detail and examples, see
+:ref:`namespaces_toplevel`.
+
+Calling Defs Programmatically
+-----------------------------
+
+You can call defs programmatically from any :class:`.Template` object
+using the :meth:`~.Template.get_def()` method, which returns a :class:`.DefTemplate`
+object. This is a :class:`.Template` subclass which the parent
+:class:`.Template` creates, and is usable like any other template:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    template = Template("""
+        <%def name="hi(name)">
+            hi ${name}!
+        </%def>
+
+        <%def name="bye(name)">
+            bye ${name}!
+        </%def>
+    """)
+
+    print template.get_def("hi").render(name="ed")
+    print template.get_def("bye").render(name="ed")
+
+Defs within Defs
+----------------
+
+The def model follows regular Python rules for closures.
+Declaring ``<%def>`` inside another ``<%def>`` declares it
+within the parent's **enclosing scope**:
+
+.. sourcecode:: mako
+
+    <%def name="mydef()">
+        <%def name="subdef()">
+            a sub def
+        </%def>
+
+        i'm the def, and the subcomponent is ${subdef()}
+    </%def>
+
+Just like Python, names that exist outside the inner ``<%def>``
+exist inside it as well:
+
+.. sourcecode:: mako
+
+    <%
+        x = 12
+    %>
+    <%def name="outer()">
+        <%
+            y = 15
+        %>
+        <%def name="inner()">
+            inner, x is ${x}, y is ${y}
+        </%def>
+
+        outer, x is ${x}, y is ${y}
+    </%def>
+
+Assigning to a name inside of a def declares that name as local
+to the scope of that def (again, like Python itself). This means
+the following code will raise an error:
+
+.. sourcecode:: mako
+
+    <%
+        x = 10
+    %>
+    <%def name="somedef()">
+        ## error !
+        somedef, x is ${x}
+        <%
+            x = 27
+        %>
+    </%def>
+
+...because the assignment to ``x`` declares ``x`` as local to the
+scope of ``somedef``, rendering the "outer" version unreachable
+in the expression that tries to render it.
+
+.. _defs_with_content:
+
+Calling a Def with Embedded Content and/or Other Defs
+-----------------------------------------------------
+
+A flip-side to def within def is a def call with content. This
+is where you call a def, and at the same time declare a block of
+content (or multiple blocks) that can be used by the def being
+called. The main point of such a call is to create custom,
+nestable tags, just like any other template language's
+custom-tag creation system -- where the external tag controls the
+execution of the nested tags and can communicate state to them.
+Only with Mako, you don't have to use any external Python
+modules, you can define arbitrarily nestable tags right in your
+templates.
+
+To achieve this, the target def is invoked using the form
+``<%namepacename:defname>`` instead of the normal ``${}``
+syntax. This syntax, introduced in Mako 0.2.3, is functionally
+equivalent to another tag known as ``%call``, which takes the form
+``<%call expr='namespacename.defname(args)'>``. While ``%call``
+is available in all versions of Mako, the newer style is
+probably more familiar looking. The ``namespace`` portion of the
+call is the name of the **namespace** in which the def is
+defined -- in the most simple cases, this can be ``local`` or
+``self`` to reference the current template's namespace (the
+difference between ``local`` and ``self`` is one of inheritance
+-- see :ref:`namespaces_builtin` for details).
+
+When the target def is invoked, a variable ``caller`` is placed
+in its context which contains another namespace containing the
+body and other defs defined by the caller. The body itself is
+referenced by the method ``body()``. Below, we build a ``%def``
+that operates upon ``caller.body()`` to invoke the body of the
+custom tag:
+
+.. sourcecode:: mako
+
+    <%def name="buildtable()">
+        <table>
+            <tr><td>
+                ${caller.body()}
+            </td></tr>
+        </table>
+    </%def>
+
+    <%self:buildtable>
+        I am the table body.
+    </%self:buildtable>
+
+This produces the output (whitespace formatted):
+
+.. sourcecode:: html
+
+    <table>
+        <tr><td>
+            I am the table body.
+        </td></tr>
+    </table>
+
+Using the older ``%call`` syntax looks like:
+
+.. sourcecode:: mako
+
+    <%def name="buildtable()">
+        <table>
+            <tr><td>
+                ${caller.body()}
+            </td></tr>
+        </table>
+    </%def>
+
+    <%call expr="buildtable()">
+        I am the table body.
+    </%call>
+
+The ``body()`` can be executed multiple times or not at all.
+This means you can use def-call-with-content to build iterators,
+conditionals, etc:
+
+.. sourcecode:: mako
+
+    <%def name="lister(count)">
+        % for x in range(count):
+            ${caller.body()}
+        % endfor
+    </%def>
+
+    <%self:lister count="${3}">
+        hi
+    </%self:lister>
+
+Produces:
+
+.. sourcecode:: html
+
+    hi
+    hi
+    hi
+
+Notice above we pass ``3`` as a Python expression, so that it
+remains as an integer.
+
+A custom "conditional" tag:
+
+.. sourcecode:: mako
+
+    <%def name="conditional(expression)">
+        % if expression:
+            ${caller.body()}
+        % endif
+    </%def>
+
+    <%self:conditional expression="${4==4}">
+        i'm the result
+    </%self:conditional>
+
+Produces:
+
+.. sourcecode:: html
+
+    i'm the result
+
+But that's not all. The ``body()`` function also can handle
+arguments, which will augment the local namespace of the body
+callable. The caller must define the arguments which it expects
+to receive from its target def using the ``args`` attribute,
+which is a comma-separated list of argument names. Below, our
+``<%def>`` calls the ``body()`` of its caller, passing in an
+element of data from its argument:
+
+.. sourcecode:: mako
+
+    <%def name="layoutdata(somedata)">
+        <table>
+        % for item in somedata:
+            <tr>
+            % for col in item:
+                <td>${caller.body(col=col)}</td>
+            % endfor
+            </tr>
+        % endfor
+        </table>
+    </%def>
+
+    <%self:layoutdata somedata="${[[1,2,3],[4,5,6],[7,8,9]]}" args="col">\
+    Body data: ${col}\
+    </%self:layoutdata>
+
+Produces:
+
+.. sourcecode:: html
+
+    <table>
+        <tr>
+            <td>Body data: 1</td>
+            <td>Body data: 2</td>
+            <td>Body data: 3</td>
+        </tr>
+        <tr>
+            <td>Body data: 4</td>
+            <td>Body data: 5</td>
+            <td>Body data: 6</td>
+        </tr>
+        <tr>
+            <td>Body data: 7</td>
+            <td>Body data: 8</td>
+            <td>Body data: 9</td>
+        </tr>
+    </table>
+
+You don't have to stick to calling just the ``body()`` function.
+The caller can define any number of callables, allowing the
+``<%call>`` tag to produce whole layouts:
+
+.. sourcecode:: mako
+
+    <%def name="layout()">
+        ## a layout def
+        <div class="mainlayout">
+            <div class="header">
+                ${caller.header()}
+            </div>
+
+            <div class="sidebar">
+                ${caller.sidebar()}
+            </div>
+
+            <div class="content">
+                ${caller.body()}
+            </div>
+        </div>
+    </%def>
+
+    ## calls the layout def
+    <%self:layout>
+        <%def name="header()">
+            I am the header
+        </%def>
+        <%def name="sidebar()">
+            <ul>
+                <li>sidebar 1</li>
+                <li>sidebar 2</li>
+            </ul>
+        </%def>
+
+            this is the body
+    </%self:layout>
+
+The above layout would produce:
+
+.. sourcecode:: html
+
+    <div class="mainlayout">
+        <div class="header">
+        I am the header
+        </div>
+
+        <div class="sidebar">
+        <ul>
+            <li>sidebar 1</li>
+            <li>sidebar 2</li>
+        </ul>
+        </div>
+
+        <div class="content">
+        this is the body
+        </div>
+    </div>
+
+The number of things you can do with ``<%call>`` and/or the
+``<%namespacename:defname>`` calling syntax is enormous. You can
+create form widget libraries, such as an enclosing ``<FORM>``
+tag and nested HTML input elements, or portable wrapping schemes
+using ``<div>`` or other elements. You can create tags that
+interpret rows of data, such as from a database, providing the
+individual columns of each row to a ``body()`` callable which
+lays out the row any way it wants. Basically anything you'd do
+with a "custom tag" or tag library in some other system, Mako
+provides via ``<%def>`` tags and plain Python callables which are
+invoked via ``<%namespacename:defname>`` or ``<%call>``.
+
+.. _blocks:
+
+Using Blocks
+============
+
+The ``<%block>`` tag introduces some new twists on the
+``<%def>`` tag which make it more closely tailored towards layout.
+
+.. versionadded:: 0.4.1
+
+An example of a block:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+            <%block>
+                this is a block.
+            </%block>
+        </body>
+    </html>
+
+In the above example, we define a simple block.  The block renders its content in the place
+that it's defined.  Since the block is called for us, it doesn't need a name and the above
+is referred to as an **anonymous block**.  So the output of the above template will be:
+
+.. sourcecode:: html
+
+    <html>
+        <body>
+                this is a block.
+        </body>
+    </html>
+
+So in fact the above block has absolutely no effect.  Its usefulness comes when we start
+using modifiers.  Such as, we can apply a filter to our block:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+            <%block filter="h">
+                <html>this is some escaped html.</html>
+            </%block>
+        </body>
+    </html>
+
+or perhaps a caching directive:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+            <%block cached="True" cache_timeout="60">
+                This content will be cached for 60 seconds.
+            </%block>
+        </body>
+    </html>
+
+Blocks also work in iterations, conditionals, just like defs:
+
+.. sourcecode:: mako
+
+    % if some_condition:
+        <%block>condition is met</%block>
+    % endif
+
+While the block renders at the point it is defined in the template,
+the underlying function is present in the generated Python code only
+once, so there's no issue with placing a block inside of a loop or
+similar. Anonymous blocks are defined as closures in the local
+rendering body, so have access to local variable scope:
+
+.. sourcecode:: mako
+
+    % for i in range(1, 4):
+        <%block>i is ${i}</%block>
+    % endfor
+
+Using Named Blocks
+------------------
+
+Possibly the more important area where blocks are useful is when we
+do actually give them names. Named blocks are tailored to behave
+somewhat closely to Jinja2's block tag, in that they define an area
+of a layout which can be overridden by an inheriting template. In
+sharp contrast to the ``<%def>`` tag, the name given to a block is
+global for the entire template regardless of how deeply it's nested:
+
+.. sourcecode:: mako
+
+    <html>
+    <%block name="header">
+        <head>
+            <title>
+                <%block name="title">Title</%block>
+            </title>
+        </head>
+    </%block>
+    <body>
+        ${next.body()}
+    </body>
+    </html>
+
+The above example has two named blocks "``header``" and "``title``", both of which can be referred to
+by an inheriting template. A detailed walkthrough of this usage can be found at :ref:`inheritance_toplevel`.
+
+Note above that named blocks don't have any argument declaration the way defs do. They still implement themselves
+as Python functions, however, so they can be invoked additional times beyond their initial definition:
+
+.. sourcecode:: mako
+
+    <div name="page">
+        <%block name="pagecontrol">
+            <a href="">previous page</a> |
+            <a href="">next page</a>
+        </%block>
+
+        <table>
+            ## some content
+        </table>
+
+        ${pagecontrol()}
+    </div>
+
+The content referenced by ``pagecontrol`` above will be rendered both above and below the ``<table>`` tags.
+
+To keep things sane, named blocks have restrictions that defs do not:
+
+* The ``<%block>`` declaration cannot have any argument signature.
+* The name of a ``<%block>`` can only be defined once in a template -- an error is raised if two blocks of the same
+  name occur anywhere in a single template, regardless of nesting.  A similar error is raised if a top level def
+  shares the same name as that of a block.
+* A named ``<%block>`` cannot be defined within a ``<%def>``, or inside the body of a "call", i.e.
+  ``<%call>`` or ``<%namespacename:defname>`` tag.  Anonymous blocks can, however.
+
+Using Page Arguments in Named Blocks
+------------------------------------
+
+A named block is very much like a top level def. It has a similar
+restriction to these types of defs in that arguments passed to the
+template via the ``<%page>`` tag aren't automatically available.
+Using arguments with the ``<%page>`` tag is described in the section
+:ref:`namespaces_body`, and refers to scenarios such as when the
+``body()`` method of a template is called from an inherited template passing
+arguments, or the template is invoked from an ``<%include>`` tag
+with arguments. To allow a named block to share the same arguments
+passed to the page, the ``args`` attribute can be used:
+
+.. sourcecode:: mako
+
+    <%page args="post"/>
+
+    <a name="${post.title}" />
+
+    <span class="post_prose">
+        <%block name="post_prose" args="post">
+            ${post.content}
+        </%block>
+    </span>
+
+Where above, if the template is called via a directive like
+``<%include file="post.mako" args="post=post" />``, the ``post``
+variable is available both in the main body as well as the
+``post_prose`` block.
+
+Similarly, the ``**pageargs`` variable is present, in named blocks only,
+for those arguments not explicit in the ``<%page>`` tag:
+
+.. sourcecode:: mako
+
+    <%block name="post_prose">
+        ${pageargs['post'].content}
+    </%block>
+
+The ``args`` attribute is only allowed with named blocks. With
+anonymous blocks, the Python function is always rendered in the same
+scope as the call itself, so anything available directly outside the
+anonymous block is available inside as well.
diff --git a/lib/mako-0.7.2/doc/build/filtering.rst b/lib/mako-0.7.2/doc/build/filtering.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/filtering.rst
@@ -0,0 +1,344 @@
+.. _filtering_toplevel:
+
+=======================
+Filtering and Buffering
+=======================
+
+Expression Filtering
+====================
+
+As described in the chapter :ref:`syntax_toplevel`, the "``|``" operator can be
+applied to a "``${}``" expression to apply escape filters to the
+output:
+
+.. sourcecode:: mako
+
+    ${"this is some text" | u}
+
+The above expression applies URL escaping to the expression, and
+produces ``this+is+some+text``.
+
+The built-in escape flags are:
+
+* ``u`` : URL escaping, provided by
+  ``urllib.quote_plus(string.encode('utf-8'))``
+* ``h`` : HTML escaping, provided by
+  ``markupsafe.escape(string)``
+
+  .. versionadded:: 0.3.4
+     Prior versions use ``cgi.escape(string, True)``.
+
+* ``x`` : XML escaping
+* ``trim`` : whitespace trimming, provided by ``string.strip()``
+* ``entity`` : produces HTML entity references for applicable
+  strings, derived from ``htmlentitydefs``
+* ``unicode`` (``str`` on Python 3): produces a Python unicode
+  string (this function is applied by default)
+* ``decode.<some encoding>``: decode input into a Python
+  unicode with the specified encoding
+* ``n`` : disable all default filtering; only filters specified
+  in the local expression tag will be applied.
+
+To apply more than one filter, separate them by a comma:
+
+.. sourcecode:: mako
+
+    ${" <tag>some value</tag> " | h,trim}
+
+The above produces ``&lt;tag&gt;some value&lt;/tag&gt;``, with
+no leading or trailing whitespace. The HTML escaping function is
+applied first, the "trim" function second.
+
+Naturally, you can make your own filters too. A filter is just a
+Python function that accepts a single string argument, and
+returns the filtered result. The expressions after the ``|``
+operator draw upon the local namespace of the template in which
+they appear, meaning you can define escaping functions locally:
+
+.. sourcecode:: mako
+
+    <%!
+        def myescape(text):
+            return "<TAG>" + text + "</TAG>"
+    %>
+
+    Here's some tagged text: ${"text" | myescape}
+
+Or from any Python module:
+
+.. sourcecode:: mako
+
+    <%!
+        import myfilters
+    %>
+
+    Here's some tagged text: ${"text" | myfilters.tagfilter}
+
+A page can apply a default set of filters to all expression tags
+using the ``expression_filter`` argument to the ``%page`` tag:
+
+.. sourcecode:: mako
+
+    <%page expression_filter="h"/>
+
+    Escaped text:  ${"<html>some html</html>"}
+
+Result:
+
+.. sourcecode:: html
+
+    Escaped text: &lt;html&gt;some html&lt;/html&gt;
+
+.. _filtering_default_filters:
+
+The ``default_filters`` Argument
+--------------------------------
+
+In addition to the ``expression_filter`` argument, the
+``default_filters`` argument to both :class:`.Template` and
+:class:`.TemplateLookup` can specify filtering for all expression tags
+at the programmatic level. This array-based argument, when given
+its default argument of ``None``, will be internally set to
+``["unicode"]`` (or ``["str"]`` on Python 3), except when
+``disable_unicode=True`` is set in which case it defaults to
+``["str"]``:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'], default_filters=['unicode'])
+
+To replace the usual ``unicode``/``str`` function with a
+specific encoding, the ``decode`` filter can be substituted:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'], default_filters=['decode.utf8'])
+
+To disable ``default_filters`` entirely, set it to an empty
+list:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'], default_filters=[])
+
+Any string name can be added to ``default_filters`` where it
+will be added to all expressions as a filter. The filters are
+applied from left to right, meaning the leftmost filter is
+applied first.
+
+.. sourcecode:: python
+
+    t = Template(templatetext, default_filters=['unicode', 'myfilter'])
+
+To ease the usage of ``default_filters`` with custom filters,
+you can also add imports (or other code) to all templates using
+the ``imports`` argument:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['/tmp'],
+                       default_filters=['unicode', 'myfilter'],
+                       imports=['from mypackage import myfilter'])
+
+The above will generate templates something like this:
+
+.. sourcecode:: python
+
+    # ....
+    from mypackage import myfilter
+
+    def render_body(context):
+        context.write(myfilter(unicode("some text")))
+
+Turning off Filtering with the ``n`` Filter
+-------------------------------------------
+
+In all cases the special ``n`` filter, used locally within an
+expression, will **disable** all filters declared in the
+``<%page>`` tag as well as in ``default_filters``. Such as:
+
+.. sourcecode:: mako
+
+    ${'myexpression' | n}
+
+will render ``myexpression`` with no filtering of any kind, and:
+
+.. sourcecode:: mako
+
+    ${'myexpression' | n,trim}
+
+will render ``myexpression`` using the ``trim`` filter only.
+
+Filtering Defs and Blocks
+=========================
+
+The ``%def`` and ``%block`` tags have an argument called ``filter`` which will apply the
+given list of filter functions to the output of the ``%def``:
+
+.. sourcecode:: mako
+
+    <%def name="foo()" filter="h, trim">
+        <b>this is bold</b>
+    </%def>
+
+When the ``filter`` attribute is applied to a def as above, the def
+is automatically **buffered** as well. This is described next.
+
+Buffering
+=========
+
+One of Mako's central design goals is speed. To this end, all of
+the textual content within a template and its various callables
+is by default piped directly to the single buffer that is stored
+within the :class:`.Context` object. While this normally is easy to
+miss, it has certain side effects. The main one is that when you
+call a def using the normal expression syntax, i.e.
+``${somedef()}``, it may appear that the return value of the
+function is the content it produced, which is then delivered to
+your template just like any other expression substitution,
+except that normally, this is not the case; the return value of
+``${somedef()}`` is simply the empty string ``''``. By the time
+you receive this empty string, the output of ``somedef()`` has
+been sent to the underlying buffer.
+
+You may not want this effect, if for example you are doing
+something like this:
+
+.. sourcecode:: mako
+
+    ${" results " + somedef() + " more results "}
+
+If the ``somedef()`` function produced the content "``somedef's
+results``", the above template would produce this output:
+
+.. sourcecode:: html
+
+    somedef's results results more results
+
+This is because ``somedef()`` fully executes before the
+expression returns the results of its concatenation; the
+concatenation in turn receives just the empty string as its
+middle expression.
+
+Mako provides two ways to work around this. One is by applying
+buffering to the ``%def`` itself:
+
+.. sourcecode:: mako
+
+    <%def name="somedef()" buffered="True">
+        somedef's results
+    </%def>
+
+The above definition will generate code similar to this:
+
+.. sourcecode:: python
+
+    def somedef():
+        context.push_buffer()
+        try:
+            context.write("somedef's results")
+        finally:
+            buf = context.pop_buffer()
+        return buf.getvalue()
+
+So that the content of ``somedef()`` is sent to a second buffer,
+which is then popped off the stack and its value returned. The
+speed hit inherent in buffering the output of a def is also
+apparent.
+
+Note that the ``filter`` argument on ``%def`` also causes the def to
+be buffered. This is so that the final content of the ``%def`` can
+be delivered to the escaping function in one batch, which
+reduces method calls and also produces more deterministic
+behavior for the filtering function itself, which can possibly
+be useful for a filtering function that wishes to apply a
+transformation to the text as a whole.
+
+The other way to buffer the output of a def or any Mako callable
+is by using the built-in ``capture`` function. This function
+performs an operation similar to the above buffering operation
+except it is specified by the caller.
+
+.. sourcecode:: mako
+
+    ${" results " + capture(somedef) + " more results "}
+
+Note that the first argument to the ``capture`` function is
+**the function itself**, not the result of calling it. This is
+because the ``capture`` function takes over the job of actually
+calling the target function, after setting up a buffered
+environment. To send arguments to the function, just send them
+to ``capture`` instead:
+
+.. sourcecode:: mako
+
+    ${capture(somedef, 17, 'hi', use_paging=True)}
+
+The above call is equivalent to the unbuffered call:
+
+.. sourcecode:: mako
+
+    ${somedef(17, 'hi', use_paging=True)}
+
+Decorating
+==========
+
+.. versionadded:: 0.2.5
+
+Somewhat like a filter for a ``%def`` but more flexible, the ``decorator``
+argument to ``%def`` allows the creation of a function that will
+work in a similar manner to a Python decorator. The function can
+control whether or not the function executes. The original
+intent of this function is to allow the creation of custom cache
+logic, but there may be other uses as well.
+
+``decorator`` is intended to be used with a regular Python
+function, such as one defined in a library module. Here we'll
+illustrate the python function defined in the template for
+simplicities' sake:
+
+.. sourcecode:: mako
+
+    <%!
+        def bar(fn):
+            def decorate(context, *args, **kw):
+                context.write("BAR")
+                fn(*args, **kw)
+                context.write("BAR")
+                return ''
+            return decorate
+    %>
+
+    <%def name="foo()" decorator="bar">
+        this is foo
+    </%def>
+
+    ${foo()}
+
+The above template will return, with more whitespace than this,
+``"BAR this is foo BAR"``. The function is the render callable
+itself (or possibly a wrapper around it), and by default will
+write to the context. To capture its output, use the :func:`.capture`
+callable in the ``mako.runtime`` module (available in templates
+as just ``runtime``):
+
+.. sourcecode:: mako
+
+    <%!
+        def bar(fn):
+            def decorate(context, *args, **kw):
+                return "BAR" + runtime.capture(context, fn, *args, **kw) + "BAR"
+            return decorate
+    %>
+
+    <%def name="foo()" decorator="bar">
+        this is foo
+    </%def>
+
+    ${foo()}
+
+The decorator can be used with top-level defs as well as nested
+defs, and blocks too. Note that when calling a top-level def from the
+:class:`.Template` API, i.e. ``template.get_def('somedef').render()``,
+the decorator has to write the output to the ``context``, i.e.
+as in the first example. The return value gets discarded.
diff --git a/lib/mako-0.7.2/doc/build/index.rst b/lib/mako-0.7.2/doc/build/index.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/index.rst
@@ -0,0 +1,22 @@
+Table of Contents
+=================
+
+.. toctree::
+    :maxdepth: 2
+
+    usage
+    syntax
+    defs
+    runtime
+    namespaces
+    inheritance
+    filtering
+    unicode
+    caching
+
+Indices and Tables
+------------------
+
+* :ref:`genindex`
+* :ref:`search`
+
diff --git a/lib/mako-0.7.2/doc/build/inheritance.rst b/lib/mako-0.7.2/doc/build/inheritance.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/inheritance.rst
@@ -0,0 +1,534 @@
+.. _inheritance_toplevel:
+
+===========
+Inheritance
+===========
+
+.. note::  Most of the inheritance examples here take advantage of a feature that's
+    new in Mako as of version 0.4.1 called the "block".  This tag is very similar to
+    the "def" tag but is more streamlined for usage with inheritance.  Note that
+    all of the examples here which use blocks can also use defs instead.  Contrasting
+    usages will be illustrated.
+
+Using template inheritance, two or more templates can organize
+themselves into an **inheritance chain**, where content and
+functions from all involved templates can be intermixed. The
+general paradigm of template inheritance is this: if a template
+``A`` inherits from template ``B``, then template ``A`` agrees
+to send the executional control to template ``B`` at runtime
+(``A`` is called the **inheriting** template). Template ``B``,
+the **inherited** template, then makes decisions as to what
+resources from ``A`` shall be executed.
+
+In practice, it looks like this. Here's a hypothetical inheriting
+template, ``index.html``:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+
+    <%block name="header">
+        this is some header content
+    </%block>
+
+    this is the body content.
+
+And ``base.html``, the inherited template:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                <%block name="header"/>
+            </div>
+
+            ${self.body()}
+
+            <div class="footer">
+                <%block name="footer">
+                    this is the footer
+                </%block>
+            </div>
+        </body>
+    </html>
+
+Here is a breakdown of the execution:
+
+#. When ``index.html`` is rendered, control immediately passes to
+   ``base.html``.
+#. ``base.html`` then renders the top part of an HTML document,
+   then invokes the ``<%block name="header">`` block.  It invokes the
+   underlying ``header()`` function off of a built-in namespace
+   called ``self`` (this namespace was first introduced in the
+   :doc:`Namespaces chapter <namespaces>` in :ref:`namespace_self`). Since
+   ``index.html`` is the topmost template and also defines a block
+   called ``header``, it's this ``header`` block that ultimately gets
+   executed -- instead of the one that's present in ``base.html``.
+#. Control comes back to ``base.html``. Some more HTML is
+   rendered.
+#. ``base.html`` executes ``self.body()``. The ``body()``
+   function on all template-based namespaces refers to the main
+   body of the template, therefore the main body of
+   ``index.html`` is rendered.
+#. When ``<%block name="header">`` is encountered in ``index.html`` 
+   during the ``self.body()`` call, a conditional is checked -- does the
+   current inherited template, i.e. ``base.html``, also define this block? If yes,
+   the ``<%block>`` is **not** executed here -- the inheritance
+   mechanism knows that the parent template is responsible for rendering
+   this block (and in fact it already has).  In other words a block
+   only renders in its *basemost scope*.
+#. Control comes back to ``base.html``. More HTML is rendered,
+   then the ``<%block name="footer">`` expression is invoked.
+#. The ``footer`` block is only defined in ``base.html``, so being
+   the topmost definition of ``footer``, it's the one that
+   executes. If ``index.html`` also specified ``footer``, then
+   its version would **override** that of the base.
+#. ``base.html`` finishes up rendering its HTML and the template
+   is complete, producing:
+
+   .. sourcecode:: html
+
+        <html>
+            <body>
+                <div class="header">
+                    this is some header content
+                </div>
+
+                this is the body content.
+
+                <div class="footer">
+                    this is the footer
+                </div>
+            </body>
+        </html>
+
+...and that is template inheritance in a nutshell. The main idea
+is that the methods that you call upon ``self`` always
+correspond to the topmost definition of that method. Very much
+the way ``self`` works in a Python class, even though Mako is
+not actually using Python class inheritance to implement this
+functionality. (Mako doesn't take the "inheritance" metaphor too
+seriously; while useful to setup some commonly recognized
+semantics, a textual template is not very much like an
+object-oriented class construct in practice).
+
+Nesting Blocks
+==============
+
+The named blocks defined in an inherited template can also be nested within
+other blocks.  The name given to each block is globally accessible via any inheriting
+template.  We can add a new block ``title`` to our ``header`` block:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                <%block name="header">
+                    <h2>
+                        <%block name="title"/>
+                    </h2>
+                </%block>
+            </div>
+
+            ${self.body()}
+
+            <div class="footer">
+                <%block name="footer">
+                    this is the footer
+                </%block>
+            </div>
+        </body>
+    </html>
+
+The inheriting template can name either or both of ``header`` and ``title``, separately
+or nested themselves:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+
+    <%block name="header">
+        this is some header content
+        ${parent.header()}
+    </%block>
+
+    <%block name="title">
+        this is the title
+    </%block>
+
+    this is the body content.
+
+Note when we overrode ``header``, we added an extra call ``${parent.header()}`` in order to invoke
+the parent's ``header`` block in addition to our own.  That's described in more detail below,
+in :ref:`parent_namespace`.
+
+Rendering a Named Block Multiple Times
+======================================
+
+Recall from the section :ref:`blocks` that a named block is just like a ``<%def>``,
+with some different usage rules.  We can call one of our named sections distinctly, for example
+a section that is used more than once, such as the title of a page:
+
+.. sourcecode:: mako
+
+    <html>
+        <head>
+            <title>${self.title()}</title>
+        </head>
+        <body>
+        <%block name="header">
+            <h2><%block name="title"/></h2>
+        </%block>
+        ${self.body()}
+        </body>
+    </html>
+
+Where above an inheriting template can define ``<%block name="title">`` just once, and it will be
+used in the base template both in the ``<title>`` section as well as the ``<h2>``.
+
+But what about Defs?
+====================
+
+The previous example used the ``<%block>`` tag to produce areas of content
+to be overridden.  Before Mako 0.4.1, there wasn't any such tag -- instead
+there was only the ``<%def>`` tag.   As it turns out, named blocks and defs are
+largely interchangeable.  The def simply doesn't call itself automatically,
+and has more open-ended naming and scoping rules that are more flexible and similar
+to Python itself, but less suited towards layout.  The first example from
+this chapter using defs would look like:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+
+    <%def name="header()">
+        this is some header content
+    </%def>
+
+    this is the body content.
+
+And ``base.html``, the inherited template:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                ${self.header()}
+            </div>
+
+            ${self.body()}
+
+            <div class="footer">
+                ${self.footer()}
+            </div>
+        </body>
+    </html>
+
+    <%def name="header()"/>
+    <%def name="footer()">
+        this is the footer
+    </%def>
+
+Above, we illustrate that defs differ from blocks in that their definition
+and invocation are defined in two separate places, instead of at once. You can *almost* do exactly what a
+block does if you put the two together:
+
+.. sourcecode:: mako
+
+    <div class="header">
+        <%def name="header()"></%def>${self.header()}
+    </div>
+
+The ``<%block>`` is obviously more streamlined than the ``<%def>`` for this kind
+of usage.  In addition,
+the above "inline" approach with ``<%def>`` does not work with nesting:
+
+.. sourcecode:: mako
+
+    <head>
+        <%def name="header()">
+            <title>
+            ## this won't work !
+            <%def name="title()">default title</%def>${self.title()}
+            </title>
+        </%def>${self.header()}
+    </head>
+
+Where above, the ``title()`` def, because it's a def within a def, is not part of the
+template's exported namespace and will not be part of ``self``.  If the inherited template
+did define its own ``title`` def at the top level, it would be called, but the "default title"
+above is not present at all on ``self`` no matter what.  For this to work as expected
+you'd instead need to say:
+
+.. sourcecode:: mako
+
+    <head>
+        <%def name="header()">
+            <title>
+            ${self.title()}
+            </title>
+        </%def>${self.header()}
+
+        <%def name="title()"/>
+    </head>
+
+That is, ``title`` is defined outside of any other defs so that it is in the ``self`` namespace.
+It works, but the definition needs to be potentially far away from the point of render.
+
+A named block is always placed in the ``self`` namespace, regardless of nesting,
+so this restriction is lifted:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <head>
+        <%block name="header">
+            <title>
+            <%block name="title"/>
+            </title>
+        </%block>
+    </head>
+
+The above template defines ``title`` inside of ``header``, and an inheriting template can define
+one or both in **any** configuration, nested inside each other or not, in order for them to be used:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="base.html"/>
+    <%block name="title">
+        the title
+    </%block>
+    <%block name="header">
+        the header
+    </%block>
+
+So while the ``<%block>`` tag lifts the restriction of nested blocks not being available externally,
+in order to achieve this it *adds* the restriction that all block names in a single template need
+to be globally unique within the template, and additionally that a ``<%block>`` can't be defined
+inside of a ``<%def>``. It's a more restricted tag suited towards a more specific use case than ``<%def>``.
+
+Using the ``next`` Namespace to Produce Content Wrapping
+========================================================
+
+Sometimes you have an inheritance chain that spans more than two
+templates. Or maybe you don't, but you'd like to build your
+system such that extra inherited templates can be inserted in
+the middle of a chain where they would be smoothly integrated.
+If each template wants to define its layout just within its main
+body, you can't just call ``self.body()`` to get at the
+inheriting template's body, since that is only the topmost body.
+To get at the body of the *next* template, you call upon the
+namespace ``next``, which is the namespace of the template
+**immediately following** the current template.
+
+Lets change the line in ``base.html`` which calls upon
+``self.body()`` to instead call upon ``next.body()``:
+
+.. sourcecode:: mako
+
+    ## base.html
+    <html>
+        <body>
+            <div class="header">
+                <%block name="header"/>
+            </div>
+
+            ${next.body()}
+
+            <div class="footer">
+                <%block name="footer">
+                    this is the footer
+                </%block>
+            </div>
+        </body>
+    </html>
+
+
+Lets also add an intermediate template called ``layout.html``,
+which inherits from ``base.html``:
+
+.. sourcecode:: mako
+
+    ## layout.html
+    <%inherit file="base.html"/>
+    <ul>
+        <%block name="toolbar">
+            <li>selection 1</li>
+            <li>selection 2</li>
+            <li>selection 3</li>
+        </%block>
+    </ul>
+    <div class="mainlayout">
+        ${next.body()}
+    </div>
+
+And finally change ``index.html`` to inherit from
+``layout.html`` instead:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="layout.html"/>
+
+    ## .. rest of template
+
+In this setup, each call to ``next.body()`` will render the body
+of the next template in the inheritance chain (which can be
+written as ``base.html -> layout.html -> index.html``). Control
+is still first passed to the bottommost template ``base.html``,
+and ``self`` still references the topmost definition of any
+particular def.
+
+The output we get would be:
+
+.. sourcecode:: html
+
+    <html>
+        <body>
+            <div class="header">
+                this is some header content
+            </div>
+
+            <ul>
+                <li>selection 1</li>
+                <li>selection 2</li>
+                <li>selection 3</li>
+            </ul>
+
+            <div class="mainlayout">
+            this is the body content.
+            </div>
+
+            <div class="footer">
+                this is the footer
+            </div>
+        </body>
+    </html>
+
+So above, we have the ``<html>``, ``<body>`` and
+``header``/``footer`` layout of ``base.html``, we have the
+``<ul>`` and ``mainlayout`` section of ``layout.html``, and the
+main body of ``index.html`` as well as its overridden ``header``
+def. The ``layout.html`` template is inserted into the middle of
+the chain without ``base.html`` having to change anything.
+Without the ``next`` namespace, only the main body of
+``index.html`` could be used; there would be no way to call
+``layout.html``'s body content.
+
+.. _parent_namespace:
+
+Using the ``parent`` Namespace to Augment Defs
+==============================================
+
+Lets now look at the other inheritance-specific namespace, the
+opposite of ``next`` called ``parent``. ``parent`` is the
+namespace of the template **immediately preceding** the current
+template. What's useful about this namespace is that
+defs or blocks can call upon their overridden versions.
+This is not as hard as it sounds and
+is very much like using the ``super`` keyword in Python. Lets
+modify ``index.html`` to augment the list of selections provided
+by the ``toolbar`` function in ``layout.html``:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%inherit file="layout.html"/>
+
+    <%block name="header">
+        this is some header content
+    </%block>
+
+    <%block name="toolbar">
+        ## call the parent's toolbar first
+        ${parent.toolbar()}
+        <li>selection 4</li>
+        <li>selection 5</li>
+    </%block>
+
+    this is the body content.
+
+Above, we implemented a ``toolbar()`` function, which is meant
+to override the definition of ``toolbar`` within the inherited
+template ``layout.html``. However, since we want the content
+from that of ``layout.html`` as well, we call it via the
+``parent`` namespace whenever we want it's content, in this case
+before we add our own selections. So the output for the whole
+thing is now:
+
+.. sourcecode:: html
+
+    <html>
+        <body>
+            <div class="header">
+                this is some header content
+            </div>
+
+            <ul>
+                <li>selection 1</li>
+                <li>selection 2</li>
+                <li>selection 3</li>
+                <li>selection 4</li>
+                <li>selection 5</li>
+            </ul>
+
+            <div class="mainlayout">
+            this is the body content.
+            </div>
+
+            <div class="footer">
+                this is the footer
+            </div>
+        </body>
+    </html>
+
+and you're now a template inheritance ninja!
+
+Inheritable Attributes
+======================
+
+The :attr:`attr <.Namespace.attr>` accessor of the :class:`.Namespace` object
+allows access to module level variables declared in a template. By accessing
+``self.attr``, you can access regular attributes from the
+inheritance chain as declared in ``<%! %>`` sections. Such as:
+
+.. sourcecode:: mako
+
+    <%!
+        class_ = "grey"
+    %>
+
+    <div class="${self.attr.class_}">
+        ${self.body()}
+    </div>
+
+If an inheriting template overrides ``class_`` to be
+``"white"``, as in:
+
+.. sourcecode:: mako
+
+    <%!
+        class_ = "white"
+    %>
+    <%inherit file="parent.html"/>
+
+    This is the body
+
+you'll get output like:
+
+.. sourcecode:: html
+
+    <div class="white">
+        This is the body
+    </div>
+
diff --git a/lib/mako-0.7.2/doc/build/namespaces.rst b/lib/mako-0.7.2/doc/build/namespaces.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/namespaces.rst
@@ -0,0 +1,349 @@
+.. _namespaces_toplevel:
+
+==========
+Namespaces
+==========
+
+Namespaces are used to organize groups of defs into
+categories, and also to "import" defs from other files.
+
+If the file ``components.html`` defines these two defs:
+
+.. sourcecode:: mako
+
+    ## components.html
+    <%def name="comp1()">
+        this is comp1
+    </%def>
+
+    <%def name="comp2(x)">
+        this is comp2, x is ${x}
+    </%def>
+
+you can make another file, for example ``index.html``, that
+pulls those two defs into a namespace called ``comp``:
+
+.. sourcecode:: mako
+
+    ## index.html
+    <%namespace name="comp" file="components.html"/>
+
+    Here's comp1:  ${comp.comp1()}
+    Here's comp2:  ${comp.comp2(x=5)}
+
+The ``comp`` variable above is an instance of
+:class:`.Namespace`, a **proxy object** which delivers
+method calls to the underlying template callable using the
+current context.
+
+``<%namespace>`` also provides an ``import`` attribute which can
+be used to pull the names into the local namespace, removing the
+need to call it via the "``.``" operator. When ``import`` is used, the
+``name`` attribute is optional.
+
+.. sourcecode:: mako
+
+    <%namespace file="components.html" import="comp1, comp2"/>
+
+    Heres comp1:  ${comp1()}
+    Heres comp2:  ${comp2(x=5)}
+
+``import`` also supports the "``*``" operator:
+
+.. sourcecode:: mako
+
+    <%namespace file="components.html" import="*"/>
+
+    Heres comp1:  ${comp1()}
+    Heres comp2:  ${comp2(x=5)}
+
+The names imported by the ``import`` attribute take precedence
+over any names that exist within the current context.
+
+.. note:: In current versions of Mako, usage of ``import='*'`` is
+   known to decrease performance of the template. This will be
+   fixed in a future release.
+
+The ``file`` argument allows expressions -- if looking for
+context variables, the ``context`` must be named explicitly:
+
+.. sourcecode:: mako
+
+    <%namespace name="dyn" file="${context['namespace_name']}"/>
+
+Ways to Call Namespaces
+=======================
+
+There are essentially four ways to call a function from a
+namespace.
+
+The "expression" format, as described previously. Namespaces are
+just Python objects with functions on them, and can be used in
+expressions like any other function:
+
+.. sourcecode:: mako
+
+    ${mynamespace.somefunction('some arg1', 'some arg2', arg3='some arg3', arg4='some arg4')}
+
+Synonymous with the "expression" format is the "custom tag"
+format, when a "closed" tag is used. This format, introduced in
+Mako 0.2.3, allows the usage of a "custom" Mako tag, with the
+function arguments passed in using named attributes:
+
+.. sourcecode:: mako
+
+    <%mynamespace:somefunction arg1="some arg1" arg2="some arg2" arg3="some arg3" arg4="some arg4"/>
+
+When using tags, the values of the arguments are taken as
+literal strings by default. To embed Python expressions as
+arguments, use the embedded expression format:
+
+.. sourcecode:: mako
+
+    <%mynamespace:somefunction arg1="${someobject.format()}" arg2="${somedef(5, 12)}"/>
+
+The "custom tag" format is intended mainly for namespace
+functions which recognize body content, which in Mako is known
+as a "def with embedded content":
+
+.. sourcecode:: mako
+
+    <%mynamespace:somefunction arg1="some argument" args="x, y">
+        Some record: ${x}, ${y}
+    </%mynamespace:somefunction>
+
+The "classic" way to call defs with embedded content is the ``<%call>`` tag:
+
+.. sourcecode:: mako
+
+    <%call expr="mynamespace.somefunction(arg1='some argument')" args="x, y">
+        Some record: ${x}, ${y}
+    </%call>
+
+For information on how to construct defs that embed content from
+the caller, see :ref:`defs_with_content`.
+
+.. _namespaces_python_modules:
+
+Namespaces from Regular Python Modules
+======================================
+
+Namespaces can also import regular Python functions from
+modules. These callables need to take at least one argument,
+``context``, an instance of :class:`.Context`. A module file 
+``some/module.py`` might contain the callable:
+
+.. sourcecode:: python
+
+    def my_tag(context):
+        context.write("hello world")
+        return ''
+
+A template can use this module via:
+
+.. sourcecode:: mako
+
+    <%namespace name="hw" module="some.module"/>
+
+    ${hw.my_tag()}
+
+Note that the ``context`` argument is not needed in the call;
+the :class:`.Namespace` tag creates a locally-scoped callable which
+takes care of it. The ``return ''`` is so that the def does not
+dump a ``None`` into the output stream -- the return value of any
+def is rendered after the def completes, in addition to whatever
+was passed to :meth:`.Context.write` within its body.
+
+If your def is to be called in an "embedded content" context,
+that is as described in :ref:`defs_with_content`, you should use
+the :func:`.supports_caller` decorator, which will ensure that Mako
+will ensure the correct "caller" variable is available when your
+def is called, supporting embedded content:
+
+.. sourcecode:: python
+
+    from mako.runtime import supports_caller
+
+    @supports_caller
+    def my_tag(context):
+        context.write("<div>")
+        context['caller'].body()
+        context.write("</div>")
+        return ''
+
+Capturing of output is available as well, using the
+outside-of-templates version of the :func:`.capture` function,
+which accepts the "context" as its first argument:
+
+.. sourcecode:: python
+
+    from mako.runtime import supports_caller, capture
+
+    @supports_caller
+    def my_tag(context):
+        return "<div>%s</div>" % \
+                capture(context, context['caller'].body, x="foo", y="bar")
+
+Declaring Defs in Namespaces
+============================
+
+The ``<%namespace>`` tag supports the definition of ``<%def>``\ s
+directly inside the tag. These defs become part of the namespace
+like any other function, and will override the definitions
+pulled in from a remote template or module:
+
+.. sourcecode:: mako
+
+    ## define a namespace
+    <%namespace name="stuff">
+        <%def name="comp1()">
+            comp1
+        </%def>
+    </%namespace>
+
+    ## then call it
+    ${stuff.comp1()}
+
+.. _namespaces_body:
+
+The ``body()`` Method
+=====================
+
+Every namespace that is generated from a template contains a
+method called ``body()``. This method corresponds to the main
+body of the template, and plays its most important roles when
+using inheritance relationships as well as
+def-calls-with-content.
+
+Since the ``body()`` method is available from a namespace just
+like all the other defs defined in a template, what happens if
+you send arguments to it? By default, the ``body()`` method
+accepts no positional arguments, and for usefulness in
+inheritance scenarios will by default dump all keyword arguments
+into a dictionary called ``pageargs``. But if you actually want
+to get at the keyword arguments, Mako recommends you define your
+own argument signature explicitly. You do this via using the
+``<%page>`` tag:
+
+.. sourcecode:: mako
+
+    <%page args="x, y, someval=8, scope='foo', **kwargs"/>
+
+A template which defines the above signature requires that the
+variables ``x`` and ``y`` are defined, defines default values
+for ``someval`` and ``scope``, and sets up ``**kwargs`` to
+receive all other keyword arguments. If ``**kwargs`` or similar
+is not present, the argument ``**pageargs`` gets tacked on by
+Mako. When the template is called as a top-level template (i.e.
+via :meth:`~.Template.render`) or via the ``<%include>`` tag, the
+values for these arguments will be pulled from the ``Context``.
+In all other cases, i.e. via calling the ``body()`` method, the
+arguments are taken as ordinary arguments from the method call.
+So above, the body might be called as:
+
+.. sourcecode:: mako
+
+    ${self.body(5, y=10, someval=15, delta=7)}
+
+The :class:`.Context` object also supplies a :attr:`~.Context.kwargs` accessor, for
+cases when you'd like to pass along whatever is in the context to
+a ``body()`` callable:
+
+.. sourcecode:: mako
+
+    ${next.body(**context.kwargs)}
+
+The usefulness of calls like the above become more apparent when
+one works with inheriting templates. For more information on
+this, as well as the meanings of the names ``self`` and
+``next``, see :ref:`inheritance_toplevel`.
+
+.. _namespaces_builtin:
+
+Built-in Namespaces
+===================
+
+The namespace is so great that Mako gives your template one (or
+two) for free. The names of these namespaces are ``local`` and
+``self``. Other built-in namespaces include ``parent`` and
+``next``, which are optional and are described in
+:ref:`inheritance_toplevel`.
+
+.. _namespace_local:
+
+``local``
+---------
+
+The ``local`` namespace is basically the namespace for the
+currently executing template. This means that all of the top
+level defs defined in your template, as well as your template's
+``body()`` function, are also available off of the ``local``
+namespace.
+
+The ``local`` namespace is also where properties like ``uri``,
+``filename``, and ``module`` and the ``get_namespace`` method
+can be particularly useful.
+
+.. _namespace_self:
+
+``self``
+--------
+
+The ``self`` namespace, in the case of a template that does not
+use inheritance, is synonymous with ``local``. If inheritance is
+used, then ``self`` references the topmost template in the
+inheritance chain, where it is most useful for providing the
+ultimate form of various "method" calls which may have been
+overridden at various points in an inheritance chain. See
+:ref:`inheritance_toplevel`.
+
+Inheritable Namespaces
+======================
+
+The ``<%namespace>`` tag includes an optional attribute
+``inheritable="True"``, which will cause the namespace to be
+attached to the ``self`` namespace. Since ``self`` is globally
+available throughout an inheritance chain (described in the next
+section), all the templates in an inheritance chain can get at
+the namespace imported in a super-template via ``self``.
+
+.. sourcecode:: mako
+
+    ## base.html
+    <%namespace name="foo" file="foo.html" inheritable="True"/>
+
+    ${next.body()}
+
+    ## somefile.html
+    <%inherit file="base.html"/>
+
+    ${self.foo.bar()}
+
+This allows a super-template to load a whole bunch of namespaces
+that its inheriting templates can get to, without them having to
+explicitly load those namespaces themselves.
+
+The ``import="*"`` part of the ``<%namespace>`` tag doesn't yet
+interact with the ``inheritable`` flag, so currently you have to
+use the explicit namespace name off of ``self``, followed by the
+desired function name. But more on this in a future release.
+
+API Reference
+=============
+
+.. autoclass:: mako.runtime.Namespace
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.TemplateNamespace
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.ModuleNamespace
+    :show-inheritance:
+    :members:
+ 
+.. autofunction:: mako.runtime.supports_caller
+
+.. autofunction:: mako.runtime.capture
+
diff --git a/lib/mako-0.7.2/doc/build/runtime.rst b/lib/mako-0.7.2/doc/build/runtime.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/runtime.rst
@@ -0,0 +1,448 @@
+.. _runtime_toplevel:
+
+============================
+The Mako Runtime Environment
+============================
+
+This section describes a little bit about the objects and
+built-in functions that are available in templates.
+
+.. _context:
+
+Context
+=======
+
+The :class:`.Context` is the central object that is created when
+a template is first executed, and is responsible for handling
+all communication with the outside world.  Within the template
+environment, it is available via the :ref:`reserved name <reserved_names>`
+``context``.  The :class:`.Context` includes two
+major components, one of which is the output buffer, which is a
+file-like object such as Python's ``StringIO`` or similar, and
+the other a dictionary of variables that can be freely
+referenced within a template; this dictionary is a combination
+of the arguments sent to the :meth:`~.Template.render` function and
+some built-in variables provided by Mako's runtime environment.
+
+The Buffer
+----------
+
+The buffer is stored within the :class:`.Context`, and writing
+to it is achieved by calling the :meth:`~.Context.write` method
+-- in a template this looks like ``context.write('some string')``.
+You usually don't need to care about this, as all text within a template, as
+well as all expressions provided by ``${}``, automatically send
+everything to this method. The cases you might want to be aware
+of its existence are if you are dealing with various
+filtering/buffering scenarios, which are described in
+:ref:`filtering_toplevel`, or if you want to programmatically
+send content to the output stream, such as within a ``<% %>``
+block.
+
+.. sourcecode:: mako
+
+    <%
+        context.write("some programmatic text")
+    %>
+
+The actual buffer may or may not be the original buffer sent to
+the :class:`.Context` object, as various filtering/caching
+scenarios may "push" a new buffer onto the context's underlying
+buffer stack. For this reason, just stick with
+``context.write()`` and content will always go to the topmost
+buffer.
+
+.. _context_vars:
+
+Context Variables
+-----------------
+
+When your template is compiled into a Python module, the body
+content is enclosed within a Python function called
+``render_body``. Other top-level defs defined in the template are
+defined within their own function bodies which are named after
+the def's name with the prefix ``render_`` (i.e. ``render_mydef``).
+One of the first things that happens within these functions is
+that all variable names that are referenced within the function
+which are not defined in some other way (i.e. such as via
+assignment, module level imports, etc.) are pulled from the
+:class:`.Context` object's dictionary of variables. This is how you're
+able to freely reference variable names in a template which
+automatically correspond to what was passed into the current
+:class:`.Context`.
+
+* **What happens if I reference a variable name that is not in
+  the current context?** - The value you get back is a special
+  value called ``UNDEFINED``, or if the ``strict_undefined=True`` flag
+  is used a ``NameError`` is raised. ``UNDEFINED`` is just a simple global
+  variable with the class :class:`mako.runtime.Undefined`. The
+  ``UNDEFINED`` object throws an error when you call ``str()`` on
+  it, which is what happens if you try to use it in an
+  expression.
+* **UNDEFINED makes it hard for me to find what name is missing** - An alternative
+  is to specify the option ``strict_undefined=True``
+  to the :class:`.Template` or :class:`.TemplateLookup`.  This will cause
+  any non-present variables to raise an immediate ``NameError``
+  which includes the name of the variable in its message
+  when :meth:`~.Template.render` is called -- ``UNDEFINED`` is not used.
+
+  .. versionadded:: 0.3.6
+
+* **Why not just return None?** Using ``UNDEFINED``, or
+  raising a ``NameError`` is more
+  explicit and allows differentiation between a value of ``None``
+  that was explicitly passed to the :class:`.Context` and a value that
+  wasn't present at all.
+* **Why raise an exception when you call str() on it ? Why not
+  just return a blank string?** - Mako tries to stick to the
+  Python philosophy of "explicit is better than implicit". In
+  this case, it's decided that the template author should be made
+  to specifically handle a missing value rather than
+  experiencing what may be a silent failure. Since ``UNDEFINED``
+  is a singleton object just like Python's ``True`` or ``False``,
+  you can use the ``is`` operator to check for it:
+
+  .. sourcecode:: mako
+
+        % if someval is UNDEFINED:
+            someval is: no value
+        % else:
+            someval is: ${someval}
+        % endif
+
+Another facet of the :class:`.Context` is that its dictionary of
+variables is **immutable**. Whatever is set when
+:meth:`~.Template.render` is called is what stays. Of course, since
+its Python, you can hack around this and change values in the
+context's internal dictionary, but this will probably will not
+work as well as you'd think. The reason for this is that Mako in
+many cases creates copies of the :class:`.Context` object, which
+get sent to various elements of the template and inheriting
+templates used in an execution. So changing the value in your
+local :class:`.Context` will not necessarily make that value
+available in other parts of the template's execution. Examples
+of where Mako creates copies of the :class:`.Context` include
+within top-level def calls from the main body of the template
+(the context is used to propagate locally assigned variables
+into the scope of defs; since in the template's body they appear
+as inlined functions, Mako tries to make them act that way), and
+within an inheritance chain (each template in an inheritance
+chain has a different notion of ``parent`` and ``next``, which
+are all stored in unique :class:`.Context` instances).
+
+* **So what if I want to set values that are global to everyone
+  within a template request?** - All you have to do is provide a
+  dictionary to your :class:`.Context` when the template first
+  runs, and everyone can just get/set variables from that. Lets
+  say its called ``attributes``.
+
+  Running the template looks like:
+
+  .. sourcecode:: python
+
+      output = template.render(attributes={})
+
+  Within a template, just reference the dictionary:
+
+  .. sourcecode:: mako
+
+      <%
+          attributes['foo'] = 'bar'
+      %>
+      'foo' attribute is: ${attributes['foo']}
+
+* **Why can't "attributes" be a built-in feature of the
+  Context?** - This is an area where Mako is trying to make as
+  few decisions about your application as it possibly can.
+  Perhaps you don't want your templates to use this technique of
+  assigning and sharing data, or perhaps you have a different
+  notion of the names and kinds of data structures that should
+  be passed around. Once again Mako would rather ask the user to
+  be explicit.
+
+Context Methods and Accessors
+-----------------------------
+
+Significant members of :class:`.Context` include:
+
+* ``context[key]`` / ``context.get(key, default=None)`` -
+  dictionary-like accessors for the context. Normally, any
+  variable you use in your template is automatically pulled from
+  the context if it isn't defined somewhere already. Use the
+  dictionary accessor and/or ``get`` method when you want a
+  variable that *is* already defined somewhere else, such as in
+  the local arguments sent to a ``%def`` call. If a key is not
+  present, like a dictionary it raises ``KeyError``.
+* ``keys()`` - all the names defined within this context.
+* ``kwargs`` - this returns a **copy** of the context's
+  dictionary of variables. This is useful when you want to
+  propagate the variables in the current context to a function
+  as keyword arguments, i.e.:
+
+  .. sourcecode:: mako
+
+        ${next.body(**context.kwargs)}
+
+* ``write(text)`` - write some text to the current output
+  stream.
+* ``lookup`` - returns the :class:`.TemplateLookup` instance that is
+  used for all file-lookups within the current execution (even
+  though individual :class:`.Template` instances can conceivably have
+  different instances of a :class:`.TemplateLookup`, only the
+  :class:`.TemplateLookup` of the originally-called :class:`.Template` gets
+  used in a particular execution).
+
+.. _loop_context:
+
+The Loop Context
+================
+
+Within ``% for`` blocks, the :ref:`reserved name<reserved_names>` ``loop``
+is available.  ``loop`` tracks the progress of
+the ``for`` loop and makes it easy to use the iteration state to control
+template behavior:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for a in ("one", "two", "three"):
+        <li>Item ${loop.index}: ${a}</li>
+    % endfor
+    </ul>
+
+.. versionadded:: 0.7
+
+Iterations
+----------
+
+Regardless of the type of iterable you're looping over, ``loop`` always tracks
+the 0-indexed iteration count (available at ``loop.index``), its parity
+(through the ``loop.even`` and ``loop.odd`` bools), and ``loop.first``, a bool
+indicating whether the loop is on its first iteration.  If your iterable
+provides a ``__len__`` method, ``loop`` also provides access to
+a count of iterations remaining at ``loop.reverse_index`` and ``loop.last``,
+a bool indicating whether the loop is on its last iteration; accessing these
+without ``__len__`` will raise a ``TypeError``.
+
+Cycling
+-------
+
+Cycling is available regardless of whether the iterable you're using provides
+a ``__len__`` method.  Prior to Mako 0.7, you might have generated a simple
+zebra striped list using ``enumerate``:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for i, item in enumerate(('spam', 'ham', 'eggs')):
+      <li class="${'odd' if i % 2 else 'even'}">${item}</li>
+    % endfor
+    </ul>
+
+With ``loop.cycle``, you get the same results with cleaner code and less prep work:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for item in ('spam', 'ham', 'eggs'):
+      <li class="${loop.cycle('even', 'odd')}">${item}</li>
+    % endfor
+    </ul>
+
+Both approaches produce output like the following:
+
+.. sourcecode:: html
+
+    <ul>
+      <li class="even">spam</li>
+      <li class="odd">ham</li>
+      <li class="even">eggs</li>
+    </ul>
+
+Parent Loops
+------------
+
+Loop contexts can also be transparently nested, and the Mako runtime will do
+the right thing and manage the scope for you.  You can access the parent loop
+context through ``loop.parent``.
+
+This allows you to reach all the way back up through the loop stack by
+chaining ``parent`` attribute accesses, i.e. ``loop.parent.parent....`` as
+long as the stack depth isn't exceeded.  For example, you can use the parent
+loop to make a checkered table:
+
+.. sourcecode:: mako
+
+    <table>
+    % for consonant in 'pbj':
+      <tr>
+      % for vowel in 'iou':
+        <td class="${'black' if (loop.parent.even == loop.even) else 'red'}">
+          ${consonant + vowel}t
+        </td>
+      % endfor
+      </tr>
+    % endfor
+    </table>
+
+.. sourcecode:: html
+
+    <table>
+      <tr>
+        <td class="black">
+          pit
+        </td>
+        <td class="red">
+          pot
+        </td>
+        <td class="black">
+          put
+        </td>
+      </tr>
+      <tr>
+        <td class="red">
+          bit
+        </td>
+        <td class="black">
+          bot
+        </td>
+        <td class="red">
+          but
+        </td>
+      </tr>
+      <tr>
+        <td class="black">
+          jit
+        </td>
+        <td class="red">
+          jot
+        </td>
+        <td class="black">
+          jut
+        </td>
+      </tr>
+    </table>
+
+.. _migrating_loop:
+
+Migrating Legacy Templates that Use the Word "loop"
+---------------------------------------------------
+
+.. versionchanged:: 0.7
+   The ``loop`` name is now :ref:`reserved <reserved_names>` in Mako,
+   which means a template that refers to a variable named ``loop``
+   won't function correctly when used in Mako 0.7.
+
+To ease the transition for such systems, the feature can be disabled across the board for
+all templates, then re-enabled on a per-template basis for those templates which wish
+to make use of the new system.
+
+First, the ``enable_loop=False`` flag is passed to either the :class:`.TemplateLookup`
+or :class:`.Template` object in use:
+
+.. sourcecode:: python
+
+    lookup = TemplateLookup(directories=['/docs'], enable_loop=False)
+
+or:
+
+.. sourcecode:: python
+
+    template = Template("some template", enable_loop=False)
+
+An individual template can make usage of the feature when ``enable_loop`` is set to
+``False`` by switching it back on within the ``<%page>`` tag:
+
+.. sourcecode:: mako
+
+    <%page enable_loop="True"/>
+
+    % for i in collection:
+        ${i} ${loop.index}
+    % endfor
+
+Using the above scheme, it's safe to pass the name ``loop`` to the :meth:`.Template.render`
+method as well as to freely make usage of a variable named ``loop`` within a template, provided
+the ``<%page>`` tag doesn't override it.  New templates that want to use the ``loop`` context
+can then set up ``<%page enable_loop="True"/>`` to use the new feature without affecting
+old templates.
+
+All the Built-in Names
+======================
+
+A one-stop shop for all the names Mako defines. Most of these
+names are instances of :class:`.Namespace`, which are described
+in the next section, :ref:`namespaces_toplevel`. Also, most of
+these names other than ``context``, ``UNDEFINED``, and ``loop`` are
+also present *within* the :class:`.Context` itself.   The names
+``context``, ``loop`` and ``UNDEFINED`` themselves can't be passed
+to the context and can't be substituted -- see the section :ref:`reserved_names`.
+
+* ``context`` - this is the :class:`.Context` object, introduced
+  at :ref:`context`.
+* ``local`` - the namespace of the current template, described
+  in :ref:`namespaces_builtin`.
+* ``self`` - the namespace of the topmost template in an
+  inheritance chain (if any, otherwise the same as ``local``),
+  mostly described in :ref:`inheritance_toplevel`.
+* ``parent`` - the namespace of the parent template in an
+  inheritance chain (otherwise undefined); see
+  :ref:`inheritance_toplevel`.
+* ``next`` - the namespace of the next template in an
+  inheritance chain (otherwise undefined); see
+  :ref:`inheritance_toplevel`.
+* ``caller`` - a "mini" namespace created when using the
+  ``<%call>`` tag to define a "def call with content"; described
+  in :ref:`defs_with_content`.
+* ``loop`` - this provides access to :class:`.LoopContext` objects when
+  they are requested within ``% for`` loops, introduced at :ref:`loop_context`.
+* ``capture`` - a function that calls a given def and captures
+  its resulting content into a string, which is returned. Usage
+  is described in :ref:`filtering_toplevel`.
+* ``UNDEFINED`` - a global singleton that is applied to all
+  otherwise uninitialized template variables that were not
+  located within the :class:`.Context` when rendering began,
+  unless the :class:`.Template` flag ``strict_undefined``
+  is set to ``True``. ``UNDEFINED`` is
+  an instance of :class:`.Undefined`, and raises an
+  exception when its ``__str__()`` method is called.
+* ``pageargs`` - this is a dictionary which is present in a
+  template which does not define any ``**kwargs`` section in its
+  ``<%page>`` tag. All keyword arguments sent to the ``body()``
+  function of a template (when used via namespaces) go here by
+  default unless otherwise defined as a page argument. If this
+  makes no sense, it shouldn't; read the section
+  :ref:`namespaces_body`.
+
+.. _reserved_names:
+
+Reserved Names
+--------------
+
+Mako has a few names that are considered to be "reserved" and can't be used
+as variable names.
+
+.. versionchanged:: 0.7
+   Mako raises an error if these words are found passed to the template
+   as context arguments, whereas in previous versions they'd be silently
+   ignored or lead to other error messages.
+
+* ``context`` - see :ref:`context`.
+* ``UNDEFINED`` - see :ref:`context_vars`.
+* ``loop`` - see :ref:`loop_context`.  Note this can be disabled for legacy templates
+  via the ``enable_loop=False`` argument; see :ref:`migrating_loop`.
+
+API Reference
+=============
+
+.. autoclass:: mako.runtime.Context
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.LoopContext
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.runtime.Undefined
+    :show-inheritance:
+
diff --git a/lib/mako-0.7.2/doc/build/static/docs.css b/lib/mako-0.7.2/doc/build/static/docs.css
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/static/docs.css
@@ -0,0 +1,438 @@
+/* global */
+
+body {
+  background-color: #FDFBFC;
+  margin:38px;
+  color:#333333;
+}
+
+a {
+    font-weight:normal; 
+    text-decoration:none;
+}
+
+form {
+    display:inline;
+}
+
+/* hyperlinks */
+
+a:link, a:visited, a:active {
+    color:#0000FF;
+}
+a:hover {
+    color:#700000;
+    text-decoration:underline;
+}
+
+/* paragraph links after sections.
+   These aren't visible until hovering
+   over the <h> tag, then have a 
+   "reverse video" effect over the actual
+   link
+ */
+
+a.headerlink {
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+    visibility: visible;
+}
+
+a.headerlink:hover {
+    background-color: #990000;
+    color: white;
+}
+
+
+/* Container setup */
+
+#docs-container {
+  max-width:1000px;
+}
+
+
+/* header/footer elements */
+
+#docs-header h1 {
+    font-size:20px;
+    color: #222222;
+    margin: 0;
+    padding: 0;
+}
+
+#docs-header {
+  font-family:Tahoma, Geneva,sans-serif;
+
+  font-size:.9em;
+
+}
+
+#docs-top-navigation,
+#docs-bottom-navigation {
+  font-family: Tahoma, Geneva, sans-serif;
+  background-color: #EEE;
+  border: solid 1px #CCC;
+  padding:10px;
+  font-size:.9em;
+}
+
+#docs-top-navigation {
+  margin:10px 0px 10px 0px;
+  line-height:1.2em;
+}
+
+.docs-navigation-links {
+  font-family:Tahoma, Geneva,sans-serif;
+}
+
+#docs-bottom-navigation {
+    float:right;
+    margin: 1em 0 1em 5px;
+}
+
+#docs-copyright {
+    font-size:.85em;
+    padding:5px 0px;
+}
+
+#docs-header h1,
+#docs-top-navigation h1,
+#docs-top-navigation h2 {
+  font-family:Tahoma,Geneva,sans-serif;
+  font-weight:normal;
+}
+
+#docs-top-navigation h2 {
+    margin:16px 4px 7px 5px;
+    font-size:2em;
+}
+
+#docs-search {
+    float:right;
+}
+
+#docs-top-page-control {
+  float:right;
+  width:350px;
+}
+
+#docs-top-page-control ul {
+  padding:0;
+  margin:0;
+}
+
+#docs-top-page-control li {
+    list-style-type:none;
+    padding:1px 8px;
+}
+
+
+#docs-container .version-num {
+    font-weight: bold;
+}
+
+
+/* content container, sidebar */
+
+#docs-body-container {
+  background-color:#EFEFEF;
+  border: solid 1px #CCC;
+
+}
+
+#docs-body,
+#docs-sidebar
+ {
+  /*font-family: helvetica, arial, sans-serif;
+  font-size:.9em;*/
+
+  font-family: Tahoma, Geneva, sans-serif;
+  /*font-size:.85em;*/
+  line-height:1.5em;
+
+}
+
+#docs-sidebar > ul {
+  font-size:.9em;
+}
+
+#docs-sidebar {
+  float:left;
+  width:212px;
+  padding: 10px 0 0 15px;
+  /*font-size:.85em;*/
+}
+
+#docs-sidebar h3, #docs-sidebar h4 {
+    background-color: #DDDDDD;
+    color: #222222;
+    font-family: Tahoma, Geneva,sans-serif;
+    font-size: 1.1em;
+    font-weight: normal;
+    margin: 10px 0 0 -15px;
+    padding: 5px 10px 5px 10px;
+    text-shadow: 1px 1px 0 white;
+    width:210px;
+}
+
+#docs-sidebar h3 a, #docs-sidebar h4 a {
+  color: #222222;
+}
+#docs-sidebar ul {
+  margin: 10px 10px 10px 0px;
+  padding: 0;
+  list-style: none outside none;
+}
+
+
+#docs-sidebar ul ul {
+    margin-bottom: 0;
+    margin-top: 0;
+    list-style: square outside none;
+    margin-left: 20px;
+}
+
+#docs-body {
+  background-color:#FFFFFF;
+  padding:1px 10px 10px 10px;
+}
+
+#docs-body.withsidebar {
+  margin: 0 0 0 230px;
+  border-left:3px solid #DFDFDF;
+}
+
+#docs-body h1,
+#docs-body h2,
+#docs-body h3,
+#docs-body h4 {
+  font-family:Tahoma, Geneva, sans-serif;
+}
+
+#docs-body h1 {
+  /* hide the <h1> for each content section. */
+  display:none;
+  font-size:1.8em;
+}
+
+#docs-body h2 {
+  font-size:1.6em;
+}
+
+#docs-body h3 {
+  font-size:1.4em;
+}
+
+/* SQL popup, code styles */
+
+.highlight {
+  background:none;
+}
+
+#docs-container pre {
+  font-size:1.2em;
+}
+
+#docs-container .pre {
+  font-size:1.1em;
+}
+
+#docs-container pre {
+  background-color: #f0f0f0;  
+  border: solid 1px #ccc;
+  box-shadow: 2px 2px 3px #DFDFDF;
+  padding:10px;
+  margin: 5px 0px 5px 0px;
+  overflow:auto;
+  line-height:1.3em;
+}
+
+.popup_sql, .show_sql
+{
+    background-color: #FBFBEE;
+    padding:5px 10px;
+    margin:10px -5px;
+    border:1px dashed;
+}
+
+/* the [SQL] links used to display SQL */
+#docs-container .sql_link
+{
+  font-weight:normal;
+  font-family: arial, sans-serif;
+  font-size:.9em;
+  text-transform: uppercase;
+  color:#990000;
+  border:1px solid;
+  padding:1px 2px 1px 2px;
+  margin:0px 10px 0px 15px;
+  float:right;
+  line-height:1.2em;
+}
+
+#docs-container a.sql_link, 
+#docs-container .sql_link
+{
+    text-decoration: none;
+    padding:1px 2px;
+}
+
+#docs-container a.sql_link:hover {
+    text-decoration: none;
+    color:#fff;
+    border:1px solid #900;
+    background-color: #900;
+}
+
+/* docutils-specific elements */
+
+th.field-name {
+    text-align:right;
+}
+
+div.note, div.warning, p.deprecated, div.topic  {
+    background-color:#EEFFEF;
+}
+
+
+div.admonition, div.topic, p.deprecated, p.versionadded, p.versionchanged {
+    border:1px solid #CCCCCC;
+    padding:5px 10px;
+    font-size:.9em;
+    box-shadow: 2px 2px 3px #DFDFDF;
+}
+
+div.warning .admonition-title {
+    color:#FF0000;
+}
+
+div.admonition .admonition-title, div.topic .topic-title {
+    font-weight:bold;
+}
+
+.viewcode-back, .viewcode-link {
+    float:right;
+}
+
+dl.function > dt,
+dl.attribute > dt,
+dl.classmethod > dt,
+dl.method > dt,
+dl.class > dt,
+dl.exception > dt
+{
+    background-color:#F0F0F0;
+    margin:25px -10px 10px 10px;
+    padding: 0px 10px;
+}
+
+p.versionadded span.versionmodified,
+p.versionchanged span.versionmodified,
+p.deprecated span.versionmodified {
+    background-color: #F0F0F0;
+    font-style: italic;
+}
+
+dt:target, span.highlight {
+    background-color:#FBE54E;
+}
+
+a.headerlink {
+    font-size: 0.8em;
+    padding: 0 4px 0 4px;
+    text-decoration: none;
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,
+dt:hover > a.headerlink {
+    visibility: visible;
+}
+
+a.headerlink:hover {
+    background-color: #00f;
+    color: white;
+}
+
+.clearboth {
+    clear:both;
+}
+
+tt.descname {
+    background-color:transparent;
+    font-size:1.2em;
+    font-weight:bold;
+}
+
+tt.descclassname {
+    background-color:transparent;
+}
+
+tt {
+    background-color:#ECF0F3;
+    padding:0 1px;
+}
+
+/* syntax highlighting overrides */
+.k, .kn {color:#0908CE;}
+.o {color:#BF0005;}
+.go {color:#804049;}
+
+
+/* special "index page" sections 
+   with specific formatting
+*/
+
+div#sqlalchemy-documentation {
+  font-size:.95em;
+}
+div#sqlalchemy-documentation em {
+  font-style:normal;
+}
+div#sqlalchemy-documentation .rubric{
+  font-size:14px;
+  background-color:#EEFFEF;
+  padding:5px;
+  border:1px solid #BFBFBF;
+}
+div#sqlalchemy-documentation a, div#sqlalchemy-documentation li {
+  padding:5px 0px;
+}
+
+div#getting-started {
+  border-bottom:1px solid;
+}
+
+div#sqlalchemy-documentation div#sqlalchemy-orm {
+  float:left;
+  width:48%;
+}
+
+div#sqlalchemy-documentation div#sqlalchemy-core {
+  float:left;
+  width:48%;
+  margin:0;
+  padding-left:10px;
+  border-left:1px solid;
+}
+
+div#dialect-documentation {
+  border-top:1px solid;
+  /*clear:left;*/
+}
diff --git a/lib/mako-0.7.2/doc/build/static/makoLogo.png b/lib/mako-0.7.2/doc/build/static/makoLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c43c087eb48ebfc2223b76cf3df2fa7868c2a72b
GIT binary patch
[stripped]
diff --git a/lib/mako-0.7.2/doc/build/static/site.css b/lib/mako-0.7.2/doc/build/static/site.css
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/static/site.css
@@ -0,0 +1,82 @@
+body { 
+    font-family: Tahoma, Geneva, sans-serif;
+    line-height:1.4em;
+    margin:15px;
+    background-color:#FFFFFF;
+}
+img {border:none;}
+a { text-decoration: none;}
+a:visited  { color: #2929ff;}
+a:hover { color: #0000ff;}
+
+#wrap {
+    margin:0 auto;
+    max-width:1024px;
+    min-width:480px;
+    position:relative;
+    
+}
+h1 {
+    font-size:1.6em;
+    font-weight:bold;
+}
+
+h2 {
+    font-size:1.1em;
+    font-weight:bold;
+    margin:10px 0px 10px 0px;
+}
+
+.clearfix{
+    clear:both;
+}
+
+.red {
+	font-weight:bold;
+	color:#FF0000;
+}
+.rightbar {
+    float:right;
+    margin:10px 30px 10px 30px;
+}
+.slogan {
+    margin-top:10px;
+}
+.toolbar {
+    margin-top:20px;
+}
+.copyright {
+    font-size:.8em;
+    text-align:center;
+    color:909090;
+}
+.pylogo {
+	text-align:right;
+	float:right;
+}
+.code {
+    font-family:monospace;
+}
+
+li {
+    margin:1px 0px 1px 0px;
+}
+
+.speedchart td {
+    font-size:small;
+}
+
+pre.codesample { 
+    margin: 1.5em; 
+    padding: .5em; 
+    font-size: .95em; 
+    line-height:1em;
+    background-color: #eee;
+    border: 1px solid #ccc;
+    width:450px;
+    overflow:auto;
+}
+
+#speedchart {
+    margin:5px 10px 5px 10px;
+}
diff --git a/lib/mako-0.7.2/doc/build/syntax.rst b/lib/mako-0.7.2/doc/build/syntax.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/syntax.rst
@@ -0,0 +1,469 @@
+.. _syntax_toplevel:
+
+======
+Syntax
+======
+
+A Mako template is parsed from a text stream containing any kind
+of content, XML, HTML, email text, etc. The template can further
+contain Mako-specific directives which represent variable and/or
+expression substitutions, control structures (i.e. conditionals
+and loops), server-side comments, full blocks of Python code, as
+well as various tags that offer additional functionality. All of
+these constructs compile into real Python code. This means that
+you can leverage the full power of Python in almost every aspect
+of a Mako template.
+
+Expression Substitution
+=======================
+
+The simplest expression is just a variable substitution. The
+syntax for this is the ``${}`` construct, which is inspired by
+Perl, Genshi, JSP EL, and others:
+
+.. sourcecode:: mako
+
+    this is x: ${x}
+
+Above, the string representation of ``x`` is applied to the
+template's output stream. If you're wondering where ``x`` comes
+from, it's usually from the :class:`.Context` supplied to the
+template's rendering function. If ``x`` was not supplied to the
+template and was not otherwise assigned locally, it evaluates to
+a special value ``UNDEFINED``. More on that later.
+
+The contents within the ``${}`` tag are evaluated by Python
+directly, so full expressions are OK:
+
+.. sourcecode:: mako
+
+    pythagorean theorem:  ${pow(x,2) + pow(y,2)}
+
+The results of the expression are evaluated into a string result
+in all cases before being rendered to the output stream, such as
+the above example where the expression produces a numeric
+result.
+
+Expression Escaping
+===================
+
+Mako includes a number of built-in escaping mechanisms,
+including HTML, URI and XML escaping, as well as a "trim"
+function. These escapes can be added to an expression
+substitution using the ``|`` operator:
+
+.. sourcecode:: mako
+
+    ${"this is some text" | u}
+
+The above expression applies URL escaping to the expression, and
+produces ``this+is+some+text``. The ``u`` name indicates URL
+escaping, whereas ``h`` represents HTML escaping, ``x``
+represents XML escaping, and ``trim`` applies a trim function.
+
+Read more about built-in filtering functions, including how to
+make your own filter functions, in :ref:`filtering_toplevel`.
+
+Control Structures
+==================
+
+A control structure refers to all those things that control the
+flow of a program -- conditionals (i.e. ``if``/``else``), loops (like
+``while`` and ``for``), as well as things like ``try``/``except``. In Mako,
+control structures are written using the ``%`` marker followed
+by a regular Python control expression, and are "closed" by
+using another ``%`` marker with the tag "``end<name>``", where
+"``<name>``" is the keyword of the expression:
+
+.. sourcecode:: mako
+
+    % if x==5:
+        this is some output
+    % endif
+
+The ``%`` can appear anywhere on the line as long as no text
+precedes it; indentation is not significant. The full range of
+Python "colon" expressions are allowed here, including
+``if``/``elif``/``else``, ``while``, ``for``, and even ``def``, although
+Mako has a built-in tag for defs which is more full-featured.
+
+.. sourcecode:: mako
+
+    % for a in ['one', 'two', 'three', 'four', 'five']:
+        % if a[0] == 't':
+        its two or three
+        % elif a[0] == 'f':
+        four/five
+        % else:
+        one
+        % endif
+    % endfor
+
+The ``%`` sign can also be "escaped", if you actually want to
+emit a percent sign as the first non whitespace character on a
+line, by escaping it as in ``%%``:
+
+.. sourcecode:: mako
+
+    %% some text
+
+        %% some more text
+
+The Loop Context
+----------------
+
+The **loop context** provides additional information about a loop
+while inside of a ``% for`` structure:
+
+.. sourcecode:: mako
+
+    <ul>
+    % for a in ("one", "two", "three"):
+        <li>Item ${loop.index}: ${a}</li>
+    % endfor
+    </ul>
+
+See :ref:`loop_context` for more information on this feature.
+
+.. versionadded:: 0.7
+
+Comments
+========
+
+Comments come in two varieties. The single line comment uses
+``##`` as the first non-space characters on a line:
+
+.. sourcecode:: mako
+
+    ## this is a comment.
+    ...text ...
+
+A multiline version exists using ``<%doc> ...text... </%doc>``:
+
+.. sourcecode:: mako
+
+    <%doc>
+        these are comments
+        more comments
+    </%doc>
+
+Newline Filters
+===============
+
+The backslash ("``\``") character, placed at the end of any
+line, will consume the newline character before continuing to
+the next line:
+
+.. sourcecode:: mako
+
+    here is a line that goes onto \
+    another line.
+
+The above text evaluates to:
+
+.. sourcecode:: text
+
+    here is a line that goes onto another line.
+
+Python Blocks
+=============
+
+Any arbitrary block of python can be dropped in using the ``<%
+%>`` tags:
+
+.. sourcecode:: mako
+
+    this is a template
+    <%
+        x = db.get_resource('foo')
+        y = [z.element for z in x if x.frobnizzle==5]
+    %>
+    % for elem in y:
+        element: ${elem}
+    % endfor
+
+Within ``<% %>``, you're writing a regular block of Python code.
+While the code can appear with an arbitrary level of preceding
+whitespace, it has to be consistently formatted with itself.
+Mako's compiler will adjust the block of Python to be consistent
+with the surrounding generated Python code.
+
+Module-level Blocks
+===================
+
+A variant on ``<% %>`` is the module-level code block, denoted
+by ``<%! %>``. Code within these tags is executed at the module
+level of the template, and not within the rendering function of
+the template. Therefore, this code does not have access to the
+template's context and is only executed when the template is
+loaded into memory (which can be only once per application, or
+more, depending on the runtime environment). Use the ``<%! %>``
+tags to declare your template's imports, as well as any
+pure-Python functions you might want to declare:
+
+.. sourcecode:: mako
+
+    <%!
+        import mylib
+        import re
+
+        def filter(text):
+            return re.sub(r'^@', '', text)
+    %>
+
+Any number of ``<%! %>`` blocks can be declared anywhere in a
+template; they will be rendered in the resulting module 
+in a single contiguous block above all render callables,
+in the order in which they appear in the source template.
+
+Tags
+====
+
+The rest of what Mako offers takes place in the form of tags.
+All tags use the same syntax, which is similar to an XML tag
+except that the first character of the tag name is a ``%``
+character. The tag is closed either by a contained slash
+character, or an explicit closing tag:
+
+.. sourcecode:: mako
+
+    <%include file="foo.txt"/>
+
+    <%def name="foo" buffered="True">
+        this is a def
+    </%def>
+
+All tags have a set of attributes which are defined for each
+tag. Some of these attributes are required. Also, many
+attributes support **evaluation**, meaning you can embed an
+expression (using ``${}``) inside the attribute text:
+
+.. sourcecode:: mako
+
+    <%include file="/foo/bar/${myfile}.txt"/>
+
+Whether or not an attribute accepts runtime evaluation depends
+on the type of tag and how that tag is compiled into the
+template. The best way to find out if you can stick an
+expression in is to try it! The lexer will tell you if it's not
+valid.
+
+Heres a quick summary of all the tags:
+
+``<%page>``
+-----------
+
+This tag defines general characteristics of the template,
+including caching arguments, and optional lists of arguments
+which the template expects when invoked.
+
+.. sourcecode:: mako
+
+    <%page args="x, y, z='default'"/>
+
+Or a page tag that defines caching characteristics:
+
+.. sourcecode:: mako
+
+    <%page cached="True" cache_type="memory"/>
+
+Currently, only one ``<%page>`` tag gets used per template, the
+rest get ignored. While this will be improved in a future
+release, for now make sure you have only one ``<%page>`` tag
+defined in your template, else you may not get the results you
+want. The details of what ``<%page>`` is used for are described
+further in :ref:`namespaces_body` as well as :ref:`caching_toplevel`.
+
+``<%include>``
+--------------
+
+A tag that is familiar from other template languages, ``%include``
+is a regular joe that just accepts a file argument and calls in
+the rendered result of that file:
+
+.. sourcecode:: mako
+
+    <%include file="header.html"/>
+
+        hello world
+
+    <%include file="footer.html"/>
+
+Include also accepts arguments which are available as ``<%page>`` arguments in the receiving template:
+
+.. sourcecode:: mako
+
+    <%include file="toolbar.html" args="current_section='members', username='ed'"/>
+
+``<%def>``
+----------
+
+The ``%def`` tag defines a Python function which contains a set
+of content, that can be called at some other point in the
+template. The basic idea is simple:
+
+.. sourcecode:: mako
+
+    <%def name="myfunc(x)">
+        this is myfunc, x is ${x}
+    </%def>
+
+    ${myfunc(7)}
+
+The ``%def`` tag is a lot more powerful than a plain Python ``def``, as
+the Mako compiler provides many extra services with ``%def`` that
+you wouldn't normally have, such as the ability to export defs
+as template "methods", automatic propagation of the current
+:class:`.Context`, buffering/filtering/caching flags, and def calls
+with content, which enable packages of defs to be sent as
+arguments to other def calls (not as hard as it sounds). Get the
+full deal on what ``%def`` can do in :ref:`defs_toplevel`.
+
+``<%block>``
+------------
+
+``%block`` is a tag that is close to a ``%def``,
+except executes itself immediately in its base-most scope,
+and can also be anonymous (i.e. with no name):
+
+.. sourcecode:: mako
+
+    <%block filter="h">
+        some <html> stuff.
+    </%block>
+
+Inspired by Jinja2 blocks, named blocks offer a syntactically pleasing way
+to do inheritance:
+
+.. sourcecode:: mako
+
+    <html>
+        <body>
+        <%block name="header">
+            <h2><%block name="title"/></h2>
+        </%block>
+        ${self.body()}
+        </body>
+    </html>
+
+Blocks are introduced in :ref:`blocks` and further described in :ref:`inheritance_toplevel`.
+
+.. versionadded:: 0.4.1
+
+``<%namespace>``
+----------------
+
+``%namespace`` is Mako's equivalent of Python's ``import``
+statement. It allows access to all the rendering functions and
+metadata of other template files, plain Python modules, as well
+as locally defined "packages" of functions.
+
+.. sourcecode:: mako
+
+    <%namespace file="functions.html" import="*"/>
+
+The underlying object generated by ``%namespace``, an instance of
+:class:`.mako.runtime.Namespace`, is a central construct used in
+templates to reference template-specific information such as the
+current URI, inheritance structures, and other things that are
+not as hard as they sound right here. Namespaces are described
+in :ref:`namespaces_toplevel`.
+
+``<%inherit>``
+--------------
+
+Inherit allows templates to arrange themselves in **inheritance
+chains**. This is a concept familiar in many other template
+languages.
+
+.. sourcecode:: mako
+
+    <%inherit file="base.html"/>
+
+When using the ``%inherit`` tag, control is passed to the topmost
+inherited template first, which then decides how to handle
+calling areas of content from its inheriting templates. Mako
+offers a lot of flexibility in this area, including dynamic
+inheritance, content wrapping, and polymorphic method calls.
+Check it out in :ref:`inheritance_toplevel`.
+
+``<%``\ nsname\ ``:``\ defname\ ``>``
+-------------------------------------
+
+Any user-defined "tag" can be created against
+a namespace by using a tag with a name of the form
+``<%<namespacename>:<defname>>``. The closed and open formats of such a
+tag are equivalent to an inline expression and the ``<%call>``
+tag, respectively.
+
+.. sourcecode:: mako
+
+    <%mynamespace:somedef param="some value">
+        this is the body
+    </%mynamespace:somedef>
+
+To create custom tags which accept a body, see
+:ref:`defs_with_content`.
+
+.. versionadded:: 0.2.3
+
+``<%call>``
+-----------
+
+The call tag is the "classic" form of a user-defined tag, and is
+roughly equivalent to the ``<%namespacename:defname>`` syntax
+described above. This tag is also described in :ref:`defs_with_content`.
+
+``<%doc>``
+----------
+
+The ``%doc`` tag handles multiline comments:
+
+.. sourcecode:: mako
+
+    <%doc>
+        these are comments
+        more comments
+    </%doc>
+
+Also the ``##`` symbol as the first non-space characters on a line can be used for single line comments.
+
+``<%text>``
+-----------
+
+This tag suspends the Mako lexer's normal parsing of Mako
+template directives, and returns its entire body contents as
+plain text. It is used pretty much to write documentation about
+Mako:
+
+.. sourcecode:: mako
+
+    <%text filter="h">
+        heres some fake mako ${syntax}
+        <%def name="x()">${x}</%def>
+    </%text>
+
+Returning Early from a Template
+===============================
+
+Sometimes you want to stop processing a template or ``<%def>``
+method in the middle and just use the text you've accumulated so
+far. You can use a ``return`` statement inside a Python
+block to do that.
+
+.. sourcecode:: mako
+
+    % if not len(records):
+        No records found.
+        <% return %>
+    % endif
+
+Or perhaps:
+
+.. sourcecode:: mako
+
+    <%
+        if not len(records):
+            return
+    %>
+
diff --git a/lib/mako-0.7.2/doc/build/templates/base.mako b/lib/mako-0.7.2/doc/build/templates/base.mako
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/templates/base.mako
@@ -0,0 +1,51 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title><%block name="head_title">Mako Templates for Python</%block></title>
+<%block name="headers">
+</%block>
+<link rel="stylesheet" href="${pathto('_static/site.css', 1)}"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+    % if toolbar:
+    <div class="toolbar">
+    <a href="${site_base}/">Home</a>
+    &nbsp; | &nbsp;
+    <a href="${site_base}/trac">Trac</a>
+    &nbsp; | &nbsp;
+    <a href="${site_base}/community.html">Community</a>
+    &nbsp; | &nbsp;
+    <a href="${pathto('index')}">Documentation</a>
+    &nbsp; | &nbsp;
+    <a href="${site_base}/download.html">Download</a>
+    </div>
+    % endif
+
+    </div>
+
+    <a href="${site_base}/"><img src="${pathto('_static/makoLogo.png', 1)}" /></a>
+
+    <hr/>
+
+    ${next.body()}
+<div class="clearfix">
+<%block name="footer">
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+</%block>
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/build/templates/genindex.mako b/lib/mako-0.7.2/doc/build/templates/genindex.mako
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/templates/genindex.mako
@@ -0,0 +1,77 @@
+<%inherit file="${context['layout']}"/>
+
+<%block name="show_title" filter="util.striptags">
+    ${_('Index')}
+</%block>
+
+   <h1 id="index">${_('Index')}</h1>
+
+   % for i, (key, dummy) in enumerate(genindexentries):
+    ${i != 0 and '| ' or ''}<a href="#${key}"><strong>${key}</strong></a>
+   % endfor
+
+   <hr />
+
+   % for i, (key, entries) in enumerate(genindexentries):
+<h2 id="${key}">${key}</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    <%
+        breakat = genindexcounts[i] // 2
+        numcols = 1
+        numitems = 0
+    %>
+% for entryname, (links, subitems) in entries:
+
+<dt>
+    % if links:
+        <a href="${links[0][1]}">${entryname|h}</a>
+        % for unknown, link in links[1:]:
+            , <a href="${link}">[${i}]</a>
+        % endfor
+    % else:
+        ${entryname|h}
+    % endif
+</dt>
+
+    % if subitems:
+    <dd><dl>
+      % for subentryname, subentrylinks in subitems:
+      <dt><a href="${subentrylinks[0][1]}">${subentryname|h}</a>
+              % for j, (unknown, link) in enumerate(subentrylinks[1:]):
+                  <a href="${link}">[${j}]</a>
+              % endfor
+      </dt>
+      % endfor
+    </dl></dd>
+    % endif
+
+  <%
+    numitems = numitems + 1 + len(subitems)
+  %>
+  % if numcols <2 and numitems > breakat:
+     <%
+        numcols = numcols + 1
+     %>
+        </dl></td><td width="33%" valign="top"><dl>
+  % endif
+
+% endfor
+<dt></dt></dl>
+</td></tr></table>
+% endfor
+
+<%def name="sidebarrel()">
+% if split_index:
+   <h4>${_('Index')}</h4>
+   <p>
+   % for i, (key, dummy) in enumerate(genindexentries):
+       ${i > 0 and '| ' or ''}
+       <a href="${pathto('genindex-' + key)}"><strong>${key}</strong></a>
+   % endfor
+   </p>
+
+   <p><a href="${pathto('genindex-all')}"><strong>${_('Full index on one page')}</strong></a></p>
+% endif
+   ${parent.sidebarrel()}
+</%def>
diff --git a/lib/mako-0.7.2/doc/build/templates/layout.mako b/lib/mako-0.7.2/doc/build/templates/layout.mako
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/templates/layout.mako
@@ -0,0 +1,199 @@
+## coding: utf-8
+<%!
+    local_script_files = []
+%>
+<%doc>
+    Structural elements are all prefixed with "docs-"
+    to prevent conflicts when the structure is integrated into the 
+    main site.
+    
+    docs-container ->
+        docs-header ->
+            docs-search
+            docs-version-header
+        docs-top-navigation
+            docs-top-page-control
+            docs-navigation-banner
+        docs-body-container ->
+            docs-sidebar
+            docs-body
+        docs-bottom-navigation
+            docs-copyright
+</%doc>
+
+<%inherit file="base.mako"/>
+
+<%
+withsidebar = bool(toc) and current_page_name != 'index'
+%>
+
+<%block name="head_title">
+    % if current_page_name != 'index':
+    ${capture(self.show_title) | util.striptags} &mdash; 
+    % endif
+    ${docstitle|h}
+</%block>
+
+
+<div id="docs-container">
+
+<%block name="headers">
+    <link rel="stylesheet" href="${pathto('_static/pygments.css', 1)}" type="text/css" />
+    <link rel="stylesheet" href="${pathto('_static/docs.css', 1)}" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '${pathto("", 1)}',
+          VERSION:     '${release|h}',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '${file_suffix}'
+      };
+    </script>
+    % for scriptfile in script_files + self.attr.local_script_files:
+        <script type="text/javascript" src="${pathto(scriptfile, 1)}"></script>
+    % endfor
+    % if hasdoc('about'):
+        <link rel="author" title="${_('About these documents')}" href="${pathto('about')}" />
+    % endif
+    <link rel="index" title="${_('Index')}" href="${pathto('genindex')}" />
+    <link rel="search" title="${_('Search')}" href="${pathto('search')}" />
+    % if hasdoc('copyright'):
+        <link rel="copyright" title="${_('Copyright')}" href="${pathto('copyright')}" />
+    % endif
+    <link rel="top" title="${docstitle|h}" href="${pathto('index')}" />
+    % if parents:
+        <link rel="up" title="${parents[-1]['title']|util.striptags}" href="${parents[-1]['link']|h}" />
+    % endif
+    % if nexttopic:
+        <link rel="next" title="${nexttopic['title']|util.striptags}" href="${nexttopic['link']|h}" />
+    % endif
+    % if prevtopic:
+        <link rel="prev" title="${prevtopic['title']|util.striptags}" href="${prevtopic['link']|h}" />
+    % endif
+</%block>
+
+<div id="docs-header">
+    <h1>${docstitle|h}</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="${pathto('search')}" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">${release}</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+        % if prevtopic:
+            <li>Prev:
+            <a href="${prevtopic['link']|h}" title="${_('previous chapter')}">${prevtopic['title']}</a>
+            </li>
+        % endif
+        % if nexttopic:
+            <li>Next:
+            <a href="${nexttopic['link']|h}" title="${_('next chapter')}">${nexttopic['title']}</a>
+            </li>
+        % endif
+
+        <li>
+            <a href="${pathto('index')}">Table of Contents</a> |
+            <a href="${pathto('genindex')}">Index</a>
+            % if sourcename:
+            | <a href="${pathto('_sources/' + sourcename, True)|h}">${_('view source')}
+            % endif
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="${pathto('index')}">${docstitle|h}</a>
+        % if parents:
+            % for parent in parents:
+                ? <a href="${parent['link']|h}" title="${parent['title']}">${parent['title']}</a>
+            % endfor
+        % endif
+        % if current_page_name != 'index':
+        ? ${self.show_title()} 
+        % endif
+
+        <h2>
+            <%block name="show_title">
+                ${title}
+            </%block>
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+% if withsidebar:
+    <div id="docs-sidebar">
+    <h3><a href="${pathto('index')}">Table of Contents</a></h3>
+    ${toc}
+
+    % if prevtopic:
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="${prevtopic['link']|h}" title="${_('previous chapter')}">${prevtopic['title']}</a>
+    </p>
+    % endif
+    % if nexttopic:
+    <h4>Next Topic</h4>
+    <p>
+    <a href="${nexttopic['link']|h}" title="${_('next chapter')}">${nexttopic['title']}</a>
+    </p>
+    % endif
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="${pathto('search')}" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+% endif
+
+    <div id="docs-body" class="${'withsidebar' if withsidebar else ''}" >
+        ${next.body()}
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+    % if prevtopic:
+        Previous:
+        <a href="${prevtopic['link']|h}" title="${_('previous chapter')}">${prevtopic['title']}</a>
+    % endif
+    % if nexttopic:
+        Next:
+        <a href="${nexttopic['link']|h}" title="${_('next chapter')}">${nexttopic['title']}</a>
+    % endif
+
+    <div id="docs-copyright">
+    % if hasdoc('copyright'):
+        &copy; <a href="${pathto('copyright')}">Copyright</a> ${copyright|h}.
+    % else:
+        &copy; Copyright ${copyright|h}.
+    % endif
+    % if show_sphinx:
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> ${sphinx_version|h} 
+        with Mako templates.
+    % endif
+    </div>
+</div>
+
+</div>
diff --git a/lib/mako-0.7.2/doc/build/templates/page.mako b/lib/mako-0.7.2/doc/build/templates/page.mako
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/templates/page.mako
@@ -0,0 +1,2 @@
+<%inherit file="${context['layout']}"/>
+${body| util.strip_toplevel_anchors}
\ No newline at end of file
diff --git a/lib/mako-0.7.2/doc/build/templates/rtd_layout.mako b/lib/mako-0.7.2/doc/build/templates/rtd_layout.mako
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/templates/rtd_layout.mako
@@ -0,0 +1,174 @@
+<!-- readthedocs add-in template, ported from their jinja source -->
+
+<%inherit file="/layout.mako"/>
+
+<%
+    newscript = []
+    # strip out script files that RTD wants to provide
+    for script in script_files:
+        for token in ("jquery.js", "underscore.js", "doctools.js"):
+            if token in script:
+                break
+        else:
+            newscript.append(script)
+    script_files[:] = newscript
+%>
+
+<%block name="headers">
+    ${parent.headers()}
+<!-- RTD <head> -->
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+<script type="text/javascript" src="${MEDIA_URL}javascript/underscore.js"></script>
+<script type="text/javascript" src="${MEDIA_URL}javascript/doctools.js"></script>
+<script type="text/javascript" src="${MEDIA_URL}javascript/searchtools.js"></script>
+##{% if using_theme %}
+##  <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
+##{% endif %}
+  <script type="text/javascript">
+    var doc_version = "${current_version}";
+    var doc_slug = "${slug}";
+  </script>
+  <script type="text/javascript" src="${MEDIA_URL}javascript/rtd.js"></script>
+<!-- end RTD <head> -->
+</%block>
+
+${next.body()}
+
+<%block name="footer">
+    ${parent.footer()}
+ <!-- End original user content -->
+## Keep this here, so that the RTD logo doesn't stomp on the bottom of the theme.
+<br>
+<br>
+<br>
+
+<style type="text/css">
+  .badge {
+    position: fixed;
+    display: block;
+    bottom: 5px;
+    height: 40px;
+    text-indent: -9999em;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 1px 0 rgba(255, 255, 255, 0.2) inset;
+    -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 1px 0 rgba(255, 255, 255, 0.2) inset;
+    -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 1px 0 rgba(255, 255, 255, 0.2) inset;
+  }
+  #version_menu {
+    position: fixed;
+    display: none;
+    bottom: 11px;
+    right: 166px;
+    list-style-type: none;
+    margin: 0;
+  }
+  .footer_popout:hover #version_menu {
+    display: block;
+  }
+  #version_menu li {
+    display: block;
+    float: right;
+  }
+  #version_menu li a {
+    display: block;
+    padding: 6px 10px 4px 10px;
+    margin: 7px 7px 0 0;
+    font-weight: bold;
+    font-size: 14px;
+    height: 20px;
+    line-height: 17px;
+    text-decoration: none;
+    color: #fff;
+    background: #8ca1af url(../images/gradient-light.png) bottom left repeat-x;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    box-shadow: 0 1px 1px #465158;
+    -moz-box-shadow: 0 1px 1px #465158;
+    -webkit-box-shadow: 0 1px 1px #465158;
+    text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
+  }
+  #version_menu li a:hover {
+    text-decoration: none;
+    background-color: #697983;
+    box-shadow: 0 1px 0px #465158;
+    -moz-box-shadow: 0 1px 0px #465158;
+    -webkit-box-shadow: 0 1px 0px #465158;
+  }
+  .badge.rtd {
+    background: #257597 url(http://media.readthedocs.org/images/badge-rtd.png) top left no-repeat;
+    border: 1px solid #282E32;
+    width: 160px;
+    right: 5px;
+  }
+  .badge.revsys { background: #465158 url(http://media.readthedocs.org/images/badge-revsys.png) top left no-repeat;
+    border: 1px solid #1C5871;
+    width: 290px;
+    right: 173px;
+  }
+  .badge.revsys-inline-sponsored {
+    position: inherit;
+    margin-left: auto;
+    margin-right: 175px;
+    margin-bottom: 5px;
+    background: #465158 url(http://media.readthedocs.org/images/badge-revsys.png) top left no-repeat;
+    border: 1px solid #1C5871;
+    width: 290px;
+    right: 173px;
+  }
+  .badge.revsys-inline {
+    position: inherit;
+    margin-left: auto;
+    margin-right: 175px;
+    margin-bottom: 5px;
+    background: #465158 url(http://media.readthedocs.org/images/badge-revsys-sm.png) top left no-repeat;
+    border: 1px solid #1C5871;
+    width: 205px;
+    right: 173px;
+  }
+
+</style>
+<div class="rtd_doc_footer">
+  <div class="footer_popout">
+    <a href="http://readthedocs.org/projects/${slug}/?fromdocs=${slug}" class="badge rtd">Brought to you by Read the Docs</a>
+    <ul id="version_menu">
+      ## note that rtd.js blows this away, probably checks if the links
+      ## are good or something like that (in which case why are they in the 'versions' 
+      ## collection...)
+      % for _slug, url in versions:
+        <li><a href="http://readthedocs.org${url}">${_slug}</a></li>
+      % endfor
+    </ul>
+  </div>
+</div>
+<!-- RTD Analytics Code -->
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-17997319-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+
+% if analytics_code:
+<!-- User Analytics Code -->
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '${analytics_code}']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+% endif
+
+</%block>
diff --git a/lib/mako-0.7.2/doc/build/templates/search.mako b/lib/mako-0.7.2/doc/build/templates/search.mako
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/templates/search.mako
@@ -0,0 +1,25 @@
+<%inherit file="${context['layout']}"/>
+
+<%!
+    local_script_files = ['_static/searchtools.js']
+%>
+
+<%block name="show_title" filter="util.striptags">
+    ${_('Search')}
+</%block>
+
+<div id="searchform">
+<h3>Enter Search Terms:</h3>
+<form class="search" action="${pathto('search')}" method="get">
+  <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+</div>
+
+<div id="search-results"></div>
+
+<%block name="footer">
+    ${parent.footer()}
+    <script type="text/javascript" src="searchindex.js"></script>
+</%block>
diff --git a/lib/mako-0.7.2/doc/build/unicode.rst b/lib/mako-0.7.2/doc/build/unicode.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/unicode.rst
@@ -0,0 +1,345 @@
+.. _unicode_toplevel:
+
+===================
+The Unicode Chapter
+===================
+
+The Python language supports two ways of representing what we
+know as "strings", i.e. series of characters. In Python 2, the
+two types are ``string`` and ``unicode``, and in Python 3 they are
+``bytes`` and ``string``. A key aspect of the Python 2 ``string`` and
+Python 3 ``bytes`` types are that they contain no information
+regarding what **encoding** the data is stored in. For this
+reason they were commonly referred to as **byte strings** on
+Python 2, and Python 3 makes this name more explicit. The
+origins of this come from Python's background of being developed
+before the Unicode standard was even available, back when
+strings were C-style strings and were just that, a series of
+bytes. Strings that had only values below 128 just happened to
+be **ASCII** strings and were printable on the console, whereas
+strings with values above 128 would produce all kinds of
+graphical characters and bells.
+
+Contrast the "byte-string" type with the "unicode/string" type.
+Objects of this latter type are created whenever you say something like
+``u"hello world"`` (or in Python 3, just ``"hello world"``). In this
+case, Python represents each character in the string internally
+using multiple bytes per character (something similar to
+UTF-16). What's important is that when using the
+``unicode``/``string`` type to store strings, Python knows the
+data's encoding; it's in its own internal format. Whereas when
+using the ``string``/``bytes`` type, it does not.
+
+When Python 2 attempts to treat a byte-string as a string, which
+means it's attempting to compare/parse its characters, to coerce
+it into another encoding, or to decode it to a unicode object,
+it has to guess what the encoding is. In this case, it will
+pretty much always guess the encoding as ``ascii``... and if the
+byte-string contains bytes above value 128, you'll get an error.
+Python 3 eliminates much of this confusion by just raising an
+error unconditionally if a byte-string is used in a
+character-aware context.
+
+There is one operation that Python *can* do with a non-ASCII
+byte-string, and it's a great source of confusion: it can dump the
+byte-string straight out to a stream or a file, with nary a care
+what the encoding is. To Python, this is pretty much like
+dumping any other kind of binary data (like an image) to a
+stream somewhere. In Python 2, it is common to see programs that
+embed all kinds of international characters and encodings into
+plain byte-strings (i.e. using ``"hello world"`` style literals)
+can fly right through their run, sending reams of strings out to
+wherever they are going, and the programmer, seeing the same
+output as was expressed in the input, is now under the illusion
+that his or her program is Unicode-compliant. In fact, their
+program has no unicode awareness whatsoever, and similarly has
+no ability to interact with libraries that *are* unicode aware.
+Python 3 makes this much less likely by defaulting to unicode as
+the storage format for strings.
+
+The "pass through encoded data" scheme is what template
+languages like Cheetah and earlier versions of Myghty do by
+default. Mako as of version 0.2 also supports this mode of
+operation when using Python 2, using the ``disable_unicode=True``
+flag. However, when using Mako in its default mode of
+unicode-aware, it requires explicitness when dealing with
+non-ASCII encodings. Additionally, if you ever need to handle
+unicode strings and other kinds of encoding conversions more
+intelligently, the usage of raw byte-strings quickly becomes a
+nightmare, since you are sending the Python interpreter
+collections of bytes for which it can make no intelligent
+decisions with regards to encoding. In Python 3 Mako only allows
+usage of native, unicode strings.
+
+In normal Mako operation, all parsed template constructs and
+output streams are handled internally as Python ``unicode``
+objects. It's only at the point of :meth:`~.Template.render` that this unicode
+stream may be rendered into whatever the desired output encoding
+is. The implication here is that the template developer must
+:ensure that :ref:`the encoding of all non-ASCII templates is explicit
+<set_template_file_encoding>` (still required in Python 3),
+that :ref:`all non-ASCII-encoded expressions are in one way or another
+converted to unicode <handling_non_ascii_expressions>`
+(not much of a burden in Python 3), and that :ref:`the output stream of the
+template is handled as a unicode stream being encoded to some
+encoding <defining_output_encoding>` (still required in Python 3).
+
+.. _set_template_file_encoding:
+
+Specifying the Encoding of a Template File
+==========================================
+
+This is the most basic encoding-related setting, and it is
+equivalent to Python's "magic encoding comment", as described in
+`pep-0263 <http://www.python.org/dev/peps/pep-0263/>`_. Any
+template that contains non-ASCII characters requires that this
+comment be present so that Mako can decode to unicode (and also
+make usage of Python's AST parsing services). Mako's lexer will
+use this encoding in order to convert the template source into a
+``unicode`` object before continuing its parsing:
+
+.. sourcecode:: mako
+
+    ## -*- coding: utf-8 -*-
+
+    Alors vous imaginez ma surprise, au lever du jour, quand 
+    une dr?le de petite voix m?a r?veill?. Elle disait:
+     ? S?il vous pla?t? dessine-moi un mouton! ?
+
+For the picky, the regular expression used is derived from that
+of the above mentioned pep:
+
+.. sourcecode:: python
+
+    #.*coding[:=]\s*([-\w.]+).*\n
+
+The lexer will convert to unicode in all cases, so that if any
+characters exist in the template that are outside of the
+specified encoding (or the default of ``ascii``), the error will
+be immediate.
+
+As an alternative, the template encoding can be specified
+programmatically to either :class:`.Template` or :class:`.TemplateLookup` via
+the ``input_encoding`` parameter:
+
+.. sourcecode:: python
+
+    t = TemplateLookup(directories=['./'], input_encoding='utf-8')
+
+The above will assume all located templates specify ``utf-8``
+encoding, unless the template itself contains its own magic
+encoding comment, which takes precedence.
+
+.. _handling_non_ascii_expressions:
+
+Handling Expressions
+====================
+
+The next area that encoding comes into play is in expression
+constructs. By default, Mako's treatment of an expression like
+this:
+
+.. sourcecode:: mako
+
+    ${"hello world"}
+
+looks something like this:
+
+.. sourcecode:: python
+
+    context.write(unicode("hello world"))
+
+In Python 3, it's just:
+
+.. sourcecode:: python
+
+    context.write(str("hello world"))
+
+That is, **the output of all expressions is run through the
+``unicode`` built-in**. This is the default setting, and can be
+modified to expect various encodings. The ``unicode`` step serves
+both the purpose of rendering non-string expressions into
+strings (such as integers or objects which contain ``__str()__``
+methods), and to ensure that the final output stream is
+constructed as a unicode object. The main implication of this is
+that **any raw byte-strings that contain an encoding other than
+ASCII must first be decoded to a Python unicode object**. It
+means you can't say this in Python 2:
+
+.. sourcecode:: mako
+
+    ${"voix m?a r?veill?."}  ## error in Python 2!
+
+You must instead say this:
+
+.. sourcecode:: mako
+
+    ${u"voix m?a r?veill?."}  ## OK !
+
+Similarly, if you are reading data from a file that is streaming
+bytes, or returning data from some object that is returning a
+Python byte-string containing a non-ASCII encoding, you have to
+explicitly decode to unicode first, such as:
+
+.. sourcecode:: mako
+
+    ${call_my_object().decode('utf-8')}
+
+Note that filehandles acquired by ``open()`` in Python 3 default
+to returning "text", that is the decoding is done for you. See
+Python 3's documentation for the ``open()`` built-in for details on
+this.
+
+If you want a certain encoding applied to *all* expressions,
+override the ``unicode`` builtin with the ``decode`` built-in at the
+:class:`.Template` or :class:`.TemplateLookup` level:
+
+.. sourcecode:: python
+
+    t = Template(templatetext, default_filters=['decode.utf8'])
+
+Note that the built-in ``decode`` object is slower than the
+``unicode`` function, since unlike ``unicode`` it's not a Python
+built-in, and it also checks the type of the incoming data to
+determine if string conversion is needed first.
+
+The ``default_filters`` argument can be used to entirely customize
+the filtering process of expressions. This argument is described
+in :ref:`filtering_default_filters`.
+
+.. _defining_output_encoding:
+
+Defining Output Encoding
+========================
+
+Now that we have a template which produces a pure unicode output
+stream, all the hard work is done. We can take the output and do
+anything with it.
+
+As stated in the :doc:`"Usage" chapter <usage>`, both :class:`.Template` and
+:class:`.TemplateLookup` accept ``output_encoding`` and ``encoding_errors``
+parameters which can be used to encode the output in any Python
+supported codec:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'], output_encoding='utf-8', encoding_errors='replace')
+
+    mytemplate = mylookup.get_template("foo.txt")
+    print mytemplate.render()
+
+:meth:`~.Template.render` will return a ``bytes`` object in Python 3 if an output
+encoding is specified. By default it performs no encoding and
+returns a native string.
+
+:meth:`~.Template.render_unicode` will return the template output as a Python
+``unicode`` object (or ``string`` in Python 3):
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode()
+
+The above method disgards the output encoding keyword argument;
+you can encode yourself by saying:
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode().encode('utf-8', 'replace')
+
+Buffer Selection
+----------------
+
+Mako does play some games with the style of buffering used
+internally, to maximize performance. Since the buffer is by far
+the most heavily used object in a render operation, it's
+important!
+
+When calling :meth:`~.Template.render` on a template that does not specify any
+output encoding (i.e. it's ``ascii``), Python's ``cStringIO`` module,
+which cannot handle encoding of non-ASCII ``unicode`` objects
+(even though it can send raw byte-strings through), is used for
+buffering. Otherwise, a custom Mako class called
+``FastEncodingBuffer`` is used, which essentially is a super
+dumbed-down version of ``StringIO`` that gathers all strings into
+a list and uses ``u''.join(elements)`` to produce the final output
+-- it's markedly faster than ``StringIO``.
+
+.. _unicode_disabled:
+
+Saying to Heck with It: Disabling the Usage of Unicode Entirely
+===============================================================
+
+Some segments of Mako's userbase choose to make no usage of
+Unicode whatsoever, and instead would prefer the "pass through"
+approach; all string expressions in their templates return
+encoded byte-strings, and they would like these strings to pass
+right through. The only advantage to this approach is that
+templates need not use ``u""`` for literal strings; there's an
+arguable speed improvement as well since raw byte-strings
+generally perform slightly faster than unicode objects in
+Python. For these users, assuming they're sticking with Python
+2, they can hit the ``disable_unicode=True`` flag as so:
+
+.. sourcecode:: python
+
+    # -*- encoding:utf-8 -*-
+    from mako.template import Template
+
+    t = Template("dr?le de petite voix m?a r?veill?.", disable_unicode=True, input_encoding='utf-8')
+    print t.code
+
+The ``disable_unicode`` mode is strictly a Python 2 thing. It is
+not supported at all in Python 3.
+
+The generated module source code will contain elements like
+these:
+
+.. sourcecode:: python
+
+    # -*- encoding:utf-8 -*-
+    #  ...more generated code ...
+
+    def render_body(context,**pageargs):
+        context.caller_stack.push_frame()
+        try:
+            __M_locals = dict(pageargs=pageargs)
+            # SOURCE LINE 1
+            context.write('dr\xc3\xb4le de petite voix m\xe2\x80\x99a r\xc3\xa9veill\xc3\xa9.')
+            return ''
+        finally:
+            context.caller_stack.pop_frame()
+
+Where above that the string literal used within :meth:`.Context.write`
+is a regular byte-string.
+
+When ``disable_unicode=True`` is turned on, the ``default_filters``
+argument which normally defaults to ``["unicode"]`` now defaults
+to ``["str"]`` instead. Setting ``default_filters`` to the empty list
+``[]`` can remove the overhead of the ``str`` call. Also, in this
+mode you **cannot** safely call :meth:`~.Template.render_unicode` -- you'll get
+unicode/decode errors.
+
+The ``h`` filter (HTML escape) uses a less performant pure Python
+escape function in non-unicode mode. This because
+MarkupSafe only supports Python unicode objects for non-ASCII
+strings.
+
+.. versionchanged:: 0.3.4
+   In prior versions, it used ``cgi.escape()``, which has been replaced
+   with a function that also escapes single quotes.
+
+Rules for using ``disable_unicode=True``
+----------------------------------------
+
+* Don't use this mode unless you really, really want to and you
+  absolutely understand what you're doing.
+* Don't use this option just because you don't want to learn to
+  use Unicode properly; we aren't supporting user issues in this
+  mode of operation. We will however offer generous help for the
+  vast majority of users who stick to the Unicode program.
+* Python 3 is unicode by default, and the flag is not available
+  when running on Python 3.
+
diff --git a/lib/mako-0.7.2/doc/build/usage.rst b/lib/mako-0.7.2/doc/build/usage.rst
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/build/usage.rst
@@ -0,0 +1,520 @@
+.. _usage_toplevel:
+
+=====
+Usage
+=====
+
+Basic Usage
+===========
+
+This section describes the Python API for Mako templates. If you
+are using Mako within a web framework such as Pylons, the work
+of integrating Mako's API is already done for you, in which case
+you can skip to the next section, :ref:`syntax_toplevel`.
+
+The most basic way to create a template and render it is through
+the :class:`.Template` class:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template("hello world!")
+    print mytemplate.render()
+
+Above, the text argument to :class:`.Template` is **compiled** into a
+Python module representation. This module contains a function
+called ``render_body()``, which produces the output of the
+template. When ``mytemplate.render()`` is called, Mako sets up a
+runtime environment for the template and calls the
+``render_body()`` function, capturing the output into a buffer and
+returning its string contents.
+
+
+The code inside the ``render_body()`` function has access to a
+namespace of variables. You can specify these variables by
+sending them as additional keyword arguments to the :meth:`~.Template.render`
+method:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template("hello, ${name}!")
+    print mytemplate.render(name="jack")
+
+The :meth:`~.Template.render` method calls upon Mako to create a
+:class:`.Context` object, which stores all the variable names accessible
+to the template and also stores a buffer used to capture output.
+You can create this :class:`.Context` yourself and have the template
+render with it, using the :meth:`~.Template.render_context` method:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.runtime import Context
+    from StringIO import StringIO
+
+    mytemplate = Template("hello, ${name}!")
+    buf = StringIO()
+    ctx = Context(buf, name="jack")
+    mytemplate.render_context(ctx)
+    print buf.getvalue()
+
+Using File-Based Templates
+==========================
+
+A :class:`.Template` can also load its template source code from a file,
+using the ``filename`` keyword argument:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template(filename='/docs/mytmpl.txt')
+    print mytemplate.render()
+
+For improved performance, a :class:`.Template` which is loaded from a
+file can also cache the source code to its generated module on
+the filesystem as a regular Python module file (i.e. a ``.py``
+file). To do this, just add the ``module_directory`` argument to
+the template:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+
+    mytemplate = Template(filename='/docs/mytmpl.txt', module_directory='/tmp/mako_modules')
+    print mytemplate.render()
+
+When the above code is rendered, a file
+``/tmp/mako_modules/docs/mytmpl.txt.py`` is created containing the
+source code for the module. The next time a :class:`.Template` with the
+same arguments is created, this module file will be
+automatically re-used.
+
+.. _usage_templatelookup:
+
+Using ``TemplateLookup``
+========================
+
+All of the examples thus far have dealt with the usage of a
+single :class:`.Template` object. If the code within those templates
+tries to locate another template resource, it will need some way
+to find them, using simple URI strings. For this need, the
+resolution of other templates from within a template is
+accomplished by the :class:`.TemplateLookup` class. This class is
+constructed given a list of directories in which to search for
+templates, as well as keyword arguments that will be passed to
+the :class:`.Template` objects it creates:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'])
+    mytemplate = Template("""<%include file="header.txt"/> hello world!""", lookup=mylookup)
+
+Above, we created a textual template which includes the file
+``"header.txt"``. In order for it to have somewhere to look for
+``"header.txt"``, we passed a :class:`.TemplateLookup` object to it, which
+will search in the directory ``/docs`` for the file ``"header.txt"``.
+
+Usually, an application will store most or all of its templates
+as text files on the filesystem. So far, all of our examples
+have been a little bit contrived in order to illustrate the
+basic concepts. But a real application would get most or all of
+its templates directly from the :class:`.TemplateLookup`, using the
+aptly named :meth:`~.TemplateLookup.get_template` method, which accepts the URI of the
+desired template:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'], module_directory='/tmp/mako_modules')
+
+    def serve_template(templatename, **kwargs):
+        mytemplate = mylookup.get_template(templatename)
+        print mytemplate.render(**kwargs)
+
+In the example above, we create a :class:`.TemplateLookup` which will
+look for templates in the ``/docs`` directory, and will store
+generated module files in the ``/tmp/mako_modules`` directory. The
+lookup locates templates by appending the given URI to each of
+its search directories; so if you gave it a URI of
+``/etc/beans/info.txt``, it would search for the file
+``/docs/etc/beans/info.txt``, else raise a :class:`.TopLevelNotFound`
+exception, which is a custom Mako exception.
+
+When the lookup locates templates, it will also assign a ``uri``
+property to the :class:`.Template` which is the URI passed to the
+:meth:`~.TemplateLookup.get_template()` call. :class:`.Template` uses this URI to calculate the
+name of its module file. So in the above example, a
+``templatename`` argument of ``/etc/beans/info.txt`` will create a
+module file ``/tmp/mako_modules/etc/beans/info.txt.py``.
+
+Setting the Collection Size
+---------------------------
+
+The :class:`.TemplateLookup` also serves the important need of caching a
+fixed set of templates in memory at a given time, so that
+successive URI lookups do not result in full template
+compilations and/or module reloads on each request. By default,
+the :class:`.TemplateLookup` size is unbounded. You can specify a fixed
+size using the ``collection_size`` argument:
+
+.. sourcecode:: python
+
+    mylookup = TemplateLookup(directories=['/docs'],
+                    module_directory='/tmp/mako_modules', collection_size=500)
+
+The above lookup will continue to load templates into memory
+until it reaches a count of around 500. At that point, it will
+clean out a certain percentage of templates using a least
+recently used scheme.
+
+Setting Filesystem Checks
+-------------------------
+
+Another important flag on :class:`.TemplateLookup` is
+``filesystem_checks``. This defaults to ``True``, and says that each
+time a template is returned by the :meth:`~.TemplateLookup.get_template()` method, the
+revision time of the original template file is checked against
+the last time the template was loaded, and if the file is newer
+will reload its contents and recompile the template. On a
+production system, setting ``filesystem_checks`` to ``False`` can
+afford a small to moderate performance increase (depending on
+the type of filesystem used).
+
+.. _usage_unicode:
+
+Using Unicode and Encoding
+==========================
+
+Both :class:`.Template` and :class:`.TemplateLookup` accept ``output_encoding``
+and ``encoding_errors`` parameters which can be used to encode the
+output in any Python supported codec:
+
+.. sourcecode:: python
+
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    mylookup = TemplateLookup(directories=['/docs'], output_encoding='utf-8', encoding_errors='replace')
+
+    mytemplate = mylookup.get_template("foo.txt")
+    print mytemplate.render()
+
+When using Python 3, the :meth:`~.Template.render` method will return a ``bytes``
+object, **if** ``output_encoding`` is set. Otherwise it returns a
+``string``.
+
+Additionally, the :meth:`~.Template.render_unicode()` method exists which will
+return the template output as a Python ``unicode`` object, or in
+Python 3 a ``string``:
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode()
+
+The above method disregards the output encoding keyword
+argument; you can encode yourself by saying:
+
+.. sourcecode:: python
+
+    print mytemplate.render_unicode().encode('utf-8', 'replace')
+
+Note that Mako's ability to return data in any encoding and/or
+``unicode`` implies that the underlying output stream of the
+template is a Python unicode object. This behavior is described
+fully in :ref:`unicode_toplevel`.
+
+.. _handling_exceptions:
+
+Handling Exceptions
+===================
+
+Template exceptions can occur in two distinct places. One is
+when you **lookup, parse and compile** the template, the other
+is when you **run** the template. Within the running of a
+template, exceptions are thrown normally from whatever Python
+code originated the issue. Mako has its own set of exception
+classes which mostly apply to the lookup and lexer/compiler
+stages of template construction. Mako provides some library
+routines that can be used to help provide Mako-specific
+information about any exception's stack trace, as well as
+formatting the exception within textual or HTML format. In all
+cases, the main value of these handlers is that of converting
+Python filenames, line numbers, and code samples into Mako
+template filenames, line numbers, and code samples. All lines
+within a stack trace which correspond to a Mako template module
+will be converted to be against the originating template file.
+
+To format exception traces, the :func:`.text_error_template` and
+:func:`.html_error_template` functions are provided. They make usage of
+``sys.exc_info()`` to get at the most recently thrown exception.
+Usage of these handlers usually looks like:
+
+.. sourcecode:: python
+
+    from mako import exceptions
+
+    try:
+        template = lookup.get_template(uri)
+        print template.render()
+    except:
+        print exceptions.text_error_template().render()
+
+Or for the HTML render function:
+
+.. sourcecode:: python
+
+    from mako import exceptions
+
+    try:
+        template = lookup.get_template(uri)
+        print template.render()
+    except:
+        print exceptions.html_error_template().render()
+
+The :func:`.html_error_template` template accepts two options:
+specifying ``full=False`` causes only a section of an HTML
+document to be rendered. Specifying ``css=False`` will disable the
+default stylesheet from being rendered.
+
+E.g.:
+
+.. sourcecode:: python
+
+    print exceptions.html_error_template().render(full=False)
+
+The HTML render function is also available built-in to
+:class:`.Template` using the ``format_exceptions`` flag. In this case, any
+exceptions raised within the **render** stage of the template
+will result in the output being substituted with the output of
+:func:`.html_error_template`:
+
+.. sourcecode:: python
+
+    template = Template(filename="/foo/bar", format_exceptions=True)
+    print template.render()
+
+Note that the compile stage of the above template occurs when
+you construct the :class:`.Template` itself, and no output stream is
+defined. Therefore exceptions which occur within the
+lookup/parse/compile stage will not be handled and will
+propagate normally. While the pre-render traceback usually will
+not include any Mako-specific lines anyway, it will mean that
+exceptions which occur previous to rendering and those which
+occur within rendering will be handled differently... so the
+``try``/``except`` patterns described previously are probably of more
+general use.
+
+The underlying object used by the error template functions is
+the :class:`.RichTraceback` object. This object can also be used
+directly to provide custom error views. Here's an example usage
+which describes its general API:
+
+.. sourcecode:: python
+
+    from mako.exceptions import RichTraceback
+
+    try:
+        template = lookup.get_template(uri)
+        print template.render()
+    except:
+        traceback = RichTraceback()
+        for (filename, lineno, function, line) in traceback.traceback:
+            print "File %s, line %s, in %s" % (filename, lineno, function)
+            print line, "\n"
+        print "%s: %s" % (str(traceback.error.__class__.__name__), traceback.error)
+
+Common Framework Integrations
+=============================
+
+The Mako distribution includes a little bit of helper code for
+the purpose of using Mako in some popular web framework
+scenarios. This is a brief description of what's included.
+
+WSGI
+----
+
+A sample WSGI application is included in the distribution in the
+file ``examples/wsgi/run_wsgi.py``. This runner is set up to pull
+files from a `templates` as well as an `htdocs` directory and
+includes a rudimental two-file layout. The WSGI runner acts as a
+fully functional standalone web server, using ``wsgiutils`` to run
+itself, and propagates GET and POST arguments from the request
+into the :class:`.Context`, can serve images, CSS files and other kinds
+of files, and also displays errors using Mako's included
+exception-handling utilities.
+
+Pygments
+--------
+
+A `Pygments <http://pygments.pocoo.org>`_-compatible syntax
+highlighting module is included under :mod:`mako.ext.pygmentplugin`.
+This module is used in the generation of Mako documentation and
+also contains various `setuptools` entry points under the heading
+``pygments.lexers``, including ``mako``, ``html+mako``, ``xml+mako``
+(see the ``setup.py`` file for all the entry points).
+
+Babel
+-----
+
+Mako provides support for extracting `gettext` messages from
+templates via a `Babel`_ extractor
+entry point under ``mako.ext.babelplugin``.
+
+`Gettext` messages are extracted from all Python code sections,
+including those of control lines and expressions embedded
+in tags.
+
+`Translator
+comments <http://babel.edgewall.org/wiki/Documentation/messages.html#comments-tags-and-translator-comments-explanation>`_
+may also be extracted from Mako templates when a comment tag is
+specified to `Babel`_ (such as with
+the ``-c`` option).
+
+For example, a project ``"myproj"`` contains the following Mako
+template at ``myproj/myproj/templates/name.html``:
+
+.. sourcecode:: mako
+
+    <div id="name">
+      Name:
+      ## TRANSLATORS: This is a proper name. See the gettext
+      ## manual, section Names.
+      ${_('Francois Pinard')}
+    </div>
+
+To extract gettext messages from this template the project needs
+a Mako section in its `Babel Extraction Method Mapping
+file <http://babel.edgewall.org/wiki/Documentation/messages.html#extraction-method-mapping-and-configuration>`_
+(typically located at ``myproj/babel.cfg``):
+
+.. sourcecode:: cfg
+
+    # Extraction from Python source files
+
+    [python: myproj/**.py]
+
+    # Extraction from Mako templates
+
+    [mako: myproj/templates/**.html]
+    input_encoding = utf-8
+
+The Mako extractor supports an optional ``input_encoding``
+parameter specifying the encoding of the templates (identical to
+:class:`.Template`/:class:`.TemplateLookup`'s ``input_encoding`` parameter).
+
+Invoking `Babel`_'s extractor at the
+command line in the project's root directory:
+
+.. sourcecode:: sh
+
+    myproj$ pybabel extract -F babel.cfg -c "TRANSLATORS:" .
+
+will output a `gettext` catalog to `stdout` including the following:
+
+.. sourcecode:: pot
+
+    #. TRANSLATORS: This is a proper name. See the gettext
+    #. manual, section Names.
+    #: myproj/templates/name.html:5
+    msgid "Francois Pinard"
+    msgstr ""
+
+This is only a basic example:
+`Babel`_ can be invoked from ``setup.py``
+and its command line options specified in the accompanying
+``setup.cfg`` via `Babel Distutils/Setuptools
+Integration <http://babel.edgewall.org/wiki/Documentation/setup.html>`_.
+
+Comments must immediately precede a `gettext` message to be
+extracted. In the following case the ``TRANSLATORS:`` comment would
+not have been extracted:
+
+.. sourcecode:: mako
+
+    <div id="name">
+      ## TRANSLATORS: This is a proper name. See the gettext
+      ## manual, section Names.
+      Name: ${_('Francois Pinard')}
+    </div>
+
+See the `Babel User
+Guide <http://babel.edgewall.org/wiki/Documentation/index.html>`_
+for more information.
+
+.. _babel: http://babel.edgewall.org/
+
+
+API Reference
+=============
+
+.. autoclass:: mako.template.Template
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.template.DefTemplate
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.lookup.TemplateCollection
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.lookup.TemplateLookup
+    :show-inheritance:
+    :members:
+
+.. autoclass:: mako.exceptions.RichTraceback
+    :show-inheritance:
+
+    .. py:attribute:: error
+
+       the exception instance.
+
+    .. py:attribute:: message
+
+       the exception error message as unicode.
+
+    .. py:attribute:: source
+
+       source code of the file where the error occurred.
+       If the error occurred within a compiled template,
+       this is the template source.
+
+    .. py:attribute:: lineno
+
+       line number where the error occurred.  If the error
+       occurred within a compiled template, the line number
+       is adjusted to that of the template source.
+
+    .. py:attribute:: records
+
+       a list of 8-tuples containing the original
+       python traceback elements, plus the
+       filename, line number, source line, and full template source
+       for the traceline mapped back to its originating source
+       template, if any for that traceline (else the fields are ``None``).
+
+    .. py:attribute:: reverse_records
+
+       the list of records in reverse
+       traceback -- a list of 4-tuples, in the same format as a regular
+       python traceback, with template-corresponding
+       traceback records replacing the originals.
+
+    .. py:attribute:: reverse_traceback
+
+       the traceback list in reverse.
+
+.. autofunction:: mako.exceptions.html_error_template
+
+.. autofunction:: mako.exceptions.text_error_template
+
diff --git a/lib/mako-0.7.2/doc/caching.html b/lib/mako-0.7.2/doc/caching.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/caching.html
@@ -0,0 +1,777 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                Caching
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="prev" title="The Unicode Chapter" href="unicode.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="unicode.html" title="previous chapter">The Unicode Chapter</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/caching.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                Caching
+             
+
+        <h2>
+            
+                Caching
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">Caching</a><ul>
+<li><a class="reference internal" href="#cache-arguments">Cache Arguments</a><ul>
+<li><a class="reference internal" href="#backend-specific-cache-arguments">Backend-Specific Cache Arguments</a></li>
+<li><a class="reference internal" href="#using-the-beaker-cache-backend">Using the Beaker Cache Backend</a></li>
+<li><a class="reference internal" href="#using-the-dogpile-cache-backend">Using the dogpile.cache Backend</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#programmatic-cache-access">Programmatic Cache Access</a></li>
+<li><a class="reference internal" href="#cache-plugins">Cache Plugins</a><ul>
+<li><a class="reference internal" href="#guidelines-for-writing-cache-plugins">Guidelines for Writing Cache Plugins</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#api-reference">API Reference</a></li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="unicode.html" title="previous chapter">The Unicode Chapter</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="caching">
+<span id="caching-toplevel"></span><h1>Caching<a class="headerlink" href="#caching" title="Permalink to this headline">?</a></h1>
+<p>Any template or component can be cached using the <tt class="docutils literal"><span class="pre">cache</span></tt>
+argument to the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt>, <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> or <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> directives:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">template text</span>
+</pre></div>
+</div>
+<p>The above template, after being executed the first time, will
+store its content within a cache that by default is scoped
+within memory. Subsequent calls to the template&#8217;s <a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a>
+method will return content directly from the cache. When the
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object itself falls out of scope, its corresponding
+cache is garbage collected along with the template.</p>
+<p>By default, caching requires that the <a class="reference external" href="http://beaker.readthedocs.org/">Beaker</a> package be installed on the
+system, however the mechanism of caching can be customized to use
+any third party or user defined system &#8211; see <a class="reference internal" href="#cache-plugins"><em>Cache Plugins</em></a>.</p>
+<p>In addition to being available on the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag, the caching flag and all
+its options can be used with the <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> tag as well:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;mycomp&quot;</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span> <span class="na">cache_timeout=</span><span class="s">&quot;60&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    other text</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>... and equivalently with the <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> tag, anonymous or named:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span> <span class="na">cache_timeout=</span><span class="s">&quot;60&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    other text</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<div class="section" id="cache-arguments">
+<h2>Cache Arguments<a class="headerlink" href="#cache-arguments" title="Permalink to this headline">?</a></h2>
+<p>Mako has two cache arguments available on tags that are
+available in all cases.   The rest of the arguments
+available are specific to a backend.</p>
+<p>The two generic tags arguments are:</p>
+<ul>
+<li><p class="first"><tt class="docutils literal"><span class="pre">cached=&quot;True&quot;</span></tt> - enable caching for this <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt>,
+<tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>, or <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt>.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">cache_key</span></tt> - the &#8220;key&#8221; used to uniquely identify this content
+in the cache.   Usually, this key is chosen automatically
+based on the name of the rendering callable (i.e. <tt class="docutils literal"><span class="pre">body</span></tt>
+when used in <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt>, the name of the def when using <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>,
+the explicit or internally-generated name when using <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt>).
+Using the <tt class="docutils literal"><span class="pre">cache_key</span></tt> parameter, the key can be overridden
+using a fixed or programmatically generated value.</p>
+<p>For example, here&#8217;s a page
+that caches any page which inherits from it, based on the
+filename of the calling template:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span> <span class="na">cache_key=</span><span class="s">&quot;${self.filename}&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">${</span><span class="nb">next</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span>
+
+<span class="cp">## rest of template</span><span class="x"></span>
+</pre></div>
+</div>
+</li>
+</ul>
+<p>On a <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> or <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>, the
+caching can be configured using these arguments:</p>
+<ul>
+<li><p class="first"><tt class="docutils literal"><span class="pre">cache_enabled</span></tt> - Setting this
+to <tt class="docutils literal"><span class="pre">False</span></tt> will disable all caching functionality
+when the template renders.  Defaults to <tt class="docutils literal"><span class="pre">True</span></tt>.
+e.g.:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">lookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span>
+                <span class="n">directories</span><span class="o">=</span><span class="s">&#39;/path/to/templates&#39;</span><span class="p">,</span>
+                <span class="n">cache_enabled</span> <span class="o">=</span> <span class="bp">False</span>
+                <span class="p">)</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">cache_impl</span></tt> - The string name of the cache backend
+to use.   This defaults to <tt class="docutils literal"><span class="pre">'beaker'</span></tt>, which has historically
+been the only cache backend supported by Mako.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.6.0.</span></p>
+<p>For example, here&#8217;s how to use the upcoming
+<a class="reference external" href="http://dogpilecache.readthedocs.org">dogpile.cache</a>
+backend:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">lookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span>
+                <span class="n">directories</span><span class="o">=</span><span class="s">&#39;/path/to/templates&#39;</span><span class="p">,</span>
+                <span class="n">cache_impl</span> <span class="o">=</span> <span class="s">&#39;dogpile.cache&#39;</span><span class="p">,</span>
+                <span class="n">cache_args</span> <span class="o">=</span> <span class="p">{</span><span class="s">&#39;regions&#39;</span><span class="p">:</span><span class="n">my_dogpile_regions</span><span class="p">}</span>
+                <span class="p">)</span>
+</pre></div>
+</div>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">cache_args</span></tt> - A dictionary of cache parameters that
+will be consumed by the cache backend.   See
+<a class="reference internal" href="#beaker-backend"><em>Using the Beaker Cache Backend</em></a> for examples.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.6.0.</span></p>
+</li>
+</ul>
+<div class="section" id="backend-specific-cache-arguments">
+<h3>Backend-Specific Cache Arguments<a class="headerlink" href="#backend-specific-cache-arguments" title="Permalink to this headline">?</a></h3>
+<p>The <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt>, <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>, and <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> tags
+accept any named argument that starts with the prefix <tt class="docutils literal"><span class="pre">&quot;cache_&quot;</span></tt>.
+Those arguments are then packaged up and passed along to the
+underlying caching implementation, minus the <tt class="docutils literal"><span class="pre">&quot;cache_&quot;</span></tt> prefix.</p>
+<p>The actual arguments understood are determined by the backend.</p>
+<ul class="simple">
+<li><a class="reference internal" href="#beaker-backend"><em>Using the Beaker Cache Backend</em></a> - Includes arguments understood by
+Beaker.</li>
+<li><a class="reference internal" href="#dogpile-cache-backend"><em>Using the dogpile.cache Backend</em></a> - Includes arguments understood by
+dogpile.cache.</li>
+</ul>
+</div>
+<div class="section" id="using-the-beaker-cache-backend">
+<span id="beaker-backend"></span><h3>Using the Beaker Cache Backend<a class="headerlink" href="#using-the-beaker-cache-backend" title="Permalink to this headline">?</a></h3>
+<p>When using Beaker, new implementations will want to make usage
+of <strong>cache regions</strong> so that cache configurations can be maintained
+externally to templates.  These configurations live under
+named &#8220;regions&#8221; that can be referred to within templates themselves.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.6.0: </span>Support for Beaker cache regions.</p>
+<p>For example, suppose we would like two regions.  One is a &#8220;short term&#8221;
+region that will store content in a memory-based dictionary,
+expiring after 60 seconds.   The other is a Memcached region,
+where values should expire in five minutes.   To configure
+our <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>, first we get a handle to a
+<a class="reference external" href="http://beaker.readthedocs.org/en/latest/modules/cache.html#beaker.cache.CacheManager" title="(in Beaker v1.6)"><tt class="xref py py-class docutils literal"><span class="pre">beaker.cache.CacheManager</span></tt></a>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">beaker.cache</span> <span class="kn">import</span> <span class="n">CacheManager</span>
+
+<span class="n">manager</span> <span class="o">=</span> <span class="n">CacheManager</span><span class="p">(</span><span class="n">cache_regions</span><span class="o">=</span><span class="p">{</span>
+    <span class="s">&#39;short_term&#39;</span><span class="p">:{</span>
+        <span class="s">&#39;type&#39;</span><span class="p">:</span> <span class="s">&#39;memory&#39;</span><span class="p">,</span>
+        <span class="s">&#39;expire&#39;</span><span class="p">:</span> <span class="mi">60</span>
+    <span class="p">},</span>
+    <span class="s">&#39;long_term&#39;</span><span class="p">:{</span>
+        <span class="s">&#39;type&#39;</span><span class="p">:</span> <span class="s">&#39;ext:memcached&#39;</span><span class="p">,</span>
+        <span class="s">&#39;url&#39;</span><span class="p">:</span> <span class="s">&#39;127.0.0.1:11211&#39;</span><span class="p">,</span>
+        <span class="s">&#39;expire&#39;</span><span class="p">:</span> <span class="mi">300</span>
+    <span class="p">}</span>
+<span class="p">})</span>
+
+<span class="n">lookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span>
+                <span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/path/to/templates&#39;</span><span class="p">],</span>
+                <span class="n">module_directory</span><span class="o">=</span><span class="s">&#39;/path/to/modules&#39;</span><span class="p">,</span>
+                <span class="n">cache_impl</span><span class="o">=</span><span class="s">&#39;beaker&#39;</span><span class="p">,</span>
+                <span class="n">cache_args</span><span class="o">=</span><span class="p">{</span>
+                    <span class="s">&#39;manager&#39;</span><span class="p">:</span><span class="n">manager</span>
+                <span class="p">}</span>
+        <span class="p">)</span>
+</pre></div>
+</div>
+<p>Our templates can then opt to cache data in one of either region,
+using the <tt class="docutils literal"><span class="pre">cache_region</span></tt> argument.   Such as using <tt class="docutils literal"><span class="pre">short_term</span></tt>
+at the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> level:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span> <span class="na">cache_region=</span><span class="s">&quot;short_term&quot;</span><span class="cp">&gt;</span>
+
+<span class="cp">## ...</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Or, <tt class="docutils literal"><span class="pre">long_term</span></tt> at the <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> level:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span> <span class="na">cache_region=</span><span class="s">&quot;long_term&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    other text</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The Beaker backend also works without regions.   There are a
+variety of arguments that can be passed to the <tt class="docutils literal"><span class="pre">cache_args</span></tt>
+dictionary, which are also allowable in templates via the
+<tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt>, <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt>,
+and <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> tags specific to those sections.   The values
+given override those specified at the  <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>
+or <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> level.</p>
+<p>With the possible exception
+of <tt class="docutils literal"><span class="pre">cache_timeout</span></tt>, these arguments are probably better off
+staying at the template configuration level.  Each argument
+specified as <tt class="docutils literal"><span class="pre">cache_XYZ</span></tt> in a template tag is specified
+without the <tt class="docutils literal"><span class="pre">cache_</span></tt> prefix in the <tt class="docutils literal"><span class="pre">cache_args</span></tt> dictionary:</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">cache_timeout</span></tt> - number of seconds in which to invalidate the
+cached data.  After this timeout, the content is re-generated
+on the next call.  Available as <tt class="docutils literal"><span class="pre">timeout</span></tt> in the <tt class="docutils literal"><span class="pre">cache_args</span></tt>
+dictionary.</li>
+<li><tt class="docutils literal"><span class="pre">cache_type</span></tt> - type of caching. <tt class="docutils literal"><span class="pre">'memory'</span></tt>, <tt class="docutils literal"><span class="pre">'file'</span></tt>, <tt class="docutils literal"><span class="pre">'dbm'</span></tt>, or
+<tt class="docutils literal"><span class="pre">'ext:memcached'</span></tt> (note that  the string <tt class="docutils literal"><span class="pre">memcached</span></tt> is
+also accepted by the dogpile.cache Mako plugin, though not by Beaker itself).
+Available as <tt class="docutils literal"><span class="pre">type</span></tt> in the <tt class="docutils literal"><span class="pre">cache_args</span></tt> dictionary.</li>
+<li><tt class="docutils literal"><span class="pre">cache_url</span></tt> - (only used for <tt class="docutils literal"><span class="pre">memcached</span></tt> but required) a single
+IP address or a semi-colon separated list of IP address of
+memcache servers to use.  Available as <tt class="docutils literal"><span class="pre">url</span></tt> in the <tt class="docutils literal"><span class="pre">cache_args</span></tt>
+dictionary.</li>
+<li><tt class="docutils literal"><span class="pre">cache_dir</span></tt> - in the case of the <tt class="docutils literal"><span class="pre">'file'</span></tt> and <tt class="docutils literal"><span class="pre">'dbm'</span></tt> cache types,
+this is the filesystem directory with which to store data
+files. If this option is not present, the value of
+<tt class="docutils literal"><span class="pre">module_directory</span></tt> is used (i.e. the directory where compiled
+template modules are stored). If neither option is available
+an exception is thrown.  Available as <tt class="docutils literal"><span class="pre">dir</span></tt> in the
+<tt class="docutils literal"><span class="pre">cache_args</span></tt> dictionary.</li>
+</ul>
+</div>
+<div class="section" id="using-the-dogpile-cache-backend">
+<span id="dogpile-cache-backend"></span><h3>Using the dogpile.cache Backend<a class="headerlink" href="#using-the-dogpile-cache-backend" title="Permalink to this headline">?</a></h3>
+<p><a class="reference external" href="http://dogpilecache.readthedocs.org">dogpile.cache</a> is a new replacement for Beaker.   It provides
+a modernized, slimmed down interface and is generally easier to use
+than Beaker.   As of this writing it has not yet been released.  dogpile.cache
+includes its own Mako cache plugin &#8211; see <a class="reference external" href="http://dogpilecache.readthedocs.org/en/latest/api.html#dogpile.cache.plugins.mako_cache" title="(in dogpile.cache v0.3.0)"><tt class="xref py py-mod docutils literal"><span class="pre">dogpile.cache.plugins.mako_cache</span></tt></a> in the
+dogpile.cache documentation.</p>
+</div>
+</div>
+<div class="section" id="programmatic-cache-access">
+<h2>Programmatic Cache Access<a class="headerlink" href="#programmatic-cache-access" title="Permalink to this headline">?</a></h2>
+<p>The <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>, as well as any template-derived <a class="reference internal" href="namespaces.html#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>, has
+an accessor called <tt class="docutils literal"><span class="pre">cache</span></tt> which returns the <a class="reference internal" href="#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> object
+for that template. This object is a facade on top of the underlying
+<a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> object, and provides some very rudimental
+capabilities, such as the ability to get and put arbitrary
+values:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span>
+    <span class="n">local</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">set</span><span class="p">(</span><span class="s">&quot;somekey&quot;</span><span class="p">,</span> <span class="nb">type</span><span class="o">=</span><span class="s">&quot;memory&quot;</span><span class="p">,</span> <span class="s">&quot;somevalue&quot;</span><span class="p">)</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Above, the cache associated with the <tt class="docutils literal"><span class="pre">local</span></tt> namespace is
+accessed and a key is placed within a memory cache.</p>
+<p>More commonly, the <tt class="docutils literal"><span class="pre">cache</span></tt> object is used to invalidate cached
+sections programmatically:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">template</span> <span class="o">=</span> <span class="n">lookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="s">&#39;/sometemplate.html&#39;</span><span class="p">)</span>
+
+<span class="c"># invalidate the &quot;body&quot; of the template</span>
+<span class="n">template</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">invalidate_body</span><span class="p">()</span>
+
+<span class="c"># invalidate an individual def</span>
+<span class="n">template</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">invalidate_def</span><span class="p">(</span><span class="s">&#39;somedef&#39;</span><span class="p">)</span>
+
+<span class="c"># invalidate an arbitrary key</span>
+<span class="n">template</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">invalidate</span><span class="p">(</span><span class="s">&#39;somekey&#39;</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>You can access any special method or attribute of the <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a>
+itself using the <a class="reference internal" href="#mako.cache.Cache.impl" title="mako.cache.Cache.impl"><tt class="xref py py-attr docutils literal"><span class="pre">impl</span></tt></a> attribute:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">template</span><span class="o">.</span><span class="n">cache</span><span class="o">.</span><span class="n">impl</span><span class="o">.</span><span class="n">do_something_special</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>Note that using implementation-specific methods will mean you can&#8217;t
+swap in a different kind of <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> implementation at a
+later time.</p>
+</div>
+<div class="section" id="cache-plugins">
+<span id="id1"></span><h2>Cache Plugins<a class="headerlink" href="#cache-plugins" title="Permalink to this headline">?</a></h2>
+<p>The mechanism used by caching can be plugged in
+using a <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> subclass.    This class implements
+the rudimental methods Mako needs to implement the caching
+API.   Mako includes the <a class="reference internal" href="#mako.ext.beaker_cache.BeakerCacheImpl" title="mako.ext.beaker_cache.BeakerCacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">BeakerCacheImpl</span></tt></a> class to
+provide the default implementation.  A <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> class
+is acquired by Mako using a <tt class="docutils literal"><span class="pre">pkg_resources</span></tt> entrypoint, using
+the name given as the <tt class="docutils literal"><span class="pre">cache_impl</span></tt> argument to <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>
+or <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>.    This entry point can be
+installed via the standard <cite>setuptools</cite>/<tt class="docutils literal"><span class="pre">setup()</span></tt> procedure, underneath
+the <cite>EntryPoint</cite> group named <tt class="docutils literal"><span class="pre">&quot;mako.cache&quot;</span></tt>.  It can also be
+installed at runtime via a convenience installer <a class="reference internal" href="#mako.cache.register_plugin" title="mako.cache.register_plugin"><tt class="xref py py-func docutils literal"><span class="pre">register_plugin()</span></tt></a>
+which accomplishes essentially the same task.</p>
+<p>An example plugin that implements a local dictionary cache:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.cache</span> <span class="kn">import</span> <span class="n">Cacheimpl</span><span class="p">,</span> <span class="n">register_plugin</span>
+
+<span class="k">class</span> <span class="nc">SimpleCacheImpl</span><span class="p">(</span><span class="n">CacheImpl</span><span class="p">):</span>
+    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">cache</span><span class="p">):</span>
+        <span class="nb">super</span><span class="p">(</span><span class="n">SimpleCacheImpl</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="n">__init__</span><span class="p">(</span><span class="n">cache</span><span class="p">)</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_cache</span> <span class="o">=</span> <span class="p">{}</span>
+
+    <span class="k">def</span> <span class="nf">get_or_create</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">creation_function</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">):</span>
+        <span class="k">if</span> <span class="n">key</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">_cache</span><span class="p">:</span>
+            <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_cache</span><span class="p">[</span><span class="n">key</span><span class="p">]</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">_cache</span><span class="p">[</span><span class="n">key</span><span class="p">]</span> <span class="o">=</span> <span class="n">value</span> <span class="o">=</span> <span class="n">creation_function</span><span class="p">()</span>
+            <span class="k">return</span> <span class="n">value</span>
+
+    <span class="k">def</span> <span class="nf">set</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">value</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_cache</span><span class="p">[</span><span class="n">key</span><span class="p">]</span> <span class="o">=</span> <span class="n">value</span>
+
+    <span class="k">def</span> <span class="nf">get</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
+        <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_cache</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">key</span><span class="p">)</span>
+
+    <span class="k">def</span> <span class="nf">invalidate</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_cache</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="n">key</span><span class="p">,</span> <span class="bp">None</span><span class="p">)</span>
+
+<span class="c"># optional - register the class locally</span>
+<span class="n">register_plugin</span><span class="p">(</span><span class="s">&quot;simple&quot;</span><span class="p">,</span> <span class="n">__name__</span><span class="p">,</span> <span class="s">&quot;SimpleCacheImpl&quot;</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>Enabling the above plugin in a template would look like:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;mytemplate&quot;</span><span class="p">,</span>
+             <span class="nb">file</span><span class="o">=</span><span class="s">&quot;mytemplate.html&quot;</span><span class="p">,</span>
+             <span class="n">cache_impl</span><span class="o">=</span><span class="s">&#39;simple&#39;</span><span class="p">)</span>
+</pre></div>
+</div>
+<div class="section" id="guidelines-for-writing-cache-plugins">
+<h3>Guidelines for Writing Cache Plugins<a class="headerlink" href="#guidelines-for-writing-cache-plugins" title="Permalink to this headline">?</a></h3>
+<ul class="simple">
+<li>The <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> is created on a per-<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> basis.  The
+class should ensure that only data for the parent <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> is
+persisted or returned by the cache methods.    The actual <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>
+is available via the <tt class="docutils literal"><span class="pre">self.cache.template</span></tt> attribute.   The <tt class="docutils literal"><span class="pre">self.cache.id</span></tt>
+attribute, which is essentially the unique modulename of the template, is
+a good value to use in order to represent a unique namespace of keys specific
+to the template.</li>
+<li>Templates only use the <a class="reference internal" href="#mako.cache.CacheImpl.get_or_create" title="mako.cache.CacheImpl.get_or_create"><tt class="xref py py-meth docutils literal"><span class="pre">CacheImpl.get_or_create()</span></tt></a> method
+in an implicit fashion.  The <a class="reference internal" href="#mako.cache.CacheImpl.set" title="mako.cache.CacheImpl.set"><tt class="xref py py-meth docutils literal"><span class="pre">CacheImpl.set()</span></tt></a>,
+<a class="reference internal" href="#mako.cache.CacheImpl.get" title="mako.cache.CacheImpl.get"><tt class="xref py py-meth docutils literal"><span class="pre">CacheImpl.get()</span></tt></a>, and <a class="reference internal" href="#mako.cache.CacheImpl.invalidate" title="mako.cache.CacheImpl.invalidate"><tt class="xref py py-meth docutils literal"><span class="pre">CacheImpl.invalidate()</span></tt></a> methods are
+only used in response to direct programmatic access to the corresponding
+methods on the <a class="reference internal" href="#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> object.</li>
+<li><a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> will be accessed in a multithreaded fashion if the
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> itself is used multithreaded.  Care should be taken
+to ensure caching implementations are threadsafe.</li>
+<li>A library like <a class="reference external" href="http://pypi.python.org/pypi/dogpile.core">Dogpile</a>, which
+is a minimal locking system derived from Beaker, can be used to help
+implement the <a class="reference internal" href="#mako.cache.CacheImpl.get_or_create" title="mako.cache.CacheImpl.get_or_create"><tt class="xref py py-meth docutils literal"><span class="pre">CacheImpl.get_or_create()</span></tt></a> method in a threadsafe
+way that can maximize effectiveness across multiple threads as well
+as processes. <a class="reference internal" href="#mako.cache.CacheImpl.get_or_create" title="mako.cache.CacheImpl.get_or_create"><tt class="xref py py-meth docutils literal"><span class="pre">CacheImpl.get_or_create()</span></tt></a> is the
+key method used by templates.</li>
+<li>All arguments passed to <tt class="docutils literal"><span class="pre">**kw</span></tt> come directly from the parameters
+inside the <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>, <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt>, or <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tags directly,
+minus the <tt class="docutils literal"><span class="pre">&quot;cache_&quot;</span></tt> prefix, as strings, with the exception of
+the argument <tt class="docutils literal"><span class="pre">cache_timeout</span></tt>, which is passed to the plugin
+as the name <tt class="docutils literal"><span class="pre">timeout</span></tt> with the value converted to an integer.
+Arguments present in <tt class="docutils literal"><span class="pre">cache_args</span></tt> on <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> or
+<a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> are passed directly, but are superseded
+by those present in the most specific template tag.</li>
+<li>The directory where <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> places module files can
+be acquired using the accessor <tt class="docutils literal"><span class="pre">self.cache.template.module_directory</span></tt>.
+This directory can be a good place to throw cache-related work
+files, underneath a prefix like <tt class="docutils literal"><span class="pre">_my_cache_work</span></tt> so that name
+conflicts with generated modules don&#8217;t occur.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="api-reference">
+<h2>API Reference<a class="headerlink" href="#api-reference" title="Permalink to this headline">?</a></h2>
+<dl class="class">
+<dt id="mako.cache.Cache">
+<em class="property">class </em><tt class="descclassname">mako.cache.</tt><tt class="descname">Cache</tt><big>(</big><em>template</em>, <em>*args</em><big>)</big><a class="headerlink" href="#mako.cache.Cache" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Represents a data content cache made available to the module
+space of a specific <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.6: </span><a class="reference internal" href="#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> by itself is mostly a
+container for a <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> object, which implements
+a fixed API to provide caching services; specific subclasses exist to
+implement different
+caching strategies.   Mako includes a backend that works with
+the Beaker caching system.   Beaker itself then supports
+a number of backends (i.e. file, memory, memcached, etc.)</p>
+<p>The construction of a <a class="reference internal" href="#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> is part of the mechanics
+of a <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>, and programmatic access to this
+cache is typically via the <tt class="xref py py-attr docutils literal"><span class="pre">Template.cache</span></tt> attribute.</p>
+<dl class="method">
+<dt id="mako.cache.Cache.get">
+<tt class="descname">get</tt><big>(</big><em>key</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.Cache.get" title="Permalink to this definition">?</a></dt>
+<dd><p>Retrieve a value from the cache.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>key</strong> &#8211; the value&#8217;s key.</li>
+<li><strong>**kw</strong> &#8211; cache configuration arguments.  The
+backend is configured using these arguments upon first request.
+Subsequent requests that use the same series of configuration
+values will use that same backend.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.Cache.get_or_create">
+<tt class="descname">get_or_create</tt><big>(</big><em>key</em>, <em>creation_function</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.Cache.get_or_create" title="Permalink to this definition">?</a></dt>
+<dd><p>Retrieve a value from the cache, using the given creation function
+to generate a new value.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.cache.Cache.id">
+<tt class="descname">id</tt><em class="property"> = None</em><a class="headerlink" href="#mako.cache.Cache.id" title="Permalink to this definition">?</a></dt>
+<dd><p>Return the &#8216;id&#8217; that identifies this cache.</p>
+<p>This is a value that should be globally unique to the
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> associated with this cache, and can
+be used by a caching system to name a local container
+for data specific to this template.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.cache.Cache.impl">
+<tt class="descname">impl</tt><em class="property"> = None</em><a class="headerlink" href="#mako.cache.Cache.impl" title="Permalink to this definition">?</a></dt>
+<dd><p>Provide the <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> in use by this <a class="reference internal" href="#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a>.</p>
+<p>This accessor allows a <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> with additional
+methods beyond that of <a class="reference internal" href="#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> to be used programmatically.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.Cache.invalidate">
+<tt class="descname">invalidate</tt><big>(</big><em>key</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.Cache.invalidate" title="Permalink to this definition">?</a></dt>
+<dd><p>Invalidate a value in the cache.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>key</strong> &#8211; the value&#8217;s key.</li>
+<li><strong>**kw</strong> &#8211; cache configuration arguments.  The
+backend is configured using these arguments upon first request.
+Subsequent requests that use the same series of configuration
+values will use that same backend.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.Cache.invalidate_body">
+<tt class="descname">invalidate_body</tt><big>(</big><big>)</big><a class="headerlink" href="#mako.cache.Cache.invalidate_body" title="Permalink to this definition">?</a></dt>
+<dd><p>Invalidate the cached content of the &#8220;body&#8221; method for this
+template.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.Cache.invalidate_closure">
+<tt class="descname">invalidate_closure</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#mako.cache.Cache.invalidate_closure" title="Permalink to this definition">?</a></dt>
+<dd><p>Invalidate a nested <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> within this template.</p>
+<p>Caching of nested defs is a blunt tool as there is no
+management of scope &#8211; nested defs that use cache tags
+need to have names unique of all other nested defs in the
+template, else their content will be overwritten by
+each other.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.Cache.invalidate_def">
+<tt class="descname">invalidate_def</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#mako.cache.Cache.invalidate_def" title="Permalink to this definition">?</a></dt>
+<dd><p>Invalidate the cached content of a particular <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> within this
+template.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.Cache.put">
+<tt class="descname">put</tt><big>(</big><em>key</em>, <em>value</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.Cache.put" title="Permalink to this definition">?</a></dt>
+<dd><p>A synonym for <a class="reference internal" href="#mako.cache.Cache.set" title="mako.cache.Cache.set"><tt class="xref py py-meth docutils literal"><span class="pre">Cache.set()</span></tt></a>.</p>
+<p>This is here for backwards compatibility.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.Cache.set">
+<tt class="descname">set</tt><big>(</big><em>key</em>, <em>value</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.Cache.set" title="Permalink to this definition">?</a></dt>
+<dd><p>Place a value in the cache.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>key</strong> &#8211; the value&#8217;s key.</li>
+<li><strong>value</strong> &#8211; the value.</li>
+<li><strong>**kw</strong> &#8211; cache configuration arguments.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.cache.Cache.starttime">
+<tt class="descname">starttime</tt><em class="property"> = None</em><a class="headerlink" href="#mako.cache.Cache.starttime" title="Permalink to this definition">?</a></dt>
+<dd><p>Epochal time value for when the owning <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> was
+first compiled.</p>
+<p>A cache implementation may wish to invalidate data earlier than
+this timestamp; this has the effect of the cache for a specific
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> starting clean any time the <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>
+is recompiled, such as when the original template file changed on
+the filesystem.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.cache.CacheImpl">
+<em class="property">class </em><tt class="descclassname">mako.cache.</tt><tt class="descname">CacheImpl</tt><big>(</big><em>cache</em><big>)</big><a class="headerlink" href="#mako.cache.CacheImpl" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Provide a cache implementation for use by <a class="reference internal" href="#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a>.</p>
+<dl class="method">
+<dt id="mako.cache.CacheImpl.get">
+<tt class="descname">get</tt><big>(</big><em>key</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.CacheImpl.get" title="Permalink to this definition">?</a></dt>
+<dd><p>Retrieve a value from the cache.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>key</strong> &#8211; the value&#8217;s key.</li>
+<li><strong>**kw</strong> &#8211; cache configuration arguments.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.CacheImpl.get_or_create">
+<tt class="descname">get_or_create</tt><big>(</big><em>key</em>, <em>creation_function</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.CacheImpl.get_or_create" title="Permalink to this definition">?</a></dt>
+<dd><p>Retrieve a value from the cache, using the given creation function
+to generate a new value.</p>
+<p>This function <em>must</em> return a value, either from
+the cache, or via the given creation function.
+If the creation function is called, the newly
+created value should be populated into the cache
+under the given key before being returned.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>key</strong> &#8211; the value&#8217;s key.</li>
+<li><strong>creation_function</strong> &#8211; function that when called generates
+a new value.</li>
+<li><strong>**kw</strong> &#8211; cache configuration arguments.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.CacheImpl.invalidate">
+<tt class="descname">invalidate</tt><big>(</big><em>key</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.CacheImpl.invalidate" title="Permalink to this definition">?</a></dt>
+<dd><p>Invalidate a value in the cache.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>key</strong> &#8211; the value&#8217;s key.</li>
+<li><strong>**kw</strong> &#8211; cache configuration arguments.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.cache.CacheImpl.pass_context">
+<tt class="descname">pass_context</tt><em class="property"> = False</em><a class="headerlink" href="#mako.cache.CacheImpl.pass_context" title="Permalink to this definition">?</a></dt>
+<dd><p>If <tt class="docutils literal"><span class="pre">True</span></tt>, the <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> will be passed to
+<a class="reference internal" href="#mako.cache.CacheImpl.get_or_create" title="mako.cache.CacheImpl.get_or_create"><tt class="xref py py-meth docutils literal"><span class="pre">get_or_create</span></tt></a> as the name <tt class="docutils literal"><span class="pre">'context'</span></tt>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.cache.CacheImpl.set">
+<tt class="descname">set</tt><big>(</big><em>key</em>, <em>value</em>, <em>**kw</em><big>)</big><a class="headerlink" href="#mako.cache.CacheImpl.set" title="Permalink to this definition">?</a></dt>
+<dd><p>Place a value in the cache.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>key</strong> &#8211; the value&#8217;s key.</li>
+<li><strong>value</strong> &#8211; the value.</li>
+<li><strong>**kw</strong> &#8211; cache configuration arguments.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="function">
+<dt id="mako.cache.register_plugin">
+<tt class="descclassname">mako.cache.</tt><tt class="descname">register_plugin</tt><big>(</big><em>self</em>, <em>name</em>, <em>modulepath</em>, <em>objname</em><big>)</big><a class="headerlink" href="#mako.cache.register_plugin" title="Permalink to this definition">?</a></dt>
+<dd></dd></dl>
+
+<dl class="class">
+<dt id="mako.ext.beaker_cache.BeakerCacheImpl">
+<em class="property">class </em><tt class="descclassname">mako.ext.beaker_cache.</tt><tt class="descname">BeakerCacheImpl</tt><big>(</big><em>cache</em><big>)</big><a class="headerlink" href="#mako.ext.beaker_cache.BeakerCacheImpl" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">mako.cache.CacheImpl</span></tt></a></p>
+<p>A <a class="reference internal" href="#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> provided for the Beaker caching system.</p>
+<p>This plugin is used by default, based on the default
+value of <tt class="docutils literal"><span class="pre">'beaker'</span></tt> for the <tt class="docutils literal"><span class="pre">cache_impl</span></tt> parameter of the
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> or <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> classes.</p>
+</dd></dl>
+
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="unicode.html" title="previous chapter">The Unicode Chapter</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/defs.html b/lib/mako-0.7.2/doc/defs.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/defs.html
@@ -0,0 +1,726 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                Defs and Blocks
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="The Mako Runtime Environment" href="runtime.html" />
+        <link rel="prev" title="Syntax" href="syntax.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="syntax.html" title="previous chapter">Syntax</a>
+            </li>
+            <li>Next:
+            <a href="runtime.html" title="next chapter">The Mako Runtime Environment</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/defs.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                Defs and Blocks
+             
+
+        <h2>
+            
+                Defs and Blocks
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">Defs and Blocks</a><ul>
+<li><a class="reference internal" href="#using-defs">Using Defs</a><ul>
+<li><a class="reference internal" href="#calling-defs-from-other-files">Calling Defs from Other Files</a></li>
+<li><a class="reference internal" href="#calling-defs-programmatically">Calling Defs Programmatically</a></li>
+<li><a class="reference internal" href="#defs-within-defs">Defs within Defs</a></li>
+<li><a class="reference internal" href="#calling-a-def-with-embedded-content-and-or-other-defs">Calling a Def with Embedded Content and/or Other Defs</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#using-blocks">Using Blocks</a><ul>
+<li><a class="reference internal" href="#using-named-blocks">Using Named Blocks</a></li>
+<li><a class="reference internal" href="#using-page-arguments-in-named-blocks">Using Page Arguments in Named Blocks</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="syntax.html" title="previous chapter">Syntax</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="runtime.html" title="next chapter">The Mako Runtime Environment</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="defs-and-blocks">
+<span id="defs-toplevel"></span><h1>Defs and Blocks<a class="headerlink" href="#defs-and-blocks" title="Permalink to this headline">?</a></h1>
+<p><tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> and <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> are two tags that both demarcate any block of text
+and/or code.   They both exist within generated Python as a callable function,
+i.e., a Python <tt class="docutils literal"><span class="pre">def</span></tt>.   They differ in their scope and calling semantics.
+Whereas <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> provides a construct that is very much like a named Python
+<tt class="docutils literal"><span class="pre">def</span></tt>, the <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> is more layout oriented.</p>
+<div class="section" id="using-defs">
+<h2>Using Defs<a class="headerlink" href="#using-defs" title="Permalink to this headline">?</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> tag requires a <tt class="docutils literal"><span class="pre">name</span></tt> attribute, where the <tt class="docutils literal"><span class="pre">name</span></tt> references
+a Python function signature:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;hello()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    hello world</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>To invoke the <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>, it is normally called as an expression:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">the def:  </span><span class="cp">${</span><span class="n">hello</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>If the <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> is not nested inside of another <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>,
+it&#8217;s known as a <strong>top level def</strong> and can be accessed anywhere in
+the template, including above where it was defined.</p>
+<p>All defs, top level or not, have access to the current
+contextual namespace in exactly the same way their containing
+template does. Suppose the template below is executed with the
+variables <tt class="docutils literal"><span class="pre">username</span></tt> and <tt class="docutils literal"><span class="pre">accountdata</span></tt> inside the context:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">Hello there </span><span class="cp">${</span><span class="n">username</span><span class="cp">}</span><span class="x">, how are ya.  Lets see what your account says:</span>
+
+<span class="cp">${</span><span class="n">account</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;account()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    Account for </span><span class="cp">${</span><span class="n">username</span><span class="cp">}</span><span class="x">:&lt;br/&gt;</span>
+
+    <span class="cp">%</span> <span class="k">for</span> <span class="n">row</span> <span class="ow">in</span> <span class="n">accountdata</span><span class="p">:</span><span class="x"></span>
+<span class="x">        Value: </span><span class="cp">${</span><span class="n">row</span><span class="cp">}</span><span class="x">&lt;br/&gt;</span>
+    <span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">username</span></tt> and <tt class="docutils literal"><span class="pre">accountdata</span></tt> variables are present
+within the main template body as well as the body of the
+<tt class="docutils literal"><span class="pre">account()</span></tt> def.</p>
+<p>Since defs are just Python functions, you can define and pass
+arguments to them as well:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="n">account</span><span class="p">(</span><span class="n">accountname</span><span class="o">=</span><span class="s">&#39;john&#39;</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;account(accountname, type=&#39;regular&#39;)&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    account name: </span><span class="cp">${</span><span class="n">accountname</span><span class="cp">}</span><span class="x">, type: </span><span class="cp">${</span><span class="nb">type</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>When you declare an argument signature for your def, they are
+required to follow normal Python conventions (i.e., all
+arguments are required except keyword arguments with a default
+value). This is in contrast to using context-level variables,
+which evaluate to <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> if you reference a name that
+does not exist.</p>
+<div class="section" id="calling-defs-from-other-files">
+<h3>Calling Defs from Other Files<a class="headerlink" href="#calling-defs-from-other-files" title="Permalink to this headline">?</a></h3>
+<p>Top level <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>s are <strong>exported</strong> by your template&#8217;s
+module, and can be called from the outside; including from other
+templates, as well as normal Python code. Calling a <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>
+from another template is something like using an <tt class="docutils literal"><span class="pre">&lt;%include&gt;</span></tt>
+&#8211; except you are calling a specific function within the
+template, not the whole template.</p>
+<p>The remote <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> call is also a little bit like calling
+functions from other modules in Python. There is an &#8220;import&#8221;
+step to pull the names from another template into your own
+template; then the function or functions are available.</p>
+<p>To import another template, use the <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">name=</span><span class="s">&quot;mystuff&quot;</span> <span class="na">file=</span><span class="s">&quot;mystuff.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above tag adds a local variable <tt class="docutils literal"><span class="pre">mystuff</span></tt> to the current
+scope.</p>
+<p>Then, just call the defs off of <tt class="docutils literal"><span class="pre">mystuff</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="n">mystuff</span><span class="o">.</span><span class="n">somedef</span><span class="p">(</span><span class="n">x</span><span class="o">=</span><span class="mi">5</span><span class="p">,</span><span class="n">y</span><span class="o">=</span><span class="mi">7</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> tag also supports some of the other
+semantics of Python&#8217;s <tt class="docutils literal"><span class="pre">import</span></tt> statement, including pulling
+names into the local variable space, or using <tt class="docutils literal"><span class="pre">*</span></tt> to represent
+all names, using the <tt class="docutils literal"><span class="pre">import</span></tt> attribute:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">file=</span><span class="s">&quot;mystuff.html&quot;</span> <span class="na">import=</span><span class="s">&quot;foo, bar&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>This is just a quick intro to the concept of a <strong>namespace</strong>,
+which is a central Mako concept that has its own chapter in
+these docs. For more detail and examples, see
+<a class="reference internal" href="namespaces.html"><em>Namespaces</em></a>.</p>
+</div>
+<div class="section" id="calling-defs-programmatically">
+<h3>Calling Defs Programmatically<a class="headerlink" href="#calling-defs-programmatically" title="Permalink to this headline">?</a></h3>
+<p>You can call defs programmatically from any <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object
+using the <a class="reference internal" href="usage.html#mako.template.Template.get_def" title="mako.template.Template.get_def"><tt class="xref py py-meth docutils literal"><span class="pre">get_def()</span></tt></a> method, which returns a <a class="reference internal" href="usage.html#mako.template.DefTemplate" title="mako.template.DefTemplate"><tt class="xref py py-class docutils literal"><span class="pre">DefTemplate</span></tt></a>
+object. This is a <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> subclass which the parent
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> creates, and is usable like any other template:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+
+<span class="n">template</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;&quot;&quot;</span>
+<span class="s">    &lt;</span><span class="si">%d</span><span class="s">ef name=&quot;hi(name)&quot;&gt;</span>
+<span class="s">        hi ${name}!</span>
+<span class="s">    &lt;/</span><span class="si">%d</span><span class="s">ef&gt;</span>
+
+<span class="s">    &lt;</span><span class="si">%d</span><span class="s">ef name=&quot;bye(name)&quot;&gt;</span>
+<span class="s">        bye ${name}!</span>
+<span class="s">    &lt;/</span><span class="si">%d</span><span class="s">ef&gt;</span>
+<span class="s">&quot;&quot;&quot;</span><span class="p">)</span>
+
+<span class="k">print</span> <span class="n">template</span><span class="o">.</span><span class="n">get_def</span><span class="p">(</span><span class="s">&quot;hi&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">render</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;ed&quot;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">template</span><span class="o">.</span><span class="n">get_def</span><span class="p">(</span><span class="s">&quot;bye&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">render</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;ed&quot;</span><span class="p">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="defs-within-defs">
+<h3>Defs within Defs<a class="headerlink" href="#defs-within-defs" title="Permalink to this headline">?</a></h3>
+<p>The def model follows regular Python rules for closures.
+Declaring <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> inside another <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> declares it
+within the parent&#8217;s <strong>enclosing scope</strong>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;mydef()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;subdef()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        a sub def</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">    i&#39;m the def, and the subcomponent is </span><span class="cp">${</span><span class="n">subdef</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Just like Python, names that exist outside the inner <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>
+exist inside it as well:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span>
+    <span class="n">x</span> <span class="o">=</span> <span class="mi">12</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;outer()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span>
+        <span class="n">y</span> <span class="o">=</span> <span class="mi">15</span>
+    <span class="cp">%&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;inner()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        inner, x is </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x">, y is </span><span class="cp">${</span><span class="n">y</span><span class="cp">}</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">    outer, x is </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x">, y is </span><span class="cp">${</span><span class="n">y</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Assigning to a name inside of a def declares that name as local
+to the scope of that def (again, like Python itself). This means
+the following code will raise an error:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span>
+    <span class="n">x</span> <span class="o">=</span> <span class="mi">10</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;somedef()&quot;</span><span class="cp">&gt;</span>
+    <span class="cp">## error !</span><span class="x"></span>
+<span class="x">    somedef, x is </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span>
+        <span class="n">x</span> <span class="o">=</span> <span class="mi">27</span>
+    <span class="cp">%&gt;</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>...because the assignment to <tt class="docutils literal"><span class="pre">x</span></tt> declares <tt class="docutils literal"><span class="pre">x</span></tt> as local to the
+scope of <tt class="docutils literal"><span class="pre">somedef</span></tt>, rendering the &#8220;outer&#8221; version unreachable
+in the expression that tries to render it.</p>
+</div>
+<div class="section" id="calling-a-def-with-embedded-content-and-or-other-defs">
+<span id="defs-with-content"></span><h3>Calling a Def with Embedded Content and/or Other Defs<a class="headerlink" href="#calling-a-def-with-embedded-content-and-or-other-defs" title="Permalink to this headline">?</a></h3>
+<p>A flip-side to def within def is a def call with content. This
+is where you call a def, and at the same time declare a block of
+content (or multiple blocks) that can be used by the def being
+called. The main point of such a call is to create custom,
+nestable tags, just like any other template language&#8217;s
+custom-tag creation system &#8211; where the external tag controls the
+execution of the nested tags and can communicate state to them.
+Only with Mako, you don&#8217;t have to use any external Python
+modules, you can define arbitrarily nestable tags right in your
+templates.</p>
+<p>To achieve this, the target def is invoked using the form
+<tt class="docutils literal"><span class="pre">&lt;%namepacename:defname&gt;</span></tt> instead of the normal <tt class="docutils literal"><span class="pre">${}</span></tt>
+syntax. This syntax, introduced in Mako 0.2.3, is functionally
+equivalent to another tag known as <tt class="docutils literal"><span class="pre">%call</span></tt>, which takes the form
+<tt class="docutils literal"><span class="pre">&lt;%call</span> <span class="pre">expr='namespacename.defname(args)'&gt;</span></tt>. While <tt class="docutils literal"><span class="pre">%call</span></tt>
+is available in all versions of Mako, the newer style is
+probably more familiar looking. The <tt class="docutils literal"><span class="pre">namespace</span></tt> portion of the
+call is the name of the <strong>namespace</strong> in which the def is
+defined &#8211; in the most simple cases, this can be <tt class="docutils literal"><span class="pre">local</span></tt> or
+<tt class="docutils literal"><span class="pre">self</span></tt> to reference the current template&#8217;s namespace (the
+difference between <tt class="docutils literal"><span class="pre">local</span></tt> and <tt class="docutils literal"><span class="pre">self</span></tt> is one of inheritance
+&#8211; see <a class="reference internal" href="namespaces.html#namespaces-builtin"><em>Built-in Namespaces</em></a> for details).</p>
+<p>When the target def is invoked, a variable <tt class="docutils literal"><span class="pre">caller</span></tt> is placed
+in its context which contains another namespace containing the
+body and other defs defined by the caller. The body itself is
+referenced by the method <tt class="docutils literal"><span class="pre">body()</span></tt>. Below, we build a <tt class="docutils literal"><span class="pre">%def</span></tt>
+that operates upon <tt class="docutils literal"><span class="pre">caller.body()</span></tt> to invoke the body of the
+custom tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;buildtable()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;table&gt;</span>
+<span class="x">        &lt;tr&gt;&lt;td&gt;</span>
+<span class="x">            </span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/td&gt;&lt;/tr&gt;</span>
+<span class="x">    &lt;/table&gt;</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">self:buildtable</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    I am the table body.</span>
+<span class="cp">&lt;/%</span><span class="nb">self:buildtable</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>This produces the output (whitespace formatted):</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;table&gt;</span>
+    <span class="nt">&lt;tr&gt;&lt;td&gt;</span>
+        I am the table body.
+    <span class="nt">&lt;/td&gt;&lt;/tr&gt;</span>
+<span class="nt">&lt;/table&gt;</span>
+</pre></div>
+</div>
+<p>Using the older <tt class="docutils literal"><span class="pre">%call</span></tt> syntax looks like:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;buildtable()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;table&gt;</span>
+<span class="x">        &lt;tr&gt;&lt;td&gt;</span>
+<span class="x">            </span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/td&gt;&lt;/tr&gt;</span>
+<span class="x">    &lt;/table&gt;</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">call</span> <span class="na">expr=</span><span class="s">&quot;buildtable()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    I am the table body.</span>
+<span class="cp">&lt;/%</span><span class="nb">call</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">body()</span></tt> can be executed multiple times or not at all.
+This means you can use def-call-with-content to build iterators,
+conditionals, etc:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;lister(count)&quot;</span><span class="cp">&gt;</span>
+    <span class="cp">%</span> <span class="k">for</span> <span class="n">x</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">count</span><span class="p">):</span><span class="x"></span>
+<span class="x">        </span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span>
+    <span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">self:lister</span> <span class="na">count=</span><span class="s">&quot;${3}&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    hi</span>
+<span class="cp">&lt;/%</span><span class="nb">self:lister</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Produces:</p>
+<div class="highlight-html"><div class="highlight"><pre>hi
+hi
+hi
+</pre></div>
+</div>
+<p>Notice above we pass <tt class="docutils literal"><span class="pre">3</span></tt> as a Python expression, so that it
+remains as an integer.</p>
+<p>A custom &#8220;conditional&#8221; tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;conditional(expression)&quot;</span><span class="cp">&gt;</span>
+    <span class="cp">%</span> <span class="k">if</span> <span class="n">expression</span><span class="p">:</span><span class="x"></span>
+<span class="x">        </span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span>
+    <span class="cp">%</span><span class="k"> endif</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">self:conditional</span> <span class="na">expression=</span><span class="s">&quot;${4==4}&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    i&#39;m the result</span>
+<span class="cp">&lt;/%</span><span class="nb">self:conditional</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Produces:</p>
+<div class="highlight-html"><div class="highlight"><pre>i&#39;m the result
+</pre></div>
+</div>
+<p>But that&#8217;s not all. The <tt class="docutils literal"><span class="pre">body()</span></tt> function also can handle
+arguments, which will augment the local namespace of the body
+callable. The caller must define the arguments which it expects
+to receive from its target def using the <tt class="docutils literal"><span class="pre">args</span></tt> attribute,
+which is a comma-separated list of argument names. Below, our
+<tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> calls the <tt class="docutils literal"><span class="pre">body()</span></tt> of its caller, passing in an
+element of data from its argument:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;layoutdata(somedata)&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;table&gt;</span>
+    <span class="cp">%</span> <span class="k">for</span> <span class="n">item</span> <span class="ow">in</span> <span class="n">somedata</span><span class="p">:</span><span class="x"></span>
+<span class="x">        &lt;tr&gt;</span>
+        <span class="cp">%</span> <span class="k">for</span> <span class="n">col</span> <span class="ow">in</span> <span class="n">item</span><span class="p">:</span><span class="x"></span>
+<span class="x">            &lt;td&gt;</span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">body</span><span class="p">(</span><span class="n">col</span><span class="o">=</span><span class="n">col</span><span class="p">)</span><span class="cp">}</span><span class="x">&lt;/td&gt;</span>
+        <span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">        &lt;/tr&gt;</span>
+    <span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">    &lt;/table&gt;</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">self:layoutdata</span> <span class="na">somedata=</span><span class="s">&quot;${[[1,2,3],[4,5,6],[7,8,9]]}&quot;</span> <span class="na">args=</span><span class="s">&quot;col&quot;</span><span class="cp">&gt;</span><span class="x">\</span>
+<span class="x">Body data: </span><span class="cp">${</span><span class="n">col</span><span class="cp">}</span><span class="x">\</span>
+<span class="cp">&lt;/%</span><span class="nb">self:layoutdata</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Produces:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;table&gt;</span>
+    <span class="nt">&lt;tr&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 1<span class="nt">&lt;/td&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 2<span class="nt">&lt;/td&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 3<span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;/tr&gt;</span>
+    <span class="nt">&lt;tr&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 4<span class="nt">&lt;/td&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 5<span class="nt">&lt;/td&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 6<span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;/tr&gt;</span>
+    <span class="nt">&lt;tr&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 7<span class="nt">&lt;/td&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 8<span class="nt">&lt;/td&gt;</span>
+        <span class="nt">&lt;td&gt;</span>Body data: 9<span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;/tr&gt;</span>
+<span class="nt">&lt;/table&gt;</span>
+</pre></div>
+</div>
+<p>You don&#8217;t have to stick to calling just the <tt class="docutils literal"><span class="pre">body()</span></tt> function.
+The caller can define any number of callables, allowing the
+<tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt> tag to produce whole layouts:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;layout()&quot;</span><span class="cp">&gt;</span>
+    <span class="cp">## a layout def</span><span class="x"></span>
+<span class="x">    &lt;div class=&quot;mainlayout&quot;&gt;</span>
+<span class="x">        &lt;div class=&quot;header&quot;&gt;</span>
+<span class="x">            </span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">header</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+
+<span class="x">        &lt;div class=&quot;sidebar&quot;&gt;</span>
+<span class="x">            </span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">sidebar</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+
+<span class="x">        &lt;div class=&quot;content&quot;&gt;</span>
+<span class="x">            </span><span class="cp">${</span><span class="n">caller</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+<span class="x">    &lt;/div&gt;</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span>
+
+<span class="cp">## calls the layout def</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">self:layout</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;header()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        I am the header</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;sidebar()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;ul&gt;</span>
+<span class="x">            &lt;li&gt;sidebar 1&lt;/li&gt;</span>
+<span class="x">            &lt;li&gt;sidebar 2&lt;/li&gt;</span>
+<span class="x">        &lt;/ul&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">        this is the body</span>
+<span class="cp">&lt;/%</span><span class="nb">self:layout</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above layout would produce:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;mainlayout&quot;</span><span class="nt">&gt;</span>
+    <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;header&quot;</span><span class="nt">&gt;</span>
+    I am the header
+    <span class="nt">&lt;/div&gt;</span>
+
+    <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;sidebar&quot;</span><span class="nt">&gt;</span>
+    <span class="nt">&lt;ul&gt;</span>
+        <span class="nt">&lt;li&gt;</span>sidebar 1<span class="nt">&lt;/li&gt;</span>
+        <span class="nt">&lt;li&gt;</span>sidebar 2<span class="nt">&lt;/li&gt;</span>
+    <span class="nt">&lt;/ul&gt;</span>
+    <span class="nt">&lt;/div&gt;</span>
+
+    <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;content&quot;</span><span class="nt">&gt;</span>
+    this is the body
+    <span class="nt">&lt;/div&gt;</span>
+<span class="nt">&lt;/div&gt;</span>
+</pre></div>
+</div>
+<p>The number of things you can do with <tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt> and/or the
+<tt class="docutils literal"><span class="pre">&lt;%namespacename:defname&gt;</span></tt> calling syntax is enormous. You can
+create form widget libraries, such as an enclosing <tt class="docutils literal"><span class="pre">&lt;FORM&gt;</span></tt>
+tag and nested HTML input elements, or portable wrapping schemes
+using <tt class="docutils literal"><span class="pre">&lt;div&gt;</span></tt> or other elements. You can create tags that
+interpret rows of data, such as from a database, providing the
+individual columns of each row to a <tt class="docutils literal"><span class="pre">body()</span></tt> callable which
+lays out the row any way it wants. Basically anything you&#8217;d do
+with a &#8220;custom tag&#8221; or tag library in some other system, Mako
+provides via <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> tags and plain Python callables which are
+invoked via <tt class="docutils literal"><span class="pre">&lt;%namespacename:defname&gt;</span></tt> or <tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt>.</p>
+</div>
+</div>
+<div class="section" id="using-blocks">
+<span id="blocks"></span><h2>Using Blocks<a class="headerlink" href="#using-blocks" title="Permalink to this headline">?</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> tag introduces some new twists on the
+<tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> tag which make it more closely tailored towards layout.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.4.1.</span></p>
+<p>An example of a block:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">        </span><span class="cp">&lt;%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">            this is a block.</span>
+<span class="x">        </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>In the above example, we define a simple block.  The block renders its content in the place
+that it&#8217;s defined.  Since the block is called for us, it doesn&#8217;t need a name and the above
+is referred to as an <strong>anonymous block</strong>.  So the output of the above template will be:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;html&gt;</span>
+    <span class="nt">&lt;body&gt;</span>
+            this is a block.
+    <span class="nt">&lt;/body&gt;</span>
+<span class="nt">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>So in fact the above block has absolutely no effect.  Its usefulness comes when we start
+using modifiers.  Such as, we can apply a filter to our block:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">        </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">filter=</span><span class="s">&quot;h&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">            &lt;html&gt;this is some escaped html.&lt;/html&gt;</span>
+<span class="x">        </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>or perhaps a caching directive:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">        </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span> <span class="na">cache_timeout=</span><span class="s">&quot;60&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">            This content will be cached for 60 seconds.</span>
+<span class="x">        </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>Blocks also work in iterations, conditionals, just like defs:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">%</span> <span class="k">if</span> <span class="n">some_condition</span><span class="p">:</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x">condition is met</span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span>
+<span class="cp">%</span><span class="k"> endif</span><span class="x"></span>
+</pre></div>
+</div>
+<p>While the block renders at the point it is defined in the template,
+the underlying function is present in the generated Python code only
+once, so there&#8217;s no issue with placing a block inside of a loop or
+similar. Anonymous blocks are defined as closures in the local
+rendering body, so have access to local variable scope:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">%</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="mi">4</span><span class="p">):</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x">i is </span><span class="cp">${</span><span class="n">i</span><span class="cp">}&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+</pre></div>
+</div>
+<div class="section" id="using-named-blocks">
+<h3>Using Named Blocks<a class="headerlink" href="#using-named-blocks" title="Permalink to this headline">?</a></h3>
+<p>Possibly the more important area where blocks are useful is when we
+do actually give them names. Named blocks are tailored to behave
+somewhat closely to Jinja2&#8217;s block tag, in that they define an area
+of a layout which can be overridden by an inheriting template. In
+sharp contrast to the <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> tag, the name given to a block is
+global for the entire template regardless of how deeply it&#8217;s nested:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;html&gt;</span>
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;head&gt;</span>
+<span class="x">        &lt;title&gt;</span>
+<span class="x">            </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;title&quot;</span><span class="cp">&gt;</span><span class="x">Title</span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;/title&gt;</span>
+<span class="x">    &lt;/head&gt;</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">&lt;body&gt;</span>
+<span class="x">    </span><span class="cp">${</span><span class="nb">next</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>The above example has two named blocks &#8220;<tt class="docutils literal"><span class="pre">header</span></tt>&#8221; and &#8220;<tt class="docutils literal"><span class="pre">title</span></tt>&#8221;, both of which can be referred to
+by an inheriting template. A detailed walkthrough of this usage can be found at <a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</p>
+<p>Note above that named blocks don&#8217;t have any argument declaration the way defs do. They still implement themselves
+as Python functions, however, so they can be invoked additional times beyond their initial definition:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;div name=&quot;page&quot;&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;pagecontrol&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;a href=&quot;&quot;&gt;previous page&lt;/a&gt; |</span>
+<span class="x">        &lt;a href=&quot;&quot;&gt;next page&lt;/a&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">    &lt;table&gt;</span>
+<span class="x">        ## some content</span>
+<span class="x">    &lt;/table&gt;</span>
+
+<span class="x">    </span><span class="cp">${</span><span class="n">pagecontrol</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/div&gt;</span>
+</pre></div>
+</div>
+<p>The content referenced by <tt class="docutils literal"><span class="pre">pagecontrol</span></tt> above will be rendered both above and below the <tt class="docutils literal"><span class="pre">&lt;table&gt;</span></tt> tags.</p>
+<p>To keep things sane, named blocks have restrictions that defs do not:</p>
+<ul class="simple">
+<li>The <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> declaration cannot have any argument signature.</li>
+<li>The name of a <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> can only be defined once in a template &#8211; an error is raised if two blocks of the same
+name occur anywhere in a single template, regardless of nesting.  A similar error is raised if a top level def
+shares the same name as that of a block.</li>
+<li>A named <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> cannot be defined within a <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>, or inside the body of a &#8220;call&#8221;, i.e.
+<tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt> or <tt class="docutils literal"><span class="pre">&lt;%namespacename:defname&gt;</span></tt> tag.  Anonymous blocks can, however.</li>
+</ul>
+</div>
+<div class="section" id="using-page-arguments-in-named-blocks">
+<h3>Using Page Arguments in Named Blocks<a class="headerlink" href="#using-page-arguments-in-named-blocks" title="Permalink to this headline">?</a></h3>
+<p>A named block is very much like a top level def. It has a similar
+restriction to these types of defs in that arguments passed to the
+template via the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag aren&#8217;t automatically available.
+Using arguments with the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag is described in the section
+<a class="reference internal" href="namespaces.html#namespaces-body"><em>The body() Method</em></a>, and refers to scenarios such as when the
+<tt class="docutils literal"><span class="pre">body()</span></tt> method of a template is called from an inherited template passing
+arguments, or the template is invoked from an <tt class="docutils literal"><span class="pre">&lt;%include&gt;</span></tt> tag
+with arguments. To allow a named block to share the same arguments
+passed to the page, the <tt class="docutils literal"><span class="pre">args</span></tt> attribute can be used:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">args=</span><span class="s">&quot;post&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">&lt;a name=&quot;</span><span class="cp">${</span><span class="n">post</span><span class="o">.</span><span class="n">title</span><span class="cp">}</span><span class="x">&quot; /&gt;</span>
+
+<span class="x">&lt;span class=&quot;post_prose&quot;&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;post_prose&quot;</span> <span class="na">args=</span><span class="s">&quot;post&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        </span><span class="cp">${</span><span class="n">post</span><span class="o">.</span><span class="n">content</span><span class="cp">}</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">&lt;/span&gt;</span>
+</pre></div>
+</div>
+<p>Where above, if the template is called via a directive like
+<tt class="docutils literal"><span class="pre">&lt;%include</span> <span class="pre">file=&quot;post.mako&quot;</span> <span class="pre">args=&quot;post=post&quot;</span> <span class="pre">/&gt;</span></tt>, the <tt class="docutils literal"><span class="pre">post</span></tt>
+variable is available both in the main body as well as the
+<tt class="docutils literal"><span class="pre">post_prose</span></tt> block.</p>
+<p>Similarly, the <tt class="docutils literal"><span class="pre">**pageargs</span></tt> variable is present, in named blocks only,
+for those arguments not explicit in the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;post_prose&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">${</span><span class="n">pageargs</span><span class="p">[</span><span class="s">&#39;post&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">content</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">args</span></tt> attribute is only allowed with named blocks. With
+anonymous blocks, the Python function is always rendered in the same
+scope as the call itself, so anything available directly outside the
+anonymous block is available inside as well.</p>
+</div>
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="syntax.html" title="previous chapter">Syntax</a>
+        Next:
+        <a href="runtime.html" title="next chapter">The Mako Runtime Environment</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/filtering.html b/lib/mako-0.7.2/doc/filtering.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/filtering.html
@@ -0,0 +1,476 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                Filtering and Buffering
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="The Unicode Chapter" href="unicode.html" />
+        <link rel="prev" title="Inheritance" href="inheritance.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="inheritance.html" title="previous chapter">Inheritance</a>
+            </li>
+            <li>Next:
+            <a href="unicode.html" title="next chapter">The Unicode Chapter</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/filtering.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                Filtering and Buffering
+             
+
+        <h2>
+            
+                Filtering and Buffering
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">Filtering and Buffering</a><ul>
+<li><a class="reference internal" href="#expression-filtering">Expression Filtering</a><ul>
+<li><a class="reference internal" href="#the-default-filters-argument">The <tt class="docutils literal"><span class="pre">default_filters</span></tt> Argument</a></li>
+<li><a class="reference internal" href="#turning-off-filtering-with-the-n-filter">Turning off Filtering with the <tt class="docutils literal"><span class="pre">n</span></tt> Filter</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#filtering-defs-and-blocks">Filtering Defs and Blocks</a></li>
+<li><a class="reference internal" href="#buffering">Buffering</a></li>
+<li><a class="reference internal" href="#decorating">Decorating</a></li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="inheritance.html" title="previous chapter">Inheritance</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="unicode.html" title="next chapter">The Unicode Chapter</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="filtering-and-buffering">
+<span id="filtering-toplevel"></span><h1>Filtering and Buffering<a class="headerlink" href="#filtering-and-buffering" title="Permalink to this headline">?</a></h1>
+<div class="section" id="expression-filtering">
+<h2>Expression Filtering<a class="headerlink" href="#expression-filtering" title="Permalink to this headline">?</a></h2>
+<p>As described in the chapter <a class="reference internal" href="syntax.html"><em>Syntax</em></a>, the &#8220;<tt class="docutils literal"><span class="pre">|</span></tt>&#8221; operator can be
+applied to a &#8220;<tt class="docutils literal"><span class="pre">${}</span></tt>&#8221; expression to apply escape filters to the
+output:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&quot;this is some text&quot;</span> <span class="o">|</span> <span class="n">u</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above expression applies URL escaping to the expression, and
+produces <tt class="docutils literal"><span class="pre">this+is+some+text</span></tt>.</p>
+<p>The built-in escape flags are:</p>
+<ul>
+<li><p class="first"><tt class="docutils literal"><span class="pre">u</span></tt> : URL escaping, provided by
+<tt class="docutils literal"><span class="pre">urllib.quote_plus(string.encode('utf-8'))</span></tt></p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">h</span></tt> : HTML escaping, provided by
+<tt class="docutils literal"><span class="pre">markupsafe.escape(string)</span></tt></p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.3.4: </span>Prior versions use <tt class="docutils literal"><span class="pre">cgi.escape(string,</span> <span class="pre">True)</span></tt>.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">x</span></tt> : XML escaping</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">trim</span></tt> : whitespace trimming, provided by <tt class="docutils literal"><span class="pre">string.strip()</span></tt></p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">entity</span></tt> : produces HTML entity references for applicable
+strings, derived from <tt class="docutils literal"><span class="pre">htmlentitydefs</span></tt></p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">unicode</span></tt> (<tt class="docutils literal"><span class="pre">str</span></tt> on Python 3): produces a Python unicode
+string (this function is applied by default)</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">decode.&lt;some</span> <span class="pre">encoding&gt;</span></tt>: decode input into a Python
+unicode with the specified encoding</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">n</span></tt> : disable all default filtering; only filters specified
+in the local expression tag will be applied.</p>
+</li>
+</ul>
+<p>To apply more than one filter, separate them by a comma:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&quot; &lt;tag&gt;some value&lt;/tag&gt; &quot;</span> <span class="o">|</span> <span class="n">h</span><span class="p">,</span><span class="n">trim</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above produces <tt class="docutils literal"><span class="pre">&amp;lt;tag&amp;gt;some</span> <span class="pre">value&amp;lt;/tag&amp;gt;</span></tt>, with
+no leading or trailing whitespace. The HTML escaping function is
+applied first, the &#8220;trim&#8221; function second.</p>
+<p>Naturally, you can make your own filters too. A filter is just a
+Python function that accepts a single string argument, and
+returns the filtered result. The expressions after the <tt class="docutils literal"><span class="pre">|</span></tt>
+operator draw upon the local namespace of the template in which
+they appear, meaning you can define escaping functions locally:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%!</span>
+    <span class="k">def</span> <span class="nf">myescape</span><span class="p">(</span><span class="n">text</span><span class="p">):</span>
+        <span class="k">return</span> <span class="s">&quot;&lt;TAG&gt;&quot;</span> <span class="o">+</span> <span class="n">text</span> <span class="o">+</span> <span class="s">&quot;&lt;/TAG&gt;&quot;</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+
+<span class="x">Here&#39;s some tagged text: </span><span class="cp">${</span><span class="s">&quot;text&quot;</span> <span class="o">|</span> <span class="n">myescape</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Or from any Python module:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%!</span>
+    <span class="kn">import</span> <span class="nn">myfilters</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+
+<span class="x">Here&#39;s some tagged text: </span><span class="cp">${</span><span class="s">&quot;text&quot;</span> <span class="o">|</span> <span class="n">myfilters</span><span class="o">.</span><span class="n">tagfilter</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>A page can apply a default set of filters to all expression tags
+using the <tt class="docutils literal"><span class="pre">expression_filter</span></tt> argument to the <tt class="docutils literal"><span class="pre">%page</span></tt> tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">expression_filter=</span><span class="s">&quot;h&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">Escaped text:  </span><span class="cp">${</span><span class="s">&quot;&lt;html&gt;some html&lt;/html&gt;&quot;</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Result:</p>
+<div class="highlight-html"><div class="highlight"><pre>Escaped text: <span class="ni">&amp;lt;</span>html<span class="ni">&amp;gt;</span>some html<span class="ni">&amp;lt;</span>/html<span class="ni">&amp;gt;</span>
+</pre></div>
+</div>
+<div class="section" id="the-default-filters-argument">
+<span id="filtering-default-filters"></span><h3>The <tt class="docutils literal"><span class="pre">default_filters</span></tt> Argument<a class="headerlink" href="#the-default-filters-argument" title="Permalink to this headline">?</a></h3>
+<p>In addition to the <tt class="docutils literal"><span class="pre">expression_filter</span></tt> argument, the
+<tt class="docutils literal"><span class="pre">default_filters</span></tt> argument to both <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> and
+<a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> can specify filtering for all expression tags
+at the programmatic level. This array-based argument, when given
+its default argument of <tt class="docutils literal"><span class="pre">None</span></tt>, will be internally set to
+<tt class="docutils literal"><span class="pre">[&quot;unicode&quot;]</span></tt> (or <tt class="docutils literal"><span class="pre">[&quot;str&quot;]</span></tt> on Python 3), except when
+<tt class="docutils literal"><span class="pre">disable_unicode=True</span></tt> is set in which case it defaults to
+<tt class="docutils literal"><span class="pre">[&quot;str&quot;]</span></tt>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/tmp&#39;</span><span class="p">],</span> <span class="n">default_filters</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;unicode&#39;</span><span class="p">])</span>
+</pre></div>
+</div>
+<p>To replace the usual <tt class="docutils literal"><span class="pre">unicode</span></tt>/<tt class="docutils literal"><span class="pre">str</span></tt> function with a
+specific encoding, the <tt class="docutils literal"><span class="pre">decode</span></tt> filter can be substituted:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/tmp&#39;</span><span class="p">],</span> <span class="n">default_filters</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;decode.utf8&#39;</span><span class="p">])</span>
+</pre></div>
+</div>
+<p>To disable <tt class="docutils literal"><span class="pre">default_filters</span></tt> entirely, set it to an empty
+list:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/tmp&#39;</span><span class="p">],</span> <span class="n">default_filters</span><span class="o">=</span><span class="p">[])</span>
+</pre></div>
+</div>
+<p>Any string name can be added to <tt class="docutils literal"><span class="pre">default_filters</span></tt> where it
+will be added to all expressions as a filter. The filters are
+applied from left to right, meaning the leftmost filter is
+applied first.</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="n">templatetext</span><span class="p">,</span> <span class="n">default_filters</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;unicode&#39;</span><span class="p">,</span> <span class="s">&#39;myfilter&#39;</span><span class="p">])</span>
+</pre></div>
+</div>
+<p>To ease the usage of <tt class="docutils literal"><span class="pre">default_filters</span></tt> with custom filters,
+you can also add imports (or other code) to all templates using
+the <tt class="docutils literal"><span class="pre">imports</span></tt> argument:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/tmp&#39;</span><span class="p">],</span>
+                   <span class="n">default_filters</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;unicode&#39;</span><span class="p">,</span> <span class="s">&#39;myfilter&#39;</span><span class="p">],</span>
+                   <span class="n">imports</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;from mypackage import myfilter&#39;</span><span class="p">])</span>
+</pre></div>
+</div>
+<p>The above will generate templates something like this:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># ....</span>
+<span class="kn">from</span> <span class="nn">mypackage</span> <span class="kn">import</span> <span class="n">myfilter</span>
+
+<span class="k">def</span> <span class="nf">render_body</span><span class="p">(</span><span class="n">context</span><span class="p">):</span>
+    <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">myfilter</span><span class="p">(</span><span class="nb">unicode</span><span class="p">(</span><span class="s">&quot;some text&quot;</span><span class="p">)))</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="turning-off-filtering-with-the-n-filter">
+<h3>Turning off Filtering with the <tt class="docutils literal"><span class="pre">n</span></tt> Filter<a class="headerlink" href="#turning-off-filtering-with-the-n-filter" title="Permalink to this headline">?</a></h3>
+<p>In all cases the special <tt class="docutils literal"><span class="pre">n</span></tt> filter, used locally within an
+expression, will <strong>disable</strong> all filters declared in the
+<tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag as well as in <tt class="docutils literal"><span class="pre">default_filters</span></tt>. Such as:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&#39;myexpression&#39;</span> <span class="o">|</span> <span class="n">n</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>will render <tt class="docutils literal"><span class="pre">myexpression</span></tt> with no filtering of any kind, and:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&#39;myexpression&#39;</span> <span class="o">|</span> <span class="n">n</span><span class="p">,</span><span class="n">trim</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>will render <tt class="docutils literal"><span class="pre">myexpression</span></tt> using the <tt class="docutils literal"><span class="pre">trim</span></tt> filter only.</p>
+</div>
+</div>
+<div class="section" id="filtering-defs-and-blocks">
+<h2>Filtering Defs and Blocks<a class="headerlink" href="#filtering-defs-and-blocks" title="Permalink to this headline">?</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">%def</span></tt> and <tt class="docutils literal"><span class="pre">%block</span></tt> tags have an argument called <tt class="docutils literal"><span class="pre">filter</span></tt> which will apply the
+given list of filter functions to the output of the <tt class="docutils literal"><span class="pre">%def</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;foo()&quot;</span> <span class="na">filter=</span><span class="s">&quot;h, trim&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    &lt;b&gt;this is bold&lt;/b&gt;</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>When the <tt class="docutils literal"><span class="pre">filter</span></tt> attribute is applied to a def as above, the def
+is automatically <strong>buffered</strong> as well. This is described next.</p>
+</div>
+<div class="section" id="buffering">
+<h2>Buffering<a class="headerlink" href="#buffering" title="Permalink to this headline">?</a></h2>
+<p>One of Mako&#8217;s central design goals is speed. To this end, all of
+the textual content within a template and its various callables
+is by default piped directly to the single buffer that is stored
+within the <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object. While this normally is easy to
+miss, it has certain side effects. The main one is that when you
+call a def using the normal expression syntax, i.e.
+<tt class="docutils literal"><span class="pre">${somedef()}</span></tt>, it may appear that the return value of the
+function is the content it produced, which is then delivered to
+your template just like any other expression substitution,
+except that normally, this is not the case; the return value of
+<tt class="docutils literal"><span class="pre">${somedef()}</span></tt> is simply the empty string <tt class="docutils literal"><span class="pre">''</span></tt>. By the time
+you receive this empty string, the output of <tt class="docutils literal"><span class="pre">somedef()</span></tt> has
+been sent to the underlying buffer.</p>
+<p>You may not want this effect, if for example you are doing
+something like this:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&quot; results &quot;</span> <span class="o">+</span> <span class="n">somedef</span><span class="p">()</span> <span class="o">+</span> <span class="s">&quot; more results &quot;</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>If the <tt class="docutils literal"><span class="pre">somedef()</span></tt> function produced the content &#8220;<tt class="docutils literal"><span class="pre">somedef's</span>
+<span class="pre">results</span></tt>&#8221;, the above template would produce this output:</p>
+<div class="highlight-html"><div class="highlight"><pre>somedef&#39;s results results more results
+</pre></div>
+</div>
+<p>This is because <tt class="docutils literal"><span class="pre">somedef()</span></tt> fully executes before the
+expression returns the results of its concatenation; the
+concatenation in turn receives just the empty string as its
+middle expression.</p>
+<p>Mako provides two ways to work around this. One is by applying
+buffering to the <tt class="docutils literal"><span class="pre">%def</span></tt> itself:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;somedef()&quot;</span> <span class="na">buffered=</span><span class="s">&quot;True&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    somedef&#39;s results</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above definition will generate code similar to this:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">somedef</span><span class="p">():</span>
+    <span class="n">context</span><span class="o">.</span><span class="n">push_buffer</span><span class="p">()</span>
+    <span class="k">try</span><span class="p">:</span>
+        <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&quot;somedef&#39;s results&quot;</span><span class="p">)</span>
+    <span class="k">finally</span><span class="p">:</span>
+        <span class="n">buf</span> <span class="o">=</span> <span class="n">context</span><span class="o">.</span><span class="n">pop_buffer</span><span class="p">()</span>
+    <span class="k">return</span> <span class="n">buf</span><span class="o">.</span><span class="n">getvalue</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>So that the content of <tt class="docutils literal"><span class="pre">somedef()</span></tt> is sent to a second buffer,
+which is then popped off the stack and its value returned. The
+speed hit inherent in buffering the output of a def is also
+apparent.</p>
+<p>Note that the <tt class="docutils literal"><span class="pre">filter</span></tt> argument on <tt class="docutils literal"><span class="pre">%def</span></tt> also causes the def to
+be buffered. This is so that the final content of the <tt class="docutils literal"><span class="pre">%def</span></tt> can
+be delivered to the escaping function in one batch, which
+reduces method calls and also produces more deterministic
+behavior for the filtering function itself, which can possibly
+be useful for a filtering function that wishes to apply a
+transformation to the text as a whole.</p>
+<p>The other way to buffer the output of a def or any Mako callable
+is by using the built-in <tt class="docutils literal"><span class="pre">capture</span></tt> function. This function
+performs an operation similar to the above buffering operation
+except it is specified by the caller.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&quot; results &quot;</span> <span class="o">+</span> <span class="n">capture</span><span class="p">(</span><span class="n">somedef</span><span class="p">)</span> <span class="o">+</span> <span class="s">&quot; more results &quot;</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Note that the first argument to the <tt class="docutils literal"><span class="pre">capture</span></tt> function is
+<strong>the function itself</strong>, not the result of calling it. This is
+because the <tt class="docutils literal"><span class="pre">capture</span></tt> function takes over the job of actually
+calling the target function, after setting up a buffered
+environment. To send arguments to the function, just send them
+to <tt class="docutils literal"><span class="pre">capture</span></tt> instead:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="n">capture</span><span class="p">(</span><span class="n">somedef</span><span class="p">,</span> <span class="mi">17</span><span class="p">,</span> <span class="s">&#39;hi&#39;</span><span class="p">,</span> <span class="n">use_paging</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above call is equivalent to the unbuffered call:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="n">somedef</span><span class="p">(</span><span class="mi">17</span><span class="p">,</span> <span class="s">&#39;hi&#39;</span><span class="p">,</span> <span class="n">use_paging</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="decorating">
+<h2>Decorating<a class="headerlink" href="#decorating" title="Permalink to this headline">?</a></h2>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.2.5.</span></p>
+<p>Somewhat like a filter for a <tt class="docutils literal"><span class="pre">%def</span></tt> but more flexible, the <tt class="docutils literal"><span class="pre">decorator</span></tt>
+argument to <tt class="docutils literal"><span class="pre">%def</span></tt> allows the creation of a function that will
+work in a similar manner to a Python decorator. The function can
+control whether or not the function executes. The original
+intent of this function is to allow the creation of custom cache
+logic, but there may be other uses as well.</p>
+<p><tt class="docutils literal"><span class="pre">decorator</span></tt> is intended to be used with a regular Python
+function, such as one defined in a library module. Here we&#8217;ll
+illustrate the python function defined in the template for
+simplicities&#8217; sake:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%!</span>
+    <span class="k">def</span> <span class="nf">bar</span><span class="p">(</span><span class="n">fn</span><span class="p">):</span>
+        <span class="k">def</span> <span class="nf">decorate</span><span class="p">(</span><span class="n">context</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">):</span>
+            <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&quot;BAR&quot;</span><span class="p">)</span>
+            <span class="n">fn</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">)</span>
+            <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&quot;BAR&quot;</span><span class="p">)</span>
+            <span class="k">return</span> <span class="s">&#39;&#39;</span>
+        <span class="k">return</span> <span class="n">decorate</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;foo()&quot;</span> <span class="na">decorator=</span><span class="s">&quot;bar&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is foo</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">${</span><span class="n">foo</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above template will return, with more whitespace than this,
+<tt class="docutils literal"><span class="pre">&quot;BAR</span> <span class="pre">this</span> <span class="pre">is</span> <span class="pre">foo</span> <span class="pre">BAR&quot;</span></tt>. The function is the render callable
+itself (or possibly a wrapper around it), and by default will
+write to the context. To capture its output, use the <a class="reference internal" href="namespaces.html#mako.runtime.capture" title="mako.runtime.capture"><tt class="xref py py-func docutils literal"><span class="pre">capture()</span></tt></a>
+callable in the <tt class="docutils literal"><span class="pre">mako.runtime</span></tt> module (available in templates
+as just <tt class="docutils literal"><span class="pre">runtime</span></tt>):</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%!</span>
+    <span class="k">def</span> <span class="nf">bar</span><span class="p">(</span><span class="n">fn</span><span class="p">):</span>
+        <span class="k">def</span> <span class="nf">decorate</span><span class="p">(</span><span class="n">context</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">):</span>
+            <span class="k">return</span> <span class="s">&quot;BAR&quot;</span> <span class="o">+</span> <span class="n">runtime</span><span class="o">.</span><span class="n">capture</span><span class="p">(</span><span class="n">context</span><span class="p">,</span> <span class="n">fn</span><span class="p">,</span> <span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kw</span><span class="p">)</span> <span class="o">+</span> <span class="s">&quot;BAR&quot;</span>
+        <span class="k">return</span> <span class="n">decorate</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;foo()&quot;</span> <span class="na">decorator=</span><span class="s">&quot;bar&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is foo</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">${</span><span class="n">foo</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The decorator can be used with top-level defs as well as nested
+defs, and blocks too. Note that when calling a top-level def from the
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> API, i.e. <tt class="docutils literal"><span class="pre">template.get_def('somedef').render()</span></tt>,
+the decorator has to write the output to the <tt class="docutils literal"><span class="pre">context</span></tt>, i.e.
+as in the first example. The return value gets discarded.</p>
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="inheritance.html" title="previous chapter">Inheritance</a>
+        Next:
+        <a href="unicode.html" title="next chapter">The Unicode Chapter</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/genindex.html b/lib/mako-0.7.2/doc/genindex.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/genindex.html
@@ -0,0 +1,914 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+    Index
+ &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="#" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="#">Index</a>
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+    Index
+ 
+
+        <h2>
+            
+    Index
+
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+
+    <div id="docs-body" class="" >
+        
+
+
+
+   <h1 id="index">Index</h1>
+
+    <a href="#A"><strong>A</strong></a>
+    | <a href="#B"><strong>B</strong></a>
+    | <a href="#C"><strong>C</strong></a>
+    | <a href="#D"><strong>D</strong></a>
+    | <a href="#E"><strong>E</strong></a>
+    | <a href="#F"><strong>F</strong></a>
+    | <a href="#G"><strong>G</strong></a>
+    | <a href="#H"><strong>H</strong></a>
+    | <a href="#I"><strong>I</strong></a>
+    | <a href="#K"><strong>K</strong></a>
+    | <a href="#L"><strong>L</strong></a>
+    | <a href="#M"><strong>M</strong></a>
+    | <a href="#N"><strong>N</strong></a>
+    | <a href="#P"><strong>P</strong></a>
+    | <a href="#R"><strong>R</strong></a>
+    | <a href="#S"><strong>S</strong></a>
+    | <a href="#T"><strong>T</strong></a>
+    | <a href="#U"><strong>U</strong></a>
+    | <a href="#W"><strong>W</strong></a>
+
+   <hr />
+
+<h2 id="A">A</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateCollection.adjust_uri">adjust_uri() (mako.lookup.TemplateCollection method)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="usage.html#mako.lookup.TemplateLookup.adjust_uri">(mako.lookup.TemplateLookup method)</a>
+      </dt>
+    </dl></dd>
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.attr">attr (mako.runtime.Namespace attribute)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="B">B</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="caching.html#mako.ext.beaker_cache.BeakerCacheImpl">BeakerCacheImpl (class in mako.ext.beaker_cache)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="C">C</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="caching.html#mako.cache.Cache">Cache (class in mako.cache)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.cache">cache (mako.runtime.Namespace attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="caching.html#mako.cache.CacheImpl">CacheImpl (class in mako.cache)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.capture">capture() (in module mako.runtime)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.template.Template.code">code (mako.template.Template attribute)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context">Context (class in mako.runtime)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.context">context (mako.runtime.Namespace attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.LoopContext.cycle">cycle() (mako.runtime.LoopContext method)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="D">D</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#mako.template.DefTemplate">DefTemplate (class in mako.template)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="E">E</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#RichTraceback.error">error (RichTraceback attribute)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="F">F</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="namespaces.html#mako.runtime.ModuleNamespace.filename">filename (mako.runtime.ModuleNamespace attribute)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="namespaces.html#mako.runtime.Namespace.filename">(mako.runtime.Namespace attribute)</a>
+      </dt>
+      <dt><a href="namespaces.html#mako.runtime.TemplateNamespace.filename">(mako.runtime.TemplateNamespace attribute)</a>
+      </dt>
+    </dl></dd>
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateCollection.filename_to_uri">filename_to_uri() (mako.lookup.TemplateCollection method)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="usage.html#mako.lookup.TemplateLookup.filename_to_uri">(mako.lookup.TemplateLookup method)</a>
+      </dt>
+    </dl></dd>
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="G">G</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.get">get() (mako.cache.Cache method)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="caching.html#mako.cache.CacheImpl.get">(mako.cache.CacheImpl method)</a>
+      </dt>
+      <dt><a href="runtime.html#mako.runtime.Context.get">(mako.runtime.Context method)</a>
+      </dt>
+    </dl></dd>
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.get_cached">get_cached() (mako.runtime.Namespace method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.template.Template.get_def">get_def() (mako.template.Template method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.get_namespace">get_namespace() (mako.runtime.Namespace method)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.get_or_create">get_or_create() (mako.cache.Cache method)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="caching.html#mako.cache.CacheImpl.get_or_create">(mako.cache.CacheImpl method)</a>
+      </dt>
+    </dl></dd>
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateCollection.get_template">get_template() (mako.lookup.TemplateCollection method)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="usage.html#mako.lookup.TemplateLookup.get_template">(mako.lookup.TemplateLookup method)</a>
+      </dt>
+      <dt><a href="namespaces.html#mako.runtime.Namespace.get_template">(mako.runtime.Namespace method)</a>
+      </dt>
+    </dl></dd>
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="H">H</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateCollection.has_template">has_template() (mako.lookup.TemplateCollection method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.exceptions.html_error_template">html_error_template() (in module mako.exceptions)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="I">I</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.id">id (mako.cache.Cache attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.impl">impl (mako.cache.Cache attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.include_file">include_file() (mako.runtime.Namespace method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.invalidate">invalidate() (mako.cache.Cache method)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="caching.html#mako.cache.CacheImpl.invalidate">(mako.cache.CacheImpl method)</a>
+      </dt>
+    </dl></dd>
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.invalidate_body">invalidate_body() (mako.cache.Cache method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.invalidate_closure">invalidate_closure() (mako.cache.Cache method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.invalidate_def">invalidate_def() (mako.cache.Cache method)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="K">K</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.keys">keys() (mako.runtime.Context method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.kwargs">kwargs (mako.runtime.Context attribute)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="L">L</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#RichTraceback.lineno">lineno (RichTraceback attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.locals_">locals_() (mako.runtime.Context method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.lookup">lookup (mako.runtime.Context attribute)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.LoopContext">LoopContext (class in mako.runtime)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="M">M</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#RichTraceback.message">message (RichTraceback attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.module">module (mako.runtime.Namespace attribute)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="namespaces.html#mako.runtime.TemplateNamespace.module">(mako.runtime.TemplateNamespace attribute)</a>
+      </dt>
+    </dl></dd>
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.ModuleNamespace">ModuleNamespace (class in mako.runtime)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="N">N</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace">Namespace (class in mako.runtime)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="P">P</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="caching.html#mako.cache.CacheImpl.pass_context">pass_context (mako.cache.CacheImpl attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.pop_caller">pop_caller() (mako.runtime.Context method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.push_caller">push_caller() (mako.runtime.Context method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.put">put() (mako.cache.Cache method)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateLookup.put_string">put_string() (mako.lookup.TemplateLookup method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateLookup.put_template">put_template() (mako.lookup.TemplateLookup method)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="R">R</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#RichTraceback.records">records (RichTraceback attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="caching.html#mako.cache.register_plugin">register_plugin() (in module mako.cache)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.template.Template.render">render() (mako.template.Template method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.template.Template.render_context">render_context() (mako.template.Template method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.template.Template.render_unicode">render_unicode() (mako.template.Template method)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="usage.html#RichTraceback.reverse_records">reverse_records (RichTraceback attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#RichTraceback.reverse_traceback">reverse_traceback (RichTraceback attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.exceptions.RichTraceback">RichTraceback (class in mako.exceptions)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="S">S</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.set">set() (mako.cache.Cache method)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="caching.html#mako.cache.CacheImpl.set">(mako.cache.CacheImpl method)</a>
+      </dt>
+    </dl></dd>
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.template.Template.source">source (mako.template.Template attribute)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="usage.html#RichTraceback.source">(RichTraceback attribute)</a>
+      </dt>
+    </dl></dd>
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="caching.html#mako.cache.Cache.starttime">starttime (mako.cache.Cache attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.supports_caller">supports_caller() (in module mako.runtime)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="T">T</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="usage.html#mako.template.Template">Template (class in mako.template)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.template">template (mako.runtime.Namespace attribute)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateCollection">TemplateCollection (class in mako.lookup)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.lookup.TemplateLookup">TemplateLookup (class in mako.lookup)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.TemplateNamespace">TemplateNamespace (class in mako.runtime)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="usage.html#mako.exceptions.text_error_template">text_error_template() (in module mako.exceptions)</a>
+</dt>
+
+
+  
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="U">U</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="runtime.html#mako.runtime.Undefined">Undefined (class in mako.runtime)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="namespaces.html#mako.runtime.Namespace.uri">uri (mako.runtime.Namespace attribute)</a>
+</dt>
+
+    <dd><dl>
+      <dt><a href="namespaces.html#mako.runtime.TemplateNamespace.uri">(mako.runtime.TemplateNamespace attribute)</a>
+      </dt>
+    </dl></dd>
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+<h2 id="W">W</h2>
+<table width="100%" class="indextable genindextable"><tr><td width="33%" valign="top">
+<dl>
+    
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.write">write() (mako.runtime.Context method)</a>
+</dt>
+
+
+  
+
+
+<dt>
+        <a href="runtime.html#mako.runtime.Context.writer">writer() (mako.runtime.Context method)</a>
+</dt>
+
+
+  
+     
+        </dl></td><td width="33%" valign="top"><dl>
+
+<dt></dt></dl>
+</td></tr></table>
+
+
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/index.html b/lib/mako-0.7.2/doc/index.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/index.html
@@ -0,0 +1,228 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="#" />
+        <link rel="next" title="Usage" href="usage.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Next:
+            <a href="usage.html" title="next chapter">Usage</a>
+            </li>
+
+        <li>
+            <a href="#">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/index.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="#">Mako 0.7.2 Documentation</a>
+
+        <h2>
+            
+                Table of Contents
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+
+    <div id="docs-body" class="" >
+        
+<div class="section" id="table-of-contents">
+<h1>Table of Contents<a class="headerlink" href="#table-of-contents" title="Permalink to this headline">?</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="usage.html">Usage</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="usage.html#basic-usage">Basic Usage</a></li>
+<li class="toctree-l2"><a class="reference internal" href="usage.html#using-file-based-templates">Using File-Based Templates</a></li>
+<li class="toctree-l2"><a class="reference internal" href="usage.html#using-templatelookup">Using <tt class="docutils literal"><span class="pre">TemplateLookup</span></tt></a></li>
+<li class="toctree-l2"><a class="reference internal" href="usage.html#using-unicode-and-encoding">Using Unicode and Encoding</a></li>
+<li class="toctree-l2"><a class="reference internal" href="usage.html#handling-exceptions">Handling Exceptions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="usage.html#common-framework-integrations">Common Framework Integrations</a></li>
+<li class="toctree-l2"><a class="reference internal" href="usage.html#api-reference">API Reference</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="syntax.html">Syntax</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#expression-substitution">Expression Substitution</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#expression-escaping">Expression Escaping</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#control-structures">Control Structures</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#comments">Comments</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#newline-filters">Newline Filters</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#python-blocks">Python Blocks</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#module-level-blocks">Module-level Blocks</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#tags">Tags</a></li>
+<li class="toctree-l2"><a class="reference internal" href="syntax.html#returning-early-from-a-template">Returning Early from a Template</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="defs.html">Defs and Blocks</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="defs.html#using-defs">Using Defs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="defs.html#using-blocks">Using Blocks</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="runtime.html">The Mako Runtime Environment</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="runtime.html#context">Context</a></li>
+<li class="toctree-l2"><a class="reference internal" href="runtime.html#the-loop-context">The Loop Context</a></li>
+<li class="toctree-l2"><a class="reference internal" href="runtime.html#all-the-built-in-names">All the Built-in Names</a></li>
+<li class="toctree-l2"><a class="reference internal" href="runtime.html#api-reference">API Reference</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="namespaces.html">Namespaces</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="namespaces.html#ways-to-call-namespaces">Ways to Call Namespaces</a></li>
+<li class="toctree-l2"><a class="reference internal" href="namespaces.html#namespaces-from-regular-python-modules">Namespaces from Regular Python Modules</a></li>
+<li class="toctree-l2"><a class="reference internal" href="namespaces.html#declaring-defs-in-namespaces">Declaring Defs in Namespaces</a></li>
+<li class="toctree-l2"><a class="reference internal" href="namespaces.html#the-body-method">The <tt class="docutils literal"><span class="pre">body()</span></tt> Method</a></li>
+<li class="toctree-l2"><a class="reference internal" href="namespaces.html#built-in-namespaces">Built-in Namespaces</a></li>
+<li class="toctree-l2"><a class="reference internal" href="namespaces.html#inheritable-namespaces">Inheritable Namespaces</a></li>
+<li class="toctree-l2"><a class="reference internal" href="namespaces.html#api-reference">API Reference</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="inheritance.html">Inheritance</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="inheritance.html#nesting-blocks">Nesting Blocks</a></li>
+<li class="toctree-l2"><a class="reference internal" href="inheritance.html#rendering-a-named-block-multiple-times">Rendering a Named Block Multiple Times</a></li>
+<li class="toctree-l2"><a class="reference internal" href="inheritance.html#but-what-about-defs">But what about Defs?</a></li>
+<li class="toctree-l2"><a class="reference internal" href="inheritance.html#using-the-next-namespace-to-produce-content-wrapping">Using the <tt class="docutils literal"><span class="pre">next</span></tt> Namespace to Produce Content Wrapping</a></li>
+<li class="toctree-l2"><a class="reference internal" href="inheritance.html#using-the-parent-namespace-to-augment-defs">Using the <tt class="docutils literal"><span class="pre">parent</span></tt> Namespace to Augment Defs</a></li>
+<li class="toctree-l2"><a class="reference internal" href="inheritance.html#inheritable-attributes">Inheritable Attributes</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="filtering.html">Filtering and Buffering</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="filtering.html#expression-filtering">Expression Filtering</a></li>
+<li class="toctree-l2"><a class="reference internal" href="filtering.html#filtering-defs-and-blocks">Filtering Defs and Blocks</a></li>
+<li class="toctree-l2"><a class="reference internal" href="filtering.html#buffering">Buffering</a></li>
+<li class="toctree-l2"><a class="reference internal" href="filtering.html#decorating">Decorating</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="unicode.html">The Unicode Chapter</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="unicode.html#specifying-the-encoding-of-a-template-file">Specifying the Encoding of a Template File</a></li>
+<li class="toctree-l2"><a class="reference internal" href="unicode.html#handling-expressions">Handling Expressions</a></li>
+<li class="toctree-l2"><a class="reference internal" href="unicode.html#defining-output-encoding">Defining Output Encoding</a></li>
+<li class="toctree-l2"><a class="reference internal" href="unicode.html#saying-to-heck-with-it-disabling-the-usage-of-unicode-entirely">Saying to Heck with It: Disabling the Usage of Unicode Entirely</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="caching.html">Caching</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="caching.html#cache-arguments">Cache Arguments</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching.html#programmatic-cache-access">Programmatic Cache Access</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching.html#cache-plugins">Cache Plugins</a></li>
+<li class="toctree-l2"><a class="reference internal" href="caching.html#api-reference">API Reference</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="indices-and-tables">
+<h2>Indices and Tables<a class="headerlink" href="#indices-and-tables" title="Permalink to this headline">?</a></h2>
+<ul class="simple">
+<li><a class="reference internal" href="genindex.html"><em>Index</em></a></li>
+<li><a class="reference internal" href="search.html"><em>Search Page</em></a></li>
+</ul>
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Next:
+        <a href="usage.html" title="next chapter">Usage</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/inheritance.html b/lib/mako-0.7.2/doc/inheritance.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/inheritance.html
@@ -0,0 +1,671 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                Inheritance
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="Filtering and Buffering" href="filtering.html" />
+        <link rel="prev" title="Namespaces" href="namespaces.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="namespaces.html" title="previous chapter">Namespaces</a>
+            </li>
+            <li>Next:
+            <a href="filtering.html" title="next chapter">Filtering and Buffering</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/inheritance.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                Inheritance
+             
+
+        <h2>
+            
+                Inheritance
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">Inheritance</a><ul>
+<li><a class="reference internal" href="#nesting-blocks">Nesting Blocks</a></li>
+<li><a class="reference internal" href="#rendering-a-named-block-multiple-times">Rendering a Named Block Multiple Times</a></li>
+<li><a class="reference internal" href="#but-what-about-defs">But what about Defs?</a></li>
+<li><a class="reference internal" href="#using-the-next-namespace-to-produce-content-wrapping">Using the <tt class="docutils literal"><span class="pre">next</span></tt> Namespace to Produce Content Wrapping</a></li>
+<li><a class="reference internal" href="#using-the-parent-namespace-to-augment-defs">Using the <tt class="docutils literal"><span class="pre">parent</span></tt> Namespace to Augment Defs</a></li>
+<li><a class="reference internal" href="#inheritable-attributes">Inheritable Attributes</a></li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="namespaces.html" title="previous chapter">Namespaces</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="filtering.html" title="next chapter">Filtering and Buffering</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="inheritance">
+<span id="inheritance-toplevel"></span><h1>Inheritance<a class="headerlink" href="#inheritance" title="Permalink to this headline">?</a></h1>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Most of the inheritance examples here take advantage of a feature that&#8217;s
+new in Mako as of version 0.4.1 called the &#8220;block&#8221;.  This tag is very similar to
+the &#8220;def&#8221; tag but is more streamlined for usage with inheritance.  Note that
+all of the examples here which use blocks can also use defs instead.  Contrasting
+usages will be illustrated.</p>
+</div>
+<p>Using template inheritance, two or more templates can organize
+themselves into an <strong>inheritance chain</strong>, where content and
+functions from all involved templates can be intermixed. The
+general paradigm of template inheritance is this: if a template
+<tt class="docutils literal"><span class="pre">A</span></tt> inherits from template <tt class="docutils literal"><span class="pre">B</span></tt>, then template <tt class="docutils literal"><span class="pre">A</span></tt> agrees
+to send the executional control to template <tt class="docutils literal"><span class="pre">B</span></tt> at runtime
+(<tt class="docutils literal"><span class="pre">A</span></tt> is called the <strong>inheriting</strong> template). Template <tt class="docutils literal"><span class="pre">B</span></tt>,
+the <strong>inherited</strong> template, then makes decisions as to what
+resources from <tt class="docutils literal"><span class="pre">A</span></tt> shall be executed.</p>
+<p>In practice, it looks like this. Here&#8217;s a hypothetical inheriting
+template, <tt class="docutils literal"><span class="pre">index.html</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## index.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;base.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is some header content</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">this is the body content.</span>
+</pre></div>
+</div>
+<p>And <tt class="docutils literal"><span class="pre">base.html</span></tt>, the inherited template:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## base.html</span><span class="x"></span>
+<span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">        &lt;div class=&quot;header&quot;&gt;</span>
+<span class="x">            </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+
+<span class="x">        </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+
+<span class="x">        &lt;div class=&quot;footer&quot;&gt;</span>
+<span class="x">            </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;footer&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">                this is the footer</span>
+<span class="x">            </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>Here is a breakdown of the execution:</p>
+<ol class="arabic">
+<li><p class="first">When <tt class="docutils literal"><span class="pre">index.html</span></tt> is rendered, control immediately passes to
+<tt class="docutils literal"><span class="pre">base.html</span></tt>.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">base.html</span></tt> then renders the top part of an HTML document,
+then invokes the <tt class="docutils literal"><span class="pre">&lt;%block</span> <span class="pre">name=&quot;header&quot;&gt;</span></tt> block.  It invokes the
+underlying <tt class="docutils literal"><span class="pre">header()</span></tt> function off of a built-in namespace
+called <tt class="docutils literal"><span class="pre">self</span></tt> (this namespace was first introduced in the
+<a class="reference internal" href="namespaces.html"><em>Namespaces chapter</em></a> in <a class="reference internal" href="namespaces.html#namespace-self"><em>self</em></a>). Since
+<tt class="docutils literal"><span class="pre">index.html</span></tt> is the topmost template and also defines a block
+called <tt class="docutils literal"><span class="pre">header</span></tt>, it&#8217;s this <tt class="docutils literal"><span class="pre">header</span></tt> block that ultimately gets
+executed &#8211; instead of the one that&#8217;s present in <tt class="docutils literal"><span class="pre">base.html</span></tt>.</p>
+</li>
+<li><p class="first">Control comes back to <tt class="docutils literal"><span class="pre">base.html</span></tt>. Some more HTML is
+rendered.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">base.html</span></tt> executes <tt class="docutils literal"><span class="pre">self.body()</span></tt>. The <tt class="docutils literal"><span class="pre">body()</span></tt>
+function on all template-based namespaces refers to the main
+body of the template, therefore the main body of
+<tt class="docutils literal"><span class="pre">index.html</span></tt> is rendered.</p>
+</li>
+<li><p class="first">When <tt class="docutils literal"><span class="pre">&lt;%block</span> <span class="pre">name=&quot;header&quot;&gt;</span></tt> is encountered in <tt class="docutils literal"><span class="pre">index.html</span></tt>
+during the <tt class="docutils literal"><span class="pre">self.body()</span></tt> call, a conditional is checked &#8211; does the
+current inherited template, i.e. <tt class="docutils literal"><span class="pre">base.html</span></tt>, also define this block? If yes,
+the <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> is <strong>not</strong> executed here &#8211; the inheritance
+mechanism knows that the parent template is responsible for rendering
+this block (and in fact it already has).  In other words a block
+only renders in its <em>basemost scope</em>.</p>
+</li>
+<li><p class="first">Control comes back to <tt class="docutils literal"><span class="pre">base.html</span></tt>. More HTML is rendered,
+then the <tt class="docutils literal"><span class="pre">&lt;%block</span> <span class="pre">name=&quot;footer&quot;&gt;</span></tt> expression is invoked.</p>
+</li>
+<li><p class="first">The <tt class="docutils literal"><span class="pre">footer</span></tt> block is only defined in <tt class="docutils literal"><span class="pre">base.html</span></tt>, so being
+the topmost definition of <tt class="docutils literal"><span class="pre">footer</span></tt>, it&#8217;s the one that
+executes. If <tt class="docutils literal"><span class="pre">index.html</span></tt> also specified <tt class="docutils literal"><span class="pre">footer</span></tt>, then
+its version would <strong>override</strong> that of the base.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">base.html</span></tt> finishes up rendering its HTML and the template
+is complete, producing:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;html&gt;</span>
+    <span class="nt">&lt;body&gt;</span>
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;header&quot;</span><span class="nt">&gt;</span>
+            this is some header content
+        <span class="nt">&lt;/div&gt;</span>
+
+        this is the body content.
+
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;footer&quot;</span><span class="nt">&gt;</span>
+            this is the footer
+        <span class="nt">&lt;/div&gt;</span>
+    <span class="nt">&lt;/body&gt;</span>
+<span class="nt">&lt;/html&gt;</span>
+</pre></div>
+</div>
+</li>
+</ol>
+<p>...and that is template inheritance in a nutshell. The main idea
+is that the methods that you call upon <tt class="docutils literal"><span class="pre">self</span></tt> always
+correspond to the topmost definition of that method. Very much
+the way <tt class="docutils literal"><span class="pre">self</span></tt> works in a Python class, even though Mako is
+not actually using Python class inheritance to implement this
+functionality. (Mako doesn&#8217;t take the &#8220;inheritance&#8221; metaphor too
+seriously; while useful to setup some commonly recognized
+semantics, a textual template is not very much like an
+object-oriented class construct in practice).</p>
+<div class="section" id="nesting-blocks">
+<h2>Nesting Blocks<a class="headerlink" href="#nesting-blocks" title="Permalink to this headline">?</a></h2>
+<p>The named blocks defined in an inherited template can also be nested within
+other blocks.  The name given to each block is globally accessible via any inheriting
+template.  We can add a new block <tt class="docutils literal"><span class="pre">title</span></tt> to our <tt class="docutils literal"><span class="pre">header</span></tt> block:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## base.html</span><span class="x"></span>
+<span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">        &lt;div class=&quot;header&quot;&gt;</span>
+<span class="x">            </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">                &lt;h2&gt;</span>
+<span class="x">                    </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;title&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="x">                &lt;/h2&gt;</span>
+<span class="x">            </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+
+<span class="x">        </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+
+<span class="x">        &lt;div class=&quot;footer&quot;&gt;</span>
+<span class="x">            </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;footer&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">                this is the footer</span>
+<span class="x">            </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>The inheriting template can name either or both of <tt class="docutils literal"><span class="pre">header</span></tt> and <tt class="docutils literal"><span class="pre">title</span></tt>, separately
+or nested themselves:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## index.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;base.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is some header content</span>
+<span class="x">    </span><span class="cp">${</span><span class="n">parent</span><span class="o">.</span><span class="n">header</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;title&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is the title</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">this is the body content.</span>
+</pre></div>
+</div>
+<p>Note when we overrode <tt class="docutils literal"><span class="pre">header</span></tt>, we added an extra call <tt class="docutils literal"><span class="pre">${parent.header()}</span></tt> in order to invoke
+the parent&#8217;s <tt class="docutils literal"><span class="pre">header</span></tt> block in addition to our own.  That&#8217;s described in more detail below,
+in <a class="reference internal" href="#parent-namespace"><em>Using the parent Namespace to Augment Defs</em></a>.</p>
+</div>
+<div class="section" id="rendering-a-named-block-multiple-times">
+<h2>Rendering a Named Block Multiple Times<a class="headerlink" href="#rendering-a-named-block-multiple-times" title="Permalink to this headline">?</a></h2>
+<p>Recall from the section <a class="reference internal" href="defs.html#blocks"><em>Using Blocks</em></a> that a named block is just like a <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>,
+with some different usage rules.  We can call one of our named sections distinctly, for example
+a section that is used more than once, such as the title of a page:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;head&gt;</span>
+<span class="x">        &lt;title&gt;</span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">title</span><span class="p">()</span><span class="cp">}</span><span class="x">&lt;/title&gt;</span>
+<span class="x">    &lt;/head&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;h2&gt;</span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;title&quot;</span><span class="cp">/&gt;</span><span class="x">&lt;/h2&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>Where above an inheriting template can define <tt class="docutils literal"><span class="pre">&lt;%block</span> <span class="pre">name=&quot;title&quot;&gt;</span></tt> just once, and it will be
+used in the base template both in the <tt class="docutils literal"><span class="pre">&lt;title&gt;</span></tt> section as well as the <tt class="docutils literal"><span class="pre">&lt;h2&gt;</span></tt>.</p>
+</div>
+<div class="section" id="but-what-about-defs">
+<h2>But what about Defs?<a class="headerlink" href="#but-what-about-defs" title="Permalink to this headline">?</a></h2>
+<p>The previous example used the <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> tag to produce areas of content
+to be overridden.  Before Mako 0.4.1, there wasn&#8217;t any such tag &#8211; instead
+there was only the <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> tag.   As it turns out, named blocks and defs are
+largely interchangeable.  The def simply doesn&#8217;t call itself automatically,
+and has more open-ended naming and scoping rules that are more flexible and similar
+to Python itself, but less suited towards layout.  The first example from
+this chapter using defs would look like:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## index.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;base.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;header()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is some header content</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">this is the body content.</span>
+</pre></div>
+</div>
+<p>And <tt class="docutils literal"><span class="pre">base.html</span></tt>, the inherited template:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## base.html</span><span class="x"></span>
+<span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">        &lt;div class=&quot;header&quot;&gt;</span>
+<span class="x">            </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">header</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+
+<span class="x">        </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+
+<span class="x">        &lt;div class=&quot;footer&quot;&gt;</span>
+<span class="x">            </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">footer</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;header()&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;footer()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is the footer</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Above, we illustrate that defs differ from blocks in that their definition
+and invocation are defined in two separate places, instead of at once. You can <em>almost</em> do exactly what a
+block does if you put the two together:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;div class=&quot;header&quot;&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;header()&quot;</span><span class="cp">&gt;&lt;/%</span><span class="nb">def</span><span class="cp">&gt;${</span><span class="bp">self</span><span class="o">.</span><span class="n">header</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/div&gt;</span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> is obviously more streamlined than the <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> for this kind
+of usage.  In addition,
+the above &#8220;inline&#8221; approach with <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt> does not work with nesting:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;head&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;header()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;title&gt;</span>
+<span class="x">        ## this won&#39;t work !</span>
+<span class="x">        </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;title()&quot;</span><span class="cp">&gt;</span><span class="x">default title</span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;${</span><span class="bp">self</span><span class="o">.</span><span class="n">title</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/title&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;${</span><span class="bp">self</span><span class="o">.</span><span class="n">header</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/head&gt;</span>
+</pre></div>
+</div>
+<p>Where above, the <tt class="docutils literal"><span class="pre">title()</span></tt> def, because it&#8217;s a def within a def, is not part of the
+template&#8217;s exported namespace and will not be part of <tt class="docutils literal"><span class="pre">self</span></tt>.  If the inherited template
+did define its own <tt class="docutils literal"><span class="pre">title</span></tt> def at the top level, it would be called, but the &#8220;default title&#8221;
+above is not present at all on <tt class="docutils literal"><span class="pre">self</span></tt> no matter what.  For this to work as expected
+you&#8217;d instead need to say:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;head&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;header()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;title&gt;</span>
+<span class="x">        </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">title</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">        &lt;/title&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;${</span><span class="bp">self</span><span class="o">.</span><span class="n">header</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;title()&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="x">&lt;/head&gt;</span>
+</pre></div>
+</div>
+<p>That is, <tt class="docutils literal"><span class="pre">title</span></tt> is defined outside of any other defs so that it is in the <tt class="docutils literal"><span class="pre">self</span></tt> namespace.
+It works, but the definition needs to be potentially far away from the point of render.</p>
+<p>A named block is always placed in the <tt class="docutils literal"><span class="pre">self</span></tt> namespace, regardless of nesting,
+so this restriction is lifted:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## base.html</span><span class="x"></span>
+<span class="x">&lt;head&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;title&gt;</span>
+<span class="x">        </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;title&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="x">        &lt;/title&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">&lt;/head&gt;</span>
+</pre></div>
+</div>
+<p>The above template defines <tt class="docutils literal"><span class="pre">title</span></tt> inside of <tt class="docutils literal"><span class="pre">header</span></tt>, and an inheriting template can define
+one or both in <strong>any</strong> configuration, nested inside each other or not, in order for them to be used:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## index.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;base.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;title&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    the title</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    the header</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>So while the <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> tag lifts the restriction of nested blocks not being available externally,
+in order to achieve this it <em>adds</em> the restriction that all block names in a single template need
+to be globally unique within the template, and additionally that a <tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt> can&#8217;t be defined
+inside of a <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>. It&#8217;s a more restricted tag suited towards a more specific use case than <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>.</p>
+</div>
+<div class="section" id="using-the-next-namespace-to-produce-content-wrapping">
+<h2>Using the <tt class="docutils literal"><span class="pre">next</span></tt> Namespace to Produce Content Wrapping<a class="headerlink" href="#using-the-next-namespace-to-produce-content-wrapping" title="Permalink to this headline">?</a></h2>
+<p>Sometimes you have an inheritance chain that spans more than two
+templates. Or maybe you don&#8217;t, but you&#8217;d like to build your
+system such that extra inherited templates can be inserted in
+the middle of a chain where they would be smoothly integrated.
+If each template wants to define its layout just within its main
+body, you can&#8217;t just call <tt class="docutils literal"><span class="pre">self.body()</span></tt> to get at the
+inheriting template&#8217;s body, since that is only the topmost body.
+To get at the body of the <em>next</em> template, you call upon the
+namespace <tt class="docutils literal"><span class="pre">next</span></tt>, which is the namespace of the template
+<strong>immediately following</strong> the current template.</p>
+<p>Lets change the line in <tt class="docutils literal"><span class="pre">base.html</span></tt> which calls upon
+<tt class="docutils literal"><span class="pre">self.body()</span></tt> to instead call upon <tt class="docutils literal"><span class="pre">next.body()</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## base.html</span><span class="x"></span>
+<span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">        &lt;div class=&quot;header&quot;&gt;</span>
+<span class="x">            </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+
+<span class="x">        </span><span class="cp">${</span><span class="nb">next</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+
+<span class="x">        &lt;div class=&quot;footer&quot;&gt;</span>
+<span class="x">            </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;footer&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">                this is the footer</span>
+<span class="x">            </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;/div&gt;</span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>Lets also add an intermediate template called <tt class="docutils literal"><span class="pre">layout.html</span></tt>,
+which inherits from <tt class="docutils literal"><span class="pre">base.html</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## layout.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;base.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+<span class="x">&lt;ul&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;toolbar&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;li&gt;selection 1&lt;/li&gt;</span>
+<span class="x">        &lt;li&gt;selection 2&lt;/li&gt;</span>
+<span class="x">        &lt;li&gt;selection 3&lt;/li&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">&lt;/ul&gt;</span>
+<span class="x">&lt;div class=&quot;mainlayout&quot;&gt;</span>
+<span class="x">    </span><span class="cp">${</span><span class="nb">next</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/div&gt;</span>
+</pre></div>
+</div>
+<p>And finally change <tt class="docutils literal"><span class="pre">index.html</span></tt> to inherit from
+<tt class="docutils literal"><span class="pre">layout.html</span></tt> instead:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## index.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;layout.html&quot;</span><span class="cp">/&gt;</span>
+
+<span class="cp">## .. rest of template</span><span class="x"></span>
+</pre></div>
+</div>
+<p>In this setup, each call to <tt class="docutils literal"><span class="pre">next.body()</span></tt> will render the body
+of the next template in the inheritance chain (which can be
+written as <tt class="docutils literal"><span class="pre">base.html</span> <span class="pre">-&gt;</span> <span class="pre">layout.html</span> <span class="pre">-&gt;</span> <span class="pre">index.html</span></tt>). Control
+is still first passed to the bottommost template <tt class="docutils literal"><span class="pre">base.html</span></tt>,
+and <tt class="docutils literal"><span class="pre">self</span></tt> still references the topmost definition of any
+particular def.</p>
+<p>The output we get would be:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;html&gt;</span>
+    <span class="nt">&lt;body&gt;</span>
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;header&quot;</span><span class="nt">&gt;</span>
+            this is some header content
+        <span class="nt">&lt;/div&gt;</span>
+
+        <span class="nt">&lt;ul&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 1<span class="nt">&lt;/li&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 2<span class="nt">&lt;/li&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 3<span class="nt">&lt;/li&gt;</span>
+        <span class="nt">&lt;/ul&gt;</span>
+
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;mainlayout&quot;</span><span class="nt">&gt;</span>
+        this is the body content.
+        <span class="nt">&lt;/div&gt;</span>
+
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;footer&quot;</span><span class="nt">&gt;</span>
+            this is the footer
+        <span class="nt">&lt;/div&gt;</span>
+    <span class="nt">&lt;/body&gt;</span>
+<span class="nt">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>So above, we have the <tt class="docutils literal"><span class="pre">&lt;html&gt;</span></tt>, <tt class="docutils literal"><span class="pre">&lt;body&gt;</span></tt> and
+<tt class="docutils literal"><span class="pre">header</span></tt>/<tt class="docutils literal"><span class="pre">footer</span></tt> layout of <tt class="docutils literal"><span class="pre">base.html</span></tt>, we have the
+<tt class="docutils literal"><span class="pre">&lt;ul&gt;</span></tt> and <tt class="docutils literal"><span class="pre">mainlayout</span></tt> section of <tt class="docutils literal"><span class="pre">layout.html</span></tt>, and the
+main body of <tt class="docutils literal"><span class="pre">index.html</span></tt> as well as its overridden <tt class="docutils literal"><span class="pre">header</span></tt>
+def. The <tt class="docutils literal"><span class="pre">layout.html</span></tt> template is inserted into the middle of
+the chain without <tt class="docutils literal"><span class="pre">base.html</span></tt> having to change anything.
+Without the <tt class="docutils literal"><span class="pre">next</span></tt> namespace, only the main body of
+<tt class="docutils literal"><span class="pre">index.html</span></tt> could be used; there would be no way to call
+<tt class="docutils literal"><span class="pre">layout.html</span></tt>&#8216;s body content.</p>
+</div>
+<div class="section" id="using-the-parent-namespace-to-augment-defs">
+<span id="parent-namespace"></span><h2>Using the <tt class="docutils literal"><span class="pre">parent</span></tt> Namespace to Augment Defs<a class="headerlink" href="#using-the-parent-namespace-to-augment-defs" title="Permalink to this headline">?</a></h2>
+<p>Lets now look at the other inheritance-specific namespace, the
+opposite of <tt class="docutils literal"><span class="pre">next</span></tt> called <tt class="docutils literal"><span class="pre">parent</span></tt>. <tt class="docutils literal"><span class="pre">parent</span></tt> is the
+namespace of the template <strong>immediately preceding</strong> the current
+template. What&#8217;s useful about this namespace is that
+defs or blocks can call upon their overridden versions.
+This is not as hard as it sounds and
+is very much like using the <tt class="docutils literal"><span class="pre">super</span></tt> keyword in Python. Lets
+modify <tt class="docutils literal"><span class="pre">index.html</span></tt> to augment the list of selections provided
+by the <tt class="docutils literal"><span class="pre">toolbar</span></tt> function in <tt class="docutils literal"><span class="pre">layout.html</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## index.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;layout.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is some header content</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;toolbar&quot;</span><span class="cp">&gt;</span>
+    <span class="cp">## call the parent&#39;s toolbar first</span><span class="x"></span>
+<span class="x">    </span><span class="cp">${</span><span class="n">parent</span><span class="o">.</span><span class="n">toolbar</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">    &lt;li&gt;selection 4&lt;/li&gt;</span>
+<span class="x">    &lt;li&gt;selection 5&lt;/li&gt;</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="x">this is the body content.</span>
+</pre></div>
+</div>
+<p>Above, we implemented a <tt class="docutils literal"><span class="pre">toolbar()</span></tt> function, which is meant
+to override the definition of <tt class="docutils literal"><span class="pre">toolbar</span></tt> within the inherited
+template <tt class="docutils literal"><span class="pre">layout.html</span></tt>. However, since we want the content
+from that of <tt class="docutils literal"><span class="pre">layout.html</span></tt> as well, we call it via the
+<tt class="docutils literal"><span class="pre">parent</span></tt> namespace whenever we want it&#8217;s content, in this case
+before we add our own selections. So the output for the whole
+thing is now:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;html&gt;</span>
+    <span class="nt">&lt;body&gt;</span>
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;header&quot;</span><span class="nt">&gt;</span>
+            this is some header content
+        <span class="nt">&lt;/div&gt;</span>
+
+        <span class="nt">&lt;ul&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 1<span class="nt">&lt;/li&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 2<span class="nt">&lt;/li&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 3<span class="nt">&lt;/li&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 4<span class="nt">&lt;/li&gt;</span>
+            <span class="nt">&lt;li&gt;</span>selection 5<span class="nt">&lt;/li&gt;</span>
+        <span class="nt">&lt;/ul&gt;</span>
+
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;mainlayout&quot;</span><span class="nt">&gt;</span>
+        this is the body content.
+        <span class="nt">&lt;/div&gt;</span>
+
+        <span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;footer&quot;</span><span class="nt">&gt;</span>
+            this is the footer
+        <span class="nt">&lt;/div&gt;</span>
+    <span class="nt">&lt;/body&gt;</span>
+<span class="nt">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>and you&#8217;re now a template inheritance ninja!</p>
+</div>
+<div class="section" id="inheritable-attributes">
+<h2>Inheritable Attributes<a class="headerlink" href="#inheritable-attributes" title="Permalink to this headline">?</a></h2>
+<p>The <a class="reference internal" href="namespaces.html#mako.runtime.Namespace.attr" title="mako.runtime.Namespace.attr"><tt class="xref py py-attr docutils literal"><span class="pre">attr</span></tt></a> accessor of the <a class="reference internal" href="namespaces.html#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> object
+allows access to module level variables declared in a template. By accessing
+<tt class="docutils literal"><span class="pre">self.attr</span></tt>, you can access regular attributes from the
+inheritance chain as declared in <tt class="docutils literal"><span class="pre">&lt;%!</span> <span class="pre">%&gt;</span></tt> sections. Such as:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%!</span>
+    <span class="n">class_</span> <span class="o">=</span> <span class="s">&quot;grey&quot;</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+
+<span class="x">&lt;div class=&quot;</span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">attr</span><span class="o">.</span><span class="n">class_</span><span class="cp">}</span><span class="x">&quot;&gt;</span>
+<span class="x">    </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/div&gt;</span>
+</pre></div>
+</div>
+<p>If an inheriting template overrides <tt class="docutils literal"><span class="pre">class_</span></tt> to be
+<tt class="docutils literal"><span class="pre">&quot;white&quot;</span></tt>, as in:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%!</span>
+    <span class="n">class_</span> <span class="o">=</span> <span class="s">&quot;white&quot;</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;parent.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">This is the body</span>
+</pre></div>
+</div>
+<p>you&#8217;ll get output like:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;white&quot;</span><span class="nt">&gt;</span>
+    This is the body
+<span class="nt">&lt;/div&gt;</span>
+</pre></div>
+</div>
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="namespaces.html" title="previous chapter">Namespaces</a>
+        Next:
+        <a href="filtering.html" title="next chapter">Filtering and Buffering</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/namespaces.html b/lib/mako-0.7.2/doc/namespaces.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/namespaces.html
@@ -0,0 +1,647 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                Namespaces
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="Inheritance" href="inheritance.html" />
+        <link rel="prev" title="The Mako Runtime Environment" href="runtime.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="runtime.html" title="previous chapter">The Mako Runtime Environment</a>
+            </li>
+            <li>Next:
+            <a href="inheritance.html" title="next chapter">Inheritance</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/namespaces.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                Namespaces
+             
+
+        <h2>
+            
+                Namespaces
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">Namespaces</a><ul>
+<li><a class="reference internal" href="#ways-to-call-namespaces">Ways to Call Namespaces</a></li>
+<li><a class="reference internal" href="#namespaces-from-regular-python-modules">Namespaces from Regular Python Modules</a></li>
+<li><a class="reference internal" href="#declaring-defs-in-namespaces">Declaring Defs in Namespaces</a></li>
+<li><a class="reference internal" href="#the-body-method">The <tt class="docutils literal"><span class="pre">body()</span></tt> Method</a></li>
+<li><a class="reference internal" href="#built-in-namespaces">Built-in Namespaces</a><ul>
+<li><a class="reference internal" href="#local"><tt class="docutils literal"><span class="pre">local</span></tt></a></li>
+<li><a class="reference internal" href="#self"><tt class="docutils literal"><span class="pre">self</span></tt></a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#inheritable-namespaces">Inheritable Namespaces</a></li>
+<li><a class="reference internal" href="#api-reference">API Reference</a></li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="runtime.html" title="previous chapter">The Mako Runtime Environment</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="inheritance.html" title="next chapter">Inheritance</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="namespaces">
+<span id="namespaces-toplevel"></span><h1>Namespaces<a class="headerlink" href="#namespaces" title="Permalink to this headline">?</a></h1>
+<p>Namespaces are used to organize groups of defs into
+categories, and also to &#8220;import&#8221; defs from other files.</p>
+<p>If the file <tt class="docutils literal"><span class="pre">components.html</span></tt> defines these two defs:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## components.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;comp1()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is comp1</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;comp2(x)&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is comp2, x is </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>you can make another file, for example <tt class="docutils literal"><span class="pre">index.html</span></tt>, that
+pulls those two defs into a namespace called <tt class="docutils literal"><span class="pre">comp</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## index.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">name=</span><span class="s">&quot;comp&quot;</span> <span class="na">file=</span><span class="s">&quot;components.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">Here&#39;s comp1:  </span><span class="cp">${</span><span class="n">comp</span><span class="o">.</span><span class="n">comp1</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">Here&#39;s comp2:  </span><span class="cp">${</span><span class="n">comp</span><span class="o">.</span><span class="n">comp2</span><span class="p">(</span><span class="n">x</span><span class="o">=</span><span class="mi">5</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">comp</span></tt> variable above is an instance of
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>, a <strong>proxy object</strong> which delivers
+method calls to the underlying template callable using the
+current context.</p>
+<p><tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> also provides an <tt class="docutils literal"><span class="pre">import</span></tt> attribute which can
+be used to pull the names into the local namespace, removing the
+need to call it via the &#8220;<tt class="docutils literal"><span class="pre">.</span></tt>&#8221; operator. When <tt class="docutils literal"><span class="pre">import</span></tt> is used, the
+<tt class="docutils literal"><span class="pre">name</span></tt> attribute is optional.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">file=</span><span class="s">&quot;components.html&quot;</span> <span class="na">import=</span><span class="s">&quot;comp1, comp2&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">Heres comp1:  </span><span class="cp">${</span><span class="n">comp1</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">Heres comp2:  </span><span class="cp">${</span><span class="n">comp2</span><span class="p">(</span><span class="n">x</span><span class="o">=</span><span class="mi">5</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p><tt class="docutils literal"><span class="pre">import</span></tt> also supports the &#8220;<tt class="docutils literal"><span class="pre">*</span></tt>&#8221; operator:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">file=</span><span class="s">&quot;components.html&quot;</span> <span class="na">import=</span><span class="s">&quot;*&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">Heres comp1:  </span><span class="cp">${</span><span class="n">comp1</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">Heres comp2:  </span><span class="cp">${</span><span class="n">comp2</span><span class="p">(</span><span class="n">x</span><span class="o">=</span><span class="mi">5</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The names imported by the <tt class="docutils literal"><span class="pre">import</span></tt> attribute take precedence
+over any names that exist within the current context.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">In current versions of Mako, usage of <tt class="docutils literal"><span class="pre">import='*'</span></tt> is
+known to decrease performance of the template. This will be
+fixed in a future release.</p>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">file</span></tt> argument allows expressions &#8211; if looking for
+context variables, the <tt class="docutils literal"><span class="pre">context</span></tt> must be named explicitly:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">name=</span><span class="s">&quot;dyn&quot;</span> <span class="na">file=</span><span class="s">&quot;${context[&#39;namespace_name&#39;]}&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<div class="section" id="ways-to-call-namespaces">
+<h2>Ways to Call Namespaces<a class="headerlink" href="#ways-to-call-namespaces" title="Permalink to this headline">?</a></h2>
+<p>There are essentially four ways to call a function from a
+namespace.</p>
+<p>The &#8220;expression&#8221; format, as described previously. Namespaces are
+just Python objects with functions on them, and can be used in
+expressions like any other function:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="n">mynamespace</span><span class="o">.</span><span class="n">somefunction</span><span class="p">(</span><span class="s">&#39;some arg1&#39;</span><span class="p">,</span> <span class="s">&#39;some arg2&#39;</span><span class="p">,</span> <span class="n">arg3</span><span class="o">=</span><span class="s">&#39;some arg3&#39;</span><span class="p">,</span> <span class="n">arg4</span><span class="o">=</span><span class="s">&#39;some arg4&#39;</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Synonymous with the &#8220;expression&#8221; format is the &#8220;custom tag&#8221;
+format, when a &#8220;closed&#8221; tag is used. This format, introduced in
+Mako 0.2.3, allows the usage of a &#8220;custom&#8221; Mako tag, with the
+function arguments passed in using named attributes:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">mynamespace:somefunction</span> <span class="na">arg1=</span><span class="s">&quot;some arg1&quot;</span> <span class="na">arg2=</span><span class="s">&quot;some arg2&quot;</span> <span class="na">arg3=</span><span class="s">&quot;some arg3&quot;</span> <span class="na">arg4=</span><span class="s">&quot;some arg4&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>When using tags, the values of the arguments are taken as
+literal strings by default. To embed Python expressions as
+arguments, use the embedded expression format:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">mynamespace:somefunction</span> <span class="na">arg1=</span><span class="s">&quot;${someobject.format()}&quot;</span> <span class="na">arg2=</span><span class="s">&quot;${somedef(5, 12)}&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The &#8220;custom tag&#8221; format is intended mainly for namespace
+functions which recognize body content, which in Mako is known
+as a &#8220;def with embedded content&#8221;:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">mynamespace:somefunction</span> <span class="na">arg1=</span><span class="s">&quot;some argument&quot;</span> <span class="na">args=</span><span class="s">&quot;x, y&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    Some record: </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x">, </span><span class="cp">${</span><span class="n">y</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">mynamespace:somefunction</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The &#8220;classic&#8221; way to call defs with embedded content is the <tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt> tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">call</span> <span class="na">expr=</span><span class="s">&quot;mynamespace.somefunction(arg1=&#39;some argument&#39;)&quot;</span> <span class="na">args=</span><span class="s">&quot;x, y&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    Some record: </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x">, </span><span class="cp">${</span><span class="n">y</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">call</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>For information on how to construct defs that embed content from
+the caller, see <a class="reference internal" href="defs.html#defs-with-content"><em>Calling a Def with Embedded Content and/or Other Defs</em></a>.</p>
+</div>
+<div class="section" id="namespaces-from-regular-python-modules">
+<span id="namespaces-python-modules"></span><h2>Namespaces from Regular Python Modules<a class="headerlink" href="#namespaces-from-regular-python-modules" title="Permalink to this headline">?</a></h2>
+<p>Namespaces can also import regular Python functions from
+modules. These callables need to take at least one argument,
+<tt class="docutils literal"><span class="pre">context</span></tt>, an instance of <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>. A module file
+<tt class="docutils literal"><span class="pre">some/module.py</span></tt> might contain the callable:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">def</span> <span class="nf">my_tag</span><span class="p">(</span><span class="n">context</span><span class="p">):</span>
+    <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&quot;hello world&quot;</span><span class="p">)</span>
+    <span class="k">return</span> <span class="s">&#39;&#39;</span>
+</pre></div>
+</div>
+<p>A template can use this module via:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">name=</span><span class="s">&quot;hw&quot;</span> <span class="na">module=</span><span class="s">&quot;some.module&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">${</span><span class="n">hw</span><span class="o">.</span><span class="n">my_tag</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Note that the <tt class="docutils literal"><span class="pre">context</span></tt> argument is not needed in the call;
+the <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> tag creates a locally-scoped callable which
+takes care of it. The <tt class="docutils literal"><span class="pre">return</span> <span class="pre">''</span></tt> is so that the def does not
+dump a <tt class="docutils literal"><span class="pre">None</span></tt> into the output stream &#8211; the return value of any
+def is rendered after the def completes, in addition to whatever
+was passed to <a class="reference internal" href="runtime.html#mako.runtime.Context.write" title="mako.runtime.Context.write"><tt class="xref py py-meth docutils literal"><span class="pre">Context.write()</span></tt></a> within its body.</p>
+<p>If your def is to be called in an &#8220;embedded content&#8221; context,
+that is as described in <a class="reference internal" href="defs.html#defs-with-content"><em>Calling a Def with Embedded Content and/or Other Defs</em></a>, you should use
+the <a class="reference internal" href="#mako.runtime.supports_caller" title="mako.runtime.supports_caller"><tt class="xref py py-func docutils literal"><span class="pre">supports_caller()</span></tt></a> decorator, which will ensure that Mako
+will ensure the correct &#8220;caller&#8221; variable is available when your
+def is called, supporting embedded content:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.runtime</span> <span class="kn">import</span> <span class="n">supports_caller</span>
+
+<span class="nd">@supports_caller</span>
+<span class="k">def</span> <span class="nf">my_tag</span><span class="p">(</span><span class="n">context</span><span class="p">):</span>
+    <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&quot;&lt;div&gt;&quot;</span><span class="p">)</span>
+    <span class="n">context</span><span class="p">[</span><span class="s">&#39;caller&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">body</span><span class="p">()</span>
+    <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&quot;&lt;/div&gt;&quot;</span><span class="p">)</span>
+    <span class="k">return</span> <span class="s">&#39;&#39;</span>
+</pre></div>
+</div>
+<p>Capturing of output is available as well, using the
+outside-of-templates version of the <a class="reference internal" href="#mako.runtime.capture" title="mako.runtime.capture"><tt class="xref py py-func docutils literal"><span class="pre">capture()</span></tt></a> function,
+which accepts the &#8220;context&#8221; as its first argument:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.runtime</span> <span class="kn">import</span> <span class="n">supports_caller</span><span class="p">,</span> <span class="n">capture</span>
+
+<span class="nd">@supports_caller</span>
+<span class="k">def</span> <span class="nf">my_tag</span><span class="p">(</span><span class="n">context</span><span class="p">):</span>
+    <span class="k">return</span> <span class="s">&quot;&lt;div&gt;</span><span class="si">%s</span><span class="s">&lt;/div&gt;&quot;</span> <span class="o">%</span> \
+            <span class="n">capture</span><span class="p">(</span><span class="n">context</span><span class="p">,</span> <span class="n">context</span><span class="p">[</span><span class="s">&#39;caller&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">body</span><span class="p">,</span> <span class="n">x</span><span class="o">=</span><span class="s">&quot;foo&quot;</span><span class="p">,</span> <span class="n">y</span><span class="o">=</span><span class="s">&quot;bar&quot;</span><span class="p">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="declaring-defs-in-namespaces">
+<h2>Declaring Defs in Namespaces<a class="headerlink" href="#declaring-defs-in-namespaces" title="Permalink to this headline">?</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> tag supports the definition of <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>s
+directly inside the tag. These defs become part of the namespace
+like any other function, and will override the definitions
+pulled in from a remote template or module:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## define a namespace</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">name=</span><span class="s">&quot;stuff&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;comp1()&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        comp1</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">namespace</span><span class="cp">&gt;</span>
+
+<span class="cp">## then call it</span><span class="x"></span>
+<span class="cp">${</span><span class="n">stuff</span><span class="o">.</span><span class="n">comp1</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="the-body-method">
+<span id="namespaces-body"></span><h2>The <tt class="docutils literal"><span class="pre">body()</span></tt> Method<a class="headerlink" href="#the-body-method" title="Permalink to this headline">?</a></h2>
+<p>Every namespace that is generated from a template contains a
+method called <tt class="docutils literal"><span class="pre">body()</span></tt>. This method corresponds to the main
+body of the template, and plays its most important roles when
+using inheritance relationships as well as
+def-calls-with-content.</p>
+<p>Since the <tt class="docutils literal"><span class="pre">body()</span></tt> method is available from a namespace just
+like all the other defs defined in a template, what happens if
+you send arguments to it? By default, the <tt class="docutils literal"><span class="pre">body()</span></tt> method
+accepts no positional arguments, and for usefulness in
+inheritance scenarios will by default dump all keyword arguments
+into a dictionary called <tt class="docutils literal"><span class="pre">pageargs</span></tt>. But if you actually want
+to get at the keyword arguments, Mako recommends you define your
+own argument signature explicitly. You do this via using the
+<tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">args=</span><span class="s">&quot;x, y, someval=8, scope=&#39;foo&#39;, **kwargs&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>A template which defines the above signature requires that the
+variables <tt class="docutils literal"><span class="pre">x</span></tt> and <tt class="docutils literal"><span class="pre">y</span></tt> are defined, defines default values
+for <tt class="docutils literal"><span class="pre">someval</span></tt> and <tt class="docutils literal"><span class="pre">scope</span></tt>, and sets up <tt class="docutils literal"><span class="pre">**kwargs</span></tt> to
+receive all other keyword arguments. If <tt class="docutils literal"><span class="pre">**kwargs</span></tt> or similar
+is not present, the argument <tt class="docutils literal"><span class="pre">**pageargs</span></tt> gets tacked on by
+Mako. When the template is called as a top-level template (i.e.
+via <a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a>) or via the <tt class="docutils literal"><span class="pre">&lt;%include&gt;</span></tt> tag, the
+values for these arguments will be pulled from the <tt class="docutils literal"><span class="pre">Context</span></tt>.
+In all other cases, i.e. via calling the <tt class="docutils literal"><span class="pre">body()</span></tt> method, the
+arguments are taken as ordinary arguments from the method call.
+So above, the body might be called as:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">body</span><span class="p">(</span><span class="mi">5</span><span class="p">,</span> <span class="n">y</span><span class="o">=</span><span class="mi">10</span><span class="p">,</span> <span class="n">someval</span><span class="o">=</span><span class="mi">15</span><span class="p">,</span> <span class="n">delta</span><span class="o">=</span><span class="mi">7</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object also supplies a <a class="reference internal" href="runtime.html#mako.runtime.Context.kwargs" title="mako.runtime.Context.kwargs"><tt class="xref py py-attr docutils literal"><span class="pre">kwargs</span></tt></a> accessor, for
+cases when you&#8217;d like to pass along whatever is in the context to
+a <tt class="docutils literal"><span class="pre">body()</span></tt> callable:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="nb">next</span><span class="o">.</span><span class="n">body</span><span class="p">(</span><span class="o">**</span><span class="n">context</span><span class="o">.</span><span class="n">kwargs</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The usefulness of calls like the above become more apparent when
+one works with inheriting templates. For more information on
+this, as well as the meanings of the names <tt class="docutils literal"><span class="pre">self</span></tt> and
+<tt class="docutils literal"><span class="pre">next</span></tt>, see <a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</p>
+</div>
+<div class="section" id="built-in-namespaces">
+<span id="namespaces-builtin"></span><h2>Built-in Namespaces<a class="headerlink" href="#built-in-namespaces" title="Permalink to this headline">?</a></h2>
+<p>The namespace is so great that Mako gives your template one (or
+two) for free. The names of these namespaces are <tt class="docutils literal"><span class="pre">local</span></tt> and
+<tt class="docutils literal"><span class="pre">self</span></tt>. Other built-in namespaces include <tt class="docutils literal"><span class="pre">parent</span></tt> and
+<tt class="docutils literal"><span class="pre">next</span></tt>, which are optional and are described in
+<a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</p>
+<div class="section" id="local">
+<span id="namespace-local"></span><h3><tt class="docutils literal"><span class="pre">local</span></tt><a class="headerlink" href="#local" title="Permalink to this headline">?</a></h3>
+<p>The <tt class="docutils literal"><span class="pre">local</span></tt> namespace is basically the namespace for the
+currently executing template. This means that all of the top
+level defs defined in your template, as well as your template&#8217;s
+<tt class="docutils literal"><span class="pre">body()</span></tt> function, are also available off of the <tt class="docutils literal"><span class="pre">local</span></tt>
+namespace.</p>
+<p>The <tt class="docutils literal"><span class="pre">local</span></tt> namespace is also where properties like <tt class="docutils literal"><span class="pre">uri</span></tt>,
+<tt class="docutils literal"><span class="pre">filename</span></tt>, and <tt class="docutils literal"><span class="pre">module</span></tt> and the <tt class="docutils literal"><span class="pre">get_namespace</span></tt> method
+can be particularly useful.</p>
+</div>
+<div class="section" id="self">
+<span id="namespace-self"></span><h3><tt class="docutils literal"><span class="pre">self</span></tt><a class="headerlink" href="#self" title="Permalink to this headline">?</a></h3>
+<p>The <tt class="docutils literal"><span class="pre">self</span></tt> namespace, in the case of a template that does not
+use inheritance, is synonymous with <tt class="docutils literal"><span class="pre">local</span></tt>. If inheritance is
+used, then <tt class="docutils literal"><span class="pre">self</span></tt> references the topmost template in the
+inheritance chain, where it is most useful for providing the
+ultimate form of various &#8220;method&#8221; calls which may have been
+overridden at various points in an inheritance chain. See
+<a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</p>
+</div>
+</div>
+<div class="section" id="inheritable-namespaces">
+<h2>Inheritable Namespaces<a class="headerlink" href="#inheritable-namespaces" title="Permalink to this headline">?</a></h2>
+<p>The <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> tag includes an optional attribute
+<tt class="docutils literal"><span class="pre">inheritable=&quot;True&quot;</span></tt>, which will cause the namespace to be
+attached to the <tt class="docutils literal"><span class="pre">self</span></tt> namespace. Since <tt class="docutils literal"><span class="pre">self</span></tt> is globally
+available throughout an inheritance chain (described in the next
+section), all the templates in an inheritance chain can get at
+the namespace imported in a super-template via <tt class="docutils literal"><span class="pre">self</span></tt>.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## base.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">name=</span><span class="s">&quot;foo&quot;</span> <span class="na">file=</span><span class="s">&quot;foo.html&quot;</span> <span class="na">inheritable=</span><span class="s">&quot;True&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">${</span><span class="nb">next</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span>
+
+<span class="cp">## somefile.html</span><span class="x"></span>
+<span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;base.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">foo</span><span class="o">.</span><span class="n">bar</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>This allows a super-template to load a whole bunch of namespaces
+that its inheriting templates can get to, without them having to
+explicitly load those namespaces themselves.</p>
+<p>The <tt class="docutils literal"><span class="pre">import=&quot;*&quot;</span></tt> part of the <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> tag doesn&#8217;t yet
+interact with the <tt class="docutils literal"><span class="pre">inheritable</span></tt> flag, so currently you have to
+use the explicit namespace name off of <tt class="docutils literal"><span class="pre">self</span></tt>, followed by the
+desired function name. But more on this in a future release.</p>
+</div>
+<div class="section" id="api-reference">
+<h2>API Reference<a class="headerlink" href="#api-reference" title="Permalink to this headline">?</a></h2>
+<dl class="class">
+<dt id="mako.runtime.Namespace">
+<em class="property">class </em><tt class="descclassname">mako.runtime.</tt><tt class="descname">Namespace</tt><big>(</big><em>name</em>, <em>context</em>, <em>callables=None</em>, <em>inherits=None</em>, <em>populate_self=True</em>, <em>calling_uri=None</em><big>)</big><a class="headerlink" href="#mako.runtime.Namespace" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Provides access to collections of rendering methods, which
+can be local, from other templates, or from imported modules.</p>
+<p>To access a particular rendering method referenced by a
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>, use plain attribute access:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="n">some_namespace</span><span class="o">.</span><span class="n">foo</span><span class="p">(</span><span class="n">x</span><span class="p">,</span> <span class="n">y</span><span class="p">,</span> <span class="n">z</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p><a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> also contains several built-in attributes
+described here.</p>
+<dl class="attribute">
+<dt id="mako.runtime.Namespace.attr">
+<tt class="descname">attr</tt><a class="headerlink" href="#mako.runtime.Namespace.attr" title="Permalink to this definition">?</a></dt>
+<dd><p>Access module level attributes by name.</p>
+<p>This accessor allows templates to supply &#8220;scalar&#8221;
+attributes which are particularly handy in inheritance
+relationships. See the example in
+<a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Namespace.cache">
+<tt class="descname">cache</tt><a class="headerlink" href="#mako.runtime.Namespace.cache" title="Permalink to this definition">?</a></dt>
+<dd><p>Return the <a class="reference internal" href="caching.html#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> object referenced
+by this <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> object&#8217;s
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Namespace.context">
+<tt class="descname">context</tt><em class="property"> = None</em><a class="headerlink" href="#mako.runtime.Namespace.context" title="Permalink to this definition">?</a></dt>
+<dd><p>The <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object for this <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>.</p>
+<p>Namespaces are often created with copies of contexts that
+contain slightly different data, particularly in inheritance
+scenarios. Using the <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> off of a <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> one
+can traverse an entire chain of templates that inherit from
+one-another.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Namespace.filename">
+<tt class="descname">filename</tt><em class="property"> = None</em><a class="headerlink" href="#mako.runtime.Namespace.filename" title="Permalink to this definition">?</a></dt>
+<dd><p>The path of the filesystem file used for this
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>&#8216;s module or template.</p>
+<p>If this is a pure module-based
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>, this evaluates to <tt class="docutils literal"><span class="pre">module.__file__</span></tt>. If a
+template-based namespace, it evaluates to the original
+template file location.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Namespace.get_cached">
+<tt class="descname">get_cached</tt><big>(</big><em>key</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#mako.runtime.Namespace.get_cached" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a value from the <a class="reference internal" href="caching.html#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> referenced by this
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> object&#8217;s <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>.</p>
+<p>The advantage to this method versus direct access to the
+<a class="reference internal" href="caching.html#mako.cache.Cache" title="mako.cache.Cache"><tt class="xref py py-class docutils literal"><span class="pre">Cache</span></tt></a> is that the configuration parameters
+declared in <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> take effect here, thereby calling
+up the same configured backend as that configured
+by <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Namespace.get_namespace">
+<tt class="descname">get_namespace</tt><big>(</big><em>uri</em><big>)</big><a class="headerlink" href="#mako.runtime.Namespace.get_namespace" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> corresponding to the given <tt class="docutils literal"><span class="pre">uri</span></tt>.</p>
+<p>If the given <tt class="docutils literal"><span class="pre">uri</span></tt> is a relative URI (i.e. it does not
+contain a leading slash <tt class="docutils literal"><span class="pre">/</span></tt>), the <tt class="docutils literal"><span class="pre">uri</span></tt> is adjusted to
+be relative to the <tt class="docutils literal"><span class="pre">uri</span></tt> of the namespace itself. This
+method is therefore mostly useful off of the built-in
+<tt class="docutils literal"><span class="pre">local</span></tt> namespace, described in <a class="reference internal" href="#namespace-local"><em>local</em></a>.</p>
+<p>In
+most cases, a template wouldn&#8217;t need this function, and
+should instead use the <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> tag to load
+namespaces. However, since all <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt> tags are
+evaluated before the body of a template ever runs,
+this method can be used to locate namespaces using
+expressions that were generated within the body code of
+the template, or to conditionally use a particular
+namespace.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Namespace.get_template">
+<tt class="descname">get_template</tt><big>(</big><em>uri</em><big>)</big><a class="headerlink" href="#mako.runtime.Namespace.get_template" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> from the given <tt class="docutils literal"><span class="pre">uri</span></tt>.</p>
+<p>The <tt class="docutils literal"><span class="pre">uri</span></tt> resolution is relative to the <tt class="docutils literal"><span class="pre">uri</span></tt> of this <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>
+object&#8217;s <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Namespace.include_file">
+<tt class="descname">include_file</tt><big>(</big><em>uri</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#mako.runtime.Namespace.include_file" title="Permalink to this definition">?</a></dt>
+<dd><p>Include a file at the given <tt class="docutils literal"><span class="pre">uri</span></tt>.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Namespace.module">
+<tt class="descname">module</tt><em class="property"> = None</em><a class="headerlink" href="#mako.runtime.Namespace.module" title="Permalink to this definition">?</a></dt>
+<dd><p>The Python module referenced by this <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>.</p>
+<p>If the namespace references a <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>, then
+this module is the equivalent of <tt class="docutils literal"><span class="pre">template.module</span></tt>,
+i.e. the generated module for the template.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Namespace.template">
+<tt class="descname">template</tt><em class="property"> = None</em><a class="headerlink" href="#mako.runtime.Namespace.template" title="Permalink to this definition">?</a></dt>
+<dd><p>The <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object referenced by this
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>, if any.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Namespace.uri">
+<tt class="descname">uri</tt><em class="property"> = None</em><a class="headerlink" href="#mako.runtime.Namespace.uri" title="Permalink to this definition">?</a></dt>
+<dd><p>The URI for this <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>&#8216;s template.</p>
+<p>I.e. whatever was sent to <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup.get_template" title="mako.lookup.TemplateLookup.get_template"><tt class="xref py py-meth docutils literal"><span class="pre">TemplateLookup.get_template()</span></tt></a>.</p>
+<p>This is the equivalent of <tt class="xref py py-attr docutils literal"><span class="pre">Template.uri</span></tt>.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.runtime.TemplateNamespace">
+<em class="property">class </em><tt class="descclassname">mako.runtime.</tt><tt class="descname">TemplateNamespace</tt><big>(</big><em>name</em>, <em>context</em>, <em>template=None</em>, <em>templateuri=None</em>, <em>callables=None</em>, <em>inherits=None</em>, <em>populate_self=True</em>, <em>calling_uri=None</em><big>)</big><a class="headerlink" href="#mako.runtime.TemplateNamespace" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">mako.runtime.Namespace</span></tt></a></p>
+<p>A <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> specific to a <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> instance.</p>
+<dl class="attribute">
+<dt id="mako.runtime.TemplateNamespace.filename">
+<tt class="descname">filename</tt><a class="headerlink" href="#mako.runtime.TemplateNamespace.filename" title="Permalink to this definition">?</a></dt>
+<dd><p>The path of the filesystem file used for this
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>&#8216;s module or template.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.TemplateNamespace.module">
+<tt class="descname">module</tt><a class="headerlink" href="#mako.runtime.TemplateNamespace.module" title="Permalink to this definition">?</a></dt>
+<dd><p>The Python module referenced by this <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>.</p>
+<p>If the namespace references a <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>, then
+this module is the equivalent of <tt class="docutils literal"><span class="pre">template.module</span></tt>,
+i.e. the generated module for the template.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.TemplateNamespace.uri">
+<tt class="descname">uri</tt><a class="headerlink" href="#mako.runtime.TemplateNamespace.uri" title="Permalink to this definition">?</a></dt>
+<dd><p>The URI for this <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>&#8216;s template.</p>
+<p>I.e. whatever was sent to <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup.get_template" title="mako.lookup.TemplateLookup.get_template"><tt class="xref py py-meth docutils literal"><span class="pre">TemplateLookup.get_template()</span></tt></a>.</p>
+<p>This is the equivalent of <tt class="xref py py-attr docutils literal"><span class="pre">Template.uri</span></tt>.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.runtime.ModuleNamespace">
+<em class="property">class </em><tt class="descclassname">mako.runtime.</tt><tt class="descname">ModuleNamespace</tt><big>(</big><em>name</em>, <em>context</em>, <em>module</em>, <em>callables=None</em>, <em>inherits=None</em>, <em>populate_self=True</em>, <em>calling_uri=None</em><big>)</big><a class="headerlink" href="#mako.runtime.ModuleNamespace" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">mako.runtime.Namespace</span></tt></a></p>
+<p>A <a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a> specific to a Python module instance.</p>
+<dl class="attribute">
+<dt id="mako.runtime.ModuleNamespace.filename">
+<tt class="descname">filename</tt><a class="headerlink" href="#mako.runtime.ModuleNamespace.filename" title="Permalink to this definition">?</a></dt>
+<dd><p>The path of the filesystem file used for this
+<a class="reference internal" href="#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>&#8216;s module or template.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="function">
+<dt id="mako.runtime.supports_caller">
+<tt class="descclassname">mako.runtime.</tt><tt class="descname">supports_caller</tt><big>(</big><em>func</em><big>)</big><a class="headerlink" href="#mako.runtime.supports_caller" title="Permalink to this definition">?</a></dt>
+<dd><p>Apply a caller_stack compatibility decorator to a plain
+Python function.</p>
+<p>See the example in <a class="reference internal" href="#namespaces-python-modules"><em>Namespaces from Regular Python Modules</em></a>.</p>
+</dd></dl>
+
+<dl class="function">
+<dt id="mako.runtime.capture">
+<tt class="descclassname">mako.runtime.</tt><tt class="descname">capture</tt><big>(</big><em>context</em>, <em>callable_</em>, <em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#mako.runtime.capture" title="Permalink to this definition">?</a></dt>
+<dd><p>Execute the given template def, capturing the output into
+a buffer.</p>
+<p>See the example in <a class="reference internal" href="#namespaces-python-modules"><em>Namespaces from Regular Python Modules</em></a>.</p>
+</dd></dl>
+
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="runtime.html" title="previous chapter">The Mako Runtime Environment</a>
+        Next:
+        <a href="inheritance.html" title="next chapter">Inheritance</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/runtime.html b/lib/mako-0.7.2/doc/runtime.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/runtime.html
@@ -0,0 +1,708 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                The Mako Runtime Environment
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="Namespaces" href="namespaces.html" />
+        <link rel="prev" title="Defs and Blocks" href="defs.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="defs.html" title="previous chapter">Defs and Blocks</a>
+            </li>
+            <li>Next:
+            <a href="namespaces.html" title="next chapter">Namespaces</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/runtime.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                The Mako Runtime Environment
+             
+
+        <h2>
+            
+                The Mako Runtime Environment
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">The Mako Runtime Environment</a><ul>
+<li><a class="reference internal" href="#context">Context</a><ul>
+<li><a class="reference internal" href="#the-buffer">The Buffer</a></li>
+<li><a class="reference internal" href="#context-variables">Context Variables</a></li>
+<li><a class="reference internal" href="#context-methods-and-accessors">Context Methods and Accessors</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#the-loop-context">The Loop Context</a><ul>
+<li><a class="reference internal" href="#iterations">Iterations</a></li>
+<li><a class="reference internal" href="#cycling">Cycling</a></li>
+<li><a class="reference internal" href="#parent-loops">Parent Loops</a></li>
+<li><a class="reference internal" href="#migrating-legacy-templates-that-use-the-word-loop">Migrating Legacy Templates that Use the Word &#8220;loop&#8221;</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#all-the-built-in-names">All the Built-in Names</a><ul>
+<li><a class="reference internal" href="#reserved-names">Reserved Names</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#api-reference">API Reference</a></li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="defs.html" title="previous chapter">Defs and Blocks</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="namespaces.html" title="next chapter">Namespaces</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="the-mako-runtime-environment">
+<span id="runtime-toplevel"></span><h1>The Mako Runtime Environment<a class="headerlink" href="#the-mako-runtime-environment" title="Permalink to this headline">?</a></h1>
+<p>This section describes a little bit about the objects and
+built-in functions that are available in templates.</p>
+<div class="section" id="context">
+<span id="id1"></span><h2>Context<a class="headerlink" href="#context" title="Permalink to this headline">?</a></h2>
+<p>The <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> is the central object that is created when
+a template is first executed, and is responsible for handling
+all communication with the outside world.  Within the template
+environment, it is available via the <a class="reference internal" href="#reserved-names"><em>reserved name</em></a>
+<tt class="docutils literal"><span class="pre">context</span></tt>.  The <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> includes two
+major components, one of which is the output buffer, which is a
+file-like object such as Python&#8217;s <tt class="docutils literal"><span class="pre">StringIO</span></tt> or similar, and
+the other a dictionary of variables that can be freely
+referenced within a template; this dictionary is a combination
+of the arguments sent to the <a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> function and
+some built-in variables provided by Mako&#8217;s runtime environment.</p>
+<div class="section" id="the-buffer">
+<h3>The Buffer<a class="headerlink" href="#the-buffer" title="Permalink to this headline">?</a></h3>
+<p>The buffer is stored within the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>, and writing
+to it is achieved by calling the <a class="reference internal" href="#mako.runtime.Context.write" title="mako.runtime.Context.write"><tt class="xref py py-meth docutils literal"><span class="pre">write()</span></tt></a> method
+&#8211; in a template this looks like <tt class="docutils literal"><span class="pre">context.write('some</span> <span class="pre">string')</span></tt>.
+You usually don&#8217;t need to care about this, as all text within a template, as
+well as all expressions provided by <tt class="docutils literal"><span class="pre">${}</span></tt>, automatically send
+everything to this method. The cases you might want to be aware
+of its existence are if you are dealing with various
+filtering/buffering scenarios, which are described in
+<a class="reference internal" href="filtering.html"><em>Filtering and Buffering</em></a>, or if you want to programmatically
+send content to the output stream, such as within a <tt class="docutils literal"><span class="pre">&lt;%</span> <span class="pre">%&gt;</span></tt>
+block.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span>
+    <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&quot;some programmatic text&quot;</span><span class="p">)</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The actual buffer may or may not be the original buffer sent to
+the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object, as various filtering/caching
+scenarios may &#8220;push&#8221; a new buffer onto the context&#8217;s underlying
+buffer stack. For this reason, just stick with
+<tt class="docutils literal"><span class="pre">context.write()</span></tt> and content will always go to the topmost
+buffer.</p>
+</div>
+<div class="section" id="context-variables">
+<span id="context-vars"></span><h3>Context Variables<a class="headerlink" href="#context-variables" title="Permalink to this headline">?</a></h3>
+<p>When your template is compiled into a Python module, the body
+content is enclosed within a Python function called
+<tt class="docutils literal"><span class="pre">render_body</span></tt>. Other top-level defs defined in the template are
+defined within their own function bodies which are named after
+the def&#8217;s name with the prefix <tt class="docutils literal"><span class="pre">render_</span></tt> (i.e. <tt class="docutils literal"><span class="pre">render_mydef</span></tt>).
+One of the first things that happens within these functions is
+that all variable names that are referenced within the function
+which are not defined in some other way (i.e. such as via
+assignment, module level imports, etc.) are pulled from the
+<a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object&#8217;s dictionary of variables. This is how you&#8217;re
+able to freely reference variable names in a template which
+automatically correspond to what was passed into the current
+<a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+<ul>
+<li><p class="first"><strong>What happens if I reference a variable name that is not in
+the current context?</strong> - The value you get back is a special
+value called <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt>, or if the <tt class="docutils literal"><span class="pre">strict_undefined=True</span></tt> flag
+is used a <tt class="docutils literal"><span class="pre">NameError</span></tt> is raised. <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> is just a simple global
+variable with the class <a class="reference internal" href="#mako.runtime.Undefined" title="mako.runtime.Undefined"><tt class="xref py py-class docutils literal"><span class="pre">mako.runtime.Undefined</span></tt></a>. The
+<tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> object throws an error when you call <tt class="docutils literal"><span class="pre">str()</span></tt> on
+it, which is what happens if you try to use it in an
+expression.</p>
+</li>
+<li><p class="first"><strong>UNDEFINED makes it hard for me to find what name is missing</strong> - An alternative
+is to specify the option <tt class="docutils literal"><span class="pre">strict_undefined=True</span></tt>
+to the <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> or <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>.  This will cause
+any non-present variables to raise an immediate <tt class="docutils literal"><span class="pre">NameError</span></tt>
+which includes the name of the variable in its message
+when <a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> is called &#8211; <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> is not used.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.3.6.</span></p>
+</li>
+<li><p class="first"><strong>Why not just return None?</strong> Using <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt>, or
+raising a <tt class="docutils literal"><span class="pre">NameError</span></tt> is more
+explicit and allows differentiation between a value of <tt class="docutils literal"><span class="pre">None</span></tt>
+that was explicitly passed to the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> and a value that
+wasn&#8217;t present at all.</p>
+</li>
+<li><p class="first"><strong>Why raise an exception when you call str() on it ? Why not
+just return a blank string?</strong> - Mako tries to stick to the
+Python philosophy of &#8220;explicit is better than implicit&#8221;. In
+this case, it&#8217;s decided that the template author should be made
+to specifically handle a missing value rather than
+experiencing what may be a silent failure. Since <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt>
+is a singleton object just like Python&#8217;s <tt class="docutils literal"><span class="pre">True</span></tt> or <tt class="docutils literal"><span class="pre">False</span></tt>,
+you can use the <tt class="docutils literal"><span class="pre">is</span></tt> operator to check for it:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">%</span> <span class="k">if</span> <span class="n">someval</span> <span class="ow">is</span> <span class="n">UNDEFINED</span><span class="p">:</span><span class="x"></span>
+<span class="x">    someval is: no value</span>
+<span class="cp">%</span> <span class="k">else</span><span class="p">:</span><span class="x"></span>
+<span class="x">    someval is: </span><span class="cp">${</span><span class="n">someval</span><span class="cp">}</span>
+<span class="cp">%</span><span class="k"> endif</span><span class="x"></span>
+</pre></div>
+</div>
+</li>
+</ul>
+<p>Another facet of the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> is that its dictionary of
+variables is <strong>immutable</strong>. Whatever is set when
+<a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> is called is what stays. Of course, since
+its Python, you can hack around this and change values in the
+context&#8217;s internal dictionary, but this will probably will not
+work as well as you&#8217;d think. The reason for this is that Mako in
+many cases creates copies of the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object, which
+get sent to various elements of the template and inheriting
+templates used in an execution. So changing the value in your
+local <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> will not necessarily make that value
+available in other parts of the template&#8217;s execution. Examples
+of where Mako creates copies of the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> include
+within top-level def calls from the main body of the template
+(the context is used to propagate locally assigned variables
+into the scope of defs; since in the template&#8217;s body they appear
+as inlined functions, Mako tries to make them act that way), and
+within an inheritance chain (each template in an inheritance
+chain has a different notion of <tt class="docutils literal"><span class="pre">parent</span></tt> and <tt class="docutils literal"><span class="pre">next</span></tt>, which
+are all stored in unique <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> instances).</p>
+<ul>
+<li><p class="first"><strong>So what if I want to set values that are global to everyone
+within a template request?</strong> - All you have to do is provide a
+dictionary to your <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> when the template first
+runs, and everyone can just get/set variables from that. Lets
+say its called <tt class="docutils literal"><span class="pre">attributes</span></tt>.</p>
+<p>Running the template looks like:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">output</span> <span class="o">=</span> <span class="n">template</span><span class="o">.</span><span class="n">render</span><span class="p">(</span><span class="n">attributes</span><span class="o">=</span><span class="p">{})</span>
+</pre></div>
+</div>
+<p>Within a template, just reference the dictionary:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span>
+    <span class="n">attributes</span><span class="p">[</span><span class="s">&#39;foo&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s">&#39;bar&#39;</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+<span class="x">&#39;foo&#39; attribute is: </span><span class="cp">${</span><span class="n">attributes</span><span class="p">[</span><span class="s">&#39;foo&#39;</span><span class="p">]</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+</li>
+<li><p class="first"><strong>Why can&#8217;t &#8220;attributes&#8221; be a built-in feature of the
+Context?</strong> - This is an area where Mako is trying to make as
+few decisions about your application as it possibly can.
+Perhaps you don&#8217;t want your templates to use this technique of
+assigning and sharing data, or perhaps you have a different
+notion of the names and kinds of data structures that should
+be passed around. Once again Mako would rather ask the user to
+be explicit.</p>
+</li>
+</ul>
+</div>
+<div class="section" id="context-methods-and-accessors">
+<h3>Context Methods and Accessors<a class="headerlink" href="#context-methods-and-accessors" title="Permalink to this headline">?</a></h3>
+<p>Significant members of <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> include:</p>
+<ul>
+<li><p class="first"><tt class="docutils literal"><span class="pre">context[key]</span></tt> / <tt class="docutils literal"><span class="pre">context.get(key,</span> <span class="pre">default=None)</span></tt> -
+dictionary-like accessors for the context. Normally, any
+variable you use in your template is automatically pulled from
+the context if it isn&#8217;t defined somewhere already. Use the
+dictionary accessor and/or <tt class="docutils literal"><span class="pre">get</span></tt> method when you want a
+variable that <em>is</em> already defined somewhere else, such as in
+the local arguments sent to a <tt class="docutils literal"><span class="pre">%def</span></tt> call. If a key is not
+present, like a dictionary it raises <tt class="docutils literal"><span class="pre">KeyError</span></tt>.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">keys()</span></tt> - all the names defined within this context.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">kwargs</span></tt> - this returns a <strong>copy</strong> of the context&#8217;s
+dictionary of variables. This is useful when you want to
+propagate the variables in the current context to a function
+as keyword arguments, i.e.:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="nb">next</span><span class="o">.</span><span class="n">body</span><span class="p">(</span><span class="o">**</span><span class="n">context</span><span class="o">.</span><span class="n">kwargs</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">write(text)</span></tt> - write some text to the current output
+stream.</p>
+</li>
+<li><p class="first"><tt class="docutils literal"><span class="pre">lookup</span></tt> - returns the <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> instance that is
+used for all file-lookups within the current execution (even
+though individual <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> instances can conceivably have
+different instances of a <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>, only the
+<a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> of the originally-called <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> gets
+used in a particular execution).</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="section" id="the-loop-context">
+<span id="loop-context"></span><h2>The Loop Context<a class="headerlink" href="#the-loop-context" title="Permalink to this headline">?</a></h2>
+<p>Within <tt class="docutils literal"><span class="pre">%</span> <span class="pre">for</span></tt> blocks, the <a class="reference internal" href="#reserved-names"><em>reserved name</em></a> <tt class="docutils literal"><span class="pre">loop</span></tt>
+is available.  <tt class="docutils literal"><span class="pre">loop</span></tt> tracks the progress of
+the <tt class="docutils literal"><span class="pre">for</span></tt> loop and makes it easy to use the iteration state to control
+template behavior:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;ul&gt;</span>
+<span class="cp">%</span> <span class="k">for</span> <span class="n">a</span> <span class="ow">in</span> <span class="p">(</span><span class="s">&quot;one&quot;</span><span class="p">,</span> <span class="s">&quot;two&quot;</span><span class="p">,</span> <span class="s">&quot;three&quot;</span><span class="p">):</span><span class="x"></span>
+<span class="x">    &lt;li&gt;Item </span><span class="cp">${</span><span class="n">loop</span><span class="o">.</span><span class="n">index</span><span class="cp">}</span><span class="x">: </span><span class="cp">${</span><span class="n">a</span><span class="cp">}</span><span class="x">&lt;/li&gt;</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">&lt;/ul&gt;</span>
+</pre></div>
+</div>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.7.</span></p>
+<div class="section" id="iterations">
+<h3>Iterations<a class="headerlink" href="#iterations" title="Permalink to this headline">?</a></h3>
+<p>Regardless of the type of iterable you&#8217;re looping over, <tt class="docutils literal"><span class="pre">loop</span></tt> always tracks
+the 0-indexed iteration count (available at <tt class="docutils literal"><span class="pre">loop.index</span></tt>), its parity
+(through the <tt class="docutils literal"><span class="pre">loop.even</span></tt> and <tt class="docutils literal"><span class="pre">loop.odd</span></tt> bools), and <tt class="docutils literal"><span class="pre">loop.first</span></tt>, a bool
+indicating whether the loop is on its first iteration.  If your iterable
+provides a <tt class="docutils literal"><span class="pre">__len__</span></tt> method, <tt class="docutils literal"><span class="pre">loop</span></tt> also provides access to
+a count of iterations remaining at <tt class="docutils literal"><span class="pre">loop.reverse_index</span></tt> and <tt class="docutils literal"><span class="pre">loop.last</span></tt>,
+a bool indicating whether the loop is on its last iteration; accessing these
+without <tt class="docutils literal"><span class="pre">__len__</span></tt> will raise a <tt class="docutils literal"><span class="pre">TypeError</span></tt>.</p>
+</div>
+<div class="section" id="cycling">
+<h3>Cycling<a class="headerlink" href="#cycling" title="Permalink to this headline">?</a></h3>
+<p>Cycling is available regardless of whether the iterable you&#8217;re using provides
+a <tt class="docutils literal"><span class="pre">__len__</span></tt> method.  Prior to Mako 0.7, you might have generated a simple
+zebra striped list using <tt class="docutils literal"><span class="pre">enumerate</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;ul&gt;</span>
+<span class="cp">%</span> <span class="k">for</span> <span class="n">i</span><span class="p">,</span> <span class="n">item</span> <span class="ow">in</span> <span class="nb">enumerate</span><span class="p">((</span><span class="s">&#39;spam&#39;</span><span class="p">,</span> <span class="s">&#39;ham&#39;</span><span class="p">,</span> <span class="s">&#39;eggs&#39;</span><span class="p">)):</span><span class="x"></span>
+<span class="x">  &lt;li class=&quot;</span><span class="cp">${</span><span class="s">&#39;odd&#39;</span> <span class="k">if</span> <span class="n">i</span> <span class="o">%</span> <span class="mi">2</span> <span class="k">else</span> <span class="s">&#39;even&#39;</span><span class="cp">}</span><span class="x">&quot;&gt;</span><span class="cp">${</span><span class="n">item</span><span class="cp">}</span><span class="x">&lt;/li&gt;</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">&lt;/ul&gt;</span>
+</pre></div>
+</div>
+<p>With <tt class="docutils literal"><span class="pre">loop.cycle</span></tt>, you get the same results with cleaner code and less prep work:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;ul&gt;</span>
+<span class="cp">%</span> <span class="k">for</span> <span class="n">item</span> <span class="ow">in</span> <span class="p">(</span><span class="s">&#39;spam&#39;</span><span class="p">,</span> <span class="s">&#39;ham&#39;</span><span class="p">,</span> <span class="s">&#39;eggs&#39;</span><span class="p">):</span><span class="x"></span>
+<span class="x">  &lt;li class=&quot;</span><span class="cp">${</span><span class="n">loop</span><span class="o">.</span><span class="n">cycle</span><span class="p">(</span><span class="s">&#39;even&#39;</span><span class="p">,</span> <span class="s">&#39;odd&#39;</span><span class="p">)</span><span class="cp">}</span><span class="x">&quot;&gt;</span><span class="cp">${</span><span class="n">item</span><span class="cp">}</span><span class="x">&lt;/li&gt;</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">&lt;/ul&gt;</span>
+</pre></div>
+</div>
+<p>Both approaches produce output like the following:</p>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;ul&gt;</span>
+  <span class="nt">&lt;li</span> <span class="na">class=</span><span class="s">&quot;even&quot;</span><span class="nt">&gt;</span>spam<span class="nt">&lt;/li&gt;</span>
+  <span class="nt">&lt;li</span> <span class="na">class=</span><span class="s">&quot;odd&quot;</span><span class="nt">&gt;</span>ham<span class="nt">&lt;/li&gt;</span>
+  <span class="nt">&lt;li</span> <span class="na">class=</span><span class="s">&quot;even&quot;</span><span class="nt">&gt;</span>eggs<span class="nt">&lt;/li&gt;</span>
+<span class="nt">&lt;/ul&gt;</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="parent-loops">
+<h3>Parent Loops<a class="headerlink" href="#parent-loops" title="Permalink to this headline">?</a></h3>
+<p>Loop contexts can also be transparently nested, and the Mako runtime will do
+the right thing and manage the scope for you.  You can access the parent loop
+context through <tt class="docutils literal"><span class="pre">loop.parent</span></tt>.</p>
+<p>This allows you to reach all the way back up through the loop stack by
+chaining <tt class="docutils literal"><span class="pre">parent</span></tt> attribute accesses, i.e. <tt class="docutils literal"><span class="pre">loop.parent.parent....</span></tt> as
+long as the stack depth isn&#8217;t exceeded.  For example, you can use the parent
+loop to make a checkered table:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;table&gt;</span>
+<span class="cp">%</span> <span class="k">for</span> <span class="n">consonant</span> <span class="ow">in</span> <span class="s">&#39;pbj&#39;</span><span class="p">:</span><span class="x"></span>
+<span class="x">  &lt;tr&gt;</span>
+  <span class="cp">%</span> <span class="k">for</span> <span class="n">vowel</span> <span class="ow">in</span> <span class="s">&#39;iou&#39;</span><span class="p">:</span><span class="x"></span>
+<span class="x">    &lt;td class=&quot;</span><span class="cp">${</span><span class="s">&#39;black&#39;</span> <span class="k">if</span> <span class="p">(</span><span class="n">loop</span><span class="o">.</span><span class="n">parent</span><span class="o">.</span><span class="n">even</span> <span class="o">==</span> <span class="n">loop</span><span class="o">.</span><span class="n">even</span><span class="p">)</span> <span class="k">else</span> <span class="s">&#39;red&#39;</span><span class="cp">}</span><span class="x">&quot;&gt;</span>
+<span class="x">      </span><span class="cp">${</span><span class="n">consonant</span> <span class="o">+</span> <span class="n">vowel</span><span class="cp">}</span><span class="x">t</span>
+<span class="x">    &lt;/td&gt;</span>
+  <span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">  &lt;/tr&gt;</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">&lt;/table&gt;</span>
+</pre></div>
+</div>
+<div class="highlight-html"><div class="highlight"><pre><span class="nt">&lt;table&gt;</span>
+  <span class="nt">&lt;tr&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;black&quot;</span><span class="nt">&gt;</span>
+      pit
+    <span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;red&quot;</span><span class="nt">&gt;</span>
+      pot
+    <span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;black&quot;</span><span class="nt">&gt;</span>
+      put
+    <span class="nt">&lt;/td&gt;</span>
+  <span class="nt">&lt;/tr&gt;</span>
+  <span class="nt">&lt;tr&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;red&quot;</span><span class="nt">&gt;</span>
+      bit
+    <span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;black&quot;</span><span class="nt">&gt;</span>
+      bot
+    <span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;red&quot;</span><span class="nt">&gt;</span>
+      but
+    <span class="nt">&lt;/td&gt;</span>
+  <span class="nt">&lt;/tr&gt;</span>
+  <span class="nt">&lt;tr&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;black&quot;</span><span class="nt">&gt;</span>
+      jit
+    <span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;red&quot;</span><span class="nt">&gt;</span>
+      jot
+    <span class="nt">&lt;/td&gt;</span>
+    <span class="nt">&lt;td</span> <span class="na">class=</span><span class="s">&quot;black&quot;</span><span class="nt">&gt;</span>
+      jut
+    <span class="nt">&lt;/td&gt;</span>
+  <span class="nt">&lt;/tr&gt;</span>
+<span class="nt">&lt;/table&gt;</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="migrating-legacy-templates-that-use-the-word-loop">
+<span id="migrating-loop"></span><h3>Migrating Legacy Templates that Use the Word &#8220;loop&#8221;<a class="headerlink" href="#migrating-legacy-templates-that-use-the-word-loop" title="Permalink to this headline">?</a></h3>
+<p class="versionchanged">
+<span class="versionmodified">Changed in version 0.7: </span>The <tt class="docutils literal"><span class="pre">loop</span></tt> name is now <a class="reference internal" href="#reserved-names"><em>reserved</em></a> in Mako,
+which means a template that refers to a variable named <tt class="docutils literal"><span class="pre">loop</span></tt>
+won&#8217;t function correctly when used in Mako 0.7.</p>
+<p>To ease the transition for such systems, the feature can be disabled across the board for
+all templates, then re-enabled on a per-template basis for those templates which wish
+to make use of the new system.</p>
+<p>First, the <tt class="docutils literal"><span class="pre">enable_loop=False</span></tt> flag is passed to either the <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>
+or <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object in use:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">lookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/docs&#39;</span><span class="p">],</span> <span class="n">enable_loop</span><span class="o">=</span><span class="bp">False</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>or:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">template</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;some template&quot;</span><span class="p">,</span> <span class="n">enable_loop</span><span class="o">=</span><span class="bp">False</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>An individual template can make usage of the feature when <tt class="docutils literal"><span class="pre">enable_loop</span></tt> is set to
+<tt class="docutils literal"><span class="pre">False</span></tt> by switching it back on within the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">enable_loop=</span><span class="s">&quot;True&quot;</span><span class="cp">/&gt;</span>
+
+<span class="cp">%</span> <span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="n">collection</span><span class="p">:</span><span class="x"></span>
+<span class="x">    </span><span class="cp">${</span><span class="n">i</span><span class="cp">}</span><span class="x"> </span><span class="cp">${</span><span class="n">loop</span><span class="o">.</span><span class="n">index</span><span class="cp">}</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Using the above scheme, it&#8217;s safe to pass the name <tt class="docutils literal"><span class="pre">loop</span></tt> to the <a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">Template.render()</span></tt></a>
+method as well as to freely make usage of a variable named <tt class="docutils literal"><span class="pre">loop</span></tt> within a template, provided
+the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag doesn&#8217;t override it.  New templates that want to use the <tt class="docutils literal"><span class="pre">loop</span></tt> context
+can then set up <tt class="docutils literal"><span class="pre">&lt;%page</span> <span class="pre">enable_loop=&quot;True&quot;/&gt;</span></tt> to use the new feature without affecting
+old templates.</p>
+</div>
+</div>
+<div class="section" id="all-the-built-in-names">
+<h2>All the Built-in Names<a class="headerlink" href="#all-the-built-in-names" title="Permalink to this headline">?</a></h2>
+<p>A one-stop shop for all the names Mako defines. Most of these
+names are instances of <a class="reference internal" href="namespaces.html#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">Namespace</span></tt></a>, which are described
+in the next section, <a class="reference internal" href="namespaces.html"><em>Namespaces</em></a>. Also, most of
+these names other than <tt class="docutils literal"><span class="pre">context</span></tt>, <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt>, and <tt class="docutils literal"><span class="pre">loop</span></tt> are
+also present <em>within</em> the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> itself.   The names
+<tt class="docutils literal"><span class="pre">context</span></tt>, <tt class="docutils literal"><span class="pre">loop</span></tt> and <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> themselves can&#8217;t be passed
+to the context and can&#8217;t be substituted &#8211; see the section <a class="reference internal" href="#reserved-names"><em>Reserved Names</em></a>.</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">context</span></tt> - this is the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object, introduced
+at <a class="reference internal" href="#context"><em>Context</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">local</span></tt> - the namespace of the current template, described
+in <a class="reference internal" href="namespaces.html#namespaces-builtin"><em>Built-in Namespaces</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">self</span></tt> - the namespace of the topmost template in an
+inheritance chain (if any, otherwise the same as <tt class="docutils literal"><span class="pre">local</span></tt>),
+mostly described in <a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">parent</span></tt> - the namespace of the parent template in an
+inheritance chain (otherwise undefined); see
+<a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">next</span></tt> - the namespace of the next template in an
+inheritance chain (otherwise undefined); see
+<a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">caller</span></tt> - a &#8220;mini&#8221; namespace created when using the
+<tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt> tag to define a &#8220;def call with content&#8221;; described
+in <a class="reference internal" href="defs.html#defs-with-content"><em>Calling a Def with Embedded Content and/or Other Defs</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">loop</span></tt> - this provides access to <a class="reference internal" href="#mako.runtime.LoopContext" title="mako.runtime.LoopContext"><tt class="xref py py-class docutils literal"><span class="pre">LoopContext</span></tt></a> objects when
+they are requested within <tt class="docutils literal"><span class="pre">%</span> <span class="pre">for</span></tt> loops, introduced at <a class="reference internal" href="#loop-context"><em>The Loop Context</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">capture</span></tt> - a function that calls a given def and captures
+its resulting content into a string, which is returned. Usage
+is described in <a class="reference internal" href="filtering.html"><em>Filtering and Buffering</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> - a global singleton that is applied to all
+otherwise uninitialized template variables that were not
+located within the <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> when rendering began,
+unless the <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> flag <tt class="docutils literal"><span class="pre">strict_undefined</span></tt>
+is set to <tt class="docutils literal"><span class="pre">True</span></tt>. <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> is
+an instance of <a class="reference internal" href="#mako.runtime.Undefined" title="mako.runtime.Undefined"><tt class="xref py py-class docutils literal"><span class="pre">Undefined</span></tt></a>, and raises an
+exception when its <tt class="docutils literal"><span class="pre">__str__()</span></tt> method is called.</li>
+<li><tt class="docutils literal"><span class="pre">pageargs</span></tt> - this is a dictionary which is present in a
+template which does not define any <tt class="docutils literal"><span class="pre">**kwargs</span></tt> section in its
+<tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag. All keyword arguments sent to the <tt class="docutils literal"><span class="pre">body()</span></tt>
+function of a template (when used via namespaces) go here by
+default unless otherwise defined as a page argument. If this
+makes no sense, it shouldn&#8217;t; read the section
+<a class="reference internal" href="namespaces.html#namespaces-body"><em>The body() Method</em></a>.</li>
+</ul>
+<div class="section" id="reserved-names">
+<span id="id2"></span><h3>Reserved Names<a class="headerlink" href="#reserved-names" title="Permalink to this headline">?</a></h3>
+<p>Mako has a few names that are considered to be &#8220;reserved&#8221; and can&#8217;t be used
+as variable names.</p>
+<p class="versionchanged">
+<span class="versionmodified">Changed in version 0.7: </span>Mako raises an error if these words are found passed to the template
+as context arguments, whereas in previous versions they&#8217;d be silently
+ignored or lead to other error messages.</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">context</span></tt> - see <a class="reference internal" href="#context"><em>Context</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> - see <a class="reference internal" href="#context-vars"><em>Context Variables</em></a>.</li>
+<li><tt class="docutils literal"><span class="pre">loop</span></tt> - see <a class="reference internal" href="#loop-context"><em>The Loop Context</em></a>.  Note this can be disabled for legacy templates
+via the <tt class="docutils literal"><span class="pre">enable_loop=False</span></tt> argument; see <a class="reference internal" href="#migrating-loop"><em>Migrating Legacy Templates that Use the Word &#8220;loop&#8221;</em></a>.</li>
+</ul>
+</div>
+</div>
+<div class="section" id="api-reference">
+<h2>API Reference<a class="headerlink" href="#api-reference" title="Permalink to this headline">?</a></h2>
+<dl class="class">
+<dt id="mako.runtime.Context">
+<em class="property">class </em><tt class="descclassname">mako.runtime.</tt><tt class="descname">Context</tt><big>(</big><em>buffer</em>, <em>**data</em><big>)</big><a class="headerlink" href="#mako.runtime.Context" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Provides runtime namespace, output buffer, and various
+callstacks for templates.</p>
+<p>See <a class="reference internal" href="#"><em>The Mako Runtime Environment</em></a> for detail on the usage of
+<a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+<dl class="method">
+<dt id="mako.runtime.Context.get">
+<tt class="descname">get</tt><big>(</big><em>key</em>, <em>default=None</em><big>)</big><a class="headerlink" href="#mako.runtime.Context.get" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a value from this <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Context.keys">
+<tt class="descname">keys</tt><big>(</big><big>)</big><a class="headerlink" href="#mako.runtime.Context.keys" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a list of all names established in this <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Context.kwargs">
+<tt class="descname">kwargs</tt><a class="headerlink" href="#mako.runtime.Context.kwargs" title="Permalink to this definition">?</a></dt>
+<dd><p>Return the dictionary of keyword arguments associated with this
+<a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Context.locals_">
+<tt class="descname">locals_</tt><big>(</big><em>d</em><big>)</big><a class="headerlink" href="#mako.runtime.Context.locals_" title="Permalink to this definition">?</a></dt>
+<dd><p>Create a new <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> with a copy of this
+<a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>&#8216;s current state, updated with the given dictionary.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.runtime.Context.lookup">
+<tt class="descname">lookup</tt><a class="headerlink" href="#mako.runtime.Context.lookup" title="Permalink to this definition">?</a></dt>
+<dd><p>Return the <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> associated
+with this <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Context.pop_caller">
+<tt class="descname">pop_caller</tt><big>(</big><big>)</big><a class="headerlink" href="#mako.runtime.Context.pop_caller" title="Permalink to this definition">?</a></dt>
+<dd><p>Pop a <tt class="docutils literal"><span class="pre">caller</span></tt> callable onto the callstack for this
+<a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Context.push_caller">
+<tt class="descname">push_caller</tt><big>(</big><em>caller</em><big>)</big><a class="headerlink" href="#mako.runtime.Context.push_caller" title="Permalink to this definition">?</a></dt>
+<dd><p>Push a <tt class="docutils literal"><span class="pre">caller</span></tt> callable onto the callstack for
+this <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Context.write">
+<tt class="descname">write</tt><big>(</big><em>string</em><big>)</big><a class="headerlink" href="#mako.runtime.Context.write" title="Permalink to this definition">?</a></dt>
+<dd><p>Write a string to this <a class="reference internal" href="#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object&#8217;s
+underlying output buffer.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.runtime.Context.writer">
+<tt class="descname">writer</tt><big>(</big><big>)</big><a class="headerlink" href="#mako.runtime.Context.writer" title="Permalink to this definition">?</a></dt>
+<dd><p>Return the current writer function.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.runtime.LoopContext">
+<em class="property">class </em><tt class="descclassname">mako.runtime.</tt><tt class="descname">LoopContext</tt><big>(</big><em>iterable</em><big>)</big><a class="headerlink" href="#mako.runtime.LoopContext" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>A magic loop variable.
+Automatically accessible in any <tt class="docutils literal"><span class="pre">%</span> <span class="pre">for</span></tt> block.</p>
+<p>See the section <a class="reference internal" href="#loop-context"><em>The Loop Context</em></a> for usage
+notes.</p>
+<dl class="docutils">
+<dt><tt class="xref py py-attr docutils literal"><span class="pre">parent</span></tt> -&gt; <a class="reference internal" href="#mako.runtime.LoopContext" title="mako.runtime.LoopContext"><tt class="xref py py-class docutils literal"><span class="pre">LoopContext</span></tt></a> or <tt class="docutils literal"><span class="pre">None</span></tt></dt>
+<dd>The parent loop, if one exists.</dd>
+<dt><tt class="xref py py-attr docutils literal"><span class="pre">index</span></tt> -&gt; <cite>int</cite></dt>
+<dd>The 0-based iteration count.</dd>
+<dt><tt class="xref py py-attr docutils literal"><span class="pre">reverse_index</span></tt> -&gt; <cite>int</cite></dt>
+<dd>The number of iterations remaining.</dd>
+<dt><tt class="xref py py-attr docutils literal"><span class="pre">first</span></tt> -&gt; <cite>bool</cite></dt>
+<dd><tt class="docutils literal"><span class="pre">True</span></tt> on the first iteration, <tt class="docutils literal"><span class="pre">False</span></tt> otherwise.</dd>
+<dt><tt class="xref py py-attr docutils literal"><span class="pre">last</span></tt> -&gt; <cite>bool</cite></dt>
+<dd><tt class="docutils literal"><span class="pre">True</span></tt> on the last iteration, <tt class="docutils literal"><span class="pre">False</span></tt> otherwise.</dd>
+<dt><tt class="xref py py-attr docutils literal"><span class="pre">even</span></tt> -&gt; <cite>bool</cite></dt>
+<dd><tt class="docutils literal"><span class="pre">True</span></tt> when <tt class="docutils literal"><span class="pre">index</span></tt> is even.</dd>
+<dt><tt class="xref py py-attr docutils literal"><span class="pre">odd</span></tt> -&gt; <cite>bool</cite></dt>
+<dd><tt class="docutils literal"><span class="pre">True</span></tt> when <tt class="docutils literal"><span class="pre">index</span></tt> is odd.</dd>
+</dl>
+<dl class="method">
+<dt id="mako.runtime.LoopContext.cycle">
+<tt class="descname">cycle</tt><big>(</big><em>*values</em><big>)</big><a class="headerlink" href="#mako.runtime.LoopContext.cycle" title="Permalink to this definition">?</a></dt>
+<dd><p>Cycle through values as the loop progresses.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.runtime.Undefined">
+<em class="property">class </em><tt class="descclassname">mako.runtime.</tt><tt class="descname">Undefined</tt><a class="headerlink" href="#mako.runtime.Undefined" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Represents an undefined value in a template.</p>
+<p>All template modules have a constant value
+<tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> present which is an instance of this
+object.</p>
+</dd></dl>
+
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="defs.html" title="previous chapter">Defs and Blocks</a>
+        Next:
+        <a href="namespaces.html" title="next chapter">Namespaces</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/search.html b/lib/mako-0.7.2/doc/search.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/search.html
@@ -0,0 +1,160 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+    Search
+ &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+        <script type="text/javascript" src="_static/searchtools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="#" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="#" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+    Search
+ 
+
+        <h2>
+            
+    Search
+
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+
+    <div id="docs-body" class="" >
+        
+
+
+
+
+
+<div id="searchform">
+<h3>Enter Search Terms:</h3>
+<form class="search" action="#" method="get">
+  <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+</div>
+
+<div id="search-results"></div>
+
+
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+    
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+    <script type="text/javascript" src="searchindex.js"></script>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/searchindex.js b/lib/mako-0.7.2/doc/searchindex.js
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/searchindex.js
@@ -0,0 +1,1 @@
+Search.setIndex({objects:{RichTraceback:{records:[8,0,1,""],reverse_traceback:[8,0,1,""],source:[8,0,1,""],lineno:[8,0,1,""],reverse_records:[8,0,1,""],error:[8,0,1,""],message:[8,0,1,""]},"mako.exceptions":{text_error_template:[8,3,1,""],RichTraceback:[8,2,1,""],html_error_template:[8,3,1,""]},"mako.lookup.TemplateLookup":{put_template:[8,1,1,""],get_template:[8,1,1,""],put_string:[8,1,1,""],adjust_uri:[8,1,1,""],filename_to_uri:[8,1,1,""]},"mako.runtime.Context":{write:[9,1,1,""],get:[9,1,1,""],keys:[9,1,1,""],push_caller:[9,1,1,""],writer:[9,1,1,""],pop_caller:[9,1,1,""],locals_:[9,1,1,""],lookup:[9,0,1,""],kwargs:[9,0,1,""]},"mako.lookup.TemplateCollection":{get_template:[8,1,1,""],adjust_uri:[8,1,1,""],has_template:[8,1,1,""],filename_to_uri:[8,1,1,""]},"mako.runtime.ModuleNamespace":{filename:[3,0,1,""]},"mako.cache.CacheImpl":{invalidate:[6,1,1,""],get_or_create:[6,1,1,""],pass_context:[6,0,1,""],set:[6,1,1,""],get:[6,1,1,""]},"mako.runtime.LoopContext":{cycle:[9,1,1,""]},"mako.cache":{register_plugin:[6,3,1,""],CacheImpl:[6,2,1,""],Cache:[6,2,1,""]},"mako.runtime.Namespace":{include_file:[3,1,1,""],template:[3,0,1,""],get_cached:[3,1,1,""],get_namespace:[3,1,1,""],cache:[3,0,1,""],uri:[3,0,1,""],module:[3,0,1,""],filename:[3,0,1,""],context:[3,0,1,""],get_template:[3,1,1,""],attr:[3,0,1,""]},"mako.lookup":{TemplateLookup:[8,2,1,""],TemplateCollection:[8,2,1,""]},"mako.runtime.TemplateNamespace":{uri:[3,0,1,""],module:[3,0,1,""],filename:[3,0,1,""]},"mako.runtime":{capture:[3,3,1,""],Undefined:[9,2,1,""],Namespace:[3,2,1,""],ModuleNamespace:[3,2,1,""],supports_caller:[3,3,1,""],Context:[9,2,1,""],LoopContext:[9,2,1,""],TemplateNamespace:[3,2,1,""]},"mako.ext.beaker_cache":{BeakerCacheImpl:[6,2,1,""]},"mako.cache.Cache":{invalidate:[6,1,1,""],set:[6,1,1,""],invalidate_body:[6,1,1,""],get:[6,1,1,""],invalidate_closure:[6,1,1,""],invalidate_def:[6,1,1,""],starttime:[6,0,1,""],put:[6,1,1,""],get_or_create:[6,1,1,""],id:[6,0,1,""],impl:[6,0,1,""]},"mako.template.Template":{render_context:[8,1,1,""],code:[8,0,1,""],render:[8,1,1,""],source:[8,0,1,""],render_unicode:[8,1,1,""],get_def:[8,1,1,""]},"mako.template":{DefTemplate:[8,2,1,""],Template:[8,2,1,""]}},terms:{interchang:4,four:[3,5],prefix:[6,9],dirnam:8,"_my_cache_work":6,typeerror:9,swap:6,under:[8,6,7],everi:[3,5],long_term:6,jack:8,voix:7,appar:[2,3],vast:7,pagearg:[0,9,3,7],get_templ:[8,6,3,7],buildtabl:0,cache_kei:6,direct:[0,8,6,3,5],batch:2,outputpath:8,second:[0,6,2],even:[5,9,7,4],"new":[0,8,9,6,4],ever:[3,7],metadata:5,widget:0,behavior:[8,2,9],here:[2,7,4,5,6,3,8,9],met:0,path:[8,6,3],interpret:[0,8,7],tagfilt:2,portabl:0,txt:[8,7,5],describ:[0,2,3,4,5,7,8,9],would:[0,2,4,6,7,8,9],call:[0,1,2,3,4,5,6,7,8,9],recommend:3,type:[0,5,6,7,8,9],until:8,relat:[8,6,7],notic:0,pkg_resourc:6,must:[0,8,6,3,7],join:7,setup:[8,6,4],work:[0,2,7,4,6,3,8,9],root:8,overrid:[7,4,6,3,8,9],give:[0,3],indic:[1,9,5],somefil:3,do_something_speci:6,want:[0,2,7,4,5,3,6,9],end:[5,2,4],quot:7,ordinari:3,output_encod:[8,7],how:[0,5,6,3,8,9],cheetah:7,updat:[8,9],module_filenam:8,recogn:[3,4],lai:0,after:[8,6,2,3,9],befor:[2,7,4,5,6,3,8],attempt:7,third:6,recompil:[8,6],maintain:[8,6],environ:[8,1,2,9,5],exclus:8,order:[8,6,5,7,4],origin:[2,7,6,3,8,9],somedata:0,over:[2,3,9],fall:6,becaus:[0,2,7,4],demarc:0,affect:9,flexibl:[5,2,4],myfil:5,streamlin:4,fix:[8,6,3],"__class__":8,better:[6,9],persist:6,easier:6,them:[0,2,4,3,8,9],thei:[0,2,4,5,7,8,9],safe:[9,7],default_filt:[8,2,7],jinja2:[0,5],html_error_templ:8,getvalu:[8,2],myghti:7,timeout:6,each:[0,4,5,6,7,8,9],side:[0,2,5],mean:[0,2,7,5,6,3,8,9],enorm:0,cacheimpl:[8,6],extract:8,expression_filt:2,unbound:8,goe:5,newli:6,content:[0,1,2,4,5,6,3,8,9],sane:0,mypackag:2,multilin:5,bottommost:4,free:3,standard:[6,7],argument:[0,1,2,3,5,6,7,8,9],traceback:8,moment:8,filter:[0,1,2,5,7,8,9],heck:[8,1,7],isn:9,text_error_templ:8,onto:[9,5],user:[8,6,9,7,5],rang:[0,5],render:[0,1,2,3,4,5,6,7,8,9],restrict:[0,4],unlik:7,alreadi:[8,9,4],wrapper:2,wasn:[9,4],agre:4,primari:8,lister:0,top:[0,2,4,3,6,9],sometim:[5,4],stack:[8,2,9],cache_region:6,too:[2,4],similarli:[0,7],john:0,consol:7,conson:9,namespac:[0,1,2,4,5,6,3,8,9],tool:6,setuptool:[8,6],somewhat:[0,2],some_namespac:3,myfilt:2,target:[0,2],keyword:[0,7,4,5,3,8,9],provid:[0,2,4,5,6,3,8,9],expr:[0,3],project:8,matter:4,minut:6,thu:8,mini:9,fashion:6,close:[0,8,3,5],runner:8,modern:6,htmlentityreplac:8,raw:[8,7],manner:2,templatelookup:[1,2,7,6,3,8,9],minu:6,latter:7,shall:4,usernam:[0,5],object:[0,2,3,4,5,6,7,8,9],regular:[0,1,2,3,4,5,7,8],phase:8,invalidate_closur:6,simplic:2,paradigm:4,don:[0,6,9,7,4],doc:[0,8,9,7,5],flow:5,doe:[0,7,4,5,3,9],declar:[0,1,2,4,5,3,8],tracelin:8,notion:9,opposit:4,"__str__":9,syntax:[0,1,2,8,5],get_resourc:5,involv:4,absolut:[0,7],layout:[0,8,4],acquir:[6,7],configur:[8,6,3,4],stop:[9,5],report:8,bar:[0,2,5,3,8,9],emb:[3,7,5],reload:8,short_term:6,black:9,elimin:7,result:[0,8,2,9,5],respons:[6,9,4],basemost:4,awar:[8,9,7],databas:0,urllib:2,implicit:[6,9],simplest:5,pybabel:8,awai:4,approach:[9,7,4],attribut:[0,1,2,4,5,6,3,8,9],preprocessor:8,easi:[2,9],howev:[0,6,3,7,4],against:[8,5],facet:9,logic:2,col:0,dogpil:6,guid:8,assum:[8,7],templatenamespac:3,three:[9,5],been:[8,6,2,3,7],accumul:5,much:[0,5,7,4],basic:[0,1,7,5,3,8],"__len__":9,quickli:7,disable_unicod:[8,2,7],ani:[0,2,3,4,5,6,7,8,9],multithread:6,lift:4,ident:8,servic:[6,7,5],properti:[8,3],calcul:8,printabl:7,kwarg:[8,6,9,3],somekei:6,sever:3,mako:[0,1,2,3,4,5,6,7,8,9],quand:7,perform:[8,2,3,7],make:[0,2,3,4,5,6,7,8,9],transpar:9,push_cal:9,complet:[8,3,4],rais:[0,8,9,7],caller_stack:[3,7],scenario:[0,8,9,3],get_cach:3,hypothet:4,inherit:[0,1,4,5,6,3,8,9],thi:[0,2,3,4,5,6,7,8,9],endif:[0,9,5],programm:7,everyth:9,pagecontrol:0,left:[8,2],identifi:[8,6],just:[0,2,3,4,5,7,8,9],invalidate_bodi:6,unbuff:2,yet:[6,3],languag:[0,7,5],previous:[8,3],enable_loop:[8,9],pygmentplugin:8,ham:9,ell:7,had:7,input_encod:[8,7],board:9,els:[8,6,9,5],gave:8,opt:[8,6],applic:[8,2,9,5],mayb:4,background:7,specif:[0,2,4,5,6,3,8,9],arbitrari:[6,5],manual:8,babelplugin:8,underli:[0,2,4,5,6,3,8,9],right:[0,2,9,7,5],old:9,deal:[9,7,5],excerpt:8,maxim:[6,7],percentag:8,intern:[8,6,2,7,9],subclass:[0,8,6],track:9,condit:[0,5,4],foo:[0,2,7,5,3,8,9],plu:8,bold:2,relationship:3,post:[0,8],"super":[6,3,7,4],plug:6,slightli:[3,7],surround:5,produc:[0,1,2,4,5,7,8,9],rudiment:[8,6],encod:[8,1,2,7],down:[6,7],lieu:8,wrap:[0,1,5,4],storag:7,accordingli:8,wai:[0,1,2,3,4,5,6,7,8,9],support:[0,7,5,6,3,8],transform:2,why:9,avail:[0,2,3,4,5,6,7,8,9],overhead:7,head:[0,8,4],form:[0,3,5],offer:[7,5],forc:8,get_def:[0,8,2],taken:[8,6,3],"true":[0,2,7,5,6,3,8,9],attr:[3,4],tell:5,emit:5,trim:[2,5],featur:[5,9,4],classic:[3,5],petit:7,"abstract":8,exist:[0,7,5,6,3,8,9],check:[8,5,9,7,4],when:[0,2,3,4,5,6,7,8,9],entrypoint:6,intend:[2,3],stringio:[8,9,7],intent:2,consid:[8,9],receiv:[0,2,3,5],faster:7,cache_en:[8,6],htdoc:8,ignor:[9,5],time:[0,1,2,4,6,8],push:9,serious:4,backward:6,concept:[0,8,5],chain:[5,9,3,4],skip:8,consum:[6,5],signific:[9,5],subcompon:0,row:0,decid:[9,5],middl:[5,2,4],depend:[8,5],mainlayout:[0,4],intermedi:4,decis:[9,7,4],sourc:[8,7,5],string:[2,7,5,6,3,8,9],word:[8,9,4],level:[0,1,2,3,4,5,6,7,8,9],did:4,iter:[0,9],item:[0,9,5],mycomp:6,quick:[0,5],lever:7,div:[0,8,3,4],dir:[8,6],slower:7,sign:5,namepacenam:0,appear:[2,9,5],current:[0,4,5,3,8,9],deriv:[6,2,7],gener:[0,2,3,4,5,6,7,8,9],address:[8,6],along:[6,3],toolbar:[5,4],bot:9,behav:0,commonli:[6,7,4],semant:[0,4],regardless:[0,9,4],extra:[5,4],modul:[0,1,2,3,4,5,6,7,8,9],prefer:7,render_bodi:[8,2,7,9],fake:5,marker:5,instal:6,callstack:9,memori:[8,6,5],sake:2,perl:5,live:6,handler:8,scope:[0,4,5,3,6,9],prep:9,chapter:[0,1,2,4,7,8],afford:8,accept:[2,7,5,6,3,8],render_:9,myexpress:2,mylookup:[8,7],fly:7,graphic:7,uniqu:[6,9,4],whatev:[8,9,3,7],purpos:[8,7],stream:[8,9,3,7,5],backslash:5,occur:[0,8,6],alwai:[0,9,7,4],differenti:9,multipl:[0,1,6,7,4],get:[2,7,4,5,6,3,8,9],modulenam:6,write:[2,7,5,6,3,8,9],pure:[3,7,5],cache_xyz:6,somevalu:6,map:8,product:8,usabl:0,mai:[2,7,5,6,3,8,9],data:[0,7,6,3,8,9],goal:2,practic:4,explicit:[0,7,5,3,6,9],format_except:8,inform:[8,3,7,5],"switch":9,preced:[8,5,3,7,4],combin:9,callabl:[0,2,5,6,3,8,9],extractor:8,still:[0,7,4],mainli:3,dynam:5,entiti:2,conjunct:8,group:[6,3],platform:8,jit:9,push_buff:2,main:[0,2,7,4,3,8,9],non:[8,9,7,5],recal:4,francoi:8,contriv:8,supersed:6,initi:0,underneath:6,therebi:3,now:[5,9,7,4],pop_fram:7,term:6,name:[0,1,2,3,4,5,6,7,8,9],drop:5,separ:[0,6,2,4],"__str":7,compil:[8,6,9,5],replac:[8,6,2,7],individu:[0,8,9,6],arg3:3,arg4:3,continu:[8,7,5],zebra:9,happen:[9,3,7],accomplish:[8,6],space:[0,6,5],intermix:4,correct:3,earlier:[6,7],migrat:[8,9],"byte":[8,7],care:[6,9,3,7],thing:[0,5,9,7,4],place:[0,8,5,6,4],think:9,first:[2,7,4,5,3,6,9],oper:[0,2,7,5,3,8,9],suspend:5,directli:[0,2,5,6,3,8],onc:[0,5,9,4],arrai:2,yourself:[8,7],walkthrough:0,textual:[8,2,4],custom:[0,2,7,5,6,3,8],open:[5,7,4],size:8,given:[0,2,4,6,3,8,9],silent:9,convent:0,caught:8,checker:9,necessarili:9,white:4,conveni:6,programat:8,copi:[9,3],specifi:[1,2,4,6,7,8,9],enclos:[0,9],mostli:[8,6,9,3],than:[2,4,5,7,6,9],serv:[8,7],"__m_local":7,were:[9,3,7],posit:3,seri:[8,6,7],pre:8,sai:[0,1,4,7,8,9],put_str:8,anywher:[0,5],deliv:[2,3],notimplementederror:8,techniqu:9,pop_cal:9,note:[0,2,7,4,6,3,8,9],take:[0,2,7,4,5,3],blunt:6,sure:5,trace:8,normal:[0,2,5,7,8,9],buffer:[1,2,7,5,3,8,9],subdef:0,synonym:[6,3],later:[6,5],highlight:8,templatenam:8,runtim:[1,2,4,5,6,3,8,9],preambl:8,shop:9,imaginez:7,delta:3,permiss:8,hack:9,xml:[8,2,5],onli:[0,2,4,5,6,7,8,9],explicitli:[8,9,3,7],state:[0,9,7],dict:7,overwritten:6,variou:[2,7,5,3,8,9],distinctli:4,dyn:3,tailor:0,requir:[0,6,3,7,5],where:[0,2,3,4,5,6,7,8,9],summari:5,wonder:5,nestabl:0,enumer:9,between:[0,9],"import":[0,2,7,5,6,3,8,9],across:[6,9],parent:[0,1,4,6,3,8,9],comp:3,cycl:9,my_dogpile_region:6,uncondition:7,come:[0,4,5,6,7,8],cache_url:[8,6],region:6,mani:[9,5],pow:5,pot:9,inspir:5,pop:[6,2,9],colon:[6,5],encoding_error:[8,7],ultim:[3,4],dessin:7,markedli:7,resolut:[8,3],those:[0,5,6,3,8,9],"case":[0,2,3,4,5,6,7,8,9],mouton:7,invok:[0,8,5,4],cannot:[0,8,7],invoc:4,advantag:[8,3,7,4],stdout:8,threadsaf:6,destin:8,shutil:8,ascii:7,"__init__":6,develop:7,author:9,same:[0,7,5,6,3,8,9],binari:7,epoch:6,html:[0,2,3,4,5,6,7,8],document:[8,6,5,7,4],breakdown:4,finish:4,utf8:[2,7],nest:[0,1,2,4,6,9],capabl:[8,6],vowel:9,improv:[8,7,5],extern:[0,6,4],moder:8,facad:6,without:[6,9,3,4],model:0,roughli:5,execut:[0,2,4,5,3,6,9],rest:[6,5,4],aspect:[7,5],speed:[2,7],versu:[8,3],except:[0,1,2,5,6,8,9],littl:[0,8,9],treatment:7,role:3,earli:[1,5],ream:7,around:[8,2,9],read:[9,7,5],moi:7,world:[0,7,5,3,8,9],use_pag:2,serve_templ:8,integ:[0,6,7],server:[8,6,5],either:[4,5,6,7,8,9],output:[0,1,2,3,4,5,7,8,9],manag:[6,9],somefunct:3,definit:[0,2,3,4],disait:7,inject:8,refer:[0,1,2,3,4,5,6,7,8,9],some_templ:8,power:5,garbag:6,pass_context:6,starttim:6,found:[0,9,5],"__name__":[8,6],"throw":[6,9],central:[0,2,9,5],act:[8,9],mytempl:[8,6,7],routin:8,overrod:4,strip:2,your:[0,2,4,5,3,9],msgstr:8,fast:8,her:7,area:[0,5,9,7,4],aren:[0,7],start:[0,6],compliant:7,interfac:6,lot:5,strictli:7,programmat:[0,1,2,7,6,9],tupl:8,regard:7,jut:9,illus:7,pull:[0,8,9,3],possibl:[0,6,2,9],"default":[0,2,3,4,5,6,7,8,9],unusu:8,embed:[0,8,9,3,5],creat:[0,7,5,6,3,8,9],multibyt:8,certain:[8,2,7],somedef:[0,6,2,3,5],intro:0,decreas:3,file:[0,1,3,4,5,6,7,8,9],again:[0,9],gettext:8,field:8,valid:5,you:[0,2,3,4,5,6,7,8,9],symbol:5,reduc:2,directori:[8,6,2,7,9],descript:8,mimic:8,potenti:4,escap:[0,1,2,7,5],represent:[8,5],all:[0,1,2,3,4,5,6,7,8,9],illustr:[8,2,4],scalar:3,abil:[8,6,7,5],follow:[0,4,5,3,8,9],program:[7,5],objnam:6,introduc:[0,5,9,3,4],sound:[5,4],"pla\u00eet":7,liter:[8,3,7],fals:[8,6,9],util:8,mechan:[6,5,4],failur:9,veri:[0,8,6,4],condition:3,list:[0,2,4,5,6,7,8,9],adjust:[8,3,5],small:8,pbj:9,aptli:8,design:2,nsname:5,pass:[0,7,4,5,6,3,8,9],further:5,what:[0,1,3,4,5,7,8,9],sub:[0,5],section:[0,4,6,3,8,9],advanc:8,abl:9,brief:8,version:[0,2,7,4,5,3,9],deepli:0,method:[0,1,2,3,4,5,6,7,8,9],contrast:[0,7,4],full:[8,5],themselv:[0,4,5,3,6,9],shouldn:9,inher:2,modifi:[0,8,7,4],valu:[0,2,7,5,6,3,8,9],search:[8,1],memcach:6,prior:[2,7,9],real:[8,5],render_mydef:9,via:[0,7,4,6,3,8,9],transit:9,ask:9,href:0,pythagorean:5,establish:[8,9],select:[7,4],mylib:5,distinct:8,regist:6,two:[0,2,3,4,5,6,7,8,9],push_fram:7,minor:8,more:[0,2,3,4,5,6,7,8,9],desir:[8,3,7],flag:[2,7,5,6,3,8,9],stick:[0,9,7,5],particular:[8,6,9,3,4],known:[0,3],cach:[0,1,2,5,6,3,8,9],none:[8,6,2,3,9],remain:[0,9],learn:7,def:[0,1,2,3,4,5,6,7,8,9],someobject:3,userbas:7,share:[0,9],templat:[0,1,2,3,4,5,6,7,8,9],sharp:0,wsgiutil:8,cours:9,newlin:[1,5],rather:9,anoth:[0,7,5,3,8,9],render_unicod:[8,7],simpl:[0,8,9,6,5],css:8,regener:8,resourc:[8,4],referenc:[0,9,3],variant:5,catalog:8,associ:[6,9],"short":6,footer:[5,4],confus:7,caus:[8,2,3,9],egg:9,help:[8,6,7],singleton:9,through:[8,9,7],paramet:[8,6,3,7],style:[0,7],might:[9,3,5],wouldn:[3,5],good:6,"return":[0,1,2,3,5,6,7,8,9],timestamp:6,framework:[8,1],ninja:4,achiev:[0,9,4],fulli:[8,2],unicod:[8,1,2,7],locals_:9,hard:[5,9,7,4],idea:[5,4],procedur:6,realli:7,expect:[0,5,7,4],beyond:[0,6],orient:[0,4],sometempl:6,lineno:8,print:[0,8,7],proxi:3,ast:7,guess:7,reason:[9,7],base:[1,2,4,5,6,3,8,9],put:[6,9,4],basi:[6,9],thrown:[8,6],thread:6,perhap:[0,9,5],assign:[0,8,9,5],major:[9,7],number:[0,8,9,6,5],done:[8,7],defnam:[0,5],blank:9,miss:[8,2,9],differ:[0,4,6,3,8,9],interact:[3,7],least:[8,3],calling_uri:3,statement:[0,8,5],natur:2,scheme:[0,8,9,7],store:[8,6,2,7,9],option:[7,5,6,3,8,9],modulenamespac:3,part:[6,9,3,4],pars:[8,7,5],kind:[2,4,5,6,7,8,9],whenev:[8,7,4],remot:[0,3],remov:[3,7],str:[8,2,7,9],arrang:5,toward:[0,4],grei:4,cleaner:9,mytmpl:8,get_namespac:3,comp2:3,packag:[6,5],comp1:3,expir:6,deftempl:[0,8],jour:7,built:[0,1,2,3,4,5,7,8,9],equival:[0,2,7,5,3,6],self:[0,4,5,6,3,8,9],undeclar:8,also:[0,2,3,4,5,6,7,8,9],build:[0,4],distribut:8,filesystem:[8,6,3],reach:[8,9],disgard:7,most:[0,7,4,5,6,3,8,9],plai:[3,7],jsp:5,ext:[8,6],fastencodingbuff:7,wsgi:8,particularli:3,find:[8,9,5],mydef:0,coerc:7,pretti:[7,5],writer:9,hit:[2,7],"__file__":3,express:[0,1,2,3,4,5,7,8,9],nativ:7,common:[8,1,7],set:[2,7,5,6,3,8,9],genshi:5,dump:[3,7],see:[0,7,5,6,3,8,9],dumb:7,arg:[0,2,5,6,3,8],reserv:9,whatsoev:7,someth:[0,2,7],topmost:[5,9,3,4],won:[8,9,4],altern:[8,9,7],signatur:[0,3],syntact:5,numer:5,popul:6,both:[0,2,4,7,8,9],last:[8,9],put_templ:8,alor:7,context:[0,1,2,3,5,6,7,8,9],whole:[0,2,3,4],load:[8,3,5],simpli:[2,4],bell:7,arbitrarili:0,header:[0,8,5,6,4],uniniti:9,param:5,suppli:[3,5],frobnizzl:5,throughout:3,backend:[6,3],empti:[2,7],accessor:[6,9,3,4],strategi:6,error_handl:8,imag:[8,7],great:[3,7],understand:7,func:3,xa9:7,look:[0,7,4,6,3,8,9],get_or_cr:6,straight:[8,7],histor:6,"while":[0,8,5,2,4],abov:[0,2,3,4,5,6,7,8,9],error:[0,8,9,7],anonym:[0,6,5],everyon:9,loop:[0,1,8,9,5],pylon:8,propag:[8,9,5],richtraceback:8,vou:7,itself:[0,2,3,4,5,6,7,8,9],decor:[1,2,3],minim:6,decod:[2,7],conflict:6,x80:7,wherea:[0,9,7,5],has_templ:8,stripe:9,pop_buff:2,typic:[8,6],recent:8,travers:3,task:6,older:0,cachemanag:6,entri:[8,6],somev:[9,3],elem:5,picki:7,endfor:[0,9,5],construct:[0,7,4,5,6,3,8],burden:7,sidebar:0,adjust_uri:8,msgid:8,theorem:5,input:[0,2,7],subsequ:6,format:[0,8,3,7,5],game:7,bit:[0,8,9],characterist:5,creation_funct:6,semi:6,whitespac:[0,2,5],resolv:8,collect:[8,6,9,3,7],"boolean":8,popular:8,encount:4,often:3,creation:[0,8,2,6],some:[0,2,3,4,5,6,7,8,9],back:[8,9,7,4],global:[0,6,9,3,4],understood:6,sampl:8,mirror:8,surpris:7,modulepath:6,though:[6,9,7,4],pep:7,per:[6,9,7,5],namespace_nam:3,substitut:[8,1,2,9,5],larg:4,slash:[3,5],leftmost:2,cgi:[2,7],buffer_filt:8,previou:[0,8,9,4],run:[8,9,3,7],namespacenam:[0,5],reverse_traceback:8,step:[0,8,7],loopcontext:9,from:[0,1,2,3,4,5,6,7,8,9],mynamespac:[3,5],exc_info:8,block:[0,1,2,4,5,6,9],within:[0,2,3,4,5,6,7,8,9],toplevelnotfound:8,ensur:[6,3,7],chang:[6,9,4],run_wsgi:8,span:[0,4],reverse_index:9,spam:9,bodi:[0,1,4,5,6,3,8,9],stylesheet:8,"long":[9,5],beaker_cach:6,includ:[0,5,6,3,8,9],suit:4,myfunc:5,properli:7,templatelookupexcept:8,link:8,translat:8,newer:[0,8],atom:8,line:[8,5,7,4],info:8,concaten:2,utf:[8,2,7],consist:5,caller:[0,2,3,9],my_tag:3,myescap:2,similar:[0,2,3,4,5,7,8,9],impl:6,constant:9,doesn:[0,9,3,4],repres:[0,5,6,7,8,9],modulename_cal:8,titl:[0,5,4],invalid:6,codec:[8,7],accountdata:0,draw:2,clean:[8,6],nightmar:7,bytestring_passthrough:8,xb4le:7,cache_typ:[8,6,5],depth:9,far:[8,5,7,4],hello:[0,8,3,7,5],code:[0,2,7,5,3,8,9],templatetext:[2,7],send:[2,7,4,3,8,9],sens:9,sent:[2,9,3,5],tri:[0,8,9],magic:[9,7],"try":[8,2,9,7,5],dealt:8,pleas:5,impli:8,cfg:8,odd:9,append:8,compat:[8,6,3],index:[1,4,5,3,8,9],compar:[8,7],xa9veil:7,access:[0,1,4,5,6,3,8,9],can:[0,2,3,4,5,6,7,8,9],len:5,closur:0,let:[0,8,9,4],becom:[8,3,7],sinc:[0,9,3,7,4],filesystem_check:8,convert:[8,6,7],convers:7,conceiv:9,ctx:8,implement:[0,8,6,4],appli:[0,2,7,5,3,8,9],approxim:8,mystuff:0,api:[1,2,6,3,8,9],immut:9,register_plugin:6,metaphor:4,commun:[0,9],next:[0,1,2,3,4,5,6,7,8,9],implic:7,few:9,trail:2,beakercacheimpl:6,account:0,retriev:6,augment:[0,1,4],obvious:4,control:[0,1,2,4,5,8,9],accountnam:0,process:[6,7,5],lock:6,slim:6,tag:[0,1,2,4,5,6,3,8,9],layoutdata:0,nari:7,instead:[0,2,7,4,3,8],templatecollect:8,overridden:[0,6,3,4],class_:4,tack:3,philosophi:9,callable_:[8,3],essenti:[6,3,7],correspond:[8,6,9,3,4],element:[0,8,9,7,5],issu:[0,8,7],allow:[0,2,3,4,5,6,7,8,9],elif:5,move:8,comma:[0,2],bunch:3,outer:0,chosen:6,myproj:8,bye:0,handl:[0,1,5,6,7,8,9],handi:3,"r\u00e9veill\u00e9":7,relativeto:8,somewher:[8,9,7],anyth:[0,7,4],nameerror:[8,9],mode:7,disregard:8,pygment:8,intellig:7,filehandl:7,our:[0,8,6,4],special:[8,6,2,9,5],out:[0,4,5,6,7,8],variabl:[0,4,5,3,8,9],contigu:5,categori:3,rel:[8,3],red:9,insid:[0,4,5,6,3,8],call_my_object:7,standalon:8,dictionari:[8,6,9,3],releas:[6,3,5],indent:5,xc3:7,could:4,lexer:[8,7,5],keep:0,outsid:[0,9,3,7,4],strict:8,system:[0,8,9,6,4],messag:[8,9],attach:3,"final":[2,7,4],cache_dir:[8,6],accompani:8,exactli:[0,4],filename_to_uri:8,structur:[1,9,5],charact:[8,7,5],simplecacheimpl:6,have:[0,2,3,4,5,6,7,8,9],tabl:[0,1,9],need:[0,7,4,6,3,8,9],turn:[2,7,4],babel:8,outward:8,builtin:7,best:5,which:[0,2,3,4,5,6,7,8,9],singl:[0,2,4,5,6,7,8],unless:[9,7],who:7,segment:7,"class":[0,7,4,6,3,8,9],url:[8,6,2,5],gather:7,request:[8,6,9],uri:[8,3,5],pipe:2,determin:[6,7],"_cach":6,fact:[0,7,4],render_context:8,dbm:6,text:[0,2,5,6,7,8,9],cache_timeout:[0,6],anywai:8,locat:[8,9,3,7],should:[8,6,9,3],suppos:[0,6],local:[0,2,5,6,3,8,9],meant:4,familiar:[0,5],bean:8,cache_:6,increas:8,cstringio:[8,7],enabl:[8,6,9,5],organ:[3,4],current_sect:5,stuff:[3,5],integr:[8,1,4],contain:[0,7,5,6,3,8],view:8,reverse_record:8,legaci:[8,9],collection_s:8,pinard:8,flip:0,bytestr:8,mako_modul:8,polymorph:5,correctli:9,pattern:8,written:[8,5,4],progress:9,neither:6,email:5,jot:9,kei:[8,6,9,3,7],module_directori:[8,6],tempfil:8,job:2,entir:[0,1,2,3,5,7,8],joe:5,cache_arg:[8,6],addit:[0,2,4,5,6,3,8],plugin:[6,1],etc:[0,8,9,6,5],instanc:[8,9,3,5],freeli:9,comment:[8,1,7,5],guidelin:6,mako_cach:6,respect:5,addition:[8,7,4],compon:[6,9,3],include_fil:3,treat:7,immedi:[8,5,9,7,4],upcom:6,togeth:4,present:[0,7,4,6,3,8,9],determinist:2,therefor:[8,5,3,4],plain:[0,8,3,7,5],contextu:0,defin:[0,1,2,3,4,5,6,7,8,9],helper:8,almost:[5,4],incom:7,revis:8,parti:6,began:9,member:[8,9,5],python:[0,1,2,3,4,5,7,8,9],denot:5,iou:9,upon:[0,8,2,6,4],effect:[0,6,2,3],distutil:8,markupsaf:[2,7],off:[0,6,2,3,4],mention:7,well:[0,2,3,4,5,6,7,8,9],exampl:[0,2,4,5,6,3,8,9],command:8,choos:7,undefin:[0,8,9,5],usual:[8,6,2,9,5],module_writ:8,less:[9,7,4],heavili:7,web:8,point:[0,7,4,5,6,3,8],add:[0,8,2,4],lookup:[8,6,9,7],dest:8,arguabl:7,cache_impl:[8,6],five:[6,5],know:[7,4],xe2:7,mkstemp:8,insert:4,like:[0,2,3,4,5,6,7,8,9],success:8,page:[0,1,2,4,5,6,3,8,9],unreach:0,exceed:9,revers:8,captur:[8,2,3,9],pariti:9,"export":[0,5,4],smoothli:4,proper:8,librari:[0,8,2,6,7],tmp:[8,2],lead:[2,3,9],usag:[0,1,2,3,4,6,7,8,9],nutshel:4,although:5,stage:8,beaker:[8,6],about:[8,1,5,9,4],actual:[0,2,4,5,6,3,8,9],column:0,htmlentitydef:2,discard:2,x99a:7,disabl:[1,2,6,7,8,9],own:[0,2,3,4,5,6,7,8,9],populate_self:3,automat:[0,2,4,5,6,8,9],"dr\u00f4le":7,leverag:5,quote_plu:2,inner:0,arg1:3,arg2:3,"function":[0,2,3,4,5,6,7,8,9],keyerror:9,invalidate_def:6,eas:[2,9],inlin:[5,9,4],buf:[8,2],wherev:7,count:[0,8,9],made:[6,9],whether:[2,9,5],wish:[6,2,9],displai:8,record:[8,3,5],below:[0,7,4],otherwis:[8,9,7,5],evalu:[0,3,5],"int":9,dure:[8,4],filenam:[8,6,3],twist:0,pit:9,probabl:[0,8,9,6],mutual:8,percent:5,detail:[0,4,5,7,8,9],other:[0,2,3,4,5,6,7,8,9],bool:9,futur:[3,5],varieti:[6,5],post_pros:0,supports_cal:3,templateuri:3,some_condit:0,stai:[6,9],experienc:9,strict_undefin:[8,9],rule:[0,7,4],portion:0},objtypes:{"0":"py:attribute","1":"py:method","2":"py:class","3":"py:function"},titles:["Defs and Blocks","Table of Contents","Filtering and Buffering","Namespaces","Inheritance","Syntax","Caching","The Unicode Chapter","Usage","The Mako Runtime Environment"],objnames:{"0":["py","attribute","Python attribute"],"1":["py","method","Python method"],"2":["py","class","Python class"],"3":["py","function","Python function"]},filenames:["defs","index","filtering","namespaces","inheritance","syntax","caching","unicode","usage","runtime"]})
\ No newline at end of file
diff --git a/lib/mako-0.7.2/doc/syntax.html b/lib/mako-0.7.2/doc/syntax.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/syntax.html
@@ -0,0 +1,594 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                Syntax
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="Defs and Blocks" href="defs.html" />
+        <link rel="prev" title="Usage" href="usage.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="usage.html" title="previous chapter">Usage</a>
+            </li>
+            <li>Next:
+            <a href="defs.html" title="next chapter">Defs and Blocks</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/syntax.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                Syntax
+             
+
+        <h2>
+            
+                Syntax
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">Syntax</a><ul>
+<li><a class="reference internal" href="#expression-substitution">Expression Substitution</a></li>
+<li><a class="reference internal" href="#expression-escaping">Expression Escaping</a></li>
+<li><a class="reference internal" href="#control-structures">Control Structures</a><ul>
+<li><a class="reference internal" href="#the-loop-context">The Loop Context</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#comments">Comments</a></li>
+<li><a class="reference internal" href="#newline-filters">Newline Filters</a></li>
+<li><a class="reference internal" href="#python-blocks">Python Blocks</a></li>
+<li><a class="reference internal" href="#module-level-blocks">Module-level Blocks</a></li>
+<li><a class="reference internal" href="#tags">Tags</a><ul>
+<li><a class="reference internal" href="#page"><tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#include"><tt class="docutils literal"><span class="pre">&lt;%include&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#def"><tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#block"><tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#namespace"><tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#inherit"><tt class="docutils literal"><span class="pre">&lt;%inherit&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#nsname-defname"><tt class="docutils literal"><span class="pre">&lt;%</span></tt>nsname<tt class="docutils literal"><span class="pre">:</span></tt>defname<tt class="docutils literal"><span class="pre">&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#call"><tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#doc"><tt class="docutils literal"><span class="pre">&lt;%doc&gt;</span></tt></a></li>
+<li><a class="reference internal" href="#text"><tt class="docutils literal"><span class="pre">&lt;%text&gt;</span></tt></a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#returning-early-from-a-template">Returning Early from a Template</a></li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="usage.html" title="previous chapter">Usage</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="defs.html" title="next chapter">Defs and Blocks</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="syntax">
+<span id="syntax-toplevel"></span><h1>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline">?</a></h1>
+<p>A Mako template is parsed from a text stream containing any kind
+of content, XML, HTML, email text, etc. The template can further
+contain Mako-specific directives which represent variable and/or
+expression substitutions, control structures (i.e. conditionals
+and loops), server-side comments, full blocks of Python code, as
+well as various tags that offer additional functionality. All of
+these constructs compile into real Python code. This means that
+you can leverage the full power of Python in almost every aspect
+of a Mako template.</p>
+<div class="section" id="expression-substitution">
+<h2>Expression Substitution<a class="headerlink" href="#expression-substitution" title="Permalink to this headline">?</a></h2>
+<p>The simplest expression is just a variable substitution. The
+syntax for this is the <tt class="docutils literal"><span class="pre">${}</span></tt> construct, which is inspired by
+Perl, Genshi, JSP EL, and others:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">this is x: </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Above, the string representation of <tt class="docutils literal"><span class="pre">x</span></tt> is applied to the
+template&#8217;s output stream. If you&#8217;re wondering where <tt class="docutils literal"><span class="pre">x</span></tt> comes
+from, it&#8217;s usually from the <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> supplied to the
+template&#8217;s rendering function. If <tt class="docutils literal"><span class="pre">x</span></tt> was not supplied to the
+template and was not otherwise assigned locally, it evaluates to
+a special value <tt class="docutils literal"><span class="pre">UNDEFINED</span></tt>. More on that later.</p>
+<p>The contents within the <tt class="docutils literal"><span class="pre">${}</span></tt> tag are evaluated by Python
+directly, so full expressions are OK:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">pythagorean theorem:  </span><span class="cp">${</span><span class="nb">pow</span><span class="p">(</span><span class="n">x</span><span class="p">,</span><span class="mi">2</span><span class="p">)</span> <span class="o">+</span> <span class="nb">pow</span><span class="p">(</span><span class="n">y</span><span class="p">,</span><span class="mi">2</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The results of the expression are evaluated into a string result
+in all cases before being rendered to the output stream, such as
+the above example where the expression produces a numeric
+result.</p>
+</div>
+<div class="section" id="expression-escaping">
+<h2>Expression Escaping<a class="headerlink" href="#expression-escaping" title="Permalink to this headline">?</a></h2>
+<p>Mako includes a number of built-in escaping mechanisms,
+including HTML, URI and XML escaping, as well as a &#8220;trim&#8221;
+function. These escapes can be added to an expression
+substitution using the <tt class="docutils literal"><span class="pre">|</span></tt> operator:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&quot;this is some text&quot;</span> <span class="o">|</span> <span class="n">u</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The above expression applies URL escaping to the expression, and
+produces <tt class="docutils literal"><span class="pre">this+is+some+text</span></tt>. The <tt class="docutils literal"><span class="pre">u</span></tt> name indicates URL
+escaping, whereas <tt class="docutils literal"><span class="pre">h</span></tt> represents HTML escaping, <tt class="docutils literal"><span class="pre">x</span></tt>
+represents XML escaping, and <tt class="docutils literal"><span class="pre">trim</span></tt> applies a trim function.</p>
+<p>Read more about built-in filtering functions, including how to
+make your own filter functions, in <a class="reference internal" href="filtering.html"><em>Filtering and Buffering</em></a>.</p>
+</div>
+<div class="section" id="control-structures">
+<h2>Control Structures<a class="headerlink" href="#control-structures" title="Permalink to this headline">?</a></h2>
+<p>A control structure refers to all those things that control the
+flow of a program &#8211; conditionals (i.e. <tt class="docutils literal"><span class="pre">if</span></tt>/<tt class="docutils literal"><span class="pre">else</span></tt>), loops (like
+<tt class="docutils literal"><span class="pre">while</span></tt> and <tt class="docutils literal"><span class="pre">for</span></tt>), as well as things like <tt class="docutils literal"><span class="pre">try</span></tt>/<tt class="docutils literal"><span class="pre">except</span></tt>. In Mako,
+control structures are written using the <tt class="docutils literal"><span class="pre">%</span></tt> marker followed
+by a regular Python control expression, and are &#8220;closed&#8221; by
+using another <tt class="docutils literal"><span class="pre">%</span></tt> marker with the tag &#8220;<tt class="docutils literal"><span class="pre">end&lt;name&gt;</span></tt>&#8221;, where
+&#8220;<tt class="docutils literal"><span class="pre">&lt;name&gt;</span></tt>&#8221; is the keyword of the expression:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">%</span> <span class="k">if</span> <span class="n">x</span><span class="o">==</span><span class="mi">5</span><span class="p">:</span><span class="x"></span>
+<span class="x">    this is some output</span>
+<span class="cp">%</span><span class="k"> endif</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">%</span></tt> can appear anywhere on the line as long as no text
+precedes it; indentation is not significant. The full range of
+Python &#8220;colon&#8221; expressions are allowed here, including
+<tt class="docutils literal"><span class="pre">if</span></tt>/<tt class="docutils literal"><span class="pre">elif</span></tt>/<tt class="docutils literal"><span class="pre">else</span></tt>, <tt class="docutils literal"><span class="pre">while</span></tt>, <tt class="docutils literal"><span class="pre">for</span></tt>, and even <tt class="docutils literal"><span class="pre">def</span></tt>, although
+Mako has a built-in tag for defs which is more full-featured.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">%</span> <span class="k">for</span> <span class="n">a</span> <span class="ow">in</span> <span class="p">[</span><span class="s">&#39;one&#39;</span><span class="p">,</span> <span class="s">&#39;two&#39;</span><span class="p">,</span> <span class="s">&#39;three&#39;</span><span class="p">,</span> <span class="s">&#39;four&#39;</span><span class="p">,</span> <span class="s">&#39;five&#39;</span><span class="p">]:</span><span class="x"></span>
+    <span class="cp">%</span> <span class="k">if</span> <span class="n">a</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;t&#39;</span><span class="p">:</span><span class="x"></span>
+<span class="x">    its two or three</span>
+    <span class="cp">%</span> <span class="k">elif</span> <span class="n">a</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="s">&#39;f&#39;</span><span class="p">:</span><span class="x"></span>
+<span class="x">    four/five</span>
+    <span class="cp">%</span> <span class="k">else</span><span class="p">:</span><span class="x"></span>
+<span class="x">    one</span>
+    <span class="cp">%</span><span class="k"> endif</span><span class="x"></span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">%</span></tt> sign can also be &#8220;escaped&#8221;, if you actually want to
+emit a percent sign as the first non whitespace character on a
+line, by escaping it as in <tt class="docutils literal"><span class="pre">%%</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">%% some text</span>
+
+<span class="x">    %% some more text</span>
+</pre></div>
+</div>
+<div class="section" id="the-loop-context">
+<h3>The Loop Context<a class="headerlink" href="#the-loop-context" title="Permalink to this headline">?</a></h3>
+<p>The <strong>loop context</strong> provides additional information about a loop
+while inside of a <tt class="docutils literal"><span class="pre">%</span> <span class="pre">for</span></tt> structure:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;ul&gt;</span>
+<span class="cp">%</span> <span class="k">for</span> <span class="n">a</span> <span class="ow">in</span> <span class="p">(</span><span class="s">&quot;one&quot;</span><span class="p">,</span> <span class="s">&quot;two&quot;</span><span class="p">,</span> <span class="s">&quot;three&quot;</span><span class="p">):</span><span class="x"></span>
+<span class="x">    &lt;li&gt;Item </span><span class="cp">${</span><span class="n">loop</span><span class="o">.</span><span class="n">index</span><span class="cp">}</span><span class="x">: </span><span class="cp">${</span><span class="n">a</span><span class="cp">}</span><span class="x">&lt;/li&gt;</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+<span class="x">&lt;/ul&gt;</span>
+</pre></div>
+</div>
+<p>See <a class="reference internal" href="runtime.html#loop-context"><em>The Loop Context</em></a> for more information on this feature.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.7.</span></p>
+</div>
+</div>
+<div class="section" id="comments">
+<h2>Comments<a class="headerlink" href="#comments" title="Permalink to this headline">?</a></h2>
+<p>Comments come in two varieties. The single line comment uses
+<tt class="docutils literal"><span class="pre">##</span></tt> as the first non-space characters on a line:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## this is a comment.</span><span class="x"></span>
+<span class="x">...text ...</span>
+</pre></div>
+</div>
+<p>A multiline version exists using <tt class="docutils literal"><span class="pre">&lt;%doc&gt;</span> <span class="pre">...text...</span> <span class="pre">&lt;/%doc&gt;</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%doc&gt;</span>
+<span class="cp">    these are comments</span>
+<span class="cp">    more comments</span>
+<span class="cp">&lt;/%doc&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="newline-filters">
+<h2>Newline Filters<a class="headerlink" href="#newline-filters" title="Permalink to this headline">?</a></h2>
+<p>The backslash (&#8220;<tt class="docutils literal"><span class="pre">\</span></tt>&#8221;) character, placed at the end of any
+line, will consume the newline character before continuing to
+the next line:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">here is a line that goes onto </span><span class="o">\</span>
+<span class="x">another line.</span>
+</pre></div>
+</div>
+<p>The above text evaluates to:</p>
+<div class="highlight-text"><div class="highlight"><pre>here is a line that goes onto another line.
+</pre></div>
+</div>
+</div>
+<div class="section" id="python-blocks">
+<h2>Python Blocks<a class="headerlink" href="#python-blocks" title="Permalink to this headline">?</a></h2>
+<p>Any arbitrary block of python can be dropped in using the <tt class="docutils literal"><span class="pre">&lt;%</span>
+<span class="pre">%&gt;</span></tt> tags:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">this is a template</span>
+<span class="cp">&lt;%</span>
+    <span class="n">x</span> <span class="o">=</span> <span class="n">db</span><span class="o">.</span><span class="n">get_resource</span><span class="p">(</span><span class="s">&#39;foo&#39;</span><span class="p">)</span>
+    <span class="n">y</span> <span class="o">=</span> <span class="p">[</span><span class="n">z</span><span class="o">.</span><span class="n">element</span> <span class="k">for</span> <span class="n">z</span> <span class="ow">in</span> <span class="n">x</span> <span class="k">if</span> <span class="n">x</span><span class="o">.</span><span class="n">frobnizzle</span><span class="o">==</span><span class="mi">5</span><span class="p">]</span>
+<span class="cp">%&gt;</span>
+<span class="cp">%</span> <span class="k">for</span> <span class="n">elem</span> <span class="ow">in</span> <span class="n">y</span><span class="p">:</span><span class="x"></span>
+<span class="x">    element: </span><span class="cp">${</span><span class="n">elem</span><span class="cp">}</span>
+<span class="cp">%</span><span class="k"> endfor</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Within <tt class="docutils literal"><span class="pre">&lt;%</span> <span class="pre">%&gt;</span></tt>, you&#8217;re writing a regular block of Python code.
+While the code can appear with an arbitrary level of preceding
+whitespace, it has to be consistently formatted with itself.
+Mako&#8217;s compiler will adjust the block of Python to be consistent
+with the surrounding generated Python code.</p>
+</div>
+<div class="section" id="module-level-blocks">
+<h2>Module-level Blocks<a class="headerlink" href="#module-level-blocks" title="Permalink to this headline">?</a></h2>
+<p>A variant on <tt class="docutils literal"><span class="pre">&lt;%</span> <span class="pre">%&gt;</span></tt> is the module-level code block, denoted
+by <tt class="docutils literal"><span class="pre">&lt;%!</span> <span class="pre">%&gt;</span></tt>. Code within these tags is executed at the module
+level of the template, and not within the rendering function of
+the template. Therefore, this code does not have access to the
+template&#8217;s context and is only executed when the template is
+loaded into memory (which can be only once per application, or
+more, depending on the runtime environment). Use the <tt class="docutils literal"><span class="pre">&lt;%!</span> <span class="pre">%&gt;</span></tt>
+tags to declare your template&#8217;s imports, as well as any
+pure-Python functions you might want to declare:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%!</span>
+    <span class="kn">import</span> <span class="nn">mylib</span>
+    <span class="kn">import</span> <span class="nn">re</span>
+
+    <span class="k">def</span> <span class="nf">filter</span><span class="p">(</span><span class="n">text</span><span class="p">):</span>
+        <span class="k">return</span> <span class="n">re</span><span class="o">.</span><span class="n">sub</span><span class="p">(</span><span class="s">r&#39;^@&#39;</span><span class="p">,</span> <span class="s">&#39;&#39;</span><span class="p">,</span> <span class="n">text</span><span class="p">)</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Any number of <tt class="docutils literal"><span class="pre">&lt;%!</span> <span class="pre">%&gt;</span></tt> blocks can be declared anywhere in a
+template; they will be rendered in the resulting module
+in a single contiguous block above all render callables,
+in the order in which they appear in the source template.</p>
+</div>
+<div class="section" id="tags">
+<h2>Tags<a class="headerlink" href="#tags" title="Permalink to this headline">?</a></h2>
+<p>The rest of what Mako offers takes place in the form of tags.
+All tags use the same syntax, which is similar to an XML tag
+except that the first character of the tag name is a <tt class="docutils literal"><span class="pre">%</span></tt>
+character. The tag is closed either by a contained slash
+character, or an explicit closing tag:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">include</span> <span class="na">file=</span><span class="s">&quot;foo.txt&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;foo&quot;</span> <span class="na">buffered=</span><span class="s">&quot;True&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is a def</span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>All tags have a set of attributes which are defined for each
+tag. Some of these attributes are required. Also, many
+attributes support <strong>evaluation</strong>, meaning you can embed an
+expression (using <tt class="docutils literal"><span class="pre">${}</span></tt>) inside the attribute text:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">include</span> <span class="na">file=</span><span class="s">&quot;/foo/bar/${myfile}.txt&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Whether or not an attribute accepts runtime evaluation depends
+on the type of tag and how that tag is compiled into the
+template. The best way to find out if you can stick an
+expression in is to try it! The lexer will tell you if it&#8217;s not
+valid.</p>
+<p>Heres a quick summary of all the tags:</p>
+<div class="section" id="page">
+<h3><tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt><a class="headerlink" href="#page" title="Permalink to this headline">?</a></h3>
+<p>This tag defines general characteristics of the template,
+including caching arguments, and optional lists of arguments
+which the template expects when invoked.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">args=</span><span class="s">&quot;x, y, z=&#39;default&#39;&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Or a page tag that defines caching characteristics:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">page</span> <span class="na">cached=</span><span class="s">&quot;True&quot;</span> <span class="na">cache_type=</span><span class="s">&quot;memory&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Currently, only one <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag gets used per template, the
+rest get ignored. While this will be improved in a future
+release, for now make sure you have only one <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag
+defined in your template, else you may not get the results you
+want. The details of what <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> is used for are described
+further in <a class="reference internal" href="namespaces.html#namespaces-body"><em>The body() Method</em></a> as well as <a class="reference internal" href="caching.html"><em>Caching</em></a>.</p>
+</div>
+<div class="section" id="include">
+<h3><tt class="docutils literal"><span class="pre">&lt;%include&gt;</span></tt><a class="headerlink" href="#include" title="Permalink to this headline">?</a></h3>
+<p>A tag that is familiar from other template languages, <tt class="docutils literal"><span class="pre">%include</span></tt>
+is a regular joe that just accepts a file argument and calls in
+the rendered result of that file:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">include</span> <span class="na">file=</span><span class="s">&quot;header.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+
+<span class="x">    hello world</span>
+
+<span class="cp">&lt;%</span><span class="nb">include</span> <span class="na">file=</span><span class="s">&quot;footer.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Include also accepts arguments which are available as <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> arguments in the receiving template:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">include</span> <span class="na">file=</span><span class="s">&quot;toolbar.html&quot;</span> <span class="na">args=</span><span class="s">&quot;current_section=&#39;members&#39;, username=&#39;ed&#39;&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="def">
+<h3><tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt><a class="headerlink" href="#def" title="Permalink to this headline">?</a></h3>
+<p>The <tt class="docutils literal"><span class="pre">%def</span></tt> tag defines a Python function which contains a set
+of content, that can be called at some other point in the
+template. The basic idea is simple:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;myfunc(x)&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is myfunc, x is </span><span class="cp">${</span><span class="n">x</span><span class="cp">}</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+
+<span class="cp">${</span><span class="n">myfunc</span><span class="p">(</span><span class="mi">7</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">%def</span></tt> tag is a lot more powerful than a plain Python <tt class="docutils literal"><span class="pre">def</span></tt>, as
+the Mako compiler provides many extra services with <tt class="docutils literal"><span class="pre">%def</span></tt> that
+you wouldn&#8217;t normally have, such as the ability to export defs
+as template &#8220;methods&#8221;, automatic propagation of the current
+<a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>, buffering/filtering/caching flags, and def calls
+with content, which enable packages of defs to be sent as
+arguments to other def calls (not as hard as it sounds). Get the
+full deal on what <tt class="docutils literal"><span class="pre">%def</span></tt> can do in <a class="reference internal" href="defs.html"><em>Defs and Blocks</em></a>.</p>
+</div>
+<div class="section" id="block">
+<h3><tt class="docutils literal"><span class="pre">&lt;%block&gt;</span></tt><a class="headerlink" href="#block" title="Permalink to this headline">?</a></h3>
+<p><tt class="docutils literal"><span class="pre">%block</span></tt> is a tag that is close to a <tt class="docutils literal"><span class="pre">%def</span></tt>,
+except executes itself immediately in its base-most scope,
+and can also be anonymous (i.e. with no name):</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">filter=</span><span class="s">&quot;h&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    some &lt;html&gt; stuff.</span>
+<span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Inspired by Jinja2 blocks, named blocks offer a syntactically pleasing way
+to do inheritance:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;html&gt;</span>
+<span class="x">    &lt;body&gt;</span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;header&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">        &lt;h2&gt;</span><span class="cp">&lt;%</span><span class="nb">block</span> <span class="na">name=</span><span class="s">&quot;title&quot;</span><span class="cp">/&gt;</span><span class="x">&lt;/h2&gt;</span>
+<span class="x">    </span><span class="cp">&lt;/%</span><span class="nb">block</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    </span><span class="cp">${</span><span class="bp">self</span><span class="o">.</span><span class="n">body</span><span class="p">()</span><span class="cp">}</span><span class="x"></span>
+<span class="x">    &lt;/body&gt;</span>
+<span class="x">&lt;/html&gt;</span>
+</pre></div>
+</div>
+<p>Blocks are introduced in <a class="reference internal" href="defs.html#blocks"><em>Using Blocks</em></a> and further described in <a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.4.1.</span></p>
+</div>
+<div class="section" id="namespace">
+<h3><tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt><a class="headerlink" href="#namespace" title="Permalink to this headline">?</a></h3>
+<p><tt class="docutils literal"><span class="pre">%namespace</span></tt> is Mako&#8217;s equivalent of Python&#8217;s <tt class="docutils literal"><span class="pre">import</span></tt>
+statement. It allows access to all the rendering functions and
+metadata of other template files, plain Python modules, as well
+as locally defined &#8220;packages&#8221; of functions.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">namespace</span> <span class="na">file=</span><span class="s">&quot;functions.html&quot;</span> <span class="na">import=</span><span class="s">&quot;*&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>The underlying object generated by <tt class="docutils literal"><span class="pre">%namespace</span></tt>, an instance of
+<a class="reference internal" href="namespaces.html#mako.runtime.Namespace" title="mako.runtime.Namespace"><tt class="xref py py-class docutils literal"><span class="pre">mako.runtime.Namespace</span></tt></a>, is a central construct used in
+templates to reference template-specific information such as the
+current URI, inheritance structures, and other things that are
+not as hard as they sound right here. Namespaces are described
+in <a class="reference internal" href="namespaces.html"><em>Namespaces</em></a>.</p>
+</div>
+<div class="section" id="inherit">
+<h3><tt class="docutils literal"><span class="pre">&lt;%inherit&gt;</span></tt><a class="headerlink" href="#inherit" title="Permalink to this headline">?</a></h3>
+<p>Inherit allows templates to arrange themselves in <strong>inheritance
+chains</strong>. This is a concept familiar in many other template
+languages.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">inherit</span> <span class="na">file=</span><span class="s">&quot;base.html&quot;</span><span class="cp">/&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>When using the <tt class="docutils literal"><span class="pre">%inherit</span></tt> tag, control is passed to the topmost
+inherited template first, which then decides how to handle
+calling areas of content from its inheriting templates. Mako
+offers a lot of flexibility in this area, including dynamic
+inheritance, content wrapping, and polymorphic method calls.
+Check it out in <a class="reference internal" href="inheritance.html"><em>Inheritance</em></a>.</p>
+</div>
+<div class="section" id="nsname-defname">
+<h3><tt class="docutils literal"><span class="pre">&lt;%</span></tt>nsname<tt class="docutils literal"><span class="pre">:</span></tt>defname<tt class="docutils literal"><span class="pre">&gt;</span></tt><a class="headerlink" href="#nsname-defname" title="Permalink to this headline">?</a></h3>
+<p>Any user-defined &#8220;tag&#8221; can be created against
+a namespace by using a tag with a name of the form
+<tt class="docutils literal"><span class="pre">&lt;%&lt;namespacename&gt;:&lt;defname&gt;&gt;</span></tt>. The closed and open formats of such a
+tag are equivalent to an inline expression and the <tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt>
+tag, respectively.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">mynamespace:somedef</span> <span class="na">param=</span><span class="s">&quot;some value&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    this is the body</span>
+<span class="cp">&lt;/%</span><span class="nb">mynamespace:somedef</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>To create custom tags which accept a body, see
+<a class="reference internal" href="defs.html#defs-with-content"><em>Calling a Def with Embedded Content and/or Other Defs</em></a>.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.2.3.</span></p>
+</div>
+<div class="section" id="call">
+<h3><tt class="docutils literal"><span class="pre">&lt;%call&gt;</span></tt><a class="headerlink" href="#call" title="Permalink to this headline">?</a></h3>
+<p>The call tag is the &#8220;classic&#8221; form of a user-defined tag, and is
+roughly equivalent to the <tt class="docutils literal"><span class="pre">&lt;%namespacename:defname&gt;</span></tt> syntax
+described above. This tag is also described in <a class="reference internal" href="defs.html#defs-with-content"><em>Calling a Def with Embedded Content and/or Other Defs</em></a>.</p>
+</div>
+<div class="section" id="doc">
+<h3><tt class="docutils literal"><span class="pre">&lt;%doc&gt;</span></tt><a class="headerlink" href="#doc" title="Permalink to this headline">?</a></h3>
+<p>The <tt class="docutils literal"><span class="pre">%doc</span></tt> tag handles multiline comments:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%doc&gt;</span>
+<span class="cp">    these are comments</span>
+<span class="cp">    more comments</span>
+<span class="cp">&lt;/%doc&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Also the <tt class="docutils literal"><span class="pre">##</span></tt> symbol as the first non-space characters on a line can be used for single line comments.</p>
+</div>
+<div class="section" id="text">
+<h3><tt class="docutils literal"><span class="pre">&lt;%text&gt;</span></tt><a class="headerlink" href="#text" title="Permalink to this headline">?</a></h3>
+<p>This tag suspends the Mako lexer&#8217;s normal parsing of Mako
+template directives, and returns its entire body contents as
+plain text. It is used pretty much to write documentation about
+Mako:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span><span class="nb">text</span> <span class="na">filter=</span><span class="s">&quot;h&quot;</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="x">    heres some fake mako </span><span class="cp">${</span><span class="n">syntax</span><span class="cp">}</span><span class="x"></span>
+<span class="x">    </span><span class="cp">&lt;%</span><span class="nb">def</span> <span class="na">name=</span><span class="s">&quot;x()&quot;</span><span class="cp">&gt;${</span><span class="n">x</span><span class="cp">}&lt;/%</span><span class="nb">def</span><span class="cp">&gt;</span><span class="x"></span>
+<span class="cp">&lt;/%</span><span class="nb">text</span><span class="cp">&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+</div>
+</div>
+<div class="section" id="returning-early-from-a-template">
+<h2>Returning Early from a Template<a class="headerlink" href="#returning-early-from-a-template" title="Permalink to this headline">?</a></h2>
+<p>Sometimes you want to stop processing a template or <tt class="docutils literal"><span class="pre">&lt;%def&gt;</span></tt>
+method in the middle and just use the text you&#8217;ve accumulated so
+far. You can use a <tt class="docutils literal"><span class="pre">return</span></tt> statement inside a Python
+block to do that.</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">%</span> <span class="k">if</span> <span class="ow">not</span> <span class="nb">len</span><span class="p">(</span><span class="n">records</span><span class="p">):</span><span class="x"></span>
+<span class="x">    No records found.</span>
+<span class="x">    </span><span class="cp">&lt;%</span> <span class="k">return</span> <span class="cp">%&gt;</span>
+<span class="cp">%</span><span class="k"> endif</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Or perhaps:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">&lt;%</span>
+    <span class="k">if</span> <span class="ow">not</span> <span class="nb">len</span><span class="p">(</span><span class="n">records</span><span class="p">):</span>
+        <span class="k">return</span>
+<span class="cp">%&gt;</span><span class="x"></span>
+</pre></div>
+</div>
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="usage.html" title="previous chapter">Usage</a>
+        Next:
+        <a href="defs.html" title="next chapter">Defs and Blocks</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/unicode.html b/lib/mako-0.7.2/doc/unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/unicode.html
@@ -0,0 +1,474 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                The Unicode Chapter
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="Caching" href="caching.html" />
+        <link rel="prev" title="Filtering and Buffering" href="filtering.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="filtering.html" title="previous chapter">Filtering and Buffering</a>
+            </li>
+            <li>Next:
+            <a href="caching.html" title="next chapter">Caching</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/unicode.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                The Unicode Chapter
+             
+
+        <h2>
+            
+                The Unicode Chapter
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">The Unicode Chapter</a><ul>
+<li><a class="reference internal" href="#specifying-the-encoding-of-a-template-file">Specifying the Encoding of a Template File</a></li>
+<li><a class="reference internal" href="#handling-expressions">Handling Expressions</a></li>
+<li><a class="reference internal" href="#defining-output-encoding">Defining Output Encoding</a><ul>
+<li><a class="reference internal" href="#buffer-selection">Buffer Selection</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#saying-to-heck-with-it-disabling-the-usage-of-unicode-entirely">Saying to Heck with It: Disabling the Usage of Unicode Entirely</a><ul>
+<li><a class="reference internal" href="#rules-for-using-disable-unicode-true">Rules for using <tt class="docutils literal"><span class="pre">disable_unicode=True</span></tt></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="filtering.html" title="previous chapter">Filtering and Buffering</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="caching.html" title="next chapter">Caching</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="the-unicode-chapter">
+<span id="unicode-toplevel"></span><h1>The Unicode Chapter<a class="headerlink" href="#the-unicode-chapter" title="Permalink to this headline">?</a></h1>
+<p>The Python language supports two ways of representing what we
+know as &#8220;strings&#8221;, i.e. series of characters. In Python 2, the
+two types are <tt class="docutils literal"><span class="pre">string</span></tt> and <tt class="docutils literal"><span class="pre">unicode</span></tt>, and in Python 3 they are
+<tt class="docutils literal"><span class="pre">bytes</span></tt> and <tt class="docutils literal"><span class="pre">string</span></tt>. A key aspect of the Python 2 <tt class="docutils literal"><span class="pre">string</span></tt> and
+Python 3 <tt class="docutils literal"><span class="pre">bytes</span></tt> types are that they contain no information
+regarding what <strong>encoding</strong> the data is stored in. For this
+reason they were commonly referred to as <strong>byte strings</strong> on
+Python 2, and Python 3 makes this name more explicit. The
+origins of this come from Python&#8217;s background of being developed
+before the Unicode standard was even available, back when
+strings were C-style strings and were just that, a series of
+bytes. Strings that had only values below 128 just happened to
+be <strong>ASCII</strong> strings and were printable on the console, whereas
+strings with values above 128 would produce all kinds of
+graphical characters and bells.</p>
+<p>Contrast the &#8220;byte-string&#8221; type with the &#8220;unicode/string&#8221; type.
+Objects of this latter type are created whenever you say something like
+<tt class="docutils literal"><span class="pre">u&quot;hello</span> <span class="pre">world&quot;</span></tt> (or in Python 3, just <tt class="docutils literal"><span class="pre">&quot;hello</span> <span class="pre">world&quot;</span></tt>). In this
+case, Python represents each character in the string internally
+using multiple bytes per character (something similar to
+UTF-16). What&#8217;s important is that when using the
+<tt class="docutils literal"><span class="pre">unicode</span></tt>/<tt class="docutils literal"><span class="pre">string</span></tt> type to store strings, Python knows the
+data&#8217;s encoding; it&#8217;s in its own internal format. Whereas when
+using the <tt class="docutils literal"><span class="pre">string</span></tt>/<tt class="docutils literal"><span class="pre">bytes</span></tt> type, it does not.</p>
+<p>When Python 2 attempts to treat a byte-string as a string, which
+means it&#8217;s attempting to compare/parse its characters, to coerce
+it into another encoding, or to decode it to a unicode object,
+it has to guess what the encoding is. In this case, it will
+pretty much always guess the encoding as <tt class="docutils literal"><span class="pre">ascii</span></tt>... and if the
+byte-string contains bytes above value 128, you&#8217;ll get an error.
+Python 3 eliminates much of this confusion by just raising an
+error unconditionally if a byte-string is used in a
+character-aware context.</p>
+<p>There is one operation that Python <em>can</em> do with a non-ASCII
+byte-string, and it&#8217;s a great source of confusion: it can dump the
+byte-string straight out to a stream or a file, with nary a care
+what the encoding is. To Python, this is pretty much like
+dumping any other kind of binary data (like an image) to a
+stream somewhere. In Python 2, it is common to see programs that
+embed all kinds of international characters and encodings into
+plain byte-strings (i.e. using <tt class="docutils literal"><span class="pre">&quot;hello</span> <span class="pre">world&quot;</span></tt> style literals)
+can fly right through their run, sending reams of strings out to
+wherever they are going, and the programmer, seeing the same
+output as was expressed in the input, is now under the illusion
+that his or her program is Unicode-compliant. In fact, their
+program has no unicode awareness whatsoever, and similarly has
+no ability to interact with libraries that <em>are</em> unicode aware.
+Python 3 makes this much less likely by defaulting to unicode as
+the storage format for strings.</p>
+<p>The &#8220;pass through encoded data&#8221; scheme is what template
+languages like Cheetah and earlier versions of Myghty do by
+default. Mako as of version 0.2 also supports this mode of
+operation when using Python 2, using the <tt class="docutils literal"><span class="pre">disable_unicode=True</span></tt>
+flag. However, when using Mako in its default mode of
+unicode-aware, it requires explicitness when dealing with
+non-ASCII encodings. Additionally, if you ever need to handle
+unicode strings and other kinds of encoding conversions more
+intelligently, the usage of raw byte-strings quickly becomes a
+nightmare, since you are sending the Python interpreter
+collections of bytes for which it can make no intelligent
+decisions with regards to encoding. In Python 3 Mako only allows
+usage of native, unicode strings.</p>
+<p>In normal Mako operation, all parsed template constructs and
+output streams are handled internally as Python <tt class="docutils literal"><span class="pre">unicode</span></tt>
+objects. It&#8217;s only at the point of <a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> that this unicode
+stream may be rendered into whatever the desired output encoding
+is. The implication here is that the template developer must
+:ensure that <a class="reference internal" href="#set-template-file-encoding"><em>the encoding of all non-ASCII templates is explicit</em></a> (still required in Python 3),
+that <a class="reference internal" href="#handling-non-ascii-expressions"><em>all non-ASCII-encoded expressions are in one way or another
+converted to unicode</em></a>
+(not much of a burden in Python 3), and that <a class="reference internal" href="#defining-output-encoding"><em>the output stream of the
+template is handled as a unicode stream being encoded to some
+encoding</em></a> (still required in Python 3).</p>
+<div class="section" id="specifying-the-encoding-of-a-template-file">
+<span id="set-template-file-encoding"></span><h2>Specifying the Encoding of a Template File<a class="headerlink" href="#specifying-the-encoding-of-a-template-file" title="Permalink to this headline">?</a></h2>
+<p>This is the most basic encoding-related setting, and it is
+equivalent to Python&#8217;s &#8220;magic encoding comment&#8221;, as described in
+<a class="reference external" href="http://www.python.org/dev/peps/pep-0263/">pep-0263</a>. Any
+template that contains non-ASCII characters requires that this
+comment be present so that Mako can decode to unicode (and also
+make usage of Python&#8217;s AST parsing services). Mako&#8217;s lexer will
+use this encoding in order to convert the template source into a
+<tt class="docutils literal"><span class="pre">unicode</span></tt> object before continuing its parsing:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">## -*- coding: utf-8 -*-</span><span class="x"></span>
+
+<span class="x">Alors vous imaginez ma surprise, au lever du jour, quand</span>
+<span class="x">une dr?le de petite voix m?a r?veill?. Elle disait:</span>
+<span class="x"> ? S?il vous pla?t? dessine-moi un mouton! ?</span>
+</pre></div>
+</div>
+<p>For the picky, the regular expression used is derived from that
+of the above mentioned pep:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c">#.*coding[:=]\s*([-\w.]+).*\n</span>
+</pre></div>
+</div>
+<p>The lexer will convert to unicode in all cases, so that if any
+characters exist in the template that are outside of the
+specified encoding (or the default of <tt class="docutils literal"><span class="pre">ascii</span></tt>), the error will
+be immediate.</p>
+<p>As an alternative, the template encoding can be specified
+programmatically to either <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> or <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> via
+the <tt class="docutils literal"><span class="pre">input_encoding</span></tt> parameter:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;./&#39;</span><span class="p">],</span> <span class="n">input_encoding</span><span class="o">=</span><span class="s">&#39;utf-8&#39;</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>The above will assume all located templates specify <tt class="docutils literal"><span class="pre">utf-8</span></tt>
+encoding, unless the template itself contains its own magic
+encoding comment, which takes precedence.</p>
+</div>
+<div class="section" id="handling-expressions">
+<span id="handling-non-ascii-expressions"></span><h2>Handling Expressions<a class="headerlink" href="#handling-expressions" title="Permalink to this headline">?</a></h2>
+<p>The next area that encoding comes into play is in expression
+constructs. By default, Mako&#8217;s treatment of an expression like
+this:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&quot;hello world&quot;</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>looks something like this:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="nb">unicode</span><span class="p">(</span><span class="s">&quot;hello world&quot;</span><span class="p">))</span>
+</pre></div>
+</div>
+<p>In Python 3, it&#8217;s just:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="s">&quot;hello world&quot;</span><span class="p">))</span>
+</pre></div>
+</div>
+<p>That is, <strong>the output of all expressions is run through the
+``unicode`` built-in</strong>. This is the default setting, and can be
+modified to expect various encodings. The <tt class="docutils literal"><span class="pre">unicode</span></tt> step serves
+both the purpose of rendering non-string expressions into
+strings (such as integers or objects which contain <tt class="docutils literal"><span class="pre">__str()__</span></tt>
+methods), and to ensure that the final output stream is
+constructed as a unicode object. The main implication of this is
+that <strong>any raw byte-strings that contain an encoding other than
+ASCII must first be decoded to a Python unicode object</strong>. It
+means you can&#8217;t say this in Python 2:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">&quot;voix m?a r?veill?.&quot;</span><span class="cp">}</span>  <span class="cp">## error in Python 2!</span><span class="x"></span>
+</pre></div>
+</div>
+<p>You must instead say this:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="s">u&quot;voix m?a r?veill?.&quot;</span><span class="cp">}</span>  <span class="cp">## OK !</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Similarly, if you are reading data from a file that is streaming
+bytes, or returning data from some object that is returning a
+Python byte-string containing a non-ASCII encoding, you have to
+explicitly decode to unicode first, such as:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="cp">${</span><span class="n">call_my_object</span><span class="p">()</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="s">&#39;utf-8&#39;</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+</pre></div>
+</div>
+<p>Note that filehandles acquired by <tt class="docutils literal"><span class="pre">open()</span></tt> in Python 3 default
+to returning &#8220;text&#8221;, that is the decoding is done for you. See
+Python 3&#8217;s documentation for the <tt class="docutils literal"><span class="pre">open()</span></tt> built-in for details on
+this.</p>
+<p>If you want a certain encoding applied to <em>all</em> expressions,
+override the <tt class="docutils literal"><span class="pre">unicode</span></tt> builtin with the <tt class="docutils literal"><span class="pre">decode</span></tt> built-in at the
+<a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> or <a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> level:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">t</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="n">templatetext</span><span class="p">,</span> <span class="n">default_filters</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;decode.utf8&#39;</span><span class="p">])</span>
+</pre></div>
+</div>
+<p>Note that the built-in <tt class="docutils literal"><span class="pre">decode</span></tt> object is slower than the
+<tt class="docutils literal"><span class="pre">unicode</span></tt> function, since unlike <tt class="docutils literal"><span class="pre">unicode</span></tt> it&#8217;s not a Python
+built-in, and it also checks the type of the incoming data to
+determine if string conversion is needed first.</p>
+<p>The <tt class="docutils literal"><span class="pre">default_filters</span></tt> argument can be used to entirely customize
+the filtering process of expressions. This argument is described
+in <a class="reference internal" href="filtering.html#filtering-default-filters"><em>The default_filters Argument</em></a>.</p>
+</div>
+<div class="section" id="defining-output-encoding">
+<span id="id1"></span><h2>Defining Output Encoding<a class="headerlink" href="#defining-output-encoding" title="Permalink to this headline">?</a></h2>
+<p>Now that we have a template which produces a pure unicode output
+stream, all the hard work is done. We can take the output and do
+anything with it.</p>
+<p>As stated in the <a class="reference internal" href="usage.html"><em>&#8220;Usage&#8221; chapter</em></a>, both <a class="reference internal" href="usage.html#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> and
+<a class="reference internal" href="usage.html#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> accept <tt class="docutils literal"><span class="pre">output_encoding</span></tt> and <tt class="docutils literal"><span class="pre">encoding_errors</span></tt>
+parameters which can be used to encode the output in any Python
+supported codec:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+<span class="kn">from</span> <span class="nn">mako.lookup</span> <span class="kn">import</span> <span class="n">TemplateLookup</span>
+
+<span class="n">mylookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/docs&#39;</span><span class="p">],</span> <span class="n">output_encoding</span><span class="o">=</span><span class="s">&#39;utf-8&#39;</span><span class="p">,</span> <span class="n">encoding_errors</span><span class="o">=</span><span class="s">&#39;replace&#39;</span><span class="p">)</span>
+
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">mylookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="s">&quot;foo.txt&quot;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p><a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> will return a <tt class="docutils literal"><span class="pre">bytes</span></tt> object in Python 3 if an output
+encoding is specified. By default it performs no encoding and
+returns a native string.</p>
+<p><a class="reference internal" href="usage.html#mako.template.Template.render_unicode" title="mako.template.Template.render_unicode"><tt class="xref py py-meth docutils literal"><span class="pre">render_unicode()</span></tt></a> will return the template output as a Python
+<tt class="docutils literal"><span class="pre">unicode</span></tt> object (or <tt class="docutils literal"><span class="pre">string</span></tt> in Python 3):</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render_unicode</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>The above method disgards the output encoding keyword argument;
+you can encode yourself by saying:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render_unicode</span><span class="p">()</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="s">&#39;utf-8&#39;</span><span class="p">,</span> <span class="s">&#39;replace&#39;</span><span class="p">)</span>
+</pre></div>
+</div>
+<div class="section" id="buffer-selection">
+<h3>Buffer Selection<a class="headerlink" href="#buffer-selection" title="Permalink to this headline">?</a></h3>
+<p>Mako does play some games with the style of buffering used
+internally, to maximize performance. Since the buffer is by far
+the most heavily used object in a render operation, it&#8217;s
+important!</p>
+<p>When calling <a class="reference internal" href="usage.html#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> on a template that does not specify any
+output encoding (i.e. it&#8217;s <tt class="docutils literal"><span class="pre">ascii</span></tt>), Python&#8217;s <tt class="docutils literal"><span class="pre">cStringIO</span></tt> module,
+which cannot handle encoding of non-ASCII <tt class="docutils literal"><span class="pre">unicode</span></tt> objects
+(even though it can send raw byte-strings through), is used for
+buffering. Otherwise, a custom Mako class called
+<tt class="docutils literal"><span class="pre">FastEncodingBuffer</span></tt> is used, which essentially is a super
+dumbed-down version of <tt class="docutils literal"><span class="pre">StringIO</span></tt> that gathers all strings into
+a list and uses <tt class="docutils literal"><span class="pre">u''.join(elements)</span></tt> to produce the final output
+&#8211; it&#8217;s markedly faster than <tt class="docutils literal"><span class="pre">StringIO</span></tt>.</p>
+</div>
+</div>
+<div class="section" id="saying-to-heck-with-it-disabling-the-usage-of-unicode-entirely">
+<span id="unicode-disabled"></span><h2>Saying to Heck with It: Disabling the Usage of Unicode Entirely<a class="headerlink" href="#saying-to-heck-with-it-disabling-the-usage-of-unicode-entirely" title="Permalink to this headline">?</a></h2>
+<p>Some segments of Mako&#8217;s userbase choose to make no usage of
+Unicode whatsoever, and instead would prefer the &#8220;pass through&#8221;
+approach; all string expressions in their templates return
+encoded byte-strings, and they would like these strings to pass
+right through. The only advantage to this approach is that
+templates need not use <tt class="docutils literal"><span class="pre">u&quot;&quot;</span></tt> for literal strings; there&#8217;s an
+arguable speed improvement as well since raw byte-strings
+generally perform slightly faster than unicode objects in
+Python. For these users, assuming they&#8217;re sticking with Python
+2, they can hit the <tt class="docutils literal"><span class="pre">disable_unicode=True</span></tt> flag as so:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># -*- encoding:utf-8 -*-</span>
+<span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+
+<span class="n">t</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;dr?le de petite voix m?a r?veill?.&quot;</span><span class="p">,</span> <span class="n">disable_unicode</span><span class="o">=</span><span class="bp">True</span><span class="p">,</span> <span class="n">input_encoding</span><span class="o">=</span><span class="s">&#39;utf-8&#39;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">t</span><span class="o">.</span><span class="n">code</span>
+</pre></div>
+</div>
+<p>The <tt class="docutils literal"><span class="pre">disable_unicode</span></tt> mode is strictly a Python 2 thing. It is
+not supported at all in Python 3.</p>
+<p>The generated module source code will contain elements like
+these:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="c"># -*- encoding:utf-8 -*-</span>
+<span class="c">#  ...more generated code ...</span>
+
+<span class="k">def</span> <span class="nf">render_body</span><span class="p">(</span><span class="n">context</span><span class="p">,</span><span class="o">**</span><span class="n">pageargs</span><span class="p">):</span>
+    <span class="n">context</span><span class="o">.</span><span class="n">caller_stack</span><span class="o">.</span><span class="n">push_frame</span><span class="p">()</span>
+    <span class="k">try</span><span class="p">:</span>
+        <span class="n">__M_locals</span> <span class="o">=</span> <span class="nb">dict</span><span class="p">(</span><span class="n">pageargs</span><span class="o">=</span><span class="n">pageargs</span><span class="p">)</span>
+        <span class="c"># SOURCE LINE 1</span>
+        <span class="n">context</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s">&#39;dr</span><span class="se">\xc3\xb4</span><span class="s">le de petite voix m</span><span class="se">\xe2\x80\x99</span><span class="s">a r</span><span class="se">\xc3\xa9</span><span class="s">veill</span><span class="se">\xc3\xa9</span><span class="s">.&#39;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="s">&#39;&#39;</span>
+    <span class="k">finally</span><span class="p">:</span>
+        <span class="n">context</span><span class="o">.</span><span class="n">caller_stack</span><span class="o">.</span><span class="n">pop_frame</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>Where above that the string literal used within <a class="reference internal" href="runtime.html#mako.runtime.Context.write" title="mako.runtime.Context.write"><tt class="xref py py-meth docutils literal"><span class="pre">Context.write()</span></tt></a>
+is a regular byte-string.</p>
+<p>When <tt class="docutils literal"><span class="pre">disable_unicode=True</span></tt> is turned on, the <tt class="docutils literal"><span class="pre">default_filters</span></tt>
+argument which normally defaults to <tt class="docutils literal"><span class="pre">[&quot;unicode&quot;]</span></tt> now defaults
+to <tt class="docutils literal"><span class="pre">[&quot;str&quot;]</span></tt> instead. Setting <tt class="docutils literal"><span class="pre">default_filters</span></tt> to the empty list
+<tt class="docutils literal"><span class="pre">[]</span></tt> can remove the overhead of the <tt class="docutils literal"><span class="pre">str</span></tt> call. Also, in this
+mode you <strong>cannot</strong> safely call <a class="reference internal" href="usage.html#mako.template.Template.render_unicode" title="mako.template.Template.render_unicode"><tt class="xref py py-meth docutils literal"><span class="pre">render_unicode()</span></tt></a> &#8211; you&#8217;ll get
+unicode/decode errors.</p>
+<p>The <tt class="docutils literal"><span class="pre">h</span></tt> filter (HTML escape) uses a less performant pure Python
+escape function in non-unicode mode. This because
+MarkupSafe only supports Python unicode objects for non-ASCII
+strings.</p>
+<p class="versionchanged">
+<span class="versionmodified">Changed in version 0.3.4: </span>In prior versions, it used <tt class="docutils literal"><span class="pre">cgi.escape()</span></tt>, which has been replaced
+with a function that also escapes single quotes.</p>
+<div class="section" id="rules-for-using-disable-unicode-true">
+<h3>Rules for using <tt class="docutils literal"><span class="pre">disable_unicode=True</span></tt><a class="headerlink" href="#rules-for-using-disable-unicode-true" title="Permalink to this headline">?</a></h3>
+<ul class="simple">
+<li>Don&#8217;t use this mode unless you really, really want to and you
+absolutely understand what you&#8217;re doing.</li>
+<li>Don&#8217;t use this option just because you don&#8217;t want to learn to
+use Unicode properly; we aren&#8217;t supporting user issues in this
+mode of operation. We will however offer generous help for the
+vast majority of users who stick to the Unicode program.</li>
+<li>Python 3 is unicode by default, and the flag is not available
+when running on Python 3.</li>
+</ul>
+</div>
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="filtering.html" title="previous chapter">Filtering and Buffering</a>
+        Next:
+        <a href="caching.html" title="next chapter">Caching</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/doc/usage.html b/lib/mako-0.7.2/doc/usage.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/doc/usage.html
@@ -0,0 +1,1055 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+<head>
+<title>
+    
+                Usage
+             &mdash; 
+    Mako 0.7.2 Documentation
+</title>
+
+    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+    <link rel="stylesheet" href="_static/docs.css" type="text/css" />
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+          URL_ROOT:    '#',
+          VERSION:     '0.7.2',
+          COLLAPSE_MODINDEX: false,
+          FILE_SUFFIX: '.html'
+      };
+    </script>
+        <script type="text/javascript" src="_static/jquery.js"></script>
+        <script type="text/javascript" src="_static/underscore.js"></script>
+        <script type="text/javascript" src="_static/doctools.js"></script>
+    <link rel="index" title="Index" href="genindex.html" />
+    <link rel="search" title="Search" href="search.html" />
+    <link rel="top" title="Mako 0.7.2 Documentation" href="index.html" />
+        <link rel="next" title="Syntax" href="syntax.html" />
+        <link rel="prev" title="Table of Contents" href="index.html" />
+
+<link rel="stylesheet" href="_static/site.css"></link>
+
+
+</head>
+<body>
+    <div id="wrap">
+    <div class="rightbar">
+    <div class="slogan">
+    Hyperfast and lightweight templating for the Python platform.
+    </div>
+
+
+    </div>
+
+    <a href="http://www.makotemplates.org/"><img src="_static/makoLogo.png" /></a>
+
+    <hr/>
+
+    
+
+
+
+
+
+
+
+
+
+<div id="docs-container">
+
+
+
+<div id="docs-header">
+    <h1>Mako 0.7.2 Documentation</h1>
+
+    <div id="docs-search">
+    Search:
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </div>
+
+    <div id="docs-version-header">
+        Release: <span class="version-num">0.7.2</span>
+
+    </div>
+
+</div>
+
+<div id="docs-top-navigation">
+    <div id="docs-top-page-control" class="docs-navigation-links">
+        <ul>
+            <li>Prev:
+            <a href="index.html" title="previous chapter">Table of Contents</a>
+            </li>
+            <li>Next:
+            <a href="syntax.html" title="next chapter">Syntax</a>
+            </li>
+
+        <li>
+            <a href="index.html">Table of Contents</a> |
+            <a href="genindex.html">Index</a>
+            | <a href="_sources/usage.txt">view source
+        </li>
+        </ul>
+    </div>
+
+    <div id="docs-navigation-banner">
+        <a href="index.html">Mako 0.7.2 Documentation</a>
+        ? 
+                Usage
+             
+
+        <h2>
+            
+                Usage
+            
+        </h2>
+    </div>
+
+</div>
+
+<div id="docs-body-container">
+
+    <div id="docs-sidebar">
+    <h3><a href="index.html">Table of Contents</a></h3>
+    <ul>
+<li><a class="reference internal" href="#">Usage</a><ul>
+<li><a class="reference internal" href="#basic-usage">Basic Usage</a></li>
+<li><a class="reference internal" href="#using-file-based-templates">Using File-Based Templates</a></li>
+<li><a class="reference internal" href="#using-templatelookup">Using <tt class="docutils literal"><span class="pre">TemplateLookup</span></tt></a><ul>
+<li><a class="reference internal" href="#setting-the-collection-size">Setting the Collection Size</a></li>
+<li><a class="reference internal" href="#setting-filesystem-checks">Setting Filesystem Checks</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#using-unicode-and-encoding">Using Unicode and Encoding</a></li>
+<li><a class="reference internal" href="#handling-exceptions">Handling Exceptions</a></li>
+<li><a class="reference internal" href="#common-framework-integrations">Common Framework Integrations</a><ul>
+<li><a class="reference internal" href="#wsgi">WSGI</a></li>
+<li><a class="reference internal" href="#pygments">Pygments</a></li>
+<li><a class="reference internal" href="#babel">Babel</a></li>
+</ul>
+</li>
+<li><a class="reference internal" href="#api-reference">API Reference</a></li>
+</ul>
+</li>
+</ul>
+
+
+    <h4>Previous Topic</h4>
+    <p>
+    <a href="index.html" title="previous chapter">Table of Contents</a>
+    </p>
+    <h4>Next Topic</h4>
+    <p>
+    <a href="syntax.html" title="next chapter">Syntax</a>
+    </p>
+
+    <h4>Quick Search</h4>
+    <p>
+    <form class="search" action="search.html" method="get">
+      <input type="text" name="q" size="18" /> <input type="submit" value="Search" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+    </p>
+
+    </div>
+
+    <div id="docs-body" class="withsidebar" >
+        
+<div class="section" id="usage">
+<span id="usage-toplevel"></span><h1>Usage<a class="headerlink" href="#usage" title="Permalink to this headline">?</a></h1>
+<div class="section" id="basic-usage">
+<h2>Basic Usage<a class="headerlink" href="#basic-usage" title="Permalink to this headline">?</a></h2>
+<p>This section describes the Python API for Mako templates. If you
+are using Mako within a web framework such as Pylons, the work
+of integrating Mako&#8217;s API is already done for you, in which case
+you can skip to the next section, <a class="reference internal" href="syntax.html"><em>Syntax</em></a>.</p>
+<p>The most basic way to create a template and render it is through
+the <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> class:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;hello world!&quot;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>Above, the text argument to <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> is <strong>compiled</strong> into a
+Python module representation. This module contains a function
+called <tt class="docutils literal"><span class="pre">render_body()</span></tt>, which produces the output of the
+template. When <tt class="docutils literal"><span class="pre">mytemplate.render()</span></tt> is called, Mako sets up a
+runtime environment for the template and calls the
+<tt class="docutils literal"><span class="pre">render_body()</span></tt> function, capturing the output into a buffer and
+returning its string contents.</p>
+<p>The code inside the <tt class="docutils literal"><span class="pre">render_body()</span></tt> function has access to a
+namespace of variables. You can specify these variables by
+sending them as additional keyword arguments to the <a class="reference internal" href="#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a>
+method:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;hello, ${name}!&quot;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;jack&quot;</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>The <a class="reference internal" href="#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> method calls upon Mako to create a
+<a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object, which stores all the variable names accessible
+to the template and also stores a buffer used to capture output.
+You can create this <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> yourself and have the template
+render with it, using the <a class="reference internal" href="#mako.template.Template.render_context" title="mako.template.Template.render_context"><tt class="xref py py-meth docutils literal"><span class="pre">render_context()</span></tt></a> method:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+<span class="kn">from</span> <span class="nn">mako.runtime</span> <span class="kn">import</span> <span class="n">Context</span>
+<span class="kn">from</span> <span class="nn">StringIO</span> <span class="kn">import</span> <span class="n">StringIO</span>
+
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;hello, ${name}!&quot;</span><span class="p">)</span>
+<span class="n">buf</span> <span class="o">=</span> <span class="n">StringIO</span><span class="p">()</span>
+<span class="n">ctx</span> <span class="o">=</span> <span class="n">Context</span><span class="p">(</span><span class="n">buf</span><span class="p">,</span> <span class="n">name</span><span class="o">=</span><span class="s">&quot;jack&quot;</span><span class="p">)</span>
+<span class="n">mytemplate</span><span class="o">.</span><span class="n">render_context</span><span class="p">(</span><span class="n">ctx</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">buf</span><span class="o">.</span><span class="n">getvalue</span><span class="p">()</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="using-file-based-templates">
+<h2>Using File-Based Templates<a class="headerlink" href="#using-file-based-templates" title="Permalink to this headline">?</a></h2>
+<p>A <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> can also load its template source code from a file,
+using the <tt class="docutils literal"><span class="pre">filename</span></tt> keyword argument:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="n">filename</span><span class="o">=</span><span class="s">&#39;/docs/mytmpl.txt&#39;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>For improved performance, a <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> which is loaded from a
+file can also cache the source code to its generated module on
+the filesystem as a regular Python module file (i.e. a <tt class="docutils literal"><span class="pre">.py</span></tt>
+file). To do this, just add the <tt class="docutils literal"><span class="pre">module_directory</span></tt> argument to
+the template:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="n">filename</span><span class="o">=</span><span class="s">&#39;/docs/mytmpl.txt&#39;</span><span class="p">,</span> <span class="n">module_directory</span><span class="o">=</span><span class="s">&#39;/tmp/mako_modules&#39;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>When the above code is rendered, a file
+<tt class="docutils literal"><span class="pre">/tmp/mako_modules/docs/mytmpl.txt.py</span></tt> is created containing the
+source code for the module. The next time a <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> with the
+same arguments is created, this module file will be
+automatically re-used.</p>
+</div>
+<div class="section" id="using-templatelookup">
+<span id="usage-templatelookup"></span><h2>Using <tt class="docutils literal"><span class="pre">TemplateLookup</span></tt><a class="headerlink" href="#using-templatelookup" title="Permalink to this headline">?</a></h2>
+<p>All of the examples thus far have dealt with the usage of a
+single <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object. If the code within those templates
+tries to locate another template resource, it will need some way
+to find them, using simple URI strings. For this need, the
+resolution of other templates from within a template is
+accomplished by the <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> class. This class is
+constructed given a list of directories in which to search for
+templates, as well as keyword arguments that will be passed to
+the <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> objects it creates:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+<span class="kn">from</span> <span class="nn">mako.lookup</span> <span class="kn">import</span> <span class="n">TemplateLookup</span>
+
+<span class="n">mylookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/docs&#39;</span><span class="p">])</span>
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="s">&quot;&quot;&quot;&lt;</span><span class="si">%i</span><span class="s">nclude file=&quot;header.txt&quot;/&gt; hello world!&quot;&quot;&quot;</span><span class="p">,</span> <span class="n">lookup</span><span class="o">=</span><span class="n">mylookup</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>Above, we created a textual template which includes the file
+<tt class="docutils literal"><span class="pre">&quot;header.txt&quot;</span></tt>. In order for it to have somewhere to look for
+<tt class="docutils literal"><span class="pre">&quot;header.txt&quot;</span></tt>, we passed a <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> object to it, which
+will search in the directory <tt class="docutils literal"><span class="pre">/docs</span></tt> for the file <tt class="docutils literal"><span class="pre">&quot;header.txt&quot;</span></tt>.</p>
+<p>Usually, an application will store most or all of its templates
+as text files on the filesystem. So far, all of our examples
+have been a little bit contrived in order to illustrate the
+basic concepts. But a real application would get most or all of
+its templates directly from the <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>, using the
+aptly named <a class="reference internal" href="#mako.lookup.TemplateLookup.get_template" title="mako.lookup.TemplateLookup.get_template"><tt class="xref py py-meth docutils literal"><span class="pre">get_template()</span></tt></a> method, which accepts the URI of the
+desired template:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+<span class="kn">from</span> <span class="nn">mako.lookup</span> <span class="kn">import</span> <span class="n">TemplateLookup</span>
+
+<span class="n">mylookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/docs&#39;</span><span class="p">],</span> <span class="n">module_directory</span><span class="o">=</span><span class="s">&#39;/tmp/mako_modules&#39;</span><span class="p">)</span>
+
+<span class="k">def</span> <span class="nf">serve_template</span><span class="p">(</span><span class="n">templatename</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
+    <span class="n">mytemplate</span> <span class="o">=</span> <span class="n">mylookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="n">templatename</span><span class="p">)</span>
+    <span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render</span><span class="p">(</span><span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>In the example above, we create a <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> which will
+look for templates in the <tt class="docutils literal"><span class="pre">/docs</span></tt> directory, and will store
+generated module files in the <tt class="docutils literal"><span class="pre">/tmp/mako_modules</span></tt> directory. The
+lookup locates templates by appending the given URI to each of
+its search directories; so if you gave it a URI of
+<tt class="docutils literal"><span class="pre">/etc/beans/info.txt</span></tt>, it would search for the file
+<tt class="docutils literal"><span class="pre">/docs/etc/beans/info.txt</span></tt>, else raise a <tt class="xref py py-class docutils literal"><span class="pre">TopLevelNotFound</span></tt>
+exception, which is a custom Mako exception.</p>
+<p>When the lookup locates templates, it will also assign a <tt class="docutils literal"><span class="pre">uri</span></tt>
+property to the <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> which is the URI passed to the
+<a class="reference internal" href="#mako.lookup.TemplateLookup.get_template" title="mako.lookup.TemplateLookup.get_template"><tt class="xref py py-meth docutils literal"><span class="pre">get_template()</span></tt></a> call. <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> uses this URI to calculate the
+name of its module file. So in the above example, a
+<tt class="docutils literal"><span class="pre">templatename</span></tt> argument of <tt class="docutils literal"><span class="pre">/etc/beans/info.txt</span></tt> will create a
+module file <tt class="docutils literal"><span class="pre">/tmp/mako_modules/etc/beans/info.txt.py</span></tt>.</p>
+<div class="section" id="setting-the-collection-size">
+<h3>Setting the Collection Size<a class="headerlink" href="#setting-the-collection-size" title="Permalink to this headline">?</a></h3>
+<p>The <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> also serves the important need of caching a
+fixed set of templates in memory at a given time, so that
+successive URI lookups do not result in full template
+compilations and/or module reloads on each request. By default,
+the <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> size is unbounded. You can specify a fixed
+size using the <tt class="docutils literal"><span class="pre">collection_size</span></tt> argument:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">mylookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/docs&#39;</span><span class="p">],</span>
+                <span class="n">module_directory</span><span class="o">=</span><span class="s">&#39;/tmp/mako_modules&#39;</span><span class="p">,</span> <span class="n">collection_size</span><span class="o">=</span><span class="mi">500</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>The above lookup will continue to load templates into memory
+until it reaches a count of around 500. At that point, it will
+clean out a certain percentage of templates using a least
+recently used scheme.</p>
+</div>
+<div class="section" id="setting-filesystem-checks">
+<h3>Setting Filesystem Checks<a class="headerlink" href="#setting-filesystem-checks" title="Permalink to this headline">?</a></h3>
+<p>Another important flag on <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> is
+<tt class="docutils literal"><span class="pre">filesystem_checks</span></tt>. This defaults to <tt class="docutils literal"><span class="pre">True</span></tt>, and says that each
+time a template is returned by the <a class="reference internal" href="#mako.lookup.TemplateLookup.get_template" title="mako.lookup.TemplateLookup.get_template"><tt class="xref py py-meth docutils literal"><span class="pre">get_template()</span></tt></a> method, the
+revision time of the original template file is checked against
+the last time the template was loaded, and if the file is newer
+will reload its contents and recompile the template. On a
+production system, setting <tt class="docutils literal"><span class="pre">filesystem_checks</span></tt> to <tt class="docutils literal"><span class="pre">False</span></tt> can
+afford a small to moderate performance increase (depending on
+the type of filesystem used).</p>
+</div>
+</div>
+<div class="section" id="using-unicode-and-encoding">
+<span id="usage-unicode"></span><h2>Using Unicode and Encoding<a class="headerlink" href="#using-unicode-and-encoding" title="Permalink to this headline">?</a></h2>
+<p>Both <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> and <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> accept <tt class="docutils literal"><span class="pre">output_encoding</span></tt>
+and <tt class="docutils literal"><span class="pre">encoding_errors</span></tt> parameters which can be used to encode the
+output in any Python supported codec:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+<span class="kn">from</span> <span class="nn">mako.lookup</span> <span class="kn">import</span> <span class="n">TemplateLookup</span>
+
+<span class="n">mylookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">(</span><span class="n">directories</span><span class="o">=</span><span class="p">[</span><span class="s">&#39;/docs&#39;</span><span class="p">],</span> <span class="n">output_encoding</span><span class="o">=</span><span class="s">&#39;utf-8&#39;</span><span class="p">,</span> <span class="n">encoding_errors</span><span class="o">=</span><span class="s">&#39;replace&#39;</span><span class="p">)</span>
+
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">mylookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="s">&quot;foo.txt&quot;</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>When using Python 3, the <a class="reference internal" href="#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> method will return a <tt class="docutils literal"><span class="pre">bytes</span></tt>
+object, <strong>if</strong> <tt class="docutils literal"><span class="pre">output_encoding</span></tt> is set. Otherwise it returns a
+<tt class="docutils literal"><span class="pre">string</span></tt>.</p>
+<p>Additionally, the <a class="reference internal" href="#mako.template.Template.render_unicode" title="mako.template.Template.render_unicode"><tt class="xref py py-meth docutils literal"><span class="pre">render_unicode()</span></tt></a> method exists which will
+return the template output as a Python <tt class="docutils literal"><span class="pre">unicode</span></tt> object, or in
+Python 3 a <tt class="docutils literal"><span class="pre">string</span></tt>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render_unicode</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>The above method disregards the output encoding keyword
+argument; you can encode yourself by saying:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">print</span> <span class="n">mytemplate</span><span class="o">.</span><span class="n">render_unicode</span><span class="p">()</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="s">&#39;utf-8&#39;</span><span class="p">,</span> <span class="s">&#39;replace&#39;</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>Note that Mako&#8217;s ability to return data in any encoding and/or
+<tt class="docutils literal"><span class="pre">unicode</span></tt> implies that the underlying output stream of the
+template is a Python unicode object. This behavior is described
+fully in <a class="reference internal" href="unicode.html"><em>The Unicode Chapter</em></a>.</p>
+</div>
+<div class="section" id="handling-exceptions">
+<span id="id1"></span><h2>Handling Exceptions<a class="headerlink" href="#handling-exceptions" title="Permalink to this headline">?</a></h2>
+<p>Template exceptions can occur in two distinct places. One is
+when you <strong>lookup, parse and compile</strong> the template, the other
+is when you <strong>run</strong> the template. Within the running of a
+template, exceptions are thrown normally from whatever Python
+code originated the issue. Mako has its own set of exception
+classes which mostly apply to the lookup and lexer/compiler
+stages of template construction. Mako provides some library
+routines that can be used to help provide Mako-specific
+information about any exception&#8217;s stack trace, as well as
+formatting the exception within textual or HTML format. In all
+cases, the main value of these handlers is that of converting
+Python filenames, line numbers, and code samples into Mako
+template filenames, line numbers, and code samples. All lines
+within a stack trace which correspond to a Mako template module
+will be converted to be against the originating template file.</p>
+<p>To format exception traces, the <a class="reference internal" href="#mako.exceptions.text_error_template" title="mako.exceptions.text_error_template"><tt class="xref py py-func docutils literal"><span class="pre">text_error_template()</span></tt></a> and
+<a class="reference internal" href="#mako.exceptions.html_error_template" title="mako.exceptions.html_error_template"><tt class="xref py py-func docutils literal"><span class="pre">html_error_template()</span></tt></a> functions are provided. They make usage of
+<tt class="docutils literal"><span class="pre">sys.exc_info()</span></tt> to get at the most recently thrown exception.
+Usage of these handlers usually looks like:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako</span> <span class="kn">import</span> <span class="n">exceptions</span>
+
+<span class="k">try</span><span class="p">:</span>
+    <span class="n">template</span> <span class="o">=</span> <span class="n">lookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="n">uri</span><span class="p">)</span>
+    <span class="k">print</span> <span class="n">template</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+<span class="k">except</span><span class="p">:</span>
+    <span class="k">print</span> <span class="n">exceptions</span><span class="o">.</span><span class="n">text_error_template</span><span class="p">()</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>Or for the HTML render function:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako</span> <span class="kn">import</span> <span class="n">exceptions</span>
+
+<span class="k">try</span><span class="p">:</span>
+    <span class="n">template</span> <span class="o">=</span> <span class="n">lookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="n">uri</span><span class="p">)</span>
+    <span class="k">print</span> <span class="n">template</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+<span class="k">except</span><span class="p">:</span>
+    <span class="k">print</span> <span class="n">exceptions</span><span class="o">.</span><span class="n">html_error_template</span><span class="p">()</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>The <a class="reference internal" href="#mako.exceptions.html_error_template" title="mako.exceptions.html_error_template"><tt class="xref py py-func docutils literal"><span class="pre">html_error_template()</span></tt></a> template accepts two options:
+specifying <tt class="docutils literal"><span class="pre">full=False</span></tt> causes only a section of an HTML
+document to be rendered. Specifying <tt class="docutils literal"><span class="pre">css=False</span></tt> will disable the
+default stylesheet from being rendered.</p>
+<p>E.g.:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="k">print</span> <span class="n">exceptions</span><span class="o">.</span><span class="n">html_error_template</span><span class="p">()</span><span class="o">.</span><span class="n">render</span><span class="p">(</span><span class="n">full</span><span class="o">=</span><span class="bp">False</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>The HTML render function is also available built-in to
+<a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> using the <tt class="docutils literal"><span class="pre">format_exceptions</span></tt> flag. In this case, any
+exceptions raised within the <strong>render</strong> stage of the template
+will result in the output being substituted with the output of
+<a class="reference internal" href="#mako.exceptions.html_error_template" title="mako.exceptions.html_error_template"><tt class="xref py py-func docutils literal"><span class="pre">html_error_template()</span></tt></a>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">template</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span><span class="n">filename</span><span class="o">=</span><span class="s">&quot;/foo/bar&quot;</span><span class="p">,</span> <span class="n">format_exceptions</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span>
+<span class="k">print</span> <span class="n">template</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+</pre></div>
+</div>
+<p>Note that the compile stage of the above template occurs when
+you construct the <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> itself, and no output stream is
+defined. Therefore exceptions which occur within the
+lookup/parse/compile stage will not be handled and will
+propagate normally. While the pre-render traceback usually will
+not include any Mako-specific lines anyway, it will mean that
+exceptions which occur previous to rendering and those which
+occur within rendering will be handled differently... so the
+<tt class="docutils literal"><span class="pre">try</span></tt>/<tt class="docutils literal"><span class="pre">except</span></tt> patterns described previously are probably of more
+general use.</p>
+<p>The underlying object used by the error template functions is
+the <a class="reference internal" href="#mako.exceptions.RichTraceback" title="mako.exceptions.RichTraceback"><tt class="xref py py-class docutils literal"><span class="pre">RichTraceback</span></tt></a> object. This object can also be used
+directly to provide custom error views. Here&#8217;s an example usage
+which describes its general API:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">mako.exceptions</span> <span class="kn">import</span> <span class="n">RichTraceback</span>
+
+<span class="k">try</span><span class="p">:</span>
+    <span class="n">template</span> <span class="o">=</span> <span class="n">lookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="n">uri</span><span class="p">)</span>
+    <span class="k">print</span> <span class="n">template</span><span class="o">.</span><span class="n">render</span><span class="p">()</span>
+<span class="k">except</span><span class="p">:</span>
+    <span class="n">traceback</span> <span class="o">=</span> <span class="n">RichTraceback</span><span class="p">()</span>
+    <span class="k">for</span> <span class="p">(</span><span class="n">filename</span><span class="p">,</span> <span class="n">lineno</span><span class="p">,</span> <span class="n">function</span><span class="p">,</span> <span class="n">line</span><span class="p">)</span> <span class="ow">in</span> <span class="n">traceback</span><span class="o">.</span><span class="n">traceback</span><span class="p">:</span>
+        <span class="k">print</span> <span class="s">&quot;File </span><span class="si">%s</span><span class="s">, line </span><span class="si">%s</span><span class="s">, in </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">filename</span><span class="p">,</span> <span class="n">lineno</span><span class="p">,</span> <span class="n">function</span><span class="p">)</span>
+        <span class="k">print</span> <span class="n">line</span><span class="p">,</span> <span class="s">&quot;</span><span class="se">\n</span><span class="s">&quot;</span>
+    <span class="k">print</span> <span class="s">&quot;</span><span class="si">%s</span><span class="s">: </span><span class="si">%s</span><span class="s">&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">traceback</span><span class="o">.</span><span class="n">error</span><span class="o">.</span><span class="n">__class__</span><span class="o">.</span><span class="n">__name__</span><span class="p">),</span> <span class="n">traceback</span><span class="o">.</span><span class="n">error</span><span class="p">)</span>
+</pre></div>
+</div>
+</div>
+<div class="section" id="common-framework-integrations">
+<h2>Common Framework Integrations<a class="headerlink" href="#common-framework-integrations" title="Permalink to this headline">?</a></h2>
+<p>The Mako distribution includes a little bit of helper code for
+the purpose of using Mako in some popular web framework
+scenarios. This is a brief description of what&#8217;s included.</p>
+<div class="section" id="wsgi">
+<h3>WSGI<a class="headerlink" href="#wsgi" title="Permalink to this headline">?</a></h3>
+<p>A sample WSGI application is included in the distribution in the
+file <tt class="docutils literal"><span class="pre">examples/wsgi/run_wsgi.py</span></tt>. This runner is set up to pull
+files from a <cite>templates</cite> as well as an <cite>htdocs</cite> directory and
+includes a rudimental two-file layout. The WSGI runner acts as a
+fully functional standalone web server, using <tt class="docutils literal"><span class="pre">wsgiutils</span></tt> to run
+itself, and propagates GET and POST arguments from the request
+into the <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a>, can serve images, CSS files and other kinds
+of files, and also displays errors using Mako&#8217;s included
+exception-handling utilities.</p>
+</div>
+<div class="section" id="pygments">
+<h3>Pygments<a class="headerlink" href="#pygments" title="Permalink to this headline">?</a></h3>
+<p>A <a class="reference external" href="http://pygments.pocoo.org">Pygments</a>-compatible syntax
+highlighting module is included under <tt class="xref py py-mod docutils literal"><span class="pre">mako.ext.pygmentplugin</span></tt>.
+This module is used in the generation of Mako documentation and
+also contains various <cite>setuptools</cite> entry points under the heading
+<tt class="docutils literal"><span class="pre">pygments.lexers</span></tt>, including <tt class="docutils literal"><span class="pre">mako</span></tt>, <tt class="docutils literal"><span class="pre">html+mako</span></tt>, <tt class="docutils literal"><span class="pre">xml+mako</span></tt>
+(see the <tt class="docutils literal"><span class="pre">setup.py</span></tt> file for all the entry points).</p>
+</div>
+<div class="section" id="babel">
+<h3>Babel<a class="headerlink" href="#babel" title="Permalink to this headline">?</a></h3>
+<p>Mako provides support for extracting <cite>gettext</cite> messages from
+templates via a <a class="reference external" href="http://babel.edgewall.org/">Babel</a> extractor
+entry point under <tt class="docutils literal"><span class="pre">mako.ext.babelplugin</span></tt>.</p>
+<p><cite>Gettext</cite> messages are extracted from all Python code sections,
+including those of control lines and expressions embedded
+in tags.</p>
+<p><a class="reference external" href="http://babel.edgewall.org/wiki/Documentation/messages.html#comments-tags-and-translator-comments-explanation">Translator
+comments</a>
+may also be extracted from Mako templates when a comment tag is
+specified to <a class="reference external" href="http://babel.edgewall.org/">Babel</a> (such as with
+the <tt class="docutils literal"><span class="pre">-c</span></tt> option).</p>
+<p>For example, a project <tt class="docutils literal"><span class="pre">&quot;myproj&quot;</span></tt> contains the following Mako
+template at <tt class="docutils literal"><span class="pre">myproj/myproj/templates/name.html</span></tt>:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;div id=&quot;name&quot;&gt;</span>
+<span class="x">  Name:</span>
+<span class="x">  ## TRANSLATORS: This is a proper name. See the gettext</span>
+<span class="x">  ## manual, section Names.</span>
+<span class="x">  </span><span class="cp">${</span><span class="n">_</span><span class="p">(</span><span class="s">&#39;Francois Pinard&#39;</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/div&gt;</span>
+</pre></div>
+</div>
+<p>To extract gettext messages from this template the project needs
+a Mako section in its <a class="reference external" href="http://babel.edgewall.org/wiki/Documentation/messages.html#extraction-method-mapping-and-configuration">Babel Extraction Method Mapping
+file</a>
+(typically located at <tt class="docutils literal"><span class="pre">myproj/babel.cfg</span></tt>):</p>
+<div class="highlight-cfg"><div class="highlight"><pre><span class="c"># Extraction from Python source files</span>
+
+<span class="k">[python: myproj/**.py]</span>
+
+<span class="c"># Extraction from Mako templates</span>
+
+<span class="k">[mako: myproj/templates/**.html]</span>
+<span class="na">input_encoding</span> <span class="o">=</span> <span class="s">utf-8</span>
+</pre></div>
+</div>
+<p>The Mako extractor supports an optional <tt class="docutils literal"><span class="pre">input_encoding</span></tt>
+parameter specifying the encoding of the templates (identical to
+<a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>/<a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>&#8216;s <tt class="docutils literal"><span class="pre">input_encoding</span></tt> parameter).</p>
+<p>Invoking <a class="reference external" href="http://babel.edgewall.org/">Babel</a>&#8216;s extractor at the
+command line in the project&#8217;s root directory:</p>
+<div class="highlight-sh"><div class="highlight"><pre>myproj<span class="nv">$ </span>pybabel extract -F babel.cfg -c <span class="s2">&quot;TRANSLATORS:&quot;</span> .
+</pre></div>
+</div>
+<p>will output a <cite>gettext</cite> catalog to <cite>stdout</cite> including the following:</p>
+<div class="highlight-pot"><div class="highlight"><pre><span class="c1">#. TRANSLATORS: This is a proper name. See the gettext</span>
+<span class="c1">#. manual, section Names.</span>
+<span class="kd">#: myproj/templates/name.html:5</span>
+<span class="nv">msgid</span> <span class="s">&quot;Francois Pinard&quot;</span>
+<span class="nv">msgstr</span> <span class="s">&quot;&quot;</span>
+</pre></div>
+</div>
+<p>This is only a basic example:
+<a class="reference external" href="http://babel.edgewall.org/">Babel</a> can be invoked from <tt class="docutils literal"><span class="pre">setup.py</span></tt>
+and its command line options specified in the accompanying
+<tt class="docutils literal"><span class="pre">setup.cfg</span></tt> via <a class="reference external" href="http://babel.edgewall.org/wiki/Documentation/setup.html">Babel Distutils/Setuptools
+Integration</a>.</p>
+<p>Comments must immediately precede a <cite>gettext</cite> message to be
+extracted. In the following case the <tt class="docutils literal"><span class="pre">TRANSLATORS:</span></tt> comment would
+not have been extracted:</p>
+<div class="highlight-mako"><div class="highlight"><pre><span class="x">&lt;div id=&quot;name&quot;&gt;</span>
+<span class="x">  ## TRANSLATORS: This is a proper name. See the gettext</span>
+<span class="x">  ## manual, section Names.</span>
+<span class="x">  Name: </span><span class="cp">${</span><span class="n">_</span><span class="p">(</span><span class="s">&#39;Francois Pinard&#39;</span><span class="p">)</span><span class="cp">}</span><span class="x"></span>
+<span class="x">&lt;/div&gt;</span>
+</pre></div>
+</div>
+<p>See the <a class="reference external" href="http://babel.edgewall.org/wiki/Documentation/index.html">Babel User
+Guide</a>
+for more information.</p>
+</div>
+</div>
+<div class="section" id="api-reference">
+<h2>API Reference<a class="headerlink" href="#api-reference" title="Permalink to this headline">?</a></h2>
+<dl class="class">
+<dt id="mako.template.Template">
+<em class="property">class </em><tt class="descclassname">mako.template.</tt><tt class="descname">Template</tt><big>(</big><em>text=None</em>, <em>filename=None</em>, <em>uri=None</em>, <em>format_exceptions=False</em>, <em>error_handler=None</em>, <em>lookup=None</em>, <em>output_encoding=None</em>, <em>encoding_errors='strict'</em>, <em>module_directory=None</em>, <em>cache_args=None</em>, <em>cache_impl='beaker'</em>, <em>cache_enabled=True</em>, <em>cache_type=None</em>, <em>cache_dir=None</em>, <em>cache_url=None</em>, <em>module_filename=None</em>, <em>input_encoding=None</em>, <em>disable_unicode=False</em>, <em>module_writer=None</em>, <em>bytestring_passthrough=False</em>, <em>default_filters=None</em>, <em>buffer_filters=()</em>, <em>strict_undefined=False</em>, <em>imports=None</em>, <em>enable_loop=True</em>, <em>preprocessor=None</em><big>)</big><a class="headerlink" href="#mako.template.Template" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Represents a compiled template.</p>
+<p><a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> includes a reference to the original
+template source (via the <a class="reference internal" href="#RichTraceback.source" title="RichTraceback.source"><tt class="xref py py-attr docutils literal"><span class="pre">source</span></tt></a> attribute)
+as well as the source code of the
+generated Python module (i.e. the <a class="reference internal" href="#mako.template.Template.code" title="mako.template.Template.code"><tt class="xref py py-attr docutils literal"><span class="pre">code</span></tt></a> attribute),
+as well as a reference to an actual Python module.</p>
+<p><a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> is constructed using either a literal string
+representing the template text, or a filename representing a filesystem
+path to a source file.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>text</strong> &#8211; textual template source.  This argument is mutually
+exclusive versus the <tt class="docutils literal"><span class="pre">filename</span></tt> parameter.</li>
+<li><strong>filename</strong> &#8211; filename of the source template.  This argument is
+mutually exclusive versus the <tt class="docutils literal"><span class="pre">text</span></tt> parameter.</li>
+<li><strong>buffer_filters</strong> &#8211; string list of filters to be applied
+to the output of <tt class="docutils literal"><span class="pre">%def</span></tt>s which are buffered, cached, or otherwise
+filtered, after all filters
+defined with the <tt class="docutils literal"><span class="pre">%def</span></tt> itself have been applied. Allows the
+creation of default expression filters that let the output
+of return-valued <tt class="docutils literal"><span class="pre">%def</span></tt>s &#8220;opt out&#8221; of that filtering via
+passing special attributes or objects.</li>
+<li><strong>bytestring_passthrough</strong> &#8211; <p>When <tt class="docutils literal"><span class="pre">True</span></tt>, and <tt class="docutils literal"><span class="pre">output_encoding</span></tt> is
+set to <tt class="docutils literal"><span class="pre">None</span></tt>, and <a class="reference internal" href="#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">Template.render()</span></tt></a> is used to render,
+the <cite>StringIO</cite> or <cite>cStringIO</cite> buffer will be used instead of the
+default &#8220;fast&#8221; buffer.   This allows raw bytestrings in the
+output stream, such as in expressions, to pass straight
+through to the buffer.  This flag is forced
+to <tt class="docutils literal"><span class="pre">True</span></tt> if <tt class="docutils literal"><span class="pre">disable_unicode</span></tt> is also configured.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.4: </span>Added to provide the same behavior as that of the previous series.</p>
+</li>
+<li><strong>cache_args</strong> &#8211; Dictionary of cache configuration arguments that
+will be passed to the <a class="reference internal" href="caching.html#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a>.   See <a class="reference internal" href="caching.html"><em>Caching</em></a>.</li>
+<li><strong>cache_dir</strong> &#8211; <p class="deprecated">
+<span class="versionmodified">Deprecated since version 0.6: </span>Use the <tt class="docutils literal"><span class="pre">'dir'</span></tt> argument in the <tt class="docutils literal"><span class="pre">cache_args</span></tt> dictionary.
+See <a class="reference internal" href="caching.html"><em>Caching</em></a>.</p>
+</li>
+<li><strong>cache_enabled</strong> &#8211; Boolean flag which enables caching of this
+template.  See <a class="reference internal" href="caching.html"><em>Caching</em></a>.</li>
+<li><strong>cache_impl</strong> &#8211; String name of a <a class="reference internal" href="caching.html#mako.cache.CacheImpl" title="mako.cache.CacheImpl"><tt class="xref py py-class docutils literal"><span class="pre">CacheImpl</span></tt></a> caching
+implementation to use.   Defaults to <tt class="docutils literal"><span class="pre">'beaker'</span></tt>.</li>
+<li><strong>cache_type</strong> &#8211; <p class="deprecated">
+<span class="versionmodified">Deprecated since version 0.6: </span>Use the <tt class="docutils literal"><span class="pre">'type'</span></tt> argument in the <tt class="docutils literal"><span class="pre">cache_args</span></tt> dictionary.
+See <a class="reference internal" href="caching.html"><em>Caching</em></a>.</p>
+</li>
+<li><strong>cache_url</strong> &#8211; <p class="deprecated">
+<span class="versionmodified">Deprecated since version 0.6: </span>Use the <tt class="docutils literal"><span class="pre">'url'</span></tt> argument in the <tt class="docutils literal"><span class="pre">cache_args</span></tt> dictionary.
+See <a class="reference internal" href="caching.html"><em>Caching</em></a>.</p>
+</li>
+<li><strong>default_filters</strong> &#8211; List of string filter names that will
+be applied to all expressions.  See <a class="reference internal" href="filtering.html#filtering-default-filters"><em>The default_filters Argument</em></a>.</li>
+<li><strong>disable_unicode</strong> &#8211; Disables all awareness of Python Unicode
+objects.  See <a class="reference internal" href="unicode.html#unicode-disabled"><em>Saying to Heck with It: Disabling the Usage of Unicode Entirely</em></a>.</li>
+<li><strong>enable_loop</strong> &#8211; When <tt class="docutils literal"><span class="pre">True</span></tt>, enable the <tt class="docutils literal"><span class="pre">loop</span></tt> context variable.
+This can be set to <tt class="docutils literal"><span class="pre">False</span></tt> to support templates that may
+be making usage of the name &#8220;<tt class="docutils literal"><span class="pre">loop</span></tt>&#8221;.   Individual templates can
+re-enable the &#8220;loop&#8221; context by placing the directive
+<tt class="docutils literal"><span class="pre">enable_loop=&quot;True&quot;</span></tt> inside the <tt class="docutils literal"><span class="pre">&lt;%page&gt;</span></tt> tag &#8211; see
+<a class="reference internal" href="runtime.html#migrating-loop"><em>Migrating Legacy Templates that Use the Word &#8220;loop&#8221;</em></a>.</li>
+<li><strong>encoding_errors</strong> &#8211; Error parameter passed to <tt class="docutils literal"><span class="pre">encode()</span></tt> when
+string encoding is performed. See <a class="reference internal" href="#usage-unicode"><em>Using Unicode and Encoding</em></a>.</li>
+<li><strong>error_handler</strong> &#8211; Python callable which is called whenever
+compile or runtime exceptions occur. The callable is passed
+the current context as well as the exception. If the
+callable returns <tt class="docutils literal"><span class="pre">True</span></tt>, the exception is considered to
+be handled, else it is re-raised after the function
+completes. Is used to provide custom error-rendering
+functions.</li>
+<li><strong>format_exceptions</strong> &#8211; if <tt class="docutils literal"><span class="pre">True</span></tt>, exceptions which occur during
+the render phase of this template will be caught and
+formatted into an HTML error page, which then becomes the
+rendered result of the <a class="reference internal" href="#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a> call. Otherwise,
+runtime exceptions are propagated outwards.</li>
+<li><strong>imports</strong> &#8211; String list of Python statements, typically individual
+&#8220;import&#8221; lines, which will be placed into the module level
+preamble of all generated Python modules. See the example
+in <a class="reference internal" href="filtering.html#filtering-default-filters"><em>The default_filters Argument</em></a>.</li>
+<li><strong>input_encoding</strong> &#8211; Encoding of the template&#8217;s source code.  Can
+be used in lieu of the coding comment. See
+<a class="reference internal" href="#usage-unicode"><em>Using Unicode and Encoding</em></a> as well as <a class="reference internal" href="unicode.html"><em>The Unicode Chapter</em></a> for
+details on source encoding.</li>
+<li><strong>lookup</strong> &#8211; a <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> instance that will be used
+for all file lookups via the <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt>,
+<tt class="docutils literal"><span class="pre">&lt;%include&gt;</span></tt>, and <tt class="docutils literal"><span class="pre">&lt;%inherit&gt;</span></tt> tags. See
+<a class="reference internal" href="#usage-templatelookup"><em>Using TemplateLookup</em></a>.</li>
+<li><strong>module_directory</strong> &#8211; Filesystem location where generated
+Python module files will be placed.</li>
+<li><strong>module_filename</strong> &#8211; Overrides the filename of the generated
+Python module file. For advanced usage only.</li>
+<li><strong>module_writer</strong> &#8211; <p>A callable which overrides how the Python
+module is written entirely.  The callable is passed the
+encoded source content of the module and the destination
+path to be written to.   The default behavior of module writing
+uses a tempfile in conjunction with a file move in order
+to make the operation atomic.   So a user-defined module
+writing function that mimics the default behavior would be:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="kn">import</span> <span class="nn">tempfile</span>
+<span class="kn">import</span> <span class="nn">os</span>
+<span class="kn">import</span> <span class="nn">shutil</span>
+
+<span class="k">def</span> <span class="nf">module_writer</span><span class="p">(</span><span class="n">source</span><span class="p">,</span> <span class="n">outputpath</span><span class="p">):</span>
+    <span class="p">(</span><span class="n">dest</span><span class="p">,</span> <span class="n">name</span><span class="p">)</span> <span class="o">=</span> \
+        <span class="n">tempfile</span><span class="o">.</span><span class="n">mkstemp</span><span class="p">(</span>
+            <span class="nb">dir</span><span class="o">=</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="n">outputpath</span><span class="p">)</span>
+        <span class="p">)</span>
+
+    <span class="n">os</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="n">dest</span><span class="p">,</span> <span class="n">source</span><span class="p">)</span>
+    <span class="n">os</span><span class="o">.</span><span class="n">close</span><span class="p">(</span><span class="n">dest</span><span class="p">)</span>
+    <span class="n">shutil</span><span class="o">.</span><span class="n">move</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">outputpath</span><span class="p">)</span>
+
+<span class="kn">from</span> <span class="nn">mako.template</span> <span class="kn">import</span> <span class="n">Template</span>
+<span class="n">mytemplate</span> <span class="o">=</span> <span class="n">Template</span><span class="p">(</span>
+                <span class="nb">file</span><span class="o">=</span><span class="s">&quot;index.html&quot;</span><span class="p">,</span>
+                <span class="n">module_directory</span><span class="o">=</span><span class="s">&quot;/path/to/modules&quot;</span><span class="p">,</span>
+                <span class="n">module_writer</span><span class="o">=</span><span class="n">module_writer</span>
+            <span class="p">)</span>
+</pre></div>
+</div>
+<p>The function is provided for unusual configurations where
+certain platform-specific permissions or other special
+steps are needed.</p>
+</li>
+<li><strong>output_encoding</strong> &#8211; The encoding to use when <a class="reference internal" href="#mako.template.Template.render" title="mako.template.Template.render"><tt class="xref py py-meth docutils literal"><span class="pre">render()</span></tt></a>
+is called.
+See <a class="reference internal" href="#usage-unicode"><em>Using Unicode and Encoding</em></a> as well as <a class="reference internal" href="unicode.html"><em>The Unicode Chapter</em></a>.</li>
+<li><strong>preprocessor</strong> &#8211; Python callable which will be passed
+the full template source before it is parsed. The return
+result of the callable will be used as the template source
+code.</li>
+<li><strong>strict_undefined</strong> &#8211; <p>Replaces the automatic usage of
+<tt class="docutils literal"><span class="pre">UNDEFINED</span></tt> for any undeclared variables not located in
+the <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> with an immediate raise of
+<tt class="docutils literal"><span class="pre">NameError</span></tt>. The advantage is immediate reporting of
+missing variables which include the name.</p>
+<p class="versionadded">
+<span class="versionmodified">New in version 0.3.6.</span></p>
+</li>
+<li><strong>uri</strong> &#8211; string URI or other identifier for this template.
+If not provided, the <tt class="docutils literal"><span class="pre">uri</span></tt> is generated from the filesystem
+path, or from the in-memory identity of a non-file-based
+template. The primary usage of the <tt class="docutils literal"><span class="pre">uri</span></tt> is to provide a key
+within <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>, as well as to generate the
+file path of the generated Python module file, if
+<tt class="docutils literal"><span class="pre">module_directory</span></tt> is specified.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+<dl class="attribute">
+<dt id="mako.template.Template.code">
+<tt class="descname">code</tt><a class="headerlink" href="#mako.template.Template.code" title="Permalink to this definition">?</a></dt>
+<dd><p>Return the module source code for this <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.template.Template.get_def">
+<tt class="descname">get_def</tt><big>(</big><em>name</em><big>)</big><a class="headerlink" href="#mako.template.Template.get_def" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a def of this template as a <a class="reference internal" href="#mako.template.DefTemplate" title="mako.template.DefTemplate"><tt class="xref py py-class docutils literal"><span class="pre">DefTemplate</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.template.Template.render">
+<tt class="descname">render</tt><big>(</big><em>*args</em>, <em>**data</em><big>)</big><a class="headerlink" href="#mako.template.Template.render" title="Permalink to this definition">?</a></dt>
+<dd><p>Render the output of this template as a string.</p>
+<p>If the template specifies an output encoding, the string
+will be encoded accordingly, else the output is raw (raw
+output uses <cite>cStringIO</cite> and can&#8217;t handle multibyte
+characters). A <a class="reference internal" href="runtime.html#mako.runtime.Context" title="mako.runtime.Context"><tt class="xref py py-class docutils literal"><span class="pre">Context</span></tt></a> object is created corresponding
+to the given data. Arguments that are explicitly declared
+by this template&#8217;s internal rendering method are also
+pulled from the given <tt class="docutils literal"><span class="pre">*args</span></tt>, <tt class="docutils literal"><span class="pre">**data</span></tt> members.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.template.Template.render_context">
+<tt class="descname">render_context</tt><big>(</big><em>context</em>, <em>*args</em>, <em>**kwargs</em><big>)</big><a class="headerlink" href="#mako.template.Template.render_context" title="Permalink to this definition">?</a></dt>
+<dd><p>Render this <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> with the given context.</p>
+<p>The data is written to the context&#8217;s buffer.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.template.Template.render_unicode">
+<tt class="descname">render_unicode</tt><big>(</big><em>*args</em>, <em>**data</em><big>)</big><a class="headerlink" href="#mako.template.Template.render_unicode" title="Permalink to this definition">?</a></dt>
+<dd><p>Render the output of this template as a unicode object.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="mako.template.Template.source">
+<tt class="descname">source</tt><a class="headerlink" href="#mako.template.Template.source" title="Permalink to this definition">?</a></dt>
+<dd><p>Return the template source code for this <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.template.DefTemplate">
+<em class="property">class </em><tt class="descclassname">mako.template.</tt><tt class="descname">DefTemplate</tt><big>(</big><em>parent</em>, <em>callable_</em><big>)</big><a class="headerlink" href="#mako.template.DefTemplate" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">mako.template.Template</span></tt></a></p>
+<p>A <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> which represents a callable def in a parent
+template.</p>
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.lookup.TemplateCollection">
+<em class="property">class </em><tt class="descclassname">mako.lookup.</tt><tt class="descname">TemplateCollection</tt><a class="headerlink" href="#mako.lookup.TemplateCollection" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Represent a collection of <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> objects,
+identifiable via URI.</p>
+<p>A <a class="reference internal" href="#mako.lookup.TemplateCollection" title="mako.lookup.TemplateCollection"><tt class="xref py py-class docutils literal"><span class="pre">TemplateCollection</span></tt></a> is linked to the usage of
+all template tags that address other templates, such
+as <tt class="docutils literal"><span class="pre">&lt;%include&gt;</span></tt>, <tt class="docutils literal"><span class="pre">&lt;%namespace&gt;</span></tt>, and <tt class="docutils literal"><span class="pre">&lt;%inherit&gt;</span></tt>.
+The <tt class="docutils literal"><span class="pre">file</span></tt> attribute of each of those tags refers
+to a string URI that is passed to that <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>
+object&#8217;s <a class="reference internal" href="#mako.lookup.TemplateCollection" title="mako.lookup.TemplateCollection"><tt class="xref py py-class docutils literal"><span class="pre">TemplateCollection</span></tt></a> for resolution.</p>
+<p><a class="reference internal" href="#mako.lookup.TemplateCollection" title="mako.lookup.TemplateCollection"><tt class="xref py py-class docutils literal"><span class="pre">TemplateCollection</span></tt></a> is an abstract class,
+with the usual default implementation being <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>.</p>
+<dl class="method">
+<dt id="mako.lookup.TemplateCollection.adjust_uri">
+<tt class="descname">adjust_uri</tt><big>(</big><em>uri</em>, <em>filename</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateCollection.adjust_uri" title="Permalink to this definition">?</a></dt>
+<dd><p>Adjust the given <tt class="docutils literal"><span class="pre">uri</span></tt> based on the calling <tt class="docutils literal"><span class="pre">filename</span></tt>.</p>
+<p>When this method is called from the runtime, the
+<tt class="docutils literal"><span class="pre">filename</span></tt> parameter is taken directly to the <tt class="docutils literal"><span class="pre">filename</span></tt>
+attribute of the calling template. Therefore a custom
+<a class="reference internal" href="#mako.lookup.TemplateCollection" title="mako.lookup.TemplateCollection"><tt class="xref py py-class docutils literal"><span class="pre">TemplateCollection</span></tt></a> subclass can place any string
+identifier desired in the <tt class="docutils literal"><span class="pre">filename</span></tt> parameter of the
+<a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> objects it constructs and have them come back
+here.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.lookup.TemplateCollection.filename_to_uri">
+<tt class="descname">filename_to_uri</tt><big>(</big><em>uri</em>, <em>filename</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateCollection.filename_to_uri" title="Permalink to this definition">?</a></dt>
+<dd><p>Convert the given <tt class="docutils literal"><span class="pre">filename</span></tt> to a URI relative to
+this <a class="reference internal" href="#mako.lookup.TemplateCollection" title="mako.lookup.TemplateCollection"><tt class="xref py py-class docutils literal"><span class="pre">TemplateCollection</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.lookup.TemplateCollection.get_template">
+<tt class="descname">get_template</tt><big>(</big><em>uri</em>, <em>relativeto=None</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateCollection.get_template" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object corresponding to the given
+<tt class="docutils literal"><span class="pre">uri</span></tt>.</p>
+<p>The default implementation raises
+<tt class="xref py py-class docutils literal"><span class="pre">NotImplementedError</span></tt>. Implementations should
+raise <tt class="xref py py-class docutils literal"><span class="pre">TemplateLookupException</span></tt> if the given <tt class="docutils literal"><span class="pre">uri</span></tt>
+cannot be resolved.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>uri</strong> &#8211; String URI of the template to be resolved.</li>
+<li><strong>relativeto</strong> &#8211; if present, the given <tt class="docutils literal"><span class="pre">uri</span></tt> is assumed to
+be relative to this URI.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.lookup.TemplateCollection.has_template">
+<tt class="descname">has_template</tt><big>(</big><em>uri</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateCollection.has_template" title="Permalink to this definition">?</a></dt>
+<dd><p>Return <tt class="docutils literal"><span class="pre">True</span></tt> if this <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> is
+capable of returning a <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object for the
+given <tt class="docutils literal"><span class="pre">uri</span></tt>.</p>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><strong>uri</strong> &#8211; String URI of the template to be resolved.</td>
+</tr>
+</tbody>
+</table>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.lookup.TemplateLookup">
+<em class="property">class </em><tt class="descclassname">mako.lookup.</tt><tt class="descname">TemplateLookup</tt><big>(</big><em>directories=None</em>, <em>module_directory=None</em>, <em>filesystem_checks=True</em>, <em>collection_size=-1</em>, <em>format_exceptions=False</em>, <em>error_handler=None</em>, <em>disable_unicode=False</em>, <em>bytestring_passthrough=False</em>, <em>output_encoding=None</em>, <em>encoding_errors='strict'</em>, <em>cache_args=None</em>, <em>cache_impl='beaker'</em>, <em>cache_enabled=True</em>, <em>cache_type=None</em>, <em>cache_dir=None</em>, <em>cache_url=None</em>, <em>modulename_callable=None</em>, <em>module_writer=None</em>, <em>default_filters=None</em>, <em>buffer_filters=()</em>, <em>strict_undefined=False</em>, <em>imports=None</em>, <em>enable_loop=True</em>, <em>input_encoding=None</em>, <em>preprocessor=None</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateLookup" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <a class="reference internal" href="#mako.lookup.TemplateCollection" title="mako.lookup.TemplateCollection"><tt class="xref py py-class docutils literal"><span class="pre">mako.lookup.TemplateCollection</span></tt></a></p>
+<p>Represent a collection of templates that locates template source files
+from the local filesystem.</p>
+<p>The primary argument is the <tt class="docutils literal"><span class="pre">directories</span></tt> argument, the list of
+directories to search:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">lookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">([</span><span class="s">&quot;/path/to/templates&quot;</span><span class="p">])</span>
+<span class="n">some_template</span> <span class="o">=</span> <span class="n">lookup</span><span class="o">.</span><span class="n">get_template</span><span class="p">(</span><span class="s">&quot;/index.html&quot;</span><span class="p">)</span>
+</pre></div>
+</div>
+<p>The <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> can also be given <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> objects
+programatically using <a class="reference internal" href="#mako.lookup.TemplateLookup.put_string" title="mako.lookup.TemplateLookup.put_string"><tt class="xref py py-meth docutils literal"><span class="pre">put_string()</span></tt></a> or <a class="reference internal" href="#mako.lookup.TemplateLookup.put_template" title="mako.lookup.TemplateLookup.put_template"><tt class="xref py py-meth docutils literal"><span class="pre">put_template()</span></tt></a>:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">lookup</span> <span class="o">=</span> <span class="n">TemplateLookup</span><span class="p">()</span>
+<span class="n">lookup</span><span class="o">.</span><span class="n">put_string</span><span class="p">(</span><span class="s">&quot;base.html&quot;</span><span class="p">,</span> <span class="s">&#39;&#39;&#39;</span>
+<span class="s">    &lt;html&gt;&lt;body&gt;${self.next()}&lt;/body&gt;&lt;/html&gt;</span>
+<span class="s">&#39;&#39;&#39;</span><span class="p">)</span>
+<span class="n">lookup</span><span class="o">.</span><span class="n">put_string</span><span class="p">(</span><span class="s">&quot;hello.html&quot;</span><span class="p">,</span> <span class="s">&#39;&#39;&#39;</span>
+<span class="s">    &lt;</span><span class="si">%i</span><span class="s">nclude file=&#39;base.html&#39;/&gt;</span>
+
+<span class="s">    Hello, world !</span>
+<span class="s">&#39;&#39;&#39;</span><span class="p">)</span>
+</pre></div>
+</div>
+<table class="docutils field-list" frame="void" rules="none">
+<col class="field-name" />
+<col class="field-body" />
+<tbody valign="top">
+<tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
+<li><strong>directories</strong> &#8211; A list of directory names which will be
+searched for a particular template URI. The URI is appended
+to each directory and the filesystem checked.</li>
+<li><strong>collection_size</strong> &#8211; Approximate size of the collection used
+to store templates. If left at its default of <tt class="docutils literal"><span class="pre">-1</span></tt>, the size
+is unbounded, and a plain Python dictionary is used to
+relate URI strings to <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> instances.
+Otherwise, a least-recently-used cache object is used which
+will maintain the size of the collection approximately to
+the number given.</li>
+<li><strong>filesystem_checks</strong> &#8211; When at its default value of <tt class="docutils literal"><span class="pre">True</span></tt>,
+each call to <a class="reference internal" href="#mako.lookup.TemplateLookup.get_template" title="mako.lookup.TemplateLookup.get_template"><tt class="xref py py-meth docutils literal"><span class="pre">TemplateLookup.get_template()</span></tt></a> will
+compare the filesystem last modified time to the time in
+which an existing <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object was created.
+This allows the <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> to regenerate a
+new <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> whenever the original source has
+been updated. Set this to <tt class="docutils literal"><span class="pre">False</span></tt> for a very minor
+performance increase.</li>
+<li><strong>modulename_callable</strong> &#8211; A callable which, when present,
+is passed the path of the source file as well as the
+requested URI, and then returns the full path of the
+generated Python module file. This is used to inject
+alternate schemes for Python module location. If left at
+its default of <tt class="docutils literal"><span class="pre">None</span></tt>, the built in system of generation
+based on <tt class="docutils literal"><span class="pre">module_directory</span></tt> plus <tt class="docutils literal"><span class="pre">uri</span></tt> is used.</li>
+</ul>
+</td>
+</tr>
+</tbody>
+</table>
+<p>All other keyword parameters available for
+<a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> are mirrored here. When new
+<a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> objects are created, the keywords
+established with this <a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a> are passed on
+to each new <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a>.</p>
+<dl class="method">
+<dt id="mako.lookup.TemplateLookup.adjust_uri">
+<tt class="descname">adjust_uri</tt><big>(</big><em>uri</em>, <em>relativeto</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateLookup.adjust_uri" title="Permalink to this definition">?</a></dt>
+<dd><p>Adjust the given <tt class="docutils literal"><span class="pre">uri</span></tt> based on the given relative URI.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.lookup.TemplateLookup.filename_to_uri">
+<tt class="descname">filename_to_uri</tt><big>(</big><em>filename</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateLookup.filename_to_uri" title="Permalink to this definition">?</a></dt>
+<dd><p>Convert the given <tt class="docutils literal"><span class="pre">filename</span></tt> to a URI relative to
+this <a class="reference internal" href="#mako.lookup.TemplateCollection" title="mako.lookup.TemplateCollection"><tt class="xref py py-class docutils literal"><span class="pre">TemplateCollection</span></tt></a>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.lookup.TemplateLookup.get_template">
+<tt class="descname">get_template</tt><big>(</big><em>uri</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateLookup.get_template" title="Permalink to this definition">?</a></dt>
+<dd><p>Return a <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object corresponding to the given
+<tt class="docutils literal"><span class="pre">uri</span></tt>.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The <tt class="docutils literal"><span class="pre">relativeto</span></tt> argument is not supported here at the moment.</p>
+</div>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.lookup.TemplateLookup.put_string">
+<tt class="descname">put_string</tt><big>(</big><em>uri</em>, <em>text</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateLookup.put_string" title="Permalink to this definition">?</a></dt>
+<dd><p>Place a new <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object into this
+<a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>, based on the given string of
+<tt class="docutils literal"><span class="pre">text</span></tt>.</p>
+</dd></dl>
+
+<dl class="method">
+<dt id="mako.lookup.TemplateLookup.put_template">
+<tt class="descname">put_template</tt><big>(</big><em>uri</em>, <em>template</em><big>)</big><a class="headerlink" href="#mako.lookup.TemplateLookup.put_template" title="Permalink to this definition">?</a></dt>
+<dd><p>Place a new <a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object into this
+<a class="reference internal" href="#mako.lookup.TemplateLookup" title="mako.lookup.TemplateLookup"><tt class="xref py py-class docutils literal"><span class="pre">TemplateLookup</span></tt></a>, based on the given
+<a class="reference internal" href="#mako.template.Template" title="mako.template.Template"><tt class="xref py py-class docutils literal"><span class="pre">Template</span></tt></a> object.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="class">
+<dt id="mako.exceptions.RichTraceback">
+<em class="property">class </em><tt class="descclassname">mako.exceptions.</tt><tt class="descname">RichTraceback</tt><big>(</big><em>error=None</em>, <em>traceback=None</em><big>)</big><a class="headerlink" href="#mako.exceptions.RichTraceback" title="Permalink to this definition">?</a></dt>
+<dd><p>Bases: <tt class="xref py py-class docutils literal"><span class="pre">object</span></tt></p>
+<p>Pull the current exception from the <tt class="docutils literal"><span class="pre">sys</span></tt> traceback and extracts
+Mako-specific template information.</p>
+<p>See the usage examples in <a class="reference internal" href="#handling-exceptions"><em>Handling Exceptions</em></a>.</p>
+<dl class="attribute">
+<dt id="RichTraceback.error">
+<tt class="descname">error</tt><a class="headerlink" href="#RichTraceback.error" title="Permalink to this definition">?</a></dt>
+<dd><p>the exception instance.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="RichTraceback.message">
+<tt class="descname">message</tt><a class="headerlink" href="#RichTraceback.message" title="Permalink to this definition">?</a></dt>
+<dd><p>the exception error message as unicode.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="RichTraceback.source">
+<tt class="descname">source</tt><a class="headerlink" href="#RichTraceback.source" title="Permalink to this definition">?</a></dt>
+<dd><p>source code of the file where the error occurred.
+If the error occurred within a compiled template,
+this is the template source.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="RichTraceback.lineno">
+<tt class="descname">lineno</tt><a class="headerlink" href="#RichTraceback.lineno" title="Permalink to this definition">?</a></dt>
+<dd><p>line number where the error occurred.  If the error
+occurred within a compiled template, the line number
+is adjusted to that of the template source.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="RichTraceback.records">
+<tt class="descname">records</tt><a class="headerlink" href="#RichTraceback.records" title="Permalink to this definition">?</a></dt>
+<dd><p>a list of 8-tuples containing the original
+python traceback elements, plus the
+filename, line number, source line, and full template source
+for the traceline mapped back to its originating source
+template, if any for that traceline (else the fields are <tt class="docutils literal"><span class="pre">None</span></tt>).</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="RichTraceback.reverse_records">
+<tt class="descname">reverse_records</tt><a class="headerlink" href="#RichTraceback.reverse_records" title="Permalink to this definition">?</a></dt>
+<dd><p>the list of records in reverse
+traceback &#8211; a list of 4-tuples, in the same format as a regular
+python traceback, with template-corresponding
+traceback records replacing the originals.</p>
+</dd></dl>
+
+<dl class="attribute">
+<dt id="RichTraceback.reverse_traceback">
+<tt class="descname">reverse_traceback</tt><a class="headerlink" href="#RichTraceback.reverse_traceback" title="Permalink to this definition">?</a></dt>
+<dd><p>the traceback list in reverse.</p>
+</dd></dl>
+
+</dd></dl>
+
+<dl class="function">
+<dt id="mako.exceptions.html_error_template">
+<tt class="descclassname">mako.exceptions.</tt><tt class="descname">html_error_template</tt><big>(</big><big>)</big><a class="headerlink" href="#mako.exceptions.html_error_template" title="Permalink to this definition">?</a></dt>
+<dd><p>Provides a template that renders a stack trace in an HTML format,
+providing an excerpt of code as well as substituting source template
+filenames, line numbers and code for that of the originating source
+template, as applicable.</p>
+<p>The template&#8217;s default <tt class="docutils literal"><span class="pre">encoding_errors</span></tt> value is <tt class="docutils literal"><span class="pre">'htmlentityreplace'</span></tt>. The
+template has two options. With the <tt class="docutils literal"><span class="pre">full</span></tt> option disabled, only a section of
+an HTML document is returned. With the <tt class="docutils literal"><span class="pre">css</span></tt> option disabled, the default
+stylesheet won&#8217;t be included.</p>
+</dd></dl>
+
+<dl class="function">
+<dt id="mako.exceptions.text_error_template">
+<tt class="descclassname">mako.exceptions.</tt><tt class="descname">text_error_template</tt><big>(</big><em>lookup=None</em><big>)</big><a class="headerlink" href="#mako.exceptions.text_error_template" title="Permalink to this definition">?</a></dt>
+<dd><p>Provides a template that renders a stack trace in a similar format to
+the Python interpreter, substituting source template filenames, line
+numbers and code for that of the originating source template, as
+applicable.</p>
+</dd></dl>
+
+</div>
+</div>
+
+    </div>
+
+</div>
+
+<div id="docs-bottom-navigation" class="docs-navigation-links">
+        Previous:
+        <a href="index.html" title="previous chapter">Table of Contents</a>
+        Next:
+        <a href="syntax.html" title="next chapter">Syntax</a>
+
+    <div id="docs-copyright">
+        &copy; Copyright the Mako authors and contributors.
+        Documentation generated using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3 
+        with Mako templates.
+    </div>
+</div>
+
+</div>
+
+<div class="clearfix">
+
+<hr/>
+
+<div class="copyright">Website content copyright &copy; by Michael Bayer.
+    All rights reserved.  Mako and its documentation are licensed
+    under the MIT license.  mike(&)zzzcomputing.com</div>
+
+</div>
+</div>
+</body>
+</html>
diff --git a/lib/mako-0.7.2/examples/bench/basic.py b/lib/mako-0.7.2/examples/bench/basic.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/basic.py
@@ -0,0 +1,191 @@
+# basic.py - basic benchmarks adapted from Genshi
+# Copyright (C) 2006 Edgewall Software
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in
+#     the documentation and/or other materials provided with the
+#     distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from cgi import escape
+import os
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+import sys
+import timeit
+
+def u(stringlit):
+    if sys.version_info >= (3,):
+        return stringlit
+    else:
+        return stringlit.decode('latin1')
+
+__all__ = ['mako', 'mako_inheritance', 'jinja2', 'jinja2_inheritance',
+            'cheetah', 'django', 'myghty', 'genshi', 'kid']
+
+# Templates content and constants
+TITLE = 'Just a test'
+USER = 'joe'
+ITEMS = ['Number %d' % num for num in range(1, 15)]
+U_ITEMS = [u(item) for item in ITEMS]
+
+def genshi(dirname, verbose=False):
+    from genshi.template import TemplateLoader
+    loader = TemplateLoader([dirname], auto_reload=False)
+    template = loader.load('template.html')
+    def render():
+        data = dict(title=TITLE, user=USER, items=ITEMS)
+        return template.generate(**data).render('xhtml')
+
+    if verbose:
+        print(render())
+    return render
+
+def myghty(dirname, verbose=False):
+    from myghty import interp
+    interpreter = interp.Interpreter(component_root=dirname)
+    def render():
+        data = dict(title=TITLE, user=USER, items=ITEMS)
+        buffer = StringIO()
+        interpreter.execute("template.myt", request_args=data, out_buffer=buffer)
+        return buffer.getvalue()
+    if verbose:
+        print(render())
+    return render
+
+def mako(dirname, verbose=False):
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+    disable_unicode = (sys.version_info < (3,))
+    lookup = TemplateLookup(directories=[dirname], filesystem_checks=False, disable_unicode=disable_unicode)
+    template = lookup.get_template('template.html')
+    def render():
+        return template.render(title=TITLE, user=USER, list_items=U_ITEMS)
+    if verbose:
+        print(template.code + " " + render())
+    return render
+mako_inheritance = mako
+
+def jinja2(dirname, verbose=False):
+    from jinja2 import Environment, FileSystemLoader
+    env = Environment(loader=FileSystemLoader(dirname))
+    template = env.get_template('template.html')
+    def render():
+        return template.render(title=TITLE, user=USER, list_items=U_ITEMS)
+    if verbose:
+        print(render())
+    return render
+jinja2_inheritance = jinja2
+
+def cheetah(dirname, verbose=False):
+    from Cheetah.Template import Template
+    filename = os.path.join(dirname, 'template.tmpl')
+    template = Template(file=filename)
+    def render():
+        template.__dict__.update({'title': TITLE, 'user': USER,
+                                  'list_items': U_ITEMS})
+        return template.respond()
+
+    if verbose:
+        print(dir(template))
+        print(template.generatedModuleCode())
+        print(render())
+    return render
+
+def django(dirname, verbose=False):
+    from django.conf import settings
+    settings.configure(TEMPLATE_DIRS=[os.path.join(dirname, 'templates')])
+    from django import template, templatetags
+    from django.template import loader
+    templatetags.__path__.append(os.path.join(dirname, 'templatetags'))
+    tmpl = loader.get_template('template.html')
+
+    def render():
+        data = {'title': TITLE, 'user': USER, 'items': ITEMS}
+        return tmpl.render(template.Context(data))
+
+    if verbose:
+        print(render())
+    return render
+
+def kid(dirname, verbose=False):
+    import kid
+    kid.path = kid.TemplatePath([dirname])
+    template = kid.Template(file='template.kid')
+    def render():
+        template = kid.Template(file='template.kid',
+                                title=TITLE, user=USER, items=ITEMS)
+        return template.serialize(output='xhtml')
+
+    if verbose:
+        print(render())
+    return render
+
+
+def run(engines, number=2000, verbose=False):
+    basepath = os.path.abspath(os.path.dirname(__file__))
+    for engine in engines:
+        dirname = os.path.join(basepath, engine)
+        if verbose:
+            print('%s:' % engine.capitalize())
+            print('--------------------------------------------------------')
+        else:
+            sys.stdout.write('%s:' % engine.capitalize())
+        t = timeit.Timer(setup='from __main__ import %s; render = %s(r"%s", %s)'
+                                       % (engine, engine, dirname, verbose),
+                                 stmt='render()')
+
+        time = t.timeit(number=number) / number
+        if verbose:
+            print('--------------------------------------------------------')
+        print('%.2f ms' % (1000 * time))
+        if verbose:
+            print('--------------------------------------------------------')
+
+
+if __name__ == '__main__':
+    engines = [arg for arg in sys.argv[1:] if arg[0] != '-']
+    if not engines:
+        engines = __all__
+
+    verbose = '-v' in sys.argv
+
+    if '-p' in sys.argv:
+        try:
+            import hotshot, hotshot.stats
+            prof = hotshot.Profile("template.prof")
+            benchtime = prof.runcall(run, engines, number=100, verbose=verbose)
+            stats = hotshot.stats.load("template.prof")
+        except ImportError:
+            import cProfile, pstats
+            stmt = "run(%r, number=%r, verbose=%r)" % (engines, 1000, verbose)
+            cProfile.runctx(stmt, globals(), {}, "template.prof")
+            stats = pstats.Stats("template.prof")
+        stats.strip_dirs()
+        stats.sort_stats('time', 'calls')
+        stats.print_stats()
+    else:
+        run(engines, verbose=verbose)
diff --git a/lib/mako-0.7.2/examples/bench/cheetah/footer.tmpl b/lib/mako-0.7.2/examples/bench/cheetah/footer.tmpl
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/cheetah/footer.tmpl
@@ -0,0 +1,2 @@
+<div id="footer">
+</div>
diff --git a/lib/mako-0.7.2/examples/bench/cheetah/header.tmpl b/lib/mako-0.7.2/examples/bench/cheetah/header.tmpl
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/cheetah/header.tmpl
@@ -0,0 +1,5 @@
+<div id="header">
+  <h1>$title</h1>
+</div>
+
+
diff --git a/lib/mako-0.7.2/examples/bench/cheetah/template.tmpl b/lib/mako-0.7.2/examples/bench/cheetah/template.tmpl
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/cheetah/template.tmpl
@@ -0,0 +1,31 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <title>${title}</title>
+  </head>
+  <body>
+
+      #def greeting(name)
+      <p>hello ${name}!</p>
+      #end def
+ 
+    #include "cheetah/header.tmpl"
+
+    $greeting($user)
+    $greeting('me')
+    $greeting('world')
+ 
+    <h2>Loop</h2>
+    #if $list_items
+      <ul>
+        #for $list_item in $list_items
+          <li #if $list_item is $list_items[-1] then "class='last'" else ""#>$list_item</li>
+        #end for
+      </ul>
+    #end if
+
+    #include "cheetah/footer.tmpl"
+  </body>
+</html>
diff --git a/lib/mako-0.7.2/examples/bench/django/templatetags/__init__.py b/lib/mako-0.7.2/examples/bench/django/templatetags/__init__.py
new file mode 100644
diff --git a/lib/mako-0.7.2/examples/bench/django/templatetags/bench.py b/lib/mako-0.7.2/examples/bench/django/templatetags/bench.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/django/templatetags/bench.py
@@ -0,0 +1,8 @@
+from django.template import Library, Node, resolve_variable
+from django.utils.html import escape
+
+register = Library()
+
+def greeting(name):
+    return 'Hello, %s!' % escape(name)
+greeting = register.simple_tag(greeting)
diff --git a/lib/mako-0.7.2/examples/bench/kid/base.kid b/lib/mako-0.7.2/examples/bench/kid/base.kid
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/kid/base.kid
@@ -0,0 +1,15 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://purl.org/kid/ns#">
+
+  <p py:def="greeting(name)">
+    Hello, ${name}!
+  </p>
+
+  <body py:match="item.tag == '{http://www.w3.org/1999/xhtml}body'" py:strip="">
+    <div id="header">
+      <h1>${title}</h1>
+    </div>
+    ${item}
+    <div id="footer" />
+  </body>
+</html>
diff --git a/lib/mako-0.7.2/examples/bench/kid/template.kid b/lib/mako-0.7.2/examples/bench/kid/template.kid
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/kid/template.kid
@@ -0,0 +1,22 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://purl.org/kid/ns#"
+      py:extends="'base.kid'"
+      lang="en">
+  <head>
+    <title>${title}</title>
+  </head>
+  <body>
+    <div>${greeting(user)}</div>
+    <div>${greeting('me')}</div>
+    <div>${greeting('world')}</div>
+ 
+    <h2>Loop</h2>
+    <ul py:if="items">
+      <li py:for="idx, item in enumerate(items)" py:content="item"
+          class="${idx + 1 == len(items) and 'last' or None}" />
+    </ul>
+  </body>
+</html>
diff --git a/lib/mako-0.7.2/examples/bench/myghty/base.myt b/lib/mako-0.7.2/examples/bench/myghty/base.myt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/myghty/base.myt
@@ -0,0 +1,29 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<%args scope="request">
+    title
+</%args>
+
+<& REQUEST:header &>
+
+<body>
+<div id="header">
+  <h1><% title %></h1>
+</div>
+
+% m.call_next()
+
+<div id="footer"></div>
+
+</body>
+</html>
+
+
+<%method greeting>
+<%args>
+   name
+</%args>
+Hello, <% name | h %>
+</%method>
diff --git a/lib/mako-0.7.2/examples/bench/myghty/template.myt b/lib/mako-0.7.2/examples/bench/myghty/template.myt
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/bench/myghty/template.myt
@@ -0,0 +1,30 @@
+<%flags>inherit="base.myt"</%flags>
+<%args>
+	title
+	items
+	user
+</%args>
+
+<%method header>
+    <%args scope="request">
+    title
+    </%args>
+<head>
+  <title><% title %></title>
+</head>
+</%method>
+
+  <div><& base.myt:greeting, name=user &></div>
+  <div><& base.myt:greeting, name="me"&></div>
+  <div><& base.myt:greeting, name="world" &></div>
+
+  <h2>Loop</h2>
+%if items:
+      <ul>
+%	for i, item in enumerate(items):
+  <li <% i+1==len(items) and "class='last'" or ""%>><% item %></li>
+%
+      </ul>
+%
+
+ 
diff --git a/lib/mako-0.7.2/examples/wsgi/run_wsgi.py b/lib/mako-0.7.2/examples/wsgi/run_wsgi.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/examples/wsgi/run_wsgi.py
@@ -0,0 +1,78 @@
+#!/usr/bin/python
+
+import cgi, re, os, posixpath, mimetypes
+from mako.lookup import TemplateLookup
+from mako import exceptions
+
+root = './'
+port = 8000
+error_style = 'html' # select 'text' for plaintext error reporting
+
+lookup = TemplateLookup(directories=[root + 'templates', root + 'htdocs'], filesystem_checks=True, module_directory='./modules')
+
+def serve(environ, start_response):
+    """serves requests using the WSGI callable interface."""
+    fieldstorage = cgi.FieldStorage(
+            fp = environ['wsgi.input'],
+            environ = environ,
+            keep_blank_values = True
+    )
+    d = dict([(k, getfield(fieldstorage[k])) for k in fieldstorage])
+
+    uri = environ.get('PATH_INFO', '/')
+    if not uri:
+        uri = '/index.html'
+    else:
+        uri = re.sub(r'^/$', '/index.html', uri)
+
+    if re.match(r'.*\.html$', uri):
+        try:
+            template = lookup.get_template(uri)
+            start_response("200 OK", [('Content-type','text/html')])
+            return [template.render(**d)]
+        except exceptions.TopLevelLookupException:
+            start_response("404 Not Found", [])
+            return ["Cant find template '%s'" % uri]
+        except:
+            if error_style == 'text':
+                start_response("200 OK", [('Content-type','text/plain')])
+                return [exceptions.text_error_template().render()]
+            else:
+                start_response("200 OK", [('Content-type','text/html')])
+                return [exceptions.html_error_template().render()]
+    else:
+        u = re.sub(r'^\/+', '', uri)
+        filename = os.path.join(root, u)
+        start_response("200 OK", [('Content-type',guess_type(uri))])
+        return [file(filename).read()]
+ 
+def getfield(f):
+    """convert values from cgi.Field objects to plain values."""
+    if isinstance(f, list):
+        return [getfield(x) for x in f]
+    else:
+        return f.value
+
+extensions_map = mimetypes.types_map.copy()
+extensions_map.update({
+'': 'text/html', # Default
+})
+
+def guess_type(path):
+    """return a mimetype for the given path based on file extension."""
+    base, ext = posixpath.splitext(path)
+    if ext in extensions_map:
+        return extensions_map[ext]
+    ext = ext.lower()
+    if ext in extensions_map:
+        return extensions_map[ext]
+    else:
+        return extensions_map['']
+ 
+if __name__ == '__main__':
+    import wsgiref.simple_server
+    server = wsgiref.simple_server.make_server('', port, serve)
+    print "Server listening on port %d" % port
+    server.serve_forever()
+
+
diff --git a/lib/mako-0.7.2/mako/__init__.py b/lib/mako-0.7.2/mako/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/__init__.py
@@ -0,0 +1,9 @@
+# mako/__init__.py
+# Copyright (C) 2006-2012 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__ = '0.7.2'
+
diff --git a/lib/mako-0.7.2/mako/_ast_util.py b/lib/mako-0.7.2/mako/_ast_util.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/_ast_util.py
@@ -0,0 +1,839 @@
+# mako/_ast_util.py
+# Copyright (C) 2006-2012 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
+
+"""
+    ast
+    ~~~
+
+    The `ast` module helps Python applications to process trees of the Python
+    abstract syntax grammar.  The abstract syntax itself might change with
+    each Python release; this module helps to find out programmatically what
+    the current grammar looks like and allows modifications of it.
+
+    An abstract syntax tree can be generated by passing `ast.PyCF_ONLY_AST` as
+    a flag to the `compile()` builtin function or by using the `parse()`
+    function from this module.  The result will be a tree of objects whose
+    classes all inherit from `ast.AST`.
+
+    A modified abstract syntax tree can be compiled into a Python code object
+    using the built-in `compile()` function.
+
+    Additionally various helper functions are provided that make working with
+    the trees simpler.  The main intention of the helper functions and this
+    module in general is to provide an easy to use interface for libraries
+    that work tightly with the python syntax (template engines for example).
+
+
+    :copyright: Copyright 2008 by Armin Ronacher.
+    :license: Python License.
+"""
+from _ast import *
+
+
+BOOLOP_SYMBOLS = {
+    And:        'and',
+    Or:         'or'
+}
+
+BINOP_SYMBOLS = {
+    Add:        '+',
+    Sub:        '-',
+    Mult:       '*',
+    Div:        '/',
+    FloorDiv:   '//',
+    Mod:        '%',
+    LShift:     '<<',
+    RShift:     '>>',
+    BitOr:      '|',
+    BitAnd:     '&',
+    BitXor:     '^'
+}
+
+CMPOP_SYMBOLS = {
+    Eq:         '==',
+    Gt:         '>',
+    GtE:        '>=',
+    In:         'in',
+    Is:         'is',
+    IsNot:      'is not',
+    Lt:         '<',
+    LtE:        '<=',
+    NotEq:      '!=',
+    NotIn:      'not in'
+}
+
+UNARYOP_SYMBOLS = {
+    Invert:     '~',
+    Not:        'not',
+    UAdd:       '+',
+    USub:       '-'
+}
+
+ALL_SYMBOLS = {}
+ALL_SYMBOLS.update(BOOLOP_SYMBOLS)
+ALL_SYMBOLS.update(BINOP_SYMBOLS)
+ALL_SYMBOLS.update(CMPOP_SYMBOLS)
+ALL_SYMBOLS.update(UNARYOP_SYMBOLS)
+
+
+def parse(expr, filename='<unknown>', mode='exec'):
+    """Parse an expression into an AST node."""
+    return compile(expr, filename, mode, PyCF_ONLY_AST)
+
+
+def to_source(node, indent_with=' ' * 4):
+    """
+    This function can convert a node tree back into python sourcecode.  This
+    is useful for debugging purposes, especially if you're dealing with custom
+    asts not generated by python itself.
+
+    It could be that the sourcecode is evaluable when the AST itself is not
+    compilable / evaluable.  The reason for this is that the AST contains some
+    more data than regular sourcecode does, which is dropped during
+    conversion.
+
+    Each level of indentation is replaced with `indent_with`.  Per default this
+    parameter is equal to four spaces as suggested by PEP 8, but it might be
+    adjusted to match the application's styleguide.
+    """
+    generator = SourceGenerator(indent_with)
+    generator.visit(node)
+    return ''.join(generator.result)
+
+
+def dump(node):
+    """
+    A very verbose representation of the node passed.  This is useful for
+    debugging purposes.
+    """
+    def _format(node):
+        if isinstance(node, AST):
+            return '%s(%s)' % (node.__class__.__name__,
+                               ', '.join('%s=%s' % (a, _format(b))
+                                         for a, b in iter_fields(node)))
+        elif isinstance(node, list):
+            return '[%s]' % ', '.join(_format(x) for x in node)
+        return repr(node)
+    if not isinstance(node, AST):
+        raise TypeError('expected AST, got %r' % node.__class__.__name__)
+    return _format(node)
+
+
+def copy_location(new_node, old_node):
+    """
+    Copy the source location hint (`lineno` and `col_offset`) from the
+    old to the new node if possible and return the new one.
+    """
+    for attr in 'lineno', 'col_offset':
+        if attr in old_node._attributes and attr in new_node._attributes \
+           and hasattr(old_node, attr):
+            setattr(new_node, attr, getattr(old_node, attr))
+    return new_node
+
+
+def fix_missing_locations(node):
+    """
+    Some nodes require a line number and the column offset.  Without that
+    information the compiler will abort the compilation.  Because it can be
+    a dull task to add appropriate line numbers and column offsets when
+    adding new nodes this function can help.  It copies the line number and
+    column offset of the parent node to the child nodes without this
+    information.
+
+    Unlike `copy_location` this works recursive and won't touch nodes that
+    already have a location information.
+    """
+    def _fix(node, lineno, col_offset):
+        if 'lineno' in node._attributes:
+            if not hasattr(node, 'lineno'):
+                node.lineno = lineno
+            else:
+                lineno = node.lineno
+        if 'col_offset' in node._attributes:
+            if not hasattr(node, 'col_offset'):
+                node.col_offset = col_offset
+            else:
+                col_offset = node.col_offset
+        for child in iter_child_nodes(node):
+            _fix(child, lineno, col_offset)
+    _fix(node, 1, 0)
+    return node
+
+
+def increment_lineno(node, n=1):
+    """
+    Increment the line numbers of all nodes by `n` if they have line number
+    attributes.  This is useful to "move code" to a different location in a
+    file.
+    """
+    for node in zip((node,), walk(node)):
+        if 'lineno' in node._attributes:
+            node.lineno = getattr(node, 'lineno', 0) + n
+
+
+def iter_fields(node):
+    """Iterate over all fields of a node, only yielding existing fields."""
+    # CPython 2.5 compat
+    if not hasattr(node, '_fields') or not node._fields:
+        return
+    for field in node._fields:
+        try:
+            yield field, getattr(node, field)
+        except AttributeError:
+            pass
+
+
+def get_fields(node):
+    """Like `iter_fiels` but returns a dict."""
+    return dict(iter_fields(node))
+
+
+def iter_child_nodes(node):
+    """Iterate over all child nodes or a node."""
+    for name, field in iter_fields(node):
+        if isinstance(field, AST):
+            yield field
+        elif isinstance(field, list):
+            for item in field:
+                if isinstance(item, AST):
+                    yield item
+
+
+def get_child_nodes(node):
+    """Like `iter_child_nodes` but returns a list."""
+    return list(iter_child_nodes(node))
+
+
+def get_compile_mode(node):
+    """
+    Get the mode for `compile` of a given node.  If the node is not a `mod`
+    node (`Expression`, `Module` etc.) a `TypeError` is thrown.
+    """
+    if not isinstance(node, mod):
+        raise TypeError('expected mod node, got %r' % node.__class__.__name__)
+    return {
+        Expression:     'eval',
+        Interactive:    'single'
+    }.get(node.__class__, 'expr')
+
+
+def get_docstring(node):
+    """
+    Return the docstring for the given node or `None` if no docstring can be
+    found.  If the node provided does not accept docstrings a `TypeError`
+    will be raised.
+    """
+    if not isinstance(node, (FunctionDef, ClassDef, Module)):
+        raise TypeError("%r can't have docstrings" % node.__class__.__name__)
+    if node.body and isinstance(node.body[0], Str):
+        return node.body[0].s
+
+
+def walk(node):
+    """
+    Iterate over all nodes.  This is useful if you only want to modify nodes in
+    place and don't care about the context or the order the nodes are returned.
+    """
+    from collections import deque
+    todo = deque([node])
+    while todo:
+        node = todo.popleft()
+        todo.extend(iter_child_nodes(node))
+        yield node
+
+
+class NodeVisitor(object):
+    """
+    Walks the abstract syntax tree and call visitor functions for every node
+    found.  The visitor functions may return values which will be forwarded
+    by the `visit` method.
+
+    Per default the visitor functions for the nodes are ``'visit_'`` +
+    class name of the node.  So a `TryFinally` node visit function would
+    be `visit_TryFinally`.  This behavior can be changed by overriding
+    the `get_visitor` function.  If no visitor function exists for a node
+    (return value `None`) the `generic_visit` visitor is used instead.
+
+    Don't use the `NodeVisitor` if you want to apply changes to nodes during
+    traversing.  For this a special visitor exists (`NodeTransformer`) that
+    allows modifications.
+    """
+
+    def get_visitor(self, node):
+        """
+        Return the visitor function for this node or `None` if no visitor
+        exists for this node.  In that case the generic visit function is
+        used instead.
+        """
+        method = 'visit_' + node.__class__.__name__
+        return getattr(self, method, None)
+
+    def visit(self, node):
+        """Visit a node."""
+        f = self.get_visitor(node)
+        if f is not None:
+            return f(node)
+        return self.generic_visit(node)
+
+    def generic_visit(self, node):
+        """Called if no explicit visitor function exists for a node."""
+        for field, value in iter_fields(node):
+            if isinstance(value, list):
+                for item in value:
+                    if isinstance(item, AST):
+                        self.visit(item)
+            elif isinstance(value, AST):
+                self.visit(value)
+
+
+class NodeTransformer(NodeVisitor):
+    """
+    Walks the abstract syntax tree and allows modifications of nodes.
+
+    The `NodeTransformer` will walk the AST and use the return value of the
+    visitor functions to replace or remove the old node.  If the return
+    value of the visitor function is `None` the node will be removed
+    from the previous location otherwise it's replaced with the return
+    value.  The return value may be the original node in which case no
+    replacement takes place.
+
+    Here an example transformer that rewrites all `foo` to `data['foo']`::
+
+        class RewriteName(NodeTransformer):
+
+            def visit_Name(self, node):
+                return copy_location(Subscript(
+                    value=Name(id='data', ctx=Load()),
+                    slice=Index(value=Str(s=node.id)),
+                    ctx=node.ctx
+                ), node)
+
+    Keep in mind that if the node you're operating on has child nodes
+    you must either transform the child nodes yourself or call the generic
+    visit function for the node first.
+
+    Nodes that were part of a collection of statements (that applies to
+    all statement nodes) may also return a list of nodes rather than just
+    a single node.
+
+    Usually you use the transformer like this::
+
+        node = YourTransformer().visit(node)
+    """
+
+    def generic_visit(self, node):
+        for field, old_value in iter_fields(node):
+            old_value = getattr(node, field, None)
+            if isinstance(old_value, list):
+                new_values = []
+                for value in old_value:
+                    if isinstance(value, AST):
+                        value = self.visit(value)
+                        if value is None:
+                            continue
+                        elif not isinstance(value, AST):
+                            new_values.extend(value)
+                            continue
+                    new_values.append(value)
+                old_value[:] = new_values
+            elif isinstance(old_value, AST):
+                new_node = self.visit(old_value)
+                if new_node is None:
+                    delattr(node, field)
+                else:
+                    setattr(node, field, new_node)
+        return node
+
+
+class SourceGenerator(NodeVisitor):
+    """
+    This visitor is able to transform a well formed syntax tree into python
+    sourcecode.  For more details have a look at the docstring of the
+    `node_to_source` function.
+    """
+
+    def __init__(self, indent_with):
+        self.result = []
+        self.indent_with = indent_with
+        self.indentation = 0
+        self.new_lines = 0
+
+    def write(self, x):
+        if self.new_lines:
+            if self.result:
+                self.result.append('\n' * self.new_lines)
+            self.result.append(self.indent_with * self.indentation)
+            self.new_lines = 0
+        self.result.append(x)
+
+    def newline(self, n=1):
+        self.new_lines = max(self.new_lines, n)
+
+    def body(self, statements):
+        self.new_line = True
+        self.indentation += 1
+        for stmt in statements:
+            self.visit(stmt)
+        self.indentation -= 1
+
+    def body_or_else(self, node):
+        self.body(node.body)
+        if node.orelse:
+            self.newline()
+            self.write('else:')
+            self.body(node.orelse)
+
+    def signature(self, node):
+        want_comma = []
+        def write_comma():
+            if want_comma:
+                self.write(', ')
+            else:
+                want_comma.append(True)
+
+        padding = [None] * (len(node.args) - len(node.defaults))
+        for arg, default in zip(node.args, padding + node.defaults):
+            write_comma()
+            self.visit(arg)
+            if default is not None:
+                self.write('=')
+                self.visit(default)
+        if node.vararg is not None:
+            write_comma()
+            self.write('*' + node.vararg)
+        if node.kwarg is not None:
+            write_comma()
+            self.write('**' + node.kwarg)
+
+    def decorators(self, node):
+        for decorator in node.decorator_list:
+            self.newline()
+            self.write('@')
+            self.visit(decorator)
+
+    # Statements
+
+    def visit_Assign(self, node):
+        self.newline()
+        for idx, target in enumerate(node.targets):
+            if idx:
+                self.write(', ')
+            self.visit(target)
+        self.write(' = ')
+        self.visit(node.value)
+
+    def visit_AugAssign(self, node):
+        self.newline()
+        self.visit(node.target)
+        self.write(BINOP_SYMBOLS[type(node.op)] + '=')
+        self.visit(node.value)
+
+    def visit_ImportFrom(self, node):
+        self.newline()
+        self.write('from %s%s import ' % ('.' * node.level, node.module))
+        for idx, item in enumerate(node.names):
+            if idx:
+                self.write(', ')
+            self.write(item)
+
+    def visit_Import(self, node):
+        self.newline()
+        for item in node.names:
+            self.write('import ')
+            self.visit(item)
+
+    def visit_Expr(self, node):
+        self.newline()
+        self.generic_visit(node)
+
+    def visit_FunctionDef(self, node):
+        self.newline(n=2)
+        self.decorators(node)
+        self.newline()
+        self.write('def %s(' % node.name)
+        self.signature(node.args)
+        self.write('):')
+        self.body(node.body)
+
+    def visit_ClassDef(self, node):
+        have_args = []
+        def paren_or_comma():
+            if have_args:
+                self.write(', ')
+            else:
+                have_args.append(True)
+                self.write('(')
+
+        self.newline(n=3)
+        self.decorators(node)
+        self.newline()
+        self.write('class %s' % node.name)
+        for base in node.bases:
+            paren_or_comma()
+            self.visit(base)
+        # XXX: the if here is used to keep this module compatible
+        #      with python 2.6.
+        if hasattr(node, 'keywords'):
+            for keyword in node.keywords:
+                paren_or_comma()
+                self.write(keyword.arg + '=')
+                self.visit(keyword.value)
+            if node.starargs is not None:
+                paren_or_comma()
+                self.write('*')
+                self.visit(node.starargs)
+            if node.kwargs is not None:
+                paren_or_comma()
+                self.write('**')
+                self.visit(node.kwargs)
+        self.write(have_args and '):' or ':')
+        self.body(node.body)
+
+    def visit_If(self, node):
+        self.newline()
+        self.write('if ')
+        self.visit(node.test)
+        self.write(':')
+        self.body(node.body)
+        while True:
+            else_ = node.orelse
+            if len(else_) == 1 and isinstance(else_[0], If):
+                node = else_[0]
+                self.newline()
+                self.write('elif ')
+                self.visit(node.test)
+                self.write(':')
+                self.body(node.body)
+            else:
+                self.newline()
+                self.write('else:')
+                self.body(else_)
+                break
+
+    def visit_For(self, node):
+        self.newline()
+        self.write('for ')
+        self.visit(node.target)
+        self.write(' in ')
+        self.visit(node.iter)
+        self.write(':')
+        self.body_or_else(node)
+
+    def visit_While(self, node):
+        self.newline()
+        self.write('while ')
+        self.visit(node.test)
+        self.write(':')
+        self.body_or_else(node)
+
+    def visit_With(self, node):
+        self.newline()
+        self.write('with ')
+        self.visit(node.context_expr)
+        if node.optional_vars is not None:
+            self.write(' as ')
+            self.visit(node.optional_vars)
+        self.write(':')
+        self.body(node.body)
+
+    def visit_Pass(self, node):
+        self.newline()
+        self.write('pass')
+
+    def visit_Print(self, node):
+        # XXX: python 2.6 only
+        self.newline()
+        self.write('print ')
+        want_comma = False
+        if node.dest is not None:
+            self.write(' >> ')
+            self.visit(node.dest)
+            want_comma = True
+        for value in node.values:
+            if want_comma:
+                self.write(', ')
+            self.visit(value)
+            want_comma = True
+        if not node.nl:
+            self.write(',')
+
+    def visit_Delete(self, node):
+        self.newline()
+        self.write('del ')
+        for idx, target in enumerate(node):
+            if idx:
+                self.write(', ')
+            self.visit(target)
+
+    def visit_TryExcept(self, node):
+        self.newline()
+        self.write('try:')
+        self.body(node.body)
+        for handler in node.handlers:
+            self.visit(handler)
+
+    def visit_TryFinally(self, node):
+        self.newline()
+        self.write('try:')
+        self.body(node.body)
+        self.newline()
+        self.write('finally:')
+        self.body(node.finalbody)
+
+    def visit_Global(self, node):
+        self.newline()
+        self.write('global ' + ', '.join(node.names))
+
+    def visit_Nonlocal(self, node):
+        self.newline()
+        self.write('nonlocal ' + ', '.join(node.names))
+
+    def visit_Return(self, node):
+        self.newline()
+        self.write('return ')
+        self.visit(node.value)
+
+    def visit_Break(self, node):
+        self.newline()
+        self.write('break')
+
+    def visit_Continue(self, node):
+        self.newline()
+        self.write('continue')
+
+    def visit_Raise(self, node):
+        # XXX: Python 2.6 / 3.0 compatibility
+        self.newline()
+        self.write('raise')
+        if hasattr(node, 'exc') and node.exc is not None:
+            self.write(' ')
+            self.visit(node.exc)
+            if node.cause is not None:
+                self.write(' from ')
+                self.visit(node.cause)
+        elif hasattr(node, 'type') and node.type is not None:
+            self.visit(node.type)
+            if node.inst is not None:
+                self.write(', ')
+                self.visit(node.inst)
+            if node.tback is not None:
+                self.write(', ')
+                self.visit(node.tback)
+
+    # Expressions
+
+    def visit_Attribute(self, node):
+        self.visit(node.value)
+        self.write('.' + node.attr)
+
+    def visit_Call(self, node):
+        want_comma = []
+        def write_comma():
+            if want_comma:
+                self.write(', ')
+            else:
+                want_comma.append(True)
+
+        self.visit(node.func)
+        self.write('(')
+        for arg in node.args:
+            write_comma()
+            self.visit(arg)
+        for keyword in node.keywords:
+            write_comma()
+            self.write(keyword.arg + '=')
+            self.visit(keyword.value)
+        if node.starargs is not None:
+            write_comma()
+            self.write('*')
+            self.visit(node.starargs)
+        if node.kwargs is not None:
+            write_comma()
+            self.write('**')
+            self.visit(node.kwargs)
+        self.write(')')
+
+    def visit_Name(self, node):
+        self.write(node.id)
+
+    def visit_Str(self, node):
+        self.write(repr(node.s))
+
+    def visit_Bytes(self, node):
+        self.write(repr(node.s))
+
+    def visit_Num(self, node):
+        self.write(repr(node.n))
+
+    def visit_Tuple(self, node):
+        self.write('(')
+        idx = -1
+        for idx, item in enumerate(node.elts):
+            if idx:
+                self.write(', ')
+            self.visit(item)
+        self.write(idx and ')' or ',)')
+
+    def sequence_visit(left, right):
+        def visit(self, node):
+            self.write(left)
+            for idx, item in enumerate(node.elts):
+                if idx:
+                    self.write(', ')
+                self.visit(item)
+            self.write(right)
+        return visit
+
+    visit_List = sequence_visit('[', ']')
+    visit_Set = sequence_visit('{', '}')
+    del sequence_visit
+
+    def visit_Dict(self, node):
+        self.write('{')
+        for idx, (key, value) in enumerate(zip(node.keys, node.values)):
+            if idx:
+                self.write(', ')
+            self.visit(key)
+            self.write(': ')
+            self.visit(value)
+        self.write('}')
+
+    def visit_BinOp(self, node):
+        self.write('(')
+        self.visit(node.left)
+        self.write(' %s ' % BINOP_SYMBOLS[type(node.op)])
+        self.visit(node.right)
+        self.write(')')
+
+    def visit_BoolOp(self, node):
+        self.write('(')
+        for idx, value in enumerate(node.values):
+            if idx:
+                self.write(' %s ' % BOOLOP_SYMBOLS[type(node.op)])
+            self.visit(value)
+        self.write(')')
+
+    def visit_Compare(self, node):
+        self.write('(')
+        self.visit(node.left)
+        for op, right in zip(node.ops, node.comparators):
+            self.write(' %s ' % CMPOP_SYMBOLS[type(op)])
+            self.visit(right)
+        self.write(')')
+
+    def visit_UnaryOp(self, node):
+        self.write('(')
+        op = UNARYOP_SYMBOLS[type(node.op)]
+        self.write(op)
+        if op == 'not':
+            self.write(' ')
+        self.visit(node.operand)
+        self.write(')')
+
+    def visit_Subscript(self, node):
+        self.visit(node.value)
+        self.write('[')
+        self.visit(node.slice)
+        self.write(']')
+
+    def visit_Slice(self, node):
+        if node.lower is not None:
+            self.visit(node.lower)
+        self.write(':')
+        if node.upper is not None:
+            self.visit(node.upper)
+        if node.step is not None:
+            self.write(':')
+            if not (isinstance(node.step, Name) and node.step.id == 'None'):
+                self.visit(node.step)
+
+    def visit_ExtSlice(self, node):
+        for idx, item in node.dims:
+            if idx:
+                self.write(', ')
+            self.visit(item)
+
+    def visit_Yield(self, node):
+        self.write('yield ')
+        self.visit(node.value)
+
+    def visit_Lambda(self, node):
+        self.write('lambda ')
+        self.signature(node.args)
+        self.write(': ')
+        self.visit(node.body)
+
+    def visit_Ellipsis(self, node):
+        self.write('Ellipsis')
+
+    def generator_visit(left, right):
+        def visit(self, node):
+            self.write(left)
+            self.visit(node.elt)
+            for comprehension in node.generators:
+                self.visit(comprehension)
+            self.write(right)
+        return visit
+
+    visit_ListComp = generator_visit('[', ']')
+    visit_GeneratorExp = generator_visit('(', ')')
+    visit_SetComp = generator_visit('{', '}')
+    del generator_visit
+
+    def visit_DictComp(self, node):
+        self.write('{')
+        self.visit(node.key)
+        self.write(': ')
+        self.visit(node.value)
+        for comprehension in node.generators:
+            self.visit(comprehension)
+        self.write('}')
+
+    def visit_IfExp(self, node):
+        self.visit(node.body)
+        self.write(' if ')
+        self.visit(node.test)
+        self.write(' else ')
+        self.visit(node.orelse)
+
+    def visit_Starred(self, node):
+        self.write('*')
+        self.visit(node.value)
+
+    def visit_Repr(self, node):
+        # XXX: python 2.6 only
+        self.write('`')
+        self.visit(node.value)
+        self.write('`')
+
+    # Helper Nodes
+
+    def visit_alias(self, node):
+        self.write(node.name)
+        if node.asname is not None:
+            self.write(' as ' + node.asname)
+
+    def visit_comprehension(self, node):
+        self.write(' for ')
+        self.visit(node.target)
+        self.write(' in ')
+        self.visit(node.iter)
+        if node.ifs:
+            for if_ in node.ifs:
+                self.write(' if ')
+                self.visit(if_)
+
+    def visit_excepthandler(self, node):
+        self.newline()
+        self.write('except')
+        if node.type is not None:
+            self.write(' ')
+            self.visit(node.type)
+            if node.name is not None:
+                self.write(' as ')
+                self.visit(node.name)
+        self.write(':')
+        self.body(node.body)
diff --git a/lib/mako-0.7.2/mako/ast.py b/lib/mako-0.7.2/mako/ast.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/ast.py
@@ -0,0 +1,151 @@
+# mako/ast.py
+# Copyright (C) 2006-2012 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
+
+"""utilities for analyzing expressions and blocks of Python
+code, as well as generating Python from AST nodes"""
+
+from mako import exceptions, pyparser, util
+import re
+
+class PythonCode(object):
+    """represents information about a string containing Python code"""
+    def __init__(self, code, **exception_kwargs):
+        self.code = code
+
+        # represents all identifiers which are assigned to at some point in
+        # the code
+        self.declared_identifiers = set()
+
+        # represents all identifiers which are referenced before their
+        # assignment, if any
+        self.undeclared_identifiers = set()
+
+        # note that an identifier can be in both the undeclared and declared
+        # lists.
+
+        # using AST to parse instead of using code.co_varnames,
+        # code.co_names has several advantages:
+        # - we can locate an identifier as "undeclared" even if
+        # its declared later in the same block of code
+        # - AST is less likely to break with version changes
+        # (for example, the behavior of co_names changed a little bit
+        # in python version 2.5)
+        if isinstance(code, basestring):
+            expr = pyparser.parse(code.lstrip(), "exec", **exception_kwargs)
+        else:
+            expr = code
+
+        f = pyparser.FindIdentifiers(self, **exception_kwargs)
+        f.visit(expr)
+
+class ArgumentList(object):
+    """parses a fragment of code as a comma-separated list of expressions"""
+    def __init__(self, code, **exception_kwargs):
+        self.codeargs = []
+        self.args = []
+        self.declared_identifiers = set()
+        self.undeclared_identifiers = set()
+        if isinstance(code, basestring):
+            if re.match(r"\S", code) and not re.match(r",\s*$", code):
+                # if theres text and no trailing comma, insure its parsed
+                # as a tuple by adding a trailing comma
+                code  += ","
+            expr = pyparser.parse(code, "exec", **exception_kwargs)
+        else:
+            expr = code
+
+        f = pyparser.FindTuple(self, PythonCode, **exception_kwargs)
+        f.visit(expr)
+
+class PythonFragment(PythonCode):
+    """extends PythonCode to provide identifier lookups in partial control
+    statements
+
+    e.g.
+        for x in 5:
+        elif y==9:
+        except (MyException, e):
+    etc.
+    """
+    def __init__(self, code, **exception_kwargs):
+        m = re.match(r'^(\w+)(?:\s+(.*?))?:\s*(#|$)', code.strip(), re.S)
+        if not m:
+            raise exceptions.CompileException(
+                          "Fragment '%s' is not a partial control statement" %
+                          code, **exception_kwargs)
+        if m.group(3):
+            code = code[:m.start(3)]
+        (keyword, expr) = m.group(1,2)
+        if keyword in ['for','if', 'while']:
+            code = code + "pass"
+        elif keyword == 'try':
+            code = code + "pass\nexcept:pass"
+        elif keyword == 'elif' or keyword == 'else':
+            code = "if False:pass\n" + code + "pass"
+        elif keyword == 'except':
+            code = "try:pass\n" + code + "pass"
+        elif keyword == 'with':
+            code = code + "pass"
+        else:
+            raise exceptions.CompileException(
+                                "Unsupported control keyword: '%s'" %
+                                keyword, **exception_kwargs)
+        super(PythonFragment, self).__init__(code, **exception_kwargs)
+
+
+class FunctionDecl(object):
+    """function declaration"""
+    def __init__(self, code, allow_kwargs=True, **exception_kwargs):
+        self.code = code
+        expr = pyparser.parse(code, "exec", **exception_kwargs)
+
+        f = pyparser.ParseFunc(self, **exception_kwargs)
+        f.visit(expr)
+        if not hasattr(self, 'funcname'):
+            raise exceptions.CompileException(
+                              "Code '%s' is not a function declaration" % code,
+                              **exception_kwargs)
+        if not allow_kwargs and self.kwargs:
+            raise exceptions.CompileException(
+                                "'**%s' keyword argument not allowed here" %
+                                self.argnames[-1], **exception_kwargs)
+
+    def get_argument_expressions(self, include_defaults=True):
+        """return the argument declarations of this FunctionDecl as a printable
+        list."""
+
+        namedecls = []
+        defaults = [d for d in self.defaults]
+        kwargs = self.kwargs
+        varargs = self.varargs
+        argnames = [f for f in self.argnames]
+        argnames.reverse()
+        for arg in argnames:
+            default = None
+            if kwargs:
+                arg = "**" + arg
+                kwargs = False
+            elif varargs:
+                arg = "*" + arg
+                varargs = False
+            else:
+                default = len(defaults) and defaults.pop() or None
+            if include_defaults and default:
+                namedecls.insert(0, "%s=%s" %
+                            (arg,
+                            pyparser.ExpressionGenerator(default).value()
+                            )
+                        )
+            else:
+                namedecls.insert(0, arg)
+        return namedecls
+
+class FunctionArgs(FunctionDecl):
+    """the argument portion of a function declaration"""
+
+    def __init__(self, code, **kwargs):
+        super(FunctionArgs, self).__init__("def ANON(%s):pass" % code,
+                **kwargs)
diff --git a/lib/mako-0.7.2/mako/cache.py b/lib/mako-0.7.2/mako/cache.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/cache.py
@@ -0,0 +1,236 @@
+# mako/cache.py
+# Copyright (C) 2006-2012 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
+
+from mako import exceptions, util
+
+_cache_plugins = util.PluginLoader("mako.cache")
+
+register_plugin = _cache_plugins.register
+register_plugin("beaker", "mako.ext.beaker_cache", "BeakerCacheImpl")
+
+
+class Cache(object):
+    """Represents a data content cache made available to the module
+    space of a specific :class:`.Template` object.
+
+    .. versionadded:: 0.6
+       :class:`.Cache` by itself is mostly a
+       container for a :class:`.CacheImpl` object, which implements
+       a fixed API to provide caching services; specific subclasses exist to
+       implement different
+       caching strategies.   Mako includes a backend that works with
+       the Beaker caching system.   Beaker itself then supports
+       a number of backends (i.e. file, memory, memcached, etc.)
+
+    The construction of a :class:`.Cache` is part of the mechanics
+    of a :class:`.Template`, and programmatic access to this
+    cache is typically via the :attr:`.Template.cache` attribute.
+
+    """
+
+    impl = None
+    """Provide the :class:`.CacheImpl` in use by this :class:`.Cache`.
+
+    This accessor allows a :class:`.CacheImpl` with additional
+    methods beyond that of :class:`.Cache` to be used programmatically.
+
+    """
+
+    id = None
+    """Return the 'id' that identifies this cache.
+
+    This is a value that should be globally unique to the
+    :class:`.Template` associated with this cache, and can
+    be used by a caching system to name a local container
+    for data specific to this template.
+
+    """
+
+    starttime = None
+    """Epochal time value for when the owning :class:`.Template` was
+    first compiled.
+
+    A cache implementation may wish to invalidate data earlier than
+    this timestamp; this has the effect of the cache for a specific
+    :class:`.Template` starting clean any time the :class:`.Template`
+    is recompiled, such as when the original template file changed on
+    the filesystem.
+
+    """
+
+    def __init__(self, template, *args):
+        # check for a stale template calling the
+        # constructor
+        if isinstance(template, basestring) and args:
+            return
+        self.template = template
+        self.id = template.module.__name__
+        self.starttime = template.module._modified_time
+        self._def_regions = {}
+        self.impl = self._load_impl(self.template.cache_impl)
+
+    def _load_impl(self, name):
+        return _cache_plugins.load(name)(self)
+
+    def get_or_create(self, key, creation_function, **kw):
+        """Retrieve a value from the cache, using the given creation function
+        to generate a new value."""
+
+        return self._ctx_get_or_create(key, creation_function, None, **kw)
+
+    def _ctx_get_or_create(self, key, creation_function, context, **kw):
+        """Retrieve a value from the cache, using the given creation function
+        to generate a new value."""
+
+        if not self.template.cache_enabled:
+            return creation_function()
+
+        return self.impl.get_or_create(key,
+                        creation_function,
+                        **self._get_cache_kw(kw, context))
+
+    def set(self, key, value, **kw):
+        """Place a value in the cache.
+
+        :param key: the value's key.
+        :param value: the value.
+        :param \**kw: cache configuration arguments.
+
+        """
+
+        self.impl.set(key, value, **self._get_cache_kw(kw, None))
+
+    put = set
+    """A synonym for :meth:`.Cache.set`.
+
+    This is here for backwards compatibility.
+
+    """
+
+    def get(self, key, **kw):
+        """Retrieve a value from the cache.
+
+        :param key: the value's key.
+        :param \**kw: cache configuration arguments.  The
+         backend is configured using these arguments upon first request.
+         Subsequent requests that use the same series of configuration
+         values will use that same backend.
+
+        """
+        return self.impl.get(key, **self._get_cache_kw(kw, None))
+
+    def invalidate(self, key, **kw):
+        """Invalidate a value in the cache.
+
+        :param key: the value's key.
+        :param \**kw: cache configuration arguments.  The
+         backend is configured using these arguments upon first request.
+         Subsequent requests that use the same series of configuration
+         values will use that same backend.
+
+        """
+        self.impl.invalidate(key, **self._get_cache_kw(kw, None))
+
+    def invalidate_body(self):
+        """Invalidate the cached content of the "body" method for this
+        template.
+
+        """
+        self.invalidate('render_body', __M_defname='render_body')
+
+    def invalidate_def(self, name):
+        """Invalidate the cached content of a particular ``<%def>`` within this
+        template.
+
+        """
+
+        self.invalidate('render_%s' % name, __M_defname='render_%s' % name)
+
+    def invalidate_closure(self, name):
+        """Invalidate a nested ``<%def>`` within this template.
+
+        Caching of nested defs is a blunt tool as there is no
+        management of scope -- nested defs that use cache tags
+        need to have names unique of all other nested defs in the
+        template, else their content will be overwritten by
+        each other.
+
+        """
+
+        self.invalidate(name, __M_defname=name)
+
+    def _get_cache_kw(self, kw, context):
+        defname = kw.pop('__M_defname', None)
+        if not defname:
+            tmpl_kw = self.template.cache_args.copy()
+            tmpl_kw.update(kw)
+        elif defname in self._def_regions:
+            tmpl_kw = self._def_regions[defname]
+        else:
+            tmpl_kw = self.template.cache_args.copy()
+            tmpl_kw.update(kw)
+            self._def_regions[defname] = tmpl_kw
+        if context and self.impl.pass_context:
+            tmpl_kw = tmpl_kw.copy()
+            tmpl_kw.setdefault('context', context)
+        return tmpl_kw
+
+class CacheImpl(object):
+    """Provide a cache implementation for use by :class:`.Cache`."""
+
+    def __init__(self, cache):
+        self.cache = cache
+
+    pass_context = False
+    """If ``True``, the :class:`.Context` will be passed to
+    :meth:`get_or_create <.CacheImpl.get_or_create>` as the name ``'context'``.
+    """
+
+    def get_or_create(self, key, creation_function, **kw):
+        """Retrieve a value from the cache, using the given creation function
+        to generate a new value.
+
+        This function *must* return a value, either from
+        the cache, or via the given creation function.
+        If the creation function is called, the newly
+        created value should be populated into the cache
+        under the given key before being returned.
+
+        :param key: the value's key.
+        :param creation_function: function that when called generates
+         a new value.
+        :param \**kw: cache configuration arguments.
+
+        """
+        raise NotImplementedError()
+
+    def set(self, key, value, **kw):
+        """Place a value in the cache.
+
+        :param key: the value's key.
+        :param value: the value.
+        :param \**kw: cache configuration arguments.
+
+        """
+        raise NotImplementedError()
+
+    def get(self, key, **kw):
+        """Retrieve a value from the cache.
+
+        :param key: the value's key.
+        :param \**kw: cache configuration arguments.
+
+        """
+        raise NotImplementedError()
+
+    def invalidate(self, key, **kw):
+        """Invalidate a value in the cache.
+
+        :param key: the value's key.
+        :param \**kw: cache configuration arguments.
+
+        """
+        raise NotImplementedError()
diff --git a/lib/mako-0.7.2/mako/codegen.py b/lib/mako-0.7.2/mako/codegen.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/codegen.py
@@ -0,0 +1,1209 @@
+# mako/codegen.py
+# Copyright (C) 2006-2012 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
+
+"""provides functionality for rendering a parsetree constructing into module
+source code."""
+
+import time
+import re
+from mako.pygen import PythonPrinter
+from mako import util, ast, parsetree, filters, exceptions
+
+MAGIC_NUMBER = 8
+
+# names which are hardwired into the
+# template and are not accessed via the
+# context itself
+RESERVED_NAMES = set(['context', 'loop', 'UNDEFINED'])
+
+def compile(node,
+                uri,
+                filename=None,
+                default_filters=None,
+                buffer_filters=None,
+                imports=None,
+                source_encoding=None,
+                generate_magic_comment=True,
+                disable_unicode=False,
+                strict_undefined=False,
+                enable_loop=True,
+                reserved_names=()):
+
+    """Generate module source code given a parsetree node,
+      uri, and optional source filename"""
+
+    # if on Py2K, push the "source_encoding" string to be
+    # a bytestring itself, as we will be embedding it into
+    # the generated source and we don't want to coerce the
+    # result into a unicode object, in "disable_unicode" mode
+    if not util.py3k and isinstance(source_encoding, unicode):
+        source_encoding = source_encoding.encode(source_encoding)
+
+
+    buf = util.FastEncodingBuffer()
+
+    printer = PythonPrinter(buf)
+    _GenerateRenderMethod(printer,
+                            _CompileContext(uri,
+                                            filename,
+                                            default_filters,
+                                            buffer_filters,
+                                            imports,
+                                            source_encoding,
+                                            generate_magic_comment,
+                                            disable_unicode,
+                                            strict_undefined,
+                                            enable_loop,
+                                            reserved_names),
+                                node)
+    return buf.getvalue()
+
+class _CompileContext(object):
+    def __init__(self,
+                    uri,
+                    filename,
+                    default_filters,
+                    buffer_filters,
+                    imports,
+                    source_encoding,
+                    generate_magic_comment,
+                    disable_unicode,
+                    strict_undefined,
+                    enable_loop,
+                    reserved_names):
+        self.uri = uri
+        self.filename = filename
+        self.default_filters = default_filters
+        self.buffer_filters = buffer_filters
+        self.imports = imports
+        self.source_encoding = source_encoding
+        self.generate_magic_comment = generate_magic_comment
+        self.disable_unicode = disable_unicode
+        self.strict_undefined = strict_undefined
+        self.enable_loop = enable_loop
+        self.reserved_names = reserved_names
+
+class _GenerateRenderMethod(object):
+    """A template visitor object which generates the
+       full module source for a template.
+
+    """
+    def __init__(self, printer, compiler, node):
+        self.printer = printer
+        self.last_source_line = -1
+        self.compiler = compiler
+        self.node = node
+        self.identifier_stack = [None]
+
+        self.in_def = isinstance(node, (parsetree.DefTag, parsetree.BlockTag))
+
+        if self.in_def:
+            name = "render_%s" % node.funcname
+            args = node.get_argument_expressions()
+            filtered = len(node.filter_args.args) > 0
+            buffered = eval(node.attributes.get('buffered', 'False'))
+            cached = eval(node.attributes.get('cached', 'False'))
+            defs = None
+            pagetag = None
+            if node.is_block and not node.is_anonymous:
+                args += ['**pageargs']
+        else:
+            defs = self.write_toplevel()
+            pagetag = self.compiler.pagetag
+            name = "render_body"
+            if pagetag is not None:
+                args = pagetag.body_decl.get_argument_expressions()
+                if not pagetag.body_decl.kwargs:
+                    args += ['**pageargs']
+                cached = eval(pagetag.attributes.get('cached', 'False'))
+                self.compiler.enable_loop = self.compiler.enable_loop or eval(
+                                        pagetag.attributes.get(
+                                                'enable_loop', 'False')
+                                    )
+            else:
+                args = ['**pageargs']
+                cached = False
+            buffered = filtered = False
+        if args is None:
+            args = ['context']
+        else:
+            args = [a for a in ['context'] + args]
+
+        self.write_render_callable(
+                            pagetag or node,
+                            name, args,
+                            buffered, filtered, cached)
+
+        if defs is not None:
+            for node in defs:
+                _GenerateRenderMethod(printer, compiler, node)
+
+    @property
+    def identifiers(self):
+        return self.identifier_stack[-1]
+
+    def write_toplevel(self):
+        """Traverse a template structure for module-level directives and
+        generate the start of module-level code.
+
+        """
+        inherit = []
+        namespaces = {}
+        module_code = []
+        encoding =[None]
+
+        self.compiler.pagetag = None
+
+        class FindTopLevel(object):
+            def visitInheritTag(s, node):
+                inherit.append(node)
+            def visitNamespaceTag(s, node):
+                namespaces[node.name] = node
+            def visitPageTag(s, node):
+                self.compiler.pagetag = node
+            def visitCode(s, node):
+                if node.ismodule:
+                    module_code.append(node)
+
+        f = FindTopLevel()
+        for n in self.node.nodes:
+            n.accept_visitor(f)
+
+        self.compiler.namespaces = namespaces
+
+        module_ident = set()
+        for n in module_code:
+            module_ident = module_ident.union(n.declared_identifiers())
+
+        module_identifiers = _Identifiers(self.compiler)
+        module_identifiers.declared = module_ident
+
+        # module-level names, python code
+        if self.compiler.generate_magic_comment and \
+            self.compiler.source_encoding:
+            self.printer.writeline("# -*- encoding:%s -*-" %
+                                    self.compiler.source_encoding)
+
+        self.printer.writeline("from mako import runtime, filters, cache")
+        self.printer.writeline("UNDEFINED = runtime.UNDEFINED")
+        self.printer.writeline("__M_dict_builtin = dict")
+        self.printer.writeline("__M_locals_builtin = locals")
+        self.printer.writeline("_magic_number = %r" % MAGIC_NUMBER)
+        self.printer.writeline("_modified_time = %r" % time.time())
+        self.printer.writeline("_enable_loop = %r" % self.compiler.enable_loop)
+        self.printer.writeline(
+                            "_template_filename = %r" % self.compiler.filename)
+        self.printer.writeline("_template_uri = %r" % self.compiler.uri)
+        self.printer.writeline(
+                    "_source_encoding = %r" % self.compiler.source_encoding)
+        if self.compiler.imports:
+            buf = ''
+            for imp in self.compiler.imports:
+                buf += imp + "\n"
+                self.printer.writeline(imp)
+            impcode = ast.PythonCode(
+                            buf,
+                            source='', lineno=0,
+                            pos=0,
+                            filename='template defined imports')
+        else:
+            impcode = None
+
+        main_identifiers = module_identifiers.branch(self.node)
+        module_identifiers.topleveldefs = \
+            module_identifiers.topleveldefs.\
+                union(main_identifiers.topleveldefs)
+        module_identifiers.declared.add("UNDEFINED")
+        if impcode:
+            module_identifiers.declared.update(impcode.declared_identifiers)
+
+        self.compiler.identifiers = module_identifiers
+        self.printer.writeline("_exports = %r" %
+                            [n.name for n in
+                            main_identifiers.topleveldefs.values()]
+                        )
+        self.printer.write("\n\n")
+
+        if len(module_code):
+            self.write_module_code(module_code)
+
+        if len(inherit):
+            self.write_namespaces(namespaces)
+            self.write_inherit(inherit[-1])
+        elif len(namespaces):
+            self.write_namespaces(namespaces)
+
+        return main_identifiers.topleveldefs.values()
+
+    def write_render_callable(self, node, name, args, buffered, filtered,
+            cached):
+        """write a top-level render callable.
+
+        this could be the main render() method or that of a top-level def."""
+
+        if self.in_def:
+            decorator = node.decorator
+            if decorator:
+                self.printer.writeline(
+                                 "@runtime._decorate_toplevel(%s)" % decorator)
+
+        self.printer.writelines(
+            "def %s(%s):" % (name, ','.join(args)),
+                # push new frame, assign current frame to __M_caller
+                "__M_caller = context.caller_stack._push_frame()",
+                "try:"
+        )
+        if buffered or filtered or cached:
+            self.printer.writeline("context._push_buffer()")
+
+        self.identifier_stack.append(
+                                   self.compiler.identifiers.branch(self.node))
+        if (not self.in_def or self.node.is_block) and '**pageargs' in args:
+            self.identifier_stack[-1].argument_declared.add('pageargs')
+
+        if not self.in_def and (
+                                len(self.identifiers.locally_assigned) > 0 or
+                                len(self.identifiers.argument_declared) > 0
+                                ):
+            self.printer.writeline("__M_locals = __M_dict_builtin(%s)" %
+                                    ','.join([
+                                            "%s=%s" % (x, x) for x in
+                                            self.identifiers.argument_declared
+                                            ]))
+
+        self.write_variable_declares(self.identifiers, toplevel=True)
+
+        for n in self.node.nodes:
+            n.accept_visitor(self)
+
+        self.write_def_finish(self.node, buffered, filtered, cached)
+        self.printer.writeline(None)
+        self.printer.write("\n\n")
+        if cached:
+            self.write_cache_decorator(
+                                node, name,
+                                args, buffered,
+                                self.identifiers, toplevel=True)
+
+    def write_module_code(self, module_code):
+        """write module-level template code, i.e. that which
+        is enclosed in <%! %> tags in the template."""
+        for n in module_code:
+            self.write_source_comment(n)
+            self.printer.write_indented_block(n.text)
+
+    def write_inherit(self, node):
+        """write the module-level inheritance-determination callable."""
+
+        self.printer.writelines(
+            "def _mako_inherit(template, context):",
+                "_mako_generate_namespaces(context)",
+                "return runtime._inherit_from(context, %s, _template_uri)" %
+                 (node.parsed_attributes['file']),
+                None
+            )
+
+    def write_namespaces(self, namespaces):
+        """write the module-level namespace-generating callable."""
+        self.printer.writelines(
+            "def _mako_get_namespace(context, name):",
+                "try:",
+                    "return context.namespaces[(__name__, name)]",
+                "except KeyError:",
+                    "_mako_generate_namespaces(context)",
+                "return context.namespaces[(__name__, name)]",
+            None,None
+            )
+        self.printer.writeline("def _mako_generate_namespaces(context):")
+
+
+        for node in namespaces.values():
+            if node.attributes.has_key('import'):
+                self.compiler.has_ns_imports = True
+            self.write_source_comment(node)
+            if len(node.nodes):
+                self.printer.writeline("def make_namespace():")
+                export = []
+                identifiers = self.compiler.identifiers.branch(node)
+                self.in_def = True
+                class NSDefVisitor(object):
+                    def visitDefTag(s, node):
+                        s.visitDefOrBase(node)
+
+                    def visitBlockTag(s, node):
+                        s.visitDefOrBase(node)
+
+                    def visitDefOrBase(s, node):
+                        if node.is_anonymous:
+                            raise exceptions.CompileException(
+                                "Can't put anonymous blocks inside "
+                                "<%namespace>",
+                                **node.exception_kwargs
+                            )
+                        self.write_inline_def(node, identifiers, nested=False)
+                        export.append(node.funcname)
+                vis = NSDefVisitor()
+                for n in node.nodes:
+                    n.accept_visitor(vis)
+                self.printer.writeline("return [%s]" % (','.join(export)))
+                self.printer.writeline(None)
+                self.in_def = False
+                callable_name = "make_namespace()"
+            else:
+                callable_name = "None"
+
+            if 'file' in node.parsed_attributes:
+                self.printer.writeline(
+                                "ns = runtime.TemplateNamespace(%r,"
+                                " context._clean_inheritance_tokens(),"
+                                " templateuri=%s, callables=%s, "
+                                " calling_uri=_template_uri)" %
+                                (
+                                   node.name,
+                                   node.parsed_attributes.get('file', 'None'),
+                                   callable_name,
+                                )
+                            )
+            elif 'module' in node.parsed_attributes:
+                self.printer.writeline(
+                                "ns = runtime.ModuleNamespace(%r,"
+                                " context._clean_inheritance_tokens(),"
+                                " callables=%s, calling_uri=_template_uri,"
+                                " module=%s)" %
+                                (
+                                   node.name,
+                                   callable_name,
+                                   node.parsed_attributes.get('module', 'None')
+                                )
+                            )
+            else:
+                self.printer.writeline(
+                                "ns = runtime.Namespace(%r,"
+                                " context._clean_inheritance_tokens(),"
+                                " callables=%s, calling_uri=_template_uri)" %
+                                (
+                                    node.name,
+                                    callable_name,
+                                )
+                            )
+            if eval(node.attributes.get('inheritable', "False")):
+                self.printer.writeline("context['self'].%s = ns" % (node.name))
+
+            self.printer.writeline(
+                   "context.namespaces[(__name__, %s)] = ns" % repr(node.name))
+            self.printer.write("\n")
+        if not len(namespaces):
+            self.printer.writeline("pass")
+        self.printer.writeline(None)
+
+    def write_variable_declares(self, identifiers, toplevel=False, limit=None):
+        """write variable declarations at the top of a function.
+
+        the variable declarations are in the form of callable
+        definitions for defs and/or name lookup within the
+        function's context argument. the names declared are based
+        on the names that are referenced in the function body,
+        which don't otherwise have any explicit assignment
+        operation. names that are assigned within the body are
+        assumed to be locally-scoped variables and are not
+        separately declared.
+
+        for def callable definitions, if the def is a top-level
+        callable then a 'stub' callable is generated which wraps
+        the current Context into a closure. if the def is not
+        top-level, it is fully rendered as a local closure.
+
+        """
+
+        # collection of all defs available to us in this scope
+        comp_idents = dict([(c.funcname, c) for c in identifiers.defs])
+        to_write = set()
+
+        # write "context.get()" for all variables we are going to
+        # need that arent in the namespace yet
+        to_write = to_write.union(identifiers.undeclared)
+
+        # write closure functions for closures that we define
+        # right here
+        to_write = to_write.union(
+                        [c.funcname for c in identifiers.closuredefs.values()])
+
+        # remove identifiers that are declared in the argument
+        # signature of the callable
+        to_write = to_write.difference(identifiers.argument_declared)
+
+        # remove identifiers that we are going to assign to.
+        # in this way we mimic Python's behavior,
+        # i.e. assignment to a variable within a block
+        # means that variable is now a "locally declared" var,
+        # which cannot be referenced beforehand.
+        to_write = to_write.difference(identifiers.locally_declared)
+
+        if self.compiler.enable_loop:
+            has_loop = "loop" in to_write
+            to_write.discard("loop")
+        else:
+            has_loop = False
+
+        # if a limiting set was sent, constraint to those items in that list
+        # (this is used for the caching decorator)
+        if limit is not None:
+            to_write = to_write.intersection(limit)
+
+        if toplevel and getattr(self.compiler, 'has_ns_imports', False):
+            self.printer.writeline("_import_ns = {}")
+            self.compiler.has_imports = True
+            for ident, ns in self.compiler.namespaces.iteritems():
+                if ns.attributes.has_key('import'):
+                    self.printer.writeline(
+                            "_mako_get_namespace(context, %r)."\
+                                    "_populate(_import_ns, %r)" %
+                            (
+                                ident,
+                                re.split(r'\s*,\s*', ns.attributes['import'])
+                            ))
+
+        if has_loop:
+            self.printer.writeline(
+                'loop = __M_loop = runtime.LoopStack()'
+            )
+
+        for ident in to_write:
+            if ident in comp_idents:
+                comp = comp_idents[ident]
+                if comp.is_block:
+                    if not comp.is_anonymous:
+                        self.write_def_decl(comp, identifiers)
+                    else:
+                        self.write_inline_def(comp, identifiers, nested=True)
+                else:
+                    if comp.is_root():
+                        self.write_def_decl(comp, identifiers)
+                    else:
+                        self.write_inline_def(comp, identifiers, nested=True)
+
+            elif ident in self.compiler.namespaces:
+                self.printer.writeline(
+                            "%s = _mako_get_namespace(context, %r)" %
+                                (ident, ident)
+                            )
+            else:
+                if getattr(self.compiler, 'has_ns_imports', False):
+                    if self.compiler.strict_undefined:
+                        self.printer.writelines(
+                        "%s = _import_ns.get(%r, UNDEFINED)" %
+                        (ident, ident),
+                        "if %s is UNDEFINED:" % ident,
+                            "try:",
+                                "%s = context[%r]" % (ident, ident),
+                            "except KeyError:",
+                                "raise NameError(\"'%s' is not defined\")" %
+                                    ident,
+                            None, None
+                        )
+                    else:
+                        self.printer.writeline(
+                        "%s = _import_ns.get(%r, context.get(%r, UNDEFINED))" %
+                        (ident, ident, ident))
+                else:
+                    if self.compiler.strict_undefined:
+                        self.printer.writelines(
+                            "try:",
+                                "%s = context[%r]" % (ident, ident),
+                            "except KeyError:",
+                                "raise NameError(\"'%s' is not defined\")" %
+                                    ident,
+                            None
+                        )
+                    else:
+                        self.printer.writeline(
+                            "%s = context.get(%r, UNDEFINED)" % (ident, ident)
+                        )
+
+        self.printer.writeline("__M_writer = context.writer()")
+
+    def write_source_comment(self, node):
+        """write a source comment containing the line number of the
+        corresponding template line."""
+        if self.last_source_line != node.lineno:
+            self.printer.writeline("# SOURCE LINE %d" % node.lineno)
+            self.last_source_line = node.lineno
+
+    def write_def_decl(self, node, identifiers):
+        """write a locally-available callable referencing a top-level def"""
+        funcname = node.funcname
+        namedecls = node.get_argument_expressions()
+        nameargs = node.get_argument_expressions(include_defaults=False)
+
+        if not self.in_def and (
+                                len(self.identifiers.locally_assigned) > 0 or
+                                len(self.identifiers.argument_declared) > 0):
+            nameargs.insert(0, 'context.locals_(__M_locals)')
+        else:
+            nameargs.insert(0, 'context')
+        self.printer.writeline("def %s(%s):" % (funcname, ",".join(namedecls)))
+        self.printer.writeline(
+                       "return render_%s(%s)" % (funcname, ",".join(nameargs)))
+        self.printer.writeline(None)
+
+    def write_inline_def(self, node, identifiers, nested):
+        """write a locally-available def callable inside an enclosing def."""
+
+        namedecls = node.get_argument_expressions()
+
+        decorator = node.decorator
+        if decorator:
+            self.printer.writeline(
+                          "@runtime._decorate_inline(context, %s)" % decorator)
+        self.printer.writeline(
+                          "def %s(%s):" % (node.funcname, ",".join(namedecls)))
+        filtered = len(node.filter_args.args) > 0
+        buffered = eval(node.attributes.get('buffered', 'False'))
+        cached = eval(node.attributes.get('cached', 'False'))
+        self.printer.writelines(
+            # push new frame, assign current frame to __M_caller
+            "__M_caller = context.caller_stack._push_frame()",
+            "try:"
+            )
+        if buffered or filtered or cached:
+            self.printer.writelines(
+                "context._push_buffer()",
+                )
+
+        identifiers = identifiers.branch(node, nested=nested)
+
+        self.write_variable_declares(identifiers)
+
+        self.identifier_stack.append(identifiers)
+        for n in node.nodes:
+            n.accept_visitor(self)
+        self.identifier_stack.pop()
+
+        self.write_def_finish(node, buffered, filtered, cached)
+        self.printer.writeline(None)
+        if cached:
+            self.write_cache_decorator(node, node.funcname,
+                                        namedecls, False, identifiers,
+                                        inline=True, toplevel=False)
+
+    def write_def_finish(self, node, buffered, filtered, cached,
+            callstack=True):
+        """write the end section of a rendering function, either outermost or
+        inline.
+
+        this takes into account if the rendering function was filtered,
+        buffered, etc.  and closes the corresponding try: block if any, and
+        writes code to retrieve captured content, apply filters, send proper
+        return value."""
+
+        if not buffered and not cached and not filtered:
+            self.printer.writeline("return ''")
+            if callstack:
+                self.printer.writelines(
+                    "finally:",
+                        "context.caller_stack._pop_frame()",
+                    None
+                )
+
+        if buffered or filtered or cached:
+            if buffered or cached:
+                # in a caching scenario, don't try to get a writer
+                # from the context after popping; assume the caching
+                # implemenation might be using a context with no
+                # extra buffers
+                self.printer.writelines(
+                    "finally:",
+                        "__M_buf = context._pop_buffer()"
+                )
+            else:
+                self.printer.writelines(
+                   "finally:",
+                       "__M_buf, __M_writer = context._pop_buffer_and_writer()"
+                )
+
+            if callstack:
+                self.printer.writeline("context.caller_stack._pop_frame()")
+
+            s = "__M_buf.getvalue()"
+            if filtered:
+                s = self.create_filter_callable(node.filter_args.args, s,
+                                                False)
+            self.printer.writeline(None)
+            if buffered and not cached:
+                s = self.create_filter_callable(self.compiler.buffer_filters,
+                                                s, False)
+            if buffered or cached:
+                self.printer.writeline("return %s" % s)
+            else:
+                self.printer.writelines(
+                    "__M_writer(%s)" % s,
+                    "return ''"
+                )
+
+    def write_cache_decorator(self, node_or_pagetag, name,
+                                    args, buffered, identifiers,
+                                    inline=False, toplevel=False):
+        """write a post-function decorator to replace a rendering
+            callable with a cached version of itself."""
+
+        self.printer.writeline("__M_%s = %s" % (name, name))
+        cachekey = node_or_pagetag.parsed_attributes.get('cache_key',
+                                                         repr(name))
+
+        cache_args = {}
+        if self.compiler.pagetag is not None:
+            cache_args.update(
+                (
+                    pa[6:],
+                    self.compiler.pagetag.parsed_attributes[pa]
+                )
+                for pa in self.compiler.pagetag.parsed_attributes
+                if pa.startswith('cache_') and pa != 'cache_key'
+            )
+        cache_args.update(
+            (
+                pa[6:],
+                node_or_pagetag.parsed_attributes[pa]
+            ) for pa in node_or_pagetag.parsed_attributes
+            if pa.startswith('cache_') and pa != 'cache_key'
+        )
+        if 'timeout' in cache_args:
+            cache_args['timeout'] = int(eval(cache_args['timeout']))
+
+        self.printer.writeline("def %s(%s):" % (name, ','.join(args)))
+
+        # form "arg1, arg2, arg3=arg3, arg4=arg4", etc.
+        pass_args = [
+                        '=' in a and "%s=%s" % ((a.split('=')[0],)*2) or a
+                        for a in args
+                    ]
+
+        self.write_variable_declares(
+                            identifiers,
+                            toplevel=toplevel,
+                            limit=node_or_pagetag.undeclared_identifiers()
+                        )
+        if buffered:
+            s = "context.get('local')."\
+                "cache._ctx_get_or_create("\
+                "%s, lambda:__M_%s(%s),  context, %s__M_defname=%r)" % \
+                            (cachekey, name, ','.join(pass_args),
+                            ''.join(["%s=%s, " % (k,v)
+                            for k, v in cache_args.items()]),
+                            name
+                            )
+            # apply buffer_filters
+            s = self.create_filter_callable(self.compiler.buffer_filters, s,
+                                            False)
+            self.printer.writelines("return " + s,None)
+        else:
+            self.printer.writelines(
+                    "__M_writer(context.get('local')."
+                    "cache._ctx_get_or_create("\
+                    "%s, lambda:__M_%s(%s), context, %s__M_defname=%r))" %
+                    (cachekey, name, ','.join(pass_args),
+                    ''.join(["%s=%s, " % (k,v)
+                        for k, v in cache_args.items()]),
+                    name,
+                    ),
+                    "return ''",
+                None
+            )
+
+    def create_filter_callable(self, args, target, is_expression):
+        """write a filter-applying expression based on the filters
+        present in the given filter names, adjusting for the global
+        'default' filter aliases as needed."""
+
+        def locate_encode(name):
+            if re.match(r'decode\..+', name):
+                return "filters." + name
+            elif self.compiler.disable_unicode:
+                return filters.NON_UNICODE_ESCAPES.get(name, name)
+            else:
+                return filters.DEFAULT_ESCAPES.get(name, name)
+
+        if 'n' not in args:
+            if is_expression:
+                if self.compiler.pagetag:
+                    args = self.compiler.pagetag.filter_args.args + args
+                if self.compiler.default_filters:
+                    args = self.compiler.default_filters + args
+        for e in args:
+            # if filter given as a function, get just the identifier portion
+            if e == 'n':
+                continue
+            m = re.match(r'(.+?)(\(.*\))', e)
+            if m:
+                (ident, fargs) = m.group(1,2)
+                f = locate_encode(ident)
+                e = f + fargs
+            else:
+                x = e
+                e = locate_encode(e)
+                assert e is not None
+            target = "%s(%s)" % (e, target)
+        return target
+
+    def visitExpression(self, node):
+        self.write_source_comment(node)
+        if len(node.escapes) or \
+                (
+                    self.compiler.pagetag is not None and
+                    len(self.compiler.pagetag.filter_args.args)
+                ) or \
+                len(self.compiler.default_filters):
+
+            s = self.create_filter_callable(node.escapes_code.args,
+                                            "%s" % node.text, True)
+            self.printer.writeline("__M_writer(%s)" % s)
+        else:
+            self.printer.writeline("__M_writer(%s)" % node.text)
+
+    def visitControlLine(self, node):
+        if node.isend:
+            self.printer.writeline(None)
+            if node.has_loop_context:
+                self.printer.writeline('finally:')
+                self.printer.writeline("loop = __M_loop._exit()")
+                self.printer.writeline(None)
+        else:
+            self.write_source_comment(node)
+            if self.compiler.enable_loop and node.keyword == 'for':
+                text = mangle_mako_loop(node, self.printer)
+            else:
+                text = node.text
+            self.printer.writeline(text)
+            children = node.get_children()
+            # this covers the three situations where we want to insert a pass:
+            #    1) a ternary control line with no children,
+            #    2) a primary control line with nothing but its own ternary
+            #          and end control lines, and
+            #    3) any control line with no content other than comments
+            if not children or (
+                    util.all(isinstance(c, (parsetree.Comment,
+                                            parsetree.ControlLine))
+                             for c in children) and
+                    util.all((node.is_ternary(c.keyword) or c.isend)
+                             for c in children
+                             if isinstance(c, parsetree.ControlLine))):
+                self.printer.writeline("pass")
+
+    def visitText(self, node):
+        self.write_source_comment(node)
+        self.printer.writeline("__M_writer(%s)" % repr(node.content))
+
+    def visitTextTag(self, node):
+        filtered = len(node.filter_args.args) > 0
+        if filtered:
+            self.printer.writelines(
+                "__M_writer = context._push_writer()",
+                "try:",
+            )
+        for n in node.nodes:
+            n.accept_visitor(self)
+        if filtered:
+            self.printer.writelines(
+                "finally:",
+                "__M_buf, __M_writer = context._pop_buffer_and_writer()",
+                "__M_writer(%s)" %
+                self.create_filter_callable(
+                                node.filter_args.args,
+                                "__M_buf.getvalue()",
+                                False),
+                None
+                )
+
+    def visitCode(self, node):
+        if not node.ismodule:
+            self.write_source_comment(node)
+            self.printer.write_indented_block(node.text)
+
+            if not self.in_def and len(self.identifiers.locally_assigned) > 0:
+                # if we are the "template" def, fudge locally
+                # declared/modified variables into the "__M_locals" dictionary,
+                # which is used for def calls within the same template,
+                # to simulate "enclosing scope"
+                self.printer.writeline(
+                      '__M_locals_builtin_stored = __M_locals_builtin()')
+                self.printer.writeline(
+                      '__M_locals.update(__M_dict_builtin([(__M_key,'
+                      ' __M_locals_builtin_stored[__M_key]) for __M_key in'
+                      ' [%s] if __M_key in __M_locals_builtin_stored]))' %
+                      ','.join([repr(x) for x in node.declared_identifiers()]))
+
+    def visitIncludeTag(self, node):
+        self.write_source_comment(node)
+        args = node.attributes.get('args')
+        if args:
+            self.printer.writeline(
+                      "runtime._include_file(context, %s, _template_uri, %s)" %
+                      (node.parsed_attributes['file'], args))
+        else:
+            self.printer.writeline(
+                        "runtime._include_file(context, %s, _template_uri)" %
+                        (node.parsed_attributes['file']))
+
+    def visitNamespaceTag(self, node):
+        pass
+
+    def visitDefTag(self, node):
+        pass
+
+    def visitBlockTag(self, node):
+        if node.is_anonymous:
+            self.printer.writeline("%s()" % node.funcname)
+        else:
+            nameargs = node.get_argument_expressions(include_defaults=False)
+            nameargs += ['**pageargs']
+            self.printer.writeline("if 'parent' not in context._data or "
+                                  "not hasattr(context._data['parent'], '%s'):"
+                                  % node.funcname)
+            self.printer.writeline(
+                "context['self'].%s(%s)" % (node.funcname, ",".join(nameargs)))
+            self.printer.writeline("\n")
+
+    def visitCallNamespaceTag(self, node):
+        # TODO: we can put namespace-specific checks here, such
+        # as ensure the given namespace will be imported,
+        # pre-import the namespace, etc.
+        self.visitCallTag(node)
+
+    def visitCallTag(self, node):
+        self.printer.writeline("def ccall(caller):")
+        export = ['body']
+        callable_identifiers = self.identifiers.branch(node, nested=True)
+        body_identifiers = callable_identifiers.branch(node, nested=False)
+        # we want the 'caller' passed to ccall to be used
+        # for the body() function, but for other non-body()
+        # <%def>s within <%call> we want the current caller
+        # off the call stack (if any)
+        body_identifiers.add_declared('caller')
+
+        self.identifier_stack.append(body_identifiers)
+        class DefVisitor(object):
+            def visitDefTag(s, node):
+                s.visitDefOrBase(node)
+
+            def visitBlockTag(s, node):
+                s.visitDefOrBase(node)
+
+            def visitDefOrBase(s, node):
+                self.write_inline_def(node, callable_identifiers, nested=False)
+                if not node.is_anonymous:
+                    export.append(node.funcname)
+                # remove defs that are within the <%call> from the
+                # "closuredefs" defined in the body, so they dont render twice
+                if node.funcname in body_identifiers.closuredefs:
+                    del body_identifiers.closuredefs[node.funcname]
+
+        vis = DefVisitor()
+        for n in node.nodes:
+            n.accept_visitor(vis)
+        self.identifier_stack.pop()
+
+        bodyargs = node.body_decl.get_argument_expressions()
+        self.printer.writeline("def body(%s):" % ','.join(bodyargs))
+
+        # TODO: figure out best way to specify
+        # buffering/nonbuffering (at call time would be better)
+        buffered = False
+        if buffered:
+            self.printer.writelines(
+                "context._push_buffer()",
+                "try:"
+            )
+        self.write_variable_declares(body_identifiers)
+        self.identifier_stack.append(body_identifiers)
+
+        for n in node.nodes:
+            n.accept_visitor(self)
+        self.identifier_stack.pop()
+
+        self.write_def_finish(node, buffered, False, False, callstack=False)
+        self.printer.writelines(
+            None,
+            "return [%s]" % (','.join(export)),
+            None
+        )
+
+        self.printer.writelines(
+            # push on caller for nested call
+            "context.caller_stack.nextcaller = "
+                "runtime.Namespace('caller', context, "
+                                  "callables=ccall(__M_caller))",
+            "try:")
+        self.write_source_comment(node)
+        self.printer.writelines(
+                "__M_writer(%s)" % self.create_filter_callable(
+                                                    [], node.expression, True),
+            "finally:",
+                "context.caller_stack.nextcaller = None",
+            None
+        )
+
+class _Identifiers(object):
+    """tracks the status of identifier names as template code is rendered."""
+
+    def __init__(self, compiler, node=None, parent=None, nested=False):
+        if parent is not None:
+            # if we are the branch created in write_namespaces(),
+            # we don't share any context from the main body().
+            if isinstance(node, parsetree.NamespaceTag):
+                self.declared = set()
+                self.topleveldefs = util.SetLikeDict()
+            else:
+                # things that have already been declared
+                # in an enclosing namespace (i.e. names we can just use)
+                self.declared = set(parent.declared).\
+                         union([c.name for c in parent.closuredefs.values()]).\
+                         union(parent.locally_declared).\
+                         union(parent.argument_declared)
+
+                # if these identifiers correspond to a "nested"
+                # scope, it means whatever the parent identifiers
+                # had as undeclared will have been declared by that parent,
+                # and therefore we have them in our scope.
+                if nested:
+                    self.declared = self.declared.union(parent.undeclared)
+
+                # top level defs that are available
+                self.topleveldefs = util.SetLikeDict(**parent.topleveldefs)
+        else:
+            self.declared = set()
+            self.topleveldefs = util.SetLikeDict()
+
+        self.compiler = compiler
+
+        # things within this level that are referenced before they
+        # are declared (e.g. assigned to)
+        self.undeclared = set()
+
+        # things that are declared locally.  some of these things
+        # could be in the "undeclared" list as well if they are
+        # referenced before declared
+        self.locally_declared = set()
+
+        # assignments made in explicit python blocks.
+        # these will be propagated to
+        # the context of local def calls.
+        self.locally_assigned = set()
+
+        # things that are declared in the argument
+        # signature of the def callable
+        self.argument_declared = set()
+
+        # closure defs that are defined in this level
+        self.closuredefs = util.SetLikeDict()
+
+        self.node = node
+
+        if node is not None:
+            node.accept_visitor(self)
+
+        illegal_names = self.compiler.reserved_names.intersection(
+                                                         self.locally_declared)
+        if illegal_names:
+            raise exceptions.NameConflictError(
+                "Reserved words declared in template: %s" %
+                ", ".join(illegal_names))
+
+
+    def branch(self, node, **kwargs):
+        """create a new Identifiers for a new Node, with
+          this Identifiers as the parent."""
+
+        return _Identifiers(self.compiler, node, self, **kwargs)
+
+    @property
+    def defs(self):
+        return set(self.topleveldefs.union(self.closuredefs).values())
+
+    def __repr__(self):
+        return "Identifiers(declared=%r, locally_declared=%r, "\
+                "undeclared=%r, topleveldefs=%r, closuredefs=%r, "\
+                "argumentdeclared=%r)" %\
+                (
+                    list(self.declared),
+                    list(self.locally_declared),
+                    list(self.undeclared),
+                    [c.name for c in self.topleveldefs.values()],
+                    [c.name for c in self.closuredefs.values()],
+                    self.argument_declared)
+
+    def check_declared(self, node):
+        """update the state of this Identifiers with the undeclared
+            and declared identifiers of the given node."""
+
+        for ident in node.undeclared_identifiers():
+            if ident != 'context' and\
+                       ident not in self.declared.union(self.locally_declared):
+                self.undeclared.add(ident)
+        for ident in node.declared_identifiers():
+            self.locally_declared.add(ident)
+
+    def add_declared(self, ident):
+        self.declared.add(ident)
+        if ident in self.undeclared:
+            self.undeclared.remove(ident)
+
+    def visitExpression(self, node):
+        self.check_declared(node)
+
+    def visitControlLine(self, node):
+        self.check_declared(node)
+
+    def visitCode(self, node):
+        if not node.ismodule:
+            self.check_declared(node)
+            self.locally_assigned = self.locally_assigned.union(
+                                                   node.declared_identifiers())
+
+    def visitNamespaceTag(self, node):
+        # only traverse into the sub-elements of a
+        # <%namespace> tag if we are the branch created in
+        # write_namespaces()
+        if self.node is node:
+            for n in node.nodes:
+                n.accept_visitor(self)
+
+    def _check_name_exists(self, collection, node):
+        existing = collection.get(node.funcname)
+        collection[node.funcname] = node
+        if existing is not None and \
+            existing is not node and \
+            (node.is_block or existing.is_block):
+            raise exceptions.CompileException(
+                    "%%def or %%block named '%s' already "
+                    "exists in this template." %
+                    node.funcname, **node.exception_kwargs)
+
+    def visitDefTag(self, node):
+        if node.is_root() and not node.is_anonymous:
+            self._check_name_exists(self.topleveldefs, node)
+        elif node is not self.node:
+            self._check_name_exists(self.closuredefs, node)
+
+        for ident in node.undeclared_identifiers():
+            if ident != 'context' and\
+                       ident not in self.declared.union(self.locally_declared):
+                self.undeclared.add(ident)
+
+        # visit defs only one level deep
+        if node is self.node:
+            for ident in node.declared_identifiers():
+                self.argument_declared.add(ident)
+
+            for n in node.nodes:
+                n.accept_visitor(self)
+
+    def visitBlockTag(self, node):
+        if node is not self.node and \
+            not node.is_anonymous:
+
+            if isinstance(self.node, parsetree.DefTag):
+                raise exceptions.CompileException(
+                        "Named block '%s' not allowed inside of def '%s'"
+                        % (node.name, self.node.name), **node.exception_kwargs)
+            elif isinstance(self.node,
+                            (parsetree.CallTag, parsetree.CallNamespaceTag)):
+                raise exceptions.CompileException(
+                        "Named block '%s' not allowed inside of <%%call> tag"
+                        % (node.name, ), **node.exception_kwargs)
+
+        for ident in node.undeclared_identifiers():
+            if ident != 'context' and\
+                       ident not in self.declared.union(self.locally_declared):
+                self.undeclared.add(ident)
+
+        if not node.is_anonymous:
+            self._check_name_exists(self.topleveldefs, node)
+            self.undeclared.add(node.funcname)
+        elif node is not self.node:
+            self._check_name_exists(self.closuredefs, node)
+        for ident in node.declared_identifiers():
+            self.argument_declared.add(ident)
+        for n in node.nodes:
+            n.accept_visitor(self)
+
+    def visitIncludeTag(self, node):
+        self.check_declared(node)
+
+    def visitPageTag(self, node):
+        for ident in node.declared_identifiers():
+            self.argument_declared.add(ident)
+        self.check_declared(node)
+
+    def visitCallNamespaceTag(self, node):
+        self.visitCallTag(node)
+
+    def visitCallTag(self, node):
+        if node is self.node:
+            for ident in node.undeclared_identifiers():
+                if ident != 'context' and\
+                       ident not in self.declared.union(self.locally_declared):
+                    self.undeclared.add(ident)
+            for ident in node.declared_identifiers():
+                self.argument_declared.add(ident)
+            for n in node.nodes:
+                n.accept_visitor(self)
+        else:
+            for ident in node.undeclared_identifiers():
+                if ident != 'context' and\
+                       ident not in self.declared.union(self.locally_declared):
+                    self.undeclared.add(ident)
+
+
+_FOR_LOOP = re.compile(
+        r'^for\s+((?:\(?)\s*[A-Za-z_][A-Za-z_0-9]*'
+        r'(?:\s*,\s*(?:[A-Za-z_][A-Za-z0-9_]*),??)*\s*(?:\)?))\s+in\s+(.*):'
+    )
+
+def mangle_mako_loop(node, printer):
+    """converts a for loop into a context manager wrapped around a for loop
+    when access to the `loop` variable has been detected in the for loop body
+    """
+    loop_variable = LoopVariable()
+    node.accept_visitor(loop_variable)
+    if loop_variable.detected:
+        node.nodes[-1].has_loop_context = True
+        match = _FOR_LOOP.match(node.text)
+        if match:
+            printer.writelines(
+                    'loop = __M_loop._enter(%s)' % match.group(2),
+                    'try:'
+                    #'with __M_loop(%s) as loop:' % match.group(2)
+                )
+            text = 'for %s in loop:' % match.group(1)
+        else:
+            raise SyntaxError("Couldn't apply loop context: %s" % node.text)
+    else:
+        text = node.text
+    return text
+
+
+class LoopVariable(object):
+    """A node visitor which looks for the name 'loop' within undeclared
+    identifiers."""
+
+    def __init__(self):
+        self.detected = False
+
+    def _loop_reference_detected(self, node):
+        if 'loop' in node.undeclared_identifiers():
+            self.detected = True
+        else:
+            for n in node.get_children():
+                n.accept_visitor(self)
+
+    def visitControlLine(self, node):
+        self._loop_reference_detected(node)
+
+    def visitCode(self, node):
+        self._loop_reference_detected(node)
+
+    def visitExpression(self, node):
+        self._loop_reference_detected(node)
diff --git a/lib/mako-0.7.2/mako/exceptions.py b/lib/mako-0.7.2/mako/exceptions.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/exceptions.py
@@ -0,0 +1,362 @@
+# mako/exceptions.py
+# Copyright (C) 2006-2012 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
+
+"""exception classes"""
+
+import traceback, sys, re
+from mako import util
+
+class MakoException(Exception):
+    pass
+
+class RuntimeException(MakoException):
+    pass
+
+def _format_filepos(lineno, pos, filename):
+    if filename is None:
+        return " at line: %d char: %d" % (lineno, pos)
+    else:
+        return " in file '%s' at line: %d char: %d" % (filename, lineno, pos)
+
+
+class CompileException(MakoException):
+    def __init__(self, message, source, lineno, pos, filename):
+        MakoException.__init__(self,
+                              message + _format_filepos(lineno, pos, filename))
+        self.lineno =lineno
+        self.pos = pos
+        self.filename = filename
+        self.source = source
+
+class SyntaxException(MakoException):
+    def __init__(self, message, source, lineno, pos, filename):
+        MakoException.__init__(self,
+                              message + _format_filepos(lineno, pos, filename))
+        self.lineno =lineno
+        self.pos = pos
+        self.filename = filename
+        self.source = source
+
+class UnsupportedError(MakoException):
+    """raised when a retired feature is used."""
+
+class NameConflictError(MakoException):
+    """raised when a reserved word is used inappropriately"""
+
+class TemplateLookupException(MakoException):
+    pass
+
+class TopLevelLookupException(TemplateLookupException):
+    pass
+
+class RichTraceback(object):
+    """Pull the current exception from the ``sys`` traceback and extracts
+    Mako-specific template information.
+
+    See the usage examples in :ref:`handling_exceptions`.
+
+    """
+    def __init__(self, error=None, traceback=None):
+        self.source, self.lineno = "", 0
+
+        if error is None or traceback is None:
+            t, value, tback = sys.exc_info()
+
+        if error is None:
+            error = value or t
+
+        if traceback is None:
+            traceback = tback
+
+        self.error = error
+        self.records = self._init(traceback)
+
+        if isinstance(self.error, (CompileException, SyntaxException)):
+            import mako.template
+            self.source = self.error.source
+            self.lineno = self.error.lineno
+            self._has_source = True
+
+        self._init_message()
+
+    @property
+    def errorname(self):
+        return util.exception_name(self.error)
+
+    def _init_message(self):
+        """Find a unicode representation of self.error"""
+        try:
+            self.message = unicode(self.error)
+        except UnicodeError:
+            try:
+                self.message = str(self.error)
+            except UnicodeEncodeError:
+                # Fallback to args as neither unicode nor
+                # str(Exception(u'\xe6')) work in Python < 2.6
+                self.message = self.error.args[0]
+        if not isinstance(self.message, unicode):
+            self.message = unicode(self.message, 'ascii', 'replace')
+
+    def _get_reformatted_records(self, records):
+        for rec in records:
+            if rec[6] is not None:
+                yield (rec[4], rec[5], rec[2], rec[6])
+            else:
+                yield tuple(rec[0:4])
+
+    @property
+    def traceback(self):
+        """Return a list of 4-tuple traceback records (i.e. normal python
+        format) with template-corresponding lines remapped to the originating
+        template.
+
+        """
+        return list(self._get_reformatted_records(self.records))
+
+    @property
+    def reverse_records(self):
+        return reversed(self.records)
+
+    @property
+    def reverse_traceback(self):
+        """Return the same data as traceback, except in reverse order.
+        """
+
+        return list(self._get_reformatted_records(self.reverse_records))
+
+    def _init(self, trcback):
+        """format a traceback from sys.exc_info() into 7-item tuples,
+        containing the regular four traceback tuple items, plus the original
+        template filename, the line number adjusted relative to the template
+        source, and code line from that line number of the template."""
+
+        import mako.template
+        mods = {}
+        rawrecords = traceback.extract_tb(trcback)
+        new_trcback = []
+        for filename, lineno, function, line in rawrecords:
+            if not line:
+                line = ''
+            try:
+                (line_map, template_lines) = mods[filename]
+            except KeyError:
+                try:
+                    info = mako.template._get_module_info(filename)
+                    module_source = info.code
+                    template_source = info.source
+                    template_filename = info.template_filename or filename
+                except KeyError:
+                    # A normal .py file (not a Template)
+                    if not util.py3k:
+                        try:
+                            fp = open(filename, 'rb')
+                            encoding = util.parse_encoding(fp)
+                            fp.close()
+                        except IOError:
+                            encoding = None
+                        if encoding:
+                            line = line.decode(encoding)
+                        else:
+                            line = line.decode('ascii', 'replace')
+                    new_trcback.append((filename, lineno, function, line,
+                                            None, None, None, None))
+                    continue
+
+                template_ln = module_ln = 1
+                line_map = {}
+                for line in module_source.split("\n"):
+                    match = re.match(r'\s*# SOURCE LINE (\d+)', line)
+                    if match:
+                        template_ln = int(match.group(1))
+                    module_ln += 1
+                    line_map[module_ln] = template_ln
+                template_lines = [line for line in
+                                    template_source.split("\n")]
+                mods[filename] = (line_map, template_lines)
+
+            template_ln = line_map[lineno]
+            if template_ln <= len(template_lines):
+                template_line = template_lines[template_ln - 1]
+            else:
+                template_line = None
+            new_trcback.append((filename, lineno, function,
+                                line, template_filename, template_ln,
+                                template_line, template_source))
+        if not self.source:
+            for l in range(len(new_trcback)-1, 0, -1):
+                if new_trcback[l][5]:
+                    self.source = new_trcback[l][7]
+                    self.lineno = new_trcback[l][5]
+                    break
+            else:
+                if new_trcback:
+                    try:
+                        # A normal .py file (not a Template)
+                        fp = open(new_trcback[-1][0], 'rb')
+                        encoding = util.parse_encoding(fp)
+                        fp.seek(0)
+                        self.source = fp.read()
+                        fp.close()
+                        if encoding:
+                            self.source = self.source.decode(encoding)
+                    except IOError:
+                        self.source = ''
+                    self.lineno = new_trcback[-1][1]
+        return new_trcback
+
+
+def text_error_template(lookup=None):
+    """Provides a template that renders a stack trace in a similar format to
+    the Python interpreter, substituting source template filenames, line
+    numbers and code for that of the originating source template, as
+    applicable.
+
+    """
+    import mako.template
+    return mako.template.Template(r"""
+<%page args="error=None, traceback=None"/>
+<%!
+    from mako.exceptions import RichTraceback
+%>\
+<%
+    tback = RichTraceback(error=error, traceback=traceback)
+%>\
+Traceback (most recent call last):
+% for (filename, lineno, function, line) in tback.traceback:
+  File "${filename}", line ${lineno}, in ${function or '?'}
+    ${line | trim}
+% endfor
+${tback.errorname}: ${tback.message}
+""")
+
+
+try:
+    from mako.ext.pygmentplugin import syntax_highlight,\
+            pygments_html_formatter
+except ImportError:
+    from mako.filters import html_escape
+    pygments_html_formatter = None
+    def syntax_highlight(filename='', language=None):
+        return html_escape
+
+def html_error_template():
+    """Provides a template that renders a stack trace in an HTML format,
+    providing an excerpt of code as well as substituting source template
+    filenames, line numbers and code for that of the originating source
+    template, as applicable.
+
+    The template's default ``encoding_errors`` value is ``'htmlentityreplace'``. The
+    template has two options. With the ``full`` option disabled, only a section of
+    an HTML document is returned. With the ``css`` option disabled, the default
+    stylesheet won't be included.
+
+    """
+    import mako.template
+    return mako.template.Template(r"""
+<%!
+    from mako.exceptions import RichTraceback, syntax_highlight,\
+            pygments_html_formatter
+%>
+<%page args="full=True, css=True, error=None, traceback=None"/>
+% if full:
+<html>
+<head>
+    <title>Mako Runtime Error</title>
+% endif
+% if css:
+    <style>
+        body { font-family:verdana; margin:10px 30px 10px 30px;}
+        .stacktrace { margin:5px 5px 5px 5px; }
+        .highlight { padding:0px 10px 0px 10px; background-color:#9F9FDF; }
+        .nonhighlight { padding:0px; background-color:#DFDFDF; }
+        .sample { padding:10px; margin:10px 10px 10px 10px;
+                  font-family:monospace; }
+        .sampleline { padding:0px 10px 0px 10px; }
+        .sourceline { margin:5px 5px 10px 5px; font-family:monospace;}
+        .location { font-size:80%; }
+        .highlight { white-space:pre; }
+        .sampleline { white-space:pre; }
+
+    % if pygments_html_formatter:
+        ${pygments_html_formatter.get_style_defs()}
+        .linenos { min-width: 2.5em; text-align: right; }
+        pre { margin: 0; }
+        .syntax-highlighted { padding: 0 10px; }
+        .syntax-highlightedtable { border-spacing: 1px; }
+        .nonhighlight { border-top: 1px solid #DFDFDF;
+                        border-bottom: 1px solid #DFDFDF; }
+        .stacktrace .nonhighlight { margin: 5px 15px 10px; }
+        .sourceline { margin: 0 0; font-family:monospace; }
+        .code { background-color: #F8F8F8; width: 100%; }
+        .error .code { background-color: #FFBDBD; }
+        .error .syntax-highlighted { background-color: #FFBDBD; }
+    % endif
+
+    </style>
+% endif
+% if full:
+</head>
+<body>
+% endif
+
+<h2>Error !</h2>
+<%
+    tback = RichTraceback(error=error, traceback=traceback)
+    src = tback.source
+    line = tback.lineno
+    if src:
+        lines = src.split('\n')
+    else:
+        lines = None
+%>
+<h3>${tback.errorname}: ${tback.message|h}</h3>
+
+% if lines:
+    <div class="sample">
+    <div class="nonhighlight">
+% for index in range(max(0, line-4),min(len(lines), line+5)):
+    <%
+       if pygments_html_formatter:
+           pygments_html_formatter.linenostart = index + 1
+    %>
+    % if index + 1 == line:
+    <%
+       if pygments_html_formatter:
+           old_cssclass = pygments_html_formatter.cssclass
+           pygments_html_formatter.cssclass = 'error ' + old_cssclass
+    %>
+        ${lines[index] | syntax_highlight(language='mako')}
+    <%
+       if pygments_html_formatter:
+           pygments_html_formatter.cssclass = old_cssclass
+    %>
+    % else:
+        ${lines[index] | syntax_highlight(language='mako')}
+    % endif
+% endfor
+    </div>
+    </div>
+% endif
+
+<div class="stacktrace">
+% for (filename, lineno, function, line) in tback.reverse_traceback:
+    <div class="location">${filename}, line ${lineno}:</div>
+    <div class="nonhighlight">
+    <%
+       if pygments_html_formatter:
+           pygments_html_formatter.linenostart = lineno
+    %>
+      <div class="sourceline">${line | syntax_highlight(filename)}</div>
+    </div>
+% endfor
+</div>
+
+% if full:
+</body>
+</html>
+% endif
+""", output_encoding=sys.getdefaultencoding(),
+        encoding_errors='htmlentityreplace')
diff --git a/lib/mako-0.7.2/mako/ext/__init__.py b/lib/mako-0.7.2/mako/ext/__init__.py
new file mode 100644
diff --git a/lib/mako-0.7.2/mako/ext/autohandler.py b/lib/mako-0.7.2/mako/ext/autohandler.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/ext/autohandler.py
@@ -0,0 +1,65 @@
+# ext/autohandler.py
+# Copyright (C) 2006-2012 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
+
+"""adds autohandler functionality to Mako templates.
+
+requires that the TemplateLookup class is used with templates.
+
+usage:
+
+<%!
+    from mako.ext.autohandler import autohandler
+%>
+<%inherit file="${autohandler(template, context)}"/>
+
+
+or with custom autohandler filename:
+
+<%!
+    from mako.ext.autohandler import autohandler
+%>
+<%inherit file="${autohandler(template, context, name='somefilename')}"/>
+
+"""
+
+import posixpath, os, re
+
+def autohandler(template, context, name='autohandler'):
+    lookup = context.lookup
+    _template_uri = template.module._template_uri
+    if not lookup.filesystem_checks:
+        try:
+            return lookup._uri_cache[(autohandler, _template_uri, name)]
+        except KeyError:
+            pass
+
+    tokens = re.findall(r'([^/]+)', posixpath.dirname(_template_uri)) + [name]
+    while len(tokens):
+        path = '/' + '/'.join(tokens)
+        if path != _template_uri and _file_exists(lookup, path):
+            if not lookup.filesystem_checks:
+                return lookup._uri_cache.setdefault(
+                            (autohandler, _template_uri, name), path)
+            else:
+                return path
+        if len(tokens) == 1:
+            break
+        tokens[-2:] = [name]
+ 
+    if not lookup.filesystem_checks:
+        return lookup._uri_cache.setdefault(
+                            (autohandler, _template_uri, name), None)
+    else:
+        return None
+
+def _file_exists(lookup, path):
+    psub = re.sub(r'^/', '',path)
+    for d in lookup.directories:
+        if os.path.exists(d + '/' + psub):
+            return True
+    else:
+        return False
+ 
diff --git a/lib/mako-0.7.2/mako/ext/babelplugin.py b/lib/mako-0.7.2/mako/ext/babelplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/ext/babelplugin.py
@@ -0,0 +1,132 @@
+# ext/babelplugin.py
+# Copyright (C) 2006-2012 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
+
+"""gettext message extraction via Babel: http://babel.edgewall.org/"""
+from StringIO import StringIO
+
+from babel.messages.extract import extract_python
+
+from mako import lexer, parsetree
+
+def extract(fileobj, keywords, comment_tags, options):
+    """Extract messages from Mako templates.
+
+    :param fileobj: the file-like object the messages should be extracted from
+    :param keywords: a list of keywords (i.e. function names) that should be
+                     recognized as translation functions
+    :param comment_tags: a list of translator tags to search for and include
+                         in the results
+    :param options: a dictionary of additional options (optional)
+    :return: an iterator over ``(lineno, funcname, message, comments)`` tuples
+    :rtype: ``iterator``
+    """
+    encoding = options.get('input_encoding', options.get('encoding', None))
+
+    template_node = lexer.Lexer(fileobj.read(),
+                                input_encoding=encoding).parse()
+    for extracted in extract_nodes(template_node.get_children(),
+                                   keywords, comment_tags, options):
+        yield extracted
+
+def extract_nodes(nodes, keywords, comment_tags, options):
+    """Extract messages from Mako's lexer node objects
+
+    :param nodes: an iterable of Mako parsetree.Node objects to extract from
+    :param keywords: a list of keywords (i.e. function names) that should be
+                     recognized as translation functions
+    :param comment_tags: a list of translator tags to search for and include
+                         in the results
+    :param options: a dictionary of additional options (optional)
+    :return: an iterator over ``(lineno, funcname, message, comments)`` tuples
+    :rtype: ``iterator``
+    """
+    translator_comments = []
+    in_translator_comments = False
+
+    for node in nodes:
+        child_nodes = None
+        if in_translator_comments and isinstance(node, parsetree.Text) and \
+                not node.content.strip():
+            # Ignore whitespace within translator comments
+            continue
+
+        if isinstance(node, parsetree.Comment):
+            value = node.text.strip()
+            if in_translator_comments:
+                translator_comments.extend(_split_comment(node.lineno, value))
+                continue
+            for comment_tag in comment_tags:
+                if value.startswith(comment_tag):
+                    in_translator_comments = True
+                    translator_comments.extend(_split_comment(node.lineno,
+                                                              value))
+            continue
+
+        if isinstance(node, parsetree.DefTag):
+            code = node.function_decl.code
+            child_nodes = node.nodes
+        elif isinstance(node, parsetree.BlockTag):
+            code = node.body_decl.code
+            child_nodes = node.nodes
+        elif isinstance(node, parsetree.CallTag):
+            code = node.code.code
+            child_nodes = node.nodes
+        elif isinstance(node, parsetree.PageTag):
+            code = node.body_decl.code
+        elif isinstance(node, parsetree.CallNamespaceTag):
+            attribs = ', '.join(['%s=%s' % (key, val)
+                                 for key, val in node.attributes.iteritems()])
+            code = '{%s}' % attribs
+            child_nodes = node.nodes
+        elif isinstance(node, parsetree.ControlLine):
+            if node.isend:
+                translator_comments = []
+                in_translator_comments = False
+                continue
+            code = node.text
+        elif isinstance(node, parsetree.Code):
+            # <% and <%! blocks would provide their own translator comments
+            translator_comments = []
+            in_translator_comments = False
+
+            code = node.code.code
+        elif isinstance(node, parsetree.Expression):
+            code = node.code.code
+        else:
+            translator_comments = []
+            in_translator_comments = False
+            continue
+
+        # Comments don't apply unless they immediately preceed the message
+        if translator_comments and \
+                translator_comments[-1][0] < node.lineno - 1:
+            translator_comments = []
+        else:
+            translator_comments = \
+                [comment[1] for comment in translator_comments]
+
+        if isinstance(code, unicode):
+            code = code.encode('ascii', 'backslashreplace')
+        code = StringIO(code)
+        for lineno, funcname, messages, python_translator_comments \
+                in extract_python(code, keywords, comment_tags, options):
+            yield (node.lineno + (lineno - 1), funcname, messages,
+                   translator_comments + python_translator_comments)
+
+        translator_comments = []
+        in_translator_comments = False
+
+        if child_nodes:
+            for extracted in extract_nodes(child_nodes, keywords, comment_tags,
+                                           options):
+                yield extracted
+
+
+def _split_comment(lineno, comment):
+    """Return the multiline comment at lineno split into a list of comment line
+    numbers and the accompanying comment line"""
+    return [(lineno + index, line) for index, line in
+            enumerate(comment.splitlines())]
diff --git a/lib/mako-0.7.2/mako/ext/beaker_cache.py b/lib/mako-0.7.2/mako/ext/beaker_cache.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/ext/beaker_cache.py
@@ -0,0 +1,70 @@
+"""Provide a :class:`.CacheImpl` for the Beaker caching system."""
+
+from mako import exceptions
+
+from mako.cache import CacheImpl
+
+_beaker_cache = None
+class BeakerCacheImpl(CacheImpl):
+    """A :class:`.CacheImpl` provided for the Beaker caching system.
+    
+    This plugin is used by default, based on the default
+    value of ``'beaker'`` for the ``cache_impl`` parameter of the
+    :class:`.Template` or :class:`.TemplateLookup` classes.
+    
+    """
+
+    def __init__(self, cache):
+        global _beaker_cache
+        if _beaker_cache is None:
+            try:
+                from beaker import cache as beaker_cache
+            except ImportError, e:
+                raise exceptions.RuntimeException(
+                            "the Beaker package is required to use cache "
+                            "functionality.")
+
+            if 'manager' in cache.template.cache_args:
+                _beaker_cache = cache.template.cache_args['manager']
+            else:
+                _beaker_cache = beaker_cache.CacheManager()
+        super(BeakerCacheImpl, self).__init__(cache)
+
+    def _get_cache(self, **kw):
+        expiretime = kw.pop('timeout', None)
+        if 'dir' in kw:
+            kw['data_dir'] = kw.pop('dir')
+        elif self.cache.template.module_directory:
+            kw['data_dir'] = self.cache.template.module_directory
+
+        if 'manager' in kw:
+            kw.pop('manager')
+
+        if kw.get('type') == 'memcached':
+            kw['type'] = 'ext:memcached'
+
+        if 'region' in kw:
+            region = kw.pop('region')
+            cache = _beaker_cache.get_cache_region(self.cache.id, region, **kw)
+        else:
+            cache = _beaker_cache.get_cache(self.cache.id, **kw)
+        cache_args = {'starttime':self.cache.starttime}
+        if expiretime:
+            cache_args['expiretime'] = expiretime
+        return cache, cache_args
+
+    def get_or_create(self, key, creation_function, **kw):
+        cache, kw = self._get_cache(**kw)
+        return cache.get(key, createfunc=creation_function, **kw)
+
+    def put(self, key, value, **kw):
+        cache, kw = self._get_cache(**kw)
+        cache.put(key, value, **kw)
+ 
+    def get(self, key, **kw):
+        cache, kw = self._get_cache(**kw)
+        return cache.get(key, **kw)
+ 
+    def invalidate(self, key, **kw):
+        cache, kw = self._get_cache(**kw)
+        cache.remove_value(key, **kw)
diff --git a/lib/mako-0.7.2/mako/ext/preprocessors.py b/lib/mako-0.7.2/mako/ext/preprocessors.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/ext/preprocessors.py
@@ -0,0 +1,20 @@
+# ext/preprocessors.py
+# Copyright (C) 2006-2012 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
+
+"""preprocessing functions, used with the 'preprocessor' 
+argument on Template, TemplateLookup"""
+
+import re
+
+def convert_comments(text):
+    """preprocess old style comments.
+ 
+    example:
+ 
+    from mako.ext.preprocessors import convert_comments
+    t = Template(..., preprocessor=preprocess_comments)"""
+    return re.sub(r'(?<=\n)\s*#[^#]', "##", text)
+
diff --git a/lib/mako-0.7.2/mako/ext/pygmentplugin.py b/lib/mako-0.7.2/mako/ext/pygmentplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/ext/pygmentplugin.py
@@ -0,0 +1,122 @@
+# ext/pygmentplugin.py
+# Copyright (C) 2006-2012 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
+
+from pygments.lexers.web import \
+     HtmlLexer, XmlLexer, JavascriptLexer, CssLexer
+from pygments.lexers.agile import PythonLexer, Python3Lexer
+from pygments.lexer import DelegatingLexer, RegexLexer, bygroups, \
+     include, using
+from pygments.token import \
+     Text, Comment, Operator, Keyword, Name, String, Other
+from pygments.formatters.html import HtmlFormatter
+from pygments import highlight
+from mako import util
+
+class MakoLexer(RegexLexer):
+    name = 'Mako'
+    aliases = ['mako']
+    filenames = ['*.mao']
+
+    tokens = {
+        'root': [
+            (r'(\s*)(\%)(\s*end(?:\w+))(\n|\Z)',
+             bygroups(Text, Comment.Preproc, Keyword, Other)),
+            (r'(\s*)(\%(?!%))([^\n]*)(\n|\Z)',
+             bygroups(Text, Comment.Preproc, using(PythonLexer), Other)),
+            (r'(\s*)(##[^\n]*)(\n|\Z)',
+              bygroups(Text, Comment.Preproc, Other)),
+            (r'''(?s)<%doc>.*?</%doc>''', Comment.Preproc),
+            (r'(<%)([\w\.\:]+)',
+              bygroups(Comment.Preproc, Name.Builtin), 'tag'),
+            (r'(</%)([\w\.\:]+)(>)',
+              bygroups(Comment.Preproc, Name.Builtin, Comment.Preproc)),
+            (r'<%(?=([\w\.\:]+))', Comment.Preproc, 'ondeftags'),
+            (r'(<%(?:!?))(.*?)(%>)(?s)',
+              bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc)),
+            (r'(\$\{)(.*?)(\})',
+             bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc)),
+            (r'''(?sx)
+                (.+?)               # anything, followed by:
+                (?:
+                 (?<=\n)(?=%(?!%)|\#\#) |  # an eval or comment line
+                 (?=\#\*) |          # multiline comment
+                 (?=</?%) |         # a python block
+                                    # call start or end
+                 (?=\$\{) |         # a substitution
+                 (?<=\n)(?=\s*%) |
+                                    # - don't consume
+                 (\\\n) |           # an escaped newline
+                 \Z                 # end of string
+                )
+            ''', bygroups(Other, Operator)),
+            (r'\s+', Text),
+        ],
+        'ondeftags': [
+            (r'<%', Comment.Preproc),
+            (r'(?<=<%)(include|inherit|namespace|page)', Name.Builtin),
+            include('tag'),
+        ],
+        'tag': [
+            (r'((?:\w+)\s*=)\s*(".*?")',
+             bygroups(Name.Attribute, String)),
+            (r'/?\s*>', Comment.Preproc, '#pop'),
+            (r'\s+', Text),
+        ],
+        'attr': [
+            ('".*?"', String, '#pop'),
+            ("'.*?'", String, '#pop'),
+            (r'[^\s>]+', String, '#pop'),
+        ],
+    }
+
+
+class MakoHtmlLexer(DelegatingLexer):
+    name = 'HTML+Mako'
+    aliases = ['html+mako']
+
+    def __init__(self, **options):
+        super(MakoHtmlLexer, self).__init__(HtmlLexer, MakoLexer,
+                                              **options)
+
+class MakoXmlLexer(DelegatingLexer):
+    name = 'XML+Mako'
+    aliases = ['xml+mako']
+
+    def __init__(self, **options):
+        super(MakoXmlLexer, self).__init__(XmlLexer, MakoLexer,
+                                             **options)
+
+class MakoJavascriptLexer(DelegatingLexer):
+    name = 'JavaScript+Mako'
+    aliases = ['js+mako', 'javascript+mako']
+
+    def __init__(self, **options):
+        super(MakoJavascriptLexer, self).__init__(JavascriptLexer,
+                                                    MakoLexer, **options)
+
+class MakoCssLexer(DelegatingLexer):
+    name = 'CSS+Mako'
+    aliases = ['css+mako']
+
+    def __init__(self, **options):
+        super(MakoCssLexer, self).__init__(CssLexer, MakoLexer,
+                                             **options)
+
+
+pygments_html_formatter = HtmlFormatter(cssclass='syntax-highlighted',
+                                        linenos=True)
+def syntax_highlight(filename='', language=None):
+    mako_lexer = MakoLexer()
+    if util.py3k:
+        python_lexer = Python3Lexer()
+    else:
+        python_lexer = PythonLexer()
+    if filename.startswith('memory:') or language == 'mako':
+        return lambda string: highlight(string, mako_lexer,
+                                        pygments_html_formatter)
+    return lambda string: highlight(string, python_lexer,
+                                    pygments_html_formatter)
+
diff --git a/lib/mako-0.7.2/mako/ext/turbogears.py b/lib/mako-0.7.2/mako/ext/turbogears.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/ext/turbogears.py
@@ -0,0 +1,57 @@
+# ext/turbogears.py
+# Copyright (C) 2006-2012 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
+
+import re, inspect
+from mako.lookup import TemplateLookup
+from mako.template import Template
+
+class TGPlugin(object):
+    """TurboGears compatible Template Plugin."""
+
+    def __init__(self, extra_vars_func=None, options=None, extension='mak'):
+        self.extra_vars_func = extra_vars_func
+        self.extension = extension
+        if not options:
+            options = {}
+
+        # Pull the options out and initialize the lookup
+        lookup_options = {}
+        for k, v in options.iteritems():
+            if k.startswith('mako.'):
+                lookup_options[k[5:]] = v
+            elif k in ['directories', 'filesystem_checks', 'module_directory']:
+                lookup_options[k] = v
+        self.lookup = TemplateLookup(**lookup_options)
+ 
+        self.tmpl_options = {}
+        # transfer lookup args to template args, based on those available
+        # in getargspec
+        for kw in inspect.getargspec(Template.__init__)[0]:
+            if kw in lookup_options:
+                self.tmpl_options[kw] = lookup_options[kw]
+
+    def load_template(self, templatename, template_string=None):
+        """Loads a template from a file or a string"""
+        if template_string is not None:
+            return Template(template_string, **self.tmpl_options)
+        # Translate TG dot notation to normal / template path
+        if '/' not in templatename:
+            templatename = '/' + templatename.replace('.', '/') + '.' +\
+                    self.extension
+
+        # Lookup template
+        return self.lookup.get_template(templatename)
+
+    def render(self, info, format="html", fragment=False, template=None):
+        if isinstance(template, basestring):
+            template = self.load_template(template)
+
+        # Load extra vars func if provided
+        if self.extra_vars_func:
+            info.update(self.extra_vars_func())
+
+        return template.render(**info)
+
diff --git a/lib/mako-0.7.2/mako/filters.py b/lib/mako-0.7.2/mako/filters.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/filters.py
@@ -0,0 +1,189 @@
+# mako/filters.py
+# Copyright (C) 2006-2012 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
+
+
+import re, urllib, htmlentitydefs, codecs
+from StringIO import StringIO
+from mako import util
+
+xml_escapes = {
+    '&' : '&amp;',
+    '>' : '&gt;',
+    '<' : '&lt;',
+    '"' : '&#34;',   # also &quot; in html-only
+    "'" : '&#39;'    # also &apos; in html-only
+}
+
+# XXX: &quot; is valid in HTML and XML
+#      &apos; is not valid HTML, but is valid XML
+
+def legacy_html_escape(string):
+    """legacy HTML escape for non-unicode mode."""
+
+    return re.sub(r'([&<"\'>])', lambda m: xml_escapes[m.group()], string)
+
+try:
+    import markupsafe
+    html_escape = markupsafe.escape
+except ImportError:
+    html_escape = legacy_html_escape
+
+
+def xml_escape(string):
+    return re.sub(r'([&<"\'>])', lambda m: xml_escapes[m.group()], string)
+
+def url_escape(string):
+    # convert into a list of octets
+    string = string.encode("utf8")
+    return urllib.quote_plus(string)
+
+def url_unescape(string):
+    text = urllib.unquote_plus(string)
+    if not is_ascii_str(text):
+        text = text.decode("utf8")
+    return text
+
+def trim(string):
+    return string.strip()
+
+
+class Decode(object):
+    def __getattr__(self, key):
+        def decode(x):
+            if isinstance(x, unicode):
+                return x
+            elif not isinstance(x, str):
+                return unicode(str(x), encoding=key)
+            else:
+                return unicode(x, encoding=key)
+        return decode
+decode = Decode()
+
+
+_ASCII_re = re.compile(r'\A[\x00-\x7f]*\Z')
+
+def is_ascii_str(text):
+    return isinstance(text, str) and _ASCII_re.match(text)
+
+################################################################
+
+class XMLEntityEscaper(object):
+    def __init__(self, codepoint2name, name2codepoint):
+        self.codepoint2entity = dict([(c, u'&%s;' % n)
+                                      for c,n in codepoint2name.iteritems()])
+        self.name2codepoint = name2codepoint
+
+    def escape_entities(self, text):
+        """Replace characters with their character entity references.
+
+        Only characters corresponding to a named entity are replaced.
+        """
+        return unicode(text).translate(self.codepoint2entity)
+
+    def __escape(self, m):
+        codepoint = ord(m.group())
+        try:
+            return self.codepoint2entity[codepoint]
+        except (KeyError, IndexError):
+            return '&#x%X;' % codepoint
+
+
+    __escapable = re.compile(r'["&<>]|[^\x00-\x7f]')
+
+    def escape(self, text):
+        """Replace characters with their character references.
+
+        Replace characters by their named entity references.
+        Non-ASCII characters, if they do not have a named entity reference,
+        are replaced by numerical character references.
+
+        The return value is guaranteed to be ASCII.
+        """
+        return self.__escapable.sub(self.__escape, unicode(text)
+                                    ).encode('ascii')
+
+    # XXX: This regexp will not match all valid XML entity names__.
+    # (It punts on details involving involving CombiningChars and Extenders.)
+    #
+    # .. __: http://www.w3.org/TR/2000/REC-xml-20001006#NT-EntityRef
+    __characterrefs = re.compile(r'''& (?:
+                                          \#(\d+)
+                                          | \#x([\da-f]+)
+                                          | ( (?!\d) [:\w] [-.:\w]+ )
+                                          ) ;''',
+                                 re.X | re.UNICODE)
+
+    def __unescape(self, m):
+        dval, hval, name = m.groups()
+        if dval:
+            codepoint = int(dval)
+        elif hval:
+            codepoint = int(hval, 16)
+        else:
+            codepoint = self.name2codepoint.get(name, 0xfffd)
+            # U+FFFD = "REPLACEMENT CHARACTER"
+        if codepoint < 128:
+            return chr(codepoint)
+        return unichr(codepoint)
+
+    def unescape(self, text):
+        """Unescape character references.
+
+        All character references (both entity references and numerical
+        character references) are unescaped.
+        """
+        return self.__characterrefs.sub(self.__unescape, text)
+
+
+_html_entities_escaper = XMLEntityEscaper(htmlentitydefs.codepoint2name,
+                                          htmlentitydefs.name2codepoint)
+
+html_entities_escape = _html_entities_escaper.escape_entities
+html_entities_unescape = _html_entities_escaper.unescape
+
+
+def htmlentityreplace_errors(ex):
+    """An encoding error handler.
+
+    This python `codecs`_ error handler replaces unencodable
+    characters with HTML entities, or, if no HTML entity exists for
+    the character, XML character references.
+
+    >>> u'The cost was \u20ac12.'.encode('latin1', 'htmlentityreplace')
+    'The cost was &euro;12.'
+    """
+    if isinstance(ex, UnicodeEncodeError):
+        # Handle encoding errors
+        bad_text = ex.object[ex.start:ex.end]
+        text = _html_entities_escaper.escape(bad_text)
+        return (unicode(text), ex.end)
+    raise ex
+
+codecs.register_error('htmlentityreplace', htmlentityreplace_errors)
+
+
+# TODO: options to make this dynamic per-compilation will be added in a later
+# release
+DEFAULT_ESCAPES = {
+    'x':'filters.xml_escape',
+    'h':'filters.html_escape',
+    'u':'filters.url_escape',
+    'trim':'filters.trim',
+    'entity':'filters.html_entities_escape',
+    'unicode':'unicode',
+    'decode':'decode',
+    'str':'str',
+    'n':'n'
+}
+
+if util.py3k:
+    DEFAULT_ESCAPES.update({
+        'unicode':'str'
+    })
+
+NON_UNICODE_ESCAPES = DEFAULT_ESCAPES.copy()
+NON_UNICODE_ESCAPES['h'] = 'filters.legacy_html_escape'
+
diff --git a/lib/mako-0.7.2/mako/lexer.py b/lib/mako-0.7.2/mako/lexer.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/lexer.py
@@ -0,0 +1,442 @@
+# mako/lexer.py
+# Copyright (C) 2006-2012 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
+
+"""provides the Lexer class for parsing template strings into parse trees."""
+
+import re, codecs
+from mako import parsetree, exceptions, util
+from mako.pygen import adjust_whitespace
+
+_regexp_cache = {}
+
+class Lexer(object):
+    def __init__(self, text, filename=None,
+                        disable_unicode=False,
+                        input_encoding=None, preprocessor=None):
+        self.text = text
+        self.filename = filename
+        self.template = parsetree.TemplateNode(self.filename)
+        self.matched_lineno = 1
+        self.matched_charpos = 0
+        self.lineno = 1
+        self.match_position = 0
+        self.tag = []
+        self.control_line = []
+        self.ternary_stack = []
+        self.disable_unicode = disable_unicode
+        self.encoding = input_encoding
+
+        if util.py3k and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "Mako for Python 3 does not "
+                                    "support disabling Unicode")
+
+        if preprocessor is None:
+            self.preprocessor = []
+        elif not hasattr(preprocessor, '__iter__'):
+            self.preprocessor = [preprocessor]
+        else:
+            self.preprocessor = preprocessor
+
+    @property
+    def exception_kwargs(self):
+        return {'source':self.text,
+                'lineno':self.matched_lineno,
+                'pos':self.matched_charpos,
+                'filename':self.filename}
+
+    def match(self, regexp, flags=None):
+        """compile the given regexp, cache the reg, and call match_reg()."""
+
+        try:
+            reg = _regexp_cache[(regexp, flags)]
+        except KeyError:
+            if flags:
+                reg = re.compile(regexp, flags)
+            else:
+                reg = re.compile(regexp)
+            _regexp_cache[(regexp, flags)] = reg
+
+        return self.match_reg(reg)
+
+    def match_reg(self, reg):
+        """match the given regular expression object to the current text
+        position.
+
+        if a match occurs, update the current text and line position.
+
+        """
+
+        mp = self.match_position
+
+        match = reg.match(self.text, self.match_position)
+        if match:
+            (start, end) = match.span()
+            if end == start:
+                self.match_position = end + 1
+            else:
+                self.match_position = end
+            self.matched_lineno = self.lineno
+            lines = re.findall(r"\n", self.text[mp:self.match_position])
+            cp = mp - 1
+            while (cp >= 0 and cp<self.textlength and self.text[cp] != '\n'):
+                cp -=1
+            self.matched_charpos = mp - cp
+            self.lineno += len(lines)
+            #print "MATCHED:", match.group(0), "LINE START:",
+            # self.matched_lineno, "LINE END:", self.lineno
+        #print "MATCH:", regexp, "\n", self.text[mp : mp + 15], \
+        #          (match and "TRUE" or "FALSE")
+        return match
+
+    def parse_until_text(self, *text):
+        startpos = self.match_position
+        text_re = r'|'.join(text)
+        brace_level = 0
+        while True:
+            match = self.match(r'#.*\n')
+            if match:
+                continue
+            match = self.match(r'(\"\"\"|\'\'\'|\"|\')((?<!\\)\\\1|.)*?\1',
+                               re.S)
+            if match:
+                continue
+            match = self.match(r'(%s)' % text_re)
+            if match:
+                if match.group(1) == '}' and brace_level > 0:
+                    brace_level -= 1
+                    continue
+                return \
+                    self.text[startpos:\
+                              self.match_position-len(match.group(1))],\
+                    match.group(1)
+            match = self.match(r"(.*?)(?=\"|\'|#|%s)" % text_re, re.S)
+            if match:
+                brace_level += match.group(1).count('{')
+                brace_level -= match.group(1).count('}')
+                continue
+            raise exceptions.SyntaxException(
+                        "Expected: %s" %
+                        ','.join(text),
+                        **self.exception_kwargs)
+
+    def append_node(self, nodecls, *args, **kwargs):
+        kwargs.setdefault('source', self.text)
+        kwargs.setdefault('lineno', self.matched_lineno)
+        kwargs.setdefault('pos', self.matched_charpos)
+        kwargs['filename'] = self.filename
+        node = nodecls(*args, **kwargs)
+        if len(self.tag):
+            self.tag[-1].nodes.append(node)
+        else:
+            self.template.nodes.append(node)
+        # build a set of child nodes for the control line
+        # (used for loop variable detection)
+        # also build a set of child nodes on ternary control lines
+        # (used for determining if a pass needs to be auto-inserted
+        if self.control_line:
+            control_frame = self.control_line[-1]
+            control_frame.nodes.append(node)
+            if not (isinstance(node, parsetree.ControlLine) and
+                    control_frame.is_ternary(node.keyword)):
+                if self.ternary_stack and self.ternary_stack[-1]:
+                    self.ternary_stack[-1][-1].nodes.append(node)
+        if isinstance(node, parsetree.Tag):
+            if len(self.tag):
+                node.parent = self.tag[-1]
+            self.tag.append(node)
+        elif isinstance(node, parsetree.ControlLine):
+            if node.isend:
+                self.control_line.pop()
+                self.ternary_stack.pop()
+            elif node.is_primary:
+                self.control_line.append(node)
+                self.ternary_stack.append([])
+            elif self.control_line and \
+                    self.control_line[-1].is_ternary(node.keyword):
+                self.ternary_stack[-1].append(node)
+            elif self.control_line and \
+                    not self.control_line[-1].is_ternary(node.keyword):
+                raise exceptions.SyntaxException(
+                          "Keyword '%s' not a legal ternary for keyword '%s'" %
+                          (node.keyword, self.control_line[-1].keyword),
+                          **self.exception_kwargs)
+
+    _coding_re = re.compile(r'#.*coding[:=]\s*([-\w.]+).*\r?\n')
+
+    def decode_raw_stream(self, text, decode_raw, known_encoding, filename):
+        """given string/unicode or bytes/string, determine encoding
+           from magic encoding comment, return body as unicode
+           or raw if decode_raw=False
+
+        """
+        if isinstance(text, unicode):
+            m = self._coding_re.match(text)
+            encoding = m and m.group(1) or known_encoding or 'ascii'
+            return encoding, text
+
+        if text.startswith(codecs.BOM_UTF8):
+            text = text[len(codecs.BOM_UTF8):]
+            parsed_encoding = 'utf-8'
+            m = self._coding_re.match(text.decode('utf-8', 'ignore'))
+            if m is not None and m.group(1) != 'utf-8':
+                raise exceptions.CompileException(
+                                "Found utf-8 BOM in file, with conflicting "
+                                "magic encoding comment of '%s'" % m.group(1),
+                                text.decode('utf-8', 'ignore'),
+                                0, 0, filename)
+        else:
+            m = self._coding_re.match(text.decode('utf-8', 'ignore'))
+            if m:
+                parsed_encoding = m.group(1)
+            else:
+                parsed_encoding = known_encoding or 'ascii'
+
+        if decode_raw:
+            try:
+                text = text.decode(parsed_encoding)
+            except UnicodeDecodeError, e:
+                raise exceptions.CompileException(
+                           "Unicode decode operation of encoding '%s' failed" %
+                           parsed_encoding,
+                           text.decode('utf-8', 'ignore'),
+                           0, 0, filename)
+
+        return parsed_encoding, text
+
+    def parse(self):
+        self.encoding, self.text = self.decode_raw_stream(self.text,
+                                        not self.disable_unicode,
+                                        self.encoding,
+                                        self.filename,)
+
+        for preproc in self.preprocessor:
+            self.text = preproc(self.text)
+
+        # push the match marker past the
+        # encoding comment.
+        self.match_reg(self._coding_re)
+
+        self.textlength = len(self.text)
+
+        while (True):
+            if self.match_position > self.textlength:
+                break
+
+            if self.match_end():
+                break
+            if self.match_expression():
+                continue
+            if self.match_control_line():
+                continue
+            if self.match_comment():
+                continue
+            if self.match_tag_start():
+                continue
+            if self.match_tag_end():
+                continue
+            if self.match_python_block():
+                continue
+            if self.match_text():
+                continue
+
+            if self.match_position > self.textlength:
+                break
+            raise exceptions.CompileException("assertion failed")
+
+        if len(self.tag):
+            raise exceptions.SyntaxException("Unclosed tag: <%%%s>" %
+                                                self.tag[-1].keyword,
+                                                **self.exception_kwargs)
+        if len(self.control_line):
+            raise exceptions.SyntaxException(
+                                      "Unterminated control keyword: '%s'" %
+                                      self.control_line[-1].keyword,
+                                      self.text,
+                                      self.control_line[-1].lineno,
+                                      self.control_line[-1].pos, self.filename)
+        return self.template
+
+    def match_tag_start(self):
+        match = self.match(r'''
+            \<%     # opening tag
+
+            ([\w\.\:]+)   # keyword
+
+            ((?:\s+\w+|\s*=\s*|".*?"|'.*?')*)  # attrname, = \
+                                               #        sign, string expression
+
+            \s*     # more whitespace
+
+            (/)?>   # closing
+
+            ''',
+
+            re.I | re.S | re.X)
+
+        if match:
+            keyword, attr, isend = match.groups()
+            self.keyword = keyword
+            attributes = {}
+            if attr:
+                for att in re.findall(
+                           r"\s*(\w+)\s*=\s*(?:'([^']*)'|\"([^\"]*)\")", attr):
+                    key, val1, val2 = att
+                    text = val1 or val2
+                    text = text.replace('\r\n', '\n')
+                    attributes[key] = text
+            self.append_node(parsetree.Tag, keyword, attributes)
+            if isend:
+                self.tag.pop()
+            else:
+                if keyword == 'text':
+                    match = self.match(r'(.*?)(?=\</%text>)',  re.S)
+                    if not match:
+                        raise exceptions.SyntaxException(
+                                            "Unclosed tag: <%%%s>" %
+                                            self.tag[-1].keyword,
+                                            **self.exception_kwargs)
+                    self.append_node(parsetree.Text, match.group(1))
+                    return self.match_tag_end()
+            return True
+        else:
+            return False
+
+    def match_tag_end(self):
+        match = self.match(r'\</%[\t ]*(.+?)[\t ]*>')
+        if match:
+            if not len(self.tag):
+                raise exceptions.SyntaxException(
+                                   "Closing tag without opening tag: </%%%s>" %
+                                    match.group(1),
+                                    **self.exception_kwargs)
+            elif self.tag[-1].keyword != match.group(1):
+                raise exceptions.SyntaxException(
+                             "Closing tag </%%%s> does not match tag: <%%%s>" %
+                             (match.group(1), self.tag[-1].keyword),
+                             **self.exception_kwargs)
+            self.tag.pop()
+            return True
+        else:
+            return False
+
+    def match_end(self):
+        match = self.match(r'\Z', re.S)
+        if match:
+            string = match.group()
+            if string:
+                return string
+            else:
+                return True
+        else:
+            return False
+
+    def match_text(self):
+        match = self.match(r"""
+                (.*?)         # anything, followed by:
+                (
+                 (?<=\n)(?=[ \t]*(?=%|\#\#)) # an eval or line-based
+                                             # comment preceded by a
+                                             # consumed newline and whitespace
+                 |
+                 (?=\${)      # an expression
+                 |
+                 (?=\#\*)     # multiline comment
+                 |
+                 (?=</?[%&])  # a substitution or block or call start or end
+                              # - don't consume
+                 |
+                 (\\\r?\n)    # an escaped newline  - throw away
+                 |
+                 \Z           # end of string
+                )""", re.X | re.S)
+
+        if match:
+            text = match.group(1)
+            if text:
+                self.append_node(parsetree.Text, text)
+            return True
+        else:
+            return False
+
+    def match_python_block(self):
+        match = self.match(r"<%(!)?")
+        if match:
+            line, pos = self.matched_lineno, self.matched_charpos
+            text, end = self.parse_until_text(r'%>')
+            # the trailing newline helps
+            # compiler.parse() not complain about indentation
+            text = adjust_whitespace(text) + "\n"
+            self.append_node(
+                            parsetree.Code,
+                            text,
+                            match.group(1)=='!', lineno=line, pos=pos)
+            return True
+        else:
+            return False
+
+    def match_expression(self):
+        match = self.match(r"\${")
+        if match:
+            line, pos = self.matched_lineno, self.matched_charpos
+            text, end = self.parse_until_text(r'\|', r'}')
+            if end == '|':
+                escapes, end = self.parse_until_text(r'}')
+            else:
+                escapes = ""
+            text = text.replace('\r\n', '\n')
+            self.append_node(
+                            parsetree.Expression,
+                            text, escapes.strip(),
+                            lineno=line, pos=pos)
+            return True
+        else:
+            return False
+
+    def match_control_line(self):
+        match = self.match(
+                      r"(?<=^)[\t ]*(%(?!%)|##)[\t ]*((?:(?:\\r?\n)|[^\r\n])*)"
+                      r"(?:\r?\n|\Z)", re.M)
+        if match:
+            operator = match.group(1)
+            text = match.group(2)
+            if operator == '%':
+                m2 = re.match(r'(end)?(\w+)\s*(.*)', text)
+                if not m2:
+                    raise exceptions.SyntaxException(
+                                "Invalid control line: '%s'" %
+                                text,
+                                **self.exception_kwargs)
+                isend, keyword = m2.group(1, 2)
+                isend = (isend is not None)
+
+                if isend:
+                    if not len(self.control_line):
+                        raise exceptions.SyntaxException(
+                                "No starting keyword '%s' for '%s'" %
+                                (keyword, text),
+                                **self.exception_kwargs)
+                    elif self.control_line[-1].keyword != keyword:
+                        raise exceptions.SyntaxException(
+                                "Keyword '%s' doesn't match keyword '%s'" %
+                                (text, self.control_line[-1].keyword),
+                                **self.exception_kwargs)
+                self.append_node(parsetree.ControlLine, keyword, isend, text)
+            else:
+                self.append_node(parsetree.Comment, text)
+            return True
+        else:
+            return False
+
+    def match_comment(self):
+        """matches the multiline version of a comment"""
+        match = self.match(r"<%doc>(.*?)</%doc>", re.S)
+        if match:
+            self.append_node(parsetree.Comment, match.group(1))
+            return True
+        else:
+            return False
+
diff --git a/lib/mako-0.7.2/mako/lookup.py b/lib/mako-0.7.2/mako/lookup.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/lookup.py
@@ -0,0 +1,354 @@
+# mako/lookup.py
+# Copyright (C) 2006-2012 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
+
+import os, stat, posixpath, re
+from mako import exceptions, util
+from mako.template import Template
+
+try:
+    import threading
+except:
+    import dummy_threading as threading
+
+class TemplateCollection(object):
+    """Represent a collection of :class:`.Template` objects,
+    identifiable via URI.
+
+    A :class:`.TemplateCollection` is linked to the usage of
+    all template tags that address other templates, such
+    as ``<%include>``, ``<%namespace>``, and ``<%inherit>``.
+    The ``file`` attribute of each of those tags refers
+    to a string URI that is passed to that :class:`.Template`
+    object's :class:`.TemplateCollection` for resolution.
+
+    :class:`.TemplateCollection` is an abstract class,
+    with the usual default implementation being :class:`.TemplateLookup`.
+
+     """
+
+    def has_template(self, uri):
+        """Return ``True`` if this :class:`.TemplateLookup` is
+        capable of returning a :class:`.Template` object for the
+        given ``uri``.
+
+        :param uri: String URI of the template to be resolved.
+
+        """
+        try:
+            self.get_template(uri)
+            return True
+        except exceptions.TemplateLookupException:
+            return False
+
+    def get_template(self, uri, relativeto=None):
+        """Return a :class:`.Template` object corresponding to the given
+        ``uri``.
+
+        The default implementation raises
+        :class:`.NotImplementedError`. Implementations should
+        raise :class:`.TemplateLookupException` if the given ``uri``
+        cannot be resolved.
+
+        :param uri: String URI of the template to be resolved.
+        :param relativeto: if present, the given ``uri`` is assumed to
+         be relative to this URI.
+
+        """
+        raise NotImplementedError()
+
+    def filename_to_uri(self, uri, filename):
+        """Convert the given ``filename`` to a URI relative to
+           this :class:`.TemplateCollection`."""
+
+        return uri
+
+    def adjust_uri(self, uri, filename):
+        """Adjust the given ``uri`` based on the calling ``filename``.
+
+        When this method is called from the runtime, the
+        ``filename`` parameter is taken directly to the ``filename``
+        attribute of the calling template. Therefore a custom
+        :class:`.TemplateCollection` subclass can place any string
+        identifier desired in the ``filename`` parameter of the
+        :class:`.Template` objects it constructs and have them come back
+        here.
+
+        """
+        return uri
+
+class TemplateLookup(TemplateCollection):
+    """Represent a collection of templates that locates template source files
+    from the local filesystem.
+
+    The primary argument is the ``directories`` argument, the list of
+    directories to search:
+
+    .. sourcecode:: python
+
+        lookup = TemplateLookup(["/path/to/templates"])
+        some_template = lookup.get_template("/index.html")
+
+    The :class:`.TemplateLookup` can also be given :class:`.Template` objects
+    programatically using :meth:`.put_string` or :meth:`.put_template`:
+
+    .. sourcecode:: python
+
+        lookup = TemplateLookup()
+        lookup.put_string("base.html", '''
+            <html><body>${self.next()}</body></html>
+        ''')
+        lookup.put_string("hello.html", '''
+            <%include file='base.html'/>
+
+            Hello, world !
+        ''')
+
+
+    :param directories: A list of directory names which will be
+     searched for a particular template URI. The URI is appended
+     to each directory and the filesystem checked.
+
+    :param collection_size: Approximate size of the collection used
+     to store templates. If left at its default of ``-1``, the size
+     is unbounded, and a plain Python dictionary is used to
+     relate URI strings to :class:`.Template` instances.
+     Otherwise, a least-recently-used cache object is used which
+     will maintain the size of the collection approximately to
+     the number given.
+
+    :param filesystem_checks: When at its default value of ``True``,
+     each call to :meth:`.TemplateLookup.get_template()` will
+     compare the filesystem last modified time to the time in
+     which an existing :class:`.Template` object was created.
+     This allows the :class:`.TemplateLookup` to regenerate a
+     new :class:`.Template` whenever the original source has
+     been updated. Set this to ``False`` for a very minor
+     performance increase.
+
+    :param modulename_callable: A callable which, when present,
+     is passed the path of the source file as well as the
+     requested URI, and then returns the full path of the
+     generated Python module file. This is used to inject
+     alternate schemes for Python module location. If left at
+     its default of ``None``, the built in system of generation
+     based on ``module_directory`` plus ``uri`` is used.
+
+    All other keyword parameters available for
+    :class:`.Template` are mirrored here. When new
+    :class:`.Template` objects are created, the keywords
+    established with this :class:`.TemplateLookup` are passed on
+    to each new :class:`.Template`.
+
+    """
+
+    def __init__(self,
+                        directories=None,
+                        module_directory=None,
+                        filesystem_checks=True,
+                        collection_size=-1,
+                        format_exceptions=False,
+                        error_handler=None,
+                        disable_unicode=False,
+                        bytestring_passthrough=False,
+                        output_encoding=None,
+                        encoding_errors='strict',
+
+                        cache_args=None,
+                        cache_impl='beaker',
+                        cache_enabled=True,
+                        cache_type=None,
+                        cache_dir=None,
+                        cache_url=None,
+
+                        modulename_callable=None,
+                        module_writer=None,
+                        default_filters=None,
+                        buffer_filters=(),
+                        strict_undefined=False,
+                        imports=None,
+                        enable_loop=True,
+                        input_encoding=None,
+                        preprocessor=None):
+
+        self.directories = [posixpath.normpath(d) for d in
+                            util.to_list(directories, ())
+                            ]
+        self.module_directory = module_directory
+        self.modulename_callable = modulename_callable
+        self.filesystem_checks = filesystem_checks
+        self.collection_size = collection_size
+
+        if cache_args is None:
+            cache_args = {}
+        # transfer deprecated cache_* args
+        if cache_dir:
+            cache_args.setdefault('dir', cache_dir)
+        if cache_url:
+            cache_args.setdefault('url', cache_url)
+        if cache_type:
+            cache_args.setdefault('type', cache_type)
+
+        self.template_args = {
+            'format_exceptions':format_exceptions,
+            'error_handler':error_handler,
+            'disable_unicode':disable_unicode,
+            'bytestring_passthrough':bytestring_passthrough,
+            'output_encoding':output_encoding,
+            'cache_impl':cache_impl,
+            'encoding_errors':encoding_errors,
+            'input_encoding':input_encoding,
+            'module_directory':module_directory,
+            'module_writer':module_writer,
+            'cache_args':cache_args,
+            'cache_enabled':cache_enabled,
+            'default_filters':default_filters,
+            'buffer_filters':buffer_filters,
+            'strict_undefined':strict_undefined,
+            'imports':imports,
+            'enable_loop':enable_loop,
+            'preprocessor':preprocessor}
+
+        if collection_size == -1:
+            self._collection = {}
+            self._uri_cache = {}
+        else:
+            self._collection = util.LRUCache(collection_size)
+            self._uri_cache = util.LRUCache(collection_size)
+        self._mutex = threading.Lock()
+
+    def get_template(self, uri):
+        """Return a :class:`.Template` object corresponding to the given
+        ``uri``.
+
+        .. note:: The ``relativeto`` argument is not supported here at the moment.
+
+        """
+
+        try:
+            if self.filesystem_checks:
+                return self._check(uri, self._collection[uri])
+            else:
+                return self._collection[uri]
+        except KeyError:
+            u = re.sub(r'^\/+', '', uri)
+            for dir in self.directories:
+                srcfile = posixpath.normpath(posixpath.join(dir, u))
+                if os.path.isfile(srcfile):
+                    return self._load(srcfile, uri)
+            else:
+                raise exceptions.TopLevelLookupException(
+                                    "Cant locate template for uri %r" % uri)
+
+    def adjust_uri(self, uri, relativeto):
+        """Adjust the given ``uri`` based on the given relative URI."""
+
+        key = (uri, relativeto)
+        if key in self._uri_cache:
+            return self._uri_cache[key]
+
+        if uri[0] != '/':
+            if relativeto is not None:
+                v = self._uri_cache[key] = posixpath.join(
+                                            posixpath.dirname(relativeto), uri)
+            else:
+                v = self._uri_cache[key] = '/' + uri
+        else:
+            v = self._uri_cache[key] = uri
+        return v
+
+
+    def filename_to_uri(self, filename):
+        """Convert the given ``filename`` to a URI relative to
+           this :class:`.TemplateCollection`."""
+
+        try:
+            return self._uri_cache[filename]
+        except KeyError:
+            value = self._relativeize(filename)
+            self._uri_cache[filename] = value
+            return value
+
+    def _relativeize(self, filename):
+        """Return the portion of a filename that is 'relative'
+           to the directories in this lookup.
+
+        """
+
+        filename = posixpath.normpath(filename)
+        for dir in self.directories:
+            if filename[0:len(dir)] == dir:
+                return filename[len(dir):]
+        else:
+            return None
+
+    def _load(self, filename, uri):
+        self._mutex.acquire()
+        try:
+            try:
+                # try returning from collection one
+                # more time in case concurrent thread already loaded
+                return self._collection[uri]
+            except KeyError:
+                pass
+            try:
+                if self.modulename_callable is not None:
+                    module_filename = self.modulename_callable(filename, uri)
+                else:
+                    module_filename = None
+                self._collection[uri] = template = Template(
+                                        uri=uri,
+                                        filename=posixpath.normpath(filename),
+                                        lookup=self,
+                                        module_filename=module_filename,
+                                        **self.template_args)
+                return template
+            except:
+                # if compilation fails etc, ensure
+                # template is removed from collection,
+                # re-raise
+                self._collection.pop(uri, None)
+                raise
+        finally:
+            self._mutex.release()
+
+    def _check(self, uri, template):
+        if template.filename is None:
+            return template
+
+        try:
+            template_stat = os.stat(template.filename)
+            if template.module._modified_time < \
+                        template_stat[stat.ST_MTIME]:
+                self._collection.pop(uri, None)
+                return self._load(template.filename, uri)
+            else:
+                return template
+        except OSError:
+            self._collection.pop(uri, None)
+            raise exceptions.TemplateLookupException(
+                                "Cant locate template for uri %r" % uri)
+
+
+    def put_string(self, uri, text):
+        """Place a new :class:`.Template` object into this
+        :class:`.TemplateLookup`, based on the given string of
+        ``text``.
+
+        """
+        self._collection[uri] = Template(
+                                    text,
+                                    lookup=self,
+                                    uri=uri,
+                                    **self.template_args)
+
+    def put_template(self, uri, template):
+        """Place a new :class:`.Template` object into this
+        :class:`.TemplateLookup`, based on the given
+        :class:`.Template` object.
+
+        """
+        self._collection[uri] = template
+
diff --git a/lib/mako-0.7.2/mako/parsetree.py b/lib/mako-0.7.2/mako/parsetree.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/parsetree.py
@@ -0,0 +1,589 @@
+# mako/parsetree.py
+# Copyright (C) 2006-2012 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
+
+"""defines the parse tree components for Mako templates."""
+
+from mako import exceptions, ast, util, filters
+import re
+
+class Node(object):
+    """base class for a Node in the parse tree."""
+
+    def __init__(self, source, lineno, pos, filename):
+        self.source = source
+        self.lineno = lineno
+        self.pos = pos
+        self.filename = filename
+
+    @property
+    def exception_kwargs(self):
+        return {'source':self.source, 'lineno':self.lineno,
+                'pos':self.pos, 'filename':self.filename}
+
+    def get_children(self):
+        return []
+
+    def accept_visitor(self, visitor):
+        def traverse(node):
+            for n in node.get_children():
+                n.accept_visitor(visitor)
+
+        method = getattr(visitor, "visit" + self.__class__.__name__, traverse)
+        method(self)
+
+class TemplateNode(Node):
+    """a 'container' node that stores the overall collection of nodes."""
+
+    def __init__(self, filename):
+        super(TemplateNode, self).__init__('', 0, 0, filename)
+        self.nodes = []
+        self.page_attributes = {}
+
+    def get_children(self):
+        return self.nodes
+
+    def __repr__(self):
+        return "TemplateNode(%s, %r)" % (
+                    util.sorted_dict_repr(self.page_attributes),
+                    self.nodes)
+
+class ControlLine(Node):
+    """defines a control line, a line-oriented python line or end tag.
+
+    e.g.::
+
+        % if foo:
+            (markup)
+        % endif
+
+    """
+
+    has_loop_context = False
+
+    def __init__(self, keyword, isend, text, **kwargs):
+        super(ControlLine, self).__init__(**kwargs)
+        self.text = text
+        self.keyword = keyword
+        self.isend = isend
+        self.is_primary = keyword in ['for', 'if', 'while', 'try', 'with']
+        self.nodes = []
+        if self.isend:
+            self._declared_identifiers = []
+            self._undeclared_identifiers = []
+        else:
+            code = ast.PythonFragment(text, **self.exception_kwargs)
+            self._declared_identifiers = code.declared_identifiers
+            self._undeclared_identifiers = code.undeclared_identifiers
+
+    def get_children(self):
+        return self.nodes
+
+    def declared_identifiers(self):
+        return self._declared_identifiers
+
+    def undeclared_identifiers(self):
+        return self._undeclared_identifiers
+
+    def is_ternary(self, keyword):
+        """return true if the given keyword is a ternary keyword
+        for this ControlLine"""
+
+        return keyword in {
+            'if':set(['else', 'elif']),
+            'try':set(['except', 'finally']),
+            'for':set(['else'])
+        }.get(self.keyword, [])
+
+    def __repr__(self):
+        return "ControlLine(%r, %r, %r, %r)" % (
+            self.keyword,
+            self.text,
+            self.isend,
+            (self.lineno, self.pos)
+        )
+
+class Text(Node):
+    """defines plain text in the template."""
+
+    def __init__(self, content, **kwargs):
+        super(Text, self).__init__(**kwargs)
+        self.content = content
+
+    def __repr__(self):
+        return "Text(%r, %r)" % (self.content, (self.lineno, self.pos))
+
+class Code(Node):
+    """defines a Python code block, either inline or module level.
+
+    e.g.::
+
+        inline:
+        <%
+            x = 12
+        %>
+
+        module level:
+        <%!
+            import logger
+        %>
+
+    """
+
+    def __init__(self, text, ismodule, **kwargs):
+        super(Code, self).__init__(**kwargs)
+        self.text = text
+        self.ismodule = ismodule
+        self.code = ast.PythonCode(text, **self.exception_kwargs)
+
+    def declared_identifiers(self):
+        return self.code.declared_identifiers
+
+    def undeclared_identifiers(self):
+        return self.code.undeclared_identifiers
+
+    def __repr__(self):
+        return "Code(%r, %r, %r)" % (
+            self.text,
+            self.ismodule,
+            (self.lineno, self.pos)
+        )
+
+class Comment(Node):
+    """defines a comment line.
+
+    # this is a comment
+
+    """
+
+    def __init__(self, text, **kwargs):
+        super(Comment, self).__init__(**kwargs)
+        self.text = text
+
+    def __repr__(self):
+        return "Comment(%r, %r)" % (self.text, (self.lineno, self.pos))
+
+class Expression(Node):
+    """defines an inline expression.
+
+    ${x+y}
+
+    """
+
+    def __init__(self, text, escapes, **kwargs):
+        super(Expression, self).__init__(**kwargs)
+        self.text = text
+        self.escapes = escapes
+        self.escapes_code = ast.ArgumentList(escapes, **self.exception_kwargs)
+        self.code = ast.PythonCode(text, **self.exception_kwargs)
+
+    def declared_identifiers(self):
+        return []
+
+    def undeclared_identifiers(self):
+        # TODO: make the "filter" shortcut list configurable at parse/gen time
+        return self.code.undeclared_identifiers.union(
+                self.escapes_code.undeclared_identifiers.difference(
+                    set(filters.DEFAULT_ESCAPES.keys())
+                )
+            ).difference(self.code.declared_identifiers)
+
+    def __repr__(self):
+        return "Expression(%r, %r, %r)" % (
+            self.text,
+            self.escapes_code.args,
+            (self.lineno, self.pos)
+        )
+
+class _TagMeta(type):
+    """metaclass to allow Tag to produce a subclass according to
+    its keyword"""
+
+    _classmap = {}
+
+    def __init__(cls, clsname, bases, dict):
+        if cls.__keyword__ is not None:
+            cls._classmap[cls.__keyword__] = cls
+            super(_TagMeta, cls).__init__(clsname, bases, dict)
+
+    def __call__(cls, keyword, attributes, **kwargs):
+        if ":" in keyword:
+            ns, defname = keyword.split(':')
+            return type.__call__(CallNamespaceTag, ns, defname,
+                                        attributes, **kwargs)
+
+        try:
+            cls = _TagMeta._classmap[keyword]
+        except KeyError:
+            raise exceptions.CompileException(
+                "No such tag: '%s'" % keyword,
+                source=kwargs['source'],
+                lineno=kwargs['lineno'],
+                pos=kwargs['pos'],
+                filename=kwargs['filename']
+            )
+        return type.__call__(cls, keyword, attributes, **kwargs)
+
+class Tag(Node):
+    """abstract base class for tags.
+
+    <%sometag/>
+
+    <%someothertag>
+        stuff
+    </%someothertag>
+
+    """
+
+    __metaclass__ = _TagMeta
+    __keyword__ = None
+
+    def __init__(self, keyword, attributes, expressions,
+                        nonexpressions, required, **kwargs):
+        """construct a new Tag instance.
+
+        this constructor not called directly, and is only called
+        by subclasses.
+
+        :param keyword: the tag keyword
+
+        :param attributes: raw dictionary of attribute key/value pairs
+
+        :param expressions: a set of identifiers that are legal attributes,
+         which can also contain embedded expressions
+
+        :param nonexpressions: a set of identifiers that are legal
+         attributes, which cannot contain embedded expressions
+
+        :param \**kwargs:
+         other arguments passed to the Node superclass (lineno, pos)
+
+        """
+        super(Tag, self).__init__(**kwargs)
+        self.keyword = keyword
+        self.attributes = attributes
+        self._parse_attributes(expressions, nonexpressions)
+        missing = [r for r in required if r not in self.parsed_attributes]
+        if len(missing):
+            raise exceptions.CompileException(
+                "Missing attribute(s): %s" %
+                    ",".join([repr(m) for m in missing]),
+                **self.exception_kwargs)
+        self.parent = None
+        self.nodes = []
+
+    def is_root(self):
+        return self.parent is None
+
+    def get_children(self):
+        return self.nodes
+
+    def _parse_attributes(self, expressions, nonexpressions):
+        undeclared_identifiers = set()
+        self.parsed_attributes = {}
+        for key in self.attributes:
+            if key in expressions:
+                expr = []
+                for x in re.compile(r'(\${.+?})',
+                                    re.S).split(self.attributes[key]):
+                    m = re.compile(r'^\${(.+?)}$', re.S).match(x)
+                    if m:
+                        code = ast.PythonCode(m.group(1).rstrip(),
+                                **self.exception_kwargs)
+                        # we aren't discarding "declared_identifiers" here,
+                        # which we do so that list comprehension-declared
+                        # variables aren't counted.   As yet can't find a
+                        # condition that requires it here.
+                        undeclared_identifiers = \
+                            undeclared_identifiers.union(
+                                    code.undeclared_identifiers)
+                        expr.append('(%s)' % m.group(1))
+                    else:
+                        if x:
+                            expr.append(repr(x))
+                self.parsed_attributes[key] = " + ".join(expr) or repr('')
+            elif key in nonexpressions:
+                if re.search(r'\${.+?}', self.attributes[key]):
+                    raise exceptions.CompileException(
+                           "Attibute '%s' in tag '%s' does not allow embedded "
+                           "expressions"  % (key, self.keyword),
+                           **self.exception_kwargs)
+                self.parsed_attributes[key] = repr(self.attributes[key])
+            else:
+                raise exceptions.CompileException(
+                                    "Invalid attribute for tag '%s': '%s'" %
+                                    (self.keyword, key),
+                                    **self.exception_kwargs)
+        self.expression_undeclared_identifiers = undeclared_identifiers
+
+    def declared_identifiers(self):
+        return []
+
+    def undeclared_identifiers(self):
+        return self.expression_undeclared_identifiers
+
+    def __repr__(self):
+        return "%s(%r, %s, %r, %r)" % (self.__class__.__name__,
+                                    self.keyword,
+                                    util.sorted_dict_repr(self.attributes),
+                                    (self.lineno, self.pos),
+                                    self.nodes
+                                )
+
+class IncludeTag(Tag):
+    __keyword__ = 'include'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        super(IncludeTag, self).__init__(
+                                    keyword,
+                                    attributes,
+                                    ('file', 'import', 'args'),
+                                    (), ('file',), **kwargs)
+        self.page_args = ast.PythonCode(
+                                "__DUMMY(%s)" % attributes.get('args', ''),
+                                 **self.exception_kwargs)
+
+    def declared_identifiers(self):
+        return []
+
+    def undeclared_identifiers(self):
+        identifiers = self.page_args.undeclared_identifiers.\
+                            difference(set(["__DUMMY"])).\
+                            difference(self.page_args.declared_identifiers)
+        return identifiers.union(super(IncludeTag, self).
+                                    undeclared_identifiers())
+
+class NamespaceTag(Tag):
+    __keyword__ = 'namespace'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        super(NamespaceTag, self).__init__(
+                                        keyword, attributes,
+                                        ('file',),
+                                        ('name','inheritable',
+                                        'import','module'),
+                                        (), **kwargs)
+
+        self.name = attributes.get('name', '__anon_%s' % hex(abs(id(self))))
+        if not 'name' in attributes and not 'import' in attributes:
+            raise exceptions.CompileException(
+                "'name' and/or 'import' attributes are required "
+                "for <%namespace>",
+                **self.exception_kwargs)
+        if 'file' in attributes and 'module' in attributes:
+            raise exceptions.CompileException(
+                "<%namespace> may only have one of 'file' or 'module'",
+                **self.exception_kwargs
+            )
+
+    def declared_identifiers(self):
+        return []
+
+class TextTag(Tag):
+    __keyword__ = 'text'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        super(TextTag, self).__init__(
+                                    keyword,
+                                    attributes, (),
+                                    ('filter'), (), **kwargs)
+        self.filter_args = ast.ArgumentList(
+                                    attributes.get('filter', ''),
+                                    **self.exception_kwargs)
+
+class DefTag(Tag):
+    __keyword__ = 'def'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        expressions = ['buffered', 'cached'] + [
+                c for c in attributes if c.startswith('cache_')]
+
+
+        super(DefTag, self).__init__(
+                keyword,
+                attributes,
+                expressions,
+                ('name','filter', 'decorator'),
+                ('name',),
+                **kwargs)
+        name = attributes['name']
+        if re.match(r'^[\w_]+$',name):
+            raise exceptions.CompileException(
+                                "Missing parenthesis in %def",
+                                **self.exception_kwargs)
+        self.function_decl = ast.FunctionDecl("def " + name + ":pass",
+                                                    **self.exception_kwargs)
+        self.name = self.function_decl.funcname
+        self.decorator = attributes.get('decorator', '')
+        self.filter_args = ast.ArgumentList(
+                                attributes.get('filter', ''),
+                                **self.exception_kwargs)
+
+    is_anonymous = False
+    is_block = False
+
+    @property
+    def funcname(self):
+        return self.function_decl.funcname
+
+    def get_argument_expressions(self, **kw):
+        return self.function_decl.get_argument_expressions(**kw)
+
+    def declared_identifiers(self):
+        return self.function_decl.argnames
+
+    def undeclared_identifiers(self):
+        res = []
+        for c in self.function_decl.defaults:
+            res += list(ast.PythonCode(c, **self.exception_kwargs).
+                                    undeclared_identifiers)
+        return set(res).union(
+            self.filter_args.\
+                            undeclared_identifiers.\
+                            difference(filters.DEFAULT_ESCAPES.keys())
+        ).union(
+            self.expression_undeclared_identifiers
+        ).difference(
+            self.function_decl.argnames
+        )
+
+class BlockTag(Tag):
+    __keyword__ = 'block'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        expressions = ['buffered', 'cached', 'args'] + [
+                 c for c in attributes if c.startswith('cache_')]
+
+        super(BlockTag, self).__init__(
+                keyword,
+                attributes,
+                expressions,
+                ('name','filter', 'decorator'),
+                (),
+                **kwargs)
+        name = attributes.get('name')
+        if name and not re.match(r'^[\w_]+$',name):
+            raise exceptions.CompileException(
+                               "%block may not specify an argument signature",
+                               **self.exception_kwargs)
+        if not name and attributes.get('args', None):
+            raise exceptions.CompileException(
+                                "Only named %blocks may specify args",
+                                **self.exception_kwargs
+                                )
+        self.body_decl = ast.FunctionArgs(attributes.get('args', ''),
+                                            **self.exception_kwargs)
+
+        self.name = name
+        self.decorator = attributes.get('decorator', '')
+        self.filter_args = ast.ArgumentList(
+                                attributes.get('filter', ''),
+                                **self.exception_kwargs)
+
+
+    is_block = True
+
+    @property
+    def is_anonymous(self):
+        return self.name is None
+
+    @property
+    def funcname(self):
+        return self.name or "__M_anon_%d" % (self.lineno, )
+
+    def get_argument_expressions(self, **kw):
+        return self.body_decl.get_argument_expressions(**kw)
+
+    def declared_identifiers(self):
+        return self.body_decl.argnames
+
+    def undeclared_identifiers(self):
+        return (self.filter_args.\
+                            undeclared_identifiers.\
+                            difference(filters.DEFAULT_ESCAPES.keys())
+                ).union(self.expression_undeclared_identifiers)
+
+
+
+class CallTag(Tag):
+    __keyword__ = 'call'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        super(CallTag, self).__init__(keyword, attributes,
+                                    ('args'), ('expr',), ('expr',), **kwargs)
+        self.expression = attributes['expr']
+        self.code = ast.PythonCode(self.expression, **self.exception_kwargs)
+        self.body_decl = ast.FunctionArgs(attributes.get('args', ''),
+                                            **self.exception_kwargs)
+
+    def declared_identifiers(self):
+        return self.code.declared_identifiers.union(self.body_decl.argnames)
+
+    def undeclared_identifiers(self):
+        return self.code.undeclared_identifiers.\
+                    difference(self.code.declared_identifiers)
+
+class CallNamespaceTag(Tag):
+
+    def __init__(self, namespace, defname, attributes, **kwargs):
+        super(CallNamespaceTag, self).__init__(
+                    namespace + ":" + defname,
+                    attributes,
+                    tuple(attributes.keys()) + ('args', ),
+                    (),
+                    (),
+                    **kwargs)
+
+        self.expression = "%s.%s(%s)" % (
+                                namespace,
+                                defname,
+                                ",".join(["%s=%s" % (k, v) for k, v in
+                                            self.parsed_attributes.iteritems()
+                                            if k != 'args'])
+                            )
+        self.code = ast.PythonCode(self.expression, **self.exception_kwargs)
+        self.body_decl = ast.FunctionArgs(
+                                    attributes.get('args', ''),
+                                    **self.exception_kwargs)
+
+    def declared_identifiers(self):
+        return self.code.declared_identifiers.union(self.body_decl.argnames)
+
+    def undeclared_identifiers(self):
+        return self.code.undeclared_identifiers.\
+                    difference(self.code.declared_identifiers)
+
+class InheritTag(Tag):
+    __keyword__ = 'inherit'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        super(InheritTag, self).__init__(
+                                keyword, attributes,
+                                ('file',), (), ('file',), **kwargs)
+
+class PageTag(Tag):
+    __keyword__ = 'page'
+
+    def __init__(self, keyword, attributes, **kwargs):
+        expressions =   ['cached', 'args', 'expression_filter', 'enable_loop'] + [
+                    c for c in attributes if c.startswith('cache_')]
+
+        super(PageTag, self).__init__(
+                keyword,
+                attributes,
+                expressions,
+                (),
+                (),
+                **kwargs)
+        self.body_decl = ast.FunctionArgs(attributes.get('args', ''),
+                                            **self.exception_kwargs)
+        self.filter_args = ast.ArgumentList(
+                                attributes.get('expression_filter', ''),
+                                **self.exception_kwargs)
+
+    def declared_identifiers(self):
+        return self.body_decl.argnames
+
+
diff --git a/lib/mako-0.7.2/mako/pygen.py b/lib/mako-0.7.2/mako/pygen.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/pygen.py
@@ -0,0 +1,283 @@
+# mako/pygen.py
+# Copyright (C) 2006-2012 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
+
+"""utilities for generating and formatting literal Python code."""
+
+import re, string
+from StringIO import StringIO
+from mako import exceptions
+
+class PythonPrinter(object):
+    def __init__(self, stream):
+        # indentation counter
+        self.indent = 0
+
+        # a stack storing information about why we incremented
+        # the indentation counter, to help us determine if we
+        # should decrement it
+        self.indent_detail = []
+
+        # the string of whitespace multiplied by the indent
+        # counter to produce a line
+        self.indentstring = "    "
+
+        # the stream we are writing to
+        self.stream = stream
+
+        # a list of lines that represents a buffered "block" of code,
+        # which can be later printed relative to an indent level
+        self.line_buffer = []
+
+        self.in_indent_lines = False
+
+        self._reset_multi_line_flags()
+
+    def write(self, text):
+        self.stream.write(text)
+
+    def write_indented_block(self, block):
+        """print a line or lines of python which already contain indentation.
+
+        The indentation of the total block of lines will be adjusted to that of
+        the current indent level."""
+        self.in_indent_lines = False
+        for l in re.split(r'\r?\n', block):
+            self.line_buffer.append(l)
+
+    def writelines(self, *lines):
+        """print a series of lines of python."""
+        for line in lines:
+            self.writeline(line)
+
+    def writeline(self, line):
+        """print a line of python, indenting it according to the current
+        indent level.
+
+        this also adjusts the indentation counter according to the
+        content of the line.
+
+        """
+
+        if not self.in_indent_lines:
+            self._flush_adjusted_lines()
+            self.in_indent_lines = True
+
+        if (line is None or
+            re.match(r"^\s*#",line) or
+            re.match(r"^\s*$", line)
+            ):
+            hastext = False
+        else:
+            hastext = True
+
+        is_comment = line and len(line) and line[0] == '#'
+
+        # see if this line should decrease the indentation level
+        if (not is_comment and
+            (not hastext or self._is_unindentor(line))
+            ):
+
+            if self.indent > 0:
+                self.indent -=1
+                # if the indent_detail stack is empty, the user
+                # probably put extra closures - the resulting
+                # module wont compile.
+                if len(self.indent_detail) == 0:
+                    raise exceptions.SyntaxException(
+                                    "Too many whitespace closures")
+                self.indent_detail.pop()
+
+        if line is None:
+            return
+
+        # write the line
+        self.stream.write(self._indent_line(line) + "\n")
+
+        # see if this line should increase the indentation level.
+        # note that a line can both decrase (before printing) and
+        # then increase (after printing) the indentation level.
+
+        if re.search(r":[ \t]*(?:#.*)?$", line):
+            # increment indentation count, and also
+            # keep track of what the keyword was that indented us,
+            # if it is a python compound statement keyword
+            # where we might have to look for an "unindent" keyword
+            match = re.match(r"^\s*(if|try|elif|while|for|with)", line)
+            if match:
+                # its a "compound" keyword, so we will check for "unindentors"
+                indentor = match.group(1)
+                self.indent +=1
+                self.indent_detail.append(indentor)
+            else:
+                indentor = None
+                # its not a "compound" keyword.  but lets also
+                # test for valid Python keywords that might be indenting us,
+                # else assume its a non-indenting line
+                m2 = re.match(r"^\s*(def|class|else|elif|except|finally)",
+                              line)
+                if m2:
+                    self.indent += 1
+                    self.indent_detail.append(indentor)
+
+    def close(self):
+        """close this printer, flushing any remaining lines."""
+        self._flush_adjusted_lines()
+
+    def _is_unindentor(self, line):
+        """return true if the given line is an 'unindentor',
+        relative to the last 'indent' event received.
+
+        """
+
+        # no indentation detail has been pushed on; return False
+        if len(self.indent_detail) == 0:
+            return False
+
+        indentor = self.indent_detail[-1]
+
+        # the last indent keyword we grabbed is not a
+        # compound statement keyword; return False
+        if indentor is None:
+            return False
+
+        # if the current line doesnt have one of the "unindentor" keywords,
+        # return False
+        match = re.match(r"^\s*(else|elif|except|finally).*\:", line)
+        if not match:
+            return False
+
+        # whitespace matches up, we have a compound indentor,
+        # and this line has an unindentor, this
+        # is probably good enough
+        return True
+
+        # should we decide that its not good enough, heres
+        # more stuff to check.
+        #keyword = match.group(1)
+
+        # match the original indent keyword
+        #for crit in [
+        #   (r'if|elif', r'else|elif'),
+        #   (r'try', r'except|finally|else'),
+        #   (r'while|for', r'else'),
+        #]:
+        #   if re.match(crit[0], indentor) and re.match(crit[1], keyword):
+        #        return True
+
+        #return False
+
+    def _indent_line(self, line, stripspace=''):
+        """indent the given line according to the current indent level.
+
+        stripspace is a string of space that will be truncated from the
+        start of the line before indenting."""
+
+        return re.sub(r"^%s" % stripspace, self.indentstring
+                      * self.indent, line)
+
+    def _reset_multi_line_flags(self):
+        """reset the flags which would indicate we are in a backslashed
+        or triple-quoted section."""
+
+        self.backslashed, self.triplequoted = False, False
+
+    def _in_multi_line(self, line):
+        """return true if the given line is part of a multi-line block,
+        via backslash or triple-quote."""
+
+        # we are only looking for explicitly joined lines here, not
+        # implicit ones (i.e. brackets, braces etc.).  this is just to
+        # guard against the possibility of modifying the space inside of
+        # a literal multiline string with unfortunately placed
+        # whitespace
+
+        current_state = (self.backslashed or self.triplequoted)
+
+        if re.search(r"\\$", line):
+            self.backslashed = True
+        else:
+            self.backslashed = False
+
+        triples = len(re.findall(r"\"\"\"|\'\'\'", line))
+        if triples == 1 or triples % 2 != 0:
+            self.triplequoted = not self.triplequoted
+
+        return current_state
+
+    def _flush_adjusted_lines(self):
+        stripspace = None
+        self._reset_multi_line_flags()
+
+        for entry in self.line_buffer:
+            if self._in_multi_line(entry):
+                self.stream.write(entry + "\n")
+            else:
+                entry = entry.expandtabs()
+                if stripspace is None and re.search(r"^[ \t]*[^# \t]", entry):
+                    stripspace = re.match(r"^([ \t]*)", entry).group(1)
+                self.stream.write(self._indent_line(entry, stripspace) + "\n")
+
+        self.line_buffer = []
+        self._reset_multi_line_flags()
+
+
+def adjust_whitespace(text):
+    """remove the left-whitespace margin of a block of Python code."""
+
+    state = [False, False]
+    (backslashed, triplequoted) = (0, 1)
+
+    def in_multi_line(line):
+        start_state = (state[backslashed] or state[triplequoted])
+
+        if re.search(r"\\$", line):
+            state[backslashed] = True
+        else:
+            state[backslashed] = False
+
+        def match(reg, t):
+            m = re.match(reg, t)
+            if m:
+                return m, t[len(m.group(0)):]
+            else:
+                return None, t
+
+        while line:
+            if state[triplequoted]:
+                m, line = match(r"%s" % state[triplequoted], line)
+                if m:
+                    state[triplequoted] = False
+                else:
+                    m, line = match(r".*?(?=%s|$)" % state[triplequoted], line)
+            else:
+                m, line = match(r'#', line)
+                if m:
+                    return start_state
+
+                m, line = match(r"\"\"\"|\'\'\'", line)
+                if m:
+                    state[triplequoted] = m.group(0)
+                    continue
+
+                m, line = match(r".*?(?=\"\"\"|\'\'\'|#|$)", line)
+
+        return start_state
+
+    def _indent_line(line, stripspace = ''):
+        return re.sub(r"^%s" % stripspace, '', line)
+
+    lines = []
+    stripspace = None
+
+    for line in re.split(r'\r?\n', text):
+        if in_multi_line(line):
+            lines.append(line)
+        else:
+            line = line.expandtabs()
+            if stripspace is None and re.search(r"^[ \t]*[^# \t]", line):
+                stripspace = re.match(r"^([ \t]*)", line).group(1)
+            lines.append(_indent_line(line, stripspace))
+    return "\n".join(lines)
diff --git a/lib/mako-0.7.2/mako/pyparser.py b/lib/mako-0.7.2/mako/pyparser.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/pyparser.py
@@ -0,0 +1,535 @@
+# mako/pyparser.py
+# Copyright (C) 2006-2012 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
+
+"""Handles parsing of Python code.
+
+Parsing to AST is done via _ast on Python > 2.5, otherwise the compiler
+module is used.
+"""
+
+from StringIO import StringIO
+from mako import exceptions, util
+import operator
+
+if util.py3k:
+    # words that cannot be assigned to (notably
+    # smaller than the total keys in __builtins__)
+    reserved = set(['True', 'False', 'None', 'print'])
+
+    # the "id" attribute on a function node
+    arg_id = operator.attrgetter('arg')
+else:
+    # words that cannot be assigned to (notably
+    # smaller than the total keys in __builtins__)
+    reserved = set(['True', 'False', 'None'])
+
+    # the "id" attribute on a function node
+    arg_id = operator.attrgetter('id')
+
+
+try:
+    import _ast
+    util.restore__ast(_ast)
+    import _ast_util
+except ImportError:
+    _ast = None
+    from compiler import parse as compiler_parse
+    from compiler import visitor
+
+
+def parse(code, mode='exec', **exception_kwargs):
+    """Parse an expression into AST"""
+
+
+    try:
+        if _ast:
+            return _ast_util.parse(code, '<unknown>', mode)
+        else:
+            if isinstance(code, unicode):
+                code = code.encode('ascii', 'backslashreplace')
+            return compiler_parse(code, mode)
+    except Exception, e:
+        raise exceptions.SyntaxException(
+                    "(%s) %s (%r)" % (
+                        e.__class__.__name__,
+                        e,
+                        code[0:50]
+                    ), **exception_kwargs)
+
+
+if _ast:
+    class FindIdentifiers(_ast_util.NodeVisitor):
+
+        def __init__(self, listener, **exception_kwargs):
+            self.in_function = False
+            self.in_assign_targets = False
+            self.local_ident_stack = set()
+            self.listener = listener
+            self.exception_kwargs = exception_kwargs
+
+        def _add_declared(self, name):
+            if not self.in_function:
+                self.listener.declared_identifiers.add(name)
+            else:
+                self.local_ident_stack.add(name)
+
+        def visit_ClassDef(self, node):
+            self._add_declared(node.name)
+
+        def visit_Assign(self, node):
+
+            # flip around the visiting of Assign so the expression gets
+            # evaluated first, in the case of a clause like "x=x+5" (x
+            # is undeclared)
+
+            self.visit(node.value)
+            in_a = self.in_assign_targets
+            self.in_assign_targets = True
+            for n in node.targets:
+                self.visit(n)
+            self.in_assign_targets = in_a
+
+        if util.py3k:
+
+            # ExceptHandler is in Python 2, but this block only works in
+            # Python 3 (and is required there)
+
+            def visit_ExceptHandler(self, node):
+                if node.name is not None:
+                    self._add_declared(node.name)
+                if node.type is not None:
+                    self.listener.undeclared_identifiers.add(node.type.id)
+                for statement in node.body:
+                    self.visit(statement)
+
+        def visit_Lambda(self, node, *args):
+            self._visit_function(node, True)
+
+        def visit_FunctionDef(self, node):
+            self._add_declared(node.name)
+            self._visit_function(node, False)
+
+        def _visit_function(self, node, islambda):
+
+            # push function state onto stack.  dont log any more
+            # identifiers as "declared" until outside of the function,
+            # but keep logging identifiers as "undeclared". track
+            # argument names in each function header so they arent
+            # counted as "undeclared"
+
+            inf = self.in_function
+            self.in_function = True
+
+            local_ident_stack = self.local_ident_stack
+            self.local_ident_stack = local_ident_stack.union([
+                arg_id(arg) for arg in node.args.args
+            ])
+            if islambda:
+                self.visit(node.body)
+            else:
+                for n in node.body:
+                    self.visit(n)
+            self.in_function = inf
+            self.local_ident_stack = local_ident_stack
+
+        def visit_For(self, node):
+
+            # flip around visit
+
+            self.visit(node.iter)
+            self.visit(node.target)
+            for statement in node.body:
+                self.visit(statement)
+            for statement in node.orelse:
+                self.visit(statement)
+
+        def visit_Name(self, node):
+            if isinstance(node.ctx, _ast.Store):
+                # this is eqiuvalent to visit_AssName in 
+                # compiler
+                self._add_declared(node.id)
+            elif node.id not in reserved and node.id \
+                not in self.listener.declared_identifiers and node.id \
+                not in self.local_ident_stack:
+                self.listener.undeclared_identifiers.add(node.id)
+
+        def visit_Import(self, node):
+            for name in node.names:
+                if name.asname is not None:
+                    self._add_declared(name.asname)
+                else:
+                    self._add_declared(name.name.split('.')[0])
+
+        def visit_ImportFrom(self, node):
+            for name in node.names:
+                if name.asname is not None:
+                    self._add_declared(name.asname)
+                else:
+                    if name.name == '*':
+                        raise exceptions.CompileException(
+                          "'import *' is not supported, since all identifier "
+                          "names must be explicitly declared.  Please use the "
+                          "form 'from <modulename> import <name1>, <name2>, "
+                          "...' instead.", **self.exception_kwargs)
+                    self._add_declared(name.name)
+
+
+    class FindTuple(_ast_util.NodeVisitor):
+
+        def __init__(self, listener, code_factory, **exception_kwargs):
+            self.listener = listener
+            self.exception_kwargs = exception_kwargs
+            self.code_factory = code_factory
+
+        def visit_Tuple(self, node):
+            for n in node.elts:
+                p = self.code_factory(n, **self.exception_kwargs)
+                self.listener.codeargs.append(p)
+                self.listener.args.append(ExpressionGenerator(n).value())
+                self.listener.declared_identifiers = \
+                    self.listener.declared_identifiers.union(
+                                                    p.declared_identifiers)
+                self.listener.undeclared_identifiers = \
+                    self.listener.undeclared_identifiers.union(
+                                                    p.undeclared_identifiers)
+
+
+    class ParseFunc(_ast_util.NodeVisitor):
+
+        def __init__(self, listener, **exception_kwargs):
+            self.listener = listener
+            self.exception_kwargs = exception_kwargs
+
+        def visit_FunctionDef(self, node):
+            self.listener.funcname = node.name
+            argnames = [arg_id(arg) for arg in node.args.args]
+            if node.args.vararg:
+                argnames.append(node.args.vararg)
+            if node.args.kwarg:
+                argnames.append(node.args.kwarg)
+            self.listener.argnames = argnames
+            self.listener.defaults = node.args.defaults  # ast
+            self.listener.varargs = node.args.vararg
+            self.listener.kwargs = node.args.kwarg
+
+
+    class ExpressionGenerator(object):
+
+        def __init__(self, astnode):
+            self.generator = _ast_util.SourceGenerator(' ' * 4)
+            self.generator.visit(astnode)
+
+        def value(self):
+            return ''.join(self.generator.result)
+else:
+    class FindIdentifiers(object):
+
+        def __init__(self, listener, **exception_kwargs):
+            self.in_function = False
+            self.local_ident_stack = set()
+            self.listener = listener
+            self.exception_kwargs = exception_kwargs
+
+        def _add_declared(self, name):
+            if not self.in_function:
+                self.listener.declared_identifiers.add(name)
+            else:
+                self.local_ident_stack.add(name)
+
+        def visitClass(self, node, *args):
+            self._add_declared(node.name)
+
+        def visitAssName(self, node, *args):
+            self._add_declared(node.name)
+
+        def visitAssign(self, node, *args):
+
+            # flip around the visiting of Assign so the expression gets
+            # evaluated first, in the case of a clause like "x=x+5" (x
+            # is undeclared)
+            self.visit(node.expr, *args)
+            for n in node.nodes:
+                self.visit(n, *args)
+
+        def visitLambda(self, node, *args):
+            self._visit_function(node, args)
+
+        def visitFunction(self, node, *args):
+            self._add_declared(node.name)
+            self._visit_function(node, args)
+
+        def _visit_function(self, node, args):
+
+            # push function state onto stack.  dont log any more
+            # identifiers as "declared" until outside of the function,
+            # but keep logging identifiers as "undeclared". track
+            # argument names in each function header so they arent
+            # counted as "undeclared"
+
+            inf = self.in_function
+            self.in_function = True
+
+            local_ident_stack = self.local_ident_stack
+            self.local_ident_stack = local_ident_stack.union([
+                arg for arg in node.argnames
+            ])
+
+            for n in node.getChildNodes():
+                self.visit(n, *args)
+            self.in_function = inf
+            self.local_ident_stack = local_ident_stack
+
+        def visitFor(self, node, *args):
+
+            # flip around visit
+
+            self.visit(node.list, *args)
+            self.visit(node.assign, *args)
+            self.visit(node.body, *args)
+
+        def visitName(self, node, *args):
+            if node.name not in reserved and node.name \
+                not in self.listener.declared_identifiers and node.name \
+                not in self.local_ident_stack:
+                self.listener.undeclared_identifiers.add(node.name)
+
+        def visitImport(self, node, *args):
+            for mod, alias in node.names:
+                if alias is not None:
+                    self._add_declared(alias)
+                else:
+                    self._add_declared(mod.split('.')[0])
+
+        def visitFrom(self, node, *args):
+            for mod, alias in node.names:
+                if alias is not None:
+                    self._add_declared(alias)
+                else:
+                    if mod == '*':
+                        raise exceptions.CompileException(
+                        "'import *' is not supported, since all identifier "
+                        "names must be explicitly declared.  Please use the "
+                        "form 'from <modulename> import <name1>, <name2>, "
+                        "...' instead.", **self.exception_kwargs)
+                    self._add_declared(mod)
+
+        def visit(self, expr):
+            visitor.walk(expr, self)  # , walker=walker())
+
+
+    class FindTuple(object):
+
+        def __init__(self, listener, code_factory, **exception_kwargs):
+            self.listener = listener
+            self.exception_kwargs = exception_kwargs
+            self.code_factory = code_factory
+
+        def visitTuple(self, node, *args):
+            for n in node.nodes:
+                p = self.code_factory(n, **self.exception_kwargs)
+                self.listener.codeargs.append(p)
+                self.listener.args.append(ExpressionGenerator(n).value())
+                self.listener.declared_identifiers = \
+                    self.listener.declared_identifiers.union(
+                                                      p.declared_identifiers)
+                self.listener.undeclared_identifiers = \
+                    self.listener.undeclared_identifiers.union(
+                                                      p.undeclared_identifiers)
+
+        def visit(self, expr):
+            visitor.walk(expr, self)  # , walker=walker())
+
+
+    class ParseFunc(object):
+
+        def __init__(self, listener, **exception_kwargs):
+            self.listener = listener
+            self.exception_kwargs = exception_kwargs
+
+        def visitFunction(self, node, *args):
+            self.listener.funcname = node.name
+            self.listener.argnames = node.argnames
+            self.listener.defaults = node.defaults
+            self.listener.varargs = node.varargs
+            self.listener.kwargs = node.kwargs
+
+        def visit(self, expr):
+            visitor.walk(expr, self)
+
+
+    class ExpressionGenerator(object):
+
+        """given an AST node, generates an equivalent literal Python
+        expression."""
+
+        def __init__(self, astnode):
+            self.buf = StringIO()
+            visitor.walk(astnode, self)  # , walker=walker())
+
+        def value(self):
+            return self.buf.getvalue()
+
+        def operator(self, op, node, *args):
+            self.buf.write('(')
+            self.visit(node.left, *args)
+            self.buf.write(' %s ' % op)
+            self.visit(node.right, *args)
+            self.buf.write(')')
+
+        def booleanop(self, op, node, *args):
+            self.visit(node.nodes[0])
+            for n in node.nodes[1:]:
+                self.buf.write(' ' + op + ' ')
+                self.visit(n, *args)
+
+        def visitConst(self, node, *args):
+            self.buf.write(repr(node.value))
+
+        def visitAssName(self, node, *args):
+
+            # TODO: figure out OP_ASSIGN, other OP_s
+
+            self.buf.write(node.name)
+
+        def visitName(self, node, *args):
+            self.buf.write(node.name)
+
+        def visitMul(self, node, *args):
+            self.operator('*', node, *args)
+
+        def visitAnd(self, node, *args):
+            self.booleanop('and', node, *args)
+
+        def visitOr(self, node, *args):
+            self.booleanop('or', node, *args)
+
+        def visitBitand(self, node, *args):
+            self.booleanop('&', node, *args)
+
+        def visitBitor(self, node, *args):
+            self.booleanop('|', node, *args)
+
+        def visitBitxor(self, node, *args):
+            self.booleanop('^', node, *args)
+
+        def visitAdd(self, node, *args):
+            self.operator('+', node, *args)
+
+        def visitGetattr(self, node, *args):
+            self.visit(node.expr, *args)
+            self.buf.write('.%s' % node.attrname)
+
+        def visitSub(self, node, *args):
+            self.operator('-', node, *args)
+
+        def visitNot(self, node, *args):
+            self.buf.write('not ')
+            self.visit(node.expr)
+
+        def visitDiv(self, node, *args):
+            self.operator('/', node, *args)
+
+        def visitFloorDiv(self, node, *args):
+            self.operator('//', node, *args)
+
+        def visitSubscript(self, node, *args):
+            self.visit(node.expr)
+            self.buf.write('[')
+            [self.visit(x) for x in node.subs]
+            self.buf.write(']')
+
+        def visitUnarySub(self, node, *args):
+            self.buf.write('-')
+            self.visit(node.expr)
+
+        def visitUnaryAdd(self, node, *args):
+            self.buf.write('-')
+            self.visit(node.expr)
+
+        def visitSlice(self, node, *args):
+            self.visit(node.expr)
+            self.buf.write('[')
+            if node.lower is not None:
+                self.visit(node.lower)
+            self.buf.write(':')
+            if node.upper is not None:
+                self.visit(node.upper)
+            self.buf.write(']')
+
+        def visitDict(self, node):
+            self.buf.write('{')
+            c = node.getChildren()
+            for i in range(0, len(c), 2):
+                self.visit(c[i])
+                self.buf.write(': ')
+                self.visit(c[i + 1])
+                if i < len(c) - 2:
+                    self.buf.write(', ')
+            self.buf.write('}')
+
+        def visitTuple(self, node):
+            self.buf.write('(')
+            c = node.getChildren()
+            for i in range(0, len(c)):
+                self.visit(c[i])
+                if i < len(c) - 1:
+                    self.buf.write(', ')
+            self.buf.write(')')
+
+        def visitList(self, node):
+            self.buf.write('[')
+            c = node.getChildren()
+            for i in range(0, len(c)):
+                self.visit(c[i])
+                if i < len(c) - 1:
+                    self.buf.write(', ')
+            self.buf.write(']')
+
+        def visitListComp(self, node):
+            self.buf.write('[')
+            self.visit(node.expr)
+            self.buf.write(' ')
+            for n in node.quals:
+                self.visit(n)
+            self.buf.write(']')
+
+        def visitListCompFor(self, node):
+            self.buf.write(' for ')
+            self.visit(node.assign)
+            self.buf.write(' in ')
+            self.visit(node.list)
+            for n in node.ifs:
+                self.visit(n)
+
+        def visitListCompIf(self, node):
+            self.buf.write(' if ')
+            self.visit(node.test)
+
+        def visitCompare(self, node):
+            self.visit(node.expr)
+            for tup in node.ops:
+                self.buf.write(tup[0])
+                self.visit(tup[1])
+
+        def visitCallFunc(self, node, *args):
+            self.visit(node.node)
+            self.buf.write('(')
+            if len(node.args):
+                self.visit(node.args[0])
+                for a in node.args[1:]:
+                    self.buf.write(', ')
+                    self.visit(a)
+            self.buf.write(')')
+
+
+    class walker(visitor.ASTVisitor):
+
+        def dispatch(self, node, *args):
+            print 'Node:', str(node)
+
+            # print "dir:", dir(node)
+
+            return visitor.ASTVisitor.dispatch(self, node, *args)
diff --git a/lib/mako-0.7.2/mako/runtime.py b/lib/mako-0.7.2/mako/runtime.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/runtime.py
@@ -0,0 +1,841 @@
+# mako/runtime.py
+# Copyright (C) 2006-2012 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
+
+"""provides runtime services for templates, including Context,
+Namespace, and various helper functions."""
+
+from mako import exceptions, util
+import __builtin__, inspect, sys
+
+
+class Context(object):
+    """Provides runtime namespace, output buffer, and various
+    callstacks for templates.
+
+    See :ref:`runtime_toplevel` for detail on the usage of
+    :class:`.Context`.
+
+     """
+
+    def __init__(self, buffer, **data):
+        self._buffer_stack = [buffer]
+
+        self._data = data
+
+        self._kwargs = data.copy()
+        self._with_template = None
+        self._outputting_as_unicode = None
+        self.namespaces = {}
+
+        # "capture" function which proxies to the
+        # generic "capture" function
+        self._data['capture'] = util.partial(capture, self)
+
+        # "caller" stack used by def calls with content
+        self.caller_stack = self._data['caller'] = CallerStack()
+
+    def _set_with_template(self, t):
+        self._with_template = t
+        illegal_names = t.reserved_names.intersection(self._data)
+        if illegal_names:
+            raise exceptions.NameConflictError(
+                "Reserved words passed to render(): %s" %
+                ", ".join(illegal_names))
+
+    @property
+    def lookup(self):
+        """Return the :class:`.TemplateLookup` associated
+        with this :class:`.Context`.
+
+        """
+        return self._with_template.lookup
+
+    @property
+    def kwargs(self):
+        """Return the dictionary of keyword arguments associated with this
+        :class:`.Context`.
+
+        """
+        return self._kwargs.copy()
+
+    def push_caller(self, caller):
+        """Push a ``caller`` callable onto the callstack for
+        this :class:`.Context`."""
+
+
+        self.caller_stack.append(caller)
+
+    def pop_caller(self):
+        """Pop a ``caller`` callable onto the callstack for this
+        :class:`.Context`."""
+
+        del self.caller_stack[-1]
+
+    def keys(self):
+        """Return a list of all names established in this :class:`.Context`."""
+
+        return self._data.keys()
+
+    def __getitem__(self, key):
+        if key in self._data:
+            return self._data[key]
+        else:
+            return __builtin__.__dict__[key]
+
+    def _push_writer(self):
+        """push a capturing buffer onto this Context and return
+        the new writer function."""
+
+        buf = util.FastEncodingBuffer()
+        self._buffer_stack.append(buf)
+        return buf.write
+
+    def _pop_buffer_and_writer(self):
+        """pop the most recent capturing buffer from this Context
+        and return the current writer after the pop.
+
+        """
+
+        buf = self._buffer_stack.pop()
+        return buf, self._buffer_stack[-1].write
+
+    def _push_buffer(self):
+        """push a capturing buffer onto this Context."""
+
+        self._push_writer()
+
+    def _pop_buffer(self):
+        """pop the most recent capturing buffer from this Context."""
+
+        return self._buffer_stack.pop()
+
+    def get(self, key, default=None):
+        """Return a value from this :class:`.Context`."""
+
+        return self._data.get(key,
+                __builtin__.__dict__.get(key, default)
+                )
+
+    def write(self, string):
+        """Write a string to this :class:`.Context` object's
+        underlying output buffer."""
+
+        self._buffer_stack[-1].write(string)
+
+    def writer(self):
+        """Return the current writer function."""
+
+        return self._buffer_stack[-1].write
+
+    def _copy(self):
+        c = Context.__new__(Context)
+        c._buffer_stack = self._buffer_stack
+        c._data = self._data.copy()
+        c._kwargs = self._kwargs
+        c._with_template = self._with_template
+        c._outputting_as_unicode = self._outputting_as_unicode
+        c.namespaces = self.namespaces
+        c.caller_stack = self.caller_stack
+        return c
+
+    def locals_(self, d):
+        """Create a new :class:`.Context` with a copy of this
+        :class:`.Context`'s current state, updated with the given dictionary."""
+
+        if len(d) == 0:
+            return self
+        c = self._copy()
+        c._data.update(d)
+        return c
+
+    def _clean_inheritance_tokens(self):
+        """create a new copy of this :class:`.Context`. with
+        tokens related to inheritance state removed."""
+
+        c = self._copy()
+        x = c._data
+        x.pop('self', None)
+        x.pop('parent', None)
+        x.pop('next', None)
+        return c
+
+class CallerStack(list):
+    def __init__(self):
+        self.nextcaller = None
+    def __nonzero__(self):
+        return self._get_caller() and True or False
+    def _get_caller(self):
+        # this method can be removed once
+        # codegen MAGIC_NUMBER moves past 7
+        return self[-1]
+    def __getattr__(self, key):
+        return getattr(self._get_caller(), key)
+    def _push_frame(self):
+        frame = self.nextcaller or None
+        self.append(frame)
+        self.nextcaller = None
+        return frame
+    def _pop_frame(self):
+        self.nextcaller = self.pop()
+
+
+class Undefined(object):
+    """Represents an undefined value in a template.
+
+    All template modules have a constant value
+    ``UNDEFINED`` present which is an instance of this
+    object.
+
+    """
+    def __str__(self):
+        raise NameError("Undefined")
+    def __nonzero__(self):
+        return False
+
+UNDEFINED = Undefined()
+
+class LoopStack(object):
+    """a stack for LoopContexts that implements the context manager protocol
+    to automatically pop off the top of the stack on context exit
+    """
+
+    def __init__(self):
+        self.stack = []
+
+    def _enter(self, iterable):
+        self._push(iterable)
+        return self._top
+
+    def _exit(self):
+        self._pop()
+        return self._top
+
+    @property
+    def _top(self):
+        if self.stack:
+            return self.stack[-1]
+        else:
+            return self
+
+    def _pop(self):
+        return self.stack.pop()
+
+    def _push(self, iterable):
+        new = LoopContext(iterable)
+        if self.stack:
+            new.parent = self.stack[-1]
+        return self.stack.append(new)
+
+    def __getattr__(self, key):
+        raise exceptions.RuntimeException("No loop context is established")
+
+    def __iter__(self):
+        return iter(self._top)
+
+
+class LoopContext(object):
+    """A magic loop variable.
+    Automatically accessible in any ``% for`` block.
+
+    See the section :ref:`loop_context` for usage
+    notes.
+
+    :attr:`parent` -> :class:`.LoopContext` or ``None``
+        The parent loop, if one exists.
+    :attr:`index` -> `int`
+        The 0-based iteration count.
+    :attr:`reverse_index` -> `int`
+        The number of iterations remaining.
+    :attr:`first` -> `bool`
+        ``True`` on the first iteration, ``False`` otherwise.
+    :attr:`last` -> `bool`
+        ``True`` on the last iteration, ``False`` otherwise.
+    :attr:`even` -> `bool`
+        ``True`` when ``index`` is even.
+    :attr:`odd` -> `bool`
+        ``True`` when ``index`` is odd.
+    """
+
+    def __init__(self, iterable):
+        self._iterable = iterable
+        self.index = 0
+        self.parent = None
+
+    def __iter__(self):
+        for i in self._iterable:
+            yield i
+            self.index += 1
+
+    @util.memoized_instancemethod
+    def __len__(self):
+        return len(self._iterable)
+
+    @property
+    def reverse_index(self):
+        return len(self) - self.index - 1
+
+    @property
+    def first(self):
+        return self.index == 0
+
+    @property
+    def last(self):
+        return self.index == len(self) - 1
+
+    @property
+    def even(self):
+        return not self.odd
+
+    @property
+    def odd(self):
+        return bool(self.index % 2)
+
+    def cycle(self, *values):
+        """Cycle through values as the loop progresses.
+        """
+        if not values:
+            raise ValueError("You must provide values to cycle through")
+        return values[self.index % len(values)]
+
+
+class _NSAttr(object):
+    def __init__(self, parent):
+        self.__parent = parent
+    def __getattr__(self, key):
+        ns = self.__parent
+        while ns:
+            if hasattr(ns.module, key):
+                return getattr(ns.module, key)
+            else:
+                ns = ns.inherits
+        raise AttributeError(key)
+
+class Namespace(object):
+    """Provides access to collections of rendering methods, which
+      can be local, from other templates, or from imported modules.
+
+      To access a particular rendering method referenced by a
+      :class:`.Namespace`, use plain attribute access:
+
+      .. sourcecode:: mako
+
+        ${some_namespace.foo(x, y, z)}
+
+      :class:`.Namespace` also contains several built-in attributes
+      described here.
+
+      """
+
+    def __init__(self, name, context,
+                            callables=None, inherits=None,
+                            populate_self=True, calling_uri=None):
+        self.name = name
+        self.context = context
+        self.inherits = inherits
+        if callables is not None:
+            self.callables = dict([(c.func_name, c) for c in callables])
+
+    callables = ()
+
+    module = None
+    """The Python module referenced by this :class:`.Namespace`.
+
+    If the namespace references a :class:`.Template`, then
+    this module is the equivalent of ``template.module``,
+    i.e. the generated module for the template.
+
+    """
+
+    template = None
+    """The :class:`.Template` object referenced by this
+        :class:`.Namespace`, if any.
+
+    """
+
+    context = None
+    """The :class:`.Context` object for this :class:`.Namespace`.
+
+    Namespaces are often created with copies of contexts that
+    contain slightly different data, particularly in inheritance
+    scenarios. Using the :class:`.Context` off of a :class:`.Namespace` one
+    can traverse an entire chain of templates that inherit from
+    one-another.
+
+    """
+
+    filename = None
+    """The path of the filesystem file used for this
+    :class:`.Namespace`'s module or template.
+
+    If this is a pure module-based
+    :class:`.Namespace`, this evaluates to ``module.__file__``. If a
+    template-based namespace, it evaluates to the original
+    template file location.
+
+    """
+
+    uri = None
+    """The URI for this :class:`.Namespace`'s template.
+
+    I.e. whatever was sent to :meth:`.TemplateLookup.get_template()`.
+
+    This is the equivalent of :attr:`.Template.uri`.
+
+    """
+
+    _templateuri = None
+
+    @util.memoized_property
+    def attr(self):
+        """Access module level attributes by name.
+
+        This accessor allows templates to supply "scalar"
+        attributes which are particularly handy in inheritance
+        relationships. See the example in
+        :ref:`inheritance_toplevel`.
+
+        """
+        return _NSAttr(self)
+
+    def get_namespace(self, uri):
+        """Return a :class:`.Namespace` corresponding to the given ``uri``.
+
+        If the given ``uri`` is a relative URI (i.e. it does not
+        contain a leading slash ``/``), the ``uri`` is adjusted to
+        be relative to the ``uri`` of the namespace itself. This
+        method is therefore mostly useful off of the built-in
+        ``local`` namespace, described in :ref:`namespace_local`.
+
+        In
+        most cases, a template wouldn't need this function, and
+        should instead use the ``<%namespace>`` tag to load
+        namespaces. However, since all ``<%namespace>`` tags are
+        evaluated before the body of a template ever runs,
+        this method can be used to locate namespaces using
+        expressions that were generated within the body code of
+        the template, or to conditionally use a particular
+        namespace.
+
+        """
+        key = (self, uri)
+        if key in self.context.namespaces:
+            return self.context.namespaces[key]
+        else:
+            ns = TemplateNamespace(uri, self.context._copy(),
+                                templateuri=uri,
+                                calling_uri=self._templateuri)
+            self.context.namespaces[key] = ns
+            return ns
+
+    def get_template(self, uri):
+        """Return a :class:`.Template` from the given ``uri``.
+
+        The ``uri`` resolution is relative to the ``uri`` of this :class:`.Namespace`
+        object's :class:`.Template`.
+
+        """
+        return _lookup_template(self.context, uri, self._templateuri)
+
+    def get_cached(self, key, **kwargs):
+        """Return a value from the :class:`.Cache` referenced by this
+        :class:`.Namespace` object's :class:`.Template`.
+
+        The advantage to this method versus direct access to the
+        :class:`.Cache` is that the configuration parameters
+        declared in ``<%page>`` take effect here, thereby calling
+        up the same configured backend as that configured
+        by ``<%page>``.
+
+        """
+
+        return self.cache.get(key, **kwargs)
+
+    @property
+    def cache(self):
+        """Return the :class:`.Cache` object referenced
+        by this :class:`.Namespace` object's
+        :class:`.Template`.
+
+        """
+        return self.template.cache
+
+    def include_file(self, uri, **kwargs):
+        """Include a file at the given ``uri``."""
+
+        _include_file(self.context, uri, self._templateuri, **kwargs)
+
+    def _populate(self, d, l):
+        for ident in l:
+            if ident == '*':
+                for (k, v) in self._get_star():
+                    d[k] = v
+            else:
+                d[ident] = getattr(self, ident)
+
+    def _get_star(self):
+        if self.callables:
+            for key in self.callables:
+                yield (key, self.callables[key])
+
+    def __getattr__(self, key):
+        if key in self.callables:
+            val = self.callables[key]
+        elif self.inherits:
+            val = getattr(self.inherits, key)
+        else:
+            raise AttributeError(
+                    "Namespace '%s' has no member '%s'" %
+                    (self.name, key))
+        setattr(self, key, val)
+        return val
+
+class TemplateNamespace(Namespace):
+    """A :class:`.Namespace` specific to a :class:`.Template` instance."""
+
+    def __init__(self, name, context, template=None, templateuri=None,
+                            callables=None, inherits=None,
+                            populate_self=True, calling_uri=None):
+        self.name = name
+        self.context = context
+        self.inherits = inherits
+        if callables is not None:
+            self.callables = dict([(c.func_name, c) for c in callables])
+
+        if templateuri is not None:
+            self.template = _lookup_template(context, templateuri,
+                                                calling_uri)
+            self._templateuri = self.template.module._template_uri
+        elif template is not None:
+            self.template = template
+            self._templateuri = template.module._template_uri
+        else:
+            raise TypeError("'template' argument is required.")
+
+        if populate_self:
+            lclcallable, lclcontext = \
+                        _populate_self_namespace(context, self.template,
+                                                    self_ns=self)
+
+    @property
+    def module(self):
+        """The Python module referenced by this :class:`.Namespace`.
+
+        If the namespace references a :class:`.Template`, then
+        this module is the equivalent of ``template.module``,
+        i.e. the generated module for the template.
+
+        """
+        return self.template.module
+
+    @property
+    def filename(self):
+        """The path of the filesystem file used for this
+        :class:`.Namespace`'s module or template.
+        """
+        return self.template.filename
+
+    @property
+    def uri(self):
+        """The URI for this :class:`.Namespace`'s template.
+
+        I.e. whatever was sent to :meth:`.TemplateLookup.get_template()`.
+
+        This is the equivalent of :attr:`.Template.uri`.
+
+        """
+        return self.template.uri
+
+    def _get_star(self):
+        if self.callables:
+            for key in self.callables:
+                yield (key, self.callables[key])
+        def get(key):
+            callable_ = self.template._get_def_callable(key)
+            return util.partial(callable_, self.context)
+        for k in self.template.module._exports:
+            yield (k, get(k))
+
+    def __getattr__(self, key):
+        if key in self.callables:
+            val = self.callables[key]
+        elif self.template.has_def(key):
+            callable_ = self.template._get_def_callable(key)
+            val = util.partial(callable_, self.context)
+        elif self.inherits:
+            val = getattr(self.inherits, key)
+
+        else:
+            raise AttributeError(
+                    "Namespace '%s' has no member '%s'" %
+                    (self.name, key))
+        setattr(self, key, val)
+        return val
+
+class ModuleNamespace(Namespace):
+    """A :class:`.Namespace` specific to a Python module instance."""
+
+    def __init__(self, name, context, module,
+                            callables=None, inherits=None,
+                            populate_self=True, calling_uri=None):
+        self.name = name
+        self.context = context
+        self.inherits = inherits
+        if callables is not None:
+            self.callables = dict([(c.func_name, c) for c in callables])
+
+        mod = __import__(module)
+        for token in module.split('.')[1:]:
+            mod = getattr(mod, token)
+        self.module = mod
+
+    @property
+    def filename(self):
+        """The path of the filesystem file used for this
+        :class:`.Namespace`'s module or template.
+        """
+        return self.module.__file__
+
+    def _get_star(self):
+        if self.callables:
+            for key in self.callables:
+                yield (key, self.callables[key])
+        def get(key):
+            callable_ = getattr(self.module, key)
+            return util.partial(callable_, self.context)
+        for k in dir(self.module):
+            if k[0] != '_':
+                yield (k, get(k))
+
+    def __getattr__(self, key):
+        if key in self.callables:
+            val = self.callables[key]
+        elif hasattr(self.module, key):
+            callable_ = getattr(self.module, key)
+            val = util.partial(callable_, self.context)
+        elif self.inherits:
+            val = getattr(self.inherits, key)
+        else:
+            raise AttributeError(
+                    "Namespace '%s' has no member '%s'" %
+                    (self.name, key))
+        setattr(self, key, val)
+        return val
+
+def supports_caller(func):
+    """Apply a caller_stack compatibility decorator to a plain
+    Python function.
+
+    See the example in :ref:`namespaces_python_modules`.
+
+    """
+
+    def wrap_stackframe(context,  *args, **kwargs):
+        context.caller_stack._push_frame()
+        try:
+            return func(context, *args, **kwargs)
+        finally:
+            context.caller_stack._pop_frame()
+    return wrap_stackframe
+
+def capture(context, callable_, *args, **kwargs):
+    """Execute the given template def, capturing the output into
+    a buffer.
+
+    See the example in :ref:`namespaces_python_modules`.
+
+    """
+
+    if not callable(callable_):
+        raise exceptions.RuntimeException(
+                           "capture() function expects a callable as "
+                           "its argument (i.e. capture(func, *args, **kwargs))"
+                        )
+    context._push_buffer()
+    try:
+        callable_(*args, **kwargs)
+    finally:
+        buf = context._pop_buffer()
+    return buf.getvalue()
+
+def _decorate_toplevel(fn):
+    def decorate_render(render_fn):
+        def go(context, *args, **kw):
+            def y(*args, **kw):
+                return render_fn(context, *args, **kw)
+            try:
+                y.__name__ = render_fn.__name__[7:]
+            except TypeError:
+                # < Python 2.4
+                pass
+            return fn(y)(context, *args, **kw)
+        return go
+    return decorate_render
+
+def _decorate_inline(context, fn):
+    def decorate_render(render_fn):
+        dec = fn(render_fn)
+        def go(*args, **kw):
+            return dec(context, *args, **kw)
+        return go
+    return decorate_render
+
+def _include_file(context, uri, calling_uri, **kwargs):
+    """locate the template from the given uri and include it in
+    the current output."""
+
+    template = _lookup_template(context, uri, calling_uri)
+    (callable_, ctx) = _populate_self_namespace(
+                                context._clean_inheritance_tokens(),
+                                template)
+    callable_(ctx, **_kwargs_for_include(callable_, context._data, **kwargs))
+
+def _inherit_from(context, uri, calling_uri):
+    """called by the _inherit method in template modules to set
+    up the inheritance chain at the start of a template's
+    execution."""
+
+    if uri is None:
+        return None
+    template = _lookup_template(context, uri, calling_uri)
+    self_ns = context['self']
+    ih = self_ns
+    while ih.inherits is not None:
+        ih = ih.inherits
+    lclcontext = context.locals_({'next':ih})
+    ih.inherits = TemplateNamespace("self:%s" % template.uri,
+                                lclcontext,
+                                template = template,
+                                populate_self=False)
+    context._data['parent'] = lclcontext._data['local'] = ih.inherits
+    callable_ = getattr(template.module, '_mako_inherit', None)
+    if callable_ is not None:
+        ret = callable_(template, lclcontext)
+        if ret:
+            return ret
+
+    gen_ns = getattr(template.module, '_mako_generate_namespaces', None)
+    if gen_ns is not None:
+        gen_ns(context)
+    return (template.callable_, lclcontext)
+
+def _lookup_template(context, uri, relativeto):
+    lookup = context._with_template.lookup
+    if lookup is None:
+        raise exceptions.TemplateLookupException(
+                            "Template '%s' has no TemplateLookup associated" %
+                            context._with_template.uri)
+    uri = lookup.adjust_uri(uri, relativeto)
+    try:
+        return lookup.get_template(uri)
+    except exceptions.TopLevelLookupException, e:
+        raise exceptions.TemplateLookupException(str(e))
+
+def _populate_self_namespace(context, template, self_ns=None):
+    if self_ns is None:
+        self_ns = TemplateNamespace('self:%s' % template.uri,
+                                context, template=template,
+                                populate_self=False)
+    context._data['self'] = context._data['local'] = self_ns
+    if hasattr(template.module, '_mako_inherit'):
+        ret = template.module._mako_inherit(template, context)
+        if ret:
+            return ret
+    return (template.callable_, context)
+
+def _render(template, callable_, args, data, as_unicode=False):
+    """create a Context and return the string
+    output of the given template and template callable."""
+
+    if as_unicode:
+        buf = util.FastEncodingBuffer(unicode=True)
+    elif template.bytestring_passthrough:
+        buf = util.StringIO()
+    else:
+        buf = util.FastEncodingBuffer(
+                        unicode=as_unicode,
+                        encoding=template.output_encoding,
+                        errors=template.encoding_errors)
+    context = Context(buf, **data)
+    context._outputting_as_unicode = as_unicode
+    context._set_with_template(template)
+
+    _render_context(template, callable_, context, *args,
+                            **_kwargs_for_callable(callable_, data))
+    return context._pop_buffer().getvalue()
+
+def _kwargs_for_callable(callable_, data):
+    argspec = util.inspect_func_args(callable_)
+    # for normal pages, **pageargs is usually present
+    if argspec[2]:
+        return data
+
+    # for rendering defs from the top level, figure out the args
+    namedargs = argspec[0] + [v for v in argspec[1:3] if v is not None]
+    kwargs = {}
+    for arg in namedargs:
+        if arg != 'context' and arg in data and arg not in kwargs:
+            kwargs[arg] = data[arg]
+    return kwargs
+
+def _kwargs_for_include(callable_, data, **kwargs):
+    argspec = util.inspect_func_args(callable_)
+    namedargs = argspec[0] + [v for v in argspec[1:3] if v is not None]
+    for arg in namedargs:
+        if arg != 'context' and arg in data and arg not in kwargs:
+            kwargs[arg] = data[arg]
+    return kwargs
+
+def _render_context(tmpl, callable_, context, *args, **kwargs):
+    import mako.template as template
+    # create polymorphic 'self' namespace for this
+    # template with possibly updated context
+    if not isinstance(tmpl, template.DefTemplate):
+        # if main render method, call from the base of the inheritance stack
+        (inherit, lclcontext) = _populate_self_namespace(context, tmpl)
+        _exec_template(inherit, lclcontext, args=args, kwargs=kwargs)
+    else:
+        # otherwise, call the actual rendering method specified
+        (inherit, lclcontext) = _populate_self_namespace(context, tmpl.parent)
+        _exec_template(callable_, context, args=args, kwargs=kwargs)
+
+def _exec_template(callable_, context, args=None, kwargs=None):
+    """execute a rendering callable given the callable, a
+    Context, and optional explicit arguments
+
+    the contextual Template will be located if it exists, and
+    the error handling options specified on that Template will
+    be interpreted here.
+    """
+    template = context._with_template
+    if template is not None and \
+            (template.format_exceptions or template.error_handler):
+        error = None
+        try:
+            callable_(context, *args, **kwargs)
+        except Exception, e:
+            _render_error(template, context, e)
+        except:
+            e = sys.exc_info()[0]
+            _render_error(template, context, e)
+    else:
+        callable_(context, *args, **kwargs)
+
+def _render_error(template, context, error):
+    if template.error_handler:
+        result = template.error_handler(context, error)
+        if not result:
+            raise error
+    else:
+        error_template = exceptions.html_error_template()
+        if context._outputting_as_unicode:
+            context._buffer_stack[:] = [util.FastEncodingBuffer(unicode=True)]
+        else:
+            context._buffer_stack[:] = [util.FastEncodingBuffer(
+                                            error_template.output_encoding,
+                                            error_template.encoding_errors)]
+
+        context._set_with_template(error_template)
+        error_template.render_context(context, error=error)
diff --git a/lib/mako-0.7.2/mako/template.py b/lib/mako-0.7.2/mako/template.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/template.py
@@ -0,0 +1,650 @@
+# mako/template.py
+# Copyright (C) 2006-2012 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
+
+"""Provides the Template class, a facade for parsing, generating and executing
+template strings, as well as template runtime operations."""
+
+from mako.lexer import Lexer
+from mako import runtime, util, exceptions, codegen, cache
+import os, re, shutil, stat, sys, tempfile, types, weakref
+
+
+class Template(object):
+    """Represents a compiled template.
+
+    :class:`.Template` includes a reference to the original
+    template source (via the :attr:`.source` attribute)
+    as well as the source code of the
+    generated Python module (i.e. the :attr:`.code` attribute),
+    as well as a reference to an actual Python module.
+
+    :class:`.Template` is constructed using either a literal string
+    representing the template text, or a filename representing a filesystem
+    path to a source file.
+
+    :param text: textual template source.  This argument is mutually
+     exclusive versus the ``filename`` parameter.
+
+    :param filename: filename of the source template.  This argument is
+     mutually exclusive versus the ``text`` parameter.
+
+    :param buffer_filters: string list of filters to be applied
+     to the output of ``%def``\ s which are buffered, cached, or otherwise
+     filtered, after all filters
+     defined with the ``%def`` itself have been applied. Allows the
+     creation of default expression filters that let the output
+     of return-valued ``%def``\ s "opt out" of that filtering via
+     passing special attributes or objects.
+
+    :param bytestring_passthrough: When ``True``, and ``output_encoding`` is
+     set to ``None``, and :meth:`.Template.render` is used to render,
+     the `StringIO` or `cStringIO` buffer will be used instead of the
+     default "fast" buffer.   This allows raw bytestrings in the
+     output stream, such as in expressions, to pass straight
+     through to the buffer.  This flag is forced
+     to ``True`` if ``disable_unicode`` is also configured.
+
+     .. versionadded:: 0.4
+        Added to provide the same behavior as that of the previous series.
+
+    :param cache_args: Dictionary of cache configuration arguments that
+     will be passed to the :class:`.CacheImpl`.   See :ref:`caching_toplevel`.
+
+    :param cache_dir:
+
+     .. deprecated:: 0.6
+        Use the ``'dir'`` argument in the ``cache_args`` dictionary.
+        See :ref:`caching_toplevel`.
+
+    :param cache_enabled: Boolean flag which enables caching of this
+     template.  See :ref:`caching_toplevel`.
+
+    :param cache_impl: String name of a :class:`.CacheImpl` caching
+     implementation to use.   Defaults to ``'beaker'``.
+
+    :param cache_type:
+
+     .. deprecated:: 0.6
+        Use the ``'type'`` argument in the ``cache_args`` dictionary.
+        See :ref:`caching_toplevel`.
+
+    :param cache_url:
+
+     .. deprecated:: 0.6
+        Use the ``'url'`` argument in the ``cache_args`` dictionary.
+        See :ref:`caching_toplevel`.
+
+    :param default_filters: List of string filter names that will
+     be applied to all expressions.  See :ref:`filtering_default_filters`.
+
+    :param disable_unicode: Disables all awareness of Python Unicode
+     objects.  See :ref:`unicode_disabled`.
+
+    :param enable_loop: When ``True``, enable the ``loop`` context variable.
+     This can be set to ``False`` to support templates that may
+     be making usage of the name "``loop``".   Individual templates can
+     re-enable the "loop" context by placing the directive
+     ``enable_loop="True"`` inside the ``<%page>`` tag -- see
+     :ref:`migrating_loop`.
+
+    :param encoding_errors: Error parameter passed to ``encode()`` when
+     string encoding is performed. See :ref:`usage_unicode`.
+
+    :param error_handler: Python callable which is called whenever
+     compile or runtime exceptions occur. The callable is passed
+     the current context as well as the exception. If the
+     callable returns ``True``, the exception is considered to
+     be handled, else it is re-raised after the function
+     completes. Is used to provide custom error-rendering
+     functions.
+
+    :param format_exceptions: if ``True``, exceptions which occur during
+     the render phase of this template will be caught and
+     formatted into an HTML error page, which then becomes the
+     rendered result of the :meth:`.render` call. Otherwise,
+     runtime exceptions are propagated outwards.
+
+    :param imports: String list of Python statements, typically individual
+     "import" lines, which will be placed into the module level
+     preamble of all generated Python modules. See the example
+     in :ref:`filtering_default_filters`.
+
+    :param input_encoding: Encoding of the template's source code.  Can
+     be used in lieu of the coding comment. See
+     :ref:`usage_unicode` as well as :ref:`unicode_toplevel` for
+     details on source encoding.
+
+    :param lookup: a :class:`.TemplateLookup` instance that will be used
+     for all file lookups via the ``<%namespace>``,
+     ``<%include>``, and ``<%inherit>`` tags. See
+     :ref:`usage_templatelookup`.
+
+    :param module_directory: Filesystem location where generated
+     Python module files will be placed.
+
+    :param module_filename: Overrides the filename of the generated
+     Python module file. For advanced usage only.
+
+    :param module_writer: A callable which overrides how the Python
+     module is written entirely.  The callable is passed the
+     encoded source content of the module and the destination
+     path to be written to.   The default behavior of module writing
+     uses a tempfile in conjunction with a file move in order
+     to make the operation atomic.   So a user-defined module
+     writing function that mimics the default behavior would be:
+
+     .. sourcecode:: python
+
+         import tempfile
+         import os
+         import shutil
+
+         def module_writer(source, outputpath):
+             (dest, name) = \\
+                 tempfile.mkstemp(
+                     dir=os.path.dirname(outputpath)
+                 )
+
+             os.write(dest, source)
+             os.close(dest)
+             shutil.move(name, outputpath)
+
+         from mako.template import Template
+         mytemplate = Template(
+                         file="index.html",
+                         module_directory="/path/to/modules",
+                         module_writer=module_writer
+                     )
+
+     The function is provided for unusual configurations where
+     certain platform-specific permissions or other special
+     steps are needed.
+
+    :param output_encoding: The encoding to use when :meth:`.render`
+     is called.
+     See :ref:`usage_unicode` as well as :ref:`unicode_toplevel`.
+
+    :param preprocessor: Python callable which will be passed
+     the full template source before it is parsed. The return
+     result of the callable will be used as the template source
+     code.
+
+    :param strict_undefined: Replaces the automatic usage of
+     ``UNDEFINED`` for any undeclared variables not located in
+     the :class:`.Context` with an immediate raise of
+     ``NameError``. The advantage is immediate reporting of
+     missing variables which include the name.
+
+     .. versionadded:: 0.3.6
+
+    :param uri: string URI or other identifier for this template.
+     If not provided, the ``uri`` is generated from the filesystem
+     path, or from the in-memory identity of a non-file-based
+     template. The primary usage of the ``uri`` is to provide a key
+     within :class:`.TemplateLookup`, as well as to generate the
+     file path of the generated Python module file, if
+     ``module_directory`` is specified.
+
+    """
+
+    def __init__(self,
+                    text=None,
+                    filename=None,
+                    uri=None,
+                    format_exceptions=False,
+                    error_handler=None,
+                    lookup=None,
+                    output_encoding=None,
+                    encoding_errors='strict',
+                    module_directory=None,
+                    cache_args=None,
+                    cache_impl='beaker',
+                    cache_enabled=True,
+                    cache_type=None,
+                    cache_dir=None,
+                    cache_url=None,
+                    module_filename=None,
+                    input_encoding=None,
+                    disable_unicode=False,
+                    module_writer=None,
+                    bytestring_passthrough=False,
+                    default_filters=None,
+                    buffer_filters=(),
+                    strict_undefined=False,
+                    imports=None,
+                    enable_loop=True,
+                    preprocessor=None):
+        if uri:
+            self.module_id = re.sub(r'\W', "_", uri)
+            self.uri = uri
+        elif filename:
+            self.module_id = re.sub(r'\W', "_", filename)
+            drive, path = os.path.splitdrive(filename)
+            path = os.path.normpath(path).replace(os.path.sep, "/")
+            self.uri = path
+        else:
+            self.module_id = "memory:" + hex(id(self))
+            self.uri = self.module_id
+
+        u_norm = self.uri
+        if u_norm.startswith("/"):
+            u_norm = u_norm[1:]
+        u_norm = os.path.normpath(u_norm)
+        if u_norm.startswith(".."):
+            raise exceptions.TemplateLookupException(
+                    "Template uri \"%s\" is invalid - "
+                    "it cannot be relative outside "
+                    "of the root path." % self.uri)
+
+        self.input_encoding = input_encoding
+        self.output_encoding = output_encoding
+        self.encoding_errors = encoding_errors
+        self.disable_unicode = disable_unicode
+        self.bytestring_passthrough = bytestring_passthrough or disable_unicode
+        self.enable_loop = enable_loop
+        self.strict_undefined = strict_undefined
+        self.module_writer = module_writer
+
+        if util.py3k and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "Mako for Python 3 does not "
+                                    "support disabling Unicode")
+        elif output_encoding and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "output_encoding must be set to "
+                                    "None when disable_unicode is used.")
+        if default_filters is None:
+            if util.py3k or self.disable_unicode:
+                self.default_filters = ['str']
+            else:
+                self.default_filters = ['unicode']
+        else:
+            self.default_filters = default_filters
+        self.buffer_filters = buffer_filters
+
+        self.imports = imports
+        self.preprocessor = preprocessor
+
+        # if plain text, compile code in memory only
+        if text is not None:
+            (code, module) = _compile_text(self, text, filename)
+            self._code = code
+            self._source = text
+            ModuleInfo(module, None, self, filename, code, text)
+        elif filename is not None:
+            # if template filename and a module directory, load
+            # a filesystem-based module file, generating if needed
+            if module_filename is not None:
+                path = module_filename
+            elif module_directory is not None:
+                path = os.path.abspath(
+                        os.path.join(
+                            os.path.normpath(module_directory),
+                            u_norm + ".py"
+                            )
+                        )
+            else:
+                path = None
+            module = self._compile_from_file(path, filename)
+        else:
+            raise exceptions.RuntimeException(
+                                "Template requires text or filename")
+
+        self.module = module
+        self.filename = filename
+        self.callable_ = self.module.render_body
+        self.format_exceptions = format_exceptions
+        self.error_handler = error_handler
+        self.lookup = lookup
+
+        self.module_directory = module_directory
+
+        self._setup_cache_args(
+            cache_impl, cache_enabled, cache_args,
+            cache_type, cache_dir, cache_url
+        )
+
+    @util.memoized_property
+    def reserved_names(self):
+        if self.enable_loop:
+            return codegen.RESERVED_NAMES
+        else:
+            return codegen.RESERVED_NAMES.difference(['loop'])
+
+    def _setup_cache_args(self,
+                cache_impl, cache_enabled, cache_args,
+                cache_type, cache_dir, cache_url):
+        self.cache_impl = cache_impl
+        self.cache_enabled = cache_enabled
+        if cache_args:
+            self.cache_args = cache_args
+        else:
+            self.cache_args = {}
+
+        # transfer deprecated cache_* args
+        if cache_type:
+            self.cache_args['type'] = cache_type
+        if cache_dir:
+            self.cache_args['dir'] = cache_dir
+        if cache_url:
+            self.cache_args['url'] = cache_url
+
+    def _compile_from_file(self, path, filename):
+        if path is not None:
+            util.verify_directory(os.path.dirname(path))
+            filemtime = os.stat(filename)[stat.ST_MTIME]
+            if not os.path.exists(path) or \
+                        os.stat(path)[stat.ST_MTIME] < filemtime:
+                data = util.read_file(filename)
+                _compile_module_file(
+                            self,
+                            data,
+                            filename,
+                            path,
+                            self.module_writer)
+            module = util.load_module(self.module_id, path)
+            del sys.modules[self.module_id]
+            if module._magic_number != codegen.MAGIC_NUMBER:
+                data = util.read_file(filename)
+                _compile_module_file(
+                            self,
+                            data,
+                            filename,
+                            path,
+                            self.module_writer)
+                module = util.load_module(self.module_id, path)
+                del sys.modules[self.module_id]
+            ModuleInfo(module, path, self, filename, None, None)
+        else:
+            # template filename and no module directory, compile code
+            # in memory
+            data = util.read_file(filename)
+            code, module = _compile_text(
+                                self,
+                                data,
+                                filename)
+            self._source = None
+            self._code = code
+            ModuleInfo(module, None, self, filename, code, None)
+        return module
+
+    @property
+    def source(self):
+        """Return the template source code for this :class:`.Template`."""
+
+        return _get_module_info_from_callable(self.callable_).source
+
+    @property
+    def code(self):
+        """Return the module source code for this :class:`.Template`."""
+
+        return _get_module_info_from_callable(self.callable_).code
+
+    @util.memoized_property
+    def cache(self):
+        return cache.Cache(self)
+
+    @property
+    def cache_dir(self):
+        return self.cache_args['dir']
+    @property
+    def cache_url(self):
+        return self.cache_args['url']
+    @property
+    def cache_type(self):
+        return self.cache_args['type']
+
+    def render(self, *args, **data):
+        """Render the output of this template as a string.
+
+        If the template specifies an output encoding, the string
+        will be encoded accordingly, else the output is raw (raw
+        output uses `cStringIO` and can't handle multibyte
+        characters). A :class:`.Context` object is created corresponding
+        to the given data. Arguments that are explicitly declared
+        by this template's internal rendering method are also
+        pulled from the given ``*args``, ``**data`` members.
+
+        """
+        return runtime._render(self, self.callable_, args, data)
+
+    def render_unicode(self, *args, **data):
+        """Render the output of this template as a unicode object."""
+
+        return runtime._render(self,
+                                self.callable_,
+                                args,
+                                data,
+                                as_unicode=True)
+
+    def render_context(self, context, *args, **kwargs):
+        """Render this :class:`.Template` with the given context.
+
+        The data is written to the context's buffer.
+
+        """
+        if getattr(context, '_with_template', None) is None:
+            context._set_with_template(self)
+        runtime._render_context(self,
+                                self.callable_,
+                                context,
+                                *args,
+                                **kwargs)
+
+    def has_def(self, name):
+        return hasattr(self.module, "render_%s" % name)
+
+    def get_def(self, name):
+        """Return a def of this template as a :class:`.DefTemplate`."""
+
+        return DefTemplate(self, getattr(self.module, "render_%s" % name))
+
+    def _get_def_callable(self, name):
+        return getattr(self.module, "render_%s" % name)
+
+    @property
+    def last_modified(self):
+        return self.module._modified_time
+
+class ModuleTemplate(Template):
+    """A Template which is constructed given an existing Python module.
+
+        e.g.::
+
+        t = Template("this is a template")
+        f = file("mymodule.py", "w")
+        f.write(t.code)
+        f.close()
+
+        import mymodule
+
+        t = ModuleTemplate(mymodule)
+        print t.render()
+
+    """
+
+    def __init__(self, module,
+                        module_filename=None,
+                        template=None,
+                        template_filename=None,
+                        module_source=None,
+                        template_source=None,
+                        output_encoding=None,
+                        encoding_errors='strict',
+                        disable_unicode=False,
+                        bytestring_passthrough=False,
+                        format_exceptions=False,
+                        error_handler=None,
+                        lookup=None,
+                        cache_args=None,
+                        cache_impl='beaker',
+                        cache_enabled=True,
+                        cache_type=None,
+                        cache_dir=None,
+                        cache_url=None,
+    ):
+        self.module_id = re.sub(r'\W', "_", module._template_uri)
+        self.uri = module._template_uri
+        self.input_encoding = module._source_encoding
+        self.output_encoding = output_encoding
+        self.encoding_errors = encoding_errors
+        self.disable_unicode = disable_unicode
+        self.bytestring_passthrough = bytestring_passthrough or disable_unicode
+        self.enable_loop = module._enable_loop
+
+        if util.py3k and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "Mako for Python 3 does not "
+                                    "support disabling Unicode")
+        elif output_encoding and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "output_encoding must be set to "
+                                    "None when disable_unicode is used.")
+
+        self.module = module
+        self.filename = template_filename
+        ModuleInfo(module,
+                        module_filename,
+                        self,
+                        template_filename,
+                        module_source,
+                        template_source)
+
+        self.callable_ = self.module.render_body
+        self.format_exceptions = format_exceptions
+        self.error_handler = error_handler
+        self.lookup = lookup
+        self._setup_cache_args(
+            cache_impl, cache_enabled, cache_args,
+            cache_type, cache_dir, cache_url
+        )
+
+class DefTemplate(Template):
+    """A :class:`.Template` which represents a callable def in a parent
+    template."""
+
+    def __init__(self, parent, callable_):
+        self.parent = parent
+        self.callable_ = callable_
+        self.output_encoding = parent.output_encoding
+        self.module = parent.module
+        self.encoding_errors = parent.encoding_errors
+        self.format_exceptions = parent.format_exceptions
+        self.error_handler = parent.error_handler
+        self.enable_loop = parent.enable_loop
+        self.lookup = parent.lookup
+        self.bytestring_passthrough = parent.bytestring_passthrough
+
+    def get_def(self, name):
+        return self.parent.get_def(name)
+
+class ModuleInfo(object):
+    """Stores information about a module currently loaded into
+    memory, provides reverse lookups of template source, module
+    source code based on a module's identifier.
+
+     """
+    _modules = weakref.WeakValueDictionary()
+
+    def __init__(self,
+                    module,
+                    module_filename,
+                    template,
+                    template_filename,
+                    module_source,
+                    template_source):
+        self.module = module
+        self.module_filename = module_filename
+        self.template_filename = template_filename
+        self.module_source = module_source
+        self.template_source = template_source
+        self._modules[module.__name__] = template._mmarker = self
+        if module_filename:
+            self._modules[module_filename] = self
+
+    @property
+    def code(self):
+        if self.module_source is not None:
+            return self.module_source
+        else:
+            return util.read_file(self.module_filename)
+
+    @property
+    def source(self):
+        if self.template_source is not None:
+            if self.module._source_encoding and \
+                    not isinstance(self.template_source, unicode):
+                return self.template_source.decode(
+                                self.module._source_encoding)
+            else:
+                return self.template_source
+        else:
+            data = util.read_file(self.template_filename)
+            if self.module._source_encoding:
+                return data.decode(self.module._source_encoding)
+            else:
+                return data
+
+def _compile(template, text, filename, generate_magic_comment):
+    lexer = Lexer(text,
+                    filename,
+                    disable_unicode=template.disable_unicode,
+                    input_encoding=template.input_encoding,
+                    preprocessor=template.preprocessor)
+    node = lexer.parse()
+    source = codegen.compile(node,
+                            template.uri,
+                            filename,
+                            default_filters=template.default_filters,
+                            buffer_filters=template.buffer_filters,
+                            imports=template.imports,
+                            source_encoding=lexer.encoding,
+                            generate_magic_comment=generate_magic_comment,
+                            disable_unicode=template.disable_unicode,
+                            strict_undefined=template.strict_undefined,
+                            enable_loop=template.enable_loop,
+                            reserved_names=template.reserved_names)
+    return source, lexer
+
+def _compile_text(template, text, filename):
+    identifier = template.module_id
+    source, lexer = _compile(template, text, filename,
+                        generate_magic_comment=template.disable_unicode)
+
+    cid = identifier
+    if not util.py3k and isinstance(cid, unicode):
+        cid = cid.encode()
+    module = types.ModuleType(cid)
+    code = compile(source, cid, 'exec')
+    exec code in module.__dict__, module.__dict__
+    return (source, module)
+
+def _compile_module_file(template, text, filename, outputpath, module_writer):
+    identifier = template.module_id
+    source, lexer = _compile(template, text, filename,
+                        generate_magic_comment=True)
+
+    if isinstance(source, unicode):
+        source = source.encode(lexer.encoding or 'ascii')
+
+    if module_writer:
+        module_writer(source, outputpath)
+    else:
+        # make tempfiles in the same location as the ultimate
+        # location.   this ensures they're on the same filesystem,
+        # avoiding synchronization issues.
+        (dest, name) = tempfile.mkstemp(dir=os.path.dirname(outputpath))
+
+        os.write(dest, source)
+        os.close(dest)
+        shutil.move(name, outputpath)
+
+def _get_module_info_from_callable(callable_):
+    return _get_module_info(callable_.func_globals['__name__'])
+
+def _get_module_info(filename):
+    return ModuleInfo._modules[filename]
+
diff --git a/lib/mako-0.7.2/mako/util.py b/lib/mako-0.7.2/mako/util.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/mako/util.py
@@ -0,0 +1,436 @@
+# mako/util.py
+# Copyright (C) 2006-2012 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
+
+import imp
+import sys
+
+
+py3k = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0)
+py26 = sys.version_info >= (2, 6)
+py24 = sys.version_info >= (2, 4) and sys.version_info < (2, 5)
+jython = sys.platform.startswith('java')
+win32 = sys.platform.startswith('win')
+
+if py3k:
+    from io import StringIO
+else:
+    try:
+        from cStringIO import StringIO
+    except:
+        from StringIO import StringIO
+
+import codecs, re, weakref, os, time, operator
+import collections
+
+try:
+    import threading
+    import thread
+except ImportError:
+    import dummy_threading as threading
+    import dummy_thread as thread
+
+if win32 or jython:
+    time_func = time.clock
+else:
+    time_func = time.time
+
+def function_named(fn, name):
+    """Return a function with a given __name__.
+
+    Will assign to __name__ and return the original function if possible on
+    the Python implementation, otherwise a new function will be constructed.
+
+    """
+    fn.__name__ = name
+    return fn
+
+try:
+    from functools import partial
+except:
+    def partial(func, *args, **keywords):
+        def newfunc(*fargs, **fkeywords):
+            newkeywords = keywords.copy()
+            newkeywords.update(fkeywords)
+            return func(*(args + fargs), **newkeywords)
+        return newfunc
+
+if py24:
+    def all(iterable):
+        for i in iterable:
+            if not i:
+                return False
+        return True
+
+    def exception_name(exc):
+        try:
+            return exc.__class__.__name__
+        except AttributeError:
+            return exc.__name__
+else:
+    all = all
+
+    def exception_name(exc):
+        return exc.__class__.__name__
+
+
+class PluginLoader(object):
+    def __init__(self, group):
+        self.group = group
+        self.impls = {}
+
+    def load(self, name):
+        if name in self.impls:
+             return self.impls[name]()
+        else:
+            import pkg_resources
+            for impl in pkg_resources.iter_entry_points(
+                                self.group,
+                                name):
+                self.impls[name] = impl.load
+                return impl.load()
+            else:
+                raise exceptions.RuntimeException(
+                        "Can't load plugin %s %s" %
+                        (self.group, name))
+
+    def register(self, name, modulepath, objname):
+        def load():
+            mod = __import__(modulepath)
+            for token in modulepath.split(".")[1:]:
+                mod = getattr(mod, token)
+            return getattr(mod, objname)
+        self.impls[name] = load
+
+def verify_directory(dir):
+    """create and/or verify a filesystem directory."""
+
+    tries = 0
+
+    while not os.path.exists(dir):
+        try:
+            tries += 1
+            os.makedirs(dir, 0775)
+        except:
+            if tries > 5:
+                raise
+
+def to_list(x, default=None):
+    if x is None:
+        return default
+    if not isinstance(x, (list, tuple)):
+        return [x]
+    else:
+        return x
+
+
+class memoized_property(object):
+    """A read-only @property that is only evaluated once."""
+    def __init__(self, fget, doc=None):
+        self.fget = fget
+        self.__doc__ = doc or fget.__doc__
+        self.__name__ = fget.__name__
+
+    def __get__(self, obj, cls):
+        if obj is None:
+            return self
+        obj.__dict__[self.__name__] = result = self.fget(obj)
+        return result
+
+class memoized_instancemethod(object):
+    """Decorate a method memoize its return value.
+
+    Best applied to no-arg methods: memoization is not sensitive to
+    argument values, and will always return the same value even when
+    called with different arguments.
+
+    """
+    def __init__(self, fget, doc=None):
+        self.fget = fget
+        self.__doc__ = doc or fget.__doc__
+        self.__name__ = fget.__name__
+
+    def __get__(self, obj, cls):
+        if obj is None:
+            return self
+        def oneshot(*args, **kw):
+            result = self.fget(obj, *args, **kw)
+            memo = lambda *a, **kw: result
+            memo.__name__ = self.__name__
+            memo.__doc__ = self.__doc__
+            obj.__dict__[self.__name__] = memo
+            return result
+        oneshot.__name__ = self.__name__
+        oneshot.__doc__ = self.__doc__
+        return oneshot
+
+class SetLikeDict(dict):
+    """a dictionary that has some setlike methods on it"""
+    def union(self, other):
+        """produce a 'union' of this dict and another (at the key level).
+
+        values in the second dict take precedence over that of the first"""
+        x = SetLikeDict(**self)
+        x.update(other)
+        return x
+
+class FastEncodingBuffer(object):
+    """a very rudimentary buffer that is faster than StringIO,
+    but doesn't crash on unicode data like cStringIO."""
+
+    def __init__(self, encoding=None, errors='strict', unicode=False):
+        self.data = collections.deque()
+        self.encoding = encoding
+        if unicode:
+            self.delim = u''
+        else:
+            self.delim = ''
+        self.unicode = unicode
+        self.errors = errors
+        self.write = self.data.append
+
+    def truncate(self):
+        self.data = collections.deque()
+        self.write = self.data.append
+
+    def getvalue(self):
+        if self.encoding:
+            return self.delim.join(self.data).encode(self.encoding,
+                                                     self.errors)
+        else:
+            return self.delim.join(self.data)
+
+class LRUCache(dict):
+    """A dictionary-like object that stores a limited number of items,
+    discarding lesser used items periodically.
+
+    this is a rewrite of LRUCache from Myghty to use a periodic timestamp-based
+    paradigm so that synchronization is not really needed.  the size management
+    is inexact.
+    """
+
+    class _Item(object):
+        def __init__(self, key, value):
+            self.key = key
+            self.value = value
+            self.timestamp = time_func()
+        def __repr__(self):
+            return repr(self.value)
+
+    def __init__(self, capacity, threshold=.5):
+        self.capacity = capacity
+        self.threshold = threshold
+
+    def __getitem__(self, key):
+        item = dict.__getitem__(self, key)
+        item.timestamp = time_func()
+        return item.value
+
+    def values(self):
+        return [i.value for i in dict.values(self)]
+
+    def setdefault(self, key, value):
+        if key in self:
+            return self[key]
+        else:
+            self[key] = value
+            return value
+
+    def __setitem__(self, key, value):
+        item = dict.get(self, key)
+        if item is None:
+            item = self._Item(key, value)
+            dict.__setitem__(self, key, item)
+        else:
+            item.value = value
+        self._manage_size()
+
+    def _manage_size(self):
+        while len(self) > self.capacity + self.capacity * self.threshold:
+            bytime = sorted(dict.values(self),
+                            key=operator.attrgetter('timestamp'), reverse=True)
+            for item in bytime[self.capacity:]:
+                try:
+                    del self[item.key]
+                except KeyError:
+                    # if we couldn't find a key, most likely some other thread
+                    # broke in on us. loop around and try again
+                    break
+
+# Regexp to match python magic encoding line
+_PYTHON_MAGIC_COMMENT_re = re.compile(
+    r'[ \t\f]* \# .* coding[=:][ \t]*([-\w.]+)',
+    re.VERBOSE)
+
+def parse_encoding(fp):
+    """Deduce the encoding of a Python source file (binary mode) from magic
+    comment.
+
+    It does this in the same way as the `Python interpreter`__
+
+    .. __: http://docs.python.org/ref/encodings.html
+
+    The ``fp`` argument should be a seekable file object in binary mode.
+    """
+    pos = fp.tell()
+    fp.seek(0)
+    try:
+        line1 = fp.readline()
+        has_bom = line1.startswith(codecs.BOM_UTF8)
+        if has_bom:
+            line1 = line1[len(codecs.BOM_UTF8):]
+
+        m = _PYTHON_MAGIC_COMMENT_re.match(line1.decode('ascii', 'ignore'))
+        if not m:
+            try:
+                import parser
+                parser.suite(line1.decode('ascii', 'ignore'))
+            except (ImportError, SyntaxError):
+                # Either it's a real syntax error, in which case the source
+                # is not valid python source, or line2 is a continuation of
+                # line1, in which case we don't want to scan line2 for a magic
+                # comment.
+                pass
+            else:
+                line2 = fp.readline()
+                m = _PYTHON_MAGIC_COMMENT_re.match(
+                                               line2.decode('ascii', 'ignore'))
+
+        if has_bom:
+            if m:
+                raise SyntaxError, \
+                      "python refuses to compile code with both a UTF8" \
+                      " byte-order-mark and a magic encoding comment"
+            return 'utf_8'
+        elif m:
+            return m.group(1)
+        else:
+            return None
+    finally:
+        fp.seek(pos)
+
+def sorted_dict_repr(d):
+    """repr() a dictionary with the keys in order.
+
+    Used by the lexer unit test to compare parse trees based on strings.
+
+    """
+    keys = d.keys()
+    keys.sort()
+    return "{" + ", ".join(["%r: %r" % (k, d[k]) for k in keys]) + "}"
+
+def restore__ast(_ast):
+    """Attempt to restore the required classes to the _ast module if it
+    appears to be missing them
+    """
+    if hasattr(_ast, 'AST'):
+        return
+    _ast.PyCF_ONLY_AST = 2 << 9
+    m = compile("""\
+def foo(): pass
+class Bar(object): pass
+if False: pass
+baz = 'mako'
+1 + 2 - 3 * 4 / 5
+6 // 7 % 8 << 9 >> 10
+11 & 12 ^ 13 | 14
+15 and 16 or 17
+-baz + (not +18) - ~17
+baz and 'foo' or 'bar'
+(mako is baz == baz) is not baz != mako
+mako > baz < mako >= baz <= mako
+mako in baz not in mako""", '<unknown>', 'exec', _ast.PyCF_ONLY_AST)
+    _ast.Module = type(m)
+
+    for cls in _ast.Module.__mro__:
+        if cls.__name__ == 'mod':
+            _ast.mod = cls
+        elif cls.__name__ == 'AST':
+            _ast.AST = cls
+
+    _ast.FunctionDef = type(m.body[0])
+    _ast.ClassDef = type(m.body[1])
+    _ast.If = type(m.body[2])
+
+    _ast.Name = type(m.body[3].targets[0])
+    _ast.Store = type(m.body[3].targets[0].ctx)
+    _ast.Str = type(m.body[3].value)
+
+    _ast.Sub = type(m.body[4].value.op)
+    _ast.Add = type(m.body[4].value.left.op)
+    _ast.Div = type(m.body[4].value.right.op)
+    _ast.Mult = type(m.body[4].value.right.left.op)
+
+    _ast.RShift = type(m.body[5].value.op)
+    _ast.LShift = type(m.body[5].value.left.op)
+    _ast.Mod = type(m.body[5].value.left.left.op)
+    _ast.FloorDiv = type(m.body[5].value.left.left.left.op)
+
+    _ast.BitOr = type(m.body[6].value.op)
+    _ast.BitXor = type(m.body[6].value.left.op)
+    _ast.BitAnd = type(m.body[6].value.left.left.op)
+
+    _ast.Or = type(m.body[7].value.op)
+    _ast.And = type(m.body[7].value.values[0].op)
+
+    _ast.Invert = type(m.body[8].value.right.op)
+    _ast.Not = type(m.body[8].value.left.right.op)
+    _ast.UAdd = type(m.body[8].value.left.right.operand.op)
+    _ast.USub = type(m.body[8].value.left.left.op)
+
+    _ast.Or = type(m.body[9].value.op)
+    _ast.And = type(m.body[9].value.values[0].op)
+
+    _ast.IsNot = type(m.body[10].value.ops[0])
+    _ast.NotEq = type(m.body[10].value.ops[1])
+    _ast.Is = type(m.body[10].value.left.ops[0])
+    _ast.Eq = type(m.body[10].value.left.ops[1])
+
+    _ast.Gt = type(m.body[11].value.ops[0])
+    _ast.Lt = type(m.body[11].value.ops[1])
+    _ast.GtE = type(m.body[11].value.ops[2])
+    _ast.LtE = type(m.body[11].value.ops[3])
+
+    _ast.In = type(m.body[12].value.ops[0])
+    _ast.NotIn = type(m.body[12].value.ops[1])
+
+
+try:
+    from inspect import CO_VARKEYWORDS, CO_VARARGS
+    def inspect_func_args(fn):
+        co = fn.func_code
+
+        nargs = co.co_argcount
+        names = co.co_varnames
+        args = list(names[:nargs])
+
+        varargs = None
+        if co.co_flags & CO_VARARGS:
+            varargs = co.co_varnames[nargs]
+            nargs = nargs + 1
+        varkw = None
+        if co.co_flags & CO_VARKEYWORDS:
+            varkw = co.co_varnames[nargs]
+
+        return args, varargs, varkw, fn.func_defaults
+except ImportError:
+    import inspect
+    def inspect_func_args(fn):
+        return inspect.getargspec(fn)
+
+def read_file(path, mode='rb'):
+    fp = open(path, mode)
+    try:
+        data = fp.read()
+        return data
+    finally:
+        fp.close()
+
+def load_module(module_id, path):
+    fp = open(path, 'rb')
+    try:
+        return imp.load_source(module_id, path, fp)
+    finally:
+        fp.close()
diff --git a/lib/mako-0.7.2/scripts/mako-render b/lib/mako-0.7.2/scripts/mako-render
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/scripts/mako-render
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+def render(data, kw):
+    from mako.template import Template
+    from mako.lookup import TemplateLookup
+
+    lookup = TemplateLookup(["."])
+    return Template(data, lookup=lookup).render(**kw)
+
+def varsplit(var):
+    if "=" not in var:
+        return (var, "")
+    return var.split("=", 1)
+
+def main(argv=None):
+    from os.path import isfile
+    from sys import stdin
+
+    if argv is None:
+        import sys
+        argv = sys.argv
+
+    from optparse import OptionParser
+
+    parser = OptionParser("usage: %prog [FILENAME]")
+    parser.add_option("--var", default=[], action="append",
+                  help="variable (can be used multiple times, use name=value)")
+
+    opts, args = parser.parse_args(argv[1:])
+    if len(args) not in (0, 1):
+        parser.error("wrong number of arguments") # Will exit
+
+    if (len(args) == 0) or (args[0] == "-"):
+        fo = stdin
+    else:
+        filename = args[0]
+        if not isfile(filename):
+            raise SystemExit("error: can't find %s" % filename)
+        fo = open(filename)
+
+    kw = dict([varsplit(var) for var in opts.var])
+    data = fo.read()
+    print render(data, kw)
+
+if __name__ == "__main__":
+    main()
diff --git a/lib/mako-0.7.2/setup.cfg b/lib/mako-0.7.2/setup.cfg
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/lib/mako-0.7.2/setup.py b/lib/mako-0.7.2/setup.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/setup.py
@@ -0,0 +1,62 @@
+from setuptools import setup, find_packages
+import os
+import re
+import sys
+
+extra = {}
+if sys.version_info >= (3, 0):
+    extra.update(
+        use_2to3=True,
+    )
+
+v = open(os.path.join(os.path.dirname(__file__), 'mako', '__init__.py'))
+VERSION = re.compile(r".*__version__ = '(.*?)'", re.S).match(v.read()).group(1)
+v.close()
+
+readme = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
+
+setup(name='Mako',
+      version=VERSION,
+      description="A super-fast templating language that borrows the \
+ best ideas from the existing templating languages.",
+      long_description=readme,
+      classifiers=[
+      'Development Status :: 5 - Production/Stable',
+      'Environment :: Web Environment',
+      'Intended Audience :: Developers',
+      'Programming Language :: Python',
+      'Programming Language :: Python :: 3',
+      "Programming Language :: Python :: Implementation :: CPython",
+      "Programming Language :: Python :: Implementation :: PyPy",
+      'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+      ],
+      keywords='templates',
+      author='Mike Bayer',
+      author_email='mike at zzzcomputing.com',
+      url='http://www.makotemplates.org/',
+      license='MIT',
+      packages=find_packages('.', exclude=['examples*', 'test*']),
+      scripts=['scripts/mako-render'],
+      tests_require = ['nose >= 0.11'],
+      test_suite = "nose.collector",
+      zip_safe=False,
+      install_requires=[
+          'MarkupSafe>=0.9.2',
+      ],
+      extras_require = {'beaker':['Beaker>=1.1']},
+      entry_points="""
+      [python.templating.engines]
+      mako = mako.ext.turbogears:TGPlugin
+ 
+      [pygments.lexers]
+      mako = mako.ext.pygmentplugin:MakoLexer
+      html+mako = mako.ext.pygmentplugin:MakoHtmlLexer
+      xml+mako = mako.ext.pygmentplugin:MakoXmlLexer
+      js+mako = mako.ext.pygmentplugin:MakoJavascriptLexer
+      css+mako = mako.ext.pygmentplugin:MakoCssLexer
+
+      [babel.extractors]
+      mako = mako.ext.babelplugin:extract
+      """,
+      **extra
+)
diff --git a/lib/mako-0.7.2/test/__init__.py b/lib/mako-0.7.2/test/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/__init__.py
@@ -0,0 +1,135 @@
+from mako.template import Template
+import unittest, os
+from mako.util import py3k
+from mako.util import function_named
+import re
+from mako.cache import CacheImpl, register_plugin
+from nose import SkipTest
+
+
+template_base = os.path.join(os.path.dirname(__file__), 'templates')
+module_base = os.path.join(template_base, 'modules')
+
+class TemplateTest(unittest.TestCase):
+
+    def _file_template(self, filename, **kw):
+        filepath = self._file_path(filename)
+        return Template(uri=filename, filename=filepath,
+                            module_directory=module_base, **kw)
+
+    def _file_path(self, filename):
+        name, ext = os.path.splitext(filename)
+
+        if py3k:
+            py3k_path = os.path.join(template_base, name + "_py3k" + ext)
+            if os.path.exists(py3k_path):
+                return py3k_path
+
+        return os.path.join(template_base, filename)
+
+    def _do_file_test(self, filename, expected, filters=None,
+                        unicode_=True, template_args=None, **kw):
+        t1 = self._file_template(filename, **kw)
+        self._do_test(t1, expected, filters=filters,
+                        unicode_=unicode_, template_args=template_args)
+
+    def _do_memory_test(self, source, expected, filters=None,
+                        unicode_=True, template_args=None, **kw):
+        t1 = Template(text=source, **kw)
+        self._do_test(t1, expected, filters=filters,
+                        unicode_=unicode_, template_args=template_args)
+
+    def _do_test(self, template, expected, filters=None, template_args=None, unicode_=True):
+        if template_args is None:
+            template_args = {}
+        if unicode_:
+            output = template.render_unicode(**template_args)
+        else:
+            output = template.render(**template_args)
+
+        if filters:
+            output = filters(output)
+        eq_(output, expected)
+
+def eq_(a, b, msg=None):
+    """Assert a == b, with repr messaging on failure."""
+    assert a == b, msg or "%r != %r" % (a, b)
+
+def teardown():
+    import shutil
+    shutil.rmtree(module_base, True)
+
+def assert_raises(except_cls, callable_, *args, **kw):
+    try:
+        callable_(*args, **kw)
+        success = False
+    except except_cls, e:
+        success = True
+
+    # assert outside the block so it works for AssertionError too !
+    assert success, "Callable did not raise an exception"
+
+def assert_raises_message(except_cls, msg, callable_, *args, **kwargs):
+    try:
+        callable_(*args, **kwargs)
+        assert False, "Callable did not raise an exception"
+    except except_cls, e:
+        assert re.search(msg, str(e)), "%r !~ %s" % (msg, e)
+        print str(e)
+
+def skip_if(predicate, reason=None):
+    """Skip a test if predicate is true."""
+    reason = reason or predicate.__name__
+
+    def decorate(fn):
+        fn_name = fn.__name__
+        def maybe(*args, **kw):
+            if predicate():
+                msg = "'%s' skipped: %s" % (
+                    fn_name, reason)
+                raise SkipTest(msg)
+            else:
+                return fn(*args, **kw)
+        return function_named(maybe, fn_name)
+    return decorate
+
+def requires_pygments_14(fn):
+    try:
+        import pygments
+        version = pygments.__version__
+    except:
+        version = "0"
+    return skip_if(lambda: version < "1.4")(fn)
+
+def requires_no_pygments(fn):
+    try:
+        import pygments
+    except:
+        pygments = None
+    return skip_if(lambda: pygments is not None)(fn)
+
+class PlainCacheImpl(CacheImpl):
+    """Simple memory cache impl so that tests which
+    use caching can run without beaker.  """
+
+    def __init__(self, cache):
+        self.cache = cache
+        self.data = {}
+
+    def get_or_create(self, key, creation_function, **kw):
+        if key in self.data:
+            return self.data[key]
+        else:
+            self.data[key] = data = creation_function(**kw)
+            return data
+
+    def put(self, key, value, **kw):
+        self.data[key] = value
+
+    def get(self, key, **kw):
+        return self.data[key]
+
+    def invalidate(self, key, **kw):
+        del self.data[key]
+
+register_plugin("plain", __name__, "PlainCacheImpl")
diff --git a/lib/mako-0.7.2/test/foo/__init__.py b/lib/mako-0.7.2/test/foo/__init__.py
new file mode 100644
diff --git a/lib/mako-0.7.2/test/foo/test_ns.py b/lib/mako-0.7.2/test/foo/test_ns.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/foo/test_ns.py
@@ -0,0 +1,7 @@
+def foo1(context):
+    context.write("this is foo1.")
+    return ''
+ 
+def foo2(context, x):
+    context.write("this is foo2, x is " + x)
+    return ''
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/sample_module_namespace.py b/lib/mako-0.7.2/test/sample_module_namespace.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/sample_module_namespace.py
@@ -0,0 +1,7 @@
+def foo1(context):
+    context.write("this is foo1.")
+    return ''
+ 
+def foo2(context, x):
+    context.write("this is foo2, x is " + x)
+    return ''
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/badbom.html b/lib/mako-0.7.2/test/templates/badbom.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/badbom.html
@@ -0,0 +1,2 @@
+?## -*- coding: ascii -*-
+Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/bom.html b/lib/mako-0.7.2/test/templates/bom.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/bom.html
@@ -0,0 +1,1 @@
+?Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/bommagic.html b/lib/mako-0.7.2/test/templates/bommagic.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/bommagic.html
@@ -0,0 +1,2 @@
+?## -*- coding: utf-8 -*-
+Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/chs_unicode.html b/lib/mako-0.7.2/test/templates/chs_unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/chs_unicode.html
@@ -0,0 +1,11 @@
+## -*- encoding:utf8 -*-
+<%
+ msg = u'??????'
+%>
+
+<%def name="welcome(who, place=u'??')">
+Welcome ${who} to ${place}.
+</%def>
+
+${name} ? ${msg}<br/>
+${welcome(u'?')}
diff --git a/lib/mako-0.7.2/test/templates/chs_unicode_py3k.html b/lib/mako-0.7.2/test/templates/chs_unicode_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/chs_unicode_py3k.html
@@ -0,0 +1,11 @@
+## -*- encoding:utf8 -*-
+<%
+ msg = '??????'
+%>
+
+<%def name="welcome(who, place='??')">
+Welcome ${who} to ${place}.
+</%def>
+
+${name} ? ${msg}<br/>
+${welcome('?')}
diff --git a/lib/mako-0.7.2/test/templates/chs_utf8.html b/lib/mako-0.7.2/test/templates/chs_utf8.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/chs_utf8.html
@@ -0,0 +1,17 @@
+## -*- encoding:utf8 -*-
+<%
+ msg = '??????'
+%>
+
+<%def name="welcome(who, place='??')">
+Welcome ${who} to ${place}.
+</%def>
+
+<%def name="welcome_buffered(who, place='??')" buffered="True">
+Welcome ${who} to ${place}.
+</%def>
+
+${name} ? ${msg}<br/>
+${welcome('?')}
+${welcome_buffered('?')}
+
diff --git a/lib/mako-0.7.2/test/templates/crlf.html b/lib/mako-0.7.2/test/templates/crlf.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/crlf.html
@@ -0,0 +1,19 @@
+<html>
+
+<%page args="a=['foo',
+                'bar']"/>
+
+like the name says.
+
+    % for x in [1,2,3]:
+        ${x}\
+    % endfor
+
+${trumpeter == 'Miles' and trumpeter or \
+      'Dizzy'}
+
+<%def name="hi()">
+    hi!
+</%def>
+
+</html>
diff --git a/lib/mako-0.7.2/test/templates/foo/modtest.html.py b/lib/mako-0.7.2/test/templates/foo/modtest.html.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/foo/modtest.html.py
@@ -0,0 +1,25 @@
+from mako import runtime, filters, cache
+UNDEFINED = runtime.UNDEFINED
+__M_dict_builtin = dict
+__M_locals_builtin = locals
+_magic_number = 5
+_modified_time = 1267565427.7968459
+_template_filename='/Users/classic/dev/mako/test/templates/modtest.html'
+_template_uri='/modtest.html'
+_template_cache=cache.Cache(__name__, _modified_time)
+_source_encoding=None
+_exports = []
+
+
+def render_body(context,**pageargs):
+    context.caller_stack._push_frame()
+    try:
+        __M_locals = __M_dict_builtin(pageargs=pageargs)
+        __M_writer = context.writer()
+        # SOURCE LINE 1
+        __M_writer(u'this is a test')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
diff --git a/lib/mako-0.7.2/test/templates/gettext.mako b/lib/mako-0.7.2/test/templates/gettext.mako
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/gettext.mako
@@ -0,0 +1,89 @@
+<%page args="x, y=_('Page arg 1'), z=_('Page arg 2')"/>
+<%!
+import random
+def gettext(message): return message
+_ = gettext
+def ungettext(s, p, c):
+    if c == 1:
+        return s
+    return p
+top = gettext('Begin')
+%>
+<%
+   # TRANSLATOR: Hi there!
+   hithere = _('Hi there!')
+
+   # TRANSLATOR: you should not be seeing this in the .po
+   rows = [[v for v in range(0,10)] for row in range(0,10)]
+
+   hello = _('Hello')
+%>
+<div id="header">
+  ${_('Welcome')}
+</div>
+<table>
+    % for row in (hithere, hello, _('Yo')):
+        ${makerow(row)}
+    % endfor
+    ${makerow(count=2)}
+</table>
+
+
+<div id="main">
+
+## TRANSLATOR: Ensure so and
+## so, thanks
+  ${_('The')} fuzzy ${ungettext('bunny', 'bunnies', random.randint(1, 2))}
+</div>
+
+<div id="footer">
+  ## TRANSLATOR: Good bye
+  ${_('Goodbye')}
+</div>
+ 
+<%def name="makerow(row=_('Babel'), count=1)">
+    <!-- ${ungettext('hella', 'hellas', count)} -->
+    % for i in range(count):
+      <tr>
+      % for name in row:
+          <td>${name}</td>\
+      % endfor
+      </tr>
+    % endfor
+</%def>
+
+<%def name="comment()">
+  <!-- ${caller.body()} -->
+</%def>
+
+<%block name="foo">
+    ## TRANSLATOR: Ensure so and
+    ## so, thanks
+      ${_('The')} fuzzy ${ungettext('bunny', 'bunnies', random.randint(1, 2))}
+</%block>
+
+<%call expr="comment">
+  P.S.
+  ## TRANSLATOR: HTML comment
+  ${_('Goodbye, really!')}
+</%call>
+
+<!-- ${_('P.S. byebye')} -->
+
+<div id="end">
+  <a href="#top">
+    ## TRANSLATOR: you won't see this either
+ 
+    ${_('Top')}
+  </a>
+</div>
+
+<%def name="panel()">
+
+${_(u'foo')} <%self:block_tpl title="123", name="_(u'baz')">
+
+${_(u'bar')}
+
+</%self:block_tpl>
+
+</%def>
diff --git a/lib/mako-0.7.2/test/templates/index.html b/lib/mako-0.7.2/test/templates/index.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/index.html
@@ -0,0 +1,1 @@
+this is index
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/internationalization.html b/lib/mako-0.7.2/test/templates/internationalization.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/internationalization.html
@@ -0,0 +1,920 @@
+<div class="rst-docs">
+ 
+  <h1 class="pudge-member-page-heading">Internationalization, Localization and Unicode</h1>
+ 
+  <table rules="none" frame="void" class="docinfo">
+<col class="docinfo-name"></col>
+<col class="docinfo-content"></col>
+<tbody valign="top">
+<tr><th class="docinfo-name">Author:</th>
+<td>James Gardner</td></tr>
+<tr class="field"><th class="docinfo-name">updated:</th><td class="field-body">2006-12-11</td>
+</tr>
+</tbody>
+</table>
+
+  <div class="note">
+<p class="first admonition-title">Note</p>
+<p>This is a work in progress. We hope the internationalization, localization
+and Unicode support in Pylons is now robust and flexible but we would
+appreciate hearing about any issues we have. Just drop a line to the
+pylons-discuss mailing list on Google Groups.</p>
+<p class="last">This is the first draft of the full document including Unicode. Expect
+some typos and spelling mistakes!</p>
+</div>
+<div class="contents topic">
+<p class="topic-title first"><a id="table-of-contents" name="table-of-contents">Table of Contents</a></p>
+<ul class="auto-toc simple">
+<li><a href="#understanding-unicode" id="id1" name="id1" class="reference">1???Understanding Unicode</a><ul class="auto-toc">
+<li><a href="#what-is-unicode" id="id2" name="id2" class="reference">1.1???What is Unicode?</a></li>
+<li><a href="#unicode-in-python" id="id3" name="id3" class="reference">1.2???Unicode in Python</a></li>
+<li><a href="#unicode-literals-in-python-source-code" id="id4" name="id4" class="reference">1.3???Unicode Literals in Python Source Code</a></li>
+<li><a href="#input-and-output" id="id5" name="id5" class="reference">1.4???Input and Output</a></li>
+<li><a href="#unicode-filenames" id="id6" name="id6" class="reference">1.5???Unicode Filenames</a></li>
+</ul>
+</li>
+<li><a href="#applying-this-to-web-programming" id="id7" name="id7" class="reference">2???Applying this to Web Programming</a><ul class="auto-toc">
+<li><a href="#request-parameters" id="id8" name="id8" class="reference">2.1???Request Parameters</a></li>
+<li><a href="#templating" id="id9" name="id9" class="reference">2.2???Templating</a></li>
+<li><a href="#output-encoding" id="id10" name="id10" class="reference">2.3???Output Encoding</a></li>
+<li><a href="#databases" id="id11" name="id11" class="reference">2.4???Databases</a></li>
+</ul>
+</li>
+<li><a href="#internationalization-and-localization" id="id12" name="id12" class="reference">3???Internationalization and Localization</a><ul class="auto-toc">
+<li><a href="#getting-started" id="id13" name="id13" class="reference">3.1???Getting Started</a></li>
+<li><a href="#testing-the-application" id="id14" name="id14" class="reference">3.2???Testing the Application</a></li>
+<li><a href="#missing-translations" id="id15" name="id15" class="reference">3.3???Missing Translations</a></li>
+<li><a href="#translations-within-templates" id="id16" name="id16" class="reference">3.4???Translations Within Templates</a></li>
+<li><a href="#producing-a-python-egg" id="id17" name="id17" class="reference">3.5???Producing a Python Egg</a></li>
+<li><a href="#plural-forms" id="id18" name="id18" class="reference">3.6???Plural Forms</a></li>
+</ul>
+</li>
+<li><a href="#summary" id="id19" name="id19" class="reference">4???Summary</a></li>
+<li><a href="#further-reading" id="id20" name="id20" class="reference">5???Further Reading</a></li>
+</ul>
+</div>
+<p>Internationalization and localization are means of adapting software for
+non-native environments, especially for other nations and cultures.</p>
+<p>Parts of an application which might need to be localized might include:</p>
+<blockquote>
+<ul class="simple">
+<li>Language</li>
+<li>Date/time format</li>
+<li>Formatting of numbers e.g. decimal points, positioning of separators,
+character used as separator</li>
+<li>Time zones (UTC in internationalized environments)</li>
+<li>Currency</li>
+<li>Weights and measures</li>
+</ul>
+</blockquote>
+<p>The distinction between internationalization and localization is subtle but
+important. Internationalization is the adaptation of products for potential use
+virtually everywhere, while localization is the addition of special features
+for use in a specific locale.</p>
+<p>For example, in terms of language used in software, internationalization is the
+process of marking up all strings that might need to be translated whilst
+localization is the process of producing translations for a particular locale.</p>
+<p>Pylons provides built-in support to enable you to internationalize language but
+leaves you to handle any other aspects of internationalization which might be
+appropriate to your application.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">Internationalization is often abbreviated as I18N (or i18n or I18n) where the
+number 18 refers to the number of letters omitted.
+Localization is often abbreviated L10n or l10n in the same manner. These
+abbreviations also avoid picking one spelling (internationalisation vs.
+internationalization, etc.) over the other.</p>
+</div>
+<p>In order to represent characters from multiple languages, you will need to use
+Unicode so this documentation will start with a description of why Unicode is
+useful, its history and how to use Unicode in Python.</p>
+<div class="section">
+<h1><a href="#id1" id="understanding-unicode" name="understanding-unicode" class="toc-backref">1???Understanding Unicode</a></h1>
+<p>If you've ever come across text in a foreign language that contains lots of
+<tt class="docutils literal"><span class="pre">????</span></tt> characters or have written some Python code and received a message
+such as <tt class="docutils literal"><span class="pre">UnicodeDecodeError:</span> <span class="pre">'ascii'</span> <span class="pre">codec</span> <span class="pre">can't</span> <span class="pre">decode</span> <span class="pre">byte</span> <span class="pre">0xff</span> <span class="pre">in</span> <span class="pre">position</span>
+<span class="pre">6:</span> <span class="pre">ordinal</span> <span class="pre">not</span> <span class="pre">in</span> <span class="pre">range(128)</span></tt> then you have run into a problem with character
+sets, encodings, Unicode and the like.</p>
+<p>The truth is that many developers are put off by Unicode because most of the
+time it is possible to muddle through rather than take the time to learn the
+basics. To make the problem worse if you have a system that manages to fudge
+the issues and just about work and then start trying to do things properly with
+Unicode it often highlights problems in other parts of your code.</p>
+<p>The good news is that Python has great Unicode support, so the rest of
+this article will show you how to correctly use Unicode in Pylons to avoid
+unwanted <tt class="docutils literal"><span class="pre">?</span></tt> characters and <tt class="docutils literal"><span class="pre">UnicodeDecodeErrors</span></tt>.</p>
+<div class="section">
+<h2><a href="#id2" id="what-is-unicode" name="what-is-unicode" class="toc-backref">1.1???What is Unicode?</a></h2>
+<p>When computers were first being used the characters that were most important
+were unaccented English letters. Each of these letters could be represented by
+a number between 32 and 127 and thus was born ASCII, a character set where
+space was 32, the letter "A" was 65 and everything could be stored in 7 bits.</p>
+<p>Most computers in those days were using 8-bit bytes so people quickly realized
+that they could use the codes 128-255 for their own purposes. Different people
+used the codes 128-255 to represent different characters and before long these
+different sets of characters were also standardized into <em>code pages</em>. This
+meant that if you needed some non-ASCII characters in a document you could also
+specify a codepage which would define which extra characters were available.
+For example Israel DOS used a code page called 862, while Greek users used 737.
+This just about worked for Western languages provided you didn't want to write
+an Israeli document with Greek characters but it didn't work at all for Asian
+languages where there are many more characters than can be represented in 8
+bits.</p>
+<p>Unicode is a character set that solves these problems by uniquely defining
+<em>every</em> character that is used anywhere in the world. Rather than defining a
+character as a particular combination of bits in the way ASCII does, each
+character is assigned a <em>code point</em>. For example the word <tt class="docutils literal"><span class="pre">hello</span></tt> is made
+from code points <tt class="docutils literal"><span class="pre">U+0048</span> <span class="pre">U+0065</span> <span class="pre">U+006C</span> <span class="pre">U+006C</span> <span class="pre">U+006F</span></tt>. The full list of code
+points can be found at <a href="http://www.unicode.org/charts/" class="reference">http://www.unicode.org/charts/</a>.</p>
+<p>There are lots of different ways of encoding Unicode code points into bits but
+the most popular encoding is UTF-8. Using UTF-8, every code point from 0-127 is
+stored in a single byte. Only code points 128 and above are stored using 2, 3,
+in fact, up to 6 bytes. This has the useful side effect that English text looks
+exactly the same in UTF-8 as it did in ASCII, because for every
+ASCII character with hexadecimal value 0xXY, the corresponding Unicode
+code point is U+00XY. This backwards compatibility is why if you are developing
+an application that is only used by English speakers you can often get away
+without handling characters properly and still expect things to work most of
+the time. Of course, if you use a different encoding such as UTF-16 this
+doesn't apply since none of the code points are encoded to 8 bits.</p>
+<p>The important things to note from the discussion so far are that:</p>
+<ul>
+<li><p class="first">Unicode can represent pretty much any character in any writing system in
+widespread use today</p>
+</li>
+<li><p class="first">Unicode uses code points to represent characters and the way these map to bits
+in memory depends on the encoding</p>
+</li>
+<li><dl class="first docutils">
+<dt>The most popular encoding is UTF-8 which has  several convenient properties:</dt>
+<dd><ol class="first last arabic simple">
+<li>It can handle any Unicode code point</li>
+<li>A Unicode string is turned into a string of bytes containing no embedded
+zero bytes. This avoids byte-ordering issues, and means UTF-8 strings can be
+processed by C functions such as strcpy() and sent through protocols that can't
+handle zero bytes</li>
+<li>A string of ASCII text is also valid UTF-8 text</li>
+<li>UTF-8 is fairly compact; the majority of code points are turned into two
+bytes, and values less than 128 occupy only a single byte.</li>
+<li>If bytes are corrupted or lost, it's possible to determine the start of
+the next UTF-8-encoded code point and resynchronize.</li>
+</ol>
+</dd>
+</dl>
+</li>
+</ul>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">Since Unicode 3.1, some extensions have even been defined so that the
+defined range is now U+000000 to U+10FFFF (21 bits), and formally, the
+character set is defined as 31-bits to allow for future expansion. It is a myth
+that there are 65,536 Unicode code points and that every Unicode letter can
+really be squeezed into two bytes. It is also incorrect to think that UTF-8 can
+represent less characters than UTF-16. UTF-8 simply uses a variable number of
+bytes for a character, sometimes just one byte (8 bits).</p>
+</div>
+</div>
+<div class="section">
+<h2><a href="#id3" id="unicode-in-python" name="unicode-in-python" class="toc-backref">1.2???Unicode in Python</a></h2>
+<p>In Python Unicode strings are expressed as instances of the built-in
+<tt class="docutils literal"><span class="pre">unicode</span></tt> type. Under the hood, Python represents Unicode strings as either
+16 or 32 bit integers, depending on how the Python interpreter was compiled.</p>
+<p>The <tt class="docutils literal"><span class="pre">unicode()</span></tt> constructor has the signature <tt class="docutils literal"><span class="pre">unicode(string[,</span> <span class="pre">encoding,</span>
+<span class="pre">errors])</span></tt>. All of its arguments should be 8-bit strings. The first argument is
+converted to Unicode using the specified encoding; if you leave off the
+encoding argument, the ASCII encoding is used for the conversion, so characters
+greater than 127 will be treated as errors:</p>
+<pre class="literal-block">
+>>> unicode('hello')
+u'hello'
+>>> s = unicode('hello')
+>>> type(s)
+&lt;type 'unicode'>
+>>> unicode('hello' + chr(255))
+Traceback (most recent call last):
+  File "&lt;stdin>", line 1, in ?
+UnicodeDecodeError: 'ascii' codec can't decode byte 0xff in position 6:
+                    ordinal not in range(128)
+</pre>
+<p>The <tt class="docutils literal"><span class="pre">errors</span></tt> argument specifies what to do if the string can't be decoded to
+ascii. Legal values for this argument are <tt class="docutils literal"><span class="pre">'strict'</span></tt> (raise a
+<tt class="docutils literal"><span class="pre">UnicodeDecodeError</span></tt> exception), <tt class="docutils literal"><span class="pre">'replace'</span></tt> (replace the character that
+can't be decoded with another one), or <tt class="docutils literal"><span class="pre">'ignore'</span></tt> (just leave the character
+out of the Unicode result).</p>
+<blockquote>
+<pre class="doctest-block">
+>>> unicode('\x80abc', errors='strict')
+Traceback (most recent call last):
+  File "&lt;stdin>", line 1, in ?
+UnicodeDecodeError: 'ascii' codec can't decode byte 0x80 in position 0:
+                    ordinal not in range(128)
+>>> unicode('\x80abc', errors='replace')
+u'\ufffdabc'
+>>> unicode('\x80abc', errors='ignore')
+u'abc'
+</pre>
+</blockquote>
+<p>It is important to understand the difference between <em>encoding</em> and <em>decoding</em>.
+Unicode strings are considered to be the Unicode code points but any
+representation of the Unicode string has to be encoded to something else, for
+example UTF-8 or ASCII. So when you are converting an ASCII or UTF-8 string to
+Unicode you are <em>decoding</em> it and when you are converting from Unicode to UTF-8
+or ASCII you are <em>encoding</em> it. This is why the error in the example above says
+that the ASCII codec cannot decode the byte <tt class="docutils literal"><span class="pre">0x80</span></tt> from ASCII to Unicode
+because it is not in the range(128) or 0-127. In fact <tt class="docutils literal"><span class="pre">0x80</span></tt> is hex for 128
+which the first number outside the ASCII range. However if we tell Python that
+the character <tt class="docutils literal"><span class="pre">0x80</span></tt> is encoded with the <tt class="docutils literal"><span class="pre">'latin-1'</span></tt>, <tt class="docutils literal"><span class="pre">'iso_8859_1'</span></tt> or
+<tt class="docutils literal"><span class="pre">'8859'</span></tt> character sets (which incidentally are different names for the same
+thing) we get the result we expected:</p>
+<textarea name="code" class="python">
+>>> unicode('\x80', encoding='latin-1')
+u'\x80'
+</textarea><div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">The character encodings Python supports are listed at
+<a href="http://docs.python.org/lib/standard-encodings.html" class="reference">http://docs.python.org/lib/standard-encodings.html</a></p>
+</div>
+<p>Unicode objects in Python have most of the same methods that normal Python
+strings provide. Python will try to use the <tt class="docutils literal"><span class="pre">'ascii'</span></tt> codec to convert
+strings to Unicode if you do an operation on both types:</p>
+<textarea name="code" class="python">
+>>> a = 'hello'
+>>> b = unicode(' world!')
+>>> print a + b
+u'hello world!'
+</textarea><p>You can encode a Unicode string using a particular encoding like this:</p>
+<textarea name="code" class="python">
+>>> u'Hello World!'.encode('UTF-8')
+'Hello World!'
+</textarea></div>
+<div class="section">
+<h2><a href="#id4" id="unicode-literals-in-python-source-code" name="unicode-literals-in-python-source-code" class="toc-backref">1.3???Unicode Literals in Python Source Code</a></h2>
+<p>In Python source code, Unicode literals are written as strings prefixed with
+the 'u' or 'U' character:</p>
+<textarea name="code" class="python">
+>>> u'abcdefghijk'
+>>> U'lmnopqrstuv'
+</textarea><p>You can also use <tt class="docutils literal"><span class="pre">"</span></tt>, <tt class="docutils literal"><span class="pre">"""`</span></tt> or <tt class="docutils literal"><span class="pre">'''</span></tt> versions too. For example:</p>
+<textarea name="code" class="python">
+>>> u"""This
+... is a really long
+... Unicode string"""
+</textarea><p>Specific code points can be written using the <tt class="docutils literal"><span class="pre">\u</span></tt> escape sequence, which is
+followed by four hex digits giving the code point. If you use <tt class="docutils literal"><span class="pre">\U</span></tt> instead
+you specify 8 hex digits instead of 4. Unicode literals can also use the same
+escape sequences as 8-bit strings, including <tt class="docutils literal"><span class="pre">\x</span></tt>, but <tt class="docutils literal"><span class="pre">\x</span></tt> only takes two
+hex digits so it can't express all the available code points. You can add
+characters to Unicode strings using the <tt class="docutils literal"><span class="pre">unichr()</span></tt> built-in function and find
+out what the ordinal is with <tt class="docutils literal"><span class="pre">ord()</span></tt>.</p>
+<p>Here is an example demonstrating the different alternatives:</p>
+<textarea name="code" class="python">
+>>> s = u"\x66\u0072\u0061\U0000006e" + unichr(231) + u"ais"
+>>> #     ^^^^ two-digit hex escape
+>>> #         ^^^^^^ four-digit Unicode escape
+>>> #                     ^^^^^^^^^^ eight-digit Unicode escape
+>>> for c in s:  print ord(c),
+...
+97 102 114 97 110 231 97 105 115
+>>> print s
+fran?ais
+</textarea><p>Using escape sequences for code points greater than 127 is fine in small doses
+but Python 2.4 and above support writing Unicode literals in any encoding as
+long as you declare the encoding being used by including a special comment as
+either the first or second line of the source file:</p>
+<textarea name="code" class="python">
+#!/usr/bin/env python
+# -*- coding: latin-1 -*-
+
+u = u'abcd?'
+print ord(u[-1])
+</textarea><p>If you don't include such a comment, the default encoding used will be ASCII.
+Versions of Python before 2.4 were Euro-centric and assumed Latin-1 as a
+default encoding for string literals; in Python 2.4, characters greater than
+127 still work but result in a warning. For example, the following program has
+no encoding declaration:</p>
+<textarea name="code" class="python">
+#!/usr/bin/env python
+u = u'abcd?'
+print ord(u[-1])
+</textarea><p>When you run it with Python 2.4, it will output the following warning:</p>
+<pre class="literal-block">
+sys:1: DeprecationWarning: Non-ASCII character '\xe9' in file testas.py on line
+2, but no encoding declared; see http://www.python.org/peps/pep-0263.html for de
+tails
+</pre>
+<p>and then the following output:</p>
+<pre class="literal-block">
+233
+</pre>
+<p>For real world use it is recommended that you use the UTF-8 encoding for your
+file but you must be sure that your text editor actually saves the file as
+UTF-8 otherwise the Python interpreter will try to parse UTF-8 characters but
+they will actually be stored as something else.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">Windows users who use the <a href="http://www.scintilla.org/SciTE.html" class="reference">SciTE</a>
+editor can specify the encoding of their file from the menu using the
+<tt class="docutils literal"><span class="pre">File->Encoding</span></tt>.</p>
+</div>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are working with Unicode in detail you might also be interested in
+the <tt class="docutils literal"><span class="pre">unicodedata</span></tt> module which can be used to find out Unicode properties
+such as a character's name, category, numeric value and the like.</p>
+</div>
+</div>
+<div class="section">
+<h2><a href="#id5" id="input-and-output" name="input-and-output" class="toc-backref">1.4???Input and Output</a></h2>
+<p>We now know how to use Unicode in Python source code but input and output can
+also be different using Unicode. Of course, some libraries natively support
+Unicode and if these libraries return Unicode objects you will not have to do
+anything special to support them. XML parsers and SQL databases frequently
+support Unicode for example.</p>
+<p>If you remember from the discussion earlier, Unicode data consists of code
+points. In order to send Unicode data via a socket or write it to a file you
+usually need to encode it to a series of bytes and then decode the data back to
+Unicode when reading it. You can of course perform the encoding manually
+reading a byte at the time but since encodings such as UTF-8 can have variable
+numbers of bytes per character it is usually much easier to use Python's
+built-in support in the form of the <tt class="docutils literal"><span class="pre">codecs</span></tt> module.</p>
+<p>The codecs module includes a version of the <tt class="docutils literal"><span class="pre">open()</span></tt> function that
+returns a file-like object that assumes the file's contents are in a specified
+encoding and accepts Unicode parameters for methods such as <tt class="docutils literal"><span class="pre">.read()</span></tt> and
+<tt class="docutils literal"><span class="pre">.write()</span></tt>.</p>
+<p>The function's parameters are open(filename, mode='rb', encoding=None,
+errors='strict', buffering=1). <tt class="docutils literal"><span class="pre">mode</span></tt> can be 'r', 'w', or 'a', just like the
+corresponding parameter to the regular built-in <tt class="docutils literal"><span class="pre">open()</span></tt> function. You can
+add a <tt class="docutils literal"><span class="pre">+</span></tt> character to update the file. <tt class="docutils literal"><span class="pre">buffering</span></tt> is similar to the
+standard function's parameter. <tt class="docutils literal"><span class="pre">encoding</span></tt> is a string giving the encoding to
+use, if not specified or specified as <tt class="docutils literal"><span class="pre">None</span></tt>, a regular Python file object
+that accepts 8-bit strings is returned.  Otherwise, a wrapper object is
+returned, and data written to or read from the wrapper object will be converted
+as needed. <tt class="docutils literal"><span class="pre">errors</span></tt> specifies the action for encoding errors and can be one
+of the usual values of <tt class="docutils literal"><span class="pre">'strict'</span></tt>, <tt class="docutils literal"><span class="pre">'ignore'</span></tt>, or <tt class="docutils literal"><span class="pre">'replace'</span></tt> which we
+saw right at the begining of this document when we were encoding strings in
+Python source files.</p>
+<p>Here is an example of how to read Unicode from a UTF-8 encoded file:</p>
+<textarea name="code" class="python">
+import codecs
+f = codecs.open('unicode.txt', encoding='utf-8')
+for line in f:
+    print repr(line)
+</textarea><p>It's also possible to open files in update mode, allowing both reading and writing:</p>
+<textarea name="code" class="python">
+f = codecs.open('unicode.txt', encoding='utf-8', mode='w+')
+f.write(u"\x66\u0072\u0061\U0000006e" + unichr(231) + u"ais")
+f.seek(0)
+print repr(f.readline()[:1])
+f.close()
+</textarea><p>Notice that we used the <tt class="docutils literal"><span class="pre">repr()</span></tt> function to display the Unicode data. This
+is very useful because if you tried to print the Unicode data directly, Python
+would need to encode it before it could be sent the console and depending on
+which characters were present and the character set used by the console, an
+error might be raised. This is avoided if you use <tt class="docutils literal"><span class="pre">repr()</span></tt>.</p>
+<p>The Unicode character <tt class="docutils literal"><span class="pre">U+FEFF</span></tt> is used as a byte-order mark or BOM, and is often
+written as the first character of a file in order to assist with auto-detection
+of the file's byte ordering. Some encodings, such as UTF-16, expect a BOM to be
+present at the start of a file, but with others such as UTF-8 it isn't necessary.</p>
+<p>When such an encoding is used, the BOM will be automatically written as the
+first character and will be silently dropped when the file is read. There are
+variants of these encodings, such as 'utf-16-le' and 'utf-16-be' for
+little-endian and big-endian encodings, that specify one particular byte
+ordering and don't skip the BOM.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">Some editors including SciTE will put a byte order mark (BOM) in the text
+file when saved as UTF-8, which is strange because UTF-8 doesn't need BOMs.</p>
+</div>
+</div>
+<div class="section">
+<h2><a href="#id6" id="unicode-filenames" name="unicode-filenames" class="toc-backref">1.5???Unicode Filenames</a></h2>
+<p>Most modern operating systems support the use of Unicode filenames. The
+filenames are transparently converted to the underlying filesystem encoding.
+The type of encoding depends on the operating system.</p>
+<p>On Windows 9x, the encoding is <tt class="docutils literal"><span class="pre">mbcs</span></tt>.</p>
+<p>On Mac OS X, the encoding is <tt class="docutils literal"><span class="pre">utf-8</span></tt>.</p>
+<p>On Unix, the encoding is the user's preference according to the
+result of nl_langinfo(CODESET), or None if the nl_langinfo(CODESET) failed.</p>
+<p>On Windows NT+, file names are Unicode natively, so no conversion is performed.
+getfilesystemencoding still returns <tt class="docutils literal"><span class="pre">mbcs</span></tt>, as this is the encoding that
+applications should use when they explicitly want to convert Unicode strings to
+byte strings that are equivalent when used as file names.</p>
+<p><tt class="docutils literal"><span class="pre">mbcs</span></tt> is a special encoding for Windows that effectively means "use
+whichever encoding is appropriate". In Python 2.3 and above you can find out
+the system encoding with <tt class="docutils literal"><span class="pre">sys.getfilesystemencoding()</span></tt>.</p>
+<p>Most file and directory functions and methods support Unicode. For example:</p>
+<textarea name="code" class="python">
+filename = u"\x66\u0072\u0061\U0000006e" + unichr(231) + u"ais"
+f = open(filename, 'w')
+f.write('Some data\n')
+f.close()
+</textarea><p>Other functions such as <tt class="docutils literal"><span class="pre">os.listdir()</span></tt> will return Unicode if you pass a
+Unicode argument and will try to return strings if you pass an ordinary 8 bit
+string. For example running this example as <tt class="docutils literal"><span class="pre">test.py</span></tt>:</p>
+<textarea name="code" class="python">
+filename = u"Sample " + unichar(5000)
+f = open(filename, 'w')
+f.close()
+
+import os
+print os.listdir('.')
+print os.listdir(u'.')
+</textarea><p>will produce the following output:</p>
+<blockquote>
+['Sample?', 'test.py']
+[u'Sampleu1388', u'test.py']</blockquote>
+</div>
+</div>
+<div class="section">
+<h1><a href="#id7" id="applying-this-to-web-programming" name="applying-this-to-web-programming" class="toc-backref">2???Applying this to Web Programming</a></h1>
+<p>So far we've seen how to use encoding in source files and seen how to decode
+text to Unicode and encode it back to text. We've also seen that Unicode
+objects can be manipulated in similar ways to strings and we've seen how to
+perform input and output operations on files. Next we are going to look at how
+best to use Unicode in a web app.</p>
+<p>The main rule is this:</p>
+<pre class="literal-block">
+Your application should use Unicode for all strings internally, decoding
+any input to Unicode as soon as it enters the application and encoding the
+Unicode to UTF-8 or another encoding only on output.
+</pre>
+<p>If you fail to do this you will find that <tt class="docutils literal"><span class="pre">UnicodeDecodeError</span></tt> s will start
+popping up in unexpected places when Unicode strings are used with normal 8-bit
+strings because Python's default encoding is ASCII and it will try to decode
+the text to ASCII and fail. It is always better to do any encoding or decoding
+at the edges of your application otherwise you will end up patching lots of
+different parts of your application unnecessarily as and when errors pop up.</p>
+<p>Unless you have a very good reason not to it is wise to use UTF-8 as the
+default encoding since it is so widely supported.</p>
+<p>The second rule is:</p>
+<pre class="literal-block">
+Always test your application with characters above 127 and above 255
+wherever possible.
+</pre>
+<p>If you fail to do this you might think your application is working fine, but as
+soon as your users do put in non-ASCII characters you will have problems.
+Using arabic is always a good test and www.google.ae is a good source of sample
+text.</p>
+<p>The third rule is:</p>
+<pre class="literal-block">
+Always do any checking of a string for illegal characters once it's in the
+form that will be used or stored, otherwise the illegal characters might be
+disguised.
+</pre>
+<p>For example, let's say you have a content management system that takes a
+Unicode filename, and you want to disallow paths with a '/' character. You
+might write this code:</p>
+<textarea name="code" class="python">
+def read_file(filename, encoding):
+    if '/' in filename:
+        raise ValueError("'/' not allowed in filenames")
+    unicode_name = filename.decode(encoding)
+    f = open(unicode_name, 'r')
+    # ... return contents of file ...
+</textarea><p>This is INCORRECT. If an attacker could specify the 'base64' encoding, they
+could pass <tt class="docutils literal"><span class="pre">L2V0Yy9wYXNzd2Q=</span></tt> which is the base-64 encoded form of the string
+<tt class="docutils literal"><span class="pre">'/etc/passwd'</span></tt> which is a file you clearly don't want an attacker to get
+hold of.  The above code looks for <tt class="docutils literal"><span class="pre">/</span></tt> characters in the encoded form and
+misses the dangerous character in the resulting decoded form.</p>
+<p>Those are the three basic rules so now we will look at some of the places you
+might want to perform Unicode decoding in a Pylons application.</p>
+<div class="section">
+<h2><a href="#id8" id="request-parameters" name="request-parameters" class="toc-backref">2.1???Request Parameters</a></h2>
+<p>Currently the Pylons input values come from <tt class="docutils literal"><span class="pre">request.params</span></tt> but these are
+not decoded to Unicode by default because not all input should be assumed to be
+Unicode data.</p>
+<p>If you would like However you can use the two functions below:</p>
+<textarea name="code" class="python">
+def decode_multi_dict(md, encoding="UTF-8", errors="strict"):
+    """Given a MultiDict, decode all its parts from the given encoding.
+
+    This modifies the MultiDict in place.
+
+    encoding, strict
+      These are passed to the decode function.
+
+    """
+    items = md.items()
+    md.clear()
+    for (k, v) in items:
+        md.add(k.decode(encoding, errors),
+               v.decode(encoding, errors))
+
+
+def decode_request(request, encoding="UTF-8", errors="strict"):
+    """Given a request object, decode GET and POST in place.
+
+    This implicitly takes care of params as well.
+
+    """
+    decode_multi_dict(request.GET, encoding, errors)
+    decode_multi_dict(request.POST, encoding, errors)
+</textarea><p>These can then be used as follows:</p>
+<textarea name="code" class="python">
+unicode_params = decode_request(request.params)
+</textarea><p>This code is discussed in <a href="http://pylonshq.com/project/pylonshq/ticket/135" class="reference">ticket 135</a> but shouldn't be used with
+file uploads since these shouldn't ordinarily be decoded to Unicode.</p>
+</div>
+<div class="section">
+<h2><a href="#id9" id="templating" name="templating" class="toc-backref">2.2???Templating</a></h2>
+<p>Pylons uses Myghty as its default templating language and Myghty 1.1 and above
+fully support Unicode. The Myghty documentation explains how to use Unicode and
+you at <a href="http://www.myghty.org/docs/unicode.myt" class="reference">http://www.myghty.org/docs/unicode.myt</a> but the important idea is that
+you can Unicode literals pretty much anywhere you can use normal 8-bit strings
+including in <tt class="docutils literal"><span class="pre">m.write()</span></tt> and <tt class="docutils literal"><span class="pre">m.comp()</span></tt>. You can also pass Unicode data to
+Pylons' <tt class="docutils literal"><span class="pre">render_response()</span></tt> and <tt class="docutils literal"><span class="pre">Response()</span></tt> callables.</p>
+<p>Any Unicode data output by Myghty is automatically decoded to whichever
+encoding you have chosen. The default is UTF-8 but you can choose which
+encoding to use by editing your project's <tt class="docutils literal"><span class="pre">config/environment.py</span></tt> file and
+adding an option like this:</p>
+<textarea name="code" class="python">
+# Add your own Myghty config options here, note that all config options will override
+# any Pylons config options
+
+myghty['output_encoding'] = 'UTF-8'
+</textarea><p>replacing <tt class="docutils literal"><span class="pre">UTF-8</span></tt> with the encoding you wish to use.</p>
+<p>If you need to disable Unicode support altogether you can set this:</p>
+<textarea name="code" class="python">
+myghty['disable_unicode'] = True
+</textarea><p>but again, you would have to have a good reason to want to do this.</p>
+</div>
+<div class="section">
+<h2><a href="#id10" id="output-encoding" name="output-encoding" class="toc-backref">2.3???Output Encoding</a></h2>
+<p>Web pages should be generated with a specific encoding, most likely UTF-8. At
+the very least, that means you should specify the following in the <tt class="docutils literal"><span class="pre">&lt;head></span></tt>
+section:</p>
+<pre class="literal-block">
+&lt;meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</pre>
+<p>You should also set the charset in the <tt class="docutils literal"><span class="pre">Content-Type</span></tt> header:</p>
+<textarea name="code" class="python">
+respones = Response(...)
+response.headers['Content-type'] = 'text/html; charset=utf-8'
+</textarea><p>If you specify that your output is UTF-8, generally the web browser will
+give you UTF-8. If you want the browser to submit data using a different
+character set, you can set the encoding by adding the <tt class="docutils literal"><span class="pre">accept-encoding</span></tt>
+tag to your form. Here is an example:</p>
+<pre class="literal-block">
+&lt;form accept-encoding="US-ASCII" ...>
+</pre>
+<p>However, be forewarned that if the user tries to give you non-ASCII
+text, then:</p>
+<blockquote>
+<ul class="simple">
+<li>Firefox will translate the non-ASCII text into HTML entities.</li>
+<li>IE will ignore your suggested encoding and give you UTF-8 anyway.</li>
+</ul>
+</blockquote>
+<p>The lesson to be learned is that if you output UTF-8, you had better be
+prepared to accept UTF-8 by decoding the data in <tt class="docutils literal"><span class="pre">request.params</span></tt> as
+described in the section above entitled "Request Parameters".</p>
+<p>Another technique which is sometimes used to determine the character set is to
+use an algorithm to analyse the input and guess the encoding based on
+probabilities.</p>
+<p>For instance, if you get a file, and you don't know what encoding it is encoded
+in, you can often rename the file with a .txt extension and then try to open it
+in Firefox.  Then you can use the "View->Character Encoding" menu to try to
+auto-detect the encoding.</p>
+</div>
+<div class="section">
+<h2><a href="#id11" id="databases" name="databases" class="toc-backref">2.4???Databases</a></h2>
+<p>Your database driver should automatically convert from Unicode objects to a
+particular charset when writing and back again when reading. Again it is normal
+to use UTF-8 which is well supported.</p>
+<p>You should check your database's documentation for information on how it handles
+Unicode.</p>
+<p>For example MySQL's Unicode documentation is here
+<a href="http://dev.mysql.com/doc/refman/5.0/en/charset-unicode.html" class="reference">http://dev.mysql.com/doc/refman/5.0/en/charset-unicode.html</a></p>
+<p>Also note that you need to consider both the encoding of the database
+and the encoding used by the database driver.</p>
+<p>If you're using MySQL together with SQLAlchemy, see the following, as
+there are some bugs in MySQLdb that you'll need to work around:</p>
+<p><a href="http://www.mail-archive.com/sqlalchemy at googlegroups.com/msg00366.html" class="reference">http://www.mail-archive.com/sqlalchemy at googlegroups.com/msg00366.html</a></p>
+</div>
+</div>
+<div class="section">
+<h1><a href="#id12" id="internationalization-and-localization" name="internationalization-and-localization" class="toc-backref">3???Internationalization and Localization</a></h1>
+<p>By now you should have a good idea of what Unicode is, how to use it in Python
+and which areas of you application need to pay specific attention to decoding and
+encoding Unicode data.</p>
+<p>This final section will look at the issue of making your application work with
+multiple languages.</p>
+<div class="section">
+<h2><a href="#id13" id="getting-started" name="getting-started" class="toc-backref">3.1???Getting Started</a></h2>
+<p>Everywhere in your code where you want strings to be available in different
+languages you wrap them in the <tt class="docutils literal"><span class="pre">_()</span></tt> function. There
+are also a number of other translation functions which are documented in the API reference at
+<a href="http://pylonshq.com/docs/module-pylons.i18n.translation.html" class="reference">http://pylonshq.com/docs/module-pylons.i18n.translation.html</a></p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">The <tt class="docutils literal"><span class="pre">_()</span></tt> function is a reference to the <tt class="docutils literal"><span class="pre">ugettext()</span></tt> function.
+<tt class="docutils literal"><span class="pre">_()</span></tt> is a convention for marking text to be translated and saves on keystrokes.
+<tt class="docutils literal"><span class="pre">ugettext()</span></tt> is the Unicode version of <tt class="docutils literal"><span class="pre">gettext()</span></tt>.</p>
+</div>
+<p>In our example we want the string <tt class="docutils literal"><span class="pre">'Hello'</span></tt> to appear in three different
+languages: English, French and Spanish. We also want to display the word
+<tt class="docutils literal"><span class="pre">'Hello'</span></tt> in the default language. We'll then go on to use some pural words
+too.</p>
+<p>Lets call our project <tt class="docutils literal"><span class="pre">translate_demo</span></tt>:</p>
+<pre class="literal-block">
+paster create --template=pylons translate_demo
+</pre>
+<p>Now lets add a friendly controller that says hello:</p>
+<pre class="literal-block">
+cd translate_demo
+paster controller hello
+</pre>
+<p>Edit <tt class="docutils literal"><span class="pre">controllers/hello.py</span></tt> controller to look like this making use of the
+<tt class="docutils literal"><span class="pre">_()</span></tt> function everywhere where the string <tt class="docutils literal"><span class="pre">Hello</span></tt> appears:</p>
+<textarea name="code" class="python">
+from translate_demo.lib.base import *
+
+class HelloController(BaseController):
+
+    def index(self):
+        resp = Response()
+        resp.write('Default: %s&lt;br />' % _('Hello'))
+        for lang in ['fr','en','es']:
+            h.set_lang(lang)
+            resp.write("%s: %s&lt;br />" % (h.get_lang(), _('Hello')))
+        return resp
+</textarea><p>When writing your controllers it is important not to piece sentences together manually because
+certain languages might need to invert the grammars. As an example this is bad:</p>
+<textarea name="code" class="python">
+# BAD!
+msg = _("He told her ")
+msg += _("not to go outside.")
+</textarea><p>but this is perfectly acceptable:</p>
+<textarea name="code" class="python">
+# GOOD
+msg = _("He told her not to go outside")
+</textarea><p>The controller has now been internationalized but it will raise a <tt class="docutils literal"><span class="pre">LanguageError</span></tt>
+until we have specified the alternative languages.</p>
+<p>Pylons uses <a href="http://www.gnu.org/software/gettext/" class="reference">GNU gettext</a> to handle
+internationalization. GNU gettext use three types of files in the
+translation framework.</p>
+<p>POT (Portable Object Template) files</p>
+<blockquote>
+The first step in the localization process. A program is used to search through
+your project's source code and pick out every string passed to one of the
+translation functions, such as <tt class="docutils literal"><span class="pre">_()</span></tt>. This list is put together in a
+specially-formatted template file that will form the basis of all
+translations. This is the <tt class="docutils literal"><span class="pre">.pot</span></tt> file.</blockquote>
+<p>PO (Portable Object) files</p>
+<blockquote>
+The second step in the localization process. Using the POT file as a template,
+the list of messages are translated and saved as a <tt class="docutils literal"><span class="pre">.po</span></tt> file.</blockquote>
+<p>MO (Machine Object) files</p>
+<blockquote>
+The final step in the localization process. The PO file is run through a
+program that turns it into an optimized machine-readable binary file, which is
+the <tt class="docutils literal"><span class="pre">.mo</span></tt> file. Compiling the translations to machine code makes the
+localized program much faster in retrieving the translations while it is
+running.</blockquote>
+<p>Versions of Pylons prior to 0.9.4 came with a setuptools extension to help with
+the extraction of strings and production of a <tt class="docutils literal"><span class="pre">.mo</span></tt> file. The implementation
+did not support Unicode nor the ungettext function and was therfore dropped in
+Python 0.9.4.</p>
+<p>You will therefore need to use an external program to perform these tasks.  You
+may use whichever you prefer but <tt class="docutils literal"><span class="pre">xgettext</span></tt> is highly recommended. Python's
+gettext utility has some bugs, especially regarding plurals.</p>
+<p>Here are some compatible tools and projects:</p>
+<p>The Rosetta Project (<a href="https://launchpad.ubuntu.com/rosetta/" class="reference">https://launchpad.ubuntu.com/rosetta/</a>)</p>
+<blockquote>
+The Ubuntu Linux project has a web site that allows you to translate
+messages without even looking at a PO or POT file, and export directly to a MO.</blockquote>
+<p>poEdit (<a href="http://www.poedit.org/" class="reference">http://www.poedit.org/</a>)</p>
+<blockquote>
+An open source program for Windows and UNIX/Linux which provides an easy-to-use
+GUI for editing PO files and generating MO files.</blockquote>
+<p>KBabel (<a href="http://i18n.kde.org/tools/kbabel/" class="reference">http://i18n.kde.org/tools/kbabel/</a>)</p>
+<blockquote>
+Another open source PO editing program for KDE.</blockquote>
+<p>GNU Gettext (<a href="http://www.gnu.org/software/gettext/" class="reference">http://www.gnu.org/software/gettext/</a>)</p>
+<blockquote>
+The official Gettext tools package contains command-line tools for creating
+POTs, manipulating POs, and generating MOs. For those comfortable with a
+command shell.</blockquote>
+<p>As an example we will quickly discuss the use of poEdit which is cross platform
+and has a GUI which makes it easier to get started with.</p>
+<p>To use poEdit with the <tt class="docutils literal"><span class="pre">translate_demo</span></tt> you would do the following:</p>
+<ol class="arabic simple">
+<li>Download and install poEdit.</li>
+<li>A dialog pops up. Fill in <em>all</em> the fields you can on the <tt class="docutils literal"><span class="pre">Project</span> <span class="pre">Info</span></tt> tab, enter the path to your project on the <tt class="docutils literal"><span class="pre">Paths</span></tt> tab (ie <tt class="docutils literal"><span class="pre">/path/to/translate_demo</span></tt>) and enter the following keywords on separate lines on the <tt class="docutils literal"><span class="pre">keywords</span></tt> tab: <tt class="docutils literal"><span class="pre">_</span></tt>, <tt class="docutils literal"><span class="pre">N_</span></tt>, <tt class="docutils literal"><span class="pre">ugettext</span></tt>, <tt class="docutils literal"><span class="pre">gettext</span></tt>, <tt class="docutils literal"><span class="pre">ngettext</span></tt>, <tt class="docutils literal"><span class="pre">ungettext</span></tt>.</li>
+<li>Click OK</li>
+</ol>
+<p>poEdit will search your source tree and find all the strings you have marked
+up. You can then enter your translations in whatever charset you chose in
+the project info tab. UTF-8 is a good choice.</p>
+<p>Finally, after entering your translations you then save the catalog and rename
+the <tt class="docutils literal"><span class="pre">.mo</span></tt> file produced to <tt class="docutils literal"><span class="pre">translate_demo.mo</span></tt> and put it in the
+<tt class="docutils literal"><span class="pre">translate_demo/i18n/es/LC_MESSAGES</span></tt> directory or whatever is appropriate for
+your translation.</p>
+<p>You will need to repeat the process of creating a <tt class="docutils literal"><span class="pre">.mo</span></tt> file for the <tt class="docutils literal"><span class="pre">fr</span></tt>,
+<tt class="docutils literal"><span class="pre">es</span></tt> and <tt class="docutils literal"><span class="pre">en</span></tt> translations.</p>
+<p>The relevant lines from <tt class="docutils literal"><span class="pre">i18n/en/LC_MESSAGES/translate_demo.po</span></tt> look like this:</p>
+<pre class="literal-block">
+#: translate_demo\controllers\hello.py:6 translate_demo\controllers\hello.py:9
+msgid "Hello"
+msgstr "Hello"
+</pre>
+<p>The relevant lines from <tt class="docutils literal"><span class="pre">i18n/es/LC_MESSAGES/translate_demo.po</span></tt> look like this:</p>
+<pre class="literal-block">
+#: translate_demo\controllers\hello.py:6 translate_demo\controllers\hello.py:9
+msgid "Hello"
+msgstr "?Hola!"
+</pre>
+<p>The relevant lines from <tt class="docutils literal"><span class="pre">i18n/fr/LC_MESSAGES/translate_demo.po</span></tt> look like this:</p>
+<pre class="literal-block">
+#: translate_demo\controllers\hello.py:6 translate_demo\controllers\hello.py:9
+msgid "Hello"
+msgstr "Bonjour"
+</pre>
+<p>Whichever tools you use you should end up with an <tt class="docutils literal"><span class="pre">i18n</span></tt> directory that looks
+like this when you have finished:</p>
+<pre class="literal-block">
+i18n/en/LC_MESSAGES/translate_demo.po
+i18n/en/LC_MESSAGES/translate_demo.mo
+i18n/es/LC_MESSAGES/translate_demo.po
+i18n/es/LC_MESSAGES/translate_demo.mo
+i18n/fr/LC_MESSAGES/translate_demo.po
+i18n/fr/LC_MESSAGES/translate_demo.mo
+</pre>
+</div>
+<div class="section">
+<h2><a href="#id14" id="testing-the-application" name="testing-the-application" class="toc-backref">3.2???Testing the Application</a></h2>
+<p>Start the server with the following command:</p>
+<pre class="literal-block">
+paster serve --reload development.ini
+</pre>
+<p>Test your controller by visiting <a href="http://localhost:5000/hello" class="reference">http://localhost:5000/hello</a>. You should see
+the following output:</p>
+<pre class="literal-block">
+Default: Hello
+fr: Bonjour
+en: Hello
+es: ?Hola!
+</pre>
+<p>You can now set the language used in a controller on the fly.</p>
+<p>For example this could be used to allow a user to set which language they
+wanted your application to work in. You could save the value to the session
+object:</p>
+<textarea name="code" class="python">
+session['lang'] = 'en'
+</textarea><p>then on each controller call the language to be used could be read from the
+session and set in your controller's <tt class="docutils literal"><span class="pre">__before__()</span></tt> method so that the pages
+remained in the same language that was previously set:</p>
+<textarea name="code" class="python">
+def __before__(self, action):
+    if session.has_key('lang'):
+        h.set_lang(session['lang'])
+</textarea><p>One more useful thing to be able to do is to set the default language to be
+used in the configuration file. Just add a <tt class="docutils literal"><span class="pre">lang</span></tt> variable together with the
+code of the language you wanted to use in your <tt class="docutils literal"><span class="pre">development.ini</span></tt> file. For
+example to set the default language to Spanish you would add <tt class="docutils literal"><span class="pre">lang</span> <span class="pre">=</span> <span class="pre">es</span></tt> to
+your <tt class="docutils literal"><span class="pre">development.ini</span></tt>. The relevant part from the file might look something
+like this:</p>
+<textarea name="code" class="pasteini">
+[app:main]
+use = egg:translate_demo
+lang = es
+</textarea><p>If you are running the server with the <tt class="docutils literal"><span class="pre">--reload</span></tt> option the server will
+automatically restart if you change the <tt class="docutils literal"><span class="pre">development.ini</span></tt> file. Otherwise
+restart the server manually and the output would this time be as follows:</p>
+<pre class="literal-block">
+Default: ?Hola!
+fr: Bonjour
+en: Hello
+es: ?Hola!
+</pre>
+</div>
+<div class="section">
+<h2><a href="#id15" id="missing-translations" name="missing-translations" class="toc-backref">3.3???Missing Translations</a></h2>
+<p>If your code calls <tt class="docutils literal"><span class="pre">_()</span></tt> with a string that doesn't exist in your language
+catalogue, the string passed to <tt class="docutils literal"><span class="pre">_()</span></tt> is returned instead.</p>
+<p>Modify the last line of the hello controller to look like this:</p>
+<textarea name="code" class="python">
+resp.write("%s: %s %s&lt;br />" % (h.get_lang(), _('Hello'), _('World!')))
+</textarea><div class="warning">
+<p class="first admonition-title">Warning</p>
+<p class="last">Of course, in real life breaking up sentences in this way is very dangerous because some
+grammars might require the order of the words to be different.</p>
+</div>
+<p>If you run the example again the output will be:</p>
+<pre class="literal-block">
+Default: ?Hola!
+fr: Bonjour World!
+en: Hello World!
+es: ?Hola! World!
+</pre>
+<p>This is because we never provided a translation for the string <tt class="docutils literal"><span class="pre">'World!'</span></tt> so
+the string itself is used.</p>
+</div>
+<div class="section">
+<h2><a href="#id16" id="translations-within-templates" name="translations-within-templates" class="toc-backref">3.4???Translations Within Templates</a></h2>
+<p>You can also use the <tt class="docutils literal"><span class="pre">_()</span></tt> function within templates in exactly the same way
+you do in code. For example:</p>
+<textarea name="code" class="html">
+&lt;% _('Hello') %>
+</textarea><p>would produce the string <tt class="docutils literal"><span class="pre">'Hello'</span></tt> in the language you had set.</p>
+<p>There is one complication though. gettext's <tt class="docutils literal"><span class="pre">xgettext</span></tt> command can only extract
+strings that need translating from Python code in <tt class="docutils literal"><span class="pre">.py</span></tt> files. This means
+that if you write <tt class="docutils literal"><span class="pre">_('Hello')</span></tt> in a template such as a Myghty template,
+<tt class="docutils literal"><span class="pre">xgettext</span></tt> will not find the string <tt class="docutils literal"><span class="pre">'Hello'</span></tt> as one which needs
+translating.</p>
+<p>As long as <tt class="docutils literal"><span class="pre">xgettext</span></tt> can find a string marked for translation with one
+of the translation functions and defined in Python code in your project
+filesystem it will manage the translation when the same string is defined in a
+Myghty template and marked for translation.</p>
+<p>One solution to ensure all strings are picked up for translation is to create a
+file in <tt class="docutils literal"><span class="pre">lib</span></tt> with an appropriate filename, <tt class="docutils literal"><span class="pre">i18n.py</span></tt> for example, and then
+add a list of all the strings which appear in your templates so that your
+translation tool can then extract the strings in <tt class="docutils literal"><span class="pre">lib/i18n.py</span></tt> for
+translation and use the translated versions in your templates as well.</p>
+<p>For example if you wanted to ensure the translated string <tt class="docutils literal"><span class="pre">'Good</span> <span class="pre">Morning'</span></tt>
+was available in all templates you could create a <tt class="docutils literal"><span class="pre">lib/i18n.py</span></tt> file that
+looked something like this:</p>
+<textarea name="code" class="python">
+from base import _
+_('Good Morning')
+</textarea><p>This approach requires quite a lot of work and is rather fragile. The best
+solution if you are using a templating system such as Myghty or Cheetah which
+uses compiled Python files is to use a Makefile to ensure that every template
+is compiled to Python before running the extraction tool to make sure that
+every template is scanned.</p>
+<p>Of course, if your cache directory is in the default location or elsewhere
+within your project's filesystem, you will probably find that all templates
+have been compiled as Python files during the course of the development process.
+This means that your tool's extraction command will successfully pick up
+strings to translate from the cached files anyway.</p>
+<p>You may also find that your extraction tool is capable of extracting the
+strings correctly from the template anyway, particularly if the templating
+langauge is quite similar to Python. It is best not to rely on this though.</p>
+</div>
+<div class="section">
+<h2><a href="#id17" id="producing-a-python-egg" name="producing-a-python-egg" class="toc-backref">3.5???Producing a Python Egg</a></h2>
+<p>Finally you can produce an egg of your project which includes the translation
+files like this:</p>
+<pre class="literal-block">
+python setup.py bdist_egg
+</pre>
+<p>The <tt class="docutils literal"><span class="pre">setup.py</span></tt> automatically includes the <tt class="docutils literal"><span class="pre">.mo</span></tt> language catalogs your
+application needs so that your application can be distributed as an egg. This
+is done with the following line in your <tt class="docutils literal"><span class="pre">setup.py</span></tt> file:</p>
+<pre class="literal-block">
+package_data={'translate_demo': ['i18n/*/LC_MESSAGES/*.mo']},
+</pre>
+<p>Internationalization support is zip safe so your application can be run
+directly from the egg without the need for <tt class="docutils literal"><span class="pre">easy_install</span></tt> to extract it.</p>
+</div>
+<div class="section">
+<h2><a href="#id18" id="plural-forms" name="plural-forms" class="toc-backref">3.6???Plural Forms</a></h2>
+<p>Pylons also defines <tt class="docutils literal"><span class="pre">ungettext()</span></tt> and <tt class="docutils literal"><span class="pre">ngettext()</span></tt> functions which can be imported
+from <tt class="docutils literal"><span class="pre">pylons.i18n</span></tt>. They are designed for internationalizing plural words and can be
+used as follows:</p>
+<textarea name="code" class="python">
+from pylons.i18n import ungettext
+
+ungettext(
+    'There is %(num)d file here',
+    'There are %(num)d files here',
+    n
+) % {'num': n}
+</textarea><p>If you wish to use plural forms in your application you need to add the appropriate
+headers to the <tt class="docutils literal"><span class="pre">.po</span></tt> files for the language you are using. You can read more about
+this at <a href="http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150" class="reference">http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150</a></p>
+<p>One thing to keep in mind is that other languages don't have the same
+plural forms as English.  While English only has 2 pulral forms, singular and
+plural, Slovenian has 4!  That means that you must use gettext's
+support for pluralization if you hope to get pluralization right.
+Specifically, the following will not work:</p>
+<textarea name="code" class="python">
+# BAD!
+    if n == 1:
+        msg = _("There was no dog.")
+    else:
+        msg = _("There were no dogs.")
+</textarea></div>
+</div>
+<div class="section">
+<h1><a href="#id19" id="summary" name="summary" class="toc-backref">4???Summary</a></h1>
+<p>Hopefully you now understand the history of Unicode, how to use it in Python
+and where to apply Unicode encoding and decoding in a Pylons application. You
+should also be able to use Unicode in your web app remembering the basic rule to
+use UTF-8 to talk to the world, do the encode and decode at the edge of your
+application.</p>
+<p>You should also be able to internationalize and then localize your application
+using Pylons' support for GNU gettext.</p>
+</div>
+<div class="section">
+<h1><a href="#id20" id="further-reading" name="further-reading" class="toc-backref">5???Further Reading</a></h1>
+<p>This information is based partly on the following articles which can be
+consulted for further information.:</p>
+<p><a href="http://www.joelonsoftware.com/articles/Unicode.html" class="reference">http://www.joelonsoftware.com/articles/Unicode.html</a></p>
+<p><a href="http://www.amk.ca/python/howto/unicode" class="reference">http://www.amk.ca/python/howto/unicode</a></p>
+<p><a href="http://en.wikipedia.org/wiki/Internationalization" class="reference">http://en.wikipedia.org/wiki/Internationalization</a></p>
+<p>Please feel free to report any mistakes to the Pylons mailing list or to the
+author. Any corrections or clarifications would be gratefully received.</p>
+</div>
+
+</div>
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/modtest.html b/lib/mako-0.7.2/test/templates/modtest.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/modtest.html
@@ -0,0 +1,1 @@
+this is a test
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/othersubdir/foo.html b/lib/mako-0.7.2/test/templates/othersubdir/foo.html
new file mode 100644
diff --git a/lib/mako-0.7.2/test/templates/read_unicode.html b/lib/mako-0.7.2/test/templates/read_unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/read_unicode.html
@@ -0,0 +1,10 @@
+<% 
+try:
+    file_content = open(path)
+except:
+    raise "Should never execute here"
+doc_content = ''.join(file_content.readlines())
+file_content.close()
+%>
+
+${unicode(doc_content, encoding='utf-8')}
diff --git a/lib/mako-0.7.2/test/templates/read_unicode_py3k.html b/lib/mako-0.7.2/test/templates/read_unicode_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/read_unicode_py3k.html
@@ -0,0 +1,10 @@
+<% 
+try:
+    file_content = open(path, encoding='utf-8', errors='ignore')
+except:
+    raise "Should never execute here"
+doc_content = ''.join(file_content.readlines())
+file_content.close()
+%>
+
+${bytes(doc_content, encoding='utf-8')}
diff --git a/lib/mako-0.7.2/test/templates/runtimeerr.html b/lib/mako-0.7.2/test/templates/runtimeerr.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/runtimeerr.html
@@ -0,0 +1,4 @@
+<%
+    print y
+    y = 10
+%>
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/runtimeerr_py3k.html b/lib/mako-0.7.2/test/templates/runtimeerr_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/runtimeerr_py3k.html
@@ -0,0 +1,4 @@
+<%
+    print(y)
+    y = 10
+%>
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/subdir/foo/modtest.html.py b/lib/mako-0.7.2/test/templates/subdir/foo/modtest.html.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/subdir/foo/modtest.html.py
@@ -0,0 +1,25 @@
+from mako import runtime, filters, cache
+UNDEFINED = runtime.UNDEFINED
+__M_dict_builtin = dict
+__M_locals_builtin = locals
+_magic_number = 5
+_modified_time = 1267565427.799504
+_template_filename='/Users/classic/dev/mako/test/templates/subdir/modtest.html'
+_template_uri='/subdir/modtest.html'
+_template_cache=cache.Cache(__name__, _modified_time)
+_source_encoding=None
+_exports = []
+
+
+def render_body(context,**pageargs):
+    context.caller_stack._push_frame()
+    try:
+        __M_locals = __M_dict_builtin(pageargs=pageargs)
+        __M_writer = context.writer()
+        # SOURCE LINE 1
+        __M_writer(u'this is a test')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
diff --git a/lib/mako-0.7.2/test/templates/subdir/incl.html b/lib/mako-0.7.2/test/templates/subdir/incl.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/subdir/incl.html
@@ -0,0 +1,2 @@
+
+    this is include 2
diff --git a/lib/mako-0.7.2/test/templates/subdir/index.html b/lib/mako-0.7.2/test/templates/subdir/index.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/subdir/index.html
@@ -0,0 +1,3 @@
+
+    this is sub index
+    <%include file="incl.html"/>
diff --git a/lib/mako-0.7.2/test/templates/subdir/modtest.html b/lib/mako-0.7.2/test/templates/subdir/modtest.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/subdir/modtest.html
@@ -0,0 +1,1 @@
+this is a test
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/unicode.html b/lib/mako-0.7.2/test/templates/unicode.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode.html
@@ -0,0 +1,2 @@
+## -*- coding: utf-8 -*-
+Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/unicode_arguments.html b/lib/mako-0.7.2/test/templates/unicode_arguments.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_arguments.html
@@ -0,0 +1,10 @@
+# coding: utf-8
+
+<%def name="my_def(x)">
+    x is: ${x}
+</%def>
+
+${my_def(u'dr?le de petite voix m?a r?veill?')}
+<%self:my_def x='dr?le de petite voix m?a r?veill?'/>
+<%self:my_def x="${u'dr?le de petite voix m?a r?veill?'}"/>
+<%call expr="my_def(u'dr?le de petite voix m?a r?veill?')"/>
diff --git a/lib/mako-0.7.2/test/templates/unicode_arguments_py3k.html b/lib/mako-0.7.2/test/templates/unicode_arguments_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_arguments_py3k.html
@@ -0,0 +1,10 @@
+# coding: utf-8
+
+<%def name="my_def(x)">
+    x is: ${x}
+</%def>
+
+${my_def('dr?le de petite voix m?a r?veill?')}
+<%self:my_def x='dr?le de petite voix m?a r?veill?'/>
+<%self:my_def x="${'dr?le de petite voix m?a r?veill?'}"/>
+<%call expr="my_def('dr?le de petite voix m?a r?veill?')"/>
diff --git a/lib/mako-0.7.2/test/templates/unicode_code.html b/lib/mako-0.7.2/test/templates/unicode_code.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_code.html
@@ -0,0 +1,7 @@
+## -*- coding: utf-8 -*-
+<%
+    x = u"dr?le de petite voix m?a r?veill?."
+%>
+% if x==u"dr?le de petite voix m?a r?veill?.":
+    hi, ${x}
+% endif
diff --git a/lib/mako-0.7.2/test/templates/unicode_code_py3k.html b/lib/mako-0.7.2/test/templates/unicode_code_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_code_py3k.html
@@ -0,0 +1,7 @@
+## -*- coding: utf-8 -*-
+<%
+    x = "dr?le de petite voix m?a r?veill?."
+%>
+% if x=="dr?le de petite voix m?a r?veill?.":
+    hi, ${x}
+% endif
diff --git a/lib/mako-0.7.2/test/templates/unicode_expr.html b/lib/mako-0.7.2/test/templates/unicode_expr.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_expr.html
@@ -0,0 +1,2 @@
+## -*- coding: utf-8 -*-
+${u"Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"}
diff --git a/lib/mako-0.7.2/test/templates/unicode_expr_py3k.html b/lib/mako-0.7.2/test/templates/unicode_expr_py3k.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_expr_py3k.html
@@ -0,0 +1,2 @@
+## -*- coding: utf-8 -*-
+${"Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"}
diff --git a/lib/mako-0.7.2/test/templates/unicode_runtime_error.html b/lib/mako-0.7.2/test/templates/unicode_runtime_error.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_runtime_error.html
@@ -0,0 +1,2 @@
+## -*- coding: utf-8 -*-
+<% print 'Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?' + int(5/0) %>
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/templates/unicode_syntax_error.html b/lib/mako-0.7.2/test/templates/unicode_syntax_error.html
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/templates/unicode_syntax_error.html
@@ -0,0 +1,2 @@
+## -*- coding: utf-8 -*-
+<% print 'Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ? %>
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/test_ast.py b/lib/mako-0.7.2/test/test_ast.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_ast.py
@@ -0,0 +1,322 @@
+import unittest
+
+from mako import ast, exceptions, pyparser, util
+from test import eq_
+
+exception_kwargs = {
+    'source': '',
+    'lineno': 0,
+    'pos': 0,
+    'filename': ''}
+
+class AstParseTest(unittest.TestCase):
+
+    def test_locate_identifiers(self):
+        """test the location of identifiers in a python code string"""
+        code = """
+a = 10
+b = 5
+c = x * 5 + a + b + q
+(g,h,i) = (1,2,3)
+[u,k,j] = [4,5,6]
+foo.hoho.lala.bar = 7 + gah.blah + u + blah
+for lar in (1,2,3):
+    gh = 5
+    x = 12
+("hello world, ", a, b)
+("Another expr", c)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(
+            parsed.declared_identifiers,
+            set(['a', 'b', 'c', 'g', 'h', 'i', 'u',
+                'k', 'j', 'gh', 'lar', 'x'])
+        )
+        eq_(
+            parsed.undeclared_identifiers,
+            set(['x', 'q', 'foo', 'gah', 'blah'])
+        )
+
+        parsed = ast.PythonCode("x + 5 * (y-z)", **exception_kwargs)
+        assert parsed.undeclared_identifiers == set(['x', 'y', 'z'])
+        assert parsed.declared_identifiers == set()
+
+    def test_locate_identifiers_2(self):
+        code = """
+import foobar
+from lala import hoho, yaya
+import bleep as foo
+result = []
+data = get_data()
+for x in data:
+    result.append(x+7)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.undeclared_identifiers, set(['get_data']))
+        eq_(
+            parsed.declared_identifiers,
+            set(['result', 'data', 'x', 'hoho', 'foobar', 'foo', 'yaya'])
+        )
+
+    def test_locate_identifiers_3(self):
+        """test that combination assignment/expressions
+        of the same identifier log the ident as 'undeclared'"""
+        code = """
+x = x + 5
+for y in range(1, y):
+    ("hi",)
+[z for z in range(1, z)]
+(q for q in range (1, q))
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(
+            parsed.undeclared_identifiers,
+            set(['x', 'y', 'z', 'q', 'range'])
+        )
+
+    def test_locate_identifiers_4(self):
+        code = """
+x = 5
+(y, )
+def mydef(mydefarg):
+    print("mda is", mydefarg)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.undeclared_identifiers, set(['y']))
+        eq_(parsed.declared_identifiers, set(['mydef', 'x']))
+
+    def test_locate_identifiers_5(self):
+        code = """
+try:
+    print(x)
+except:
+    print(y)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.undeclared_identifiers, set(['x', 'y']))
+
+    def test_locate_identifiers_6(self):
+        code = """
+def foo():
+    return bar()
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.undeclared_identifiers, set(['bar']))
+
+        code = """
+def lala(x, y):
+    return x, y, z
+print(x)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.undeclared_identifiers, set(['z', 'x']))
+        eq_(parsed.declared_identifiers, set(['lala']))
+
+        code = """
+def lala(x, y):
+    def hoho():
+        def bar():
+            z = 7
+print(z)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.undeclared_identifiers, set(['z']))
+        eq_(parsed.declared_identifiers, set(['lala']))
+
+    def test_locate_identifiers_7(self):
+        code = """
+import foo.bar
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['foo']))
+        eq_(parsed.undeclared_identifiers, set())
+
+    def test_locate_identifiers_8(self):
+        code = """
+class Hi(object):
+    foo = 7
+    def hoho(self):
+        x = 5
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['Hi']))
+        eq_(parsed.undeclared_identifiers, set())
+
+    def test_locate_identifiers_9(self):
+        code = """
+    ",".join([t for t in ("a", "b", "c")])
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['t']))
+        eq_(parsed.undeclared_identifiers, set(['t']))
+
+        code = """
+    [(val, name) for val, name in x]
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['val', 'name']))
+        eq_(parsed.undeclared_identifiers, set(['val', 'name', 'x']))
+
+    def test_locate_identifiers_10(self):
+        code = """
+lambda q: q + 5
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set())
+        eq_(parsed.undeclared_identifiers, set())
+
+    def test_locate_identifiers_11(self):
+        code = """
+def x(q):
+    return q + 5
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['x']))
+        eq_(parsed.undeclared_identifiers, set())
+
+
+    def test_locate_identifiers_12(self):
+        code = """
+def foo():
+    s = 1
+    def bar():
+        t = s
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['foo']))
+        eq_(parsed.undeclared_identifiers, set())
+
+    def test_locate_identifiers_13(self):
+        code = """
+def foo():
+    class Bat(object):
+        pass
+    Bat
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['foo']))
+        eq_(parsed.undeclared_identifiers, set())
+
+    def test_locate_identifiers_14(self):
+        code = """
+def foo():
+    class Bat(object):
+        pass
+    Bat
+
+print(Bat)
+"""
+        parsed = ast.PythonCode(code, **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['foo']))
+        eq_(parsed.undeclared_identifiers, set(['Bat']))
+
+    def test_no_global_imports(self):
+        code = """
+from foo import *
+import x as bar
+"""
+        self.assertRaises(exceptions.CompileException,
+            ast.PythonCode, code, **exception_kwargs)
+
+    def test_python_fragment(self):
+        parsed = ast.PythonFragment("for x in foo:", **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['x']))
+        eq_(parsed.undeclared_identifiers, set(['foo']))
+
+        parsed = ast.PythonFragment("try:", **exception_kwargs)
+
+        if util.py3k:
+            parsed = ast.PythonFragment(
+                        "except MyException as e:", **exception_kwargs)
+        else:
+            parsed = ast.PythonFragment(
+                        "except MyException, e:", **exception_kwargs)
+        eq_(parsed.declared_identifiers, set(['e']))
+        eq_(parsed.undeclared_identifiers, set(['MyException']))
+
+    def test_argument_list(self):
+        parsed = ast.ArgumentList("3, 5, 'hi', x+5, "
+                    "context.get('lala')", **exception_kwargs)
+        eq_(parsed.undeclared_identifiers, set(['x', 'context']))
+        eq_([x for x in parsed.args],
+            ["3", "5", "'hi'", "(x + 5)", "context.get('lala')"])
+
+        parsed = ast.ArgumentList("h", **exception_kwargs)
+        eq_(parsed.args, ["h"])
+
+    def test_function_decl(self):
+        """test getting the arguments from a function"""
+        code = "def foo(a, b, c=None, d='hi', e=x, f=y+7):pass"
+        parsed = ast.FunctionDecl(code, **exception_kwargs)
+        eq_(parsed.funcname, 'foo')
+        eq_(parsed.argnames,
+            ['a', 'b', 'c', 'd', 'e', 'f'])
+
+    def test_function_decl_2(self):
+        """test getting the arguments from a function"""
+        code = "def foo(a, b, c=None, *args, **kwargs):pass"
+        parsed = ast.FunctionDecl(code, **exception_kwargs)
+        eq_(parsed.funcname, 'foo')
+        eq_(parsed.argnames,
+            ['a', 'b', 'c', 'args', 'kwargs'])
+
+    def test_expr_generate(self):
+        """test the round trip of expressions to AST back to python source"""
+        x = 1
+        y = 2
+
+        class F(object):
+            def bar(self, a,b):
+                return a + b
+
+        def lala(arg):
+            return "blah" + arg
+
+        local_dict = dict(x=x, y=y, foo=F(), lala=lala)
+
+        code = "str((x+7*y) / foo.bar(5,6)) + lala('ho')"
+        astnode = pyparser.parse(code)
+        newcode = pyparser.ExpressionGenerator(astnode).value()
+        eq_(eval(code, local_dict), eval(newcode, local_dict))
+
+        a = ["one", "two", "three"]
+        hoho = {'somevalue': "asdf"}
+        g = [1, 2, 3, 4, 5]
+        local_dict = dict(a=a, hoho=hoho, g=g)
+        code = "a[2] + hoho['somevalue'] + "\
+                "repr(g[3:5]) + repr(g[3:]) + repr(g[:5])"
+        astnode = pyparser.parse(code)
+        newcode = pyparser.ExpressionGenerator(astnode).value()
+        eq_(eval(code, local_dict), eval(newcode, local_dict))
+
+        local_dict = {'f': lambda: 9, 'x': 7}
+        code = "x+f()"
+        astnode = pyparser.parse(code)
+        newcode = pyparser.ExpressionGenerator(astnode).value()
+        eq_(eval(code, local_dict), eval(newcode, local_dict))
+
+        for code in ["repr({'x':7,'y':18})",
+                        "repr([])",
+                        "repr({})",
+                        "repr([{3:[]}])",
+                        "repr({'x':37*2 + len([6,7,8])})",
+                        "repr([1, 2, {}, {'x':'7'}])",
+                        "repr({'x':-1})", "repr(((1,2,3), (4,5,6)))",
+                        "repr(1 and 2 and 3 and 4)",
+                        "repr(True and False or 55)",
+                        "repr(1 & 2 | 3)",
+                        "repr(3//5)",
+                        "repr(3^5)",
+                        "repr([q.endswith('e') for q in "
+                            "['one', 'two', 'three']])",
+                        "repr([x for x in (5,6,7) if x == 6])",
+                        "repr(not False)"]:
+            local_dict = {}
+            astnode = pyparser.parse(code)
+            newcode = pyparser.ExpressionGenerator(astnode).value()
+            eq_(eval(code, local_dict),
+                eval(newcode, local_dict)
+            )
+
+
+
diff --git a/lib/mako-0.7.2/test/test_babelplugin.py b/lib/mako-0.7.2/test/test_babelplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_babelplugin.py
@@ -0,0 +1,44 @@
+
+from test import TemplateTest, template_base, skip_if
+
+try:
+    import babel
+    from mako.ext.babelplugin import extract
+except:
+    babel = None
+ 
+import os
+
+
+class ExtractMakoTestCase(TemplateTest):
+    @skip_if(lambda: not babel, 'babel not installed: skipping babelplugin test')
+ 
+    def test_extract(self):
+        mako_tmpl = open(os.path.join(template_base, 'gettext.mako'))
+        messages = list(extract(mako_tmpl, {'_': None, 'gettext': None,
+                                            'ungettext': (1, 2)},
+                                ['TRANSLATOR:'], {}))
+        expected = \
+            [(1, '_', u'Page arg 1', []),
+             (1, '_', u'Page arg 2', []),
+             (10, 'gettext', u'Begin', []),
+             (14, '_', u'Hi there!', [u'TRANSLATOR: Hi there!']),
+             (19, '_', u'Hello', []),
+             (22, '_', u'Welcome', []),
+             (25, '_', u'Yo', []),
+             (36, '_', u'The', [u'TRANSLATOR: Ensure so and', u'so, thanks']),
+             (36, 'ungettext', (u'bunny', u'bunnies', None), []),
+             (41, '_', u'Goodbye', [u'TRANSLATOR: Good bye']),
+             (44, '_', u'Babel', []),
+             (45, 'ungettext', (u'hella', u'hellas', None), []),
+            (62, '_', u'The', [u'TRANSLATOR: Ensure so and', u'so, thanks']),
+            (62, 'ungettext', (u'bunny', u'bunnies', None), []),
+            (68, '_', u'Goodbye, really!', [u'TRANSLATOR: HTML comment']),
+            (71, '_', u'P.S. byebye', []),
+            (77, '_', u'Top', []),
+            (83, '_', u'foo', []),
+            (83, '_', u'baz', []),
+            (85, '_', u'bar', [])
+             ]
+        self.assertEqual(expected, messages)
+
diff --git a/lib/mako-0.7.2/test/test_block.py b/lib/mako-0.7.2/test/test_block.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_block.py
@@ -0,0 +1,569 @@
+from mako.template import Template
+from mako.lookup import TemplateLookup
+from mako import exceptions
+from test import TemplateTest, assert_raises, assert_raises_message
+from util import flatten_result, result_lines
+
+
+
+class BlockTest(TemplateTest):
+    def test_anonymous_block_namespace_raises(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "Can't put anonymous blocks inside <%namespace>",
+            Template, """
+                <%namespace name="foo">
+                    <%block>
+                        block
+                    </%block>
+                </%namespace>
+            """
+        )
+
+    def test_anonymous_block_in_call(self):
+        template = Template("""
+        
+            <%self:foo x="5">
+                <%block>
+                    this is the block x
+                </%block>
+            </%self:foo>
+            
+            <%def name="foo(x)">
+                foo:
+                ${caller.body()}
+            </%def>
+        """)
+        self._do_test(
+            template,
+            ["foo:", "this is the block x"],
+            filters=result_lines
+        )
+
+    def test_named_block_in_call(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "Named block 'y' not allowed inside of <%call> tag",
+            Template,"""
+        
+            <%self:foo x="5">
+                <%block name="y">
+                    this is the block
+                </%block>
+            </%self:foo>
+            
+            <%def name="foo(x)">
+                foo:
+                ${caller.body()}
+                ${caller.y()}
+            </%def>
+        """)
+
+    def test_name_collision_blocks_toplevel(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "%def or %block named 'x' already exists in this template",
+            Template,
+            """
+                <%block name="x">
+                    block
+                </%block>
+                
+                foob 
+                
+                <%block name="x">
+                    block
+                </%block>
+            """
+        )
+
+    def test_name_collision_blocks_nested_block(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "%def or %block named 'x' already exists in this template",
+            Template,
+            """
+                <%block>
+                <%block name="x">
+                    block
+                </%block>
+                
+                foob 
+                
+                <%block name="x">
+                    block
+                </%block>
+                </%block>
+            """
+        )
+
+    def test_name_collision_blocks_nested_def(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "Named block 'x' not allowed inside of def 'foo'",
+            Template,
+            """
+                <%def name="foo()">
+                <%block name="x">
+                    block
+                </%block>
+                
+                foob 
+                
+                <%block name="x">
+                    block
+                </%block>
+                </%def>
+            """
+        )
+
+    def test_name_collision_block_def_toplevel(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "%def or %block named 'x' already exists in this template",
+            Template,
+            """
+                <%block name="x">
+                    block
+                </%block>
+                
+                foob 
+                
+                <%def name="x()">
+                    block
+                </%def>
+            """
+        )
+
+    def test_name_collision_def_block_toplevel(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "%def or %block named 'x' already exists in this template",
+            Template,
+            """
+                <%def name="x()">
+                    block
+                </%def>
+
+                foob 
+                
+                <%block name="x">
+                    block
+                </%block>
+                
+            """
+        )
+
+    def test_named_block_renders(self):
+        template = Template("""
+            above
+            <%block name="header">
+                the header
+            </%block>
+            below
+        """)
+        self._do_test(template, ["above", "the header", "below"], 
+                filters=result_lines)
+
+    def test_inherited_block_no_render(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="base"/>
+                <%block name="header">
+                    index header
+                </%block>
+            """
+        )
+        l.put_string("base","""
+            above
+            <%block name="header">
+                the header
+            </%block>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "index header", "below"], 
+                filters=result_lines)
+
+    def test_no_named_in_def(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "Named block 'y' not allowed inside of def 'q'",
+            Template,
+            """
+            <%def name="q()">
+                <%block name="y">
+                </%block>
+            </%def>
+        """)
+
+    def test_inherited_block_nested_both(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="base"/>
+                <%block name="title">
+                    index title
+                </%block>
+                
+                <%block name="header">
+                    index header
+                    ${parent.header()}
+                </%block>
+            """
+        )
+        l.put_string("base","""
+            above
+            <%block name="header">
+                base header
+                <%block name="title">
+                    the title
+                </%block>
+            </%block>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "index header", "base header", "index title", "below"], 
+                filters=result_lines)
+
+    def test_inherited_block_nested_inner_only(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="base"/>
+                <%block name="title">
+                    index title
+                </%block>
+                
+            """
+        )
+        l.put_string("base","""
+            above
+            <%block name="header">
+                base header
+                <%block name="title">
+                    the title
+                </%block>
+            </%block>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "base header", "index title", "below"], 
+                filters=result_lines)
+
+    def test_noninherited_block_no_render(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="base"/>
+                <%block name="some_thing">
+                    some thing
+                </%block>
+            """
+        )
+        l.put_string("base","""
+            above
+            <%block name="header">
+                the header
+            </%block>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "the header", "some thing", "below"], 
+                filters=result_lines)
+
+    def test_no_conflict_nested_one(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="base"/>
+                <%block>
+                    <%block name="header">
+                        inner header
+                    </%block>
+                </%block>
+            """
+        )
+        l.put_string("base","""
+            above
+            <%block name="header">
+                the header
+            </%block>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "inner header", "below"], 
+                filters=result_lines)
+
+    def test_nested_dupe_names_raise(self):
+        assert_raises_message(
+            exceptions.CompileException,
+            "%def or %block named 'header' already exists in this template.",
+            Template,
+            """
+                <%inherit file="base"/>
+                <%block name="header">
+                    <%block name="header">
+                        inner header
+                    </%block>
+                </%block>
+            """
+        )
+
+    def test_two_levels_one(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="middle"/>
+                <%block name="header">
+                    index header
+                </%block>
+                <%block>
+                    index anon
+                </%block>
+            """
+        )
+        l.put_string("middle", """
+            <%inherit file="base"/>
+            <%block>
+                middle anon
+            </%block>
+            ${next.body()}
+        """)
+        l.put_string("base","""
+            above
+            <%block name="header">
+                the header
+            </%block>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "index header", "middle anon", 
+                "index anon", "below"], 
+                filters=result_lines)
+
+    def test_filter(self):
+        template = Template("""
+            <%block filter="h">
+                <html>
+            </%block>
+        """)
+        self._do_test(template, [u'&lt;html&gt;'], 
+                    filters=result_lines)
+
+    def test_anon_in_named(self):
+        template = Template("""
+            <%block name="x">
+                outer above
+                <%block>
+                    inner
+                </%block>
+                outer below
+            </%block>
+        """)
+        self._test_block_in_block(template)
+
+    def test_named_in_anon(self):
+        template = Template("""
+            <%block>
+                outer above
+                <%block name="x">
+                    inner
+                </%block>
+                outer below
+            </%block>
+        """)
+        self._test_block_in_block(template)
+
+    def test_anon_in_anon(self):
+        template = Template("""
+            <%block>
+                outer above
+                <%block>
+                    inner
+                </%block>
+                outer below
+            </%block>
+        """)
+        self._test_block_in_block(template)
+
+    def test_named_in_named(self):
+        template = Template("""
+            <%block name="x">
+                outer above
+                <%block name="y">
+                    inner
+                </%block>
+                outer below
+            </%block>
+        """)
+        self._test_block_in_block(template)
+
+    def _test_block_in_block(self, template):
+        self._do_test(template, 
+            ["outer above", "inner", "outer below"],
+            filters=result_lines
+        )
+
+    def test_iteration(self):
+        t = Template("""
+            % for i in (1, 2, 3):
+                <%block>${i}</%block>
+            % endfor
+        """)
+        self._do_test(t, 
+            ["1", "2", "3"],
+            filters=result_lines
+        )
+
+    def test_conditional(self):
+        t = Template("""
+            % if True:
+                <%block>true</%block>
+            % endif
+
+            % if False:
+                <%block>false</%block>
+            % endif
+        """)
+        self._do_test(t, 
+            ["true"],
+            filters=result_lines
+        )
+
+    def test_block_overridden_by_def(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="base"/>
+                <%def name="header()">
+                    inner header
+                </%def>
+            """
+        )
+        l.put_string("base","""
+            above
+            <%block name="header">
+                the header
+            </%block>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "inner header", "below"], 
+                filters=result_lines)
+
+    def test_def_overridden_by_block(self):
+        l = TemplateLookup()
+        l.put_string("index",
+            """
+                <%inherit file="base"/>
+                <%block name="header">
+                    inner header
+                </%block>
+            """
+        )
+        l.put_string("base","""
+            above
+            ${self.header()}
+            <%def name="header()">
+                the header
+            </%def>
+            
+            ${next.body()}
+            below
+        """)
+        self._do_test(l.get_template("index"), 
+                ["above", "inner header", "below"], 
+                filters=result_lines)
+
+    def test_block_args(self):
+        l = TemplateLookup()
+        l.put_string("caller", """
+        
+            <%include file="callee" args="val1='3', val2='4'"/>
+            
+        """)
+        l.put_string("callee", """
+            <%page args="val1, val2"/>
+            <%block name="foob" args="val1, val2">
+                foob, ${val1}, ${val2}
+            </%block>
+        """)
+        self._do_test(
+            l.get_template("caller"),
+            [u'foob, 3, 4'],
+            filters=result_lines
+        )
+
+    def test_block_variables_contextual(self):
+        t = Template("""            
+            <%block name="foob" >
+                foob, ${val1}, ${val2}
+            </%block>
+        """)
+        self._do_test(
+            t,
+            [u'foob, 3, 4'],
+            template_args={'val1':3, 'val2':4},
+            filters=result_lines
+        )
+
+    def test_block_args_contextual(self):
+        t = Template("""            
+            <%page args="val1"/>
+            <%block name="foob" args="val1">
+                foob, ${val1}, ${val2}
+            </%block>
+        """)
+        self._do_test(
+            t,
+            [u'foob, 3, 4'],
+            template_args={'val1':3, 'val2':4},
+            filters=result_lines
+        )
+
+    def test_block_pageargs_contextual(self):
+        t = Template("""            
+            <%block name="foob">
+                foob, ${pageargs['val1']}, ${pageargs['val2']}
+            </%block>
+        """)
+        self._do_test(
+            t,
+            [u'foob, 3, 4'],
+            template_args={'val1':3, 'val2':4},
+            filters=result_lines
+        )
+
+    def test_block_pageargs(self):
+        l = TemplateLookup()
+        l.put_string("caller", """
+        
+            <%include file="callee" args="val1='3', val2='4'"/>
+            
+        """)
+        l.put_string("callee", """
+            <%block name="foob">
+                foob, ${pageargs['val1']}, ${pageargs['val2']}
+            </%block>
+        """)
+        self._do_test(
+            l.get_template("caller"),
+            [u'foob, 3, 4'],
+            filters=result_lines
+        )
\ No newline at end of file
diff --git a/lib/mako-0.7.2/test/test_cache.py b/lib/mako-0.7.2/test/test_cache.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_cache.py
@@ -0,0 +1,557 @@
+from mako.template import Template
+from mako.lookup import TemplateLookup
+from mako import lookup
+import shutil, unittest, os, time
+from util import result_lines
+from test import TemplateTest, template_base, module_base
+from test import eq_
+
+try:
+    import beaker
+    import beaker.cache
+except:
+    from nose import SkipTest
+    raise SkipTest("Beaker is required for these tests.")
+
+from mako.cache import register_plugin, CacheImpl
+
+class MockCacheImpl(CacheImpl):
+    realcacheimpl = None
+
+    def __init__(self, cache):
+        self.cache = cache
+        use_beaker = self.cache.\
+                    template.cache_args.\
+                    get('use_beaker', True)
+        if use_beaker:
+            self.realcacheimpl = cache._load_impl("beaker")
+
+    def get_or_create(self, key, creation_function, **kw):
+        self.key = key
+        self.kwargs = kw.copy()
+        if self.realcacheimpl:
+            return self.realcacheimpl.\
+                    get_or_create(key, creation_function, **kw)
+        else:
+            return creation_function()
+
+    def put(self, key, value, **kw):
+        self.key = key
+        self.kwargs = kw.copy()
+        if self.realcacheimpl:
+            self.realcacheimpl.put(key, value, **kw)
+
+    def get(self, key, **kw):
+        self.key = key
+        self.kwargs = kw.copy()
+        if self.realcacheimpl:
+            return self.realcacheimpl.get(key, **kw)
+
+    def invalidate(self, key, **kw):
+        self.key = key
+        self.kwargs = kw.copy()
+        if self.realcacheimpl:
+            self.realcacheimpl.invalidate(key, **kw)
+
+
+register_plugin("mock", __name__, "MockCacheImpl")
+
+class BeakerCacheTest(TemplateTest):
+    def _regions(self):
+        return beaker.cache.CacheManager(
+            cache_regions = {
+                'short':{
+                    'expire':1,
+                    'type':'memory'
+                },
+                'long':{
+                    'expire':60,
+                    'type':'memory'
+                }
+            }
+        )
+
+    def test_region(self):
+        t = Template("""
+            <%block name="foo" cached="True" cache_region="short">
+                short term ${x}
+            </%block>
+            <%block name="bar" cached="True" cache_region="long">
+                long term ${x}
+            </%block>
+            <%block name="lala">
+                none ${x}
+            </%block>
+        """, cache_args={"manager":self._regions()})
+
+        r1 = result_lines(t.render(x=5))
+        time.sleep(2)
+        r2 = result_lines(t.render(x=6))
+        r3 = result_lines(t.render(x=7))
+        eq_(r1, ["short term 5", "long term 5", "none 5"])
+        eq_(r2, ["short term 6", "long term 5", "none 6"])
+        eq_(r3, ["short term 6", "long term 5", "none 7"])
+
+class CacheTest(TemplateTest):
+    def _install_mock_cache(self, template):
+        template.cache_impl = 'mock'
+        return template.cache.impl
+
+    def test_def(self):
+        t = Template("""
+        <%!
+            callcount = [0]
+        %>
+        <%def name="foo()" cached="True">
+            this is foo
+            <%
+            callcount[0] += 1
+            %>
+        </%def>
+
+        ${foo()}
+        ${foo()}
+        ${foo()}
+        callcount: ${callcount}
+""")
+        m = self._install_mock_cache(t)
+        assert result_lines(t.render()) == [
+            'this is foo',
+            'this is foo',
+            'this is foo',
+            'callcount: [1]',
+        ]
+        assert m.kwargs == {}
+
+    def test_cache_enable(self):
+        t = Template("""
+            <%!
+                callcount = [0]
+            %>
+            <%def name="foo()" cached="True">
+                <% callcount[0] += 1 %>
+            </%def>
+            ${foo()}
+            ${foo()}
+            callcount: ${callcount}
+        """, cache_enabled=False)
+        m = self._install_mock_cache(t)
+
+        eq_(t.render().strip(), "callcount: [2]")
+
+    def test_nested_def(self):
+        t = Template("""
+        <%!
+            callcount = [0]
+        %>
+        <%def name="foo()">
+            <%def name="bar()" cached="True">
+                this is foo
+                <%
+                callcount[0] += 1
+                %>
+            </%def>
+            ${bar()}
+        </%def>
+
+        ${foo()}
+        ${foo()}
+        ${foo()}
+        callcount: ${callcount}
+""")
+        m = self._install_mock_cache(t)
+        assert result_lines(t.render()) == [
+            'this is foo',
+            'this is foo',
+            'this is foo',
+            'callcount: [1]',
+        ]
+        assert m.kwargs == {}
+
+    def test_page(self):
+        t = Template("""
+        <%!
+            callcount = [0]
+        %>
+        <%page cached="True"/>
+        this is foo
+        <%
+        callcount[0] += 1
+        %>
+        callcount: ${callcount}
+""")
+        m = self._install_mock_cache(t)
+        t.render()
+        t.render()
+        assert result_lines(t.render()) == [
+            "this is foo",
+            "callcount: [1]"
+        ]
+        assert m.kwargs == {}
+
+    def test_dynamic_key_with_context(self):
+        t = Template("""
+            <%block name="foo" cached="True" cache_key="${mykey}">
+                some block
+            </%block>
+        """)
+        m = self._install_mock_cache(t)
+        t.render(mykey="thekey")
+        t.render(mykey="thekey")
+        eq_(
+            result_lines(t.render(mykey="thekey")),
+            ["some block"]
+        )
+        eq_(m.key, "thekey")
+
+        t = Template("""
+            <%def name="foo()" cached="True" cache_key="${mykey}">
+                some def
+            </%def>
+            ${foo()}
+        """)
+        m = self._install_mock_cache(t)
+        t.render(mykey="thekey")
+        t.render(mykey="thekey")
+        eq_(
+            result_lines(t.render(mykey="thekey")),
+            ["some def"]
+        )
+        eq_(m.key, "thekey")
+
+
+    def test_dynamic_key_with_funcargs(self):
+        t = Template("""
+            <%def name="foo(num=5)" cached="True" cache_key="foo_${str(num)}">
+             hi
+            </%def>
+
+            ${foo()}
+        """)
+        m = self._install_mock_cache(t)
+        t.render()
+        t.render()
+        assert result_lines(t.render()) == ['hi']
+        assert m.key == "foo_5"
+
+        t = Template("""
+            <%def name="foo(*args, **kwargs)" cached="True" cache_key="foo_${kwargs['bar']}">
+             hi
+            </%def>
+
+            ${foo(1, 2, bar='lala')}
+        """)
+        m = self._install_mock_cache(t)
+        t.render()
+        assert result_lines(t.render()) == ['hi']
+        assert m.key == "foo_lala"
+
+        t = Template('''
+        <%page args="bar='hi'" cache_key="foo_${bar}" cached="True"/>
+         hi
+        ''')
+        m = self._install_mock_cache(t)
+        t.render()
+        assert result_lines(t.render()) == ['hi']
+        assert m.key == "foo_hi"
+
+
+    def test_dynamic_key_with_imports(self):
+        lookup = TemplateLookup()
+        lookup.put_string("foo.html", """
+        <%!
+            callcount = [0]
+        %>
+        <%namespace file="ns.html" import="*"/>
+        <%page cached="True" cache_key="${foo}"/>
+        this is foo
+        <%
+        callcount[0] += 1
+        %>
+        callcount: ${callcount}
+""")
+        lookup.put_string("ns.html", """""")
+        t = lookup.get_template("foo.html")
+        m = self._install_mock_cache(t)
+        t.render(foo='somekey')
+        t.render(foo='somekey')
+        assert result_lines(t.render(foo='somekey')) == [
+            "this is foo",
+            "callcount: [1]"
+        ]
+        assert m.kwargs == {}
+
+    def test_fileargs_implicit(self):
+        l = lookup.TemplateLookup(module_directory=module_base)
+        l.put_string("test","""
+                <%!
+                    callcount = [0]
+                %>
+                <%def name="foo()" cached="True" cache_type='dbm'>
+                    this is foo
+                    <%
+                    callcount[0] += 1
+                    %>
+                </%def>
+
+                ${foo()}
+                ${foo()}
+                ${foo()}
+                callcount: ${callcount}
+        """)
+
+        m = self._install_mock_cache(l.get_template('test'))
+        assert result_lines(l.get_template('test').render()) == [
+            'this is foo',
+            'this is foo',
+            'this is foo',
+            'callcount: [1]',
+        ]
+        eq_(m.kwargs, {'type':'dbm'})
+
+    def test_fileargs_deftag(self):
+        t = Template("""
+        <%%!
+            callcount = [0]
+        %%>
+        <%%def name="foo()" cached="True" cache_type='file' cache_dir='%s'>
+            this is foo
+            <%%
+            callcount[0] += 1
+            %%>
+        </%%def>
+
+        ${foo()}
+        ${foo()}
+        ${foo()}
+        callcount: ${callcount}
+""" % module_base)
+        m = self._install_mock_cache(t)
+        assert result_lines(t.render()) == [
+            'this is foo',
+            'this is foo',
+            'this is foo',
+            'callcount: [1]',
+        ]
+        assert m.kwargs == {'type':'file','dir':module_base}
+
+    def test_fileargs_pagetag(self):
+        t = Template("""
+        <%%page cache_dir='%s' cache_type='dbm'/>
+        <%%!
+            callcount = [0]
+        %%>
+        <%%def name="foo()" cached="True">
+            this is foo
+            <%%
+            callcount[0] += 1
+            %%>
+        </%%def>
+
+        ${foo()}
+        ${foo()}
+        ${foo()}
+        callcount: ${callcount}
+""" % module_base)
+        m = self._install_mock_cache(t)
+        assert result_lines(t.render()) == [
+            'this is foo',
+            'this is foo',
+            'this is foo',
+            'callcount: [1]',
+        ]
+        eq_(m.kwargs, {'dir':module_base, 'type':'dbm'})
+
+    def test_args_complete(self):
+        t = Template("""
+        <%%def name="foo()" cached="True" cache_timeout="30" cache_dir="%s" cache_type="file" cache_key='somekey'>
+            this is foo
+        </%%def>
+
+        ${foo()}
+""" % module_base)
+        m = self._install_mock_cache(t)
+        t.render()
+        eq_(m.kwargs, {'dir':module_base, 'type':'file', 'timeout':30})
+
+        t2 = Template("""
+        <%%page cached="True" cache_timeout="30" cache_dir="%s" cache_type="file" cache_key='somekey'/>
+        hi
+        """ % module_base)
+        m = self._install_mock_cache(t2)
+        t2.render()
+        eq_(m.kwargs, {'dir':module_base, 'type':'file', 'timeout':30})
+
+    def test_fileargs_lookup(self):
+        l = lookup.TemplateLookup(cache_dir=module_base, cache_type='file')
+        l.put_string("test","""
+                <%!
+                    callcount = [0]
+                %>
+                <%def name="foo()" cached="True">
+                    this is foo
+                    <%
+                    callcount[0] += 1
+                    %>
+                </%def>
+
+                ${foo()}
+                ${foo()}
+                ${foo()}
+                callcount: ${callcount}
+        """)
+
+        t = l.get_template('test')
+        m = self._install_mock_cache(t)
+        assert result_lines(l.get_template('test').render()) == [
+            'this is foo',
+            'this is foo',
+            'this is foo',
+            'callcount: [1]',
+        ]
+        eq_(m.kwargs, {'dir':module_base, 'type':'file'})
+
+    def test_buffered(self):
+        t = Template("""
+        <%!
+            def a(text):
+                return "this is a " + text.strip()
+        %>
+        ${foo()}
+        ${foo()}
+        <%def name="foo()" cached="True" buffered="True">
+            this is a test
+        </%def>
+        """, buffer_filters=["a"])
+        assert result_lines(t.render()) == ["this is a this is a test", "this is a this is a test"]
+
+    def test_load_from_expired(self):
+        """test that the cache callable can be called safely after the
+        originating template has completed rendering.
+
+        """
+        t = Template("""
+        ${foo()}
+        <%def name="foo()" cached="True" cache_timeout="2">
+            foo
+        </%def>
+        """)
+
+        x1 = t.render()
+        time.sleep(3)
+        x2 = t.render()
+        assert x1.strip() == x2.strip() == "foo"
+
+    def test_cache_uses_current_context(self):
+        t = Template("""
+        ${foo()}
+        <%def name="foo()" cached="True" cache_timeout="2">
+            foo: ${x}
+        </%def>
+        """)
+
+        x1 = t.render(x=1)
+        time.sleep(3)
+        x2 = t.render(x=2)
+        eq_(x1.strip(), "foo: 1")
+        eq_(x2.strip(), "foo: 2")
+
+    def test_namespace_access(self):
+        t = Template("""
+            <%def name="foo(x)" cached="True">
+                foo: ${x}
+            </%def>
+
+            <%
+                foo(1)
+                foo(2)
+                local.cache.invalidate_def('foo')
+                foo(3)
+                foo(4)
+            %>
+        """)
+        assert result_lines(t.render()) == ['foo: 1', 'foo: 1', 'foo: 3', 'foo: 3']
+
+    def test_lookup(self):
+        l = TemplateLookup(cache_impl='mock')
+        l.put_string("x", """
+            <%page cached="True" />
+            ${y}
+        """)
+        t = l.get_template("x")
+        assert result_lines(t.render(y=5)) == ["5"]
+        assert result_lines(t.render(y=7)) == ["5"]
+        assert isinstance(t.cache.impl, MockCacheImpl)
+
+    def test_invalidate(self):
+        t = Template("""
+            <%%def name="foo()" cached="True">
+                foo: ${x}
+            </%%def>
+
+            <%%def name="bar()" cached="True" cache_type='dbm' cache_dir='%s'>
+                bar: ${x}
+            </%%def>
+            ${foo()} ${bar()}
+        """ % module_base)
+        assert result_lines(t.render(x=1)) == ["foo: 1", "bar: 1"]
+        assert result_lines(t.render(x=2)) == ["foo: 1", "bar: 1"]
+        t.cache.invalidate_def('foo')
+        assert result_lines(t.render(x=3)) == ["foo: 3", "bar: 1"]
+        t.cache.invalidate_def('bar')
+        assert result_lines(t.render(x=4)) == ["foo: 3", "bar: 4"]
+
+        t = Template("""
+            <%%page cached="True" cache_type="dbm" cache_dir="%s"/>
+
+            page: ${x}
+        """ % module_base)
+        assert result_lines(t.render(x=1)) == ["page: 1"]
+        assert result_lines(t.render(x=2)) == ["page: 1"]
+        t.cache.invalidate_body()
+        assert result_lines(t.render(x=3)) == ["page: 3"]
+        assert result_lines(t.render(x=4)) == ["page: 3"]
+
+    def test_custom_args_def(self):
+        t = Template("""
+            <%def name="foo()" cached="True" cache_region="myregion"
+                    cache_timeout="50" cache_foo="foob">
+            </%def>
+            ${foo()}
+        """, cache_args={'use_beaker':False})
+        m = self._install_mock_cache(t)
+        t.render()
+        eq_(m.kwargs, {'use_beaker':False,'region':'myregion', 'timeout':50, 'foo':'foob'})
+
+    def test_custom_args_block(self):
+        t = Template("""
+            <%block name="foo" cached="True" cache_region="myregion"
+                    cache_timeout="50" cache_foo="foob">
+            </%block>
+        """, cache_args={'use_beaker':False})
+        m = self._install_mock_cache(t)
+        t.render()
+        eq_(m.kwargs, {'use_beaker':False, 'region':'myregion', 'timeout':50, 'foo':'foob'})
+
+    def test_custom_args_page(self):
+        t = Template("""
+            <%page cached="True" cache_region="myregion"
+                    cache_timeout="50" cache_foo="foob"/>
+        """, cache_args={'use_beaker':False})
+        m = self._install_mock_cache(t)
+        t.render()
+        eq_(m.kwargs, {'use_beaker':False, 'region':'myregion', 'timeout':50, 'foo':'foob'})
+
+    def test_pass_context(self):
+        t = Template("""
+            <%page cached="True"/>
+        """)
+        m = self._install_mock_cache(t)
+        t.render()
+        assert 'context' not in m.kwargs
+
+        m.pass_context = True
+        t.render(x="bar")
+        assert 'context' in m.kwargs
+        assert m.kwargs['context'].get('x') == 'bar'
+
diff --git a/lib/mako-0.7.2/test/test_call.py b/lib/mako-0.7.2/test/test_call.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_call.py
@@ -0,0 +1,515 @@
+from mako.template import Template
+from mako import util
+from util import result_lines, flatten_result
+from test import TemplateTest, eq_
+
+class CallTest(TemplateTest):
+    def test_call(self):
+        t = Template("""
+        <%def name="foo()">
+            hi im foo ${caller.body(y=5)}
+        </%def>
+ 
+        <%call expr="foo()" args="y, **kwargs">
+            this is the body, y is ${y}
+        </%call>
+""")
+        assert result_lines(t.render()) == ['hi im foo', 'this is the body, y is 5']
+
+
+    def test_compound_call(self):
+        t = Template("""
+
+        <%def name="bar()">
+            this is bar
+        </%def>
+ 
+        <%def name="comp1()">
+            this comp1 should not be called
+        </%def>
+ 
+        <%def name="foo()">
+            foo calling comp1: ${caller.comp1(x=5)}
+            foo calling body: ${caller.body()}
+        </%def>
+ 
+        <%call expr="foo()">
+            <%def name="comp1(x)">
+                this is comp1, ${x}
+            </%def>
+            this is the body, ${comp1(6)}
+        </%call>
+        ${bar()}
+
+""")
+        assert result_lines(t.render()) == ['foo calling comp1:', 'this is comp1, 5', 'foo calling body:', 'this is the body,', 'this is comp1, 6', 'this is bar']
+
+    def test_new_syntax(self):
+        """test foo:bar syntax, including multiline args and expression eval."""
+ 
+        # note the trailing whitespace in the bottom ${} expr, need to strip
+        # that off < python 2.7
+ 
+        t = Template("""
+            <%def name="foo(x, y, q, z)">
+                ${x}
+                ${y}
+                ${q}
+                ${",".join("%s->%s" % (a, b) for a, b in z)}
+            </%def>
+ 
+            <%self:foo x="this is x" y="${'some ' + 'y'}" q="
+                this
+                is
+                q"
+ 
+                z="${[
+                (1, 2),
+                (3, 4),
+                (5, 6)
+            ]
+ 
+            }"/>
+        """)
+ 
+        eq_(
+            result_lines(t.render()),
+             ['this is x', 'some y', 'this', 'is', 'q', '1->2,3->4,5->6']
+        )
+ 
+    def test_ccall_caller(self):
+        t = Template("""
+        <%def name="outer_func()">
+        OUTER BEGIN
+            <%call expr="caller.inner_func()">
+                INNER CALL
+            </%call>
+        OUTER END
+        </%def>
+
+        <%call expr="outer_func()">
+            <%def name="inner_func()">
+                INNER BEGIN
+                ${caller.body()}
+                INNER END
+            </%def>
+        </%call>
+
+        """)
+        #print t.code
+        assert result_lines(t.render()) == [
+            "OUTER BEGIN",
+            "INNER BEGIN",
+            "INNER CALL",
+            "INNER END",
+            "OUTER END",
+        ]
+ 
+    def test_stack_pop(self):
+        t = Template("""
+        <%def name="links()" buffered="True">
+           Some links
+        </%def>
+
+        <%def name="wrapper(links)">
+           <h1>${caller.body()}</h1>
+           ${links}
+        </%def>
+
+        ## links() pushes a stack frame on.  when complete,
+        ## 'nextcaller' must be restored
+        <%call expr="wrapper(links())">
+           Some title
+        </%call>
+
+        """)
+
+        assert result_lines(t.render()) == [
+        "<h1>",
+        "Some title",
+        "</h1>",
+        "Some links"
+        ]
+ 
+    def test_conditional_call(self):
+        """test that 'caller' is non-None only if the immediate <%def> was called via <%call>"""
+
+        t = Template("""
+        <%def name="a()">
+        % if caller:
+        ${ caller.body() } \\
+        % endif
+        AAA
+        ${ b() }
+        </%def>
+
+        <%def name="b()">
+        % if caller:
+        ${ caller.body() } \\
+        % endif
+        BBB
+        ${ c() }
+        </%def>
+
+        <%def name="c()">
+        % if caller:
+        ${ caller.body() } \\
+        % endif
+        CCC
+        </%def>
+
+        <%call expr="a()">
+        CALL
+        </%call>
+
+        """)
+        assert result_lines(t.render()) == [
+            "CALL",
+            "AAA",
+            "BBB",
+            "CCC"
+        ]
+ 
+    def test_chained_call(self):
+        """test %calls that are chained through their targets"""
+        t = Template("""
+            <%def name="a()">
+                this is a. 
+                <%call expr="b()">
+                    this is a's ccall.  heres my body: ${caller.body()}
+                </%call>
+            </%def>
+            <%def name="b()">
+                this is b.  heres  my body: ${caller.body()}
+                whats in the body's caller's body ?
+                ${context.caller_stack[-2].body()}
+            </%def>
+ 
+            <%call expr="a()">
+                heres the main templ call
+            </%call>
+ 
+""")
+        assert result_lines(t.render()) == [
+            'this is a.',
+            'this is b. heres my body:',
+            "this is a's ccall. heres my body:",
+            'heres the main templ call',
+            "whats in the body's caller's body ?",
+            'heres the main templ call'
+        ]
+
+    def test_nested_call(self):
+        """test %calls that are nested inside each other"""
+        t = Template("""
+            <%def name="foo()">
+                ${caller.body(x=10)}
+            </%def>
+
+            x is ${x}
+            <%def name="bar()">
+                bar: ${caller.body()}
+            </%def>
+
+            <%call expr="foo()" args="x">
+                this is foo body: ${x}
+
+                <%call expr="bar()">
+                    this is bar body: ${x}
+                </%call>
+            </%call>
+""")
+        assert result_lines(t.render(x=5)) == [
+            "x is 5",
+            "this is foo body: 10",
+            "bar:",
+            "this is bar body: 10"
+        ]
+ 
+    def test_nested_call_2(self):
+        t = Template("""
+            x is ${x}
+            <%def name="foo()">
+                ${caller.foosub(x=10)}
+            </%def>
+
+            <%def name="bar()">
+                bar: ${caller.barsub()}
+            </%def>
+
+            <%call expr="foo()">
+                <%def name="foosub(x)">
+                this is foo body: ${x}
+ 
+                <%call expr="bar()">
+                    <%def name="barsub()">
+                    this is bar body: ${x}
+                    </%def>
+                </%call>
+ 
+                </%def>
+
+            </%call>
+""")
+        assert result_lines(t.render(x=5)) == [
+            "x is 5",
+            "this is foo body: 10",
+            "bar:",
+            "this is bar body: 10"
+        ]
+
+    def test_nested_call_3(self):
+        template = Template('''\
+        <%def name="A()">
+          ${caller.body()}
+        </%def>
+
+        <%def name="B()">
+          ${caller.foo()}
+        </%def>
+
+        <%call expr="A()">
+          <%call expr="B()">
+            <%def name="foo()">
+              foo
+            </%def>
+          </%call>
+        </%call>
+
+        ''')
+        assert flatten_result(template.render()) == "foo"
+ 
+    def test_nested_call_4(self):
+        base = """
+        <%def name="A()">
+        A_def
+        ${caller.body()}
+        </%def>
+
+        <%def name="B()">
+        B_def
+        ${caller.body()}
+        </%def>
+        """
+
+        template = Template(base + """
+        <%def name="C()">
+         C_def
+         <%self:B>
+           <%self:A>
+              A_body
+           </%self:A>
+            B_body
+           ${caller.body()}
+         </%self:B>
+        </%def>
+
+        <%self:C>
+        C_body
+        </%self:C>
+        """)
+
+        eq_(
+            flatten_result(template.render()),
+            "C_def B_def A_def A_body B_body C_body"
+        )
+
+        template = Template(base + """
+        <%def name="C()">
+         C_def
+         <%self:B>
+            B_body
+           ${caller.body()}
+           <%self:A>
+              A_body
+           </%self:A>
+         </%self:B>
+        </%def>
+
+        <%self:C>
+        C_body
+        </%self:C>
+        """)
+
+        eq_(
+            flatten_result(template.render()),
+            "C_def B_def B_body C_body A_def A_body"
+        )
+
+    def test_chained_call_in_nested(self):
+        t = Template("""
+            <%def name="embedded()">
+            <%def name="a()">
+                this is a. 
+                <%call expr="b()">
+                    this is a's ccall.  heres my body: ${caller.body()}
+                </%call>
+            </%def>
+            <%def name="b()">
+                this is b.  heres  my body: ${caller.body()}
+                whats in the body's caller's body ? ${context.caller_stack[-2].body()}
+            </%def>
+
+            <%call expr="a()">
+                heres the main templ call
+            </%call>
+            </%def>
+            ${embedded()}
+""")
+        #print t.code
+        #print result_lines(t.render())
+        assert result_lines(t.render()) == [
+            'this is a.',
+            'this is b. heres my body:',
+            "this is a's ccall. heres my body:",
+            'heres the main templ call',
+            "whats in the body's caller's body ?",
+            'heres the main templ call'
+        ]
+ 
+    def test_call_in_nested(self):
+        t = Template("""
+            <%def name="a()">
+                this is a ${b()}
+                <%def name="b()">
+                    this is b
+                    <%call expr="c()">
+                        this is the body in b's call
+                    </%call>
+                </%def>
+                <%def name="c()">
+                    this is c: ${caller.body()}
+                </%def>
+            </%def>
+        ${a()}
+""")
+        assert result_lines(t.render()) == ['this is a', 'this is b', 'this is c:', "this is the body in b's call"]
+
+    def test_composed_def(self):
+        t = Template("""
+            <%def name="f()"><f>${caller.body()}</f></%def>
+            <%def name="g()"><g>${caller.body()}</g></%def>
+            <%def name="fg()">
+                <%self:f><%self:g>${caller.body()}</%self:g></%self:f>
+            </%def>
+            <%self:fg>fgbody</%self:fg>
+            """)
+        assert result_lines(t.render()) == ['<f><g>fgbody</g></f>']
+
+    def test_regular_defs(self):
+        t = Template("""
+        <%!
+            @runtime.supports_caller
+            def a(context):
+                context.write("this is a")
+                if context['caller']:
+                    context['caller'].body()
+                context.write("a is done")
+                return ''
+        %>
+ 
+        <%def name="b()">
+            this is b
+            our body: ${caller.body()}
+            ${a(context)}
+        </%def>
+        test 1
+        <%call expr="a(context)">
+            this is the body
+        </%call>
+        test 2
+        <%call expr="b()">
+            this is the body
+        </%call>
+        test 3
+        <%call expr="b()">
+            this is the body
+            <%call expr="b()">
+                this is the nested body
+            </%call>
+        </%call>
+
+
+        """) 
+        #print t.code
+        assert result_lines(t.render()) == [
+            "test 1",
+            "this is a",
+            "this is the body",
+            "a is done",
+            "test 2",
+            "this is b",
+            "our body:",
+            "this is the body",
+            "this is aa is done",
+            "test 3",
+            "this is b",
+            "our body:",
+            "this is the body",
+            "this is b",
+            "our body:",
+            "this is the nested body",
+            "this is aa is done",
+            "this is aa is done"
+        ]
+ 
+    def test_call_in_nested_2(self):
+        t = Template("""
+            <%def name="a()">
+                <%def name="d()">
+                    not this d
+                </%def>
+                this is a ${b()}
+                <%def name="b()">
+                    <%def name="d()">
+                        not this d either
+                    </%def>
+                    this is b
+                    <%call expr="c()">
+                        <%def name="d()">
+                            this is d
+                        </%def>
+                        this is the body in b's call
+                    </%call>
+                </%def>
+                <%def name="c()">
+                    this is c: ${caller.body()}
+                    the embedded "d" is: ${caller.d()}
+                </%def>
+            </%def>
+        ${a()}
+""")
+        assert result_lines(t.render()) == ['this is a', 'this is b', 'this is c:', "this is the body in b's call", 'the embedded "d" is:', 'this is d']
+
+class SelfCacheTest(TemplateTest):
+    """this test uses a now non-public API."""
+ 
+    def test_basic(self):
+        t = Template("""
+        <%!
+            cached = None
+        %>
+        <%def name="foo()">
+            <% 
+                global cached
+                if cached:
+                    return "cached: " + cached
+                __M_writer = context._push_writer()
+            %>
+            this is foo
+            <%
+                buf, __M_writer = context._pop_buffer_and_writer()
+                cached = buf.getvalue()
+                return cached
+            %>
+        </%def>
+ 
+        ${foo()}
+        ${foo()}
+""")
+        assert result_lines(t.render()) == [
+            "this is foo",
+            "cached:",
+            "this is foo"
+        ]
+ 
diff --git a/lib/mako-0.7.2/test/test_decorators.py b/lib/mako-0.7.2/test/test_decorators.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_decorators.py
@@ -0,0 +1,110 @@
+from mako.template import Template
+from mako import lookup
+import unittest
+from util import flatten_result, result_lines
+
+class DecoratorTest(unittest.TestCase):
+    def test_toplevel(self):
+        template = Template("""
+            <%!
+                def bar(fn):
+                    def decorate(context, *args, **kw):
+                        return "BAR" + runtime.capture(context, fn, *args, **kw) + "BAR"
+                    return decorate
+            %>
+ 
+            <%def name="foo(y, x)" decorator="bar">
+                this is foo ${y} ${x}
+            </%def>
+ 
+            ${foo(1, x=5)}
+        """)
+
+        assert flatten_result(template.render()) == "BAR this is foo 1 5 BAR"
+
+    def test_toplevel_contextual(self):
+        template = Template("""
+            <%!
+                def bar(fn):
+                    def decorate(context):
+                        context.write("BAR")
+                        fn()
+                        context.write("BAR")
+                        return ''
+                    return decorate
+            %>
+
+            <%def name="foo()" decorator="bar">
+                this is foo
+            </%def>
+
+            ${foo()}
+        """)
+
+        assert flatten_result(template.render()) == "BAR this is foo BAR"
+
+        assert flatten_result(template.get_def('foo').render()) == "BAR this is foo BAR"
+
+
+    def test_nested(self):
+        template = Template("""
+            <%!
+                def bat(fn):
+                    def decorate(context):
+                        return "BAT" + runtime.capture(context, fn) + "BAT"
+                    return decorate
+            %>
+
+            <%def name="foo()">
+ 
+                <%def name="bar()" decorator="bat">
+                    this is bar
+                </%def>
+                ${bar()}
+            </%def>
+
+            ${foo()}
+        """)
+
+        assert flatten_result(template.render()) == "BAT this is bar BAT"
+ 
+    def test_toplevel_decorated_name(self):
+        template = Template("""
+            <%!
+                def bar(fn):
+                    def decorate(context, *args, **kw):
+                        return "function " + fn.__name__ + " " + runtime.capture(context, fn, *args, **kw)
+                    return decorate
+            %>
+
+            <%def name="foo(y, x)" decorator="bar">
+                this is foo ${y} ${x}
+            </%def>
+
+            ${foo(1, x=5)}
+        """)
+
+        assert flatten_result(template.render()) == "function foo this is foo 1 5"
+
+    def test_nested_decorated_name(self):
+        template = Template("""
+            <%!
+                def bat(fn):
+                    def decorate(context):
+                        return "function " + fn.__name__ + " " + runtime.capture(context, fn)
+                    return decorate
+            %>
+
+            <%def name="foo()">
+
+                <%def name="bar()" decorator="bat">
+                    this is bar
+                </%def>
+                ${bar()}
+            </%def>
+
+            ${foo()}
+        """)
+
+        assert flatten_result(template.render()) == "function bar this is bar"
+ 
diff --git a/lib/mako-0.7.2/test/test_def.py b/lib/mako-0.7.2/test/test_def.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_def.py
@@ -0,0 +1,678 @@
+from mako.template import Template
+from mako import lookup
+from test import TemplateTest
+from util import flatten_result, result_lines
+from test import eq_, assert_raises
+
+class DefTest(TemplateTest):
+    def test_def_noargs(self):
+        template = Template("""
+
+        ${mycomp()}
+
+        <%def name="mycomp()">
+            hello mycomp ${variable}
+        </%def>
+
+        """)
+        eq_(
+            template.render(variable='hi').strip(),
+            """hello mycomp hi"""
+        )
+
+    def test_def_blankargs(self):
+        template = Template("""
+        <%def name="mycomp()">
+            hello mycomp ${variable}
+        </%def>
+
+        ${mycomp()}""")
+        eq_(
+            template.render(variable='hi').strip(),
+            "hello mycomp hi"
+        )
+
+    def test_def_args(self):
+        template = Template("""
+        <%def name="mycomp(a, b)">
+            hello mycomp ${variable}, ${a}, ${b}
+        </%def>
+
+        ${mycomp(5, 6)}""")
+        eq_(
+            template.render(variable='hi', a=5, b=6).strip(),
+            """hello mycomp hi, 5, 6"""
+        )
+
+    def test_inter_def(self):
+        """test defs calling each other"""
+        template = Template("""
+        ${b()}
+
+        <%def name="a()">\
+        im a
+        </%def>
+
+        <%def name="b()">
+        im b
+        and heres a:  ${a()}
+        </%def>
+
+        <%def name="c()">
+        im c
+        </%def>
+""")
+        # check that "a" is declared in "b", but not in "c"
+        assert "a" not in template.module.render_c.func_code.co_varnames
+        assert "a" in template.module.render_b.func_code.co_varnames
+
+        # then test output
+        eq_(
+            flatten_result(template.render()),
+            "im b and heres a: im a"
+        )
+
+    def test_toplevel(self):
+        """test calling a def from the top level"""
+
+        template = Template("""
+
+            this is the body
+
+            <%def name="a()">
+                this is a
+            </%def>
+
+            <%def name="b(x, y)">
+                this is b, ${x} ${y}
+            </%def>
+
+        """)
+
+        self._do_test(template.get_def("a"),
+                    "this is a",
+                    filters=flatten_result)
+        self._do_test(template.get_def("b"),
+                    "this is b, 10 15",
+                    template_args={'x': 10, 'y': 15},
+                    filters=flatten_result)
+        self._do_test(template.get_def("body"),
+                    "this is the body",
+                    filters=flatten_result)
+
+        # test that args outside of the dict can be used
+        self._do_test(template.get_def("a"), "this is a",
+                        filters=flatten_result,
+                        template_args={'q': 5, 'zq': 'test'})
+
+class ScopeTest(TemplateTest):
+    """test scoping rules.  The key is, enclosing
+    scope always takes precedence over contextual scope."""
+
+    def test_scope_one(self):
+        self._do_memory_test("""
+        <%def name="a()">
+            this is a, and y is ${y}
+        </%def>
+
+        ${a()}
+
+        <%
+            y = 7
+        %>
+
+        ${a()}
+
+""",
+            "this is a, and y is None this is a, and y is 7",
+            filters=flatten_result,
+            template_args={'y': None}
+        )
+
+    def test_scope_two(self):
+        t = Template("""
+        y is ${y}
+
+        <%
+            y = 7
+        %>
+
+        y is ${y}
+""")
+        try:
+            t.render(y=None)
+            assert False
+        except UnboundLocalError:
+            assert True
+
+    def test_scope_four(self):
+        """test that variables are pulled
+        from 'enclosing' scope before context."""
+        t = Template("""
+            <%
+                x = 5
+            %>
+            <%def name="a()">
+                this is a. x is ${x}.
+            </%def>
+
+            <%def name="b()">
+                <%
+                    x = 9
+                %>
+                this is b. x is ${x}.
+                calling a. ${a()}
+            </%def>
+
+            ${b()}
+""")
+        eq_(
+            flatten_result(t.render()),
+            "this is b. x is 9. calling a. this is a. x is 5."
+        )
+
+    def test_scope_five(self):
+        """test that variables are pulled from
+        'enclosing' scope before context."""
+        # same as test four, but adds a scope around it.
+        t = Template("""
+            <%def name="enclosing()">
+            <%
+                x = 5
+            %>
+            <%def name="a()">
+                this is a. x is ${x}.
+            </%def>
+
+            <%def name="b()">
+                <%
+                    x = 9
+                %>
+                this is b. x is ${x}.
+                calling a. ${a()}
+            </%def>
+
+            ${b()}
+            </%def>
+            ${enclosing()}
+""")
+        eq_(
+            flatten_result(t.render()),
+            "this is b. x is 9. calling a. this is a. x is 5."
+        )
+
+    def test_scope_six(self):
+        """test that the initial context counts
+        as 'enclosing' scope, for plain defs"""
+        t = Template("""
+
+        <%def name="a()">
+            a: x is ${x}
+        </%def>
+
+        <%def name="b()">
+            <%
+                x = 10
+            %>
+            b. x is ${x}.  ${a()}
+        </%def>
+
+        ${b()}
+    """)
+        eq_(
+            flatten_result(t.render(x=5)),
+            "b. x is 10. a: x is 5"
+        )
+
+    def test_scope_seven(self):
+        """test that the initial context counts
+        as 'enclosing' scope, for nested defs"""
+        t = Template("""
+        <%def name="enclosing()">
+            <%def name="a()">
+                a: x is ${x}
+            </%def>
+
+            <%def name="b()">
+                <%
+                    x = 10
+                %>
+                b. x is ${x}.  ${a()}
+            </%def>
+
+            ${b()}
+        </%def>
+        ${enclosing()}
+    """)
+        eq_(
+            flatten_result(t.render(x=5)),
+            "b. x is 10. a: x is 5"
+        )
+
+    def test_scope_eight(self):
+        """test that the initial context counts
+        as 'enclosing' scope, for nested defs"""
+        t = Template("""
+        <%def name="enclosing()">
+            <%def name="a()">
+                a: x is ${x}
+            </%def>
+
+            <%def name="b()">
+                <%
+                    x = 10
+                %>
+
+                b. x is ${x}.  ${a()}
+            </%def>
+
+            ${b()}
+        </%def>
+        ${enclosing()}
+    """)
+        eq_(
+            flatten_result(t.render(x=5)),
+            "b. x is 10. a: x is 5"
+        )
+
+    def test_scope_nine(self):
+        """test that 'enclosing scope' doesnt
+        get exported to other templates"""
+
+        l = lookup.TemplateLookup()
+        l.put_string('main', """
+        <%
+            x = 5
+        %>
+        this is main.  <%include file="secondary"/>
+""")
+
+        l.put_string('secondary', """
+        this is secondary.  x is ${x}
+""")
+
+        eq_(
+            flatten_result(l.get_template('main').render(x=2)),
+            "this is main. this is secondary. x is 2"
+        )
+
+    def test_scope_ten(self):
+        t = Template("""
+            <%def name="a()">
+                <%def name="b()">
+                    <%
+                        y = 19
+                    %>
+                    b/c: ${c()}
+                    b/y: ${y}
+                </%def>
+                <%def name="c()">
+                    c/y: ${y}
+                </%def>
+
+                <%
+                    # we assign to "y".  but the 'enclosing
+                    # scope' of "b" and "c" is from
+                    # the "y" on the outside
+                    y = 10
+                %>
+                a/y: ${y}
+                a/b: ${b()}
+            </%def>
+
+            <%
+                y = 7
+            %>
+            main/a: ${a()}
+            main/y: ${y}
+    """)
+        eq_(
+            flatten_result(t.render()),
+            "main/a: a/y: 10 a/b: b/c: c/y: 10 b/y: 19 main/y: 7"
+        )
+
+    def test_scope_eleven(self):
+        t = Template("""
+            x is ${x}
+            <%def name="a(x)">
+                this is a, ${b()}
+                <%def name="b()">
+                    this is b, x is ${x}
+                </%def>
+            </%def>
+
+            ${a(x=5)}
+""")
+        eq_(
+            result_lines(t.render(x=10)),
+        [
+            "x is 10",
+            "this is a,",
+            "this is b, x is 5"
+        ])
+
+    def test_unbound_scope(self):
+        t = Template("""
+            <%
+                y = 10
+            %>
+            <%def name="a()">
+                y is: ${y}
+                <%
+                    # should raise error ?
+                    y = 15
+                %>
+                y is ${y}
+            </%def>
+            ${a()}
+""")
+        assert_raises(
+            UnboundLocalError,
+            t.render
+            )
+
+    def test_unbound_scope_two(self):
+        t = Template("""
+            <%def name="enclosing()">
+            <%
+                y = 10
+            %>
+            <%def name="a()">
+                y is: ${y}
+                <%
+                    # should raise error ?
+                    y = 15
+                %>
+                y is ${y}
+            </%def>
+            ${a()}
+            </%def>
+            ${enclosing()}
+""")
+        try:
+            print t.render()
+            assert False
+        except UnboundLocalError:
+            assert True
+
+    def test_canget_kwargs(self):
+        """test that arguments passed to the body()
+        function are accessible by top-level defs"""
+        l = lookup.TemplateLookup()
+        l.put_string("base", """
+
+        ${next.body(x=12)}
+
+        """)
+
+        l.put_string("main", """
+            <%inherit file="base"/>
+            <%page args="x"/>
+            this is main.  x is ${x}
+
+            ${a()}
+
+            <%def name="a(**args)">
+                this is a, x is ${x}
+            </%def>
+        """)
+
+        # test via inheritance
+        eq_(
+            result_lines(l.get_template("main").render()),
+            [
+            "this is main. x is 12",
+            "this is a, x is 12"
+        ])
+
+        l.put_string("another", """
+            <%namespace name="ns" file="main"/>
+
+            ${ns.body(x=15)}
+        """)
+        # test via namespace
+        eq_(
+            result_lines(l.get_template("another").render()),
+        [
+            "this is main. x is 15",
+            "this is a, x is 15"
+        ])
+
+    def test_inline_expression_from_arg_one(self):
+        """test that cache_key=${foo} gets its value from
+        the 'foo' argument in the <%def> tag,
+        and strict_undefined doesn't complain.
+
+        this is #191.
+
+        """
+        t = Template("""
+        <%def name="layout(foo)" cached="True" cache_key="${foo}">
+        foo: ${foo}
+        </%def>
+
+        ${layout(3)}
+        """, strict_undefined=True,
+            cache_impl="plain")
+
+        eq_(
+            result_lines(t.render()),
+            ["foo: 3"]
+        )
+
+    def test_interpret_expression_from_arg_two(self):
+        """test that cache_key=${foo} gets its value from
+        the 'foo' argument regardless of it being passed
+        from the context.
+
+        This is here testing that there's no change
+        to existing behavior before and after #191.
+
+        """
+        t = Template("""
+        <%def name="layout(foo)" cached="True" cache_key="${foo}">
+        foo: ${value}
+        </%def>
+
+        ${layout(3)}
+        """, cache_impl="plain")
+
+        eq_(
+            result_lines(t.render(foo='foo', value=1)),
+            ["foo: 1"]
+        )
+        eq_(
+            result_lines(t.render(foo='bar', value=2)),
+            ["foo: 1"]
+        )
+
+class NestedDefTest(TemplateTest):
+    def test_nested_def(self):
+        t = Template("""
+
+        ${hi()}
+
+        <%def name="hi()">
+            hey, im hi.
+            and heres ${foo()}, ${bar()}
+
+            <%def name="foo()">
+                this is foo
+            </%def>
+
+            <%def name="bar()">
+                this is bar
+            </%def>
+        </%def>
+""")
+        eq_(
+            flatten_result(t.render()),
+            "hey, im hi. and heres this is foo , this is bar"
+        )
+
+    def test_nested_2(self):
+        t = Template("""
+            x is ${x}
+            <%def name="a()">
+                this is a, x is ${x}
+                ${b()}
+                <%def name="b()">
+                    this is b: ${x}
+                </%def>
+            </%def>
+            ${a()}
+""")
+
+        eq_(
+            flatten_result(t.render(x=10)),
+            "x is 10 this is a, x is 10 this is b: 10"
+        )
+
+    def test_nested_with_args(self):
+        t = Template("""
+        ${a()}
+        <%def name="a()">
+            <%def name="b(x, y=2)">
+                b x is ${x} y is ${y}
+            </%def>
+            a ${b(5)}
+        </%def>
+""")
+        eq_(
+            flatten_result(t.render()),
+            "a b x is 5 y is 2"
+        )
+
+    def test_nested_def_2(self):
+        template = Template("""
+        ${a()}
+        <%def name="a()">
+            <%def name="b()">
+                <%def name="c()">
+                    comp c
+                </%def>
+                ${c()}
+            </%def>
+            ${b()}
+        </%def>
+""")
+        eq_(
+            flatten_result(template.render()),
+            "comp c"
+        )
+
+    def test_nested_nested_def(self):
+        t = Template("""
+
+        ${a()}
+        <%def name="a()">
+            a
+            <%def name="b1()">
+                a_b1
+            </%def>
+            <%def name="b2()">
+                a_b2 ${c1()}
+                <%def name="c1()">
+                    a_b2_c1
+                </%def>
+            </%def>
+            <%def name="b3()">
+                a_b3 ${c1()}
+                <%def name="c1()">
+                    a_b3_c1 heres x: ${x}
+                    <%
+                        y = 7
+                    %>
+                    y is ${y}
+                </%def>
+                <%def name="c2()">
+                    a_b3_c2
+                    y is ${y}
+                    c1 is ${c1()}
+                </%def>
+                ${c2()}
+            </%def>
+
+            ${b1()} ${b2()}  ${b3()}
+        </%def>
+""")
+        eq_(
+            flatten_result(t.render(x=5, y=None)),
+            "a a_b1 a_b2 a_b2_c1 a_b3 a_b3_c1 "
+            "heres x: 5 y is 7 a_b3_c2 y is "
+            "None c1 is a_b3_c1 heres x: 5 y is 7"
+        )
+
+    def test_nested_nested_def_2(self):
+        t = Template("""
+        <%def name="a()">
+            this is a ${b()}
+            <%def name="b()">
+                this is b
+                ${c()}
+            </%def>
+
+            <%def name="c()">
+                this is c
+            </%def>
+        </%def>
+        ${a()}
+""")
+        eq_(
+            flatten_result(t.render()),
+            "this is a this is b this is c"
+        )
+
+    def test_outer_scope(self):
+        t = Template("""
+        <%def name="a()">
+            a: x is ${x}
+        </%def>
+
+        <%def name="b()">
+            <%def name="c()">
+            <%
+                x = 10
+            %>
+            c. x is ${x}.  ${a()}
+            </%def>
+
+            b. ${c()}
+        </%def>
+
+        ${b()}
+
+        x is ${x}
+""")
+        eq_(
+            flatten_result(t.render(x=5)),
+            "b. c. x is 10. a: x is 5 x is 5"
+        )
+
+class ExceptionTest(TemplateTest):
+    def test_raise(self):
+        template = Template("""
+            <%
+                raise Exception("this is a test")
+            %>
+    """, format_exceptions=False)
+        assert_raises(
+            Exception,
+            template.render
+            )
+
+    def test_handler(self):
+        def handle(context, error):
+            context.write("error message is " + str(error))
+            return True
+
+        template = Template("""
+            <%
+                raise Exception("this is a test")
+            %>
+    """, error_handler=handle)
+        eq_(
+            template.render().strip(),
+            "error message is this is a test"
+        )
+
diff --git a/lib/mako-0.7.2/test/test_exceptions.py b/lib/mako-0.7.2/test/test_exceptions.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_exceptions.py
@@ -0,0 +1,296 @@
+# -*- coding: utf-8 -*-
+import sys
+import unittest
+
+from mako import exceptions, util
+from mako.template import Template
+from mako.lookup import TemplateLookup
+from util import result_lines
+from test import template_base, module_base, TemplateTest
+from test import requires_pygments_14, requires_no_pygments
+
+class ExceptionsTest(TemplateTest):
+    def test_html_error_template(self):
+        """test the html_error_template"""
+        code = """
+% i = 0
+"""
+        try:
+            template = Template(code)
+            template.render_unicode()
+            assert False
+        except exceptions.CompileException, ce:
+            html_error = exceptions.html_error_template().render_unicode()
+            assert ("CompileException: Fragment &#39;i = 0&#39; is not "
+                    "a partial control statement at line: 2 char: 1") in html_error
+            assert '<style>' in html_error
+            html_error_stripped = html_error.strip()
+            assert html_error_stripped.startswith('<html>')
+            assert html_error_stripped.endswith('</html>')
+
+            not_full = exceptions.html_error_template().\
+                                    render_unicode(full=False)
+            assert '<html>' not in not_full
+            assert '<style>' in not_full
+
+            no_css = exceptions.html_error_template().\
+                                    render_unicode(css=False)
+            assert '<style>' not in no_css
+        else:
+            assert False, ("This function should trigger a CompileException, "
+                           "but didn't")
+
+    def test_text_error_template(self):
+        code = """
+% i = 0
+"""
+        try:
+            template = Template(code)
+            template.render_unicode()
+            assert False
+        except exceptions.CompileException, ce:
+            text_error = exceptions.text_error_template().render_unicode()
+            assert 'Traceback (most recent call last):' in text_error
+            assert ("CompileException: Fragment 'i = 0' is not a partial "
+                    "control statement") in text_error
+
+    @requires_pygments_14
+    def test_utf8_html_error_template_pygments(self):
+        """test the html_error_template with a Template containing utf8
+        chars"""
+ 
+        if util.py3k:
+            code = """# -*- coding: utf-8 -*-
+% if 2 == 2: /an error
+${'??????'}
+% endif
+"""
+        else:
+            code = """# -*- coding: utf-8 -*-
+% if 2 == 2: /an error
+${u'??????'}
+% endif
+"""
+        try:
+            template = Template(code)
+            template.render_unicode()
+        except exceptions.CompileException, ce:
+            html_error = exceptions.html_error_template().render()
+            if util.py3k:
+                assert ("CompileException: Fragment &#39;if 2 == 2: /an "
+                    "error&#39; is not a partial control statement "
+                    "at line: 2 char: 1").encode(sys.getdefaultencoding(), 'htmlentityreplace') in \
+                    html_error
+            else:
+                assert ("CompileException: Fragment &#39;if 2 == 2: /an "
+                        "error&#39; is not a partial control statement "
+                        "at line: 2 char: 1") in \
+                        html_error
+ 
+            if util.py3k:
+                assert u"".encode(sys.getdefaultencoding(),
+                                        'htmlentityreplace') in html_error
+            else:
+                assert u'<pre>3</pre></div></td><td class="code">'\
+                        '<div class="syntax-highlighted"><pre><span '\
+                        'class="cp">${</span><span class="s">u&#39;'\
+                        '&#x43F;&#x440;&#x438;&#x432;&#x435;&#x442;'\
+                        '&#39;</span><span class="cp">}</span>'.encode(
+                                sys.getdefaultencoding(),
+                                'htmlentityreplace') in html_error
+        else:
+            assert False, ("This function should trigger a CompileException, "
+                           "but didn't")
+
+    @requires_no_pygments
+    def test_utf8_html_error_template_no_pygments(self):
+        """test the html_error_template with a Template containing utf8
+        chars"""
+ 
+        if util.py3k:
+            code = """# -*- coding: utf-8 -*-
+% if 2 == 2: /an error
+${'??????'}
+% endif
+"""
+        else:
+            code = """# -*- coding: utf-8 -*-
+% if 2 == 2: /an error
+${u'??????'}
+% endif
+"""
+        try:
+            template = Template(code)
+            template.render_unicode()
+        except exceptions.CompileException, ce:
+            html_error = exceptions.html_error_template().render()
+            if util.py3k:
+                assert ("CompileException: Fragment &#39;if 2 == 2: /an "
+                    "error&#39; is not a partial control statement "
+                    "at line: 2 char: 1").encode(sys.getdefaultencoding(), 'htmlentityreplace') in \
+                    html_error
+            else:
+                assert ("CompileException: Fragment &#39;if 2 == 2: /an "
+                        "error&#39; is not a partial control statement "
+                        "at line: 2 char: 1") in \
+                        html_error
+ 
+            if util.py3k:
+                assert u"${&#39;??????&#39;}".encode(sys.getdefaultencoding(),
+                                        'htmlentityreplace') in html_error
+            else:
+                assert u"${u&#39;??????&#39;}".encode(sys.getdefaultencoding(),
+                                        'htmlentityreplace') in html_error
+        else:
+            assert False, ("This function should trigger a CompileException, "
+                           "but didn't")
+ 
+    def test_format_closures(self):
+        try:
+            exec "def foo():"\
+                 "    raise RuntimeError('test')"\
+                 in locals()
+            foo()
+        except:
+            html_error = exceptions.html_error_template().render()
+            assert "RuntimeError: test" in str(html_error)
+ 
+    def test_py_utf8_html_error_template(self):
+        try:
+            foo = u'??'
+            raise RuntimeError('test')
+        except:
+            html_error = exceptions.html_error_template().render()
+            if util.py3k:
+                assert 'RuntimeError: test' in html_error.decode('utf-8')
+                assert u"foo = &#39;??&#39;" in html_error.decode('utf-8')
+            else:
+                assert 'RuntimeError: test' in html_error
+                assert "foo = u&#39;&#x65E5;&#x672C;&#39;" in html_error
+
+    def test_py_unicode_error_html_error_template(self):
+        try:
+            raise RuntimeError(u'??')
+        except:
+            html_error = exceptions.html_error_template().render()
+            assert u"RuntimeError: ??".encode('ascii', 'ignore') in html_error
+
+    @requires_pygments_14
+    def test_format_exceptions_pygments(self):
+        l = TemplateLookup(format_exceptions=True)
+
+        l.put_string("foo.html", """
+<%inherit file="base.html"/>
+${foobar}
+        """)
+
+        l.put_string("base.html", """
+        ${self.body()}
+        """)
+
+        assert '<div class="sourceline"><table class="syntax-highlightedtable">'\
+                '<tr><td class="linenos"><div class="linenodiv"><pre>3</pre>'\
+                '</div></td><td class="code"><div class="syntax-highlighted">'\
+                '<pre><span class="err">$</span><span class="p">{</span>'\
+                '<span class="n">foobar</span><span class="p">}</span>' in \
+            result_lines(l.get_template("foo.html").render_unicode())
+
+    @requires_no_pygments
+    def test_format_exceptions_no_pygments(self):
+        l = TemplateLookup(format_exceptions=True)
+
+        l.put_string("foo.html", """
+<%inherit file="base.html"/>
+${foobar}
+        """)
+
+        l.put_string("base.html", """
+        ${self.body()}
+        """)
+
+        assert '<div class="sourceline">${foobar}</div>' in \
+            result_lines(l.get_template("foo.html").render_unicode())
+ 
+    @requires_pygments_14
+    def test_utf8_format_exceptions_pygments(self):
+        """test that htmlentityreplace formatting is applied to 
+           exceptions reported with format_exceptions=True"""
+ 
+        l = TemplateLookup(format_exceptions=True)
+        if util.py3k:
+            l.put_string("foo.html", """# -*- coding: utf-8 -*-\n${'??????' + foobar}""")
+        else:
+            l.put_string("foo.html", """# -*- coding: utf-8 -*-\n${u'??????' + foobar}""")
+
+        if util.py3k:
+            assert '<table class="error syntax-highlightedtable"><tr><td '\
+                    'class="linenos"><div class="linenodiv"><pre>2</pre>'\
+                    '</div></td><td class="code"><div class="error '\
+                    'syntax-highlighted"><pre><span class="cp">${</span>'\
+                    '<span class="s">&#39;??????&#39;</span> <span class="o">+</span> '\
+                    '<span class="n">foobar</span><span class="cp">}</span>'\
+                    '<span class="x"></span>' in \
+                result_lines(l.get_template("foo.html").render().decode('utf-8'))
+        else:
+            assert '<table class="error syntax-highlightedtable"><tr><td '\
+                    'class="linenos"><div class="linenodiv"><pre>2</pre>'\
+                    '</div></td><td class="code"><div class="error '\
+                    'syntax-highlighted"><pre><span class="cp">${</span>'\
+                    '<span class="s">u&#39;&#x43F;&#x440;&#x438;&#x432;'\
+                    '&#x435;&#x442;&#39;</span> <span class="o">+</span> '\
+                    '<span class="n">foobar</span><span class="cp">}</span>'\
+                    '<span class="x"></span>' in \
+                result_lines(l.get_template("foo.html").render().decode('utf-8'))
+
+    @requires_no_pygments
+    def test_utf8_format_exceptions_no_pygments(self):
+        """test that htmlentityreplace formatting is applied to 
+           exceptions reported with format_exceptions=True"""
+ 
+        l = TemplateLookup(format_exceptions=True)
+        if util.py3k:
+            l.put_string("foo.html", """# -*- coding: utf-8 -*-\n${'??????' + foobar}""")
+        else:
+            l.put_string("foo.html", """# -*- coding: utf-8 -*-\n${u'??????' + foobar}""")
+
+        if util.py3k:
+            assert u'<div class="sourceline">${&#39;??????&#39; + foobar}</div>'\
+                in result_lines(l.get_template("foo.html").render().decode('utf-8'))
+        else:
+            assert '${u&#39;&#x43F;&#x440;&#x438;&#x432;&#x435;'\
+                   '&#x442;&#39; + foobar}' in \
+                result_lines(l.get_template("foo.html").render().decode('utf-8'))
+ 
+ 
+    def test_custom_tback(self):
+        try:
+            raise RuntimeError("error 1")
+            foo('bar')
+        except:
+            t, v, tback = sys.exc_info()
+ 
+        try:
+            raise RuntimeError("error 2")
+        except:
+            html_error = exceptions.html_error_template().\
+                        render_unicode(error=v, traceback=tback)
+ 
+        # obfuscate the text so that this text
+        # isn't in the 'wrong' exception
+        assert "".join(reversed(");93#&rab;93#&(oof")) in html_error
+
+    def test_tback_no_trace(self):
+        try:
+            t = self._file_template("runtimeerr.html")
+            t.render()
+        except:
+            t, v, tback = sys.exc_info()
+
+        if not util.py3k:
+            # blow away tracebaack info
+            sys.exc_clear()
+ 
+        # and don't even send what we have.
+        html_error = exceptions.html_error_template().\
+                    render_unicode(error=v, traceback=None)
+        assert "local variable &#39;y&#39; referenced before assignment" in html_error
diff --git a/lib/mako-0.7.2/test/test_filters.py b/lib/mako-0.7.2/test/test_filters.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_filters.py
@@ -0,0 +1,322 @@
+# -*- coding: utf-8 -*-
+
+from mako.template import Template
+import unittest
+from mako import util
+from test import TemplateTest, eq_, skip_if, assert_raises
+from util import result_lines, flatten_result
+
+class FilterTest(TemplateTest):
+    def test_basic(self):
+        t = Template("""
+        ${x | myfilter}
+""")
+        assert flatten_result(t.render(x="this is x", myfilter=lambda t: "MYFILTER->%s<-MYFILTER" % t)) == "MYFILTER->this is x<-MYFILTER"
+
+    def test_expr(self):
+        """test filters that are themselves expressions"""
+        t = Template("""
+        ${x | myfilter(y)}
+""")
+        def myfilter(y):
+            return lambda x: "MYFILTER->%s<-%s" % (x, y)
+        assert flatten_result(t.render(x="this is x", myfilter=myfilter, y="this is y")) == "MYFILTER->this is x<-this is y"
+
+    def test_convert_str(self):
+        """test that string conversion happens in expressions before sending to filters"""
+        t = Template("""
+            ${x | trim}
+        """)
+        assert flatten_result(t.render(x=5)) == "5"
+ 
+    def test_quoting(self):
+        t = Template("""
+            foo ${bar | h}
+        """)
+ 
+        eq_(
+            flatten_result(t.render(bar="<'some bar'>")),
+            "foo &lt;&#39;some bar&#39;&gt;"
+        )
+ 
+    @skip_if(lambda: util.py3k)
+    def test_quoting_non_unicode(self):
+        t = Template("""
+            foo ${bar | h}
+        """, disable_unicode=True,
+        output_encoding=None)
+
+        eq_(
+            flatten_result(t.render(bar="<'??????'>")),
+            "foo &lt;&#39;??????&#39;&gt;"
+        )
+ 
+ 
+    def test_def(self):
+        t = Template("""
+            <%def name="foo()" filter="myfilter">
+                this is foo
+            </%def>
+            ${foo()}
+""")
+
+        eq_(
+            flatten_result(t.render(x="this is x", 
+                        myfilter=lambda t: "MYFILTER->%s<-MYFILTER" % t)),
+            "MYFILTER-> this is foo <-MYFILTER"
+        )
+
+    def test_import(self):
+        t = Template("""
+        <%!
+            from mako import filters
+        %>\
+        trim this string: ${"  some string to trim   " | filters.trim} continue\
+        """)
+
+        assert t.render().strip()=="trim this string: some string to trim continue"
+ 
+    def test_import_2(self):
+        t = Template("""
+        trim this string: ${"  some string to trim   " | filters.trim} continue\
+        """, imports=["from mako import filters"])
+        #print t.code
+        assert t.render().strip()=="trim this string: some string to trim continue"
+
+    def test_encode_filter(self):
+        t = Template("""# coding: utf-8
+            some stuff.... ${x}
+        """, default_filters=['decode.utf8'])
+        #print t.code
+        assert t.render_unicode(x="voix m?a r?veill?").strip() == u"some stuff.... voix m?a r?veill?"
+ 
+    def test_custom_default(self):
+        t = Template("""
+        <%!
+            def myfilter(x):
+                return "->" + x + "<-"
+        %>
+ 
+            hi ${'there'}
+        """, default_filters=['myfilter'])
+        assert t.render().strip()=="hi ->there<-"
+ 
+    def test_global(self):
+        t = Template("""
+            <%page expression_filter="h"/>
+            ${"<tag>this is html</tag>"}
+        """)
+        assert t.render().strip()  == "&lt;tag&gt;this is html&lt;/tag&gt;"
+
+    def test_block_via_context(self):
+        t = Template("""
+            <%block name="foo" filter="myfilter">
+                some text
+            </%block>
+        """)
+        def myfilter(text):
+            return "MYTEXT" + text
+        eq_(
+            result_lines(t.render(myfilter=myfilter)),
+            ["MYTEXT", "some text"]
+        )
+
+    def test_def_via_context(self):
+        t = Template("""
+            <%def name="foo()" filter="myfilter">
+                some text
+            </%def>
+            ${foo()}
+        """)
+        def myfilter(text):
+            return "MYTEXT" + text
+        eq_(
+            result_lines(t.render(myfilter=myfilter)),
+            ["MYTEXT", "some text"]
+        )
+
+    def test_nflag(self):
+        t = Template("""
+            ${"<tag>this is html</tag>" | n}
+        """, default_filters=['h', 'unicode'])
+        assert t.render().strip()  == "<tag>this is html</tag>"
+
+        t = Template("""
+            <%page expression_filter="h"/>
+            ${"<tag>this is html</tag>" | n}
+        """)
+        assert t.render().strip()  == "<tag>this is html</tag>"
+
+        t = Template("""
+            <%page expression_filter="h"/>
+            ${"<tag>this is html</tag>" | n, h}
+        """)
+        assert t.render().strip()  == "&lt;tag&gt;this is html&lt;/tag&gt;"
+ 
+    def test_non_expression(self):
+        t = Template("""
+        <%!
+            def a(text):
+                return "this is a"
+            def b(text):
+                return "this is b"
+        %>
+ 
+        ${foo()}
+        <%def name="foo()" buffered="True">
+            this is text
+        </%def>
+        """, buffer_filters=['a'])
+        assert t.render().strip() == "this is a"
+
+        t = Template("""
+        <%!
+            def a(text):
+                return "this is a"
+            def b(text):
+                return "this is b"
+        %>
+ 
+        ${'hi'}
+        ${foo()}
+        <%def name="foo()" buffered="True">
+            this is text
+        </%def>
+        """, buffer_filters=['a'], default_filters=['b'])
+        assert flatten_result(t.render()) == "this is b this is b"
+
+        t = Template("""
+        <%!
+            class Foo(object):
+                foo = True
+                def __str__(self):
+                    return "this is a"
+            def a(text):
+                return Foo()
+            def b(text):
+                if hasattr(text, 'foo'):
+                    return str(text)
+                else:
+                    return "this is b"
+        %>
+ 
+        ${'hi'}
+        ${foo()}
+        <%def name="foo()" buffered="True">
+            this is text
+        </%def>
+        """, buffer_filters=['a'], default_filters=['b'])
+        assert flatten_result(t.render()) == "this is b this is a"
+
+        t = Template("""
+        <%!
+            def a(text):
+                return "this is a"
+            def b(text):
+                return "this is b"
+        %>
+ 
+        ${foo()}
+        ${bar()}
+        <%def name="foo()" filter="b">
+            this is text
+        </%def>
+        <%def name="bar()" filter="b" buffered="True">
+            this is text
+        </%def>
+        """, buffer_filters=['a'])
+        assert flatten_result(t.render()) == "this is b this is a"
+
+ 
+    def test_builtins(self):
+        t = Template("""
+            ${"this is <text>" | h}
+""")
+        assert flatten_result(t.render()) == "this is &lt;text&gt;"
+ 
+        t = Template("""
+            http://foo.com/arg1=${"hi! this is a string." | u}
+""")
+        assert flatten_result(t.render()) == "http://foo.com/arg1=hi%21+this+is+a+string."
+
+class BufferTest(unittest.TestCase): 
+    def test_buffered_def(self):
+        t = Template("""
+            <%def name="foo()" buffered="True">
+                this is foo
+            </%def>
+            ${"hi->" + foo() + "<-hi"}
+""")
+        assert flatten_result(t.render()) == "hi-> this is foo <-hi"
+
+    def test_unbuffered_def(self):
+        t = Template("""
+            <%def name="foo()" buffered="False">
+                this is foo
+            </%def>
+            ${"hi->" + foo() + "<-hi"}
+""")
+        assert flatten_result(t.render()) == "this is foo hi-><-hi"
+
+    def test_capture(self):
+        t = Template("""
+            <%def name="foo()" buffered="False">
+                this is foo
+            </%def>
+            ${"hi->" + capture(foo) + "<-hi"}
+""")
+        assert flatten_result(t.render()) == "hi-> this is foo <-hi"
+
+    def test_capture_exception(self):
+        template = Template("""
+            <%def name="a()">
+                this is a
+                <% 
+                    raise TypeError("hi")
+                %>
+            </%def>
+            <%
+                c = capture(a)
+            %>
+            a->${c}<-a
+        """)
+        try:
+            template.render()
+            assert False
+        except TypeError:
+            assert True
+ 
+    def test_buffered_exception(self):
+        template = Template("""
+            <%def name="a()" buffered="True">
+                <%
+                    raise TypeError("hi")
+                %>
+            </%def>
+ 
+            ${a()}
+ 
+""") 
+        try:
+            print template.render()
+            assert False
+        except TypeError:
+            assert True
+ 
+    def test_capture_ccall(self):
+        t = Template("""
+            <%def name="foo()">
+                <%
+                    x = capture(caller.body)
+                %>
+                this is foo.  body: ${x}
+            </%def>
+
+            <%call expr="foo()">
+                ccall body
+            </%call>
+""")
+ 
+        #print t.render()
+        assert flatten_result(t.render()) == "this is foo. body: ccall body"
+ 
diff --git a/lib/mako-0.7.2/test/test_inheritance.py b/lib/mako-0.7.2/test/test_inheritance.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_inheritance.py
@@ -0,0 +1,350 @@
+from mako.template import Template
+from mako import lookup, util
+import unittest
+from util import flatten_result, result_lines
+
+class InheritanceTest(unittest.TestCase):
+    def test_basic(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main', """
+<%inherit file="base"/>
+
+<%def name="header()">
+    main header.
+</%def>
+
+this is the content.
+""")
+
+        collection.put_string('base', """
+This is base.
+
+header: ${self.header()}
+
+body: ${self.body()}
+
+footer: ${self.footer()}
+
+<%def name="footer()">
+    this is the footer. header again ${next.header()}
+</%def>
+""")
+
+        assert result_lines(collection.get_template('main').render()) == [
+            'This is base.',
+             'header:',
+             'main header.',
+             'body:',
+             'this is the content.',
+             'footer:',
+             'this is the footer. header again',
+             'main header.'
+        ]
+
+    def test_multilevel_nesting(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main', """
+<%inherit file="layout"/>
+<%def name="d()">main_d</%def>
+main_body ${parent.d()}
+full stack from the top:
+    ${self.name} ${parent.name} ${parent.context['parent'].name} ${parent.context['parent'].context['parent'].name}
+""")
+ 
+        collection.put_string('layout', """
+<%inherit file="general"/>
+<%def name="d()">layout_d</%def>
+layout_body
+parent name: ${parent.name}
+${parent.d()}
+${parent.context['parent'].d()}
+${next.body()}
+""")
+
+        collection.put_string('general', """
+<%inherit file="base"/>
+<%def name="d()">general_d</%def>
+general_body
+${next.d()}
+${next.context['next'].d()}
+${next.body()}
+""")
+        collection.put_string('base', """
+base_body
+full stack from the base:
+    ${self.name} ${self.context['parent'].name} ${self.context['parent'].context['parent'].name} ${self.context['parent'].context['parent'].context['parent'].name}
+${next.body()}
+<%def name="d()">base_d</%def>
+""")
+
+        assert result_lines(collection.get_template('main').render()) == [
+            'base_body',
+             'full stack from the base:',
+             'self:main self:layout self:general self:base',
+             'general_body',
+             'layout_d',
+             'main_d',
+             'layout_body',
+             'parent name: self:general',
+             'general_d',
+             'base_d',
+             'main_body layout_d',
+             'full stack from the top:',
+             'self:main self:layout self:general self:base'
+        ]
+ 
+    def test_includes(self):
+        """test that an included template also has its full hierarchy invoked."""
+        collection = lookup.TemplateLookup()
+ 
+        collection.put_string("base", """
+        <%def name="a()">base_a</%def>
+        This is the base.
+        ${next.body()}
+        End base.
+""")
+
+        collection.put_string("index","""
+        <%inherit file="base"/>
+        this is index.
+        a is: ${self.a()}
+        <%include file="secondary"/>
+""")
+
+        collection.put_string("secondary","""
+        <%inherit file="base"/>
+        this is secondary.
+        a is: ${self.a()}
+""")
+
+        assert result_lines(collection.get_template("index").render()) == [
+            'This is the base.', 
+            'this is index.',
+             'a is: base_a',
+             'This is the base.',
+             'this is secondary.',
+             'a is: base_a',
+             'End base.',
+             'End base.'
+            ]
+
+    def test_namespaces(self):
+        """test that templates used via <%namespace> have access to an inheriting 'self', and that
+        the full 'self' is also exported."""
+        collection = lookup.TemplateLookup()
+ 
+        collection.put_string("base", """
+        <%def name="a()">base_a</%def>
+        <%def name="b()">base_b</%def>
+        This is the base.
+        ${next.body()}
+""")
+
+        collection.put_string("layout", """
+        <%inherit file="base"/>
+        <%def name="a()">layout_a</%def>
+        This is the layout..
+        ${next.body()}
+""")
+
+        collection.put_string("index","""
+        <%inherit file="base"/>
+        <%namespace name="sc" file="secondary"/>
+        this is index.
+        a is: ${self.a()}
+        sc.a is: ${sc.a()}
+        sc.b is: ${sc.b()}
+        sc.c is: ${sc.c()}
+        sc.body is: ${sc.body()}
+""")
+
+        collection.put_string("secondary","""
+        <%inherit file="layout"/>
+        <%def name="c()">secondary_c.  a is ${self.a()} b is ${self.b()} d is ${self.d()}</%def>
+        <%def name="d()">secondary_d.</%def>
+        this is secondary.
+        a is: ${self.a()}
+        c is: ${self.c()}
+""")
+
+        assert result_lines(collection.get_template('index').render()) ==  ['This is the base.',
+         'this is index.',
+         'a is: base_a',
+         'sc.a is: layout_a',
+         'sc.b is: base_b',
+         'sc.c is: secondary_c. a is layout_a b is base_b d is secondary_d.',
+         'sc.body is:',
+         'this is secondary.',
+         'a is: layout_a',
+         'c is: secondary_c. a is layout_a b is base_b d is secondary_d.'
+         ]
+
+    def test_pageargs(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base", """
+            this is the base.
+
+            <%
+            sorted_ = pageargs.items()
+            sorted_ = sorted(sorted_)
+            %>
+            pageargs: (type: ${type(pageargs)}) ${sorted_}
+            <%def name="foo()">
+                ${next.body(**context.kwargs)}
+            </%def>
+ 
+            ${foo()}
+        """)
+        collection.put_string("index", """
+            <%inherit file="base"/>
+            <%page args="x, y, z=7"/>
+            print ${x}, ${y}, ${z}
+        """)
+ 
+        if util.py3k:
+            assert result_lines(collection.get_template('index').render_unicode(x=5,y=10)) == [
+                "this is the base.",
+                "pageargs: (type: <class 'dict'>) [('x', 5), ('y', 10)]",
+                "print 5, 10, 7"
+            ]
+        else:
+            assert result_lines(collection.get_template('index').render_unicode(x=5,y=10)) == [
+                "this is the base.",
+                "pageargs: (type: <type 'dict'>) [('x', 5), ('y', 10)]",
+                "print 5, 10, 7"
+            ]
+ 
+    def test_pageargs_2(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base", """
+            this is the base.
+ 
+            ${next.body(**context.kwargs)}
+ 
+            <%def name="foo(**kwargs)">
+                ${next.body(**kwargs)}
+            </%def>
+
+            <%def name="bar(**otherargs)">
+                ${next.body(z=16, **context.kwargs)}
+            </%def>
+
+            ${foo(x=12, y=15, z=8)}
+            ${bar(x=19, y=17)}
+        """)
+        collection.put_string("index", """
+            <%inherit file="base"/>
+            <%page args="x, y, z=7"/>
+            pageargs: ${x}, ${y}, ${z}
+        """)
+        assert result_lines(collection.get_template('index').render(x=5,y=10)) == [
+            "this is the base.",
+            "pageargs: 5, 10, 7",
+            "pageargs: 12, 15, 8",
+            "pageargs: 5, 10, 16"
+        ]
+ 
+    def test_pageargs_err(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base", """
+            this is the base.
+            ${next.body()}
+        """)
+        collection.put_string("index", """
+            <%inherit file="base"/>
+            <%page args="x, y, z=7"/>
+            print ${x}, ${y}, ${z}
+        """)
+        try:
+            print collection.get_template('index').render(x=5,y=10)
+            assert False
+        except TypeError:
+            assert True
+ 
+    def test_toplevel(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base", """
+            this is the base.
+            ${next.body()}
+        """)
+        collection.put_string("index", """
+            <%inherit file="base"/>
+            this is the body
+        """)
+        assert result_lines(collection.get_template('index').render()) == [
+            "this is the base.",
+            "this is the body"
+        ]
+        assert result_lines(collection.get_template('index').get_def("body").render()) == [
+            "this is the body"
+        ]
+
+    def test_dynamic(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base", """
+            this is the base.
+            ${next.body()}
+        """)
+        collection.put_string("index", """
+            <%!
+                def dyn(context):
+                    if context.get('base', None) is not None:
+                        return 'base'
+                    else:
+                        return None
+            %>
+            <%inherit file="${dyn(context)}"/>
+            this is index.
+        """)
+        assert result_lines(collection.get_template('index').render()) == [
+            'this is index.'
+        ]
+        assert result_lines(collection.get_template('index').render(base=True)) == [
+            'this is the base.',
+            'this is index.'
+        ]
+ 
+    def test_in_call(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("/layout.html","""
+        Super layout!
+        <%call expr="self.grid()">
+            ${next.body()}
+        </%call>
+        Oh yea!
+
+        <%def name="grid()">
+            Parent grid
+                ${caller.body()}
+            End Parent
+        </%def>
+        """)
+
+
+        collection.put_string("/subdir/layout.html", """
+        ${next.body()}
+        <%def name="grid()">
+           Subdir grid
+               ${caller.body()}
+           End subdir
+        </%def>
+        <%inherit file="/layout.html"/>
+        """)
+ 
+        collection.put_string("/subdir/renderedtemplate.html","""
+        Holy smokes!
+        <%inherit file="/subdir/layout.html"/>
+        """)
+
+        #print collection.get_template("/layout.html").code
+        #print collection.get_template("/subdir/renderedtemplate.html").render()
+        assert result_lines(collection.get_template("/subdir/renderedtemplate.html").render()) == [
+            "Super layout!",
+            "Subdir grid",
+            "Holy smokes!",
+            "End subdir",
+            "Oh yea!"
+        ]
+
diff --git a/lib/mako-0.7.2/test/test_lexer.py b/lib/mako-0.7.2/test/test_lexer.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_lexer.py
@@ -0,0 +1,871 @@
+import unittest
+
+from mako.lexer import Lexer
+from mako import exceptions, util
+from util import flatten_result, result_lines
+from mako.template import Template
+import re
+from test import TemplateTest, template_base, skip_if, eq_, assert_raises_message
+
+# create fake parsetree classes which are constructed
+# exactly as the repr() of a real parsetree object.
+# this allows us to use a Python construct as the source
+# of a comparable repr(), which is also hit by the 2to3 tool.
+
+def repr_arg(x):
+    if isinstance(x, dict):
+        return util.sorted_dict_repr(x)
+    else:
+        return repr(x)
+
+from mako import parsetree
+for cls in parsetree.__dict__.values():
+    if isinstance(cls, type) and \
+        issubclass(cls, parsetree.Node):
+        clsname = cls.__name__
+        exec ("""
+class %s(object):
+    def __init__(self, *args):
+        self.args = args
+    def __repr__(self):
+        return "%%s(%%s)" %% (
+            self.__class__.__name__,
+            ", ".join(repr_arg(x) for x in self.args)
+            )
+""" % clsname) in locals()
+
+# NOTE: most assertion expressions were generated, then formatted
+# by PyTidy, hence the dense formatting.
+
+class LexerTest(TemplateTest):
+
+    def _compare(self, node, expected):
+        eq_(repr(node), repr(expected))
+
+    def test_text_and_tag(self):
+        template = """
+<b>Hello world</b>
+        <%def name="foo()">
+                this is a def.
+        </%def>
+        
+        and some more text.
+"""
+        node = Lexer(template).parse()
+        self._compare(node, TemplateNode({},
+                      [Text(u'''\n<b>Hello world</b>\n        ''', (1,
+                      1)), DefTag(u'def', {u'name': u'foo()'}, (3, 9),
+                      [Text(u'''\n                this is a def.\n        ''',
+                      (3, 28))]),
+                      Text(u'''\n        \n        and some more text.\n''',
+                      (5, 16))]))
+
+    def test_unclosed_tag(self):
+        template = """
+        
+            <%def name="foo()">
+             other text
+        """
+        try:
+            nodes = Lexer(template).parse()
+            assert False
+        except exceptions.SyntaxException, e:
+            assert str(e) == "Unclosed tag: <%def> at line: 5 char: 9"
+
+    def test_onlyclosed_tag(self):
+        template = \
+            """
+            <%def name="foo()">
+                foo
+            </%def>
+            
+            </%namespace>
+            
+            hi.
+        """
+        self.assertRaises(exceptions.SyntaxException,
+                          Lexer(template).parse)
+
+    def test_noexpr_allowed(self):
+        template = \
+            """
+            <%namespace name="${foo}"/>
+        """
+        self.assertRaises(exceptions.CompileException,
+                          Lexer(template).parse)
+
+    def test_unmatched_tag(self):
+        template = \
+            """
+        <%namespace name="bar">
+        <%def name="foo()">
+            foo
+            </%namespace>
+        </%def>
+        
+        
+        hi.
+"""
+        self.assertRaises(exceptions.SyntaxException,
+                          Lexer(template).parse)
+
+    def test_nonexistent_tag(self):
+        template = """
+            <%lala x="5"/>
+        """
+        self.assertRaises(exceptions.CompileException,
+                          Lexer(template).parse)
+
+    def test_wrongcase_tag(self):
+        template = \
+            """
+            <%DEF name="foo()">
+            </%def>
+        
+        """
+        self.assertRaises(exceptions.CompileException,
+                          Lexer(template).parse)
+
+    def test_percent_escape(self):
+        template = \
+            """
+        
+%% some whatever.
+
+    %% more some whatever
+    % if foo:
+    % endif
+        """
+        node = Lexer(template).parse()
+        self._compare(node, TemplateNode({}, [Text(u'''\n        \n''',
+                      (1, 1)), Text(u'''% some whatever.\n\n''', (3, 2)),
+                      Text(u'   %% more some whatever\n', (5, 2)),
+                      ControlLine(u'if', u'if foo:', False, (6, 1)),
+                      ControlLine(u'if', u'endif', True, (7, 1)),
+                      Text(u'        ', (8, 1))]))
+
+    def test_text_tag(self):
+        template = \
+            """
+        ## comment
+        % if foo:
+            hi
+        % endif
+        <%text>
+            # more code
+            
+            % more code
+            <%illegal compionent>/></>
+            <%def name="laal()">def</%def>
+            
+            
+        </%text>
+
+        <%def name="foo()">this is foo</%def>
+        
+        % if bar:
+            code
+        % endif
+        """
+        node = Lexer(template).parse()
+        self._compare(node, 
+            TemplateNode({}, [Text(u'\n', (1, 1)),
+              Comment(u'comment', (2, 1)), 
+              ControlLine(u'if', u'if foo:', False, (3, 1)),
+              Text(u'            hi\n', (4, 1)),
+              ControlLine(u'if', u'endif', True, (5, 1)),
+              Text(u'        ', (6, 1)), TextTag(u'text', {},
+              (6, 9),
+              [Text(u'''\n            # more code\n            '''
+              '''\n            % more code\n            '''
+              '''<%illegal compionent>/></>\n            '''
+              '''<%def name="laal()">def</%def>\n       '''
+              '''     \n            \n        ''',
+                      (6, 16))]), Text(u'''
+
+        ''', (14, 17)),
+                      DefTag(u'def', {u'name': u'foo()'}, (16, 9),
+                      [Text(u'this is foo', (16, 28))]),
+                      Text(u'''\n        \n''', (16, 46)),
+                      ControlLine(u'if', u'if bar:', False, (18, 1)),
+                      Text(u'            code\n', (19, 1)),
+                      ControlLine(u'if', u'endif', True, (20, 1)),
+                      Text(u'        ', (21, 1))]))
+
+    def test_def_syntax(self):
+        template = \
+            """
+        <%def lala>
+            hi
+        </%def>
+"""
+        self.assertRaises(exceptions.CompileException,
+                          Lexer(template).parse)
+
+    def test_def_syntax_2(self):
+        template = \
+            """
+        <%def name="lala">
+            hi
+        </%def>
+    """
+        self.assertRaises(exceptions.CompileException,
+                          Lexer(template).parse)
+
+    def test_whitespace_equals(self):
+        template = \
+            """
+            <%def name = "adef()" >
+              adef
+            </%def>
+        """
+        node = Lexer(template).parse()
+        self._compare(node, TemplateNode({}, [Text(u'\n            ',
+                      (1, 1)), DefTag(u'def', {u'name': u'adef()'}, (2,
+                      13),
+                      [Text(u'''\n              adef\n            ''',
+                      (2, 36))]), Text(u'\n        ', (4, 20))]))
+
+    def test_ns_tag_closed(self):
+        template = \
+            """
+        
+            <%self:go x="1" y="2" z="${'hi' + ' ' + 'there'}"/>
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Text(u'''
+        
+            ''', (1, 1)),
+                      CallNamespaceTag(u'self:go', {u'x': u'1', u'y'
+                      : u'2', u'z': u"${'hi' + ' ' + 'there'}"}, (3,
+                      13), []), Text(u'\n        ', (3, 64))]))
+
+    def test_ns_tag_empty(self):
+        template = \
+            """
+            <%form:option value=""></%form:option>
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [Text(u'\n            ',
+                      (1, 1)), CallNamespaceTag(u'form:option',
+                      {u'value': u''}, (2, 13), []), Text(u'\n        '
+                      , (2, 51))]))
+
+    def test_ns_tag_open(self):
+        template = \
+            """
+        
+            <%self:go x="1" y="${process()}">
+                this is the body
+            </%self:go>
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Text(u'''
+        
+            ''', (1, 1)),
+                      CallNamespaceTag(u'self:go', {u'x': u'1', u'y'
+                      : u'${process()}'}, (3, 13),
+                      [Text(u'''
+                this is the body
+            ''',
+                      (3, 46))]), Text(u'\n        ', (5, 24))]))
+
+    def test_expr_in_attribute(self):
+        """test some slightly trickier expressions.
+        
+        you can still trip up the expression parsing, though, unless we
+        integrated really deeply somehow with AST."""
+
+        template = \
+            """
+            <%call expr="foo>bar and 'lala' or 'hoho'"/>
+            <%call expr='foo<bar and hoho>lala and "x" + "y"'/>
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [Text(u'\n            ',
+                      (1, 1)), CallTag(u'call', {u'expr'
+                      : u"foo>bar and 'lala' or 'hoho'"}, (2, 13), []),
+                      Text(u'\n            ', (2, 57)), CallTag(u'call'
+                      , {u'expr': u'foo<bar and hoho>lala and "x" + "y"'
+                      }, (3, 13), []), Text(u'\n        ', (3, 64))]))
+
+    def test_pagetag(self):
+        template = \
+            """
+            <%page cached="True", args="a, b"/>
+            
+            some template
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [Text(u'\n            ',
+                      (1, 1)), PageTag(u'page', {u'args': u'a, b',
+                      u'cached': u'True'}, (2, 13), []),
+                      Text(u'''
+            
+            some template
+        ''',
+                      (2, 48))]))
+
+    def test_nesting(self):
+        template = \
+            """
+        
+        <%namespace name="ns">
+            <%def name="lala(hi, there)">
+                <%call expr="something()"/>
+            </%def>
+        </%namespace>
+        
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Text(u'''
+        
+        ''', (1, 1)),
+                      NamespaceTag(u'namespace', {u'name': u'ns'}, (3,
+                      9), [Text(u'\n            ', (3, 31)),
+                      DefTag(u'def', {u'name': u'lala(hi, there)'}, (4,
+                      13), [Text(u'\n                ', (4, 42)),
+                      CallTag(u'call', {u'expr': u'something()'}, (5,
+                      17), []), Text(u'\n            ', (5, 44))]),
+                      Text(u'\n        ', (6, 20))]),
+                      Text(u'''
+        
+        ''', (7, 22))]))
+
+    if util.py3k:
+        def test_code(self):
+            template = \
+"""text
+    <%
+        print("hi")
+        for x in range(1,5):
+            print(x)
+    %>
+more text
+    <%!
+        import foo
+    %>
+"""
+            nodes = Lexer(template).parse()
+            self._compare(nodes, 
+            TemplateNode({}, [
+                Text(u'text\n    ', (1, 1)), 
+                Code(u'\nprint("hi")\nfor x in range(1,5):\n    '
+                            'print(x)\n    \n', False, (2, 5)), 
+                Text(u'\nmore text\n    ', (6, 7)), 
+                Code(u'\nimport foo\n    \n', True, (8, 5)), 
+                Text(u'\n', (10, 7))])
+            )
+
+
+    else:
+
+        def test_code(self):
+            template = \
+"""text
+    <%
+        print "hi"
+        for x in range(1,5):
+            print x
+    %>
+more text
+    <%!
+        import foo
+    %>
+"""
+            nodes = Lexer(template).parse()
+            self._compare(nodes, 
+            TemplateNode({}, [
+                Text(u'text\n    ', (1, 1)), 
+                Code(u'\nprint "hi"\nfor x in range(1,5):\n    '
+                            'print x\n    \n', False, (2, 5)), 
+                Text(u'\nmore text\n    ', (6, 7)), 
+                Code(u'\nimport foo\n    \n', True, (8, 5)), 
+                Text(u'\n', (10, 7))])
+            )
+
+    def test_code_and_tags(self):
+        template = \
+            """
+<%namespace name="foo">
+    <%def name="x()">
+        this is x
+    </%def>
+    <%def name="y()">
+        this is y
+    </%def>
+</%namespace>
+
+<%
+    result = []
+    data = get_data()
+    for x in data:
+        result.append(x+7)
+%>
+
+    result: <%call expr="foo.x(result)"/>
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [Text(u'\n', (1, 1)),
+                      NamespaceTag(u'namespace', {u'name': u'foo'}, (2,
+                      1), [Text(u'\n    ', (2, 24)), DefTag(u'def',
+                      {u'name': u'x()'}, (3, 5),
+                      [Text(u'''\n        this is x\n    ''', (3, 22))]),
+                      Text(u'\n    ', (5, 12)), DefTag(u'def', {u'name'
+                      : u'y()'}, (6, 5),
+                      [Text(u'''\n        this is y\n    ''', (6, 22))]),
+                      Text(u'\n', (8, 12))]), Text(u'''\n\n''', (9, 14)),
+                      Code(u'''\nresult = []\ndata = get_data()\n'''
+                      '''for x in data:\n    result.append(x+7)\n\n''',
+                      False, (11, 1)), Text(u'''\n\n    result: ''', (16,
+                      3)), CallTag(u'call', {u'expr': u'foo.x(result)'
+                      }, (18, 13), []), Text(u'\n', (18, 42))]))
+
+    def test_expression(self):
+        template = \
+            """
+        this is some ${text} and this is ${textwith | escapes, moreescapes}
+        <%def name="hi()">
+            give me ${foo()} and ${bar()}
+        </%def>
+        ${hi()}
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Text(u'\n        this is some ', (1, 1)),
+                      Expression(u'text', [], (2, 22)),
+                      Text(u' and this is ', (2, 29)),
+                      Expression(u'textwith ', ['escapes', 'moreescapes'
+                      ], (2, 42)), Text(u'\n        ', (2, 76)),
+                      DefTag(u'def', {u'name': u'hi()'}, (3, 9),
+                      [Text(u'\n            give me ', (3, 27)),
+                      Expression(u'foo()', [], (4, 21)), Text(u' and ',
+                      (4, 29)), Expression(u'bar()', [], (4, 34)),
+                      Text(u'\n        ', (4, 42))]), Text(u'\n        '
+                      , (5, 16)), Expression(u'hi()', [], (6, 9)),
+                      Text(u'\n', (6, 16))]))
+
+
+    def test_tricky_expression(self):
+        template = """
+        
+            ${x and "|" or "hi"}
+        """
+        nodes = Lexer(template).parse()
+        self._compare(
+            nodes,
+            TemplateNode({}, [
+                Text(u'\n        \n            ', (1, 1)), 
+                Expression(u'x and "|" or "hi"', [], (3, 13)), 
+                Text(u'\n        ', (3, 33))
+            ])
+        )
+
+        template = """
+        
+            ${hello + '''heres '{|}' text | | }''' | escape1}
+        """
+        nodes = Lexer(template).parse()
+        self._compare(
+            nodes,
+            TemplateNode({}, [
+                Text(u'\n        \n            ', (1, 1)), 
+                Expression(u"hello + '''heres '{|}' text | | }''' ", 
+                                ['escape1'], (3, 13)), 
+                Text(u'\n        ', (3, 62))
+            ])
+        )
+
+    def test_tricky_code(self):
+        if util.py3k:
+            template = """<% print('hi %>') %>"""
+            nodes = Lexer(template).parse()
+            self._compare(nodes, TemplateNode({},
+                          [Code(u"print('hi %>') \n", False, (1, 1))]))
+        else:
+            template = """<% print 'hi %>' %>"""
+            nodes = Lexer(template).parse()
+            self._compare(nodes, TemplateNode({},
+                          [Code(u"print 'hi %>' \n", False, (1, 1))]))
+
+    def test_tricky_code_2(self):
+        template = \
+            """<% 
+        # someone's comment
+        %>
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Code(u""" 
+        # someone's comment
+        
+""",
+                      False, (1, 1)), Text(u'\n        ', (3, 11))]))
+
+    if util.py3k:
+        def test_tricky_code_3(self):
+            template = \
+                """<%
+            print('hi')
+            # this is a comment
+            # another comment
+            x = 7 # someone's '''comment
+            print('''
+        there
+        ''')
+            # someone else's comment
+        %> '''and now some text '''"""
+            nodes = Lexer(template).parse()
+            self._compare(nodes, TemplateNode({},
+                          [Code(u"""
+print('hi')
+# this is a comment
+# another comment
+x = 7 # someone's '''comment
+print('''
+        there
+        ''')
+# someone else's comment
+        
+""",
+                          False, (1, 1)),
+                          Text(u" '''and now some text '''", (10,
+                          11))]))
+    else:
+        def test_tricky_code_3(self):
+            template = \
+                """<%
+            print 'hi'
+            # this is a comment
+            # another comment
+            x = 7 # someone's '''comment
+            print '''
+        there
+        '''
+            # someone else's comment
+        %> '''and now some text '''"""
+            nodes = Lexer(template).parse()
+            self._compare(nodes, TemplateNode({},
+                      [Code(u"""\nprint 'hi'\n# this is a comment\n"""
+                      """# another comment\nx = 7 """
+                      """# someone's '''comment\nprint '''\n        """
+                      """there\n        '''\n# someone else's """
+                      """comment\n        \n""",
+                      False, (1, 1)),
+                      Text(u" '''and now some text '''", (10,11))]))
+
+    def test_tricky_code_4(self):
+        template = \
+            """<% foo = "\\"\\\\" %>"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Code(u"""foo = "\\"\\\\" \n""",
+                      False, (1, 1))]))
+
+    def test_tricky_code_5(self):
+        template = \
+            """before ${ {'key': 'value'} } after"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Text(u'before ', (1, 1)),
+                      Expression(u" {'key': 'value'} ", [], (1, 8)),
+                      Text(u' after', (1, 29))]))
+
+    def test_control_lines(self):
+        template = \
+            """
+text text la la
+% if foo():
+ mroe text la la blah blah
+% endif
+
+        and osme more stuff
+        % for l in range(1,5):
+    tex tesl asdl l is ${l} kfmas d
+      % endfor
+    tetx text
+    
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Text(u'''\ntext text la la\n''', (1, 1)),
+                      ControlLine(u'if', u'if foo():', False, (3, 1)),
+                      Text(u' mroe text la la blah blah\n', (4, 1)),
+                      ControlLine(u'if', u'endif', True, (5, 1)),
+                      Text(u'''\n        and osme more stuff\n''', (6,
+                      1)), ControlLine(u'for', u'for l in range(1,5):',
+                      False, (8, 1)), Text(u'    tex tesl asdl l is ',
+                      (9, 1)), Expression(u'l', [], (9, 24)),
+                      Text(u' kfmas d\n', (9, 28)), ControlLine(u'for',
+                      u'endfor', True, (10, 1)),
+                      Text(u'''    tetx text\n    \n''', (11, 1))]))
+
+    def test_control_lines_2(self):
+        template = \
+"""% for file in requestattr['toc'].filenames:
+    x
+% endfor
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [ControlLine(u'for',
+                      u"for file in requestattr['toc'].filenames:",
+                      False, (1, 1)), Text(u'    x\n', (2, 1)),
+                      ControlLine(u'for', u'endfor', True, (3, 1))]))
+
+    def test_long_control_lines(self):
+        template = \
+        """
+    % for file in \\
+        requestattr['toc'].filenames:
+        x
+    % endfor
+        """
+        nodes = Lexer(template).parse()
+        self._compare(
+            nodes,
+            TemplateNode({}, [
+                Text(u'\n', (1, 1)), 
+                ControlLine(u'for', u"for file in \\\n        "
+                                "requestattr['toc'].filenames:", 
+                                False, (2, 1)), 
+                Text(u'        x\n', (4, 1)), 
+                ControlLine(u'for', u'endfor', True, (5, 1)), 
+                Text(u'        ', (6, 1))
+            ])
+        )
+
+    def test_unmatched_control(self):
+        template = """
+
+        % if foo:
+            % for x in range(1,5):
+        % endif
+"""
+        assert_raises_message(
+            exceptions.SyntaxException,
+            "Keyword 'endif' doesn't match keyword 'for' at line: 5 char: 1",
+            Lexer(template).parse
+        )
+
+    def test_unmatched_control_2(self):
+        template = """
+
+        % if foo:
+            % for x in range(1,5):
+            % endfor
+"""
+
+        assert_raises_message(
+            exceptions.SyntaxException,
+            "Unterminated control keyword: 'if' at line: 3 char: 1",
+            Lexer(template).parse
+        )
+
+    def test_unmatched_control_3(self):
+        template = """
+
+        % if foo:
+            % for x in range(1,5):
+            % endlala
+        % endif
+"""
+        assert_raises_message(
+            exceptions.SyntaxException,
+            "Keyword 'endlala' doesn't match keyword 'for' at line: 5 char: 1",
+            Lexer(template).parse
+        )
+
+    def test_ternary_control(self):
+        template = \
+            """
+        % if x:
+            hi
+        % elif y+7==10:
+            there
+        % elif lala:
+            lala
+        % else:
+            hi
+        % endif
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [Text(u'\n', (1, 1)),
+                      ControlLine(u'if', u'if x:', False, (2, 1)),
+                      Text(u'            hi\n', (3, 1)),
+                      ControlLine(u'elif', u'elif y+7==10:', False, (4,
+                      1)), Text(u'            there\n', (5, 1)),
+                      ControlLine(u'elif', u'elif lala:', False, (6,
+                      1)), Text(u'            lala\n', (7, 1)),
+                      ControlLine(u'else', u'else:', False, (8, 1)),
+                      Text(u'            hi\n', (9, 1)),
+                      ControlLine(u'if', u'endif', True, (10, 1))]))
+
+    def test_integration(self):
+        template = \
+            """<%namespace name="foo" file="somefile.html"/>
+ ## inherit from foobar.html
+<%inherit file="foobar.html"/>
+
+<%def name="header()">
+     <div>header</div>
+</%def>
+<%def name="footer()">
+    <div> footer</div>
+</%def>
+
+<table>
+    % for j in data():
+    <tr>
+        % for x in j:
+            <td>Hello ${x| h}</td>
+        % endfor
+    </tr>
+    % endfor
+</table>
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [NamespaceTag(u'namespace'
+                      , {u'file': u'somefile.html', u'name': u'foo'},
+                      (1, 1), []), Text(u'\n', (1, 46)),
+                      Comment(u'inherit from foobar.html', (2, 1)),
+                      InheritTag(u'inherit', {u'file': u'foobar.html'},
+                      (3, 1), []), Text(u'''\n\n''', (3, 31)),
+                      DefTag(u'def', {u'name': u'header()'}, (5, 1),
+                      [Text(u'''\n     <div>header</div>\n''', (5,
+                      23))]), Text(u'\n', (7, 8)), DefTag(u'def',
+                      {u'name': u'footer()'}, (8, 1),
+                      [Text(u'''\n    <div> footer</div>\n''', (8,
+                      23))]), Text(u'''\n\n<table>\n''', (10, 8)),
+                      ControlLine(u'for', u'for j in data():', False,
+                      (13, 1)), Text(u'    <tr>\n', (14, 1)),
+                      ControlLine(u'for', u'for x in j:', False, (15,
+                      1)), Text(u'            <td>Hello ', (16, 1)),
+                      Expression(u'x', ['h'], (16, 23)), Text(u'</td>\n'
+                      , (16, 30)), ControlLine(u'for', u'endfor', True,
+                      (17, 1)), Text(u'    </tr>\n', (18, 1)),
+                      ControlLine(u'for', u'endfor', True, (19, 1)),
+                      Text(u'</table>\n', (20, 1))]))
+
+    def test_comment_after_statement(self):
+        template = \
+            """
+        % if x: #comment
+            hi
+        % else: #next
+            hi
+        % endif #end
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({}, [Text(u'\n', (1, 1)),
+                      ControlLine(u'if', u'if x: #comment', False, (2,
+                      1)), Text(u'            hi\n', (3, 1)),
+                      ControlLine(u'else', u'else: #next', False, (4,
+                      1)), Text(u'            hi\n', (5, 1)),
+                      ControlLine(u'if', u'endif #end', True, (6, 1))]))
+
+    def test_crlf(self):
+        template = open(self._file_path("crlf.html"), 'rb').read()
+        nodes = Lexer(template).parse()
+        self._compare(
+            nodes,
+            TemplateNode({}, [
+                Text(u'<html>\r\n\r\n', (1, 1)), 
+                PageTag(u'page', {
+                            u'args': u"a=['foo',\n                'bar']"
+                        }, (3, 1), []), 
+                Text(u'\r\n\r\nlike the name says.\r\n\r\n', (4, 26)), 
+                ControlLine(u'for', u'for x in [1,2,3]:', False, (8, 1)), 
+                Text(u'        ', (9, 1)), 
+                Expression(u'x', [], (9, 9)), 
+                ControlLine(u'for', u'endfor', True, (10, 1)), 
+                Text(u'\r\n', (11, 1)), 
+                Expression(u"trumpeter == 'Miles' and "
+                                "trumpeter or \\\n      'Dizzy'", 
+                                [], (12, 1)), 
+                Text(u'\r\n\r\n', (13, 15)), 
+                DefTag(u'def', {u'name': u'hi()'}, (15, 1), [
+                    Text(u'\r\n    hi!\r\n', (15, 19))]), 
+                    Text(u'\r\n\r\n</html>\r\n', (17, 8))
+                ])
+        )
+        assert flatten_result(Template(template).render()) \
+            == """<html> like the name says. 1 2 3 Dizzy </html>"""
+
+    def test_comments(self):
+        template = \
+            """
+<style>
+ #someselector
+ # other non comment stuff
+</style>
+## a comment
+
+# also not a comment
+
+   ## this is a comment
+   
+this is ## not a comment
+
+<%doc> multiline
+comment
+</%doc>
+
+hi
+"""
+        nodes = Lexer(template).parse()
+        self._compare(nodes, TemplateNode({},
+                      [Text(u'''\n<style>\n #someselector\n # '''
+                        '''other non comment stuff\n</style>\n''',
+                      (1, 1)), Comment(u'a comment', (6, 1)),
+                      Text(u'''\n# also not a comment\n\n''', (7, 1)),
+                      Comment(u'this is a comment', (10, 1)),
+                      Text(u'''   \nthis is ## not a comment\n\n''', (11,
+                      1)), Comment(u''' multiline\ncomment\n''', (14,
+                      1)), Text(u'''
+
+hi
+''', (16, 8))]))
+
+    def test_docs(self):
+        template = \
+            """
+        <%doc>
+            this is a comment
+        </%doc>
+        <%def name="foo()">
+            <%doc>
+                this is the foo func
+            </%doc>
+        </%def>
+        """
+        nodes = Lexer(template).parse()
+        self._compare(nodes, 
+            TemplateNode({}, [Text(u'\n        ', (1,
+              1)),
+              Comment(u'''\n            this is a comment\n        ''',
+              (2, 9)), Text(u'\n        ', (4, 16)),
+              DefTag(u'def', {u'name': u'foo()'}, (5, 9),
+              [Text(u'\n            ', (5, 28)),
+              Comment(u'''\n                this is the foo func\n'''
+                '''            ''',
+              (6, 13)), Text(u'\n        ', (8, 20))]),
+              Text(u'\n        ', (9, 16))]))
+
+    def test_preprocess(self):
+
+        def preproc(text):
+            return re.sub(r'(?<=\n)\s*#[^#]', '##', text)
+
+        template = \
+            """
+    hi
+    # old style comment
+# another comment
+"""
+        nodes = Lexer(template, preprocessor=preproc).parse()
+        self._compare(nodes, TemplateNode({}, [Text(u'''\n    hi\n''',
+                      (1, 1)), Comment(u'old style comment', (3, 1)),
+                      Comment(u'another comment', (4, 1))]))
diff --git a/lib/mako-0.7.2/test/test_lookup.py b/lib/mako-0.7.2/test/test_lookup.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_lookup.py
@@ -0,0 +1,104 @@
+from mako.template import Template
+from mako import lookup, exceptions, runtime
+from mako.util import FastEncodingBuffer
+from util import flatten_result, result_lines
+import unittest
+import os
+
+from test import TemplateTest, template_base, module_base, assert_raises_message
+
+tl = lookup.TemplateLookup(directories=[template_base])
+class LookupTest(unittest.TestCase):
+    def test_basic(self):
+        t = tl.get_template('index.html')
+        assert result_lines(t.render()) == [
+            "this is index"
+        ]
+    def test_subdir(self):
+        t = tl.get_template('/subdir/index.html')
+        assert result_lines(t.render()) == [
+            "this is sub index",
+            "this is include 2"
+
+        ]
+
+        assert tl.get_template('/subdir/index.html').module_id \
+                            == '_subdir_index_html'
+ 
+    def test_updir(self):
+        t = tl.get_template('/subdir/foo/../bar/../index.html')
+        assert result_lines(t.render()) == [
+            "this is sub index",
+            "this is include 2"
+
+        ]
+ 
+    def test_directory_lookup(self):
+        """test that hitting an existent directory still raises
+        LookupError."""
+ 
+        self.assertRaises(exceptions.TopLevelLookupException,
+            tl.get_template, "/subdir"
+        )
+ 
+    def test_no_lookup(self):
+        t = Template("hi <%include file='foo.html'/>")
+        try:
+            t.render()
+            assert False
+        except exceptions.TemplateLookupException, e:
+            assert str(e) == \
+                "Template 'memory:%s' has no TemplateLookup associated" % \
+                hex(id(t))
+ 
+    def test_uri_adjust(self):
+        tl = lookup.TemplateLookup(directories=['/foo/bar'])
+        assert tl.filename_to_uri('/foo/bar/etc/lala/index.html') == \
+                        '/etc/lala/index.html'
+
+        tl = lookup.TemplateLookup(directories=['./foo/bar'])
+        assert tl.filename_to_uri('./foo/bar/etc/index.html') == \
+                        '/etc/index.html'
+ 
+    def test_uri_cache(self):
+        """test that the _uri_cache dictionary is available"""
+        tl._uri_cache[('foo', 'bar')] = '/some/path'
+        assert tl._uri_cache[('foo', 'bar')] == '/some/path'
+ 
+    def test_check_not_found(self):
+        tl = lookup.TemplateLookup()
+        tl.put_string("foo", "this is a template")
+        f = tl.get_template("foo")
+        assert f.uri in tl._collection
+        f.filename = "nonexistent"
+        self.assertRaises(exceptions.TemplateLookupException,
+            tl.get_template, "foo"
+        )
+        assert f.uri not in tl._collection
+
+    def test_dont_accept_relative_outside_of_root(self):
+        """test the mechanics of an include where 
+        the include goes outside of the path"""
+        tl = lookup.TemplateLookup(directories=[os.path.join(template_base, "subdir")])
+        index = tl.get_template("index.html")
+
+        ctx = runtime.Context(FastEncodingBuffer())
+        ctx._with_template=index
+
+        assert_raises_message(
+            exceptions.TemplateLookupException,
+           "Template uri \"../index.html\" is invalid - it "
+            "cannot be relative outside of the root path",
+            runtime._lookup_template, ctx, "../index.html", index.uri
+        )
+
+        assert_raises_message(
+            exceptions.TemplateLookupException,
+           "Template uri \"../othersubdir/foo.html\" is invalid - it "
+            "cannot be relative outside of the root path",
+            runtime._lookup_template, ctx, "../othersubdir/foo.html", index.uri
+        )
+
+        # this is OK since the .. cancels out
+        t = runtime._lookup_template(ctx, "foo/../index.html", index.uri)
+
diff --git a/lib/mako-0.7.2/test/test_loop.py b/lib/mako-0.7.2/test/test_loop.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_loop.py
@@ -0,0 +1,295 @@
+import re
+import unittest
+
+from mako.template import Template
+from mako.lookup import TemplateLookup
+from mako.codegen import (
+        _FOR_LOOP, mangle_mako_loop, LoopVariable
+    )
+from mako.runtime import LoopStack, LoopContext
+from mako import exceptions
+from test import assert_raises_message
+from test import TemplateTest, eq_
+from util import flatten_result, result_lines
+
+class TestLoop(unittest.TestCase):
+
+    def test__FOR_LOOP(self):
+        for statement, target_list, expression_list in (
+                ('for x in y:', 'x', 'y'),
+                ('for x, y in z:', 'x, y', 'z'),
+                ('for (x,y) in z:', '(x,y)', 'z'),
+                ('for ( x, y, z) in a:', '( x, y, z)', 'a'),
+                ('for x in [1, 2, 3]:', 'x', '[1, 2, 3]'),
+                ('for x in "spam":', 'x', '"spam"'),
+                ('for k,v in dict(a=1,b=2).items():', 'k,v',
+                    'dict(a=1,b=2).items()'),
+                ('for x in [y+1 for y in [1, 2, 3]]:', 'x',
+                    '[y+1 for y in [1, 2, 3]]')
+                ):
+            match = _FOR_LOOP.match(statement)
+            assert match and match.groups() == (target_list, expression_list)
+
+    def test_no_loop(self):
+        template = Template("""% for x in 'spam':
+${x}
+% endfor""")
+        code = template.code
+        assert not re.match(r"loop = __M_loop._enter\(:", code), "No need to "\
+                "generate a loop context if the loop variable wasn't accessed"
+        print template.render()
+
+    def test_loop_demo(self):
+        template = Template("""x|index|reverse_index|first|last|cycle|even|odd
+% for x in 'ham':
+${x}|${loop.index}|${loop.reverse_index}|${loop.first}|${loop.last}|${loop.cycle('even', 'odd')}|${loop.even}|${loop.odd}
+% endfor""")
+        expected = [
+                "x|index|reverse_index|first|last|cycle|even|odd",
+                "h|0|2|True|False|even|True|False",
+                "a|1|1|False|False|odd|False|True",
+                "m|2|0|False|True|even|True|False"
+            ]
+        code = template.code
+        assert "loop = __M_loop._enter(" in code, "Generated a loop context since "\
+                "the loop variable was accessed"
+        rendered = template.render()
+        print rendered
+        for line in expected:
+            assert line in rendered, "Loop variables give information about "\
+                    "the progress of the loop"
+
+    def test_nested_loops(self):
+        template = Template("""% for x in 'ab':
+${x} ${loop.index} <- start in outer loop
+% for y in [0, 1]:
+${y} ${loop.index} <- go to inner loop
+% endfor
+${x} ${loop.index} <- back to outer loop
+% endfor""")
+        code = template.code
+        rendered = template.render()
+        expected = [
+                "a 0 <- start in outer loop",
+                "0 0 <- go to inner loop",
+                "1 1 <- go to inner loop",
+                "a 0 <- back to outer loop",
+                "b 1 <- start in outer loop",
+                "0 0 <- go to inner loop",
+                "1 1 <- go to inner loop",
+                "b 1 <- back to outer loop",
+            ]
+        for line in expected:
+            assert line in rendered, "The LoopStack allows you to take "\
+                    "advantage of the loop variable even in embedded loops"
+
+    def test_parent_loops(self):
+        template = Template("""% for x in 'ab':
+${x} ${loop.index} <- outer loop
+% for y in [0, 1]:
+${y} ${loop.index} <- inner loop
+${x} ${loop.parent.index} <- parent loop
+% endfor
+${x} ${loop.index} <- outer loop
+% endfor""")
+        code = template.code
+        rendered = template.render()
+        expected = [
+                "a 0 <- outer loop",
+                "a 0 <- parent loop",
+                "b 1 <- outer loop",
+                "b 1 <- parent loop"
+            ]
+        for line in expected:
+            print code
+            assert line in rendered, "The parent attribute of a loop gives "\
+                    "you the previous loop context in the stack"
+
+    def test_out_of_context_access(self):
+        template = Template("""${loop.index}""")
+        assert_raises_message(
+            exceptions.RuntimeException,
+            "No loop context is established",
+            template.render
+        )
+
+class TestLoopStack(unittest.TestCase):
+
+    def setUp(self):
+        self.stack = LoopStack()
+        self.bottom = 'spam'
+        self.stack.stack = [self.bottom]
+
+    def test_enter(self):
+        iterable = 'ham'
+        s = self.stack._enter(iterable)
+        assert s is self.stack.stack[-1], "Calling the stack with an iterable returns "\
+                "the stack"
+        assert iterable == self.stack.stack[-1]._iterable, "and pushes the "\
+                "iterable on the top of the stack"
+
+    def test__top(self):
+        assert self.bottom == self.stack._top, "_top returns the last item "\
+                "on the stack"
+
+    def test__pop(self):
+        assert len(self.stack.stack) == 1
+        top = self.stack._pop()
+        assert top == self.bottom
+        assert len(self.stack.stack) == 0
+
+    def test__push(self):
+        assert len(self.stack.stack) == 1
+        iterable = 'ham'
+        self.stack._push(iterable)
+        assert len(self.stack.stack) == 2
+        assert iterable is self.stack._top._iterable
+
+    def test_exit(self):
+        iterable = 'ham'
+        self.stack._enter(iterable)
+        before = len(self.stack.stack)
+        self.stack._exit()
+        after = len(self.stack.stack)
+        assert before == (after + 1), "Exiting a context pops the stack"
+
+
+class TestLoopContext(unittest.TestCase):
+
+    def setUp(self):
+        self.iterable = [1, 2, 3]
+        self.ctx = LoopContext(self.iterable)
+
+    def test___len__(self):
+        assert len(self.iterable) == len(self.ctx), "The LoopContext is the "\
+                "same length as the iterable"
+
+    def test_index(self):
+        expected = tuple(range(len(self.iterable)))
+        actual = tuple(self.ctx.index for i in self.ctx)
+        assert expected == actual, "The index is consistent with the current "\
+                "iteration count"
+
+    def test_reverse_index(self):
+        length = len(self.iterable)
+        expected = tuple([length-i-1 for i in range(length)])
+        actual = tuple(self.ctx.reverse_index for i in self.ctx)
+        print expected, actual
+        assert expected == actual, "The reverse_index is the number of "\
+                "iterations until the end"
+
+    def test_first(self):
+        expected = (True, False, False)
+        actual = tuple(self.ctx.first for i in self.ctx)
+        assert expected == actual, "first is only true on the first iteration"
+
+    def test_last(self):
+        expected = (False, False, True)
+        actual = tuple(self.ctx.last for i in self.ctx)
+        assert expected == actual, "last is only true on the last iteration"
+
+    def test_even(self):
+        expected = (True, False, True)
+        actual = tuple(self.ctx.even for i in self.ctx)
+        assert expected == actual, "even is true on even iterations"
+
+    def test_odd(self):
+        expected = (False, True, False)
+        actual = tuple(self.ctx.odd for i in self.ctx)
+        assert expected == actual, "odd is true on odd iterations"
+
+    def test_cycle(self):
+        expected = ('a', 'b', 'a')
+        actual = tuple(self.ctx.cycle('a', 'b') for i in self.ctx)
+        assert expected == actual, "cycle endlessly cycles through the values"
+
+class TestLoopFlags(TemplateTest):
+    def test_loop_disabled_template(self):
+        self._do_memory_test(
+        """
+            the loop: ${loop}
+        """, 
+        "the loop: hi",
+        template_args=dict(loop='hi'),
+        filters=flatten_result,
+        enable_loop=False
+        )
+
+    def test_loop_disabled_lookup(self):
+        l = TemplateLookup(enable_loop=False)
+        l.put_string("x",
+        """
+            the loop: ${loop}
+        """
+        )
+
+        self._do_test(
+            l.get_template("x"),
+            "the loop: hi",
+            template_args=dict(loop='hi'),
+            filters=flatten_result,
+        )
+
+    def test_loop_disabled_override_template(self):
+        self._do_memory_test(
+        """
+            <%page enable_loop="True" />
+            % for i in (1, 2, 3):
+                ${i} ${loop.index}
+            % endfor
+        """, 
+        "1 0 2 1 3 2",
+        template_args=dict(loop='hi'),
+        filters=flatten_result,
+        enable_loop=False
+        )
+
+    def test_loop_disabled_override_lookup(self):
+        l = TemplateLookup(enable_loop=False)
+        l.put_string("x",
+        """
+            <%page enable_loop="True" />
+            % for i in (1, 2, 3):
+                ${i} ${loop.index}
+            % endfor
+        """
+        )
+
+        self._do_test(
+            l.get_template("x"),
+            "1 0 2 1 3 2",
+            template_args=dict(loop='hi'),
+            filters=flatten_result,
+        )
+
+    def test_loop_enabled_override_template(self):
+        self._do_memory_test(
+        """
+            <%page enable_loop="True" />
+            % for i in (1, 2, 3):
+                ${i} ${loop.index}
+            % endfor
+        """, 
+        "1 0 2 1 3 2",
+        template_args=dict(),
+        filters=flatten_result,
+        )
+
+    def test_loop_enabled_override_lookup(self):
+        l = TemplateLookup()
+        l.put_string("x",
+        """
+            <%page enable_loop="True" />
+            % for i in (1, 2, 3):
+                ${i} ${loop.index}
+            % endfor
+        """
+        )
+
+        self._do_test(
+            l.get_template("x"),
+            "1 0 2 1 3 2",
+            template_args=dict(),
+            filters=flatten_result,
+        )
+
diff --git a/lib/mako-0.7.2/test/test_lru.py b/lib/mako-0.7.2/test/test_lru.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_lru.py
@@ -0,0 +1,111 @@
+from mako.util import LRUCache
+import string, unittest, time, random
+
+import thread
+
+class item:
+    def __init__(self, id):
+        self.id = id
+
+    def __str__(self):
+        return "item id %d" % self.id
+
+class LRUTest(unittest.TestCase):
+
+
+    def testlru(self): 
+        l = LRUCache(10, threshold=.2)
+ 
+        for id in range(1,20):
+            l[id] = item(id)
+ 
+        # first couple of items should be gone
+        self.assert_(not l.has_key(1)) 
+        self.assert_(not l.has_key(2))
+ 
+        # next batch over the threshold of 10 should be present
+        for id in range(11,20):
+            self.assert_(l.has_key(id))
+
+        l[12]
+        l[15]
+        l[23] = item(23)
+        l[24] = item(24)
+        l[25] = item(25)
+        l[26] = item(26)
+        l[27] = item(27)
+
+        self.assert_(not l.has_key(11))
+        self.assert_(not l.has_key(13))
+ 
+        for id in (25, 24, 23, 14, 12, 19, 18, 17, 16, 15):
+            self.assert_(l.has_key(id)) 
+
+    def _disabled_test_threaded(self):
+        size = 100
+        threshold = .5
+        all_elems = 2000
+        hot_zone = range(30,40)
+        cache = LRUCache(size, threshold)
+ 
+        # element to store
+        class Element(object):
+            def __init__(self, id):
+                self.id = id
+                self.regets = 0
+ 
+        # return an element.  we will favor ids in the relatively small
+        # "hot zone" 25% of  the time.
+        def get_elem():
+            if random.randint(1,4) == 1:
+                return hot_zone[random.randint(0, len(hot_zone) - 1)]
+            else:
+                return random.randint(1, all_elems)
+ 
+        total = [0]
+        # request thread.
+        def request_elem():
+            while True:
+                total[0] += 1
+                id = get_elem()
+                try:
+                    elem = cache[id]
+                    elem.regets += 1
+                except KeyError:
+                    e = Element(id)
+                    cache[id] = e
+ 
+                time.sleep(random.random() / 1000)
+
+        for x in range(0,20):
+            thread.start_new_thread(request_elem, ())
+ 
+        # assert size doesn't grow unbounded, doesnt shrink well below size
+        for x in range(0,5):
+            time.sleep(1)
+            print "size:", len(cache)
+            assert len(cache) < size + size * threshold * 2
+            assert len(cache) > size - (size * .1)
+ 
+        # computs the average number of times a range of elements were "reused",
+        # i.e. without being removed from the cache.
+        def average_regets_in_range(start, end):
+            elem = [e for e in cache.values() if e.id >= start and e.id <= end]
+            if len(elem) == 0:
+                return 0
+            avg = sum([e.regets for e in elem]) / len(elem)
+            return avg
+
+        hotzone_avg = average_regets_in_range(30, 40)
+        control_avg = average_regets_in_range(450,760)
+        total_avg = average_regets_in_range(0, 2000)
+ 
+        # hotzone should be way above the others
+        print "total fetches", total[0], "hotzone", \
+                                hotzone_avg, "control", \
+                                control_avg, "total", total_avg
+ 
+        assert hotzone_avg > total_avg * 5 > control_avg * 5
+ 
+ 
+
diff --git a/lib/mako-0.7.2/test/test_namespace.py b/lib/mako-0.7.2/test/test_namespace.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_namespace.py
@@ -0,0 +1,792 @@
+from mako.template import Template
+from mako import lookup
+from util import flatten_result, result_lines
+from test import TemplateTest, eq_
+
+class NamespaceTest(TemplateTest):
+    def test_inline_crossreference(self):
+        self._do_memory_test(
+            """
+            <%namespace name="x">
+                <%def name="a()">
+                    this is x a
+                </%def>
+                <%def name="b()">
+                    this is x b, and heres ${a()}
+                </%def>
+            </%namespace>
+ 
+            ${x.a()}
+ 
+            ${x.b()}
+    """,
+            "this is x a this is x b, and heres this is x a",
+            filters=flatten_result
+        )
+
+    def test_inline_assignment(self):
+        self._do_memory_test(
+            """
+            <%namespace name="x">
+                <%def name="a()">
+                    <%
+                        x = 5
+                    %>
+                    this is x: ${x}
+                </%def>
+            </%namespace>
+
+            ${x.a()}
+
+    """,
+            "this is x: 5",
+            filters=flatten_result
+        )
+
+    def test_inline_arguments(self):
+        self._do_memory_test(
+            """
+            <%namespace name="x">
+                <%def name="a(x, y)">
+                    <%
+                        result = x * y
+                    %>
+                    result: ${result}
+                </%def>
+            </%namespace>
+
+            ${x.a(5, 10)}
+
+    """,
+            "result: 50",
+            filters=flatten_result
+        )
+
+    def test_inline_not_duped(self):
+        self._do_memory_test(
+            """
+            <%namespace name="x">
+                <%def name="a()">
+                    foo
+                </%def>
+            </%namespace>
+
+            <%
+                assert x.a is not UNDEFINED, "namespace x.a wasn't defined"
+                assert a is UNDEFINED, "name 'a' is in the body locals"
+            %>
+
+    """,
+            "",
+            filters=flatten_result
+        )
+
+    def test_dynamic(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('a', """
+        <%namespace name="b" file="${context['b_def']}"/>
+
+        a.  b: ${b.body()}
+""")
+
+        collection.put_string('b', """
+        b.
+""")
+
+        eq_(
+            flatten_result(collection.get_template('a').render(b_def='b')),
+            "a. b: b."
+        )
+ 
+    def test_template(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main.html', """
+        <%namespace name="comp" file="defs.html"/>
+ 
+        this is main.  ${comp.def1("hi")}
+        ${comp.def2("there")}
+""")
+
+        collection.put_string('defs.html', """
+        <%def name="def1(s)">
+            def1: ${s}
+        </%def>
+ 
+        <%def name="def2(x)">
+            def2: ${x}
+        </%def>
+""")
+
+        assert flatten_result(collection.get_template('main.html').render()) == "this is main. def1: hi def2: there"
+ 
+    def test_module(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main.html', """
+        <%namespace name="comp" module="test.sample_module_namespace"/>
+
+        this is main.  ${comp.foo1()}
+        ${comp.foo2("hi")}
+""")
+
+        assert flatten_result(collection.get_template('main.html').render()) == "this is main. this is foo1. this is foo2, x is hi"
+
+    def test_module_2(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main.html', """
+        <%namespace name="comp" module="test.foo.test_ns"/>
+
+        this is main.  ${comp.foo1()}
+        ${comp.foo2("hi")}
+""")
+
+        assert flatten_result(collection.get_template('main.html').render()) == "this is main. this is foo1. this is foo2, x is hi"
+
+    def test_module_imports(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main.html', """
+        <%namespace import="*" module="test.foo.test_ns"/>
+
+        this is main.  ${foo1()}
+        ${foo2("hi")}
+""")
+
+        assert flatten_result(collection.get_template('main.html').render()) == "this is main. this is foo1. this is foo2, x is hi"
+
+    def test_module_imports_2(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main.html', """
+        <%namespace import="foo1, foo2" module="test.foo.test_ns"/>
+
+        this is main.  ${foo1()}
+        ${foo2("hi")}
+""")
+
+        assert flatten_result(collection.get_template('main.html').render()) == "this is main. this is foo1. this is foo2, x is hi"
+ 
+    def test_context(self):
+        """test that namespace callables get access to the current context"""
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main.html', """
+        <%namespace name="comp" file="defs.html"/>
+
+        this is main.  ${comp.def1()}
+        ${comp.def2("there")}
+""")
+
+        collection.put_string('defs.html', """
+        <%def name="def1()">
+            def1: x is ${x}
+        </%def>
+
+        <%def name="def2(x)">
+            def2: x is ${x}
+        </%def>
+""")
+
+        assert flatten_result(collection.get_template('main.html').render(x="context x")) == "this is main. def1: x is context x def2: x is there"
+ 
+    def test_overload(self):
+        collection = lookup.TemplateLookup()
+
+        collection.put_string('main.html', """
+        <%namespace name="comp" file="defs.html">
+            <%def name="def1(x, y)">
+                overridden def1 ${x}, ${y}
+            </%def>
+        </%namespace>
+
+        this is main.  ${comp.def1("hi", "there")}
+        ${comp.def2("there")}
+    """)
+
+        collection.put_string('defs.html', """
+        <%def name="def1(s)">
+            def1: ${s}
+        </%def>
+
+        <%def name="def2(x)">
+            def2: ${x}
+        </%def>
+    """)
+
+        assert flatten_result(collection.get_template('main.html').render()) == "this is main. overridden def1 hi, there def2: there"
+
+    def test_getattr(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("main.html", """
+            <%namespace name="foo" file="ns.html"/>
+            <%
+                 if hasattr(foo, 'lala'):
+                     foo.lala()
+                 if not hasattr(foo, 'hoho'):
+                     context.write('foo has no hoho.')
+            %>
+         """)
+        collection.put_string("ns.html", """
+          <%def name="lala()">this is lala.</%def>
+        """)
+        assert flatten_result(collection.get_template("main.html").render()) == "this is lala.foo has no hoho."
+
+    def test_in_def(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("main.html", """
+            <%namespace name="foo" file="ns.html"/>
+ 
+            this is main.  ${bar()}
+            <%def name="bar()">
+                this is bar, foo is ${foo.bar()}
+            </%def>
+        """)
+ 
+        collection.put_string("ns.html", """
+            <%def name="bar()">
+                this is ns.html->bar
+            </%def>
+        """)
+
+        assert result_lines(collection.get_template("main.html").render()) == [
+            "this is main.",
+            "this is bar, foo is" ,
+            "this is ns.html->bar"
+        ]
+
+
+    def test_in_remote_def(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("main.html", """
+            <%namespace name="foo" file="ns.html"/>
+
+            this is main.  ${bar()}
+            <%def name="bar()">
+                this is bar, foo is ${foo.bar()}
+            </%def>
+        """)
+
+        collection.put_string("ns.html", """
+            <%def name="bar()">
+                this is ns.html->bar
+            </%def>
+        """)
+ 
+        collection.put_string("index.html", """
+            <%namespace name="main" file="main.html"/>
+ 
+            this is index
+            ${main.bar()}
+        """)
+
+        assert result_lines(collection.get_template("index.html").render()) == [ 
+            "this is index",
+            "this is bar, foo is" ,
+            "this is ns.html->bar"
+        ]
+ 
+    def test_dont_pollute_self(self):
+        # test that get_namespace() doesn't modify the original context
+        # incompatibly
+ 
+        collection = lookup.TemplateLookup()
+        collection.put_string("base.html", """
+
+        <%def name="foo()">
+        <%
+            foo = local.get_namespace("foo.html")
+        %>
+        </%def>
+
+        name: ${self.name}
+        name via bar: ${bar()}
+
+        ${next.body()}
+
+        name: ${self.name}
+        name via bar: ${bar()}
+        <%def name="bar()">
+            ${self.name}
+        </%def>
+
+
+        """)
+
+        collection.put_string("page.html", """
+        <%inherit file="base.html"/>
+
+        ${self.foo()}
+
+        hello world
+
+        """)
+
+        collection.put_string("foo.html", """<%inherit file="base.html"/>""")
+        assert result_lines(collection.get_template("page.html").render()) == [
+            "name: self:page.html",
+            "name via bar:",
+            "self:page.html",
+            "hello world",
+            "name: self:page.html",
+            "name via bar:",
+            "self:page.html"
+        ]
+ 
+    def test_inheritance(self):
+        """test namespace initialization in a base inherited template that doesnt otherwise access the namespace"""
+        collection = lookup.TemplateLookup()
+        collection.put_string("base.html", """
+            <%namespace name="foo" file="ns.html" inheritable="True"/>
+ 
+            ${next.body()}
+""")
+        collection.put_string("ns.html", """
+            <%def name="bar()">
+                this is ns.html->bar
+            </%def>
+        """)
+
+        collection.put_string("index.html", """
+            <%inherit file="base.html"/>
+ 
+            this is index
+            ${self.foo.bar()}
+        """)
+ 
+        assert result_lines(collection.get_template("index.html").render()) == [
+            "this is index",
+            "this is ns.html->bar"
+        ]
+
+    def test_inheritance_two(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base.html", """
+            <%def name="foo()">
+                base.foo
+            </%def>
+ 
+            <%def name="bat()">
+                base.bat
+            </%def>
+""")
+        collection.put_string("lib.html", """
+            <%inherit file="base.html"/>
+            <%def name="bar()">
+                lib.bar
+                ${parent.foo()}
+                ${self.foo()}
+                ${parent.bat()}
+                ${self.bat()}
+            </%def>
+ 
+            <%def name="foo()">
+                lib.foo
+            </%def>
+ 
+        """)
+
+        collection.put_string("front.html", """
+            <%namespace name="lib" file="lib.html"/>
+            ${lib.bar()}
+        """)
+
+        assert result_lines(collection.get_template("front.html").render()) == ['lib.bar', 'base.foo', 'lib.foo', 'base.bat', 'base.bat']
+
+    def test_attr(self):
+        l = lookup.TemplateLookup()
+
+        l.put_string("foo.html", """
+        <%!
+            foofoo = "foo foo"
+            onlyfoo = "only foo"
+        %>
+        <%inherit file="base.html"/>
+        <%def name="setup()">
+            <%
+            self.attr.foolala = "foo lala"
+            %>
+        </%def>
+        ${self.attr.basefoo}
+        ${self.attr.foofoo}
+        ${self.attr.onlyfoo}
+        ${self.attr.lala}
+        ${self.attr.foolala}
+        """)
+
+        l.put_string("base.html", """
+        <%!
+            basefoo = "base foo 1"
+            foofoo = "base foo 2"
+        %>
+        <%
+            self.attr.lala = "base lala"
+        %>
+ 
+        ${self.attr.basefoo}
+        ${self.attr.foofoo}
+        ${self.attr.onlyfoo}
+        ${self.attr.lala}
+        ${self.setup()}
+        ${self.attr.foolala}
+        body
+        ${self.body()}
+        """)
+
+        assert result_lines(l.get_template("foo.html").render()) == [
+            "base foo 1",
+            "foo foo",
+            "only foo",
+            "base lala",
+            "foo lala",
+            "body",
+            "base foo 1",
+            "foo foo",
+            "only foo",
+            "base lala",
+            "foo lala",
+        ]
+ 
+    def test_attr_raise(self):
+        l = lookup.TemplateLookup()
+
+        l.put_string("foo.html", """
+            <%def name="foo()">
+            </%def>
+        """)
+
+        l.put_string("bar.html", """
+        <%namespace name="foo" file="foo.html"/>
+ 
+        ${foo.notfoo()}
+        """)
+
+        self.assertRaises(AttributeError, l.get_template("bar.html").render)
+ 
+    def test_custom_tag_1(self):
+        template = Template("""
+ 
+            <%def name="foo(x, y)">
+                foo: ${x} ${y}
+            </%def>
+ 
+            <%self:foo x="5" y="${7+8}"/>
+        """)
+        assert result_lines(template.render()) == ['foo: 5 15']
+
+    def test_custom_tag_2(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base.html", """
+            <%def name="foo(x, y)">
+                foo: ${x} ${y}
+            </%def>
+ 
+            <%def name="bat(g)"><%
+                return "the bat! %s" % g
+            %></%def>
+ 
+            <%def name="bar(x)">
+                ${caller.body(z=x)}
+            </%def>
+        """)
+ 
+        collection.put_string("index.html", """
+            <%namespace name="myns" file="base.html"/>
+ 
+            <%myns:foo x="${'some x'}" y="some y"/>
+ 
+            <%myns:bar x="${myns.bat(10)}" args="z">
+                record: ${z}
+            </%myns:bar>
+ 
+        """)
+ 
+        assert result_lines(collection.get_template("index.html").render()) == [
+            'foo: some x some y', 
+            'record: the bat! 10'
+        ]
+ 
+    def test_custom_tag_3(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base.html", """
+            <%namespace name="foo" file="ns.html" inheritable="True"/>
+
+            ${next.body()}
+    """)
+        collection.put_string("ns.html", """
+            <%def name="bar()">
+                this is ns.html->bar
+                caller body: ${caller.body()}
+            </%def>
+        """)
+
+        collection.put_string("index.html", """
+            <%inherit file="base.html"/>
+
+            this is index
+            <%self.foo:bar>
+                call body
+            </%self.foo:bar>
+        """)
+ 
+        assert result_lines(collection.get_template("index.html").render()) == [
+            "this is index",
+            "this is ns.html->bar",
+            "caller body:",
+            "call body"
+        ]
+ 
+    def test_custom_tag_case_sensitive(self):
+        t = Template("""
+        <%def name="renderPanel()">
+            panel ${caller.body()}
+        </%def>
+
+        <%def name="renderTablePanel()">
+            <%self:renderPanel>
+                hi
+            </%self:renderPanel>
+        </%def>
+ 
+        <%self:renderTablePanel/>
+        """)
+        assert result_lines(t.render()) == ['panel', 'hi']
+ 
+ 
+    def test_expr_grouping(self):
+        """test that parenthesis are placed around string-embedded expressions."""
+ 
+        template = Template("""
+            <%def name="bar(x, y)">
+                ${x}
+                ${y}
+            </%def>
+ 
+            <%self:bar x=" ${foo} " y="x${g and '1' or '2'}y"/>
+        """, input_encoding='utf-8')
+
+        # the concat has to come out as "x + (g and '1' or '2') + y"
+        assert result_lines(template.render(foo='this is foo', g=False)) == [
+            "this is foo",
+            "x2y"
+        ]
+
+ 
+    def test_ccall(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base.html", """
+            <%namespace name="foo" file="ns.html" inheritable="True"/>
+
+            ${next.body()}
+    """)
+        collection.put_string("ns.html", """
+            <%def name="bar()">
+                this is ns.html->bar
+                caller body: ${caller.body()}
+            </%def>
+        """)
+
+        collection.put_string("index.html", """
+            <%inherit file="base.html"/>
+
+            this is index
+            <%call expr="self.foo.bar()">
+                call body
+            </%call>
+        """)
+
+        assert result_lines(collection.get_template("index.html").render()) == [
+            "this is index",
+            "this is ns.html->bar",
+            "caller body:",
+            "call body"
+        ]
+
+    def test_ccall_2(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("base.html", """
+            <%namespace name="foo" file="ns1.html" inheritable="True"/>
+
+            ${next.body()}
+    """)
+        collection.put_string("ns1.html", """
+            <%namespace name="foo2" file="ns2.html"/>
+            <%def name="bar()">
+                <%call expr="foo2.ns2_bar()">
+                this is ns1.html->bar
+                caller body: ${caller.body()}
+                </%call>
+            </%def>
+        """)
+
+        collection.put_string("ns2.html", """
+            <%def name="ns2_bar()">
+                this is ns2.html->bar
+                caller body: ${caller.body()}
+            </%def>
+        """)
+
+        collection.put_string("index.html", """
+            <%inherit file="base.html"/>
+
+            this is index
+            <%call expr="self.foo.bar()">
+                call body
+            </%call>
+        """)
+
+        assert result_lines(collection.get_template("index.html").render()) == [
+            "this is index",
+            "this is ns2.html->bar",
+            "caller body:",
+            "this is ns1.html->bar",
+            "caller body:",
+            "call body"
+        ]
+
+    def test_import(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("functions.html","""
+            <%def name="foo()">
+                this is foo
+            </%def>
+ 
+            <%def name="bar()">
+                this is bar
+            </%def>
+ 
+            <%def name="lala()">
+                this is lala
+            </%def>
+        """)
+
+        collection.put_string("func2.html", """
+            <%def name="a()">
+                this is a
+            </%def>
+            <%def name="b()">
+                this is b
+            </%def>
+        """)
+        collection.put_string("index.html", """
+            <%namespace file="functions.html" import="*"/>
+            <%namespace file="func2.html" import="a, b"/>
+            ${foo()}
+            ${bar()}
+            ${lala()}
+            ${a()}
+            ${b()}
+            ${x}
+        """)
+
+        assert result_lines(collection.get_template("index.html").render(bar="this is bar", x="this is x")) == [
+            "this is foo",
+            "this is bar",
+            "this is lala",
+            "this is a",
+            "this is b",
+            "this is x"
+        ]
+ 
+    def test_import_calledfromdef(self):
+        l = lookup.TemplateLookup()
+        l.put_string("a", """
+        <%def name="table()">
+            im table
+        </%def>
+        """)
+
+        l.put_string("b","""
+        <%namespace file="a" import="table"/>
+
+        <%
+            def table2():
+                table()
+                return ""
+        %>
+
+        ${table2()}
+        """)
+
+        t = l.get_template("b")
+        assert flatten_result(t.render()) == "im table"
+ 
+    def test_closure_import(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("functions.html","""
+            <%def name="foo()">
+                this is foo
+            </%def>
+ 
+            <%def name="bar()">
+                this is bar
+            </%def>
+        """)
+ 
+        collection.put_string("index.html", """
+            <%namespace file="functions.html" import="*"/>
+            <%def name="cl1()">
+                ${foo()}
+            </%def>
+ 
+            <%def name="cl2()">
+                ${bar()}
+            </%def>
+ 
+            ${cl1()}
+            ${cl2()}
+        """)
+        assert result_lines(collection.get_template("index.html").render(bar="this is bar", x="this is x")) == [
+            "this is foo",
+            "this is bar",
+        ]
+
+    def test_import_local(self):
+        t = Template("""
+            <%namespace import="*">
+                <%def name="foo()">
+                    this is foo
+                </%def>
+            </%namespace>
+ 
+            ${foo()}
+ 
+        """)
+        assert flatten_result(t.render()) == "this is foo"
+ 
+    def test_ccall_import(self):
+        collection = lookup.TemplateLookup()
+        collection.put_string("functions.html","""
+            <%def name="foo()">
+                this is foo
+            </%def>
+ 
+            <%def name="bar()">
+                this is bar.
+                ${caller.body()}
+                ${caller.lala()}
+            </%def>
+        """)
+ 
+        collection.put_string("index.html", """
+            <%namespace name="func" file="functions.html" import="*"/>
+            <%call expr="bar()">
+                this is index embedded
+                foo is ${foo()}
+                <%def name="lala()">
+                     this is lala ${foo()}
+                </%def>
+            </%call>
+        """)
+        #print collection.get_template("index.html").code
+        #print collection.get_template("functions.html").code
+        assert result_lines(collection.get_template("index.html").render()) == [
+            "this is bar.",
+            "this is index embedded",
+            "foo is",
+            "this is foo",
+            "this is lala",
+            "this is foo"
+        ]
diff --git a/lib/mako-0.7.2/test/test_pygen.py b/lib/mako-0.7.2/test/test_pygen.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_pygen.py
@@ -0,0 +1,252 @@
+import unittest
+
+from mako.pygen import PythonPrinter, adjust_whitespace
+from StringIO import StringIO
+
+class GeneratePythonTest(unittest.TestCase):
+    def test_generate_normal(self):
+        stream = StringIO()
+        printer = PythonPrinter(stream)
+        printer.writeline("import lala")
+        printer.writeline("for x in foo:")
+        printer.writeline("print x")
+        printer.writeline(None)
+        printer.writeline("print y")
+        assert stream.getvalue() == \
+"""import lala
+for x in foo:
+    print x
+print y
+"""
+    def test_generate_adjusted(self):
+        block = """
+        x = 5 +6
+        if x > 7:
+            for y in range(1,5):
+                print "<td>%s</td>" % y
+"""
+        stream = StringIO()
+        printer = PythonPrinter(stream)
+        printer.write_indented_block(block)
+        printer.close()
+        #print stream.getvalue()
+        assert stream.getvalue() == \
+"""
+x = 5 +6
+if x > 7:
+    for y in range(1,5):
+        print "<td>%s</td>" % y
+
+"""
+    def test_generate_combo(self):
+        block = \
+"""
+                x = 5 +6
+                if x > 7:
+                    for y in range(1,5):
+                        print "<td>%s</td>" % y
+                    print "hi"
+                print "there"
+                foo(lala)
+        """
+        stream = StringIO()
+        printer = PythonPrinter(stream)
+        printer.writeline("import lala")
+        printer.writeline("for x in foo:")
+        printer.writeline("print x")
+        printer.write_indented_block(block)
+        printer.writeline(None)
+        printer.writeline("print y")
+        printer.close()
+        #print "->" + stream.getvalue().replace(' ', '#') + "<-"
+        assert stream.getvalue() == \
+"""import lala
+for x in foo:
+    print x
+
+    x = 5 +6
+    if x > 7:
+        for y in range(1,5):
+            print "<td>%s</td>" % y
+        print "hi"
+    print "there"
+    foo(lala)
+        
+print y
+"""
+    def test_multi_line(self):
+        block = \
+"""
+    if test:
+        print ''' this is a block of stuff.
+this is more stuff in the block.
+and more block.
+'''
+        do_more_stuff(g)
+"""
+        stream = StringIO()
+        printer = PythonPrinter(stream)
+        printer.write_indented_block(block)
+        printer.close()
+        #print stream.getvalue()
+        assert stream.getvalue() == \
+"""
+if test:
+    print ''' this is a block of stuff.
+this is more stuff in the block.
+and more block.
+'''
+    do_more_stuff(g)
+
+"""
+    
+    def test_false_unindentor(self):
+        stream = StringIO()
+        printer = PythonPrinter(stream)
+        for line in [
+            "try:",
+            "elsemyvar = 12",
+            "if True:",
+            "print 'hi'",
+            None,
+            "finally:",
+            "dosomething",
+            None
+        ]:
+            printer.writeline(line)
+        
+        assert stream.getvalue() == \
+"""try:
+    elsemyvar = 12
+    if True:
+        print 'hi'
+finally:
+    dosomething
+"""    , stream.getvalue()
+        
+        
+    def test_backslash_line(self):
+        block = \
+"""
+            # comment
+    if test:
+        if (lala + hoho) + \\
+(foobar + blat) == 5:
+            print "hi"
+    print "more indent"
+"""
+        stream = StringIO()
+        printer = PythonPrinter(stream)
+        printer.write_indented_block(block)
+        printer.close()
+        assert stream.getvalue() == \
+"""
+            # comment
+if test:
+    if (lala + hoho) + \\
+(foobar + blat) == 5:
+        print "hi"
+print "more indent"
+
+"""
+
+class WhitespaceTest(unittest.TestCase):
+    def test_basic(self):
+        text = """
+        for x in range(0,15):
+            print x
+        print "hi"
+        """
+        assert adjust_whitespace(text) == \
+"""
+for x in range(0,15):
+    print x
+print "hi"
+"""
+
+    def test_blank_lines(self):
+        text = """
+    print "hi"  # a comment
+    
+    # more comments
+    
+    print g
+"""
+        assert adjust_whitespace(text) == \
+"""
+print "hi"  # a comment
+
+# more comments
+
+print g
+"""
+
+    def test_open_quotes_with_pound(self):
+        text = '''
+        print """  this is text
+          # and this is text
+        # and this is too """
+'''
+        assert adjust_whitespace(text) == \
+'''
+print """  this is text
+          # and this is text
+        # and this is too """
+'''
+
+    def test_quote_with_comments(self):
+        text= """
+            print 'hi'
+            # this is a comment
+            # another comment
+            x = 7 # someone's '''comment
+            print '''
+        there
+        '''
+            # someone else's comment
+"""
+
+        assert adjust_whitespace(text) == \
+"""
+print 'hi'
+# this is a comment
+# another comment
+x = 7 # someone's '''comment
+print '''
+        there
+        '''
+# someone else's comment
+"""
+
+
+    def test_quotes_with_pound(self):
+        text = '''
+        if True:
+            """#"""
+        elif False:
+            "bar"
+'''
+        assert adjust_whitespace(text) == \
+'''
+if True:
+    """#"""
+elif False:
+    "bar"
+'''
+
+    def test_quotes(self):
+        text = """
+        print ''' aslkjfnas kjdfn
+askdjfnaskfd fkasnf dknf sadkfjn asdkfjna sdakjn
+asdkfjnads kfajns '''
+        if x:
+            print y
+"""
+        assert adjust_whitespace(text) == \
+"""
+print ''' aslkjfnas kjdfn
+askdjfnaskfd fkasnf dknf sadkfjn asdkfjna sdakjn
+asdkfjnads kfajns '''
+if x:
+    print y
+"""
diff --git a/lib/mako-0.7.2/test/test_template.py b/lib/mako-0.7.2/test/test_template.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_template.py
@@ -0,0 +1,1241 @@
+# -*- coding: utf-8 -*-
+
+from mako.template import Template, ModuleTemplate
+from mako.lookup import TemplateLookup
+from mako.ext.preprocessors import convert_comments
+from mako import exceptions, util, runtime
+import re
+import os
+from util import flatten_result, result_lines
+import codecs
+from test import TemplateTest, eq_, template_base, module_base, \
+    skip_if, assert_raises, assert_raises_message
+
+class EncodingTest(TemplateTest):
+    def test_escapes_html_tags(self):
+        from mako.exceptions import html_error_template
+
+        x = Template("""
+        X:
+        <% raise Exception('<span style="color:red">Foobar</span>') %>
+        """)
+
+        try:
+            x.render()
+        except:
+            # <h3>Exception: <span style="color:red">Foobar</span></h3>
+            markup = html_error_template().render(full=False, css=False)
+            if util.py3k:
+                assert '<span style="color:red">Foobar</span></h3>'\
+                            .encode('ascii') not in markup
+                assert '&lt;span style=&#34;color:red&#34;'\
+                            '&gt;Foobar&lt;/span&gt;'\
+                            .encode('ascii') in markup
+            else:
+                assert '<span style="color:red">Foobar</span></h3>' \
+                            not in markup
+                assert '&lt;span style=&#34;color:red&#34;'\
+                            '&gt;Foobar&lt;/span&gt;' in markup
+
+    def test_unicode(self):
+        self._do_memory_test(
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        )
+
+    def test_encoding_doesnt_conflict(self):
+        self._do_memory_test(
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+            output_encoding='utf-8'
+        )
+ 
+    def test_unicode_arg(self):
+        val = u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        self._do_memory_test(
+            "${val}",
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+            template_args={'val':val}
+        )
+
+    def test_unicode_file(self):
+        self._do_file_test(
+            "unicode.html",
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        )
+
+    def test_unicode_file_code(self):
+        self._do_file_test(
+            'unicode_code.html',
+            u"""hi, dr?le de petite voix m?a r?veill?.""",
+            filters=flatten_result
+        )
+
+    def test_unicode_file_lookup(self):
+        lookup = TemplateLookup(
+                    directories=[template_base], 
+                    output_encoding='utf-8', 
+                    default_filters=['decode.utf8'])
+        if util.py3k:
+            template = lookup.get_template('/chs_unicode_py3k.html')
+        else:
+            template = lookup.get_template('/chs_unicode.html')
+        eq_(
+            flatten_result(template.render_unicode(name='???')),
+            u'??? ? ??????<br/> Welcome ? to ??.'
+        )
+
+    def test_unicode_bom(self):
+        self._do_file_test(
+            'bom.html',
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        )
+
+        self._do_file_test(
+            'bommagic.html',
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        )
+
+        self.assertRaises(
+            exceptions.CompileException,
+            Template, filename=self._file_path('badbom.html'),
+            module_directory=module_base
+        )
+
+    def test_unicode_memory(self):
+        val = u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        self._do_memory_test(
+            ("## -*- coding: utf-8 -*-\n" + val).encode('utf-8'),
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        )
+ 
+    def test_unicode_text(self):
+        val = u"""<%text>Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?</%text>"""
+        self._do_memory_test(
+            ("## -*- coding: utf-8 -*-\n" + val).encode('utf-8'),
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"""
+        )
+
+    def test_unicode_text_ccall(self):
+        val = u"""
+        <%def name="foo()">
+            ${capture(caller.body)}
+        </%def>
+        <%call expr="foo()">
+        <%text>Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?</%text>
+        </%call>"""
+        self._do_memory_test(
+            ("## -*- coding: utf-8 -*-\n" + val).encode('utf-8'),
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+            filters=flatten_result
+        )
+ 
+    def test_unicode_literal_in_expr(self):
+        if util.py3k:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                ${"Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"}
+                """.encode('utf-8'),
+                u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+                filters = lambda s:s.strip()
+            )
+        else:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                ${u"Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?"}
+                """.encode('utf-8'),
+                u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+                filters = lambda s:s.strip()
+            )
+
+    def test_unicode_literal_in_expr_file(self):
+        self._do_file_test(
+            'unicode_expr.html',
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+            lambda t:t.strip()
+        )
+
+    def test_unicode_literal_in_code(self):
+        if util.py3k:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%
+                    context.write("Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?")
+                %>
+                """.encode('utf-8'),
+                u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+                filters=lambda s:s.strip()
+            )
+        else:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%
+                    context.write(u"Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?")
+                %>
+                """.encode('utf-8'),
+                u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+                filters=lambda s:s.strip()
+            )
+ 
+    def test_unicode_literal_in_controlline(self):
+        if util.py3k:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%
+                    x = "dr?le de petite voix m?a r?veill?."
+                %>
+                % if x=="dr?le de petite voix m?a r?veill?.":
+                    hi, ${x}
+                % endif
+                """.encode('utf-8'),
+                u"""hi, dr?le de petite voix m?a r?veill?.""",
+                filters=lambda s:s.strip(),
+            )
+        else:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%
+                    x = u"dr?le de petite voix m?a r?veill?."
+                %>
+                % if x==u"dr?le de petite voix m?a r?veill?.":
+                    hi, ${x}
+                % endif
+                """.encode('utf-8'),
+                u"""hi, dr?le de petite voix m?a r?veill?.""",
+                filters=lambda s:s.strip(),
+            )
+ 
+    def test_unicode_literal_in_tag(self):
+        self._do_file_test(
+            "unicode_arguments.html",
+            [
+                u'x is: dr?le de petite voix m?a r?veill?',
+                u'x is: dr?le de petite voix m?a r?veill?',
+                u'x is: dr?le de petite voix m?a r?veill?',
+                u'x is: dr?le de petite voix m?a r?veill?',
+            ],
+            filters=result_lines
+        )
+
+        self._do_memory_test(
+            open(self._file_path("unicode_arguments.html"), 'rb').read(),
+            [
+                u'x is: dr?le de petite voix m?a r?veill?',
+                u'x is: dr?le de petite voix m?a r?veill?',
+                u'x is: dr?le de petite voix m?a r?veill?',
+                u'x is: dr?le de petite voix m?a r?veill?',
+            ],
+            filters=result_lines
+        )
+ 
+    def test_unicode_literal_in_def(self):
+        if util.py3k:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%def name="bello(foo, bar)">
+                Foo: ${ foo }
+                Bar: ${ bar }
+                </%def>
+                <%call expr="bello(foo='?rv?zt?r? t?k?rf?r?g?p', bar='?RV?ZT?R? T?K?RF?R?G?P')">
+                </%call>""".encode('utf-8'),
+                u"""Foo: ?rv?zt?r? t?k?rf?r?g?p Bar: ?RV?ZT?R? T?K?RF?R?G?P""",
+                filters=flatten_result
+            )
+
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%def name="hello(foo='?rv?zt?r? t?k?rf?r?g?p', bar='?RV?ZT?R? T?K?RF?R?G?P')">
+                Foo: ${ foo }
+                Bar: ${ bar }
+                </%def>
+                ${ hello() }""".encode('utf-8'),
+                u"""Foo: ?rv?zt?r? t?k?rf?r?g?p Bar: ?RV?ZT?R? T?K?RF?R?G?P""",
+                filters=flatten_result
+            )
+        else:
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%def name="bello(foo, bar)">
+                Foo: ${ foo }
+                Bar: ${ bar }
+                </%def>
+                <%call expr="bello(foo=u'?rv?zt?r? t?k?rf?r?g?p', bar=u'?RV?ZT?R? T?K?RF?R?G?P')">
+                </%call>""".encode('utf-8'),
+                u"""Foo: ?rv?zt?r? t?k?rf?r?g?p Bar: ?RV?ZT?R? T?K?RF?R?G?P""",
+                filters=flatten_result
+            )
+ 
+            self._do_memory_test(
+                u"""## -*- coding: utf-8 -*-
+                <%def name="hello(foo=u'?rv?zt?r? t?k?rf?r?g?p', bar=u'?RV?ZT?R? T?K?RF?R?G?P')">
+                Foo: ${ foo }
+                Bar: ${ bar }
+                </%def>
+                ${ hello() }""".encode('utf-8'),
+                u"""Foo: ?rv?zt?r? t?k?rf?r?g?p Bar: ?RV?ZT?R? T?K?RF?R?G?P""",
+                filters=flatten_result
+            )
+ 
+    def test_input_encoding(self):
+        """test the 'input_encoding' flag on Template, and that unicode 
+            objects arent double-decoded"""
+ 
+        if util.py3k:
+            self._do_memory_test(
+                u"hello ${f('?l?sk')}",
+                u"hello ?l?sk",
+                input_encoding='utf-8',
+                template_args={'f':lambda x:x}
+            ) 
+
+            self._do_memory_test(
+                u"## -*- coding: utf-8 -*-\nhello ${f('?l?sk')}",
+                u"hello ?l?sk",
+                template_args={'f':lambda x:x}
+            )
+        else:
+            self._do_memory_test(
+                u"hello ${f(u'?l?sk')}",
+                u"hello ?l?sk",
+                input_encoding='utf-8',
+                template_args={'f':lambda x:x}
+            ) 
+
+            self._do_memory_test(
+                u"## -*- coding: utf-8 -*-\nhello ${f(u'?l?sk')}",
+                u"hello ?l?sk",
+                template_args={'f':lambda x:x}
+            )
+
+    def test_raw_strings(self):
+        """test that raw strings go straight thru with default_filters turned off,
+        bytestring_passthrough enabled.
+        
+        """
+
+        self._do_memory_test(
+            u"## -*- coding: utf-8 -*-\nhello ${x}",
+            "hello ?l?sk",
+            default_filters=[],
+            template_args={'x':'?l?sk'},
+            unicode_=False,
+            bytestring_passthrough=True,
+            output_encoding=None #'ascii'
+        )
+
+        # now, the way you *should* be doing it....
+        self._do_memory_test(
+            u"## -*- coding: utf-8 -*-\nhello ${x}",
+            u"hello ?l?sk",
+            template_args={'x':u'?l?sk'}
+        )
+ 
+    def test_encoding(self):
+        self._do_memory_test(
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""",
+            u"""Alors vous imaginez ma surprise, au lever du jour, quand une dr?le de petite voix m?a r?veill?. Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?""".encode('utf-8'),
+            output_encoding='utf-8',
+            unicode_=False
+        )
+
+    def test_encoding_errors(self):
+        self._do_memory_test(
+            u"""KGB (transliteration of "???") is the Russian-language abbreviation for Committee for State Security, (Russian: ???????? ???????????????? ????????????? (help?info); Komitet Gosudarstvennoy Bezopasnosti)""",
+            u"""KGB (transliteration of "???") is the Russian-language abbreviation for Committee for State Security, (Russian: ???????? ???????????????? ????????????? (help?info); Komitet Gosudarstvennoy Bezopasnosti)""".encode('iso-8859-1', 'replace'),
+            output_encoding='iso-8859-1', encoding_errors='replace',
+            unicode_=False
+        )
+ 
+    def test_read_unicode(self):
+        lookup = TemplateLookup(directories=[template_base], 
+                                filesystem_checks=True, output_encoding='utf-8')
+        if util.py3k:
+            template = lookup.get_template('/read_unicode_py3k.html')
+        else:
+            template = lookup.get_template('/read_unicode.html')
+        # TODO: I've no idea what encoding this file is, Python 3.1.2 
+        # won't read the file even with open(...encoding='utf-8') unless
+        # errors is specified.   or if there's some quirk in 3.1.2
+        # since I'm pretty sure this test worked with py3k when I wrote it.
+        data = template.render(path=self._file_path('internationalization.html'))
+
+    @skip_if(lambda: util.py3k)
+    def test_bytestring_passthru(self):
+        self._do_file_test(
+            'chs_utf8.html',
+            '??? ? ??????<br/> Welcome ? to ??. Welcome ? to ??.',
+            default_filters=[],
+            disable_unicode=True,
+            output_encoding=None,
+            template_args={'name':'???'},
+            filters=flatten_result, 
+            unicode_=False
+        )
+
+        self._do_file_test(
+            'chs_utf8.html',
+            '??? ? ??????<br/> Welcome ? to ??. Welcome ? to ??.',
+            disable_unicode=True,
+            output_encoding=None,
+            template_args={'name':'???'},
+            filters=flatten_result,
+            unicode_=False
+        )
+
+        template = self._file_template('chs_utf8.html', 
+                    output_encoding=None,
+                    disable_unicode=True)
+        self.assertRaises(UnicodeDecodeError, template.render_unicode, name='???')
+
+        template = Template(
+            "${'Alors vous imaginez ma surprise, au lever"
+            " du jour, quand une dr?le de petite voix m?a "
+            "r?veill?. Elle disait: ? S?il vous pla?t? "
+            "dessine-moi un mouton! ?'}", 
+            output_encoding=None,
+            disable_unicode=True, input_encoding='utf-8')
+        assert template.render() == "Alors vous imaginez ma surprise, "\
+                "au lever du jour, quand une dr?le de petite "\
+                "voix m?a r?veill?. Elle disait: ? S?il vous "\
+                "pla?t? dessine-moi un mouton! ?"
+        template = Template(
+                "${'Alors vous imaginez ma surprise, au "
+                "lever du jour, quand une dr?le de petite "
+                "voix m?a r?veill?. Elle disait: ? S?il "
+                "vous pla?t? dessine-moi un mouton! ?'}", 
+                input_encoding='utf8', output_encoding='utf8', 
+                disable_unicode=False, default_filters=[])
+        # raises because expression contains an encoded bytestring which cannot be decoded
+        self.assertRaises(UnicodeDecodeError, template.render)
+
+
+class PageArgsTest(TemplateTest):
+    def test_basic(self):
+        template = Template("""
+            <%page args="x, y, z=7"/>
+ 
+            this is page, ${x}, ${y}, ${z}
+""")
+
+        assert flatten_result(template.render(x=5, y=10)) == "this is page, 5, 10, 7"
+        assert flatten_result(template.render(x=5, y=10, z=32)) == "this is page, 5, 10, 32"
+        try:
+            template.render(y=10)
+            assert False
+        except TypeError, e:
+            assert True
+ 
+    def test_inherits(self):
+        lookup = TemplateLookup()
+        lookup.put_string("base.tmpl",
+        """
+        <%page args="bar" />
+        ${bar}
+        ${pageargs['foo']}
+        ${self.body(**pageargs)}
+        """
+        )
+        lookup.put_string("index.tmpl", """
+        <%inherit file="base.tmpl" />
+        <%page args="variable" />
+        ${variable}
+        """)
+
+        self._do_test(
+            lookup.get_template("index.tmpl"),
+            "bar foo var",
+            filters=flatten_result,
+            template_args={'variable':'var', 'bar':'bar', 'foo':'foo'}
+ 
+        )
+
+    def test_includes(self):
+        lookup = TemplateLookup()
+        lookup.put_string("incl1.tmpl",
+        """
+        <%page args="bar" />
+        ${bar}
+        ${pageargs['foo']}
+        """
+        )
+        lookup.put_string("incl2.tmpl",
+        """
+        ${pageargs}
+        """
+        )
+        lookup.put_string("index.tmpl", """
+        <%include file="incl1.tmpl" args="**pageargs"/>
+        <%page args="variable" />
+        ${variable}
+        <%include file="incl2.tmpl" />
+        """)
+
+        self._do_test(
+            lookup.get_template("index.tmpl"),
+            "bar foo var {}",
+            filters=flatten_result,
+            template_args={'variable':'var', 'bar':'bar', 'foo':'foo'}
+
+        )
+
+    def test_context_small(self):
+        ctx = runtime.Context([].append, x=5, y=4)
+        eq_(sorted(ctx.keys()), ['caller', 'capture', 'x', 'y'])
+
+    def test_with_context(self):
+        template = Template("""
+            <%page args="x, y, z=7"/>
+
+            this is page, ${x}, ${y}, ${z}, ${w}
+""")
+        #print template.code
+        assert flatten_result(template.render(x=5, y=10, w=17)) == "this is page, 5, 10, 7, 17"
+
+    def test_overrides_builtins(self):
+        template = Template("""
+            <%page args="id"/>
+ 
+            this is page, id is ${id}
+        """)
+ 
+        assert flatten_result(template.render(id="im the id")) == "this is page, id is im the id"
+ 
+    def test_canuse_builtin_names(self):
+        template = Template("""
+            exception: ${Exception}
+            id: ${id}
+        """)
+        assert flatten_result(template.render(id='some id', Exception='some exception')) == "exception: some exception id: some id"
+
+    def test_builtin_names_dont_clobber_defaults_in_includes(self):
+        lookup = TemplateLookup()
+        lookup.put_string("test.mako", 
+        """
+        <%include file="test1.mako"/>
+
+        """)
+
+        lookup.put_string("test1.mako", """
+        <%page args="id='foo'"/>
+
+        ${id}
+        """)
+
+        for template in ("test.mako", "test1.mako"):
+            assert flatten_result(lookup.get_template(template).render()) == "foo"
+            assert flatten_result(lookup.get_template(template).render(id=5)) == "5"
+            assert flatten_result(lookup.get_template(template).render(id=id)) == "<built-in function id>"
+ 
+    def test_dict_locals(self):
+        template = Template("""
+            <%
+                dict = "this is dict"
+                locals = "this is locals"
+            %>
+            dict: ${dict}
+            locals: ${locals}
+        """)
+        assert flatten_result(template.render()) == "dict: this is dict locals: this is locals"
+
+class IncludeTest(TemplateTest):
+    def test_basic(self):
+        lookup = TemplateLookup()
+        lookup.put_string("a", """
+            this is a
+            <%include file="b" args="a=3,b=4,c=5"/>
+        """)
+        lookup.put_string("b", """
+            <%page args="a,b,c"/>
+            this is b.  ${a}, ${b}, ${c}
+        """)
+        assert flatten_result(lookup.get_template("a").render()) == "this is a this is b. 3, 4, 5"
+
+    def test_localargs(self):
+        lookup = TemplateLookup()
+        lookup.put_string("a", """
+            this is a
+            <%include file="b" args="a=a,b=b,c=5"/>
+        """)
+        lookup.put_string("b", """
+            <%page args="a,b,c"/>
+            this is b.  ${a}, ${b}, ${c}
+        """)
+        assert flatten_result(lookup.get_template("a").render(a=7,b=8)) == "this is a this is b. 7, 8, 5"
+ 
+    def test_viakwargs(self): 
+        lookup = TemplateLookup()
+        lookup.put_string("a", """
+            this is a
+            <%include file="b" args="c=5, **context.kwargs"/>
+        """)
+        lookup.put_string("b", """
+            <%page args="a,b,c"/>
+            this is b.  ${a}, ${b}, ${c}
+        """)
+        #print lookup.get_template("a").code
+        assert flatten_result(lookup.get_template("a").render(a=7,b=8)) == "this is a this is b. 7, 8, 5"
+
+    def test_include_withargs(self):
+        lookup = TemplateLookup()
+        lookup.put_string("a", """
+            this is a
+            <%include file="${i}" args="c=5, **context.kwargs"/>
+        """)
+        lookup.put_string("b", """
+            <%page args="a,b,c"/>
+            this is b.  ${a}, ${b}, ${c}
+        """)
+        assert flatten_result(lookup.get_template("a").render(a=7,b=8,i='b')) == "this is a this is b. 7, 8, 5"
+ 
+    def test_within_ccall(self):
+        lookup = TemplateLookup()
+        lookup.put_string("a", """this is a""")
+        lookup.put_string("b", """
+        <%def name="bar()">
+            bar: ${caller.body()}
+            <%include file="a"/>
+        </%def>
+        """)
+        lookup.put_string("c", """
+        <%namespace name="b" file="b"/>
+        <%b:bar>
+            calling bar
+        </%b:bar>
+        """)
+        assert flatten_result(lookup.get_template("c").render()) == "bar: calling bar this is a"
+
+class UndefinedVarsTest(TemplateTest):
+    def test_undefined(self):
+        t = Template("""
+            % if x is UNDEFINED:
+                undefined
+            % else:
+                x: ${x}
+            % endif
+        """)
+ 
+        assert result_lines(t.render(x=12)) == ["x: 12"]
+        assert result_lines(t.render(y=12)) == ["undefined"]
+
+    def test_strict(self):
+        t = Template("""
+            % if x is UNDEFINED:
+                undefined
+            % else:
+                x: ${x}
+            % endif
+        """, strict_undefined=True)
+ 
+        assert result_lines(t.render(x=12)) == ['x: 12']
+ 
+        assert_raises(
+            NameError,
+            t.render, y=12
+        )
+ 
+        l = TemplateLookup(strict_undefined=True)
+        l.put_string("a", "some template")
+        l.put_string("b", """
+            <%namespace name='a' file='a' import='*'/>
+            % if x is UNDEFINED:
+                undefined
+            % else:
+                x: ${x}
+            % endif
+        """)
+
+        assert result_lines(t.render(x=12)) == ['x: 12']
+ 
+        assert_raises(
+            NameError,
+            t.render, y=12
+        )
+ 
+    def test_expression_declared(self):
+        t = Template("""
+            ${",".join([t for t in ("a", "b", "c")])}
+        """, strict_undefined=True)
+ 
+        eq_(result_lines(t.render()), ['a,b,c'])
+
+        t = Template("""
+            <%self:foo value="${[(val, n) for val, n in [(1, 2)]]}"/>
+ 
+            <%def name="foo(value)">
+                ${value}
+            </%def>
+ 
+        """, strict_undefined=True)
+ 
+        eq_(result_lines(t.render()), ['[(1, 2)]'])
+
+        t = Template("""
+            <%call expr="foo(value=[(val, n) for val, n in [(1, 2)]])" />
+ 
+            <%def name="foo(value)">
+                ${value}
+            </%def>
+ 
+        """, strict_undefined=True)
+ 
+        eq_(result_lines(t.render()), ['[(1, 2)]'])
+ 
+        l = TemplateLookup(strict_undefined=True)
+        l.put_string("i", "hi, ${pageargs['y']}")
+        l.put_string("t", """
+            <%include file="i" args="y=[x for x in range(3)]" />
+        """)
+        eq_(
+            result_lines(l.get_template("t").render()), ['hi, [0, 1, 2]']
+        )
+ 
+        l.put_string('q', """
+            <%namespace name="i" file="${(str([x for x in range(3)][2]) + 'i')[-1]}" />
+            ${i.body(y='x')}
+        """)
+        eq_(
+            result_lines(l.get_template("q").render()), ['hi, x']
+        )
+
+        t = Template("""
+            <%
+                y = lambda q: str(q)
+            %>
+            ${y('hi')}
+        """, strict_undefined=True)
+        eq_(
+            result_lines(t.render()), ["hi"]
+        )
+
+    def test_list_comprehensions_plus_undeclared_nonstrict(self):
+        # traditional behavior.  variable inside a list comprehension
+        # is treated as an "undefined", so is pulled from the context.
+        t = Template("""
+            t is: ${t}
+ 
+            ${",".join([t for t in ("a", "b", "c")])}
+        """)
+ 
+        eq_(
+            result_lines(t.render(t="T")),
+            ['t is: T', 'a,b,c'] 
+        )
+ 
+    def test_traditional_assignment_plus_undeclared(self):
+        t = Template("""
+            t is: ${t}
+ 
+            <%
+                t = 12
+            %>
+        """)
+        assert_raises(
+            UnboundLocalError,
+            t.render, t="T"
+        )
+ 
+    def test_list_comprehensions_plus_undeclared_strict(self):
+        # with strict, a list comprehension now behaves
+        # like the undeclared case above.
+        t = Template("""
+            t is: ${t}
+ 
+            ${",".join([t for t in ("a", "b", "c")])}
+        """, strict_undefined=True)
+ 
+        eq_(
+            result_lines(t.render(t="T")),
+            ['t is: T', 'a,b,c']
+        )
+
+class ReservedNameTest(TemplateTest):
+    def test_names_on_context(self):
+        for name in ('context', 'loop', 'UNDEFINED'):
+            assert_raises_message(
+                exceptions.NameConflictError,
+                r"Reserved words passed to render\(\): %s" % name,
+                Template("x").render, **{name:'foo'}
+            )
+
+    def test_names_in_template(self):
+        for name in ('context', 'loop', 'UNDEFINED'):
+            assert_raises_message(
+                exceptions.NameConflictError,
+                r"Reserved words declared in template: %s" % name,
+                Template, "<%% %s = 5 %%>" % name
+            )
+
+    def test_exclude_loop_context(self):
+        self._do_memory_test(
+            "loop is ${loop}",
+            "loop is 5",
+            template_args=dict(loop=5),
+            enable_loop=False
+        )
+
+    def test_exclude_loop_template(self):
+        self._do_memory_test(
+            "<% loop = 12 %>loop is ${loop}",
+            "loop is 12",
+            enable_loop=False
+        )
+ 
+class ControlTest(TemplateTest):
+    def test_control(self):
+        t = Template("""
+    ## this is a template.
+    % for x in y:
+    %   if 'test' in x:
+        yes x has test
+    %   else:
+        no x does not have test
+    %endif
+    %endfor
+""")
+        assert result_lines(t.render(y=[{'test':'one'}, {'foo':'bar'}, {'foo':'bar', 'test':'two'}])) == [
+            "yes x has test",
+            "no x does not have test",
+            "yes x has test"
+        ]
+ 
+    def test_blank_control_1(self):
+        self._do_memory_test(
+            """
+            % if True:
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_blank_control_2(self):
+        self._do_memory_test(
+            """
+            % if True:
+            % elif True:
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_blank_control_3(self):
+        self._do_memory_test(
+            """
+            % if True:
+            % else:
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_blank_control_4(self):
+        self._do_memory_test(
+            """
+            % if True:
+            % elif True:
+            % else:
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_blank_control_5(self):
+        self._do_memory_test(
+            """
+            % for x in range(10):
+            % endfor
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_blank_control_6(self):
+        self._do_memory_test(
+            """
+            % while False:
+            % endwhile
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_blank_control_7(self):
+        self._do_memory_test(
+            """
+            % try:
+            % except:
+            % endtry
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    @skip_if(lambda: not util.py26)
+    def test_blank_control_8(self):
+        self._do_memory_test(
+            """
+            % with open('x', 'w') as fp:
+            % endwith
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+
+    def test_commented_blank_control_1(self):
+        self._do_memory_test(
+            """
+            % if True:
+            ## comment
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_commented_blank_control_2(self):
+        self._do_memory_test(
+            """
+            % if True:
+            ## comment
+            % elif True:
+            ## comment
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_commented_blank_control_3(self):
+        self._do_memory_test(
+            """
+            % if True:
+            ## comment
+            % else:
+            ## comment
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_commented_blank_control_4(self):
+        self._do_memory_test(
+            """
+            % if True:
+            ## comment
+            % elif True:
+            ## comment
+            % else:
+            ## comment
+            % endif
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_commented_blank_control_5(self):
+        self._do_memory_test(
+            """
+            % for x in range(10):
+            ## comment
+            % endfor
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_commented_blank_control_6(self):
+        self._do_memory_test(
+            """
+            % while False:
+            ## comment
+            % endwhile
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_commented_blank_control_7(self):
+        self._do_memory_test(
+            """
+            % try:
+            ## comment
+            % except:
+            ## comment
+            % endtry
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    @skip_if(lambda: not util.py26)
+    def test_commented_blank_control_8(self):
+        self._do_memory_test(
+            """
+            % with open('x', 'w') as fp:
+            ## comment
+            % endwith
+            """,
+            "",
+            filters=lambda s:s.strip()
+        )
+ 
+    def test_multiline_control(self):
+        t = Template("""
+    % for x in \\
+        [y for y in [1,2,3]]:
+        ${x}
+    % endfor
+""")
+        #print t.code
+        assert flatten_result(t.render()) == "1 2 3"
+ 
+class GlobalsTest(TemplateTest):
+    def test_globals(self):
+        self._do_memory_test(
+            """
+                <%!
+                    y = "hi"
+                %>
+            y is ${y}
+            """,
+            "y is hi",
+            filters=lambda t:t.strip()
+        )
+
+class RichTracebackTest(TemplateTest):
+ 
+    def _do_test_traceback(self, utf8, memory, syntax):
+        if memory:
+            if syntax:
+                source = u'## coding: utf-8\n<% print "m?a r?veill?. '\
+                        u'Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ? %>'
+            else:
+                source = u'## coding: utf-8\n<% print u"m?a r?veill?. '\
+                        u'Elle disait: ? S?il vous pla?t? dessine-moi un mouton! ?" + str(5/0) %>'
+            if utf8:
+                source = source.encode('utf-8')
+            else:
+                source = source
+            templateargs = {'text':source}
+        else:
+            if syntax:
+                filename = 'unicode_syntax_error.html'
+            else:
+                filename = 'unicode_runtime_error.html'
+            source = open(self._file_path(filename), 'rb').read()
+            if not utf8:
+                source = source.decode('utf-8')
+            templateargs = {'filename':self._file_path(filename)}
+        try:
+            template = Template(**templateargs)
+            if not syntax:
+                template.render_unicode()
+            assert False
+        except Exception, e:
+            tback = exceptions.RichTraceback()
+            if utf8:
+                assert tback.source == source.decode('utf-8')
+            else:
+                assert tback.source == source
+
+for utf8 in (True, False):
+    for memory in (True, False):
+        for syntax in (True, False):
+            def _do_test(self):
+                self._do_test_traceback(utf8, memory, syntax)
+            name = 'test_%s_%s_%s' % (utf8 and 'utf8' or 'unicode', 
+                                        memory and 'memory' or 'file', 
+                                        syntax and 'syntax' or 'runtime')
+            _do_test.__name__ = name
+            setattr(RichTracebackTest, name, _do_test)
+            del _do_test
+
+class ModuleDirTest(TemplateTest):
+    def tearDown(self):
+        import shutil
+        shutil.rmtree(module_base, True)
+
+    def test_basic(self):
+        t = self._file_template("modtest.html")
+        t2 = self._file_template('subdir/modtest.html')
+
+        eq_(
+            t.module.__file__,
+            os.path.join(module_base, 'modtest.html.py')
+        )
+        eq_(
+            t2.module.__file__,
+            os.path.join(module_base, 'subdir', 'modtest.html.py')
+        )
+ 
+    def test_callable(self):
+        def get_modname(filename, uri):
+            return os.path.join(
+                        module_base, 
+                        os.path.dirname(uri)[1:], 
+                        'foo', 
+                        os.path.basename(filename) + ".py")
+
+        lookup = TemplateLookup(template_base, modulename_callable=get_modname)
+        t = lookup.get_template('/modtest.html')
+        t2 = lookup.get_template('/subdir/modtest.html')
+        eq_(
+            t.module.__file__, 
+            os.path.join(module_base, 'foo', 'modtest.html.py')
+        )
+        eq_(
+            t2.module.__file__, 
+            os.path.join(module_base, 'subdir', 'foo', 'modtest.html.py')
+        )
+
+    def test_custom_writer(self):
+        canary = []
+        def write_module(source, outputpath):
+            f = open(outputpath, 'wb')
+            canary.append(outputpath)
+            f.write(source)
+            f.close()
+        lookup = TemplateLookup(template_base, module_writer=write_module, 
+                                            module_directory=module_base)
+        t = lookup.get_template('/modtest.html')
+        t2 = lookup.get_template('/subdir/modtest.html')
+        eq_(
+            canary,
+            [os.path.join(module_base, "modtest.html.py"),
+            os.path.join(module_base, "subdir/modtest.html.py")]
+        )
+
+class FilenameToURITest(TemplateTest):
+    def test_windows_paths(self):
+        """test that windows filenames are handled appropriately by Template."""
+ 
+        current_path = os.path
+        import ntpath
+        os.path = ntpath
+        try:
+            class NoCompileTemplate(Template):
+                def _compile_from_file(self, path, filename):
+                    self.path = path
+                    return Template("foo bar").module
+ 
+            t1 = NoCompileTemplate(
+                                    filename="c:\\foo\\template.html", 
+                                    module_directory="c:\\modules\\")
+ 
+            eq_(t1.uri, "/foo/template.html")
+            eq_(t1.path, "c:\\modules\\foo\\template.html.py")
+
+            t1 = NoCompileTemplate(
+                                    filename="c:\\path\\to\\templates\\template.html", 
+                                    uri = "/bar/template.html",
+                                    module_directory="c:\\modules\\")
+ 
+            eq_(t1.uri, "/bar/template.html")
+            eq_(t1.path, "c:\\modules\\bar\\template.html.py")
+
+        finally:
+            os.path = current_path
+
+    def test_posix_paths(self):
+        """test that posixs filenames are handled appropriately by Template."""
+
+        current_path = os.path
+        import posixpath
+        os.path = posixpath
+        try:
+            class NoCompileTemplate(Template):
+                def _compile_from_file(self, path, filename):
+                    self.path = path
+                    return Template("foo bar").module
+
+            t1 = NoCompileTemplate(
+                                    filename="/var/www/htdocs/includes/template.html", 
+                                    module_directory="/var/lib/modules")
+
+            eq_(t1.uri, "/var/www/htdocs/includes/template.html")
+            eq_(t1.path, "/var/lib/modules/var/www/htdocs/includes/template.html.py")
+
+            t1 = NoCompileTemplate(
+                                    filename="/var/www/htdocs/includes/template.html", 
+                                    uri = "/bar/template.html",
+                                    module_directory="/var/lib/modules")
+
+            eq_(t1.uri, "/bar/template.html")
+            eq_(t1.path, "/var/lib/modules/bar/template.html.py")
+
+        finally:
+            os.path = current_path
+ 
+    def test_dont_accept_relative_outside_of_root(self):
+        assert_raises_message(
+            exceptions.TemplateLookupException,
+            "Template uri \"../../foo.html\" is invalid - it "
+            "cannot be relative outside of the root path",
+            Template, "test", uri="../../foo.html", 
+        )
+
+        assert_raises_message(
+            exceptions.TemplateLookupException,
+            "Template uri \"/../../foo.html\" is invalid - it "
+            "cannot be relative outside of the root path",
+            Template, "test", uri="/../../foo.html", 
+        )
+
+        # normalizes in the root is OK
+        t = Template("test", uri="foo/bar/../../foo.html")
+        eq_(t.uri, "foo/bar/../../foo.html")
+
+
+class ModuleTemplateTest(TemplateTest):
+    def test_module_roundtrip(self):
+        lookup = TemplateLookup()
+
+        template = Template("""
+        <%inherit file="base.html"/>
+ 
+        % for x in range(5):
+            ${x}
+        % endfor
+""", lookup=lookup)
+
+        base = Template("""
+        This is base.
+        ${self.body()}
+""", lookup=lookup)
+
+        lookup.put_template("base.html", base)
+        lookup.put_template("template.html", template)
+ 
+        assert result_lines(template.render()) == [
+            "This is base.", "0", "1", "2", "3", "4"
+        ]
+ 
+        lookup = TemplateLookup()
+        template = ModuleTemplate(template.module, lookup=lookup)
+        base = ModuleTemplate(base.module, lookup=lookup)
+
+        lookup.put_template("base.html", base)
+        lookup.put_template("template.html", template)
+ 
+        assert result_lines(template.render()) == [
+            "This is base.", "0", "1", "2", "3", "4"
+        ]
+ 
+ 
+class PreprocessTest(TemplateTest):
+    def test_old_comments(self):
+        t = Template("""
+        im a template
+# old style comment
+    # more old style comment
+ 
+    ## new style comment
+    - # not a comment
+    - ## not a comment
+""", preprocessor=convert_comments)
+
+        assert flatten_result(t.render()) == "im a template - # not a comment - ## not a comment"
diff --git a/lib/mako-0.7.2/test/test_tgplugin.py b/lib/mako-0.7.2/test/test_tgplugin.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_tgplugin.py
@@ -0,0 +1,42 @@
+import unittest
+
+from mako.ext.turbogears import TGPlugin
+from util import flatten_result, result_lines
+from test import TemplateTest, template_base
+
+tl = TGPlugin(options=dict(directories=[template_base]), extension='html')
+
+class TestTGPlugin(TemplateTest):
+    def test_basic(self):
+        t = tl.load_template('/index.html')
+        assert result_lines(t.render()) == [
+            "this is index"
+        ]
+    def test_subdir(self):
+        t = tl.load_template('/subdir/index.html')
+        assert result_lines(t.render()) == [
+            "this is sub index",
+            "this is include 2"
+
+        ]
+
+        assert tl.load_template('/subdir/index.html').module_id == '_subdir_index_html'
+
+    def test_basic_dot(self):
+        t = tl.load_template('index')
+        assert result_lines(t.render()) == [
+            "this is index"
+        ]
+    def test_subdir_dot(self):
+        t = tl.load_template('subdir.index')
+        assert result_lines(t.render()) == [
+            "this is sub index",
+            "this is include 2"
+
+        ]
+
+        assert tl.load_template('subdir.index').module_id == '_subdir_index_html'
+ 
+    def test_string(self):
+        t = tl.load_template('foo', "hello world")
+        assert t.render() == "hello world"
diff --git a/lib/mako-0.7.2/test/test_util.py b/lib/mako-0.7.2/test/test_util.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/test_util.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+import os
+import unittest
+from mako import util
+from test import eq_
+
+class UtilTest(unittest.TestCase):
+    def test_fast_buffer_write(self):
+        buf = util.FastEncodingBuffer()
+        buf.write("string a ")
+        buf.write("string b")
+        eq_(buf.getvalue(), "string a string b")
+
+    def test_fast_buffer_truncate(self):
+        buf = util.FastEncodingBuffer()
+        buf.write("string a ")
+        buf.write("string b")
+        buf.truncate()
+        buf.write("string c ")
+        buf.write("string d")
+        eq_(buf.getvalue(), "string c string d")
+
+    def test_fast_buffer_encoded(self):
+        s = u"dr?l m?a r?e ? S?il"
+        buf = util.FastEncodingBuffer(encoding='utf-8')
+        buf.write(s[0:10])
+        buf.write(s[10:])
+        q = buf.getvalue()
+        eq_(buf.getvalue(), s.encode('utf-8'))
+
+    def test_read_file(self):
+        fn = os.path.join(os.path.dirname(__file__), 'test_util.py')
+        data = util.read_file(fn, 'rb')
+        self.failUnless('test_util' in str(data)) # str() for py3k
+
+    def test_load_module(self):
+        fn = os.path.join(os.path.dirname(__file__), 'test_util.py')
+        module = util.load_module('mako.template', fn)
+        import mako.template
+        self.assertEqual(module, mako.template)
diff --git a/lib/mako-0.7.2/test/util.py b/lib/mako-0.7.2/test/util.py
new file mode 100644
--- /dev/null
+++ b/lib/mako-0.7.2/test/util.py
@@ -0,0 +1,7 @@
+import re
+
+def flatten_result(result):
+    return re.sub(r'[\s\r\n]+', ' ', result).strip()
+
+def result_lines(result):
+    return [x.strip() for x in re.split(r'\r?\n', re.sub(r' +', ' ', result)) if x.strip() != '']
\ No newline at end of file
diff --git a/make_perf3.sh b/make_perf3.sh
--- a/make_perf3.sh
+++ b/make_perf3.sh
@@ -33,7 +33,7 @@
 # Libraries that are Python 3 compatible as-is.
 SAFE_LIBS_AS_IS="pathlib"
 # Libraries that work with Python 3 after passing through 2to3.
-SAFE_LIBS_TO_TRANSLATE="2to3 mako"
+SAFE_LIBS_TO_TRANSLATE="2to3 mako-0.3.6 mako-0.7.2"
 mkdir lib
 for safe_lib in ${SAFE_LIBS_AS_IS}; do
   cp -a "${srcdir}/lib/${safe_lib}" lib/${safe_lib}
diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1478,7 +1478,7 @@
 
 def MeasureMako(python, options):
     bm_path = Relative("performance/bm_mako.py", python, options)
-    mako_path = Relative("lib/mako", python, options)
+    mako_path = Relative("lib/mako-0.3.6", python, options)
     bm_env = BuildEnv({"PYTHONPATH": mako_path}, options.inherit_env)
     return MeasureGeneric(python, options, bm_path, bm_env, iteration_scaling=5)
 
@@ -1487,6 +1487,17 @@
     return SimpleBenchmark(MeasureMako, *args, **kwargs)
 
 
+def MeasureMakoV2(python, options):
+    bm_path = Relative("performance/bm_mako_v2.py", python, options)
+    mako_path = Relative("lib/mako-0.7.2", python, options)
+    bm_env = BuildEnv({"PYTHONPATH": mako_path}, options.inherit_env)
+    return MeasureGeneric(python, options, bm_path, bm_env, iteration_scaling=5)
+
+
+def BM_mako_v2(*args, **kwargs):
+    return SimpleBenchmark(MeasureMakoV2, *args, **kwargs)
+
+
 def MeasurePathlib(python, options):
     bm_path = Relative("performance/bm_pathlib.py")
     pathlib_path = Relative("lib/pathlib")
@@ -2041,7 +2052,7 @@
                 "calls": ["call_simple", "call_method", "call_method_slots",
                           "call_method_unknown"],
                 "math": ["nbody", "float", "pidigits"],
-                "template" : ["slowspitfire", "django", "mako"],
+                "template" : ["slowspitfire", "django", "mako_v2"],
                 "logging": ["silent_logging", "simple_logging", "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
                 "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
@@ -2051,7 +2062,7 @@
                         "startup_nosite", "richards", "threading",
                         "unpack_sequence"],
                 # After 2to3-conversion
-                "py3k": ["2to3", "2n3", "mako"]
+                "py3k": ["2to3", "2n3", "mako_v2"]
                }
 
 
diff --git a/performance/bm_mako_v2.py b/performance/bm_mako_v2.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_mako_v2.py
@@ -0,0 +1,154 @@
+#!/usr/bin/python
+
+"""
+Benchmark for test the performance of Mako templates engine.
+Includes:
+    -two template inherences
+    -HTML escaping, XML escaping, URL escaping, whitespace trimming
+    -function defitions and calls
+    -forloops
+"""
+
+__author__ = "virhilo at gmail.com (Lukasz Fidosz)"
+
+# Python imports
+import os
+import sys
+import optparse
+import time
+
+# Local imports
+from compat import xrange
+import util
+
+def relative(*args):
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), *args)
+
+sys.path.insert(0, relative('..', 'lib'))
+
+# Mako imports
+from mako.template import Template
+from mako.lookup import TemplateLookup
+
+
+LOREM_IPSUM = """Quisque lobortis hendrerit posuere. Curabitur
+aliquet consequat sapien molestie pretium. Nunc adipiscing luc
+tus mi, viverra porttitor lorem vulputate et. Ut at purus sem,
+sed tincidunt ante. Vestibulum ante ipsum primis in faucibus 
+orci luctus et ultrices posuere cubilia Curae; Praesent pulvinar
+sodales justo at congue. Praesent aliquet facilisis nisl a
+molestie. Sed tempus nisl ut augue eleifend tincidunt. Sed a
+lacinia nulla. Cras tortor est, mollis et consequat at,
+vulputate et orci. Nulla sollicitudin"""
+
+BASE_TEMPLATE = """
+<%def name="render_table(table)">
+    <table>
+    % for row in table:
+        <tr>
+        % for col in row:
+            <td>${col|h}</td>
+        % endfor
+        </tr>
+    % endfor
+    </table>
+</%def>
+<%def name="img(src, alt)">
+    <img src="${src|u}" alt="${alt}" />
+</%def>
+<html>
+    <head><title>${title|h,trim}</title></head>
+    <body>
+        ${next.body()}
+    </body>
+<html>
+"""
+
+PAGE_TEMPLATE = """
+<%inherit file="base.mako"/>
+<table>
+    % for row in table:
+        <tr>
+            % for col in row:
+                <td>${col}</td>
+            % endfor
+        </tr>
+    % endfor
+</table>
+% for nr in xrange(img_count):
+    ${parent.img('/foo/bar/baz.png', 'no image :o')}
+% endfor
+${next.body()}
+% for nr in paragraphs:
+    <p>${lorem|x}</p>
+% endfor
+${parent.render_table(table)}
+"""
+
+CONTENT_TEMPLATE = """
+<%inherit file="page.mako"/>
+<%def name="fun1()">
+    <span>fun1</span>
+</%def>
+<%def name="fun2()">
+    <span>fun2</span>
+</%def>
+<%def name="fun3()">
+    <span>foo3</span>
+</%def>
+<%def name="fun4()">
+    <span>foo4</span>
+</%def>
+<%def name="fun5()">
+    <span>foo5</span>
+</%def>
+<%def name="fun6()">
+    <span>foo6</span>
+</%def>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Nam laoreet justo in velit faucibus lobortis. Sed dictum sagittis
+volutpat. Sed adipiscing vestibulum consequat. Nullam laoreet, ante
+nec pretium varius, libero arcu porttitor orci, id cursus odio nibh
+nec leo. Vestibulum dapibus pellentesque purus, sed bibendum tortor
+laoreet id. Praesent quis sodales ipsum. Fusce ut ligula sed diam
+pretium sagittis vel at ipsum. Nulla sagittis sem quam, et volutpat
+velit. Fusce dapibus ligula quis lectus ultricies tempor. Pellente</p>
+${fun1()}
+${fun2()}
+${fun3()}
+${fun4()}
+${fun5()}
+${fun6()}
+"""
+
+
+def test_mako(count):
+
+    lookup = TemplateLookup()
+    lookup.put_string('base.mako', BASE_TEMPLATE)
+    lookup.put_string('page.mako', PAGE_TEMPLATE)
+
+    template = Template(CONTENT_TEMPLATE, lookup=lookup)
+    
+    table = [xrange(150) for i in xrange(150)]
+    paragraphs = xrange(50)
+    title = 'Hello world!'
+
+    times = []
+    for i in xrange(count):
+        t0 = time.time()
+        data = template.render(table=table, paragraphs=paragraphs,
+                               lorem=LOREM_IPSUM, title=title,
+                               img_count=50, xrange=xrange)
+        t1 = time.time()
+        times.append(t1-t0)
+    return times
+
+if __name__ == "__main__":
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description=("Test the performance of Mako templates."))
+    util.add_standard_options_to(parser)
+    (options, args) = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, test_mako)

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:27 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Remove_an_unneeded_sys?=
	=?utf-8?q?=2Epath_modification=2E?=
Message-ID: <3XJWDq1L97zQMT@mail.python.org>

http://hg.python.org/benchmarks/rev/be837864d05b
changeset:   174:be837864d05b
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 12:28:42 2012 -0400
summary:
  Remove an unneeded sys.path modification.

files:
  performance/bm_mako_v2.py |  5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)


diff --git a/performance/bm_mako_v2.py b/performance/bm_mako_v2.py
--- a/performance/bm_mako_v2.py
+++ b/performance/bm_mako_v2.py
@@ -21,11 +21,6 @@
 from compat import xrange
 import util
 
-def relative(*args):
-    return os.path.join(os.path.dirname(os.path.abspath(__file__)), *args)
-
-sys.path.insert(0, relative('..', 'lib'))
-
 # Mako imports
 from mako.template import Template
 from mako.lookup import TemplateLookup

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:28 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_json=5Fbe?=
 =?utf-8?q?nch_benchmark=2E_Currently_only_includes_a_new_version_of?=
Message-ID: <3XJWDr3c80zQDx@mail.python.org>

http://hg.python.org/benchmarks/rev/96c9c9ffb2ef
changeset:   175:96c9c9ffb2ef
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 13:33:04 2012 -0400
summary:
  Port PyPy's json_bench benchmark. Currently only includes a new version of json_dump and not json_load.

files:
  perf.py                   |  12 ++++++-
  performance/bm_json_v2.py |  39 +++++++++++++++++++++++++++
  2 files changed, 49 insertions(+), 2 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1612,6 +1612,14 @@
     args = ["json_load"]
     return _JSONBenchmark(base_python, changed_python, options, args)
 
+
+def MeasureJSONDumpV2(python, options):
+    bm_path = Relative("performance/bm_json_v2.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_JSON_Dump_V2(*args, **kwargs):
+    return SimpleBenchmark(MeasureJSONDumpV2, *args, **kwargs)
+
 def MeasureNQueens(python, options):
     """Test the performance of an N-Queens solver.
 
@@ -2047,7 +2055,7 @@
                 "threading": ["threaded_count", "iterative_count"],
                 "serialize": ["slowpickle", "slowunpickle",
                               "fastpickle", "fastunpickle",
-                              "json_dump", "json_load"],
+                              "json_dump_v2", "json_load"],
                 "apps": ["2to3", "html5lib", "rietveld", "spambayes"],
                 "calls": ["call_simple", "call_method", "call_method_slots",
                           "call_method_unknown"],
@@ -2056,7 +2064,7 @@
                 "logging": ["silent_logging", "simple_logging", "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
                 "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
-                        "fastunpickle", "json_dump", "json_load", "math",
+                        "fastunpickle", "json_dump_v2", "json_load", "math",
                         "logging", "meteor_contest", "normal_startup",
                         "nqueens", "pathlib", "regex", "spectral_norm",
                         "startup_nosite", "richards", "threading",
diff --git a/performance/bm_json_v2.py b/performance/bm_json_v2.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_json_v2.py
@@ -0,0 +1,39 @@
+import time
+import json
+
+from compat import u_lit, xrange
+
+# execution runtime per test case
+TARGET_RUNTIME = 10
+
+EMPTY = ({}, 200000)
+SIMPLE_DATA = {'key1': 0, 'key2': True, 'key3': 'value', 'key4': 'foo',
+               'key5': 'string'}
+SIMPLE = (SIMPLE_DATA, 100000)
+NESTED_DATA = {'key1': 0, 'key2': SIMPLE[0], 'key3': 'value', 'key4': SIMPLE[0],
+               'key5': SIMPLE[0], u_lit('key'): u_lit('\u0105\u0107\u017c')}
+NESTED = (NESTED_DATA, 100000)
+HUGE = ([NESTED[0]] * 1000, 100)
+
+cases = ['EMPTY', 'SIMPLE', 'NESTED', 'HUGE']
+
+def main(n):
+    l = []
+    for i in xrange(n):
+        t0 = time.time()
+        for case in cases:
+            data, count = globals()[case]
+            for i in xrange(count):
+                json.dumps(data)
+        l.append(time.time() - t0)
+    return l
+
+if __name__ == '__main__':
+    import util, optparse
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the JSON benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:30 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_go_benchm?=
	=?utf-8?q?ark=2E?=
Message-ID: <3XJWDt162NzQWH@mail.python.org>

http://hg.python.org/benchmarks/rev/69e3f1619f32
changeset:   176:69e3f1619f32
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 13:41:50 2012 -0400
summary:
  Port PyPy's go benchmark.

files:
  perf.py              |   12 +-
  performance/bm_go.py |  447 +++++++++++++++++++++++++++++++
  2 files changed, 457 insertions(+), 2 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1653,6 +1653,14 @@
     return SimpleBenchmark(MeasureFannkuch, *args, **kwargs)
 
 
+def MeasureGo(python, options):
+    bm_path = Relative("performance/bm_go.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Go(*args, **kwargs):
+    return SimpleBenchmark(MeasureGo, *args, **kwargs)
+
+
 def MeasureMeteorContest(python, options):
     bm_path = Relative("performance/bm_meteor_contest.py")
     return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
@@ -2064,8 +2072,8 @@
                 "logging": ["silent_logging", "simple_logging", "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
                 "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
-                        "fastunpickle", "json_dump_v2", "json_load", "math",
-                        "logging", "meteor_contest", "normal_startup",
+                        "fastunpickle", "go", "json_dump_v2", "json_load",
+                        "math", "logging", "meteor_contest", "normal_startup",
                         "nqueens", "pathlib", "regex", "spectral_norm",
                         "startup_nosite", "richards", "threading",
                         "unpack_sequence"],
diff --git a/performance/bm_go.py b/performance/bm_go.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_go.py
@@ -0,0 +1,447 @@
+import random, math, sys, time
+
+SIZE = 9
+GAMES = 200
+KOMI = 7.5
+EMPTY, WHITE, BLACK = 0, 1, 2
+SHOW = {EMPTY: '.', WHITE: 'o', BLACK: 'x'}
+PASS = -1
+MAXMOVES = SIZE*SIZE*3
+TIMESTAMP = 0
+MOVES = 0
+
+def to_pos(x,y):
+    return y * SIZE + x
+
+def to_xy(pos):
+    y, x = divmod(pos, SIZE)
+    return x, y
+
+class Square:
+    def __init__(self, board, pos):
+        self.board = board
+        self.pos = pos
+        self.timestamp = TIMESTAMP
+        self.removestamp = TIMESTAMP
+        self.zobrist_strings = [random.randrange(9223372036854775807)
+                                for i in range(3)]
+
+    def set_neighbours(self): 
+        x, y = self.pos % SIZE, self.pos // SIZE;
+        self.neighbours = []
+        for dx, dy in [(-1, 0), (1, 0), (0, -1), (0, 1)]:
+            newx, newy = x + dx, y + dy
+            if 0 <= newx < SIZE and 0 <= newy < SIZE:
+                self.neighbours.append(self.board.squares[to_pos(newx, newy)])
+
+    def move(self, color):
+        global TIMESTAMP, MOVES
+        TIMESTAMP += 1
+        MOVES += 1
+        self.board.zobrist.update(self, color)
+        self.color = color
+        self.reference = self
+        self.ledges = 0
+        self.used = True
+        for neighbour in self.neighbours:
+            neighcolor = neighbour.color
+            if neighcolor == EMPTY: 
+                self.ledges += 1
+            else:
+                neighbour_ref = neighbour.find(update=True)
+                if neighcolor == color:
+                    if neighbour_ref.reference.pos != self.pos:
+                        self.ledges += neighbour_ref.ledges 
+                        neighbour_ref.reference = self
+                    self.ledges -= 1
+                else:
+                    neighbour_ref.ledges -= 1
+                    if neighbour_ref.ledges == 0:
+                        neighbour.remove(neighbour_ref)
+        self.board.zobrist.add()
+
+    def remove(self, reference, update=True):
+        self.board.zobrist.update(self, EMPTY)
+        self.removestamp = TIMESTAMP
+        if update:
+            self.color = EMPTY
+            self.board.emptyset.add(self.pos)
+#            if color == BLACK:
+#                self.board.black_dead += 1
+#            else:
+#                self.board.white_dead += 1
+        for neighbour in self.neighbours:
+            if neighbour.color != EMPTY and neighbour.removestamp != TIMESTAMP:
+                neighbour_ref = neighbour.find(update)
+                if neighbour_ref.pos == reference.pos:
+                    neighbour.remove(reference, update)
+                else:
+                    if update:
+                        neighbour_ref.ledges += 1
+
+    def find(self, update=False): 
+       reference = self.reference
+       if reference.pos != self.pos:
+           reference = reference.find(update)
+           if update:
+               self.reference = reference
+       return reference
+    
+    def __repr__(self):
+        return repr(to_xy(self.pos))
+
+class EmptySet:
+    def __init__(self, board):
+        self.board = board
+        self.empties = list(range(SIZE*SIZE))
+        self.empty_pos = list(range(SIZE*SIZE))
+
+    def random_choice(self):
+        choices = len(self.empties)
+        while choices:  
+            i = int(random.random()*choices)
+            pos = self.empties[i]
+            if self.board.useful(pos):
+                return pos
+            choices -= 1
+            self.set(i, self.empties[choices])
+            self.set(choices, pos)
+        return PASS
+
+    def add(self, pos):
+        self.empty_pos[pos] = len(self.empties)
+        self.empties.append(pos)
+
+    def remove(self, pos):
+        self.set(self.empty_pos[pos], self.empties[len(self.empties)-1])
+        self.empties.pop()
+
+    def set(self, i, pos): 
+        self.empties[i] = pos
+        self.empty_pos[pos] = i
+
+class ZobristHash:
+    def __init__(self, board):
+        self.board = board
+        self.hash_set = set()
+        self.hash = 0
+        for square in self.board.squares:
+            self.hash ^= square.zobrist_strings[EMPTY]
+        self.hash_set.clear()
+        self.hash_set.add(self.hash)
+
+    def update(self, square, color):
+        self.hash ^= square.zobrist_strings[square.color]
+        self.hash ^= square.zobrist_strings[color]
+
+    def add(self):
+        self.hash_set.add(self.hash)
+    
+    def dupe(self):
+        return self.hash in self.hash_set
+
+class Board:
+    def __init__(self):
+        self.squares = [Square(self, pos) for pos in range(SIZE*SIZE)]
+        for square in self.squares:
+            square.set_neighbours()
+        self.reset()
+
+    def reset(self):
+        for square in self.squares:
+            square.color = EMPTY
+            square.used = False
+        self.emptyset = EmptySet(self)
+        self.zobrist = ZobristHash(self)
+        self.color = BLACK
+        self.finished = False
+        self.lastmove = -2
+        self.history = []
+        self.white_dead = 0
+        self.black_dead = 0
+
+    def move(self, pos):
+        square = self.squares[pos]
+        if pos != PASS:
+            square.move(self.color)
+            self.emptyset.remove(square.pos)
+        elif self.lastmove == PASS:
+            self.finished = True
+        if self.color == BLACK: self.color = WHITE
+        else: self.color = BLACK
+        self.lastmove = pos
+        self.history.append(pos)
+
+    def random_move(self):
+        return self.emptyset.random_choice()
+
+    def useful_fast(self, square):
+        if not square.used:
+            for neighbour in square.neighbours:
+                if neighbour.color == EMPTY:
+                    return True
+        return False
+
+    def useful(self, pos): 
+        global TIMESTAMP
+        TIMESTAMP += 1
+        square = self.squares[pos]
+        if self.useful_fast(square):
+            return True
+        old_hash = self.zobrist.hash
+        self.zobrist.update(square, self.color)
+        empties = opps = weak_opps = neighs = weak_neighs = 0
+        for neighbour in square.neighbours:
+            neighcolor = neighbour.color
+            if neighcolor == EMPTY:
+                empties += 1
+                continue
+            neighbour_ref = neighbour.find()
+            if neighbour_ref.timestamp != TIMESTAMP:
+                if neighcolor == self.color:  
+                    neighs += 1
+                else: 
+                    opps += 1
+                neighbour_ref.timestamp = TIMESTAMP
+                neighbour_ref.temp_ledges = neighbour_ref.ledges
+            neighbour_ref.temp_ledges -= 1
+            if neighbour_ref.temp_ledges == 0:
+                if neighcolor == self.color:  
+                    weak_neighs += 1
+                else:
+                    weak_opps += 1
+                    neighbour_ref.remove(neighbour_ref, update=False)
+        dupe = self.zobrist.dupe()
+        self.zobrist.hash = old_hash
+        strong_neighs = neighs-weak_neighs
+        strong_opps = opps-weak_opps
+        return not dupe and \
+               (empties or weak_opps or (strong_neighs and (strong_opps or weak_neighs)))
+
+    def useful_moves(self):
+        return [pos for pos in self.emptyset.empties if self.useful(pos)]
+
+    def replay(self, history):
+        for pos in history:
+            self.move(pos)
+
+    def score(self, color):
+        if color == WHITE:
+            count = KOMI + self.black_dead
+        else:
+            count = self.white_dead
+        for square in self.squares:
+            squarecolor = square.color
+            if squarecolor == color:
+                count += 1
+            elif squarecolor == EMPTY:
+                surround = 0
+                for neighbour in square.neighbours:
+                    if neighbour.color == color:
+                        surround += 1
+                if surround == len(square.neighbours): 
+                    count += 1
+        return count
+
+    def check(self):
+       for square in self.squares:
+           if square.color == EMPTY:
+               continue
+
+           members1 = set([square])
+           changed = True
+           while changed:
+               changed = False
+               for member in members1.copy():
+                   for neighbour in member.neighbours:
+                       if neighbour.color == square.color and neighbour not in members1:
+                           changed = True
+                           members1.add(neighbour)
+           ledges1 = 0
+           for member in members1:
+               for neighbour in member.neighbours:
+                   if neighbour.color == EMPTY:
+                       ledges1 += 1
+
+           root = square.find()
+
+           #print 'members1', square, root, members1
+           #print 'ledges1', square, ledges1
+
+           members2 = set()
+           for square2 in self.squares:
+               if square2.color != EMPTY and square2.find() == root:
+                   members2.add(square2)
+
+           ledges2 = root.ledges
+           #print 'members2', square, root, members1
+           #print 'ledges2', square, ledges2
+
+           assert members1 == members2
+           assert ledges1 == ledges2, ('ledges differ at %r: %d %d' % (square, ledges1, ledges2))
+
+           empties1 = set(self.emptyset.empties)
+
+           empties2 = set()
+           for square in self.squares:
+               if square.color == EMPTY:
+                   empties2.add(square.pos)
+
+    def __repr__(self):
+        result = []
+        for y in range(SIZE):
+            start = to_pos(0, y)
+            result.append(''.join([SHOW[square.color]+' ' for square in self.squares[start:start+SIZE]]))
+        return '\n'.join(result)
+
+class UCTNode:
+    def __init__(self):
+        self.bestchild = None
+        self.pos = -1
+        self.wins = 0
+        self.losses = 0
+        self.pos_child = [None for x in range(SIZE*SIZE)]
+        self.parent = None
+
+    def play(self, board):
+        """ uct tree search """
+        color = board.color
+        node = self
+        path = [node]
+        while True:
+            pos = node.select(board)
+            if pos == PASS:
+                break
+            board.move(pos)
+            child = node.pos_child[pos]
+            if not child:
+                child = node.pos_child[pos] = UCTNode()
+                child.unexplored = board.useful_moves()
+                child.pos = pos
+                child.parent = node
+                path.append(child)
+                break
+            path.append(child)
+            node = child
+        self.random_playout(board)
+        self.update_path(board, color, path)
+
+    def select(self, board):
+        """ select move; unexplored children first, then according to uct value """
+        if self.unexplored:
+            i = random.randrange(len(self.unexplored))
+            pos = self.unexplored[i]
+            self.unexplored[i] = self.unexplored[len(self.unexplored)-1]
+            self.unexplored.pop()
+            return pos
+        elif self.bestchild:
+            return self.bestchild.pos
+        else:
+            return PASS
+
+    def random_playout(self, board):
+        """ random play until both players pass """
+        for x in range(MAXMOVES): # XXX while not self.finished?
+            if board.finished:
+                break
+            board.move(board.random_move())
+
+    def update_path(self, board, color, path):
+        """ update win/loss count along path """
+        wins = board.score(BLACK) >= board.score(WHITE)
+        for node in path:
+            if color == BLACK: color = WHITE
+            else: color = BLACK
+            if wins == (color == BLACK):
+                node.wins += 1
+            else:
+                node.losses += 1
+            if node.parent:
+                node.parent.bestchild = node.parent.best_child()
+
+    def score(self):
+        winrate = self.wins/float(self.wins+self.losses)
+        parentvisits = self.parent.wins+self.parent.losses
+        if not parentvisits:
+            return winrate
+        nodevisits = self.wins+self.losses
+        return winrate + math.sqrt((math.log(parentvisits))/(5*nodevisits))
+
+    def best_child(self):
+        maxscore = -1
+        maxchild = None
+        for child in self.pos_child:
+            if child and child.score() > maxscore:
+                maxchild = child
+                maxscore = child.score()
+        return maxchild
+
+    def best_visited(self):
+        maxvisits = -1
+        maxchild = None
+        for child in self.pos_child:
+#            if child:
+#                print to_xy(child.pos), child.wins, child.losses, child.score()
+            if child and (child.wins+child.losses) > maxvisits:
+                maxvisits, maxchild = (child.wins+child.losses), child
+        return maxchild
+
+def user_move(board):
+    while True:
+        text = raw_input('?').strip()
+        if text == 'p':
+            return PASS
+        if text == 'q':
+            raise EOFError
+        try:
+            x, y = [int(i) for i in text.split()]
+        except ValueError:
+            continue
+        if not (0 <= x < SIZE and 0 <= y < SIZE):
+            continue
+        pos = to_pos(x, y)
+        if board.useful(pos): 
+            return pos
+
+def computer_move(board):
+    global MOVES
+    pos = board.random_move()
+    if pos == PASS:
+        return PASS
+    tree = UCTNode()
+    tree.unexplored = board.useful_moves()
+    nboard = Board()
+    for game in range(GAMES):
+        node = tree
+        nboard.reset()
+        nboard.replay(board.history)
+        node.play(nboard)
+#    print 'moves', MOVES
+    return tree.best_visited().pos
+
+def versus_cpu():
+    random.seed(1)
+    board = Board()
+    pos = computer_move(board)
+
+def main(n):
+    times = []
+    for i in range(5):
+        versus_cpu() # warmup
+    for i in range(n):
+        t1 = time.time()
+        versus_cpu()
+        t2 = time.time()
+        times.append(t2 - t1)
+    return times
+
+if __name__ == "__main__":
+    import util, optparse
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the Go benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)
+

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:31 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:31 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Mark_what_serializing_t?=
 =?utf-8?q?ests_are_not_run_by_Python_3=2E?=
Message-ID: <3XJWDv3TMgzQWk@mail.python.org>

http://hg.python.org/benchmarks/rev/885dafc93881
changeset:   177:885dafc93881
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 13:49:08 2012 -0400
summary:
  Mark what serializing tests are not run by Python 3.

files:
  perf.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -2061,15 +2061,16 @@
                             "bzr_startup", "hg_startup"],
                 "regex": ["regex_v8", "regex_effbot", "regex_compile"],
                 "threading": ["threaded_count", "iterative_count"],
-                "serialize": ["slowpickle", "slowunpickle",
+                "serialize": ["slowpickle", "slowunpickle",  # Not for Python 3
                               "fastpickle", "fastunpickle",
                               "json_dump_v2", "json_load"],
                 "apps": ["2to3", "html5lib", "rietveld", "spambayes"],
                 "calls": ["call_simple", "call_method", "call_method_slots",
                           "call_method_unknown"],
-                "math": ["nbody", "float", "pidigits"],
+                "math": ["float", "nbody", "pidigits"],
                 "template" : ["slowspitfire", "django", "mako_v2"],
-                "logging": ["silent_logging", "simple_logging", "formatted_logging"],
+                "logging": ["silent_logging", "simple_logging",
+                            "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
                 "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
                         "fastunpickle", "go", "json_dump_v2", "json_load",

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:32 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Minor_code_clean-up=2E?=
Message-ID: <3XJWDw5k1nzNjl@mail.python.org>

http://hg.python.org/benchmarks/rev/8dda41adf5fd
changeset:   178:8dda41adf5fd
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 13:49:22 2012 -0400
summary:
  Minor code clean-up.

files:
  performance/bm_fannkuch.py       |  2 +-
  performance/bm_meteor_contest.py |  4 ----
  2 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/performance/bm_fannkuch.py b/performance/bm_fannkuch.py
--- a/performance/bm_fannkuch.py
+++ b/performance/bm_fannkuch.py
@@ -56,7 +56,7 @@
 
 def main(n):
     times = []
-    for i in range(n):
+    for i in xrange(n):
         t0 = time.time()
         fannkuch(DEFAULT_ARG)
         tk = time.time()
diff --git a/performance/bm_meteor_contest.py b/performance/bm_meteor_contest.py
--- a/performance/bm_meteor_contest.py
+++ b/performance/bm_meteor_contest.py
@@ -27,7 +27,6 @@
 
 
 def permute(ido, r_ido, rotate=rotate, flip=flip):
-
     ps = [ido]
     for r in xrange(dir_no - 1):
         ps.append(rotate(ps[-1]))
@@ -47,7 +46,6 @@
 
 
 def get_footprints(board, cti, pieces):
-
     fps = [[[] for p in xrange(len(pieces))] for ci in xrange(len(board))]
     for c in board:
         for pi, p in enumerate(pieces):
@@ -68,7 +66,6 @@
 
 
 def get_puzzle(w=w, h=h):
-
     board = [E*x + S*y + (y%2) for y in xrange(h) for x in xrange(w)]
     cti = dict((board[i], i) for i in xrange(len(board)))
 
@@ -89,7 +86,6 @@
 
 
 def print_board(board, w=w, h=h):
-
     for y in xrange(h):
         for x in xrange(w):
             print(board[x + y * w])

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:34 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:34 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_hexiom2?=
	=?utf-8?q?=27s_benchmark=2E?=
Message-ID: <3XJWDy3MxwzQ6q@mail.python.org>

http://hg.python.org/benchmarks/rev/8ddd6bbd517f
changeset:   179:8ddd6bbd517f
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 15:18:48 2012 -0400
summary:
  Port PyPy's hexiom2's benchmark.

files:
  perf.py                   |   18 +-
  performance/bm_hexiom2.py |  541 ++++++++++++++++++++++++++
  performance/compat.py     |    4 +
  3 files changed, 558 insertions(+), 5 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1685,6 +1685,14 @@
     return SimpleBenchmark(MeasureTelco, *args, **kwargs)
 
 
+def MeasureHexiom2(python, options):
+    bm_path = Relative("performance/bm_hexiom2.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Hexiom2(*args, **kwargs):
+    return SimpleBenchmark(MeasureHexiom2, *args, **kwargs)
+
+
 def MeasureLogging(python, options, extra_args):
     """Test the performance of Python's logging module.
 
@@ -2073,11 +2081,11 @@
                             "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
                 "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
-                        "fastunpickle", "go", "json_dump_v2", "json_load",
-                        "math", "logging", "meteor_contest", "normal_startup",
-                        "nqueens", "pathlib", "regex", "spectral_norm",
-                        "startup_nosite", "richards", "threading",
-                        "unpack_sequence"],
+                        "fastunpickle", "go", "hexiom2", "json_dump_v2",
+                        "json_load", "math", "logging", "meteor_contest",
+                        "normal_startup", "nqueens", "pathlib", "regex",
+                        "spectral_norm", "startup_nosite", "richards",
+                        "threading", "unpack_sequence"],
                 # After 2to3-conversion
                 "py3k": ["2to3", "2n3", "mako_v2"]
                }
diff --git a/performance/bm_hexiom2.py b/performance/bm_hexiom2.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_hexiom2.py
@@ -0,0 +1,541 @@
+"""Benchmark from Laurent Vaucher.
+
+Source: https://github.com/slowfrog/hexiom : hexiom2.py, level36.txt
+
+(Main function tweaked by Armin Rigo.)
+"""
+
+from __future__ import division, print_function
+import sys
+import time
+
+from compat import StringIO, u_lit, unicode, xrange
+
+##################################
+class Dir(object):
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+        
+DIRS = [ Dir(1, 0),
+         Dir(-1, 0),
+         Dir(0, 1),
+         Dir(0, -1),
+         Dir(1, 1),
+         Dir(-1, -1) ]
+
+EMPTY = 7
+
+##################################
+class Done(object):
+    MIN_CHOICE_STRATEGY = 0
+    MAX_CHOICE_STRATEGY = 1
+    HIGHEST_VALUE_STRATEGY = 2
+    FIRST_STRATEGY = 3
+    MAX_NEIGHBORS_STRATEGY = 4
+    MIN_NEIGHBORS_STRATEGY = 5
+    
+    def __init__(self, count, empty=False):
+        self.count = count
+        self.cells = None if empty else [[0, 1, 2, 3, 4, 5, 6, EMPTY] for i in xrange(count)]
+
+    def clone(self):
+        ret = Done(self.count, True)
+        ret.cells = [self.cells[i][:] for i in xrange(self.count)]
+        return ret
+
+    def __getitem__(self, i):
+        return self.cells[i]
+
+    def set_done(self, i, v):
+        self.cells[i] = [v]
+
+    def already_done(self, i):
+        return len(self.cells[i]) == 1
+
+    def remove(self, i, v):
+        if v in self.cells[i]:
+            self.cells[i].remove(v)
+            return True
+        else:
+            return False
+        
+    def remove_all(self, v):
+        for i in xrange(self.count):
+            self.remove(i, v)
+        
+    def remove_unfixed(self, v):
+        changed = False
+        for i in xrange(self.count):
+            if not self.already_done(i):
+                if self.remove(i, v):
+                    changed = True
+        return changed
+        
+    def filter_tiles(self, tiles):
+        for v in xrange(8):
+            if tiles[v] == 0:
+                self.remove_all(v)
+
+    def next_cell_min_choice(self):
+        minlen = 10
+        mini = -1
+        for i in xrange(self.count):
+            if 1 < len(self.cells[i]) < minlen:
+                minlen = len(self.cells[i])
+                mini = i
+        return mini
+
+    def next_cell_max_choice(self):
+        maxlen = 1
+        maxi = -1
+        for i in xrange(self.count):
+            if maxlen < len(self.cells[i]):
+                maxlen = len(self.cells[i])
+                maxi = i
+        return maxi
+
+    def next_cell_highest_value(self):
+        maxval = -1
+        maxi = -1
+        for i in xrange(self.count):
+            if (not self.already_done(i)):
+                maxvali = max(k for k in self.cells[i] if k != EMPTY)
+                if maxval < maxvali:
+                    maxval = maxvali
+                    maxi = i
+        return maxi
+
+    def next_cell_first(self):
+        for i in xrange(self.count):
+            if (not self.already_done(i)):
+                return i
+        return -1
+
+    def next_cell_max_neighbors(self, pos):
+        maxn = -1;
+        maxi = -1;
+        for i in xrange(self.count):
+            if not self.already_done(i):
+                cells_around = pos.hex.get_by_id(i).links;
+                n = sum(1 if (self.already_done(nid) and (self[nid][0] != EMPTY)) else 0
+                        for nid in cells_around)
+                if n > maxn:
+                    maxn = n
+                    maxi = i
+        return maxi
+
+    def next_cell_min_neighbors(self, pos):
+        minn = 7;
+        mini = -1;
+        for i in xrange(self.count):
+            if not self.already_done(i):
+                cells_around = pos.hex.get_by_id(i).links;
+                n = sum(1 if (self.already_done(nid) and (self[nid][0] != EMPTY)) else 0
+                        for nid in cells_around)
+                if n < minn:
+                    minn = n
+                    mini = i
+        return mini
+
+
+    def next_cell(self, pos, strategy=HIGHEST_VALUE_STRATEGY):
+        if strategy == Done.HIGHEST_VALUE_STRATEGY:
+            return self.next_cell_highest_value()
+        elif strategy == Done.MIN_CHOICE_STRATEGY:
+            return self.next_cell_min_choice()
+        elif strategy == Done.MAX_CHOICE_STRATEGY:
+            return self.next_cell_max_choice()
+        elif strategy == Done.FIRST_STRATEGY:
+            return self.next_cell_first()
+        elif strategy == Done.MAX_NEIGHBORS_STRATEGY:
+            return self.next_cell_max_neighbors(pos)
+        elif strategy == Done.MIN_NEIGHBORS_STRATEGY:
+            return self.next_cell_min_neighbors(pos)
+        else:
+            raise Exception("Wrong strategy: %d" % strategy)
+
+##################################
+class Node(object):
+    def __init__(self, pos, id, links):
+        self.pos = pos
+        self.id = id
+        self.links = links
+
+##################################
+class Hex(object):
+    def __init__(self, size):
+        self.size = size
+        self.count = 3 * size * (size - 1) + 1
+        self.nodes_by_id = self.count * [None]
+        self.nodes_by_pos = {}
+        id = 0
+        for y in xrange(size):
+            for x in xrange(size + y):
+                pos = (x, y)
+                node = Node(pos, id, [])
+                self.nodes_by_pos[pos] = node
+                self.nodes_by_id[node.id] = node
+                id += 1
+        for y in xrange(1, size):
+            for x in xrange(y, size * 2 - 1):
+                ry = size + y - 1
+                pos = (x, ry)
+                node = Node(pos, id, [])
+                self.nodes_by_pos[pos] = node
+                self.nodes_by_id[node.id] = node
+                id += 1
+
+    def link_nodes(self):
+        for node in self.nodes_by_id:
+            (x, y) = node.pos
+            for dir in DIRS:
+                nx = x + dir.x
+                ny = y + dir.y
+                if self.contains_pos((nx, ny)):
+                    node.links.append(self.nodes_by_pos[(nx, ny)].id)
+
+    def contains_pos(self, pos):
+        return pos in self.nodes_by_pos
+                    
+    def get_by_pos(self, pos):
+        return self.nodes_by_pos[pos]
+
+    def get_by_id(self, id):
+        return self.nodes_by_id[id]
+
+        
+##################################
+class Pos(object):
+    def __init__(self, hex, tiles, done = None):
+        self.hex = hex
+        self.tiles = tiles
+        self.done = Done(hex.count) if done is None else done
+
+    def clone(self):
+        return Pos(self.hex, self.tiles, self.done.clone())
+    
+##################################
+def constraint_pass(pos, last_move = None):
+    changed = False
+    left = pos.tiles[:]
+    done = pos.done
+
+    # Remove impossible values from free cells
+    free_cells = (range(done.count) if last_move is None
+                  else pos.hex.get_by_id(last_move).links)
+    for i in free_cells:
+        if not done.already_done(i):
+            vmax = 0
+            vmin = 0
+            cells_around = pos.hex.get_by_id(i).links;
+            for nid in cells_around:
+                if done.already_done(nid):
+                    if done[nid][0] != EMPTY:
+                        vmin += 1
+                        vmax += 1
+                else:
+                    vmax += 1
+
+            for num in xrange(7):
+                if (num < vmin) or (num > vmax):
+                    if done.remove(i, num):
+                        changed = True
+
+    # Computes how many of each value is still free
+    for cell in done.cells:
+        if len(cell) == 1:
+            left[cell[0]] -= 1
+            
+    for v in xrange(8):
+        # If there is none, remove the possibility from all tiles
+        if (pos.tiles[v] > 0) and (left[v] == 0):
+            if done.remove_unfixed(v):
+                changed = True
+        else:
+            possible = sum((1 if v in cell else 0) for cell in done.cells)
+            # If the number of possible cells for a value is exactly the number of available tiles
+            # put a tile in each cell
+            if pos.tiles[v] == possible:
+                for i in xrange(done.count):
+                    cell = done.cells[i]
+                    if (not done.already_done(i)) and (v in cell):
+                        done.set_done(i, v)
+                        changed = True
+                       
+    # Force empty or non-empty around filled cells
+    filled_cells = (range(done.count) if last_move is None
+                    else [last_move])
+    for i in filled_cells:
+        if done.already_done(i):
+            num = done[i][0]
+            empties = 0
+            filled = 0
+            unknown = []
+            cells_around = pos.hex.get_by_id(i).links;
+            for nid in cells_around:
+                if done.already_done(nid):
+                    if done[nid][0] == EMPTY:
+                        empties += 1
+                    else:
+                        filled += 1
+                else:
+                    unknown.append(nid)
+            if len(unknown) > 0:
+                if num == filled:
+                    for u in unknown:
+                        if EMPTY in done[u]:
+                            done.set_done(u, EMPTY)
+                            changed = True
+                        #else:
+                        #    raise Exception("Houston, we've got a problem")
+                elif num == filled + len(unknown):
+                    for u in unknown:
+                        if done.remove(u, EMPTY):
+                            changed = True
+            
+    return changed
+
+ASCENDING = 1
+DESCENDING = -1
+
+def find_moves(pos, strategy, order):
+    done = pos.done
+    cell_id = done.next_cell(pos, strategy)
+    if cell_id < 0:
+        return []
+
+    if order == ASCENDING:
+        return [(cell_id, v) for v in done[cell_id]]
+    else:
+        # Try higher values first and EMPTY last
+        moves = list(reversed([(cell_id, v) for v in done[cell_id] if v != EMPTY]))
+        if EMPTY in done[cell_id]:
+            moves.append((cell_id, EMPTY))
+        return moves
+
+def play_move(pos, move):
+    (cell_id, i) = move
+    pos.done.set_done(cell_id, i)
+
+def print_pos(pos, output):
+    hex = pos.hex
+    done = pos.done
+    size = hex.size
+    for y in xrange(size):
+        print(u_lit(" ") * (size - y - 1), end=u_lit(""), file=output)
+        for x in xrange(size + y):
+            pos2 = (x, y)
+            id = hex.get_by_pos(pos2).id
+            if done.already_done(id):
+                c = unicode(done[id][0]) if done[id][0] != EMPTY else u_lit(".")
+            else:
+                c = u_lit("?")
+            print(u_lit("%s ") % c, end=u_lit(""), file=output)
+        print(end=u_lit("\n"), file=output)
+    for y in xrange(1, size):
+        print(u_lit(" ") * y, end=u_lit(""), file=output)
+        for x in xrange(y, size * 2 - 1):
+            ry = size + y - 1
+            pos2 = (x, ry)
+            id = hex.get_by_pos(pos2).id
+            if done.already_done(id):
+                c = unicode(done[id][0]) if done[id][0] != EMPTY else u_lit(".")
+            else:
+                c = u_lit("?")
+            print(u_lit("%s ") % c, end=u_lit(""), file=output)
+        print(end=u_lit("\n"), file=output)
+
+OPEN = 0
+SOLVED = 1
+IMPOSSIBLE = -1
+        
+def solved(pos, output, verbose=False):
+    hex = pos.hex
+    tiles = pos.tiles[:]
+    done = pos.done
+    exact = True
+    all_done = True
+    for i in xrange(hex.count):
+        if len(done[i]) == 0:
+            return IMPOSSIBLE
+        elif done.already_done(i):
+            num = done[i][0]
+            tiles[num] -= 1
+            if (tiles[num] < 0):
+                return IMPOSSIBLE
+            vmax = 0
+            vmin = 0
+            if num != EMPTY:
+                cells_around = hex.get_by_id(i).links;
+                for nid in cells_around:
+                    if done.already_done(nid):
+                        if done[nid][0] != EMPTY:
+                            vmin += 1
+                            vmax += 1
+                    else:
+                        vmax += 1
+
+                if (num < vmin) or (num > vmax):
+                    return IMPOSSIBLE
+                if num != vmin:
+                    exact = False
+        else:
+            all_done = False
+
+    if (not all_done) or (not exact):
+        return OPEN
+    
+    print_pos(pos, output)
+    return SOLVED
+
+def solve_step(prev, strategy, order, output, first=False):
+    if first:
+        pos = prev.clone()
+        while constraint_pass(pos):
+            pass
+    else:
+        pos = prev
+    
+    moves = find_moves(pos, strategy, order)
+    if len(moves) == 0:
+        return solved(pos, output)
+    else:
+        for move in moves:
+            #print("Trying (%d, %d)" % (move[0], move[1]))
+            ret = OPEN
+            new_pos = pos.clone()
+            play_move(new_pos, move)
+            #print_pos(new_pos)
+            while constraint_pass(new_pos, move[0]):
+                pass
+            cur_status = solved(new_pos, output)
+            if cur_status != OPEN:
+                ret = cur_status
+            else:
+                ret = solve_step(new_pos, strategy, order, output)
+            if ret == SOLVED:
+                return SOLVED
+    return IMPOSSIBLE
+
+def check_valid(pos):
+    hex = pos.hex
+    tiles = pos.tiles
+    done = pos.done
+    # fill missing entries in tiles
+    tot = 0
+    for i in xrange(8):
+        if tiles[i] > 0:
+            tot += tiles[i]
+        else:
+            tiles[i] = 0
+    # check total
+    if tot != hex.count:
+        raise Exception("Invalid input. Expected %d tiles, got %d." % (hex.count, tot))
+
+def solve(pos, strategy, order, output):
+    check_valid(pos)
+    return solve_step(pos, strategy, order, output, first=True)
+
+
+# TODO Write an 'iterator' to go over all x,y positions
+
+def read_file(file):
+    lines = [line.strip("\r\n") for line in file.splitlines()]
+    size = int(lines[0])
+    hex = Hex(size)
+    linei = 1
+    tiles = 8 * [0]
+    done = Done(hex.count)
+    for y in xrange(size):
+        line = lines[linei][size - y - 1:]
+        p = 0
+        for x in xrange(size + y):
+            tile = line[p:p + 2];
+            p += 2
+            if tile[1] == ".":
+                inctile = EMPTY
+            else:
+                inctile = int(tile)
+            tiles[inctile] += 1
+            # Look for locked tiles    
+            if tile[0] == "+":
+                print("Adding locked tile: %d at pos %d, %d, id=%d" %
+                      (inctile, x, y, hex.get_by_pos((x, y)).id))
+                done.set_done(hex.get_by_pos((x, y)).id, inctile)
+            
+        linei += 1
+    for y in xrange(1, size):
+        ry = size - 1 + y
+        line = lines[linei][y:]
+        p = 0
+        for x in xrange(y, size * 2 - 1):
+            tile = line[p:p + 2];
+            p += 2
+            if tile[1] == ".":
+                inctile = EMPTY
+            else:
+                inctile = int(tile)
+            tiles[inctile] += 1
+            # Look for locked tiles    
+            if tile[0] == "+":
+                print("Adding locked tile: %d at pos %d, %d, id=%d" %
+                      (inctile, x, ry, hex.get_by_pos((x, ry)).id))
+                done.set_done(hex.get_by_pos((x, ry)).id, inctile)
+        linei += 1
+    hex.link_nodes()
+    done.filter_tiles(tiles)
+    return Pos(hex, tiles, done)
+
+def solve_file(file, strategy, order, output):
+    pos = read_file(file)
+    solve(pos, strategy, order, output)
+
+def run_level36():
+    f = """\
+4
+    2 1 1 2
+   3 3 3 . .
+  2 3 3 . 4 .
+ . 2 . 2 4 3 2
+  2 2 . . . 2
+   4 3 4 . .
+    3 2 3 3
+"""
+    order = DESCENDING
+    strategy = Done.FIRST_STRATEGY
+    output = StringIO()
+    solve_file(f, strategy, order, output)
+    expected = """\
+   3 4 3 2 
+  3 4 4 . 3 
+ 2 . . 3 4 3 
+2 . 1 . 3 . 2 
+ 3 3 . 2 . 2 
+  3 . 2 . 2 
+   2 2 . 1 
+"""
+    if output.getvalue() != expected:
+        raise AssertionError("got a wrong answer:\n%s" % output.getvalue())
+
+def main(n):
+    # only run 1/25th of the requested number of iterations.
+    # with the default n=50 from runner.py, this means twice.
+    l = []
+    for i in xrange(n):
+        if (i % 25) == 0:
+            t0 = time.time()
+            run_level36()
+            time_elapsed = time.time() - t0
+        l.append(time_elapsed)
+    return l
+
+if __name__ == "__main__":
+    import util, optparse
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the hexiom2 benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)
diff --git a/performance/compat.py b/performance/compat.py
--- a/performance/compat.py
+++ b/performance/compat.py
@@ -3,6 +3,10 @@
 import sys
 import functools
 import itertools
+try:
+    from io import StringIO
+except ImportError:
+    from StringIO import StringIO
 
 if sys.version_info < (3,):
     int_types = (int, long)

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:35 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Port_PyPy=27s_raytrace_?=
	=?utf-8?q?benchmark=2E?=
Message-ID: <3XJWDz6v38zQMT@mail.python.org>

http://hg.python.org/benchmarks/rev/ba088479cdda
changeset:   180:ba088479cdda
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 15:54:09 2012 -0400
summary:
  Port PyPy's raytrace benchmark.

files:
  perf.py                    |   12 +-
  performance/bm_raytrace.py |  378 +++++++++++++++++++++++++
  2 files changed, 388 insertions(+), 2 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1693,6 +1693,14 @@
     return SimpleBenchmark(MeasureHexiom2, *args, **kwargs)
 
 
+def MeasureRaytrace(python, options):
+    bm_path = Relative("performance/bm_raytrace.py")
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+
+def BM_Raytrace(*args, **kwargs):
+    return SimpleBenchmark(MeasureRaytrace, *args, **kwargs)
+
+
 def MeasureLogging(python, options, extra_args):
     """Test the performance of Python's logging module.
 
@@ -2083,8 +2091,8 @@
                 "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
                         "fastunpickle", "go", "hexiom2", "json_dump_v2",
                         "json_load", "math", "logging", "meteor_contest",
-                        "normal_startup", "nqueens", "pathlib", "regex",
-                        "spectral_norm", "startup_nosite", "richards",
+                        "normal_startup", "nqueens", "pathlib", "raytrace",
+                        "regex", "richards", "spectral_norm", "startup_nosite", 
                         "threading", "unpack_sequence"],
                 # After 2to3-conversion
                 "py3k": ["2to3", "2n3", "mako_v2"]
diff --git a/performance/bm_raytrace.py b/performance/bm_raytrace.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_raytrace.py
@@ -0,0 +1,378 @@
+# This file contains definitions for a simple raytracer.
+# Copyright Callum and Tony Garnock-Jones, 2008.
+# This file may be freely redistributed under the MIT license,
+# http://www.opensource.org/licenses/mit-license.php
+
+# from http://www.lshift.net/blog/2008/10/29/toy-raytracer-in-python
+from __future__ import with_statement
+
+import math
+
+EPSILON = 0.00001
+
+class Vector(object):
+    def __init__(self, initx, inity, initz):
+        self.x = initx
+        self.y = inity
+        self.z = initz
+
+    def __str__(self):
+        return '(%s,%s,%s)' % (self.x, self.y, self.z)
+
+    def __repr__(self):
+        return 'Vector(%s,%s,%s)' % (self.x, self.y, self.z)
+
+    def magnitude(self):
+        return math.sqrt(self.dot(self))
+
+    def __add__(self, other):
+        if other.isPoint():
+            return Point(self.x + other.x, self.y + other.y, self.z + other.z)
+        else:
+            return Vector(self.x + other.x, self.y + other.y, self.z + other.z)
+
+    def __sub__(self, other):
+        other.mustBeVector()
+        return Vector(self.x - other.x, self.y - other.y, self.z - other.z)
+
+    def scale(self, factor):
+        return Vector(factor * self.x, factor * self.y, factor * self.z)
+
+    def dot(self, other):
+        other.mustBeVector()
+        return (self.x * other.x) + (self.y * other.y) + (self.z * other.z)
+
+    def cross(self, other):
+        other.mustBeVector()
+        return Vector(self.y * other.z - self.z * other.y,
+                      self.z * other.x - self.x * other.z,
+                      self.x * other.y - self.y * other.x)
+
+    def normalized(self):
+        return self.scale(1.0 / self.magnitude())
+
+    def negated(self):
+        return self.scale(-1)
+
+    def __eq__(self, other):
+        return (self.x == other.x) and (self.y == other.y) and (self.z == other.z)
+
+    def isVector(self):
+        return True
+
+    def isPoint(self):
+        return False
+
+    def mustBeVector(self):
+        return self
+
+    def mustBePoint(self):
+        raise 'Vectors are not points!'
+
+    def reflectThrough(self, normal):
+        d = normal.scale(self.dot(normal))
+        return self - d.scale(2)
+
+Vector.ZERO = Vector(0,0,0)
+Vector.RIGHT = Vector(1,0,0)
+Vector.UP = Vector(0,1,0)
+Vector.OUT = Vector(0,0,1)
+
+assert Vector.RIGHT.reflectThrough(Vector.UP) == Vector.RIGHT
+assert Vector(-1,-1,0).reflectThrough(Vector.UP) == Vector(-1,1,0)
+
+class Point(object):
+    def __init__(self, initx, inity, initz):
+        self.x = initx
+        self.y = inity
+        self.z = initz
+
+    def __str__(self):
+        return '(%s,%s,%s)' % (self.x, self.y, self.z)
+
+    def __repr__(self):
+        return 'Point(%s,%s,%s)' % (self.x, self.y, self.z)
+
+    def __add__(self, other):
+        other.mustBeVector()
+        return Point(self.x + other.x, self.y + other.y, self.z + other.z)
+
+    def __sub__(self, other):
+        if other.isPoint():
+            return Vector(self.x - other.x, self.y - other.y, self.z - other.z)
+        else:
+            return Point(self.x - other.x, self.y - other.y, self.z - other.z)
+
+    def isVector(self):
+        return False
+
+    def isPoint(self):
+        return True
+
+    def mustBeVector(self):
+        raise 'Points are not vectors!'
+
+    def mustBePoint(self):
+        return self
+
+class Sphere(object):
+    def __init__(self, centre, radius):
+        centre.mustBePoint()
+        self.centre = centre
+        self.radius = radius
+
+    def __repr__(self):
+        return 'Sphere(%s,%s)' % (repr(self.centre), self.radius)
+
+    def intersectionTime(self, ray):
+        cp = self.centre - ray.point
+        v = cp.dot(ray.vector)
+        discriminant = (self.radius * self.radius) - (cp.dot(cp) - v*v)
+        if discriminant < 0:
+            return None
+        else:
+            return v - math.sqrt(discriminant)
+
+    def normalAt(self, p):
+        return (p - self.centre).normalized()
+
+class Halfspace(object):
+    def __init__(self, point, normal):
+        self.point = point
+        self.normal = normal.normalized()
+
+    def __repr__(self):
+        return 'Halfspace(%s,%s)' % (repr(self.point), repr(self.normal))
+
+    def intersectionTime(self, ray):
+        v = ray.vector.dot(self.normal)
+        if v:
+            return 1 / -v
+        else:
+            return None
+
+    def normalAt(self, p):
+        return self.normal
+
+class Ray(object):
+    def __init__(self, point, vector):
+        self.point = point
+        self.vector = vector.normalized()
+
+    def __repr__(self):
+        return 'Ray(%s,%s)' % (repr(self.point), repr(self.vector))
+
+    def pointAtTime(self, t):
+        return self.point + self.vector.scale(t)
+
+Point.ZERO = Point(0,0,0)
+
+a = Vector(3,4,12)
+b = Vector(1,1,1)
+
+class PpmCanvas(object):
+    def __init__(self, width, height, filenameBase):
+        import array
+        self.bytes = array.array('B', [0] * (width * height * 3))
+        for i in range(width * height):
+            self.bytes[i * 3 + 2] = 255
+        self.width = width
+        self.height = height
+        self.filenameBase = filenameBase
+
+    def plot(self, x, y, r, g, b):
+        i = ((self.height - y - 1) * self.width + x) * 3
+        self.bytes[i  ] = max(0, min(255, int(r * 255)))
+        self.bytes[i+1] = max(0, min(255, int(g * 255)))
+        self.bytes[i+2] = max(0, min(255, int(b * 255)))
+
+    def save(self):
+        pass
+        #with open(self.filenameBase + '.ppm', 'wb') as f:
+        #    f.write('P6 %d %d 255\n' % (self.width, self.height))
+        #    f.write(self.bytes.tostring())
+
+def firstIntersection(intersections):
+    result = None
+    for i in intersections:
+        candidateT = i[1]
+        if candidateT is not None and candidateT > -EPSILON:
+            if result is None or candidateT < result[1]:
+                result = i
+    return result
+
+class Scene(object):
+    def __init__(self):
+        self.objects = []
+        self.lightPoints = []
+        self.position = Point(0, 1.8, 10)
+        self.lookingAt = Point.ZERO
+        self.fieldOfView = 45
+        self.recursionDepth = 0
+
+    def moveTo(self, p):
+        self.position = p
+
+    def lookAt(self, p):
+        self.lookingAt = p
+
+    def addObject(self, object, surface):
+        self.objects.append((object, surface))
+
+    def addLight(self, p):
+        self.lightPoints.append(p)
+
+    def render(self, canvas):
+        #print 'Computing field of view'
+        fovRadians = math.pi * (self.fieldOfView / 2.0) / 180.0
+        halfWidth = math.tan(fovRadians)
+        halfHeight = 0.75 * halfWidth
+        width = halfWidth * 2
+        height = halfHeight * 2
+        pixelWidth = width / (canvas.width - 1)
+        pixelHeight = height / (canvas.height - 1)
+
+        eye = Ray(self.position, self.lookingAt - self.position)
+        vpRight = eye.vector.cross(Vector.UP).normalized()
+        vpUp = vpRight.cross(eye.vector).normalized()
+
+        #print 'Looping over pixels'
+        previousfraction = 0
+        for y in range(canvas.height):
+            currentfraction = float(y) / canvas.height
+            if currentfraction - previousfraction > 0.05:
+                canvas.save()
+                #print '%d%% complete' % (currentfraction * 100)
+                previousfraction = currentfraction
+            for x in range(canvas.width):
+                xcomp = vpRight.scale(x * pixelWidth - halfWidth)
+                ycomp = vpUp.scale(y * pixelHeight - halfHeight)
+                ray = Ray(eye.point, eye.vector + xcomp + ycomp)
+                colour = self.rayColour(ray)
+                canvas.plot(x,y,*colour)
+
+        #print 'Complete.'
+
+    def rayColour(self, ray):
+        if self.recursionDepth > 3:
+            return (0,0,0)
+        try:
+            self.recursionDepth = self.recursionDepth + 1
+            intersections = [(o, o.intersectionTime(ray), s) for (o, s) in self.objects]
+            i = firstIntersection(intersections)
+            if i is None:
+                return (0,0,0) ## the background colour
+            else:
+                (o, t, s) = i
+                p = ray.pointAtTime(t)
+                return s.colourAt(self, ray, p, o.normalAt(p))
+        finally:
+            self.recursionDepth = self.recursionDepth - 1
+
+    def _lightIsVisible(self, l, p):
+        for (o, s) in self.objects:
+            t = o.intersectionTime(Ray(p,l - p))
+            if t is not None and t > EPSILON:
+                return False
+        return True
+
+    def visibleLights(self, p):
+        result = []
+        for l in self.lightPoints:
+            if self._lightIsVisible(l, p):
+                result.append(l)
+        return result
+
+def addColours(a, scale, b):
+    return (a[0] + scale * b[0],
+            a[1] + scale * b[1],
+            a[2] + scale * b[2])
+
+class SimpleSurface(object):
+    def __init__(self, **kwargs):
+        self.baseColour = kwargs.get('baseColour', (1,1,1))
+        self.specularCoefficient = kwargs.get('specularCoefficient', 0.2)
+        self.lambertCoefficient = kwargs.get('lambertCoefficient', 0.6)
+        self.ambientCoefficient = 1.0 - self.specularCoefficient - self.lambertCoefficient
+
+    def baseColourAt(self, p):
+        return self.baseColour
+
+    def colourAt(self, scene, ray, p, normal):
+        b = self.baseColourAt(p)
+
+        c = (0,0,0)
+        if self.specularCoefficient > 0:
+            reflectedRay = Ray(p, ray.vector.reflectThrough(normal))
+            #print p, normal, ray.vector, reflectedRay.vector
+            reflectedColour = scene.rayColour(reflectedRay)
+            c = addColours(c, self.specularCoefficient, reflectedColour)
+
+        if self.lambertCoefficient > 0:
+            lambertAmount = 0
+            for lightPoint in scene.visibleLights(p):
+                contribution = (lightPoint - p).normalized().dot(normal)
+                if contribution > 0:
+                    lambertAmount = lambertAmount + contribution
+            lambertAmount = min(1,lambertAmount)
+            c = addColours(c, self.lambertCoefficient * lambertAmount, b)
+
+        if self.ambientCoefficient > 0:
+            c = addColours(c, self.ambientCoefficient, b)
+
+        return c
+
+class CheckerboardSurface(SimpleSurface):
+    def __init__(self, **kwargs):
+        SimpleSurface.__init__(self, **kwargs)
+        self.otherColour = kwargs.get('otherColour', (0,0,0))
+        self.checkSize = kwargs.get('checkSize', 1)
+
+    def baseColourAt(self, p):
+        v = p - Point.ZERO
+        v.scale(1.0 / self.checkSize)
+        if (int(abs(v.x) + 0.5) + \
+            int(abs(v.y) + 0.5) + \
+            int(abs(v.z) + 0.5)) \
+           % 2:
+            return self.otherColour
+        else:
+            return self.baseColour
+
+def _main():
+    Canvas = PpmCanvas
+    c = Canvas(100,100,'test_raytrace')
+    #c = Canvas(640,480,'test_raytrace_big')
+    s = Scene()
+    s.addLight(Point(30, 30, 10))
+    s.addLight(Point(-10, 100, 30))
+    s.lookAt(Point(0, 3, 0))
+    s.addObject(Sphere(Point(1,3,-10), 2), SimpleSurface(baseColour = (1,1,0)))
+    for y in range(6):
+        s.addObject(Sphere(Point(-3 - y * 0.4, 2.3, -5), 0.4),
+                    SimpleSurface(baseColour = (y / 6.0, 1 - y / 6.0, 0.5)))
+    s.addObject(Halfspace(Point(0,0,0), Vector.UP), CheckerboardSurface())
+    s.render(c)
+
+def main(n):
+    import time
+    times = []
+    for i in range(5):
+        _main() # warmup
+    for i in range(n):
+        t1 = time.time()
+        _main()
+        t2 = time.time()
+        times.append(t2 - t1)
+    return times
+
+if __name__ == "__main__":
+    import util, optparse
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the raytrace benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)
+

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 00:12:37 2012
From: python-checkins at python.org (brett.cannon)
Date: Sat, 15 Sep 2012 00:12:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Tweak_some_iteration_sc?=
 =?utf-8?q?aling_values_so_that_using_the_same_interpreter_doesn=27t?=
Message-ID: <3XJWF13JvGzQMK@mail.python.org>

http://hg.python.org/benchmarks/rev/8b252c8b8457
changeset:   181:8b252c8b8457
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 14 18:11:51 2012 -0400
summary:
  Tweak some iteration scaling values so that using the same interpreter doesn't lead to any perf difference with -f.

files:
  perf.py                   |  26 ++++++++++++++------------
  performance/bm_hexiom2.py |   7 +++----
  2 files changed, 17 insertions(+), 16 deletions(-)


diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1344,7 +1344,7 @@
 
 def MeasureFloat(python, options):
     bm_path = Relative("performance/bm_float.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Float(*args, **kwargs):
     return SimpleBenchmark(MeasureFloat, *args, **kwargs)
@@ -1491,7 +1491,8 @@
     bm_path = Relative("performance/bm_mako_v2.py", python, options)
     mako_path = Relative("lib/mako-0.7.2", python, options)
     bm_env = BuildEnv({"PYTHONPATH": mako_path}, options.inherit_env)
-    return MeasureGeneric(python, options, bm_path, bm_env, iteration_scaling=5)
+    return MeasureGeneric(python, options, bm_path, bm_env,
+                          iteration_scaling=10)
 
 
 def BM_mako_v2(*args, **kwargs):
@@ -1502,7 +1503,8 @@
     bm_path = Relative("performance/bm_pathlib.py")
     pathlib_path = Relative("lib/pathlib")
     bm_env = BuildEnv({"PYTHONPATH": pathlib_path}, options.inherit_env)
-    return MeasureGeneric(python, options, bm_path, bm_env, iteration_scaling=10)
+    return MeasureGeneric(python, options, bm_path, bm_env,
+                          iteration_scaling=10)
 
 
 def BM_pathlib(*args, **kwargs):
@@ -1615,7 +1617,7 @@
 
 def MeasureJSONDumpV2(python, options):
     bm_path = Relative("performance/bm_json_v2.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_JSON_Dump_V2(*args, **kwargs):
     return SimpleBenchmark(MeasureJSONDumpV2, *args, **kwargs)
@@ -1639,7 +1641,7 @@
 
 def MeasureChaos(python, options):
     bm_path = Relative("performance/bm_chaos.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Chaos(*args, **kwargs):
     return SimpleBenchmark(MeasureChaos, *args, **kwargs)
@@ -1647,7 +1649,7 @@
 
 def MeasureFannkuch(python, options):
     bm_path = Relative("performance/bm_fannkuch.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Fannkuch(*args, **kwargs):
     return SimpleBenchmark(MeasureFannkuch, *args, **kwargs)
@@ -1655,7 +1657,7 @@
 
 def MeasureGo(python, options):
     bm_path = Relative("performance/bm_go.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Go(*args, **kwargs):
     return SimpleBenchmark(MeasureGo, *args, **kwargs)
@@ -1663,7 +1665,7 @@
 
 def MeasureMeteorContest(python, options):
     bm_path = Relative("performance/bm_meteor_contest.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Meteor_Contest(*args, **kwargs):
     return SimpleBenchmark(MeasureMeteorContest, *args, **kwargs)
@@ -1671,7 +1673,7 @@
 
 def MeasureSpectralNorm(python, options):
     bm_path = Relative("performance/bm_spectral_norm.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Spectral_Norm(*args, **kwargs):
     return SimpleBenchmark(MeasureSpectralNorm, *args, **kwargs)
@@ -1679,7 +1681,7 @@
 
 def MeasureTelco(python, options):
     bm_path = Relative("performance/bm_telco.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Telco(*args, **kwargs):
     return SimpleBenchmark(MeasureTelco, *args, **kwargs)
@@ -1687,7 +1689,7 @@
 
 def MeasureHexiom2(python, options):
     bm_path = Relative("performance/bm_hexiom2.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path, iteration_scaling=0.04)
 
 def BM_Hexiom2(*args, **kwargs):
     return SimpleBenchmark(MeasureHexiom2, *args, **kwargs)
@@ -1695,7 +1697,7 @@
 
 def MeasureRaytrace(python, options):
     bm_path = Relative("performance/bm_raytrace.py")
-    return MeasureGeneric(python, options, bm_path, iteration_scaling=1)
+    return MeasureGeneric(python, options, bm_path)
 
 def BM_Raytrace(*args, **kwargs):
     return SimpleBenchmark(MeasureRaytrace, *args, **kwargs)
diff --git a/performance/bm_hexiom2.py b/performance/bm_hexiom2.py
--- a/performance/bm_hexiom2.py
+++ b/performance/bm_hexiom2.py
@@ -523,10 +523,9 @@
     # with the default n=50 from runner.py, this means twice.
     l = []
     for i in xrange(n):
-        if (i % 25) == 0:
-            t0 = time.time()
-            run_level36()
-            time_elapsed = time.time() - t0
+        t0 = time.time()
+        run_level36()
+        time_elapsed = time.time() - t0
         l.append(time_elapsed)
     return l
 

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Sat Sep 15 03:46:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 15 Sep 2012 03:46:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1ODMxOiBhdm9p?=
 =?utf-8?q?d_using_3=2Ex_syntax_for_keyword-only_args=2E?=
Message-ID: <3XJbzT0KNyzQ4V@mail.python.org>

http://hg.python.org/cpython/rev/881acdf9133f
changeset:   79028:881acdf9133f
branch:      2.7
parent:      79025:2291aff20a05
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 15 04:45:57 2012 +0300
summary:
  #15831: avoid using 3.x syntax for keyword-only args.

files:
  Doc/library/functions.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -779,7 +779,7 @@
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable, *[, key])
+.. function:: min(iterable[, key])
               min(arg1, arg2, *args[, key])
 
    Return the smallest item in an iterable or the smallest of two or more

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 15 04:52:52 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 15 Sep 2012 04:52:52 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1OTMyOiB1c2Ug?=
 =?utf-8?q?with_statement_in_csv_doc_examples=2E?=
Message-ID: <3XJdSN414XzQ9Y@mail.python.org>

http://hg.python.org/cpython/rev/ade667076c14
changeset:   79029:ade667076c14
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 15 05:46:24 2012 +0300
summary:
  #15932: use with statement in csv doc examples.

files:
  Doc/library/csv.rst |  28 +++++++++++++++-------------
  1 files changed, 15 insertions(+), 13 deletions(-)


diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -78,9 +78,10 @@
    A short usage example::
 
       >>> import csv
-      >>> spamReader = csv.reader(open('eggs.csv', 'rb'), delimiter=' ', quotechar='|')
-      >>> for row in spamReader:
-      ...     print ', '.join(row)
+      >>> with open('eggs.csv', 'rb') as csvfile:
+      ...     spamreader = csv.reader(csvfile, delimiter=' ', quotechar='|')
+      ...     for row in spamreader:
+      ...         print ', '.join(row)
       Spam, Spam, Spam, Spam, Spam, Baked Beans
       Spam, Lovely Spam, Wonderful Spam
 
@@ -115,11 +116,12 @@
 
    A short usage example::
 
-      >>> import csv
-      >>> spamWriter = csv.writer(open('eggs.csv', 'wb'), delimiter=' ',
-      ...                         quotechar='|', quoting=csv.QUOTE_MINIMAL)
-      >>> spamWriter.writerow(['Spam'] * 5 + ['Baked Beans'])
-      >>> spamWriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
+      import csv
+      with open('eggs.csv', 'wb') as csvfile:
+          spamwriter = csv.writer(csvfile, delimiter=' ',
+                                  quotechar='|', quoting=csv.QUOTE_MINIMAL)
+          spamwriter.writerow(['Spam'] * 5 + ['Baked Beans'])
+          spamwriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
 
 
 .. function:: register_dialect(name[, dialect], **fmtparams)
@@ -234,11 +236,11 @@
 
 An example for :class:`Sniffer` use::
 
-   csvfile = open("example.csv", "rb")
-   dialect = csv.Sniffer().sniff(csvfile.read(1024))
-   csvfile.seek(0)
-   reader = csv.reader(csvfile, dialect)
-   # ... process CSV file contents here ...
+   with open('example.csv', 'rb') as csvfile:
+       dialect = csv.Sniffer().sniff(csvfile.read(1024))
+       csvfile.seek(0)
+       reader = csv.reader(csvfile, dialect)
+       # ... process CSV file contents here ...
 
 
 The :mod:`csv` module defines the following constants:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 15 04:52:54 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 15 Sep 2012 04:52:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTMyOiB1c2Ug?=
 =?utf-8?q?with_statement_in_csv_doc_examples=2E__Patch_by_Dario_Bertini?=
 =?utf-8?q?=2E?=
Message-ID: <3XJdSQ25kszQCP@mail.python.org>

http://hg.python.org/cpython/rev/8a06fb321074
changeset:   79030:8a06fb321074
branch:      3.2
parent:      79026:fad797916266
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 15 05:51:45 2012 +0300
summary:
  #15932: use with statement in csv doc examples.  Patch by Dario Bertini.

files:
  Doc/library/csv.rst |  28 +++++++++++++++-------------
  1 files changed, 15 insertions(+), 13 deletions(-)


diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -71,9 +71,10 @@
    A short usage example::
 
       >>> import csv
-      >>> spamReader = csv.reader(open('eggs.csv', newline=''), delimiter=' ', quotechar='|')
-      >>> for row in spamReader:
-      ...     print(', '.join(row))
+      >>> with open('eggs.csv', newline='') as csvfile:
+      ...     spamreader = csv.reader(csvfile, delimiter=' ', quotechar='|')
+      ...     for row in spamreader:
+      ...         print(', '.join(row))
       Spam, Spam, Spam, Spam, Spam, Baked Beans
       Spam, Lovely Spam, Wonderful Spam
 
@@ -99,11 +100,12 @@
 
    A short usage example::
 
-      >>> import csv
-      >>> spamWriter = csv.writer(open('eggs.csv', 'w', newline=''), delimiter=' ',
-      ...                         quotechar='|', quoting=csv.QUOTE_MINIMAL)
-      >>> spamWriter.writerow(['Spam'] * 5 + ['Baked Beans'])
-      >>> spamWriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
+      import csv
+      with open('eggs.csv', 'w', newline='') as csvfile:
+          spamwriter = csv.writer(csvfile, delimiter=' ',
+                                  quotechar='|', quoting=csv.QUOTE_MINIMAL)
+          spamwriter.writerow(['Spam'] * 5 + ['Baked Beans'])
+          spamwriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
 
 
 .. function:: register_dialect(name[, dialect], **fmtparams)
@@ -221,11 +223,11 @@
 
 An example for :class:`Sniffer` use::
 
-   csvfile = open("example.csv")
-   dialect = csv.Sniffer().sniff(csvfile.read(1024))
-   csvfile.seek(0)
-   reader = csv.reader(csvfile, dialect)
-   # ... process CSV file contents here ...
+   with open('example.csv') as csvfile:
+       dialect = csv.Sniffer().sniff(csvfile.read(1024))
+       csvfile.seek(0)
+       reader = csv.reader(csvfile, dialect)
+       # ... process CSV file contents here ...
 
 
 The :mod:`csv` module defines the following constants:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 15 04:52:55 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 15 Sep 2012 04:52:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1OTMyOiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XJdSR4r6NzQHk@mail.python.org>

http://hg.python.org/cpython/rev/a5a8d255daee
changeset:   79031:a5a8d255daee
parent:      79027:3b0e20f71d8a
parent:      79030:8a06fb321074
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 15 05:52:36 2012 +0300
summary:
  #15932: merge with 3.2.

files:
  Doc/library/csv.rst |  28 +++++++++++++++-------------
  1 files changed, 15 insertions(+), 13 deletions(-)


diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -71,9 +71,10 @@
    A short usage example::
 
       >>> import csv
-      >>> spamReader = csv.reader(open('eggs.csv', newline=''), delimiter=' ', quotechar='|')
-      >>> for row in spamReader:
-      ...     print(', '.join(row))
+      >>> with open('eggs.csv', newline='') as csvfile:
+      ...     spamreader = csv.reader(csvfile, delimiter=' ', quotechar='|')
+      ...     for row in spamreader:
+      ...         print(', '.join(row))
       Spam, Spam, Spam, Spam, Spam, Baked Beans
       Spam, Lovely Spam, Wonderful Spam
 
@@ -99,11 +100,12 @@
 
    A short usage example::
 
-      >>> import csv
-      >>> spamWriter = csv.writer(open('eggs.csv', 'w', newline=''), delimiter=' ',
-      ...                         quotechar='|', quoting=csv.QUOTE_MINIMAL)
-      >>> spamWriter.writerow(['Spam'] * 5 + ['Baked Beans'])
-      >>> spamWriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
+      import csv
+      with open('eggs.csv', 'w', newline='') as csvfile:
+          spamwriter = csv.writer(csvfile, delimiter=' ',
+                                  quotechar='|', quoting=csv.QUOTE_MINIMAL)
+          spamwriter.writerow(['Spam'] * 5 + ['Baked Beans'])
+          spamwriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
 
 
 .. function:: register_dialect(name[, dialect], **fmtparams)
@@ -221,11 +223,11 @@
 
 An example for :class:`Sniffer` use::
 
-   csvfile = open("example.csv")
-   dialect = csv.Sniffer().sniff(csvfile.read(1024))
-   csvfile.seek(0)
-   reader = csv.reader(csvfile, dialect)
-   # ... process CSV file contents here ...
+   with open('example.csv') as csvfile:
+       dialect = csv.Sniffer().sniff(csvfile.read(1024))
+       csvfile.seek(0)
+       reader = csv.reader(csvfile, dialect)
+       # ... process CSV file contents here ...
 
 
 The :mod:`csv` module defines the following constants:

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Sat Sep 15 06:04:19 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 15 Sep 2012 06:04:19 +0200
Subject: [Python-checkins] Daily reference leaks (3b0e20f71d8a): sum=0
Message-ID: <E1TCjcB-0001Kk-9E@ap.vmr.nerim.net>

results for 3b0e20f71d8a on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/refloga73jG6', '-x']

From python-checkins at python.org  Sat Sep 15 07:35:02 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 15 Sep 2012 07:35:02 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1Nzg5OiBtZW50?=
 =?utf-8?q?ion_shell-like_parts_of_the_stdlib_in_the_subprocess_docs=2E__P?=
 =?utf-8?q?atch?=
Message-ID: <3XJj3V5MmXzQ2Z@mail.python.org>

http://hg.python.org/cpython/rev/820032281f49
changeset:   79032:820032281f49
branch:      2.7
parent:      79029:ade667076c14
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 15 08:33:12 2012 +0300
summary:
  #15789: mention shell-like parts of the stdlib in the subprocess docs.  Patch by Chris Rebert.

files:
  Doc/library/subprocess.rst |  12 ++++++++----
  1 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -227,11 +227,15 @@
    ``True`` then all line endings will be converted to ``'\n'`` as described
    for the :term:`universal newlines` `'U'`` mode argument to :func:`open`.
 
-   If *shell* is :const:`True`, the specified command will be executed through
-   the shell. This can be useful if you are using Python primarily for the
+   If *shell* is ``True``, the specified command will be executed through
+   the shell.  This can be useful if you are using Python primarily for the
    enhanced control flow it offers over most system shells and still want
-   access to other shell features such as filename wildcards, shell pipes and
-   environment variable expansion.
+   convenient access to other shell features such as shell pipes, filename
+   wildcards, environment variable expansion, and expansion of ``~`` to a
+   user's home directory.  However, note that Python itself offers
+   implementations of many shell-like features (in particular, :mod:`glob`,
+   :mod:`fnmatch`, :func:`os.walk`, :func:`os.path.expandvars`,
+   :func:`os.path.expanduser`, and :mod:`shutil`).
 
    .. warning::
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 15 07:35:04 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 15 Sep 2012 07:35:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1Nzg5OiBtZW50?=
 =?utf-8?q?ion_shell-like_parts_of_the_stdlib_in_the_subprocess_docs=2E__P?=
 =?utf-8?q?atch?=
Message-ID: <3XJj3X25kBzQ8J@mail.python.org>

http://hg.python.org/cpython/rev/9794f69c1d09
changeset:   79033:9794f69c1d09
branch:      3.2
parent:      79030:8a06fb321074
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 15 08:34:08 2012 +0300
summary:
  #15789: mention shell-like parts of the stdlib in the subprocess docs.  Patch by Chris Rebert.

files:
  Doc/library/subprocess.rst |  10 +++++++---
  1 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -245,10 +245,14 @@
       :meth:`Popen.communicate` method.
 
    If *shell* is ``True``, the specified command will be executed through
-   the shell. This can be useful if you are using Python primarily for the
+   the shell.  This can be useful if you are using Python primarily for the
    enhanced control flow it offers over most system shells and still want
-   access to other shell features such as filename wildcards, shell pipes and
-   environment variable expansion.
+   convenient access to other shell features such as shell pipes, filename
+   wildcards, environment variable expansion, and expansion of ``~`` to a
+   user's home directory.  However, note that Python itself offers
+   implementations of many shell-like features (in particular, :mod:`glob`,
+   :mod:`fnmatch`, :func:`os.walk`, :func:`os.path.expandvars`,
+   :func:`os.path.expanduser`, and :mod:`shutil`).
 
    .. warning::
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 15 07:35:05 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 15 Sep 2012 07:35:05 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1Nzg5OiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XJj3Y52XzzQNT@mail.python.org>

http://hg.python.org/cpython/rev/09011896374d
changeset:   79034:09011896374d
parent:      79031:a5a8d255daee
parent:      79033:9794f69c1d09
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 15 08:34:47 2012 +0300
summary:
  #15789: merge with 3.2.

files:
  Doc/library/subprocess.rst |  10 +++++++---
  1 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -307,10 +307,14 @@
       :meth:`Popen.communicate` method.
 
    If *shell* is ``True``, the specified command will be executed through
-   the shell. This can be useful if you are using Python primarily for the
+   the shell.  This can be useful if you are using Python primarily for the
    enhanced control flow it offers over most system shells and still want
-   access to other shell features such as filename wildcards, shell pipes and
-   environment variable expansion.
+   convenient access to other shell features such as shell pipes, filename
+   wildcards, environment variable expansion, and expansion of ``~`` to a
+   user's home directory.  However, note that Python itself offers
+   implementations of many shell-like features (in particular, :mod:`glob`,
+   :mod:`fnmatch`, :func:`os.walk`, :func:`os.path.expandvars`,
+   :func:`os.path.expanduser`, and :mod:`shutil`).
 
    .. versionchanged:: 3.3
       When *universal_newlines* is ``True``, the class uses the encoding

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 15 14:08:00 2012
From: python-checkins at python.org (daniel.holth)
Date: Sat, 15 Sep 2012 14:08:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_metadata_1=2E3_edits?=
Message-ID: <3XJsmw57sYzQQ4@mail.python.org>

http://hg.python.org/peps/rev/025d47bef588
changeset:   4510:025d47bef588
user:        Daniel Holth <dholth at fastmail.fm>
date:        Sat Sep 15 07:51:35 2012 -0400
summary:
  metadata 1.3 edits

files:
  pep-0426.txt |  20 ++++++++++----------
  1 files changed, 10 insertions(+), 10 deletions(-)


diff --git a/pep-0426.txt b/pep-0426.txt
--- a/pep-0426.txt
+++ b/pep-0426.txt
@@ -33,9 +33,9 @@
 
 The syntax defined in this PEP is for use with Python distribution
 metadata files. The file format is a simple UTF-8 encoded Key: value
-format with no line length parsable by the ``email`` module with an
-appropriate ``email.policy.Policy()``.  The field names listed in the
-`Fields`_ section are used as the header names.
+format with no maximum line length. It is parsable by the ``email``
+module with an appropriate ``email.policy.Policy()``.  The field names
+listed in the `Fields`_ section are used as the header names.
 
 There are two standard locations for these metadata files:
 
@@ -52,9 +52,9 @@
 Encoding
 ========
 
-Metadata 1.3 files are UTF-8, with the restriction that keys must be
-ASCII. Parsers should be aware that older versions of the Metadata
-specification do not specify an encoding.
+Metadata 1.3 files are UTF-8 with the restriction that keys must be
+ASCII. Parser implementations should be aware that older versions of
+the Metadata specification do not specify an encoding.
 
 Fields
 ======
@@ -560,10 +560,10 @@
    Requires-Dist: bar; python_version == '2.4' or python_version == '2.5'
    Requires-External: libxslt; 'linux' in sys.platform
 
-The micro-language behind this is the simplest possible: it compares only
-strings, with the ``==`` and ``in`` operators (and their opposites), and
-with the ability to combine expressions. Parethesis are also supported for
-grouping.
+The micro-language behind this is a simple subset of Python: it compares
+only strings, with the ``==`` and ``in`` operators (and their opposites),
+and with the ability to combine expressions. Parenthesis are supported
+for grouping.
 
 The pseudo-grammar is ::
 

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 16 00:13:42 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 16 Sep 2012 00:13:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1NTI2?=
 =?utf-8?q?=3A_try_to_fix_test=5Fstartfile=27s_inability_to_clean_up_after?=
 =?utf-8?q?_itself_in?=
Message-ID: <3XK7Cp6DJKzQVt@mail.python.org>

http://hg.python.org/cpython/rev/bc5c5b79b7e1
changeset:   79035:bc5c5b79b7e1
branch:      3.2
parent:      79033:9794f69c1d09
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 16 00:12:50 2012 +0200
summary:
  Issue #15526: try to fix test_startfile's inability to clean up after itself in time.
Patch by Jeremy Kloth.

files:
  Lib/test/test_startfile.py |  15 +++++++--------
  1 files changed, 7 insertions(+), 8 deletions(-)


diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -10,8 +10,8 @@
 import unittest
 from test import support
 import os
+import sys
 from os import path
-from time import sleep
 
 startfile = support.get_attribute(os, 'startfile')
 
@@ -21,13 +21,12 @@
         self.assertRaises(OSError, startfile, "nonexisting.vbs")
 
     def test_empty(self):
-        empty = path.join(path.dirname(__file__), "empty.vbs")
-        startfile(empty)
-        startfile(empty, "open")
-        # Give the child process some time to exit before we finish.
-        # Otherwise the cleanup code will not be able to delete the cwd,
-        # because it is still in use.
-        sleep(0.1)
+        # Switch to an existing, but safe, working directory to let the
+        # cleanup code do its thing without permission errors.
+        with support.temp_cwd(path=path.dirname(sys.executable)):
+            empty = path.join(path.dirname(__file__), "empty.vbs")
+            startfile(empty)
+            startfile(empty, "open")
 
 def test_main():
     support.run_unittest(TestCase)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 16 00:13:44 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 16 Sep 2012 00:13:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315526=3A_try_to_fix_test=5Fstartfile=27s_inabil?=
 =?utf-8?q?ity_to_clean_up_after_itself_in?=
Message-ID: <3XK7Cr3sbZzQQN@mail.python.org>

http://hg.python.org/cpython/rev/1704deb7e6d7
changeset:   79036:1704deb7e6d7
parent:      79034:09011896374d
parent:      79035:bc5c5b79b7e1
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 16 00:13:10 2012 +0200
summary:
  Issue #15526: try to fix test_startfile's inability to clean up after itself in time.
Patch by Jeremy Kloth.

files:
  Lib/test/test_startfile.py |  15 +++++++--------
  1 files changed, 7 insertions(+), 8 deletions(-)


diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -10,8 +10,8 @@
 import unittest
 from test import support
 import os
+import sys
 from os import path
-from time import sleep
 
 startfile = support.get_attribute(os, 'startfile')
 
@@ -21,13 +21,12 @@
         self.assertRaises(OSError, startfile, "nonexisting.vbs")
 
     def test_empty(self):
-        empty = path.join(path.dirname(__file__), "empty.vbs")
-        startfile(empty)
-        startfile(empty, "open")
-        # Give the child process some time to exit before we finish.
-        # Otherwise the cleanup code will not be able to delete the cwd,
-        # because it is still in use.
-        sleep(0.1)
+        # Switch to an existing, but safe, working directory to let the
+        # cleanup code do its thing without permission errors.
+        with support.temp_cwd(path=path.dirname(sys.executable)):
+            empty = path.join(path.dirname(__file__), "empty.vbs")
+            startfile(empty)
+            startfile(empty, "open")
 
 def test_main():
     support.run_unittest(TestCase)

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Sun Sep 16 06:04:52 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 16 Sep 2012 06:04:52 +0200
Subject: [Python-checkins] Daily reference leaks (1704deb7e6d7): sum=2
Message-ID: <E1TD66G-0001y0-PG@ap.vmr.nerim.net>

results for 1704deb7e6d7 on branch "default"
--------------------------------------------

test_dbm leaked [0, 2, 0] references, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogGSVSRC', '-x']

From python-checkins at python.org  Sun Sep 16 19:27:19 2012
From: python-checkins at python.org (daniel.holth)
Date: Sun, 16 Sep 2012 19:27:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_add_hash_algorithm_agility_to?=
	=?utf-8?q?_RECORD?=
Message-ID: <3XKcpv0fBbzNsm@mail.python.org>

http://hg.python.org/peps/rev/75c492a5e23b
changeset:   4511:75c492a5e23b
user:        Daniel Holth <dholth at fastmail.fm>
date:        Sat Sep 15 08:10:49 2012 -0400
summary:
  add hash algorithm agility to RECORD

files:
  pep-0376.txt |  20 +++++++++++++-------
  1 files changed, 13 insertions(+), 7 deletions(-)


diff --git a/pep-0376.txt b/pep-0376.txt
--- a/pep-0376.txt
+++ b/pep-0376.txt
@@ -218,11 +218,17 @@
 
   - an absolute path, using the local platform separator
 
-- the **MD5** hash of the file, encoded in hex. Notice that `pyc` and `pyo`
-  generated files don't have any hash because they are automatically produced
-  from `py` files. So checking the hash of the corresponding `py` file is
-  enough to decide if the file and its associated `pyc` or `pyo` files have
-  changed.
+- a hash of the file's contents.
+  Notice that `pyc` and `pyo` generated files don't have any hash because
+  they are automatically produced from `py` files. So checking the hash
+  of the corresponding `py` file is enough to decide if the file and
+  its associated `pyc` or `pyo` files have changed.
+
+  The hash is either the empty string, the **MD5** hash of
+  the file, encoded in hex, or the hash algorithm as named in
+  ``hashlib.algorithms_guaranteed``, followed by the equals character
+  ``=``, followed by the urlsafe-base64-nopad encoding of the digest 
+  (``base64.urlsafe_b64encode(digest)`` with trailing ``=`` removed).
 
 - the file's size in bytes
 
@@ -391,9 +397,9 @@
 
 And following methods:
 
-- ``get_installed_files(local=False)`` -> iterator of (path, md5, size)
+- ``get_installed_files(local=False)`` -> iterator of (path, hash, size)
 
-  Iterates over the `RECORD` entries and return a tuple ``(path, md5, size)``
+  Iterates over the `RECORD` entries and return a tuple ``(path, hash, size)``
   for each line. If ``local`` is ``True``, the path is transformed into a
   local absolute path. Otherwise the raw value from `RECORD` is returned.
 

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 16 19:27:20 2012
From: python-checkins at python.org (daniel.holth)
Date: Sun, 16 Sep 2012 19:27:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_update_tags_PEP?=
Message-ID: <3XKcpw6PC9zQ3k@mail.python.org>

http://hg.python.org/peps/rev/4fb8292a0578
changeset:   4512:4fb8292a0578
user:        Daniel Holth <dholth at fastmail.fm>
date:        Sun Sep 16 13:27:11 2012 -0400
summary:
  update tags PEP

files:
  pep-0425.txt |  73 +++++++++++++++++++--------------------
  1 files changed, 36 insertions(+), 37 deletions(-)


diff --git a/pep-0425.txt b/pep-0425.txt
--- a/pep-0425.txt
+++ b/pep-0425.txt
@@ -57,7 +57,7 @@
 python tag
     ?py27?, ?cp33?
 abi tag
-    ?cp33dmu?, ?none?
+    ?cp32dmu?, ?none?
 platform tag
     ?linux_x86_64?, ?any?
 
@@ -82,9 +82,15 @@
 
 Other Python implementations should use `sys.implementation.name`.
 
-The language version is `py_version_nodot`, or just the major version
-`2` or `3` for many pure-Python distributions.  CPython gets away with
-no dot, but if one is needed the underscore `_` is used instead.
+The language version is `py_version_nodot`. CPython gets away with no dot,
+but if one is needed the underscore `_` is used instead.
+
+The version can be just the major version `2` or `3` `py2`, `py3` for
+many pure-Python distributions.
+
+Importantly, major-version-only tags like `py2` and `py3` are not
+shorthand for `py20` and `py30`.  Instead, these tags mean the packager
+intentionally released a cross-version-compatible distribution.
 
 A single-source Python 2/3 compatible distribution can use the compound
 tag `py2.py3`.  See `Compressed Tag Sets`, below.
@@ -97,8 +103,8 @@
 is abbreviated in the same way as the Python Tag, e.g. `cp33d` would be
 the CPython 3.3 ABI with debugging.
 
-As a special case, the CPython stable ABI starts with `py`; `py32`
-is that ABI with only the operations available from Python 3.2 onward.
+The CPython stable ABI is `abi3` as in the shared library suffix, and
+is available starting with Python 3.2.
 
 Implementations with a very unstable ABI may use the first 6 bytes (as
 8 base64-encoded characters) of the SHA-256 hash of ther source code
@@ -112,48 +118,41 @@
 The platform tag is simply `distutils.util.get_platform()` with all
 hyphens `-` and periods `.` replaced with underscore `_`.
 
+* win32
+* linux_i386
+* linux_x86_64
+
 Use
 ===
 
 The tags are used by installers to decide which built distribution
 (if any) to download from a list of potential built distributions.
-Installers will have a list of (python, abi, plat) that the current
-Python installation can run sorted by order of preference.  Each built
-distribution recieves a score based on its tag's position in the list,
-and the most-preferred distribution is the one that is installed.
-If no built distribution matches the list of supported tag tuples then
-the installer falls back to installing from the source distribution.
-Tags are only compared for equality; they are never greater or less than
-another tag, and a tag that 'startswith' another tag is not a subset of
-the shorter tag.
+The installer maintains a list of (pyver, abi, arch) tuples that it
+will support.  If the built distribution's tag is `in` the list, then
+it can be installed.
 
-For example, an installer running under CPython 3.3 on an imaginary MMIX
-system might prefer, in order::
+For example, an installer running under CPython 3.3 on a linux_x86_64
+system might support::
 
-   1. (cp33, cp33, mmix) # built for this specific version of Python
-   2. (cp33, py32, mmix) # using the stable ABI as defined by Python 3.2
-   3. (cp33, none, mmix) # using no ABI, but still depending on the specific
-      platform (e.g. through ctypes or os.system)
-   4. (cp33, none, any) # pure-Python distribution for the current Python
-   5. (py33, none, any) # pure-Python distribution for the current (generic)
-      Python
-   6. (py32, none, any) # pure-Python distributions for older versions of
-      Python
-   7. (py31, none, any) # ""
-   8. (py30, none, any) # ""
-   9. (py3, none, any) # ""
-
-A distribution that requires CPython 3.3 or CPython 2.7 and has an
-optional extension module could distribute built distributions tagged
-`cp33-cp3-mmix`, `cp33-none-any`, and `cp27-none-any`.  (Our imaginary
-program is using 2to3, so the built distribution is not compatible across
-major releases.)  `cp33-cp3-mmix` gets a score of 1, `cp33-none-any`
-gets a score of 3, and `cp27-none-any` is not in the list at all.  Since
-`cp33-cp3-mmix` has the best score, that built distribution is installed.
+ 1. cp33-cp33m-linux_x86_64
+ 2. cp33-none-linux_x86_64
+ 3. cp3-abi3-linux_x86_64
+ 4. cp33-none-any
+ 5. cp3-none-any
+ 6. py33-none-any
+ 7. py3-none-any
 
 A user could instruct their installer to fall back to building from an
 sdist more or less often by configuring this list of tags.
 
+Rarely there will be more than one supported built distribution for a
+particular version of a package.  For example, a packager could release
+a package tagged `cp3-abi3-linux_x86_64` that contains an optional C
+extension and the same distribution tagged `py3-none-any` that does not.
+The index of the tag in the supported tags list breaks the tie, and the
+package with the C extension is installed in preference to the package
+without because that tag appears first in the list.
+
 Compressed Tag Sets
 ===================
 

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 16 23:50:30 2012
From: python-checkins at python.org (daniel.holth)
Date: Sun, 16 Sep 2012 23:50:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_pep-0425_edits?=
Message-ID: <3XKkfZ5KQPzQbX@mail.python.org>

http://hg.python.org/peps/rev/6475aa6bc3b9
changeset:   4513:6475aa6bc3b9
user:        Daniel Holth <dholth at fastmail.fm>
date:        Sun Sep 16 17:50:23 2012 -0400
summary:
  pep-0425 edits

files:
  pep-0425.txt |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/pep-0425.txt b/pep-0425.txt
--- a/pep-0425.txt
+++ b/pep-0425.txt
@@ -70,9 +70,8 @@
 Python Tag
 ----------
 
-The Python tag indicates both the implementation and the language version
-required by a distribution.  Major implementations have abbreviated
-codes, initially:
+The Python tag indicates the implementation and version required by
+a distribution.  Major implementations have abbreviated codes, initially:
 
 * py: Generic Python (does not require implementation-specific features)
 * cp: CPython
@@ -82,8 +81,10 @@
 
 Other Python implementations should use `sys.implementation.name`.
 
-The language version is `py_version_nodot`. CPython gets away with no dot,
-but if one is needed the underscore `_` is used instead.
+The version is `py_version_nodot`.  CPython gets away with no dot, but
+if one is needed the underscore `_` is used instead.  Pypy uses versions that
+do not track the Python language version and should probably use its own
+versions here `pp18`, `pp19`.
 
 The version can be just the major version `2` or `3` `py2`, `py3` for
 many pure-Python distributions.

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Mon Sep 17 04:37:37 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 17 Sep 2012 04:37:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTIwOiBmaXgg?=
 =?utf-8?q?doctests_in_Doc/howto/regex=2Erst=2E__Patch_by_Chris_Jerdonek?=
 =?utf-8?q?=2E?=
Message-ID: <3XKs1s4JmFzQjP@mail.python.org>

http://hg.python.org/cpython/rev/f98f46f7f11b
changeset:   79037:f98f46f7f11b
branch:      3.2
parent:      79035:bc5c5b79b7e1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 17 05:29:47 2012 +0300
summary:
  #15920: fix doctests in Doc/howto/regex.rst.  Patch by Chris Jerdonek.

files:
  Doc/howto/regex.rst |  26 +++++++++++++-------------
  1 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -260,7 +260,7 @@
 
    >>> import re
    >>> p = re.compile('ab*')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 :func:`re.compile` also accepts an optional *flags* argument, used to enable
@@ -372,7 +372,7 @@
 
    >>> import re
    >>> p = re.compile('[a-z]+')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 Now, you can try matching various strings against the RE ``[a-z]+``.  An empty
@@ -390,7 +390,7 @@
 result in a variable for later use. ::
 
    >>> m = p.match('tempo')
-   >>> m
+   >>> m  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Now you can query the :class:`MatchObject` for information about the matching
@@ -429,7 +429,7 @@
 
    >>> print(p.match('::: message'))
    None
-   >>> m = p.search('::: message') ; print(m)
+   >>> m = p.search('::: message'); print(m)  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
    >>> m.group()
    'message'
@@ -458,7 +458,7 @@
 instances as an :term:`iterator`::
 
    >>> iterator = p.finditer('12 drummers drumming, 11 ... 10 ...')
-   >>> iterator
+   >>> iterator  #doctest: +ELLIPSIS
    <callable_iterator object at 0x...>
    >>> for match in iterator:
    ...     print(match.span())
@@ -480,7 +480,7 @@
 
    >>> print(re.match(r'From\s+', 'Fromage amk'))
    None
-   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')
+   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Under the hood, these functions simply create a pattern object for you
@@ -682,7 +682,7 @@
    For example, if you wish to match the word ``From`` only at the beginning of a
    line, the RE to use is ``^From``. ::
 
-      >>> print(re.search('^From', 'From Here to Eternity'))
+      >>> print(re.search('^From', 'From Here to Eternity'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('^From', 'Reciting From Memory'))
       None
@@ -694,11 +694,11 @@
    Matches at the end of a line, which is defined as either the end of the string,
    or any location followed by a newline character.     ::
 
-      >>> print(re.search('}$', '{block}'))
+      >>> print(re.search('}$', '{block}'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('}$', '{block} '))
       None
-      >>> print(re.search('}$', '{block}\n'))
+      >>> print(re.search('}$', '{block}\n'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    To match a literal ``'$'``, use ``\$`` or enclose it inside a character class,
@@ -723,7 +723,7 @@
    match when it's contained inside another word. ::
 
       >>> p = re.compile(r'\bclass\b')
-      >>> print(p.search('no class at all'))
+      >>> print(p.search('no class at all'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(p.search('the declassified algorithm'))
       None
@@ -741,7 +741,7 @@
       >>> p = re.compile('\bclass\b')
       >>> print(p.search('no class at all'))
       None
-      >>> print(p.search('\b' + 'class' + '\b')  )
+      >>> print(p.search('\b' + 'class' + '\b'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    Second, inside a character class, where there's no use for this assertion,
@@ -1182,9 +1182,9 @@
 In the following example, the replacement function translates  decimals into
 hexadecimal::
 
-   >>> def hexrepl( match ):
+   >>> def hexrepl(match):
    ...     "Return the hex string for a decimal number"
-   ...     value = int( match.group() )
+   ...     value = int(match.group())
    ...     return hex(value)
    ...
    >>> p = re.compile(r'\d+')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 17 04:37:39 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 17 Sep 2012 04:37:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1OTIwOiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XKs1v2l0fzQjP@mail.python.org>

http://hg.python.org/cpython/rev/ef44e1b740cb
changeset:   79038:ef44e1b740cb
parent:      79036:1704deb7e6d7
parent:      79037:f98f46f7f11b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 17 05:30:58 2012 +0300
summary:
  #15920: merge with 3.2.

files:
  Doc/howto/regex.rst |  26 +++++++++++++-------------
  1 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -260,7 +260,7 @@
 
    >>> import re
    >>> p = re.compile('ab*')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 :func:`re.compile` also accepts an optional *flags* argument, used to enable
@@ -372,7 +372,7 @@
 
    >>> import re
    >>> p = re.compile('[a-z]+')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 Now, you can try matching various strings against the RE ``[a-z]+``.  An empty
@@ -390,7 +390,7 @@
 result in a variable for later use. ::
 
    >>> m = p.match('tempo')
-   >>> m
+   >>> m  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Now you can query the :class:`MatchObject` for information about the matching
@@ -429,7 +429,7 @@
 
    >>> print(p.match('::: message'))
    None
-   >>> m = p.search('::: message') ; print(m)
+   >>> m = p.search('::: message'); print(m)  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
    >>> m.group()
    'message'
@@ -458,7 +458,7 @@
 instances as an :term:`iterator`::
 
    >>> iterator = p.finditer('12 drummers drumming, 11 ... 10 ...')
-   >>> iterator
+   >>> iterator  #doctest: +ELLIPSIS
    <callable_iterator object at 0x...>
    >>> for match in iterator:
    ...     print(match.span())
@@ -480,7 +480,7 @@
 
    >>> print(re.match(r'From\s+', 'Fromage amk'))
    None
-   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')
+   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Under the hood, these functions simply create a pattern object for you
@@ -682,7 +682,7 @@
    For example, if you wish to match the word ``From`` only at the beginning of a
    line, the RE to use is ``^From``. ::
 
-      >>> print(re.search('^From', 'From Here to Eternity'))
+      >>> print(re.search('^From', 'From Here to Eternity'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('^From', 'Reciting From Memory'))
       None
@@ -694,11 +694,11 @@
    Matches at the end of a line, which is defined as either the end of the string,
    or any location followed by a newline character.     ::
 
-      >>> print(re.search('}$', '{block}'))
+      >>> print(re.search('}$', '{block}'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('}$', '{block} '))
       None
-      >>> print(re.search('}$', '{block}\n'))
+      >>> print(re.search('}$', '{block}\n'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    To match a literal ``'$'``, use ``\$`` or enclose it inside a character class,
@@ -723,7 +723,7 @@
    match when it's contained inside another word. ::
 
       >>> p = re.compile(r'\bclass\b')
-      >>> print(p.search('no class at all'))
+      >>> print(p.search('no class at all'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(p.search('the declassified algorithm'))
       None
@@ -741,7 +741,7 @@
       >>> p = re.compile('\bclass\b')
       >>> print(p.search('no class at all'))
       None
-      >>> print(p.search('\b' + 'class' + '\b')  )
+      >>> print(p.search('\b' + 'class' + '\b'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    Second, inside a character class, where there's no use for this assertion,
@@ -1182,9 +1182,9 @@
 In the following example, the replacement function translates  decimals into
 hexadecimal::
 
-   >>> def hexrepl( match ):
+   >>> def hexrepl(match):
    ...     "Return the hex string for a decimal number"
-   ...     value = int( match.group() )
+   ...     value = int(match.group())
    ...     return hex(value)
    ...
    >>> p = re.compile(r'\d+')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 17 04:37:40 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 17 Sep 2012 04:37:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1OTIwOiBmaXgg?=
 =?utf-8?q?doctests_in_Doc/howto/regex=2Erst=2E__Patch_by_Chris_Jerdonek?=
 =?utf-8?q?=2E?=
Message-ID: <3XKs1w6sFwzQmq@mail.python.org>

http://hg.python.org/cpython/rev/19601d451d4c
changeset:   79039:19601d451d4c
branch:      2.7
parent:      79032:820032281f49
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 17 05:36:56 2012 +0300
summary:
  #15920: fix doctests in Doc/howto/regex.rst.  Patch by Chris Jerdonek.

files:
  Doc/howto/regex.rst |  28 ++++++++++++++--------------
  1 files changed, 14 insertions(+), 14 deletions(-)


diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -265,7 +265,7 @@
 
    >>> import re
    >>> p = re.compile('ab*')
-   >>> print p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 :func:`re.compile` also accepts an optional *flags* argument, used to enable
@@ -378,7 +378,7 @@
    Python 2.2.2 (#1, Feb 10 2003, 12:57:01)
    >>> import re
    >>> p = re.compile('[a-z]+')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 Now, you can try matching various strings against the RE ``[a-z]+``.  An empty
@@ -396,7 +396,7 @@
 result in a variable for later use. ::
 
    >>> m = p.match('tempo')
-   >>> print m
+   >>> m  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Now you can query the :class:`MatchObject` for information about the matching
@@ -435,7 +435,7 @@
 
    >>> print p.match('::: message')
    None
-   >>> m = p.search('::: message') ; print m
+   >>> m = p.search('::: message'); print m  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
    >>> m.group()
    'message'
@@ -464,8 +464,8 @@
 instances as an :term:`iterator`. [#]_ ::
 
    >>> iterator = p.finditer('12 drummers drumming, 11 ... 10 ...')
-   >>> iterator
-   <callable-iterator object at 0x401833ac>
+   >>> iterator  #doctest: +ELLIPSIS
+   <callable-iterator object at 0x...>
    >>> for match in iterator:
    ...     print match.span()
    ...
@@ -486,7 +486,7 @@
 
    >>> print re.match(r'From\s+', 'Fromage amk')
    None
-   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')
+   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Under the hood, these functions simply create a pattern object for you
@@ -687,7 +687,7 @@
    For example, if you wish to match the word ``From`` only at the beginning of a
    line, the RE to use is ``^From``. ::
 
-      >>> print re.search('^From', 'From Here to Eternity')
+      >>> print re.search('^From', 'From Here to Eternity')  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print re.search('^From', 'Reciting From Memory')
       None
@@ -699,11 +699,11 @@
    Matches at the end of a line, which is defined as either the end of the string,
    or any location followed by a newline character.     ::
 
-      >>> print re.search('}$', '{block}')
+      >>> print re.search('}$', '{block}')  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print re.search('}$', '{block} ')
       None
-      >>> print re.search('}$', '{block}\n')
+      >>> print re.search('}$', '{block}\n')  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    To match a literal ``'$'``, use ``\$`` or enclose it inside a character class,
@@ -728,7 +728,7 @@
    match when it's contained inside another word. ::
 
       >>> p = re.compile(r'\bclass\b')
-      >>> print p.search('no class at all')
+      >>> print p.search('no class at all')  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print p.search('the declassified algorithm')
       None
@@ -746,7 +746,7 @@
       >>> p = re.compile('\bclass\b')
       >>> print p.search('no class at all')
       None
-      >>> print p.search('\b' + 'class' + '\b')
+      >>> print p.search('\b' + 'class' + '\b')  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    Second, inside a character class, where there's no use for this assertion,
@@ -1187,9 +1187,9 @@
 In the following example, the replacement function translates  decimals into
 hexadecimal::
 
-   >>> def hexrepl( match ):
+   >>> def hexrepl(match):
    ...     "Return the hex string for a decimal number"
-   ...     value = int( match.group() )
+   ...     value = int(match.group())
    ...     return hex(value)
    ...
    >>> p = re.compile(r'\d+')

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Mon Sep 17 06:07:07 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 17 Sep 2012 06:07:07 +0200
Subject: [Python-checkins] Daily reference leaks (1704deb7e6d7): sum=0
Message-ID: <E1TDSbz-0002wf-I0@ap.vmr.nerim.net>

results for 1704deb7e6d7 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogQENIGU', '-x']

From python-checkins at python.org  Mon Sep 17 09:01:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 17 Sep 2012 09:01:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzExNjQzOiBmaXgg?=
 =?utf-8?q?rst_markup_error_in_site=2Erst=2E?=
Message-ID: <3XKyt10v8ZzNyd@mail.python.org>

http://hg.python.org/cpython/rev/de6976fe19aa
changeset:   79040:de6976fe19aa
branch:      2.7
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 17 08:59:36 2012 +0200
summary:
  #11643: fix rst markup error in site.rst.

files:
  Doc/library/site.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/site.rst b/Doc/library/site.rst
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -26,7 +26,7 @@
 For the head part, it uses ``sys.prefix`` and ``sys.exec_prefix``; empty heads
 are skipped.  For the tail part, it uses the empty string and then
 :file:`lib/site-packages` (on Windows) or
-:file:`lib/python|version|/site-packages` and then :file:`lib/site-python` (on
+:file:`lib/python{X.Y}/site-packages` and then :file:`lib/site-python` (on
 Unix and Macintosh).  For each of the distinct head-tail combinations, it sees
 if it refers to an existing directory, and if so, adds it to ``sys.path`` and
 also inspects the newly added path for configuration files.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 17 09:01:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 17 Sep 2012 09:01:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzExNjQzOiBmaXgg?=
 =?utf-8?q?rst_markup_error_in_site=2Erst=2E?=
Message-ID: <3XKyt25JqlzPH2@mail.python.org>

http://hg.python.org/cpython/rev/7aca2781c381
changeset:   79041:7aca2781c381
branch:      3.2
parent:      79037:f98f46f7f11b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 17 08:59:36 2012 +0200
summary:
  #11643: fix rst markup error in site.rst.

files:
  Doc/library/site.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/site.rst b/Doc/library/site.rst
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -26,7 +26,7 @@
 For the head part, it uses ``sys.prefix`` and ``sys.exec_prefix``; empty heads
 are skipped.  For the tail part, it uses the empty string and then
 :file:`lib/site-packages` (on Windows) or
-:file:`lib/python|version|/site-packages` and then :file:`lib/site-python` (on
+:file:`lib/python{X.Y}/site-packages` and then :file:`lib/site-python` (on
 Unix and Macintosh).  For each of the distinct head-tail combinations, it sees
 if it refers to an existing directory, and if so, adds it to ``sys.path`` and
 also inspects the newly added path for configuration files.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 17 09:01:16 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 17 Sep 2012 09:01:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzExNjQzOiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XKyt41GkGzP9V@mail.python.org>

http://hg.python.org/cpython/rev/c6892ce7e56f
changeset:   79042:c6892ce7e56f
parent:      79038:ef44e1b740cb
parent:      79041:7aca2781c381
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 17 09:01:03 2012 +0200
summary:
  #11643: merge with 3.2.

files:
  Doc/library/site.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/site.rst b/Doc/library/site.rst
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -33,7 +33,7 @@
 For the head part, it uses ``sys.prefix`` and ``sys.exec_prefix``; empty heads
 are skipped.  For the tail part, it uses the empty string and then
 :file:`lib/site-packages` (on Windows) or
-:file:`lib/python|version|/site-packages` and then :file:`lib/site-python` (on
+:file:`lib/python{X.Y}/site-packages` and then :file:`lib/site-python` (on
 Unix and Macintosh).  For each of the distinct head-tail combinations, it sees
 if it refers to an existing directory, and if so, adds it to ``sys.path`` and
 also inspects the newly added path for configuration files.

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Tue Sep 18 06:07:06 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 18 Sep 2012 06:07:06 +0200
Subject: [Python-checkins] Daily reference leaks (c6892ce7e56f): sum=0
Message-ID: <E1TDp5W-0002rY-Bu@ap.vmr.nerim.net>

results for c6892ce7e56f on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogMAsGC5', '-x']

From python-checkins at python.org  Tue Sep 18 06:21:51 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 18 Sep 2012 06:21:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1Nzk2OiBGaXgg?=
 =?utf-8?q?=5Cn_in_readline_docstring=2E?=
Message-ID: <3XLWHg2Jq2zNf7@mail.python.org>

http://hg.python.org/cpython/rev/210a189544c3
changeset:   79043:210a189544c3
branch:      2.7
parent:      79040:de6976fe19aa
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Sep 18 07:17:49 2012 +0300
summary:
  #15796: Fix \n in readline docstring.

files:
  Modules/_io/iobase.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -437,7 +437,7 @@
     "\n"
     "If limit is specified, at most limit bytes will be read.\n"
     "\n"
-    "The line terminator is always b'\n' for binary files; for text\n"
+    "The line terminator is always b'\\n' for binary files; for text\n"
     "files, the newlines argument to open can be used to select the line\n"
     "terminator(s) recognized.\n");
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 18 06:21:53 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 18 Sep 2012 06:21:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1Nzk2OiBGaXgg?=
 =?utf-8?q?=5Cn_in_readline_docstring=2E__Patch_by_Serhiy_Storchaka=2E?=
Message-ID: <3XLWHj6h27zNjy@mail.python.org>

http://hg.python.org/cpython/rev/6386e1f4f1fd
changeset:   79044:6386e1f4f1fd
branch:      3.2
parent:      79041:7aca2781c381
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Sep 18 07:20:18 2012 +0300
summary:
  #15796: Fix \n in readline docstring.  Patch by Serhiy Storchaka.

files:
  Modules/_io/_iomodule.c |  2 +-
  Modules/_io/iobase.c    |  2 +-
  Modules/_io/textio.c    |  2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -264,7 +264,7 @@
 "\n"
 "* On output, if newline is None, any '\\n' characters written are\n"
 "  translated to the system default line separator, os.linesep. If\n"
-"  newline is '' or '\n', no translation takes place. If newline is any\n"
+"  newline is '' or '\\n', no translation takes place. If newline is any\n"
 "  of the other legal values, any '\\n' characters written are translated\n"
 "  to the given string.\n"
 "\n"
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -451,7 +451,7 @@
     "\n"
     "If limit is specified, at most limit bytes will be read.\n"
     "\n"
-    "The line terminator is always b'\n' for binary files; for text\n"
+    "The line terminator is always b'\\n' for binary files; for text\n"
     "files, the newlines argument to open can be used to select the line\n"
     "terminator(s) recognized.\n");
 
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -635,7 +635,7 @@
     "\n"
     "* On output, if newline is None, any '\\n' characters written are\n"
     "  translated to the system default line separator, os.linesep. If\n"
-    "  newline is '' or '\n', no translation takes place. If newline is any\n"
+    "  newline is '' or '\\n', no translation takes place. If newline is any\n"
     "  of the other legal values, any '\\n' characters written are translated\n"
     "  to the given string.\n"
     "\n"

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 18 06:21:55 2012
From: python-checkins at python.org (ezio.melotti)
Date: Tue, 18 Sep 2012 06:21:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1Nzk2OiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XLWHl2YVBzPJq@mail.python.org>

http://hg.python.org/cpython/rev/3a880d640981
changeset:   79045:3a880d640981
parent:      79042:c6892ce7e56f
parent:      79044:6386e1f4f1fd
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Sep 18 07:21:18 2012 +0300
summary:
  #15796: merge with 3.2.

files:
  Modules/_io/_iomodule.c |  2 +-
  Modules/_io/iobase.c    |  2 +-
  Modules/_io/textio.c    |  2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -185,7 +185,7 @@
 "\n"
 "* On output, if newline is None, any '\\n' characters written are\n"
 "  translated to the system default line separator, os.linesep. If\n"
-"  newline is '' or '\n', no translation takes place. If newline is any\n"
+"  newline is '' or '\\n', no translation takes place. If newline is any\n"
 "  of the other legal values, any '\\n' characters written are translated\n"
 "  to the given string.\n"
 "\n"
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -442,7 +442,7 @@
     "\n"
     "If limit is specified, at most limit bytes will be read.\n"
     "\n"
-    "The line terminator is always b'\n' for binary files; for text\n"
+    "The line terminator is always b'\\n' for binary files; for text\n"
     "files, the newlines argument to open can be used to select the line\n"
     "terminator(s) recognized.\n");
 
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -648,7 +648,7 @@
     "\n"
     "* On output, if newline is None, any '\\n' characters written are\n"
     "  translated to the system default line separator, os.linesep. If\n"
-    "  newline is '' or '\n', no translation takes place. If newline is any\n"
+    "  newline is '' or '\\n', no translation takes place. If newline is any\n"
     "  of the other legal values, any '\\n' characters written are translated\n"
     "  to the given string.\n"
     "\n"

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 18 14:35:45 2012
From: python-checkins at python.org (nick.coghlan)
Date: Tue, 18 Sep 2012 14:35:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_a_note_to_say_that_yo?=
 =?utf-8?q?u_need_to_purge_build_artefacts_after_switching_from?=
Message-ID: <3XLkFY5ShxzPKx@mail.python.org>

http://hg.python.org/devguide/rev/9ea5d869d3c2
changeset:   549:9ea5d869d3c2
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Tue Sep 18 22:35:36 2012 +1000
summary:
  Add a note to say that you need to purge build artefacts after switching from Python 2 to Python 3 or vice-versa in a single checkout

files:
  faq.rst |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -304,6 +304,12 @@
 
 Adding the ``-v`` option to ``hg update`` will list all updated files.
 
+Note that, due to some previously built executables being used as a part of
+the build process, you may sometimes run into issues when attempting to
+switch between Python 2.x and Python 3.x branches. In these cases, it is
+best to run a ``make distclean``to ensure that all previously built files
+are removed.
+
 
 I want to keep a separate working copy per development branch, is it possible?
 ------------------------------------------------------------------------------

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Tue Sep 18 22:45:40 2012
From: python-checkins at python.org (victor.stinner)
Date: Tue, 18 Sep 2012 22:45:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_What=27s_New_in_Python_3?=
 =?utf-8?q?=2E3=3A_mention_unittest=2Emock?=
Message-ID: <3XLx6r3L6yzPLw@mail.python.org>

http://hg.python.org/cpython/rev/cffb815e6de4
changeset:   79046:cffb815e6de4
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Sep 18 22:40:03 2012 +0200
summary:
  What's New in Python 3.3: mention unittest.mock

files:
  Doc/whatsnew/3.3.rst |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -69,6 +69,7 @@
 * :mod:`faulthandler` (helps debugging low-level crashes)
 * :mod:`ipaddress` (high-level objects representing IP addresses and masks)
 * :mod:`lzma` (compress data using the XZ / LZMA algorithm)
+* :mod:`unittest.mock` (replace parts of your system under test with mock objects)
 * :mod:`venv` (Python :ref:`virtual environments <pep-405>`, as in the
   popular ``virtualenv`` package)
 
@@ -923,7 +924,7 @@
 faulthandler
 ------------
 
-This new debug module contains functions to dump Python tracebacks explicitly,
+This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
 on a fault (a crash like a segmentation fault), after a timeout, or on a user
 signal. Call :func:`faulthandler.enable` to install fault handlers for the
 :const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 19 03:50:28 2012
From: python-checkins at python.org (trent.nelson)
Date: Wed, 19 Sep 2012 03:50:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2315965=3A_Explicitly_cas?=
 =?utf-8?q?t_AT=5FFDCWD_as_=28int=29=2E?=
Message-ID: <3XM3tX0VQjzP1K@mail.python.org>

http://hg.python.org/cpython/rev/974a4cae6094
changeset:   79047:974a4cae6094
user:        Trent Nelson <trent at trent.me>
date:        Tue Sep 18 21:50:06 2012 -0400
summary:
  #15965: Explicitly cast AT_FDCWD as (int).

Required on Solaris 10 (which defines AT_FDCWD as 0xffd19553),
harmless on other platforms.

files:
  Misc/NEWS             |  3 +++
  Modules/posixmodule.c |  9 ++++++++-
  2 files changed, 11 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
+  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
+
 - Issue #15926: Fix crash after multiple reinitializations of the interpreter.
 
 - Issue #15895: Fix FILE pointer leak in one error branch of
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -414,7 +414,14 @@
 
 
 #ifdef AT_FDCWD
-#define DEFAULT_DIR_FD AT_FDCWD
+/*
+ * Why the (int) cast?  Solaris 10 defines AT_FDCWD as 0xffd19553 (-3041965);
+ * without the int cast, the value gets interpreted as uint (4291925331),
+ * which doesn't play nicely with all the initializer lines in this file that
+ * look like this:
+ *      int dir_fd = DEFAULT_DIR_FD;
+ */
+#define DEFAULT_DIR_FD (int)AT_FDCWD
 #else
 #define DEFAULT_DIR_FD (-100)
 #endif

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 19 03:58:17 2012
From: python-checkins at python.org (trent.nelson)
Date: Wed, 19 Sep 2012 03:58:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Silence_compil?=
 =?utf-8?q?er_warnings_on_Solaris_10_via_explicit_=28void_*=29_casts=2E?=
Message-ID: <3XM43Y33fPzMfM@mail.python.org>

http://hg.python.org/cpython/rev/e9e6e5104936
changeset:   79048:e9e6e5104936
branch:      3.2
parent:      79044:6386e1f4f1fd
user:        Trent Nelson <trent at trent.me>
date:        Tue Sep 18 21:58:03 2012 -0400
summary:
  Silence compiler warnings on Solaris 10 via explicit (void *) casts.

(Compiler: Solaris Studio 12.3)

files:
  Objects/typeobject.c |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5772,7 +5772,7 @@
         descr = _PyType_Lookup(type, p->name_strobj);
         if (descr == NULL) {
             if (ptr == (void**)&type->tp_iternext) {
-                specific = _PyObject_NextNotImplemented;
+                specific = (void *)_PyObject_NextNotImplemented;
             }
             continue;
         }
@@ -5819,7 +5819,7 @@
             /* We specifically allow __hash__ to be set to None
                to prevent inheritance of the default
                implementation from object.__hash__ */
-            specific = PyObject_HashNotImplemented;
+            specific = (void *)PyObject_HashNotImplemented;
         }
         else {
             use_generic = 1;
@@ -6034,7 +6034,7 @@
             continue;
         if (PyDict_GetItem(dict, p->name_strobj))
             continue;
-        if (*ptr == PyObject_HashNotImplemented) {
+        if (*ptr == (void *)PyObject_HashNotImplemented) {
             /* Classes may prevent the inheritance of the tp_hash
                slot by storing PyObject_HashNotImplemented in it. Make it
                visible as a None value for the __hash__ attribute. */

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 19 04:00:32 2012
From: python-checkins at python.org (trent.nelson)
Date: Wed, 19 Sep 2012 04:00:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Silence_compiler_warnings_on_Solaris_10_via_explicit_=28?=
 =?utf-8?q?void_*=29_casts=2E?=
Message-ID: <3XM4681KNFzP1K@mail.python.org>

http://hg.python.org/cpython/rev/650e1857a91e
changeset:   79049:650e1857a91e
parent:      79047:974a4cae6094
parent:      79048:e9e6e5104936
user:        Trent Nelson <trent at trent.me>
date:        Tue Sep 18 22:00:25 2012 -0400
summary:
  Silence compiler warnings on Solaris 10 via explicit (void *) casts.

files:
  Objects/typeobject.c |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5992,7 +5992,7 @@
         descr = _PyType_Lookup(type, p->name_strobj);
         if (descr == NULL) {
             if (ptr == (void**)&type->tp_iternext) {
-                specific = _PyObject_NextNotImplemented;
+                specific = (void *)_PyObject_NextNotImplemented;
             }
             continue;
         }
@@ -6039,7 +6039,7 @@
             /* We specifically allow __hash__ to be set to None
                to prevent inheritance of the default
                implementation from object.__hash__ */
-            specific = PyObject_HashNotImplemented;
+            specific = (void *)PyObject_HashNotImplemented;
         }
         else {
             use_generic = 1;
@@ -6254,7 +6254,7 @@
             continue;
         if (PyDict_GetItem(dict, p->name_strobj))
             continue;
-        if (*ptr == PyObject_HashNotImplemented) {
+        if (*ptr == (void *)PyObject_HashNotImplemented) {
             /* Classes may prevent the inheritance of the tp_hash
                slot by storing PyObject_HashNotImplemented in it. Make it
                visible as a None value for the __hash__ attribute. */

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Wed Sep 19 06:08:35 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 19 Sep 2012 06:08:35 +0200
Subject: [Python-checkins] Daily reference leaks (cffb815e6de4): sum=2
Message-ID: <E1TEBaV-0007og-Nw@ap.vmr.nerim.net>

results for cffb815e6de4 on branch "default"
--------------------------------------------

test_dbm leaked [0, 2, 0] references, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogq_CTd5', '-x']

From python-checkins at python.org  Wed Sep 19 07:26:07 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 19 Sep 2012 07:26:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1OTcwOiB4bWwu?=
 =?utf-8?q?etree=2EElementTree_now_serializes_correctly_the_empty_HTML_ele?=
 =?utf-8?q?ments?=
Message-ID: <3XM8gM1m4GzQMx@mail.python.org>

http://hg.python.org/cpython/rev/3498ffd3cdee
changeset:   79050:3498ffd3cdee
branch:      2.7
parent:      79043:210a189544c3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Sep 19 08:11:03 2012 +0300
summary:
  #15970: xml.etree.ElementTree now serializes correctly the empty HTML elements "meta" and "param".

files:
  Lib/test/test_xml_etree.py   |  20 ++++++++++++++++++++
  Lib/xml/etree/ElementTree.py |   2 +-
  Misc/NEWS                    |   3 +++
  3 files changed, 24 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1822,6 +1822,26 @@
 
     """
 
+def check_html_empty_elems_serialization(self):
+    # issue 15970
+    # from http://www.w3.org/TR/html401/index/elements.html
+    """
+
+    >>> empty_elems = ['AREA', 'BASE', 'BASEFONT', 'BR', 'COL', 'FRAME', 'HR',
+    ...                'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM']
+    >>> elems = ''.join('<%s />' % elem for elem in empty_elems)
+    >>> serialize(ET.XML('<html>%s</html>' % elems), method='html')
+    '<html><AREA><BASE><BASEFONT><BR><COL><FRAME><HR><IMG><INPUT><ISINDEX><LINK><META><PARAM></html>'
+    >>> serialize(ET.XML('<html>%s</html>' % elems.lower()), method='html')
+    '<html><area><base><basefont><br><col><frame><hr><img><input><isindex><link><meta><param></html>'
+    >>> elems = ''.join('<%s></%s>' % (elem, elem) for elem in empty_elems)
+    >>> serialize(ET.XML('<html>%s</html>' % elems), method='html')
+    '<html><AREA><BASE><BASEFONT><BR><COL><FRAME><HR><IMG><INPUT><ISINDEX><LINK><META><PARAM></html>'
+    >>> serialize(ET.XML('<html>%s</html>' % elems.lower()), method='html')
+    '<html><area><base><basefont><br><col><frame><hr><img><input><isindex><link><meta><param></html>'
+
+    """
+
 # --------------------------------------------------------------------
 
 
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -945,7 +945,7 @@
         write(_escape_cdata(elem.tail, encoding))
 
 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
-              "img", "input", "isindex", "link", "meta" "param")
+              "img", "input", "isindex", "link", "meta", "param")
 
 try:
     HTML_EMPTY = set(HTML_EMPTY)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,9 @@
 Library
 -------
 
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
 - Issue #15676: Now "mmap" check for empty files before doing the
   offset check.  Patch by Steven Willis.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 19 07:26:38 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 19 Sep 2012 07:26:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTcwOiB4bWwu?=
 =?utf-8?q?etree=2EElementTree_now_serializes_correctly_the_empty_HTML_ele?=
 =?utf-8?q?ments?=
Message-ID: <3XM8gy6Fm7zQMX@mail.python.org>

http://hg.python.org/cpython/rev/17c528cff63f
changeset:   79051:17c528cff63f
branch:      3.2
parent:      79048:e9e6e5104936
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Sep 19 08:19:12 2012 +0300
summary:
  #15970: xml.etree.ElementTree now serializes correctly the empty HTML elements "meta" and "param".

files:
  Lib/test/test_xml_etree.py   |  20 ++++++++++++++++++++
  Lib/xml/etree/ElementTree.py |   2 +-
  Misc/NEWS                    |   3 +++
  3 files changed, 24 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1851,6 +1851,26 @@
     >>> ET.register_namespace('test10777', 'http://myuri/')
     """
 
+def check_html_empty_elems_serialization(self):
+    # issue 15970
+    # from http://www.w3.org/TR/html401/index/elements.html
+    """
+
+    >>> empty_elems = ['AREA', 'BASE', 'BASEFONT', 'BR', 'COL', 'FRAME', 'HR',
+    ...                'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM']
+    >>> elems = ''.join('<%s />' % elem for elem in empty_elems)
+    >>> serialize(ET.XML('<html>%s</html>' % elems), method='html')
+    '<html><AREA><BASE><BASEFONT><BR><COL><FRAME><HR><IMG><INPUT><ISINDEX><LINK><META><PARAM></html>'
+    >>> serialize(ET.XML('<html>%s</html>' % elems.lower()), method='html')
+    '<html><area><base><basefont><br><col><frame><hr><img><input><isindex><link><meta><param></html>'
+    >>> elems = ''.join('<%s></%s>' % (elem, elem) for elem in empty_elems)
+    >>> serialize(ET.XML('<html>%s</html>' % elems), method='html')
+    '<html><AREA><BASE><BASEFONT><BR><COL><FRAME><HR><IMG><INPUT><ISINDEX><LINK><META><PARAM></html>'
+    >>> serialize(ET.XML('<html>%s</html>' % elems.lower()), method='html')
+    '<html><area><base><basefont><br><col><frame><hr><img><input><isindex><link><meta><param></html>'
+
+    """
+
 # --------------------------------------------------------------------
 
 
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -983,7 +983,7 @@
         write(_escape_cdata(elem.tail))
 
 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
-              "img", "input", "isindex", "link", "meta" "param")
+              "img", "input", "isindex", "link", "meta", "param")
 
 try:
     HTML_EMPTY = set(HTML_EMPTY)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,9 @@
 Library
 -------
 
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
 - Issue #15842: the SocketIO.{readable,writable,seekable} methods now
   raise ValueError when the file-like object is closed.  Patch by Alessandro
   Moura.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 19 07:26:43 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 19 Sep 2012 07:26:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1OTcwOiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XM8h3165MzQdT@mail.python.org>

http://hg.python.org/cpython/rev/19c74cadea95
changeset:   79052:19c74cadea95
parent:      79049:650e1857a91e
parent:      79051:17c528cff63f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Sep 19 08:25:01 2012 +0300
summary:
  #15970: merge with 3.2.

files:
  Lib/test/test_xml_etree.py   |  12 ++++++++++++
  Lib/xml/etree/ElementTree.py |   2 +-
  Misc/NEWS                    |   3 +++
  3 files changed, 16 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1809,6 +1809,18 @@
         mye = MyElement('joe')
         self.assertEqual(mye.newmethod(), 'joe')
 
+    def test_html_empty_elems_serialization(self):
+        # issue 15970
+        # from http://www.w3.org/TR/html401/index/elements.html
+        for element in ['AREA', 'BASE', 'BASEFONT', 'BR', 'COL', 'FRAME', 'HR',
+                        'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM']:
+            for elem in [element, element.lower()]:
+                expected = '<%s>' % elem
+                serialized = serialize(ET.XML('<%s />' % elem), method='html')
+                self.assertEqual(serialized, expected)
+                serialized = serialize(ET.XML('<%s></%s>' % (elem,elem)),
+                                       method='html')
+                self.assertEqual(serialized, expected)
 
 class ElementIterTest(unittest.TestCase):
     def _ilist(self, elem, tag=None):
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -995,7 +995,7 @@
         write(_escape_cdata(elem.tail))
 
 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
-              "img", "input", "isindex", "link", "meta" "param")
+              "img", "input", "isindex", "link", "meta", "param")
 
 try:
     HTML_EMPTY = set(HTML_EMPTY)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@
 Library
 -------
 
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
 - Issue #15842: the SocketIO.{readable,writable,seekable} methods now
   raise ValueError when the file-like object is closed.  Patch by Alessandro
   Moura.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 05:15:11 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 05:15:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_rst_markup?=
	=?utf-8?q?_in_timeit_docs=2E?=
Message-ID: <3XMjjq5BS4zQm1@mail.python.org>

http://hg.python.org/cpython/rev/e0c2bd9e0ac1
changeset:   79053:e0c2bd9e0ac1
branch:      2.7
parent:      79050:3498ffd3cdee
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 06:02:50 2012 +0300
summary:
  Fix rst markup in timeit docs.

files:
  Doc/library/timeit.rst |  30 +++++++++++++++---------------
  1 files changed, 15 insertions(+), 15 deletions(-)


diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -23,7 +23,7 @@
 The module defines the following public class:
 
 
-.. class:: Timer([stmt='pass' [, setup='pass' [, timer=<timer function>]]])
+.. class:: Timer(stmt='pass', setup='pass', timer=<timer function>)
 
    Class for timing execution speed of small code snippets.
 
@@ -33,18 +33,18 @@
    may also contain multiple statements separated by ``;`` or newlines, as long as
    they don't contain multi-line string literals.
 
-   To measure the execution time of the first statement, use the :meth:`timeit`
-   method.  The :meth:`repeat` method is a convenience to call :meth:`timeit`
+   To measure the execution time of the first statement, use the :meth:`Timer.timeit`
+   method.  The :meth:`repeat` method is a convenience to call :meth:`.timeit`
    multiple times and return a list of results.
 
    .. versionchanged:: 2.6
       The *stmt* and *setup* parameters can now also take objects that are callable
       without arguments. This will embed calls to them in a timer function that will
-      then be executed by :meth:`timeit`.  Note that the timing overhead is a little
-      larger in this case because of the extra function calls.
+      then be executed by :meth:`.timeit`.  Note that the timing overhead is a
+      little larger in this case because of the extra function calls.
 
 
-.. method:: Timer.print_exc([file=None])
+.. method:: Timer.print_exc(file=None)
 
    Helper to print a traceback from the timed code.
 
@@ -61,14 +61,14 @@
    traceback is sent; it defaults to ``sys.stderr``.
 
 
-.. method:: Timer.repeat([repeat=3 [, number=1000000]])
+.. method:: Timer.repeat(repeat=3, number=1000000)
 
-   Call :meth:`timeit` a few times.
+   Call :meth:`.timeit` a few times.
 
-   This is a convenience function that calls the :meth:`timeit` repeatedly,
+   This is a convenience function that calls the :meth:`.timeit` repeatedly,
    returning a list of results.  The first argument specifies how many times to
-   call :meth:`timeit`.  The second argument specifies the *number* argument for
-   :func:`timeit`.
+   call :meth:`.timeit`.  The second argument specifies the *number* argument for
+   :meth:`.timeit`.
 
    .. note::
 
@@ -82,7 +82,7 @@
       and apply common sense rather than statistics.
 
 
-.. method:: Timer.timeit([number=1000000])
+.. method:: Timer.timeit(number=1000000)
 
    Time *number* executions of the main statement. This executes the setup
    statement once, and then returns the time it takes to execute the main statement
@@ -92,7 +92,7 @@
 
    .. note::
 
-      By default, :meth:`timeit` temporarily turns off :term:`garbage collection`
+      By default, :meth:`.timeit` temporarily turns off :term:`garbage collection`
       during the timing.  The advantage of this approach is that it makes
       independent timings more comparable.  This disadvantage is that GC may be
       an important component of the performance of the function being measured.
@@ -126,7 +126,7 @@
 .. function:: timeit(stmt, setup='pass', timer=default_timer, number=1000000)
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
-   function and run its :meth:`timeit` method with *number* executions.
+   function and run its :meth:`.timeit` method with *number* executions.
 
    .. versionadded:: 2.6
 
@@ -248,7 +248,7 @@
    3.15 usec/pass
 
 To give the :mod:`timeit` module access to functions you define, you can pass a
-``setup`` parameter which contains an import statement::
+*setup* parameter which contains an import statement::
 
    def test():
        """Stupid test function"""

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 05:15:13 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 05:15:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_rst_markup?=
	=?utf-8?q?_in_timeit_docs=2E?=
Message-ID: <3XMjjs1PbczQlV@mail.python.org>

http://hg.python.org/cpython/rev/60d135893ee0
changeset:   79054:60d135893ee0
branch:      3.2
parent:      79051:17c528cff63f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 06:13:38 2012 +0300
summary:
  Fix rst markup in timeit docs.

files:
  Doc/library/timeit.rst |  20 ++++++++++----------
  1 files changed, 10 insertions(+), 10 deletions(-)


diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -31,13 +31,13 @@
    may also contain multiple statements separated by ``;`` or newlines, as long as
    they don't contain multi-line string literals.
 
-   To measure the execution time of the first statement, use the :meth:`timeit`
-   method.  The :meth:`repeat` method is a convenience to call :meth:`timeit`
+   To measure the execution time of the first statement, use the :meth:`Timer.timeit`
+   method.  The :meth:`repeat` method is a convenience to call :meth:`.timeit`
    multiple times and return a list of results.
 
    The *stmt* and *setup* parameters can also take objects that are callable
    without arguments. This will embed calls to them in a timer function that
-   will then be executed by :meth:`timeit`.  Note that the timing overhead is a
+   will then be executed by :meth:`.timeit`.  Note that the timing overhead is a
    little larger in this case because of the extra function calls.
 
 
@@ -60,12 +60,12 @@
 
 .. method:: Timer.repeat(repeat=3, number=1000000)
 
-   Call :meth:`timeit` a few times.
+   Call :meth:`.timeit` a few times.
 
-   This is a convenience function that calls the :meth:`timeit` repeatedly,
+   This is a convenience function that calls the :meth:`.timeit` repeatedly,
    returning a list of results.  The first argument specifies how many times to
-   call :meth:`timeit`.  The second argument specifies the *number* argument for
-   :func:`timeit`.
+   call :meth:`.timeit`.  The second argument specifies the *number* argument for
+   :meth:`.timeit`.
 
    .. note::
 
@@ -89,7 +89,7 @@
 
    .. note::
 
-      By default, :meth:`timeit` temporarily turns off :term:`garbage collection`
+      By default, :meth:`.timeit` temporarily turns off :term:`garbage collection`
       during the timing.  The advantage of this approach is that it makes
       independent timings more comparable.  This disadvantage is that GC may be
       an important component of the performance of the function being measured.
@@ -123,7 +123,7 @@
 .. function:: timeit(stmt='pass', setup='pass', timer=<default timer>, number=1000000)
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
-   function and run its :meth:`timeit` method with *number* executions.
+   function and run its :meth:`.timeit` method with *number* executions.
 
 
 Command Line Interface
@@ -243,7 +243,7 @@
    3.15 usec/pass
 
 To give the :mod:`timeit` module access to functions you define, you can pass a
-``setup`` parameter which contains an import statement::
+*setup* parameter which contains an import statement::
 
    def test():
        """Stupid test function"""

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 05:15:14 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 05:15:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_rst_markup_fixes_in_timeit_docs_with_3=2E2=2E?=
Message-ID: <3XMjjt46fpzQm3@mail.python.org>

http://hg.python.org/cpython/rev/187ab9195462
changeset:   79055:187ab9195462
parent:      79052:19c74cadea95
parent:      79054:60d135893ee0
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 06:14:54 2012 +0300
summary:
  Merge rst markup fixes in timeit docs with 3.2.

files:
  Doc/library/timeit.rst |  20 ++++++++++----------
  1 files changed, 10 insertions(+), 10 deletions(-)


diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -31,13 +31,13 @@
    may also contain multiple statements separated by ``;`` or newlines, as long as
    they don't contain multi-line string literals.
 
-   To measure the execution time of the first statement, use the :meth:`timeit`
-   method.  The :meth:`repeat` method is a convenience to call :meth:`timeit`
+   To measure the execution time of the first statement, use the :meth:`Timer.timeit`
+   method.  The :meth:`repeat` method is a convenience to call :meth:`.timeit`
    multiple times and return a list of results.
 
    The *stmt* and *setup* parameters can also take objects that are callable
    without arguments. This will embed calls to them in a timer function that
-   will then be executed by :meth:`timeit`.  Note that the timing overhead is a
+   will then be executed by :meth:`.timeit`.  Note that the timing overhead is a
    little larger in this case because of the extra function calls.
 
 
@@ -60,12 +60,12 @@
 
 .. method:: Timer.repeat(repeat=3, number=1000000)
 
-   Call :meth:`timeit` a few times.
+   Call :meth:`.timeit` a few times.
 
-   This is a convenience function that calls the :meth:`timeit` repeatedly,
+   This is a convenience function that calls the :meth:`.timeit` repeatedly,
    returning a list of results.  The first argument specifies how many times to
-   call :meth:`timeit`.  The second argument specifies the *number* argument for
-   :func:`timeit`.
+   call :meth:`.timeit`.  The second argument specifies the *number* argument for
+   :meth:`.timeit`.
 
    .. note::
 
@@ -89,7 +89,7 @@
 
    .. note::
 
-      By default, :meth:`timeit` temporarily turns off :term:`garbage collection`
+      By default, :meth:`.timeit` temporarily turns off :term:`garbage collection`
       during the timing.  The advantage of this approach is that it makes
       independent timings more comparable.  This disadvantage is that GC may be
       an important component of the performance of the function being measured.
@@ -117,7 +117,7 @@
 .. function:: timeit(stmt='pass', setup='pass', timer=<default timer>, number=1000000)
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
-   function and run its :meth:`timeit` method with *number* executions.
+   function and run its :meth:`.timeit` method with *number* executions.
 
 
 Command Line Interface
@@ -243,7 +243,7 @@
    3.15 usec/pass
 
 To give the :mod:`timeit` module access to functions you define, you can pass a
-``setup`` parameter which contains an import statement::
+*setup* parameter which contains an import statement::
 
    def test():
        """Stupid test function"""

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Thu Sep 20 06:06:02 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 20 Sep 2012 06:06:02 +0200
Subject: [Python-checkins] Daily reference leaks (19c74cadea95): sum=0
Message-ID: <E1TEY1a-0007Xc-E4@ap.vmr.nerim.net>

results for 19c74cadea95 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogRTbSxR', '-x']

From python-checkins at python.org  Thu Sep 20 06:43:16 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 06:43:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_=2314873=3A_add_paragraph?=
 =?utf-8?q?_about_building_errors_caused_by_missing_dependencies_on?=
Message-ID: <3XMlgS06sqzQmw@mail.python.org>

http://hg.python.org/devguide/rev/a9f8a205fa9a
changeset:   550:a9f8a205fa9a
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 07:42:58 2012 +0300
summary:
  #14873: add paragraph about building errors caused by missing dependencies on Windows.  Patch by Chris Jerdonek, initial patch by Merlijn van Deen.

files:
  setup.rst |  19 +++++++++++++------
  1 files changed, 13 insertions(+), 6 deletions(-)


diff --git a/setup.rst b/setup.rst
--- a/setup.rst
+++ b/setup.rst
@@ -192,15 +192,22 @@
 Regardless of Visual Studio version, the ``PCbuild`` directory of a source
 checkout contains the build files for the Python version you are building.
 The full version of Visual Studio is not necessary for common tasks with
-32-bit builds; the gratis C++ Express versions linked above are sufficient. 
+32-bit builds; the gratis C++ Express versions linked above are sufficient.
 The limitations of the Express versions are given at
 http://msdn.microsoft.com/en-us/library/hs24szh9%28v=VS.90%29.aspx .
 
-To build from the Visual Studio GUI, open pcbuild.sln to load the project
-files and choose the Build Solution option from either the Build or Debug menu
-(depending on your Visual Studio version), which is often
-associated with the F7 key. Make sure you have chosen the "Debug" option from
-the "Solution Configurations" drop-down on the toolbar first.
+To build from the Visual Studio GUI, open the ``pcbuild.sln`` solution file
+with Visual Studio.  Choose the :menuselection:`Build Solution` option
+under the :menuselection:`Build` or :menuselection:`Debug` menu
+(depending on your version of Visual Studio).  Be sure that "Debug" was
+chosen as the active solution configuration (e.g. under
+:menuselection:`Build --> Configuration Manager...`).
+
+When building you may see a number of build errors related to missing
+files or directories.  These do not necessarily mean that Python failed
+to build.  If you prefer, you can exclude the offending projects from
+the build process by unchecking them inside the
+:menuselection:`Build --> Configuration Manager...` settings.
 
 Once built you might want to set Python as a startup project. Pressing F5 in
 Visual Studio, or choosing Start Debugging from the Debug menu, will launch

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Thu Sep 20 06:46:19 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 06:46:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_missing_space=2E?=
Message-ID: <3XMlkz206xzQlf@mail.python.org>

http://hg.python.org/devguide/rev/308e8d6d20ed
changeset:   551:308e8d6d20ed
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 07:46:03 2012 +0300
summary:
  Add missing space.

files:
  faq.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -307,7 +307,7 @@
 Note that, due to some previously built executables being used as a part of
 the build process, you may sometimes run into issues when attempting to
 switch between Python 2.x and Python 3.x branches. In these cases, it is
-best to run a ``make distclean``to ensure that all previously built files
+best to run a ``make distclean`` to ensure that all previously built files
 are removed.
 
 

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Thu Sep 20 07:34:07 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 07:34:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_rst_markup=2E?=
Message-ID: <3XMmp72GkxzQ9Y@mail.python.org>

http://hg.python.org/cpython/rev/0cd29947ba15
changeset:   79056:0cd29947ba15
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 08:33:53 2012 +0300
summary:
  Fix rst markup.

files:
  Doc/c-api/import.rst |  2 +-
  Doc/whatsnew/3.3.rst |  6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
--- a/Doc/c-api/import.rst
+++ b/Doc/c-api/import.rst
@@ -76,7 +76,7 @@
    UTF-8 encoded string instead of a Unicode object.
 
    .. versionchanged:: 3.3
-         Negative values for **level** are no longer accepted.
+         Negative values for *level* are no longer accepted.
 
 .. c:function:: PyObject* PyImport_Import(PyObject *name)
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1928,7 +1928,7 @@
   updated to use the full name of the module instead of just the tail of the
   name.
 
-* The **index** argument to :func:`__import__` now defaults to 0 instead of -1
+* The *index* argument to :func:`__import__` now defaults to 0 instead of -1
   and no longer support negative values. It was an oversight when :pep:`328` was
   implemented that the default value remained -1. If you need to continue to
   perform a relative import followed by an absolute import, then perform the
@@ -1996,9 +1996,9 @@
 
 * :c:func:`PyImport_GetMagicNumber` now returns -1 upon failure.
 
-* As a negative value for the **level** argument to :func:`__import__` is no
+* As a negative value for the *level* argument to :func:`__import__` is no
   longer valid, the same now holds for :c:func:`PyImport_ImportModuleLevel`.
-  This also means that the value of **level** used by
+  This also means that the value of *level* used by
   :c:func:`PyImport_ImportModuleEx` is now 0 instead of -1.
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 07:46:38 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 07:46:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Update_suspicious_ignore_f?=
	=?utf-8?q?ile=2E?=
Message-ID: <3XMn4Z5fpxzQkn@mail.python.org>

http://hg.python.org/cpython/rev/3ce8b2700de4
changeset:   79057:3ce8b2700de4
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 08:46:06 2012 +0300
summary:
  Update suspicious ignore file.

files:
  Doc/tools/sphinxext/susp-ignored.csv |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -124,9 +124,8 @@
 library/functions,,:stop,"a[start:stop, i]"
 library/functions,,:stop,a[start:stop:step]
 library/hotshot,,:lineno,"ncalls  tottime  percall  cumtime  percall filename:lineno(function)"
-library/http.client,52,:port,host:port
+library/http.client,,:port,host:port
 library/http.cookies,,`,!#$%&'*+-.^_`|~:
-library/httplib,,:port,host:port
 library/imaplib,,:MM,"""DD-Mmm-YYYY HH:MM:SS"
 library/imaplib,,:SS,"""DD-Mmm-YYYY HH:MM:SS"
 library/inspect,,:int,">>> def foo(a, *, b:int, **kwargs):"

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 08:09:40 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 08:09:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_markup_in_?=
	=?utf-8?q?smtpd=2Erst=2E?=
Message-ID: <3XMnb82d85zNJg@mail.python.org>

http://hg.python.org/cpython/rev/c74203b33c4e
changeset:   79058:c74203b33c4e
branch:      3.2
parent:      79054:60d135893ee0
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 09:06:51 2012 +0300
summary:
  Fix markup in smtpd.rst.

files:
  Doc/library/smtpd.rst |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -104,12 +104,13 @@
    .. attribute:: addr
 
       Holds the address of the client, the second value returned by
-      socket.accept()
+      :func:`socket.accept <socket.socket.accept>`
 
    .. attribute:: received_lines
 
       Holds a list of the line strings (decoded using UTF-8) received from
-      the client. The lines have their "\\r\\n" line ending translated to "\\n".
+      the client. The lines have their ``"\r\n"`` line ending translated to
+      ``"\n"``.
 
    .. attribute:: smtp_state
 
@@ -134,12 +135,12 @@
    .. attribute:: received_data
 
       Holds a string containing all of the data sent by the client during the
-      DATA state, up to but not including the terminating "\r\n.\r\n".
+      DATA state, up to but not including the terminating ``"\r\n.\r\n"``.
 
    .. attribute:: fqdn
 
       Holds the fully-qualified domain name of the server as returned by
-      ``socket.getfqdn()``.
+      :func:`socket.getfqdn`.
 
    .. attribute:: peer
 
@@ -166,5 +167,5 @@
             :attr:`received_data`, but not the greeting.
    DATA     Sets the internal state to :attr:`DATA` and stores remaining lines
             from the client in :attr:`received_data` until the terminator
-            "\r\n.\r\n" is received.
+            ``"\r\n.\r\n"`` is received.
    ======== ===================================================================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 08:09:43 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 08:09:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_markup_fixes_in_smtpd=2Erst_with_3=2E2=2E?=
Message-ID: <3XMnbC0hxnzQhm@mail.python.org>

http://hg.python.org/cpython/rev/2ac0ac77390f
changeset:   79059:2ac0ac77390f
parent:      79057:3ce8b2700de4
parent:      79058:c74203b33c4e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 09:09:24 2012 +0300
summary:
  Merge markup fixes in smtpd.rst with 3.2.

files:
  Doc/library/smtpd.rst |  13 +++++++------
  1 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -111,12 +111,13 @@
    .. attribute:: addr
 
       Holds the address of the client, the second value returned by
-      socket.accept()
+      :func:`socket.accept <socket.socket.accept>`
 
    .. attribute:: received_lines
 
       Holds a list of the line strings (decoded using UTF-8) received from
-      the client. The lines have their "\\r\\n" line ending translated to "\\n".
+      the client. The lines have their ``"\r\n"`` line ending translated to
+      ``"\n"``.
 
    .. attribute:: smtp_state
 
@@ -141,12 +142,12 @@
    .. attribute:: received_data
 
       Holds a string containing all of the data sent by the client during the
-      DATA state, up to but not including the terminating "\r\n.\r\n".
+      DATA state, up to but not including the terminating ``"\r\n.\r\n"``.
 
    .. attribute:: fqdn
 
       Holds the fully-qualified domain name of the server as returned by
-      ``socket.getfqdn()``.
+      :func:`socket.getfqdn`.
 
    .. attribute:: peer
 
@@ -170,14 +171,14 @@
    MAIL     Accepts the "MAIL FROM:" syntax and stores the supplied address as
             :attr:`mailfrom`.  In extended command mode, accepts the
             :rfc:`1870` SIZE attribute and responds appropriately based on the
-            value of ``data_size_limit``.
+            value of *data_size_limit*.
    RCPT     Accepts the "RCPT TO:" syntax and stores the supplied addresses in
             the :attr:`rcpttos` list.
    RSET     Resets the :attr:`mailfrom`, :attr:`rcpttos`, and
             :attr:`received_data`, but not the greeting.
    DATA     Sets the internal state to :attr:`DATA` and stores remaining lines
             from the client in :attr:`received_data` until the terminator
-            "\r\n.\r\n" is received.
+            ``"\r\n.\r\n"`` is received.
    HELP     Returns minimal information on command syntax
    VRFY     Returns code 252 (the server doesn't know if the address is valid)
    EXPN     Reports that the command is not implemented.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 08:49:07 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 08:49:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fix_a_few_quot?=
	=?utf-8?q?es/backslashes=2E?=
Message-ID: <3XMpSg2zNXzQkQ@mail.python.org>

http://hg.python.org/cpython/rev/786aa16aeda5
changeset:   79060:786aa16aeda5
branch:      3.2
parent:      79058:c74203b33c4e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 09:47:03 2012 +0300
summary:
  Fix a few quotes/backslashes.

files:
  Doc/faq/windows.rst     |  10 +++++-----
  Doc/library/doctest.rst |   2 +-
  Doc/library/pyexpat.rst |   2 +-
  3 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -464,13 +464,13 @@
 Why does os.path.isdir() fail on NT shared directories?
 -------------------------------------------------------
 
-The solution appears to be always append the "\\" on the end of shared
-drives.
+In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
+end of the shared drive::
 
    >>> import os
-   >>> os.path.isdir( '\\\\rorschach\\public')
+   >>> os.path.isdir('\\\\rorschach\\public')
    0
-   >>> os.path.isdir( '\\\\rorschach\\public\\')
+   >>> os.path.isdir('\\\\rorschach\\public\\')
    1
 
 It helps to think of share points as being like drive letters.  Example::
@@ -480,7 +480,7 @@
    k:\media is a directory
    k:\media\ is not a directory
 
-The same rules apply if you substitute "k:" with "\\conky\foo"::
+The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
 
    \\conky\foo  is not a directory
    \\conky\foo\ is a directory
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -338,7 +338,7 @@
      Backslashes in a raw docstring: m\n
 
   Otherwise, the backslash will be interpreted as part of the string. For example,
-  the "\\" above would be interpreted as a newline character.  Alternatively, you
+  the ``\n`` above would be interpreted as a newline character.  Alternatively, you
   can double each backslash in the doctest version (and not use a raw string)::
 
      >>> def f(x):
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -402,7 +402,7 @@
 .. method:: xmlparser.CommentHandler(data)
 
    Called for comments.  *data* is the text of the comment, excluding the leading
-   '``<!-``\ ``-``' and trailing '``-``\ ``->``'.
+   ``'<!-``\ ``-'`` and trailing ``'-``\ ``->'``.
 
 
 .. method:: xmlparser.StartCdataSectionHandler()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 08:49:09 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 08:49:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_the_quotes/backslashes_fixes_with_3=2E2=2E?=
Message-ID: <3XMpSj1BfGzQl7@mail.python.org>

http://hg.python.org/cpython/rev/ddec854843f1
changeset:   79061:ddec854843f1
parent:      79059:2ac0ac77390f
parent:      79060:786aa16aeda5
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 09:47:41 2012 +0300
summary:
  Merge the quotes/backslashes fixes with 3.2.

files:
  Doc/faq/windows.rst     |  10 +++++-----
  Doc/library/doctest.rst |   2 +-
  Doc/library/pyexpat.rst |   2 +-
  3 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -464,13 +464,13 @@
 Why does os.path.isdir() fail on NT shared directories?
 -------------------------------------------------------
 
-The solution appears to be always append the "\\" on the end of shared
-drives.
+In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
+end of the shared drive::
 
    >>> import os
-   >>> os.path.isdir( '\\\\rorschach\\public')
+   >>> os.path.isdir('\\\\rorschach\\public')
    0
-   >>> os.path.isdir( '\\\\rorschach\\public\\')
+   >>> os.path.isdir('\\\\rorschach\\public\\')
    1
 
 It helps to think of share points as being like drive letters.  Example::
@@ -480,7 +480,7 @@
    k:\media is a directory
    k:\media\ is not a directory
 
-The same rules apply if you substitute "k:" with "\\conky\foo"::
+The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
 
    \\conky\foo  is not a directory
    \\conky\foo\ is a directory
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -338,7 +338,7 @@
      Backslashes in a raw docstring: m\n
 
   Otherwise, the backslash will be interpreted as part of the string. For example,
-  the "\\" above would be interpreted as a newline character.  Alternatively, you
+  the ``\n`` above would be interpreted as a newline character.  Alternatively, you
   can double each backslash in the doctest version (and not use a raw string)::
 
      >>> def f(x):
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -402,7 +402,7 @@
 .. method:: xmlparser.CommentHandler(data)
 
    Called for comments.  *data* is the text of the comment, excluding the leading
-   '``<!-``\ ``-``' and trailing '``-``\ ``->``'.
+   ``'<!-``\ ``-'`` and trailing ``'-``\ ``->'``.
 
 
 .. method:: xmlparser.StartCdataSectionHandler()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 08:49:10 2012
From: python-checkins at python.org (ezio.melotti)
Date: Thu, 20 Sep 2012 08:49:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Fix_a_few_quot?=
	=?utf-8?q?es/backslashes=2E?=
Message-ID: <3XMpSk5FtHzQlD@mail.python.org>

http://hg.python.org/cpython/rev/1a61c56050e4
changeset:   79062:1a61c56050e4
branch:      2.7
parent:      79053:e0c2bd9e0ac1
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu Sep 20 09:48:07 2012 +0300
summary:
  Fix a few quotes/backslashes.

files:
  Doc/faq/windows.rst     |  10 +++++-----
  Doc/library/doctest.rst |   2 +-
  Doc/library/pyexpat.rst |   2 +-
  3 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -460,13 +460,13 @@
 Why does os.path.isdir() fail on NT shared directories?
 -------------------------------------------------------
 
-The solution appears to be always append the "\\" on the end of shared
-drives.
+In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
+end of the shared drive::
 
    >>> import os
-   >>> os.path.isdir( '\\\\rorschach\\public')
+   >>> os.path.isdir('\\\\rorschach\\public')
    0
-   >>> os.path.isdir( '\\\\rorschach\\public\\')
+   >>> os.path.isdir('\\\\rorschach\\public\\')
    1
 
 It helps to think of share points as being like drive letters.  Example::
@@ -476,7 +476,7 @@
    k:\media is a directory
    k:\media\ is not a directory
 
-The same rules apply if you substitute "k:" with "\\conky\foo"::
+The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
 
    \\conky\foo  is not a directory
    \\conky\foo\ is a directory
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -363,7 +363,7 @@
      Backslashes in a raw docstring: m\n
 
   Otherwise, the backslash will be interpreted as part of the string. For example,
-  the "\\" above would be interpreted as a newline character.  Alternatively, you
+  the ``\n`` above would be interpreted as a newline character.  Alternatively, you
   can double each backslash in the doctest version (and not use a raw string)::
 
      >>> def f(x):
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -437,7 +437,7 @@
 .. method:: xmlparser.CommentHandler(data)
 
    Called for comments.  *data* is the text of the comment, excluding the leading
-   '``<!-``\ ``-``' and trailing '``-``\ ``->``'.
+   ``'<!-``\ ``-'`` and trailing ``'-``\ ``->'``.
 
 
 .. method:: xmlparser.StartCdataSectionHandler()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 12:43:57 2012
From: python-checkins at python.org (christian.heimes)
Date: Thu, 20 Sep 2012 12:43:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315977=3A_Fix_memo?=
 =?utf-8?q?ry_leak_in_Modules/=5Fssl=2Ec_when_the_function?=
Message-ID: <3XMvgd015wzNQw@mail.python.org>

http://hg.python.org/cpython/rev/2bdc8c8ea42e
changeset:   79063:2bdc8c8ea42e
parent:      79042:c6892ce7e56f
user:        Christian Heimes <christian at cheimes.de>
date:        Thu Sep 20 12:42:54 2012 +0200
summary:
  Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols() is called multiple times

files:
  Misc/NEWS      |  3 +++
  Modules/_ssl.c |  7 +++++++
  2 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,9 @@
 Extension Modules
 -----------------
 
+- Issue #15977: Fix memory leak in Modules/_ssl.c when the function
+  _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
+
 Tests
 -----
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1713,6 +1713,9 @@
         return NULL;
     }
     self->ctx = ctx;
+#ifdef OPENSSL_NPN_NEGOTIATED
+    self->npn_protocols = NULL;
+#endif
     /* Defaults */
     SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL);
     SSL_CTX_set_options(self->ctx,
@@ -1812,6 +1815,10 @@
     if (!PyArg_ParseTuple(args, "y*:set_npn_protocols", &protos))
         return NULL;
 
+    if (self->npn_protocols != NULL) {
+        PyMem_Free(self->npn_protocols);
+    }
+
     self->npn_protocols = PyMem_Malloc(protos.len);
     if (self->npn_protocols == NULL) {
         PyBuffer_Release(&protos);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 12:43:58 2012
From: python-checkins at python.org (christian.heimes)
Date: Thu, 20 Sep 2012 12:43:58 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3XMvgf6dMTzQl5@mail.python.org>

http://hg.python.org/cpython/rev/dcced3bd22fe
changeset:   79064:dcced3bd22fe
parent:      79063:2bdc8c8ea42e
parent:      79061:ddec854843f1
user:        Christian Heimes <christian at cheimes.de>
date:        Thu Sep 20 12:43:24 2012 +0200
summary:
  merge

files:
  Doc/c-api/import.rst                 |   2 +-
  Doc/faq/windows.rst                  |  10 ++++----
  Doc/library/doctest.rst              |   2 +-
  Doc/library/pyexpat.rst              |   2 +-
  Doc/library/smtpd.rst                |  13 +++++----
  Doc/library/timeit.rst               |  20 ++++++++--------
  Doc/tools/sphinxext/susp-ignored.csv |   3 +-
  Doc/whatsnew/3.3.rst                 |   9 ++++---
  Lib/test/test_xml_etree.py           |  12 +++++++++
  Lib/xml/etree/ElementTree.py         |   2 +-
  Misc/NEWS                            |   6 ++++
  Modules/_io/_iomodule.c              |   2 +-
  Modules/_io/iobase.c                 |   2 +-
  Modules/_io/textio.c                 |   2 +-
  Modules/posixmodule.c                |   9 ++++++-
  Objects/typeobject.c                 |   6 ++--
  16 files changed, 64 insertions(+), 38 deletions(-)


diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
--- a/Doc/c-api/import.rst
+++ b/Doc/c-api/import.rst
@@ -76,7 +76,7 @@
    UTF-8 encoded string instead of a Unicode object.
 
    .. versionchanged:: 3.3
-         Negative values for **level** are no longer accepted.
+         Negative values for *level* are no longer accepted.
 
 .. c:function:: PyObject* PyImport_Import(PyObject *name)
 
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -464,13 +464,13 @@
 Why does os.path.isdir() fail on NT shared directories?
 -------------------------------------------------------
 
-The solution appears to be always append the "\\" on the end of shared
-drives.
+In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
+end of the shared drive::
 
    >>> import os
-   >>> os.path.isdir( '\\\\rorschach\\public')
+   >>> os.path.isdir('\\\\rorschach\\public')
    0
-   >>> os.path.isdir( '\\\\rorschach\\public\\')
+   >>> os.path.isdir('\\\\rorschach\\public\\')
    1
 
 It helps to think of share points as being like drive letters.  Example::
@@ -480,7 +480,7 @@
    k:\media is a directory
    k:\media\ is not a directory
 
-The same rules apply if you substitute "k:" with "\\conky\foo"::
+The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
 
    \\conky\foo  is not a directory
    \\conky\foo\ is a directory
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -338,7 +338,7 @@
      Backslashes in a raw docstring: m\n
 
   Otherwise, the backslash will be interpreted as part of the string. For example,
-  the "\\" above would be interpreted as a newline character.  Alternatively, you
+  the ``\n`` above would be interpreted as a newline character.  Alternatively, you
   can double each backslash in the doctest version (and not use a raw string)::
 
      >>> def f(x):
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -402,7 +402,7 @@
 .. method:: xmlparser.CommentHandler(data)
 
    Called for comments.  *data* is the text of the comment, excluding the leading
-   '``<!-``\ ``-``' and trailing '``-``\ ``->``'.
+   ``'<!-``\ ``-'`` and trailing ``'-``\ ``->'``.
 
 
 .. method:: xmlparser.StartCdataSectionHandler()
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -111,12 +111,13 @@
    .. attribute:: addr
 
       Holds the address of the client, the second value returned by
-      socket.accept()
+      :func:`socket.accept <socket.socket.accept>`
 
    .. attribute:: received_lines
 
       Holds a list of the line strings (decoded using UTF-8) received from
-      the client. The lines have their "\\r\\n" line ending translated to "\\n".
+      the client. The lines have their ``"\r\n"`` line ending translated to
+      ``"\n"``.
 
    .. attribute:: smtp_state
 
@@ -141,12 +142,12 @@
    .. attribute:: received_data
 
       Holds a string containing all of the data sent by the client during the
-      DATA state, up to but not including the terminating "\r\n.\r\n".
+      DATA state, up to but not including the terminating ``"\r\n.\r\n"``.
 
    .. attribute:: fqdn
 
       Holds the fully-qualified domain name of the server as returned by
-      ``socket.getfqdn()``.
+      :func:`socket.getfqdn`.
 
    .. attribute:: peer
 
@@ -170,14 +171,14 @@
    MAIL     Accepts the "MAIL FROM:" syntax and stores the supplied address as
             :attr:`mailfrom`.  In extended command mode, accepts the
             :rfc:`1870` SIZE attribute and responds appropriately based on the
-            value of ``data_size_limit``.
+            value of *data_size_limit*.
    RCPT     Accepts the "RCPT TO:" syntax and stores the supplied addresses in
             the :attr:`rcpttos` list.
    RSET     Resets the :attr:`mailfrom`, :attr:`rcpttos`, and
             :attr:`received_data`, but not the greeting.
    DATA     Sets the internal state to :attr:`DATA` and stores remaining lines
             from the client in :attr:`received_data` until the terminator
-            "\r\n.\r\n" is received.
+            ``"\r\n.\r\n"`` is received.
    HELP     Returns minimal information on command syntax
    VRFY     Returns code 252 (the server doesn't know if the address is valid)
    EXPN     Reports that the command is not implemented.
diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -31,13 +31,13 @@
    may also contain multiple statements separated by ``;`` or newlines, as long as
    they don't contain multi-line string literals.
 
-   To measure the execution time of the first statement, use the :meth:`timeit`
-   method.  The :meth:`repeat` method is a convenience to call :meth:`timeit`
+   To measure the execution time of the first statement, use the :meth:`Timer.timeit`
+   method.  The :meth:`repeat` method is a convenience to call :meth:`.timeit`
    multiple times and return a list of results.
 
    The *stmt* and *setup* parameters can also take objects that are callable
    without arguments. This will embed calls to them in a timer function that
-   will then be executed by :meth:`timeit`.  Note that the timing overhead is a
+   will then be executed by :meth:`.timeit`.  Note that the timing overhead is a
    little larger in this case because of the extra function calls.
 
 
@@ -60,12 +60,12 @@
 
 .. method:: Timer.repeat(repeat=3, number=1000000)
 
-   Call :meth:`timeit` a few times.
+   Call :meth:`.timeit` a few times.
 
-   This is a convenience function that calls the :meth:`timeit` repeatedly,
+   This is a convenience function that calls the :meth:`.timeit` repeatedly,
    returning a list of results.  The first argument specifies how many times to
-   call :meth:`timeit`.  The second argument specifies the *number* argument for
-   :func:`timeit`.
+   call :meth:`.timeit`.  The second argument specifies the *number* argument for
+   :meth:`.timeit`.
 
    .. note::
 
@@ -89,7 +89,7 @@
 
    .. note::
 
-      By default, :meth:`timeit` temporarily turns off :term:`garbage collection`
+      By default, :meth:`.timeit` temporarily turns off :term:`garbage collection`
       during the timing.  The advantage of this approach is that it makes
       independent timings more comparable.  This disadvantage is that GC may be
       an important component of the performance of the function being measured.
@@ -117,7 +117,7 @@
 .. function:: timeit(stmt='pass', setup='pass', timer=<default timer>, number=1000000)
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
-   function and run its :meth:`timeit` method with *number* executions.
+   function and run its :meth:`.timeit` method with *number* executions.
 
 
 Command Line Interface
@@ -243,7 +243,7 @@
    3.15 usec/pass
 
 To give the :mod:`timeit` module access to functions you define, you can pass a
-``setup`` parameter which contains an import statement::
+*setup* parameter which contains an import statement::
 
    def test():
        """Stupid test function"""
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -124,9 +124,8 @@
 library/functions,,:stop,"a[start:stop, i]"
 library/functions,,:stop,a[start:stop:step]
 library/hotshot,,:lineno,"ncalls  tottime  percall  cumtime  percall filename:lineno(function)"
-library/http.client,52,:port,host:port
+library/http.client,,:port,host:port
 library/http.cookies,,`,!#$%&'*+-.^_`|~:
-library/httplib,,:port,host:port
 library/imaplib,,:MM,"""DD-Mmm-YYYY HH:MM:SS"
 library/imaplib,,:SS,"""DD-Mmm-YYYY HH:MM:SS"
 library/inspect,,:int,">>> def foo(a, *, b:int, **kwargs):"
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -69,6 +69,7 @@
 * :mod:`faulthandler` (helps debugging low-level crashes)
 * :mod:`ipaddress` (high-level objects representing IP addresses and masks)
 * :mod:`lzma` (compress data using the XZ / LZMA algorithm)
+* :mod:`unittest.mock` (replace parts of your system under test with mock objects)
 * :mod:`venv` (Python :ref:`virtual environments <pep-405>`, as in the
   popular ``virtualenv`` package)
 
@@ -923,7 +924,7 @@
 faulthandler
 ------------
 
-This new debug module contains functions to dump Python tracebacks explicitly,
+This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
 on a fault (a crash like a segmentation fault), after a timeout, or on a user
 signal. Call :func:`faulthandler.enable` to install fault handlers for the
 :const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
@@ -1927,7 +1928,7 @@
   updated to use the full name of the module instead of just the tail of the
   name.
 
-* The **index** argument to :func:`__import__` now defaults to 0 instead of -1
+* The *index* argument to :func:`__import__` now defaults to 0 instead of -1
   and no longer support negative values. It was an oversight when :pep:`328` was
   implemented that the default value remained -1. If you need to continue to
   perform a relative import followed by an absolute import, then perform the
@@ -1995,9 +1996,9 @@
 
 * :c:func:`PyImport_GetMagicNumber` now returns -1 upon failure.
 
-* As a negative value for the **level** argument to :func:`__import__` is no
+* As a negative value for the *level* argument to :func:`__import__` is no
   longer valid, the same now holds for :c:func:`PyImport_ImportModuleLevel`.
-  This also means that the value of **level** used by
+  This also means that the value of *level* used by
   :c:func:`PyImport_ImportModuleEx` is now 0 instead of -1.
 
 
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1809,6 +1809,18 @@
         mye = MyElement('joe')
         self.assertEqual(mye.newmethod(), 'joe')
 
+    def test_html_empty_elems_serialization(self):
+        # issue 15970
+        # from http://www.w3.org/TR/html401/index/elements.html
+        for element in ['AREA', 'BASE', 'BASEFONT', 'BR', 'COL', 'FRAME', 'HR',
+                        'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM']:
+            for elem in [element, element.lower()]:
+                expected = '<%s>' % elem
+                serialized = serialize(ET.XML('<%s />' % elem), method='html')
+                self.assertEqual(serialized, expected)
+                serialized = serialize(ET.XML('<%s></%s>' % (elem,elem)),
+                                       method='html')
+                self.assertEqual(serialized, expected)
 
 class ElementIterTest(unittest.TestCase):
     def _ilist(self, elem, tag=None):
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -995,7 +995,7 @@
         write(_escape_cdata(elem.tail))
 
 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
-              "img", "input", "isindex", "link", "meta" "param")
+              "img", "input", "isindex", "link", "meta", "param")
 
 try:
     HTML_EMPTY = set(HTML_EMPTY)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
+  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
+
 - Issue #15926: Fix crash after multiple reinitializations of the interpreter.
 
 - Issue #15895: Fix FILE pointer leak in one error branch of
@@ -29,6 +32,9 @@
 Library
 -------
 
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
 - Issue #15842: the SocketIO.{readable,writable,seekable} methods now
   raise ValueError when the file-like object is closed.  Patch by Alessandro
   Moura.
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -185,7 +185,7 @@
 "\n"
 "* On output, if newline is None, any '\\n' characters written are\n"
 "  translated to the system default line separator, os.linesep. If\n"
-"  newline is '' or '\n', no translation takes place. If newline is any\n"
+"  newline is '' or '\\n', no translation takes place. If newline is any\n"
 "  of the other legal values, any '\\n' characters written are translated\n"
 "  to the given string.\n"
 "\n"
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -442,7 +442,7 @@
     "\n"
     "If limit is specified, at most limit bytes will be read.\n"
     "\n"
-    "The line terminator is always b'\n' for binary files; for text\n"
+    "The line terminator is always b'\\n' for binary files; for text\n"
     "files, the newlines argument to open can be used to select the line\n"
     "terminator(s) recognized.\n");
 
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -648,7 +648,7 @@
     "\n"
     "* On output, if newline is None, any '\\n' characters written are\n"
     "  translated to the system default line separator, os.linesep. If\n"
-    "  newline is '' or '\n', no translation takes place. If newline is any\n"
+    "  newline is '' or '\\n', no translation takes place. If newline is any\n"
     "  of the other legal values, any '\\n' characters written are translated\n"
     "  to the given string.\n"
     "\n"
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -414,7 +414,14 @@
 
 
 #ifdef AT_FDCWD
-#define DEFAULT_DIR_FD AT_FDCWD
+/*
+ * Why the (int) cast?  Solaris 10 defines AT_FDCWD as 0xffd19553 (-3041965);
+ * without the int cast, the value gets interpreted as uint (4291925331),
+ * which doesn't play nicely with all the initializer lines in this file that
+ * look like this:
+ *      int dir_fd = DEFAULT_DIR_FD;
+ */
+#define DEFAULT_DIR_FD (int)AT_FDCWD
 #else
 #define DEFAULT_DIR_FD (-100)
 #endif
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -5992,7 +5992,7 @@
         descr = _PyType_Lookup(type, p->name_strobj);
         if (descr == NULL) {
             if (ptr == (void**)&type->tp_iternext) {
-                specific = _PyObject_NextNotImplemented;
+                specific = (void *)_PyObject_NextNotImplemented;
             }
             continue;
         }
@@ -6039,7 +6039,7 @@
             /* We specifically allow __hash__ to be set to None
                to prevent inheritance of the default
                implementation from object.__hash__ */
-            specific = PyObject_HashNotImplemented;
+            specific = (void *)PyObject_HashNotImplemented;
         }
         else {
             use_generic = 1;
@@ -6254,7 +6254,7 @@
             continue;
         if (PyDict_GetItem(dict, p->name_strobj))
             continue;
-        if (*ptr == PyObject_HashNotImplemented) {
+        if (*ptr == (void *)PyObject_HashNotImplemented) {
             /* Classes may prevent the inheritance of the tp_hash
                slot by storing PyObject_HashNotImplemented in it. Make it
                visible as a None value for the __hash__ attribute. */

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 20:57:45 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Thu, 20 Sep 2012 20:57:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315144=3A_Fix_poss?=
 =?utf-8?q?ible_integer_overflow_when_handling_pointers_as_integer?=
Message-ID: <3XN6dP6gNLzPPL@mail.python.org>

http://hg.python.org/cpython/rev/99112b851b25
changeset:   79065:99112b851b25
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Sep 20 20:56:47 2012 +0200
summary:
  Issue #15144: Fix possible integer overflow when handling pointers as integer values, by using Py_uintptr_t instead of size_t.
Patch by Serhiy Storchaka.

files:
  Include/objimpl.h                 |   9 +++------
  Include/pymacro.h                 |  14 ++++++++++++++
  Misc/NEWS                         |   4 ++++
  Modules/_elementtree.c            |   2 +-
  Objects/obmalloc.c                |   7 ++-----
  Objects/stringlib/codecs.h        |  14 +++++---------
  Objects/stringlib/fastsearch.h    |   3 +--
  Objects/stringlib/find_max_char.h |  11 ++++-------
  Objects/unicodeobject.c           |  15 ++++++---------
  Parser/node.c                     |   2 +-
  Python/pyarena.c                  |   8 +++-----
  11 files changed, 44 insertions(+), 45 deletions(-)


diff --git a/Include/objimpl.h b/Include/objimpl.h
--- a/Include/objimpl.h
+++ b/Include/objimpl.h
@@ -181,12 +181,9 @@
 #endif
 
 #define _PyObject_VAR_SIZE(typeobj, nitems)     \
-    (size_t)                                    \
-    ( ( (typeobj)->tp_basicsize +               \
-        (nitems)*(typeobj)->tp_itemsize +       \
-        (SIZEOF_VOID_P - 1)                     \
-      ) & ~(SIZEOF_VOID_P - 1)                  \
-    )
+    _Py_SIZE_ROUND_UP((typeobj)->tp_basicsize + \
+        (nitems)*(typeobj)->tp_itemsize,        \
+        SIZEOF_VOID_P)
 
 #define PyObject_NEW(type, typeobj) \
 ( (type *) PyObject_Init( \
diff --git a/Include/pymacro.h b/Include/pymacro.h
--- a/Include/pymacro.h
+++ b/Include/pymacro.h
@@ -52,4 +52,18 @@
 #define PyDoc_STR(str) ""
 #endif
 
+/* Below "a" is a power of 2. */
+/* Round down size "n" to be a multiple of "a". */
+#define _Py_SIZE_ROUND_DOWN(n, a) ((size_t)(n) & ~(size_t)((a) - 1))
+/* Round up size "n" to be a multiple of "a". */
+#define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \
+        (size_t)((a) - 1)) & ~(size_t)((a) - 1))
+/* Round pointer "p" down to the closest "a"-aligned address <= "p". */
+#define _Py_ALIGN_DOWN(p, a) ((void *)((Py_uintptr_t)(p) & ~(Py_uintptr_t)((a) - 1)))
+/* Round pointer "p" up to the closest "a"-aligned address >= "p". */
+#define _Py_ALIGN_UP(p, a) ((void *)(((Py_uintptr_t)(p) + \
+        (Py_uintptr_t)((a) - 1)) & ~(Py_uintptr_t)((a) - 1)))
+/* Check if pointer "p" is aligned to "a"-bytes boundary. */
+#define _Py_IS_ALIGNED(p, a) (!((Py_uintptr_t)(p) & (Py_uintptr_t)((a) - 1)))
+
 #endif /* Py_PYMACRO_H */
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- Issue #15144: Fix possible integer overflow when handling pointers as
+  integer values, by using Py_uintptr_t instead of size_t.  Patch by
+  Serhiy Storchaka.
+
 - Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
   (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
 
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -98,7 +98,7 @@
    info. */
 #define JOIN_GET(p) ((Py_uintptr_t) (p) & 1)
 #define JOIN_SET(p, flag) ((void*) ((Py_uintptr_t) (JOIN_OBJ(p)) | (flag)))
-#define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~1))
+#define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~(Py_uintptr_t)1))
 
 /* glue functions (see the init function for details) */
 static PyObject* elementtree_parseerror_obj;
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -138,7 +138,6 @@
  */
 #define ALIGNMENT               8               /* must be 2^N */
 #define ALIGNMENT_SHIFT         3
-#define ALIGNMENT_MASK          (ALIGNMENT - 1)
 
 /* Return the number of bytes in size class I, as a uint. */
 #define INDEX2SIZE(I) (((uint)(I) + 1) << ALIGNMENT_SHIFT)
@@ -314,14 +313,12 @@
     struct arena_object* prevarena;
 };
 
-#undef  ROUNDUP
-#define ROUNDUP(x)              (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
-#define POOL_OVERHEAD           ROUNDUP(sizeof(struct pool_header))
+#define POOL_OVERHEAD   _Py_SIZE_ROUND_UP(sizeof(struct pool_header), ALIGNMENT)
 
 #define DUMMY_SIZE_IDX          0xffff  /* size class of newly cached pools */
 
 /* Round pointer P down to the closest pool-aligned address <= P, as a poolp */
-#define POOL_ADDR(P) ((poolp)((uptr)(P) & ~(uptr)POOL_SIZE_MASK))
+#define POOL_ADDR(P) ((poolp)_Py_ALIGN_DOWN((P), POOL_SIZE))
 
 /* Return total number of blocks in pool of size index I, as a uint. */
 #define NUMBLOCKS(I) ((uint)(POOL_SIZE - POOL_OVERHEAD) / INDEX2SIZE(I))
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -2,9 +2,6 @@
 
 #if STRINGLIB_IS_UNICODE
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -25,7 +22,7 @@
 {
     Py_UCS4 ch;
     const char *s = *inptr;
-    const char *aligned_end = (const char *) ((size_t) end & ~LONG_PTR_MASK);
+    const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
     STRINGLIB_CHAR *p = dest + *outpos;
 
     while (s < end) {
@@ -39,7 +36,7 @@
                First, check if we can do an aligned read, as most CPUs have
                a penalty for unaligned reads.
             */
-            if (!((size_t) s & LONG_PTR_MASK)) {
+            if (_Py_IS_ALIGNED(s, SIZEOF_LONG)) {
                 /* Help register allocation */
                 register const char *_s = s;
                 register STRINGLIB_CHAR *_p = p;
@@ -453,7 +450,7 @@
 {
     Py_UCS4 ch;
     const unsigned char *aligned_end =
-            (const unsigned char *) ((size_t) e & ~LONG_PTR_MASK);
+            (const unsigned char *) _Py_ALIGN_DOWN(e, SIZEOF_LONG);
     const unsigned char *q = *inptr;
     STRINGLIB_CHAR *p = dest + *outpos;
     /* Offsets from q for retrieving byte pairs in the right order. */
@@ -468,7 +465,7 @@
         Py_UCS4 ch2;
         /* First check for possible aligned read of a C 'long'. Unaligned
            reads are more expensive, better to defer to another iteration. */
-        if (!((size_t) q & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(q, SIZEOF_LONG)) {
             /* Fast path for runs of in-range non-surrogate chars. */
             register const unsigned char *_q = q;
             while (_q < aligned_end) {
@@ -565,7 +562,6 @@
 #undef FAST_CHAR_MASK
 #undef STRIPPED_MASK
 #undef SWAB
-#undef LONG_PTR_MASK
 
 
 Py_LOCAL_INLINE(void)
@@ -588,7 +584,7 @@
         _PyUnicode_CONVERT_BYTES(STRINGLIB_CHAR, unsigned short, in, end, out);
 # endif
     } else {
-        const STRINGLIB_CHAR *unrolled_end = in + (len & ~ (Py_ssize_t) 3);
+        const STRINGLIB_CHAR *unrolled_end = in + _Py_SIZE_ROUND_DOWN(len, 4);
         while (in < unrolled_end) {
             out[0] = SWAB2(in[0]);
             out[1] = SWAB2(in[1]);
diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h
--- a/Objects/stringlib/fastsearch.h
+++ b/Objects/stringlib/fastsearch.h
@@ -43,8 +43,7 @@
 
 #define DO_MEMCHR(memchr, s, needle, nchars) do { \
     candidate = memchr((const void *) (s), (needle), (nchars) * sizeof(STRINGLIB_CHAR)); \
-    found = (const STRINGLIB_CHAR *) \
-        ((Py_ssize_t) candidate & (~ ((Py_ssize_t) sizeof(STRINGLIB_CHAR) - 1))); \
+    found = (const STRINGLIB_CHAR *) _Py_ALIGN_DOWN(candidate, sizeof(STRINGLIB_CHAR)); \
     } while (0)
 
     if (mode == FAST_SEARCH) {
diff --git a/Objects/stringlib/find_max_char.h b/Objects/stringlib/find_max_char.h
--- a/Objects/stringlib/find_max_char.h
+++ b/Objects/stringlib/find_max_char.h
@@ -2,9 +2,6 @@
 
 #if STRINGLIB_IS_UNICODE
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -21,10 +18,11 @@
 STRINGLIB(find_max_char)(const STRINGLIB_CHAR *begin, const STRINGLIB_CHAR *end)
 {
     const unsigned char *p = (const unsigned char *) begin;
-    const unsigned char *aligned_end = (const unsigned char *) ((size_t) end & ~LONG_PTR_MASK);
+    const unsigned char *aligned_end =
+            (const unsigned char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
 
     while (p < end) {
-        if (!((size_t) p & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
             /* Help register allocation */
             register const unsigned char *_p = p;
             while (_p < aligned_end) {
@@ -43,7 +41,6 @@
     return 127;
 }
 
-#undef LONG_PTR_MASK
 #undef ASCII_CHAR_MASK
 
 #else /* STRINGLIB_SIZEOF_CHAR == 1 */
@@ -72,7 +69,7 @@
     register Py_UCS4 mask;
     Py_ssize_t n = end - begin;
     const STRINGLIB_CHAR *p = begin;
-    const STRINGLIB_CHAR *unrolled_end = begin + (n & ~ (Py_ssize_t) 3);
+    const STRINGLIB_CHAR *unrolled_end = begin + _Py_SIZE_ROUND_DOWN(n, 4);
     Py_UCS4 max_char;
 
     max_char = MAX_CHAR_ASCII;
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -159,7 +159,7 @@
         const from_type *_end = (end);                  \
         Py_ssize_t n = (_end) - (_iter);                \
         const from_type *_unrolled_end =                \
-            _iter + (n & ~ (Py_ssize_t) 3);             \
+            _iter + _Py_SIZE_ROUND_DOWN(n, 4);          \
         while (_iter < (_unrolled_end)) {               \
             _to[0] = (to_type) _iter[0];                \
             _to[1] = (to_type) _iter[1];                \
@@ -4635,9 +4635,6 @@
 #include "stringlib/codecs.h"
 #include "stringlib/undef.h"
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -4652,11 +4649,11 @@
 ascii_decode(const char *start, const char *end, Py_UCS1 *dest)
 {
     const char *p = start;
-    const char *aligned_end = (const char *) ((size_t) end & ~LONG_PTR_MASK);
+    const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
 
 #if SIZEOF_LONG <= SIZEOF_VOID_P
-    assert(!((size_t) dest & LONG_PTR_MASK));
-    if (!((size_t) p & LONG_PTR_MASK)) {
+    assert(_Py_IS_ALIGNED(dest, SIZEOF_LONG));
+    if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
         /* Fast path, see in STRINGLIB(utf8_decode) for
            an explanation. */
         /* Help register allocation */
@@ -4682,7 +4679,7 @@
     while (p < end) {
         /* Fast path, see in STRINGLIB(utf8_decode) in stringlib/codecs.h
            for an explanation. */
-        if (!((size_t) p & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
             /* Help register allocation */
             register const char *_p = p;
             while (_p < aligned_end) {
@@ -5390,7 +5387,7 @@
         return NULL;
 
     /* output buffer is 2-bytes aligned */
-    assert(((Py_uintptr_t)PyBytes_AS_STRING(v) & 1) == 0);
+    assert(_Py_IS_ALIGNED(PyBytes_AS_STRING(v), 2));
     out = (unsigned short *)PyBytes_AS_STRING(v);
     if (byteorder == 0)
         *out++ = 0xFEFF;
diff --git a/Parser/node.c b/Parser/node.c
--- a/Parser/node.c
+++ b/Parser/node.c
@@ -71,7 +71,7 @@
  * capacity.  The code is tricky to avoid that.
  */
 #define XXXROUNDUP(n) ((n) <= 1 ? (n) :                 \
-               (n) <= 128 ? (((n) + 3) & ~3) :          \
+               (n) <= 128 ? _Py_SIZE_ROUND_UP((n), 4) : \
                fancy_roundup(n))
 
 
diff --git a/Python/pyarena.c b/Python/pyarena.c
--- a/Python/pyarena.c
+++ b/Python/pyarena.c
@@ -12,8 +12,6 @@
 
 #define DEFAULT_BLOCK_SIZE 8192
 #define ALIGNMENT               8
-#define ALIGNMENT_MASK          (ALIGNMENT - 1)
-#define ROUNDUP(x)              (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
 
 typedef struct _block {
     /* Total number of bytes owned by this block available to pass out.
@@ -85,8 +83,8 @@
     b->ab_size = size;
     b->ab_mem = (void *)(b + 1);
     b->ab_next = NULL;
-    b->ab_offset = ROUNDUP((Py_uintptr_t)(b->ab_mem)) -
-      (Py_uintptr_t)(b->ab_mem);
+    b->ab_offset = (char *)_Py_ALIGN_UP(b->ab_mem, ALIGNMENT) -
+            (char *)(b->ab_mem);
     return b;
 }
 
@@ -104,7 +102,7 @@
 {
     void *p;
     assert(b);
-    size = ROUNDUP(size);
+    size = _Py_SIZE_ROUND_UP(size, ALIGNMENT);
     if (b->ab_offset + size > b->ab_size) {
         /* If we need to allocate more memory than will fit in
            the default block, allocate a one-off block that is

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 21:52:21 2012
From: python-checkins at python.org (mark.dickinson)
Date: Thu, 20 Sep 2012 21:52:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgMTU5ODU6?=
 =?utf-8?q?_fix_round_argument_names_in_documentation=2E__Thanks_Chris_Jer?=
 =?utf-8?q?donek=2E?=
Message-ID: <3XN7rP1Xw9zQmV@mail.python.org>

http://hg.python.org/cpython/rev/eccd94d4ee77
changeset:   79066:eccd94d4ee77
branch:      3.2
parent:      79060:786aa16aeda5
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Sep 20 20:51:14 2012 +0100
summary:
  Issue 15985: fix round argument names in documentation.  Thanks Chris Jerdonek.

files:
  Doc/library/functions.rst |  18 +++++++++---------
  1 files changed, 9 insertions(+), 9 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1132,18 +1132,18 @@
    arguments starting at ``0``).
 
 
-.. function:: round(x[, n])
+.. function:: round(number[, ndigits])
 
-   Return the floating point value *x* rounded to *n* digits after the decimal
-   point.  If *n* is omitted, it defaults to zero.  Delegates to
-   ``x.__round__(n)``.
+   Return the floating point value *number* rounded to *ndigits* digits after
+   the decimal point.  If *ndigits* is omitted, it defaults to zero. Delegates
+   to ``number.__round__(ndigits)``.
 
    For the built-in types supporting :func:`round`, values are rounded to the
-   closest multiple of 10 to the power minus *n*; if two multiples are equally
-   close, rounding is done toward the even choice (so, for example, both
-   ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is ``2``).
-   The return value is an integer if called with one argument, otherwise of the
-   same type as *x*.
+   closest multiple of 10 to the power minus *ndigits*; if two multiples are
+   equally close, rounding is done toward the even choice (so, for example,
+   both ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is
+   ``2``).  The return value is an integer if called with one argument,
+   otherwise of the same type as *number*.
 
    .. note::
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 21:52:22 2012
From: python-checkins at python.org (mark.dickinson)
Date: Thu, 20 Sep 2012 21:52:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_15985=3A_merge_from_3=2E2=2E?=
Message-ID: <3XN7rQ5LNHzQnK@mail.python.org>

http://hg.python.org/cpython/rev/ad04dd6c07f7
changeset:   79067:ad04dd6c07f7
parent:      79065:99112b851b25
parent:      79066:eccd94d4ee77
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Sep 20 20:51:53 2012 +0100
summary:
  Issue 15985: merge from 3.2.

files:
  Doc/library/functions.rst |  18 +++++++++---------
  1 files changed, 9 insertions(+), 9 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1098,18 +1098,18 @@
    arguments starting at ``0``).
 
 
-.. function:: round(x[, n])
+.. function:: round(number[, ndigits])
 
-   Return the floating point value *x* rounded to *n* digits after the decimal
-   point.  If *n* is omitted, it defaults to zero.  Delegates to
-   ``x.__round__(n)``.
+   Return the floating point value *number* rounded to *ndigits* digits after
+   the decimal point.  If *ndigits* is omitted, it defaults to zero. Delegates
+   to ``number.__round__(ndigits)``.
 
    For the built-in types supporting :func:`round`, values are rounded to the
-   closest multiple of 10 to the power minus *n*; if two multiples are equally
-   close, rounding is done toward the even choice (so, for example, both
-   ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is ``2``).
-   The return value is an integer if called with one argument, otherwise of the
-   same type as *x*.
+   closest multiple of 10 to the power minus *ndigits*; if two multiples are
+   equally close, rounding is done toward the even choice (so, for example,
+   both ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is
+   ``2``).  The return value is an integer if called with one argument,
+   otherwise of the same type as *number*.
 
    .. note::
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 21:58:05 2012
From: python-checkins at python.org (mark.dickinson)
Date: Thu, 20 Sep 2012 21:58:05 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgMTU5ODU6?=
 =?utf-8?q?_fix_round_argument_names_in_documentation=2E__Thanks_Chris_Jer?=
 =?utf-8?q?donek=2E?=
Message-ID: <3XN7z11jV3zQmd@mail.python.org>

http://hg.python.org/cpython/rev/e4037dd73877
changeset:   79068:e4037dd73877
branch:      2.7
parent:      79062:1a61c56050e4
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Sep 20 20:57:37 2012 +0100
summary:
  Issue 15985: fix round argument names in documentation.  Thanks Chris Jerdonek.

files:
  Doc/library/functions.rst |  13 +++++++------
  1 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1192,13 +1192,14 @@
       Added the possibility to write a custom :meth:`__reversed__` method.
 
 
-.. function:: round(x[, n])
+.. function:: round(number[, ndigits])
 
-   Return the floating point value *x* rounded to *n* digits after the decimal
-   point.  If *n* is omitted, it defaults to zero. The result is a floating point
-   number.  Values are rounded to the closest multiple of 10 to the power minus
-   *n*; if two multiples are equally close, rounding is done away from 0 (so. for
-   example, ``round(0.5)`` is ``1.0`` and ``round(-0.5)`` is ``-1.0``).
+   Return the floating point value *number* rounded to *ndigits* digits after
+   the decimal point.  If *ndigits* is omitted, it defaults to zero. The result
+   is a floating point number.  Values are rounded to the closest multiple of
+   10 to the power minus *ndigits*; if two multiples are equally close,
+   rounding is done away from 0 (so. for example, ``round(0.5)`` is ``1.0`` and
+   ``round(-0.5)`` is ``-1.0``).
 
 
    .. note::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 22:31:03 2012
From: python-checkins at python.org (mark.dickinson)
Date: Thu, 20 Sep 2012 22:31:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgMTU5NTk6?=
 =?utf-8?q?_Fix_type_mismatch_for_quick=7B=5Fneg=7D=5Fint=5Fallocs=2E__Tha?=
 =?utf-8?q?nks_Serhiy?=
Message-ID: <3XN8j32HQrzQ0k@mail.python.org>

http://hg.python.org/cpython/rev/5ed83105731d
changeset:   79069:5ed83105731d
branch:      3.2
parent:      79066:eccd94d4ee77
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Sep 20 21:29:28 2012 +0100
summary:
  Issue 15959: Fix type mismatch for quick{_neg}_int_allocs.  Thanks Serhiy Storchaka.

files:
  Objects/longobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -30,7 +30,7 @@
 */
 static PyLongObject small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
 #ifdef COUNT_ALLOCS
-int quick_int_allocs, quick_neg_int_allocs;
+Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
 #endif
 
 static PyObject *

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 22:31:04 2012
From: python-checkins at python.org (mark.dickinson)
Date: Thu, 20 Sep 2012 22:31:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_15959=3A_Merge_from_3=2E2=2E?=
Message-ID: <3XN8j46WWqzQ0k@mail.python.org>

http://hg.python.org/cpython/rev/3504cbb3e1d8
changeset:   79070:3504cbb3e1d8
parent:      79067:ad04dd6c07f7
parent:      79069:5ed83105731d
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Sep 20 21:30:34 2012 +0100
summary:
  Issue 15959: Merge from 3.2.

files:
  Objects/longobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -30,7 +30,7 @@
 */
 static PyLongObject small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
 #ifdef COUNT_ALLOCS
-int quick_int_allocs, quick_neg_int_allocs;
+Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
 #endif
 
 static PyObject *

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 22:50:20 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu, 20 Sep 2012 22:50:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1OTcz?=
 =?utf-8?q?=3A_Fixed_segmentation_fault_on_timezone_comparison_to_other_ty?=
 =?utf-8?q?pes=2E?=
Message-ID: <3XN97J74zDzN8k@mail.python.org>

http://hg.python.org/cpython/rev/9fba12ceb2fd
changeset:   79071:9fba12ceb2fd
branch:      3.2
parent:      79066:eccd94d4ee77
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Thu Sep 20 16:39:33 2012 -0400
summary:
  Issue #15973: Fixed segmentation fault on timezone comparison to other types.

files:
  Lib/datetime.py            |   2 ++
  Lib/test/datetimetester.py |   2 ++
  Modules/_datetimemodule.c  |  10 +++++++---
  3 files changed, 11 insertions(+), 3 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1821,6 +1821,8 @@
         return (self._offset, self._name)
 
     def __eq__(self, other):
+        if type(other) != timezone:
+            return False
         return self._offset == other._offset
 
     def __hash__(self):
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -235,6 +235,8 @@
         self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST'))
         with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
         self.assertIn(timezone(ZERO), {timezone(ZERO)})
+        self.assertTrue(timezone(ZERO) != None)
+        self.assertFalse(timezone(ZERO) ==  None)
 
     def test_aware_datetime(self):
         # test that timezone instances can be used by datetime
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3243,9 +3243,13 @@
 timezone_richcompare(PyDateTime_TimeZone *self,
                      PyDateTime_TimeZone *other, int op)
 {
-    if (op != Py_EQ && op != Py_NE) {
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
+    if (op != Py_EQ && op != Py_NE)
+        Py_RETURN_NOTIMPLEMENTED;
+    if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {
+	if (op == Py_EQ)
+	    Py_RETURN_FALSE;
+	else
+	    Py_RETURN_TRUE;
     }
     return delta_richcompare(self->offset, other->offset, op);
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 22:50:22 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu, 20 Sep 2012 22:50:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_merged_3=2E2?=
Message-ID: <3XN97L5KMFzQnK@mail.python.org>

http://hg.python.org/cpython/rev/63cb0a642c84
changeset:   79072:63cb0a642c84
parent:      79067:ad04dd6c07f7
parent:      79071:9fba12ceb2fd
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Thu Sep 20 16:42:34 2012 -0400
summary:
  merged 3.2

files:
  Lib/datetime.py            |  2 ++
  Lib/test/datetimetester.py |  2 ++
  Modules/_datetimemodule.c  |  6 ++++++
  3 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1854,6 +1854,8 @@
         return (self._offset, self._name)
 
     def __eq__(self, other):
+        if type(other) != timezone:
+            return False
         return self._offset == other._offset
 
     def __hash__(self):
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -235,6 +235,8 @@
         self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST'))
         with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
         self.assertIn(timezone(ZERO), {timezone(ZERO)})
+        self.assertTrue(timezone(ZERO) != None)
+        self.assertFalse(timezone(ZERO) ==  None)
 
     def test_aware_datetime(self):
         # test that timezone instances can be used by datetime
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3215,6 +3215,12 @@
 {
     if (op != Py_EQ && op != Py_NE)
         Py_RETURN_NOTIMPLEMENTED;
+    if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {
+	if (op == Py_EQ)
+	    Py_RETURN_FALSE;
+	else
+	    Py_RETURN_TRUE;
+    }
     return delta_richcompare(self->offset, other->offset, op);
 }
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 22:50:24 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu, 20 Sep 2012 22:50:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3XN97N0szxzPSL@mail.python.org>

http://hg.python.org/cpython/rev/8da881036a9e
changeset:   79073:8da881036a9e
parent:      79072:63cb0a642c84
parent:      79070:3504cbb3e1d8
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Thu Sep 20 16:44:11 2012 -0400
summary:
  merge

files:
  Objects/longobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -30,7 +30,7 @@
 */
 static PyLongObject small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
 #ifdef COUNT_ALLOCS
-int quick_int_allocs, quick_neg_int_allocs;
+Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
 #endif
 
 static PyObject *

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 22:50:25 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu, 20 Sep 2012 22:50:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?=
	=?utf-8?q?_merge?=
Message-ID: <3XN97P3hlxzQmV@mail.python.org>

http://hg.python.org/cpython/rev/c99cf18b2272
changeset:   79074:c99cf18b2272
branch:      3.2
parent:      79069:5ed83105731d
parent:      79071:9fba12ceb2fd
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Thu Sep 20 16:49:58 2012 -0400
summary:
  merge

files:
  Lib/datetime.py            |   2 ++
  Lib/test/datetimetester.py |   2 ++
  Modules/_datetimemodule.c  |  10 +++++++---
  3 files changed, 11 insertions(+), 3 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1821,6 +1821,8 @@
         return (self._offset, self._name)
 
     def __eq__(self, other):
+        if type(other) != timezone:
+            return False
         return self._offset == other._offset
 
     def __hash__(self):
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -235,6 +235,8 @@
         self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST'))
         with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
         self.assertIn(timezone(ZERO), {timezone(ZERO)})
+        self.assertTrue(timezone(ZERO) != None)
+        self.assertFalse(timezone(ZERO) ==  None)
 
     def test_aware_datetime(self):
         # test that timezone instances can be used by datetime
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3243,9 +3243,13 @@
 timezone_richcompare(PyDateTime_TimeZone *self,
                      PyDateTime_TimeZone *other, int op)
 {
-    if (op != Py_EQ && op != Py_NE) {
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
+    if (op != Py_EQ && op != Py_NE)
+        Py_RETURN_NOTIMPLEMENTED;
+    if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {
+	if (op == Py_EQ)
+	    Py_RETURN_FALSE;
+	else
+	    Py_RETURN_TRUE;
     }
     return delta_richcompare(self->offset, other->offset, op);
 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 23:25:38 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu, 20 Sep 2012 23:25:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1OTcz?=
 =?utf-8?q?=3A_fixed_3=2E2_backport=2E?=
Message-ID: <3XN9w271BXzQny@mail.python.org>

http://hg.python.org/cpython/rev/f17f67f0ec4b
changeset:   79075:f17f67f0ec4b
branch:      3.2
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Thu Sep 20 17:23:46 2012 -0400
summary:
  Issue #15973: fixed 3.2 backport.

files:
  Modules/_datetimemodule.c |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3243,8 +3243,10 @@
 timezone_richcompare(PyDateTime_TimeZone *self,
                      PyDateTime_TimeZone *other, int op)
 {
-    if (op != Py_EQ && op != Py_NE)
-        Py_RETURN_NOTIMPLEMENTED;
+    if (op != Py_EQ && op != Py_NE) {
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    }
     if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {
 	if (op == Py_EQ)
 	    Py_RETURN_FALSE;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 20 23:25:40 2012
From: python-checkins at python.org (alexander.belopolsky)
Date: Thu, 20 Sep 2012 23:25:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_null_merge?=
Message-ID: <3XN9w43DhyzQpg@mail.python.org>

http://hg.python.org/cpython/rev/9be7289dca60
changeset:   79076:9be7289dca60
parent:      79073:8da881036a9e
parent:      79075:f17f67f0ec4b
user:        Alexander Belopolsky <alexander.belopolsky at gmail.com>
date:        Thu Sep 20 17:25:18 2012 -0400
summary:
  null merge

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 00:44:18 2012
From: python-checkins at python.org (daniel.holth)
Date: Fri, 21 Sep 2012 00:44:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_add_stub_for_wheel_spec?=
Message-ID: <3XNCfp3DGCzQnp@mail.python.org>

http://hg.python.org/peps/rev/4ac055623f2a
changeset:   4514:4ac055623f2a
user:        Daniel Holth <dholth at fastmail.fm>
date:        Thu Sep 20 18:43:53 2012 -0400
summary:
  add stub for wheel spec

files:
  pep-0425.txt |   7 +++----
  pep-0427.txt |  30 ++++++++++++++++++++++++++++++
  2 files changed, 33 insertions(+), 4 deletions(-)


diff --git a/pep-0425.txt b/pep-0425.txt
--- a/pep-0425.txt
+++ b/pep-0425.txt
@@ -81,10 +81,9 @@
 
 Other Python implementations should use `sys.implementation.name`.
 
-The version is `py_version_nodot`.  CPython gets away with no dot, but
-if one is needed the underscore `_` is used instead.  Pypy uses versions that
-do not track the Python language version and should probably use its own
-versions here `pp18`, `pp19`.
+The version is `py_version_nodot`.  CPython gets away with no dot,
+but if one is needed the underscore `_` is used instead.  Pypy should
+probably use its own versions here `pp18`, `pp19`.
 
 The version can be just the major version `2` or `3` `py2`, `py3` for
 many pure-Python distributions.
diff --git a/pep-0427.txt b/pep-0427.txt
new file mode 100644
--- /dev/null
+++ b/pep-0427.txt
@@ -0,0 +1,30 @@
+PEP: 426
+Title: The Wheel Binary Package Format 1.0
+Version: $Revision$
+Last-Modified: $Date$
+Author: Daniel Holth <dholth at fastmail.fm>
+Discussions-To: Distutils SIG
+Status: Draft
+Type: Standards Track
+Content-Type: text/x-rst
+Created: 20 Sep 2012
+
+
+Abstract
+========
+
+This PEP describes a binary format for Python called wheel.
+
+Copyright
+=========
+
+This document has been placed in the public domain.
+
+
+..
+   Local Variables:
+   mode: indented-text
+   indent-tabs-mode: nil
+   sentence-end-double-space: t
+   fill-column: 70
+   End:

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Fri Sep 21 05:50:13 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 21 Sep 2012 05:50:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_remove_gdb_noi?=
	=?utf-8?q?se_about_linux-vdso?=
Message-ID: <3XNLRn32mMzQqQ@mail.python.org>

http://hg.python.org/cpython/rev/fe8bd8b621a2
changeset:   79077:fe8bd8b621a2
branch:      3.2
parent:      79075:f17f67f0ec4b
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Sep 20 23:48:23 2012 -0400
summary:
  remove gdb noise about linux-vdso

files:
  Lib/test/test_gdb.py |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -144,6 +144,11 @@
         err = err.replace("warning: Cannot initialize thread debugging"
                           " library: Debugger service failed\n",
                           '')
+        err = err.replace('warning: Could not load shared library symbols for '
+                          'linux-vdso.so.1.\n'
+                          'Do you need "set solib-search-path" or '
+                          '"set sysroot"?\n',
+                          '')
 
         # Ensure no unexpected error messages:
         self.assertEqual(err, '')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 05:50:15 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 21 Sep 2012 05:50:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4y?=
Message-ID: <3XNLRq0VfczQrH@mail.python.org>

http://hg.python.org/cpython/rev/24136a775943
changeset:   79078:24136a775943
parent:      79076:9be7289dca60
parent:      79077:fe8bd8b621a2
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Sep 20 23:49:33 2012 -0400
summary:
  merge 3.2

files:
  Lib/test/test_gdb.py |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -154,6 +154,11 @@
         err = err.replace("warning: Cannot initialize thread debugging"
                           " library: Debugger service failed\n",
                           '')
+        err = err.replace('warning: Could not load shared library symbols for '
+                          'linux-vdso.so.1.\n'
+                          'Do you need "set solib-search-path" or '
+                          '"set sysroot"?\n',
+                          '')
 
         # Ensure no unexpected error messages:
         self.assertEqual(err, '')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 05:50:16 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 21 Sep 2012 05:50:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_remove_gdb_noi?=
	=?utf-8?q?se_about_linux-vdso?=
Message-ID: <3XNLRr3dX0zQqd@mail.python.org>

http://hg.python.org/cpython/rev/3d170d1e2fa3
changeset:   79079:3d170d1e2fa3
branch:      2.7
parent:      79068:e4037dd73877
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Sep 20 23:48:23 2012 -0400
summary:
  remove gdb noise about linux-vdso

files:
  Lib/test/test_gdb.py |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -150,6 +150,11 @@
         err = err.replace("warning: Cannot initialize thread debugging"
                           " library: Debugger service failed\n",
                           '')
+        err = err.replace('warning: Could not load shared library symbols for '
+                          'linux-vdso.so.1.\n'
+                          'Do you need "set solib-search-path" or '
+                          '"set sysroot"?\n',
+                          '')
 
         # Ensure no unexpected error messages:
         self.assertEqual(err, '')

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Fri Sep 21 06:06:12 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 21 Sep 2012 06:06:12 +0200
Subject: [Python-checkins] Daily reference leaks (9be7289dca60): sum=0
Message-ID: <E1TEuVI-0007xc-5Y@ap.vmr.nerim.net>

results for 9be7289dca60 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogvOLmZZ', '-x']

From python-checkins at python.org  Fri Sep 21 14:04:55 2012
From: python-checkins at python.org (matthias.klose)
Date: Fri, 21 Sep 2012 14:04:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogLSBJc3N1ZSAjMTE3?=
 =?utf-8?q?15=3A_Fix_multiarch_detection_without_having_Debian_development?=
Message-ID: <3XNYQb5k1nzQpg@mail.python.org>

http://hg.python.org/cpython/rev/53fa224b95f4
changeset:   79080:53fa224b95f4
branch:      2.7
user:        doko at ubuntu.com
date:        Fri Sep 21 13:51:40 2012 +0200
summary:
  - Issue #11715: Fix multiarch detection without having Debian development
  tools (dpkg-dev) installed.

files:
  Misc/NEWS |   3 +++
  setup.py  |  21 +++++++++++++++++++++
  2 files changed, 24 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -400,6 +400,9 @@
 Build
 -----
 
+- Issue #11715: Fix multiarch detection without having Debian development
+  tools (dpkg-dev) installed.
+
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -351,6 +351,27 @@
     def add_multiarch_paths(self):
         # Debian/Ubuntu multiarch support.
         # https://wiki.ubuntu.com/MultiarchSpec
+        cc = sysconfig.get_config_var('CC')
+        tmpfile = os.path.join(self.build_temp, 'multiarch')
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+        ret = os.system(
+            '%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile))
+        multiarch_path_component = ''
+        try:
+            if ret >> 8 == 0:
+                with open(tmpfile) as fp:
+                    multiarch_path_component = fp.readline().strip()
+        finally:
+            os.unlink(tmpfile)
+
+        if multiarch_path_component != '':
+            add_dir_to_list(self.compiler.library_dirs,
+                            '/usr/lib/' + multiarch_path_component)
+            add_dir_to_list(self.compiler.include_dirs,
+                            '/usr/include/' + multiarch_path_component)
+            return
+
         if not find_executable('dpkg-architecture'):
             return
         tmpfile = os.path.join(self.build_temp, 'multiarch')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 14:04:57 2012
From: python-checkins at python.org (matthias.klose)
Date: Fri, 21 Sep 2012 14:04:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogLSBJc3N1ZSAjMTE3?=
 =?utf-8?q?15=3A_Fix_multiarch_detection_without_having_Debian_development?=
Message-ID: <3XNYQd3xlZzQp3@mail.python.org>

http://hg.python.org/cpython/rev/78aba41a8105
changeset:   79081:78aba41a8105
branch:      3.2
parent:      79077:fe8bd8b621a2
user:        doko at ubuntu.com
date:        Fri Sep 21 13:52:29 2012 +0200
summary:
  - Issue #11715: Fix multiarch detection without having Debian development
  tools (dpkg-dev) installed.

files:
  Misc/NEWS |   3 +++
  setup.py  |  21 +++++++++++++++++++++
  2 files changed, 24 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -541,6 +541,9 @@
 Build
 -----
 
+- Issue #11715: Fix multiarch detection without having Debian development
+  tools (dpkg-dev) installed.
+
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -376,6 +376,27 @@
     def add_multiarch_paths(self):
         # Debian/Ubuntu multiarch support.
         # https://wiki.ubuntu.com/MultiarchSpec
+        cc = sysconfig.get_config_var('CC')
+        tmpfile = os.path.join(self.build_temp, 'multiarch')
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+        ret = os.system(
+            '%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile))
+        multiarch_path_component = ''
+        try:
+            if ret >> 8 == 0:
+                with open(tmpfile) as fp:
+                    multiarch_path_component = fp.readline().strip()
+        finally:
+            os.unlink(tmpfile)
+
+        if multiarch_path_component != '':
+            add_dir_to_list(self.compiler.library_dirs,
+                            '/usr/lib/' + multiarch_path_component)
+            add_dir_to_list(self.compiler.include_dirs,
+                            '/usr/include/' + multiarch_path_component)
+            return
+
         if not find_executable('dpkg-architecture'):
             return
         tmpfile = os.path.join(self.build_temp, 'multiarch')

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 14:04:59 2012
From: python-checkins at python.org (matthias.klose)
Date: Fri, 21 Sep 2012 14:04:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_null_merge?=
Message-ID: <3XNYQg0B0vzQph@mail.python.org>

http://hg.python.org/cpython/rev/637634679bcd
changeset:   79082:637634679bcd
parent:      79078:24136a775943
parent:      79081:78aba41a8105
user:        doko at ubuntu.com
date:        Fri Sep 21 14:00:47 2012 +0200
summary:
  null merge

files:



-- 
Repository URL: http://hg.python.org/cpython

From brett at python.org  Fri Sep 21 14:37:47 2012
From: brett at python.org (Brett Cannon)
Date: Fri, 21 Sep 2012 08:37:47 -0400
Subject: [Python-checkins] peps: add stub for wheel spec
In-Reply-To: <3XNCfp3DGCzQnp@mail.python.org>
References: <3XNCfp3DGCzQnp@mail.python.org>
Message-ID: <CAP1=2W4rXrw7-Wtq7CyKjbz74MLN+EjXpB6ukrJJsWER4-kATg@mail.gmail.com>

We don't put stubs of PEPs into the repository, especially when they have
not been vetted on python-ideas or some other public mailing list that is
appropriate for the subject.

You also mis-capitalized PyPy in this commit.

On Thu, Sep 20, 2012 at 6:44 PM, daniel.holth <python-checkins at python.org>wrote:

> http://hg.python.org/peps/rev/4ac055623f2a
> changeset:   4514:4ac055623f2a
> user:        Daniel Holth <dholth at fastmail.fm>
> date:        Thu Sep 20 18:43:53 2012 -0400
> summary:
>   add stub for wheel spec
>
> files:
>   pep-0425.txt |   7 +++----
>   pep-0427.txt |  30 ++++++++++++++++++++++++++++++
>   2 files changed, 33 insertions(+), 4 deletions(-)
>
>
> diff --git a/pep-0425.txt b/pep-0425.txt
> --- a/pep-0425.txt
> +++ b/pep-0425.txt
> @@ -81,10 +81,9 @@
>
>  Other Python implementations should use `sys.implementation.name`.
>
> -The version is `py_version_nodot`.  CPython gets away with no dot, but
> -if one is needed the underscore `_` is used instead.  Pypy uses versions
> that
> -do not track the Python language version and should probably use its own
> -versions here `pp18`, `pp19`.
> +The version is `py_version_nodot`.  CPython gets away with no dot,
> +but if one is needed the underscore `_` is used instead.  Pypy should
> +probably use its own versions here `pp18`, `pp19`.
>
>  The version can be just the major version `2` or `3` `py2`, `py3` for
>  many pure-Python distributions.
> diff --git a/pep-0427.txt b/pep-0427.txt
> new file mode 100644
> --- /dev/null
> +++ b/pep-0427.txt
> @@ -0,0 +1,30 @@
> +PEP: 426
> +Title: The Wheel Binary Package Format 1.0
> +Version: $Revision$
> +Last-Modified: $Date$
> +Author: Daniel Holth <dholth at fastmail.fm>
> +Discussions-To: Distutils SIG
> +Status: Draft
> +Type: Standards Track
> +Content-Type: text/x-rst
> +Created: 20 Sep 2012
> +
> +
> +Abstract
> +========
> +
> +This PEP describes a binary format for Python called wheel.
> +
> +Copyright
> +=========
> +
> +This document has been placed in the public domain.
> +
> +
> +..
> +   Local Variables:
> +   mode: indented-text
> +   indent-tabs-mode: nil
> +   sentence-end-double-space: t
> +   fill-column: 70
> +   End:
>
> --
> Repository URL: http://hg.python.org/peps
>
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-checkins/attachments/20120921/5db6e76d/attachment.html>

From python-checkins at python.org  Fri Sep 21 15:31:47 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 15:31:47 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1OTgwOiBwcm9w?=
 =?utf-8?q?erly_escape_newlines_in_docstrings=2E__Patch_by_Serhiy_Storchak?=
 =?utf-8?q?a=2E?=
Message-ID: <3XNbLq6pbRzQpy@mail.python.org>

http://hg.python.org/cpython/rev/7a125913a375
changeset:   79083:7a125913a375
branch:      2.7
parent:      79080:53fa224b95f4
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 16:27:45 2012 +0300
summary:
  #15980: properly escape newlines in docstrings.  Patch by Serhiy Storchaka.

files:
  Lib/_LWPCookieJar.py    |  4 ++--
  Lib/email/base64mime.py |  2 +-
  Lib/email/utils.py      |  4 ++--
  Lib/rfc822.py           |  2 +-
  4 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Lib/_LWPCookieJar.py b/Lib/_LWPCookieJar.py
--- a/Lib/_LWPCookieJar.py
+++ b/Lib/_LWPCookieJar.py
@@ -48,7 +48,7 @@
 
 class LWPCookieJar(FileCookieJar):
     """
-    The LWPCookieJar saves a sequence of"Set-Cookie3" lines.
+    The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
     "Set-Cookie3" is the format used by the libwww-perl libary, not known
     to be compatible with any browser, but which is easy to read and
     doesn't lose information about RFC 2965 cookies.
@@ -60,7 +60,7 @@
     """
 
     def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
-        """Return cookies as a string of "\n"-separated "Set-Cookie3" headers.
+        """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
 
         ignore_discard and ignore_expires: see docstring for FileCookieJar.save
 
diff --git a/Lib/email/base64mime.py b/Lib/email/base64mime.py
--- a/Lib/email/base64mime.py
+++ b/Lib/email/base64mime.py
@@ -130,7 +130,7 @@
     verbatim (this is the default).
 
     Each line of encoded text will end with eol, which defaults to "\\n".  Set
-    this to "\r\n" if you will be using the result of this function directly
+    this to "\\r\\n" if you will be using the result of this function directly
     in an email.
     """
     if not s:
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -63,7 +63,7 @@
     """Decodes a base64 string.
 
     This function is equivalent to base64.decodestring and it's retained only
-    for backward compatibility. It used to remove the last \n of the decoded
+    for backward compatibility. It used to remove the last \\n of the decoded
     string, if it had any (see issue 7143).
     """
     if not s:
@@ -73,7 +73,7 @@
 
 
 def fix_eols(s):
-    """Replace all line-ending characters with \r\n."""
+    """Replace all line-ending characters with \\r\\n."""
     # Fix newlines with no preceding carriage return
     s = re.sub(r'(?<!\r)\n', CRLF, s)
     # Fix carriage returns with no following newline
diff --git a/Lib/rfc822.py b/Lib/rfc822.py
--- a/Lib/rfc822.py
+++ b/Lib/rfc822.py
@@ -212,7 +212,7 @@
         You may override this method if your application wants to bend the
         rules, e.g. to strip trailing whitespace, or to recognize MH template
         separators ('--------').  For convenience (e.g. for code reading from
-        sockets) a line consisting of \r\n also matches.
+        sockets) a line consisting of \\r\\n also matches.
         """
         return line in _blanklines
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 15:31:49 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 15:31:49 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTgwOiBwcm9w?=
 =?utf-8?q?erly_escape_newlines_in_docstrings=2E__Patch_by_Serhiy_Storchak?=
 =?utf-8?q?a=2E?=
Message-ID: <3XNbLs3hrqzQr8@mail.python.org>

http://hg.python.org/cpython/rev/e582ad1aee62
changeset:   79084:e582ad1aee62
branch:      3.2
parent:      79081:78aba41a8105
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 16:30:22 2012 +0300
summary:
  #15980: properly escape newlines in docstrings.  Patch by Serhiy Storchaka.

files:
  Lib/http/cookiejar.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1825,7 +1825,7 @@
 
 class LWPCookieJar(FileCookieJar):
     """
-    The LWPCookieJar saves a sequence of"Set-Cookie3" lines.
+    The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
     "Set-Cookie3" is the format used by the libwww-perl libary, not known
     to be compatible with any browser, but which is easy to read and
     doesn't lose information about RFC 2965 cookies.
@@ -1837,7 +1837,7 @@
     """
 
     def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
-        """Return cookies as a string of "\n"-separated "Set-Cookie3" headers.
+        """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
 
         ignore_discard and ignore_expires: see docstring for FileCookieJar.save
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 15:31:50 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 15:31:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1OTgwOiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XNbLt6mHPzQqm@mail.python.org>

http://hg.python.org/cpython/rev/1830426da082
changeset:   79085:1830426da082
parent:      79082:637634679bcd
parent:      79084:e582ad1aee62
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 16:31:24 2012 +0300
summary:
  #15980: merge with 3.2.

files:
  Lib/http/cookiejar.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1825,7 +1825,7 @@
 
 class LWPCookieJar(FileCookieJar):
     """
-    The LWPCookieJar saves a sequence of"Set-Cookie3" lines.
+    The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
     "Set-Cookie3" is the format used by the libwww-perl libary, not known
     to be compatible with any browser, but which is easy to read and
     doesn't lose information about RFC 2965 cookies.
@@ -1837,7 +1837,7 @@
     """
 
     def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
-        """Return cookies as a string of "\n"-separated "Set-Cookie3" headers.
+        """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
 
         ignore_discard and ignore_expires: see docstring for FileCookieJar.save
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 15:53:31 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 15:53:31 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1MzA0OiBmaXgg?=
 =?utf-8?q?wrong_warning_message_in_test=2Esupport=2Etemp=5Fcwd=28=29=2E?=
Message-ID: <3XNbqv0wQHzRQP@mail.python.org>

http://hg.python.org/cpython/rev/0b60dcabf7e6
changeset:   79086:0b60dcabf7e6
branch:      3.2
parent:      79084:e582ad1aee62
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 16:48:12 2012 +0300
summary:
  #15304: fix wrong warning message in test.support.temp_cwd().

files:
  Lib/test/support.py |  2 +-
  Misc/NEWS           |  3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -600,7 +600,7 @@
     except OSError:
         if not quiet:
             raise
-        warnings.warn('tests may fail, unable to change the CWD to ' + name,
+        warnings.warn('tests may fail, unable to change the CWD to ' + path,
                       RuntimeWarning, stacklevel=3)
     try:
         yield os.getcwd()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -494,6 +494,9 @@
 Tests
 -----
 
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
 - Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
   by Serhiy Storchaka.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 15:53:32 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 15:53:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1MzA0OiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XNbqw5q6bzRQb@mail.python.org>

http://hg.python.org/cpython/rev/b1d6daface10
changeset:   79087:b1d6daface10
parent:      79085:1830426da082
parent:      79086:0b60dcabf7e6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 16:53:07 2012 +0300
summary:
  #15304: merge with 3.2.

files:
  Lib/test/support.py      |  2 +-
  Lib/test/test_support.py |  9 +++++++++
  Misc/NEWS                |  4 ++++
  3 files changed, 14 insertions(+), 1 deletions(-)


diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -680,7 +680,7 @@
     except OSError:
         if not quiet:
             raise
-        warnings.warn('tests may fail, unable to change the CWD to ' + name,
+        warnings.warn('tests may fail, unable to change the CWD to ' + path,
                       RuntimeWarning, stacklevel=3)
     try:
         yield os.getcwd()
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -95,6 +95,15 @@
         self.assertFalse(os.path.exists(TESTFN))
         self.assertTrue(os.path.basename(os.getcwd()), here)
 
+    def test_temp_cwd__chdir_warning(self):
+        """Check the warning message when os.chdir() fails."""
+        path = TESTFN + '_does_not_exist'
+        with support.check_warnings() as recorder:
+            with support.temp_cwd(path=path, quiet=True):
+                pass
+            messages = [str(w.message) for w in recorder.warnings]
+        self.assertEqual(messages, ['tests may fail, unable to change the CWD to ' + path])
+
     def test_sortdict(self):
         self.assertEqual(support.sortdict({3:3, 2:2, 1:1}), "{1: 1, 2: 2, 3: 3}")
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,10 @@
 Tests
 -----
 
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+
 - Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
   by Serhiy Storchaka.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 16:29:41 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 16:29:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogICMxNTQyMTogZml4?=
 =?utf-8?q?_an_OverflowError_in_Calendar=2Eitermonthdates=28=29_after?=
Message-ID: <3XNcdd2kxmzNZb@mail.python.org>

http://hg.python.org/cpython/rev/bfdf366a779a
changeset:   79088:bfdf366a779a
branch:      2.7
parent:      79083:7a125913a375
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 17:26:35 2012 +0300
summary:
   #15421: fix an OverflowError in Calendar.itermonthdates() after datetime.MAXYEAR.  Patch by C?dric Krier.

files:
  Lib/calendar.py           |  6 +++++-
  Lib/test/test_calendar.py |  6 ++++++
  Misc/NEWS                 |  3 +++
  3 files changed, 14 insertions(+), 1 deletions(-)


diff --git a/Lib/calendar.py b/Lib/calendar.py
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -161,7 +161,11 @@
         oneday = datetime.timedelta(days=1)
         while True:
             yield date
-            date += oneday
+            try:
+                date += oneday
+            except OverflowError:
+                # Adding one day could fail after datetime.MAXYEAR
+                break
             if date.month != month and date.weekday() == self.firstweekday:
                 break
 
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -3,6 +3,7 @@
 
 from test import test_support
 import locale
+import datetime
 
 
 result_2004_text = """
@@ -262,6 +263,11 @@
         new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
         self.assertEquals(old_october, new_october)
 
+    def test_itermonthdates(self):
+        # ensure itermonthdates doesn't overflow after datetime.MAXYEAR
+        # see #15421
+        list(calendar.Calendar().itermonthdates(datetime.MAXYEAR, 12))
+
 
 class MonthCalendarTestCase(unittest.TestCase):
     def setUp(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,9 @@
 Library
 -------
 
+- Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
+  datetime.MAXYEAR.  Patch by C?dric Krier.
+
 - Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
   elements 'meta' and 'param'.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 16:29:42 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 16:29:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1NDIxOiBmaXgg?=
 =?utf-8?q?an_OverflowError_in_Calendar=2Eitermonthdates=28=29_after?=
Message-ID: <3XNcdf6VxRzQmq@mail.python.org>

http://hg.python.org/cpython/rev/aa73e60f65e9
changeset:   79089:aa73e60f65e9
branch:      3.2
parent:      79086:0b60dcabf7e6
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 17:26:35 2012 +0300
summary:
  #15421: fix an OverflowError in Calendar.itermonthdates() after datetime.MAXYEAR.  Patch by C?dric Krier.

files:
  Lib/calendar.py           |  6 +++++-
  Lib/test/test_calendar.py |  6 ++++++
  Misc/NEWS                 |  3 +++
  3 files changed, 14 insertions(+), 1 deletions(-)


diff --git a/Lib/calendar.py b/Lib/calendar.py
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -161,7 +161,11 @@
         oneday = datetime.timedelta(days=1)
         while True:
             yield date
-            date += oneday
+            try:
+                date += oneday
+            except OverflowError:
+                # Adding one day could fail after datetime.MAXYEAR
+                break
             if date.month != month and date.weekday() == self.firstweekday:
                 break
 
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -5,6 +5,7 @@
 from test.script_helper import assert_python_ok
 import time
 import locale
+import datetime
 
 result_2004_text = """
                                   2004
@@ -265,6 +266,11 @@
         new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
         self.assertEqual(old_october, new_october)
 
+    def test_itermonthdates(self):
+        # ensure itermonthdates doesn't overflow after datetime.MAXYEAR
+        # see #15421
+        list(calendar.Calendar().itermonthdates(datetime.MAXYEAR, 12))
+
 
 class MonthCalendarTestCase(unittest.TestCase):
     def setUp(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,9 @@
 Library
 -------
 
+- Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
+  datetime.MAXYEAR.  Patch by C?dric Krier.
+
 - Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
   elements 'meta' and 'param'.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 16:29:44 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 21 Sep 2012 16:29:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogICMxNTQyMTogbWVyZ2Ugd2l0aCAzLjIu?=
Message-ID: <3XNcdh2fW4zMH0@mail.python.org>

http://hg.python.org/cpython/rev/59a2807872d5
changeset:   79090:59a2807872d5
parent:      79087:b1d6daface10
parent:      79089:aa73e60f65e9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 21 17:29:20 2012 +0300
summary:
   #15421: merge with 3.2.

files:
  Lib/calendar.py           |  6 +++++-
  Lib/test/test_calendar.py |  6 ++++++
  Misc/NEWS                 |  3 +++
  3 files changed, 14 insertions(+), 1 deletions(-)


diff --git a/Lib/calendar.py b/Lib/calendar.py
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -161,7 +161,11 @@
         oneday = datetime.timedelta(days=1)
         while True:
             yield date
-            date += oneday
+            try:
+                date += oneday
+            except OverflowError:
+                # Adding one day could fail after datetime.MAXYEAR
+                break
             if date.month != month and date.weekday() == self.firstweekday:
                 break
 
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -6,6 +6,7 @@
 import time
 import locale
 import sys
+import datetime
 
 result_2004_01_text = """
     January 2004
@@ -464,6 +465,11 @@
         new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
         self.assertEqual(old_october, new_october)
 
+    def test_itermonthdates(self):
+        # ensure itermonthdates doesn't overflow after datetime.MAXYEAR
+        # see #15421
+        list(calendar.Calendar().itermonthdates(datetime.MAXYEAR, 12))
+
 
 class MonthCalendarTestCase(unittest.TestCase):
     def setUp(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@
 Library
 -------
 
+- Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
+  datetime.MAXYEAR.  Patch by C?dric Krier.
+
 - Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
   elements 'meta' and 'param'.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 17:08:34 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Fri, 21 Sep 2012 17:08:34 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Update_pep-362_text=2E?=
Message-ID: <3XNdVV62shzQt3@mail.python.org>

http://hg.python.org/peps/rev/20e3164cc43b
changeset:   4515:20e3164cc43b
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Fri Sep 21 18:08:27 2012 +0300
summary:
  Update pep-362 text.

files:
  pep-0362.txt |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/pep-0362.txt b/pep-0362.txt
--- a/pep-0362.txt
+++ b/pep-0362.txt
@@ -90,8 +90,8 @@
     True
 
     >>> new_sig = new_sig.replace(return_annotation=new_sig.empty)
-    >>> hasattr(new_sig, "return_annotation")
-    False
+    >>> new_sig.return_annotation is Signature.empty
+    True
 
 There are two ways to instantiate a Signature class:
 

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Fri Sep 21 18:30:53 2012
From: python-checkins at python.org (larry.hastings)
Date: Fri, 21 Sep 2012 18:30:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_What=27s_New_entries_f?=
 =?utf-8?q?or_some_minor_work_I_did_in_3=2E3=2E?=
Message-ID: <3XNgKT1T1nzPLt@mail.python.org>

http://hg.python.org/cpython/rev/c051056a1e93
changeset:   79091:c051056a1e93
user:        Larry Hastings <larry at hastings.org>
date:        Fri Sep 21 09:30:19 2012 -0700
summary:
  Add What's New entries for some minor work I did in 3.3.

files:
  Doc/whatsnew/3.3.rst |  13 ++++++++++++-
  1 files changed, 12 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1358,7 +1358,7 @@
   files and directories, it is more reliable (and also faster) to manipulate
   file descriptors instead of file names. Python 3.3 enhances existing functions
   and introduces new functions to work on file descriptors (:issue:`4761`,
-  :issue:`10755`).
+  :issue:`10755` and :issue:`14626`).
 
   - The :mod:`os` module has a new :func:`~os.fwalk` function similar to
     :func:`~os.walk` except that it also yields file descriptors referring to the
@@ -1391,6 +1391,12 @@
   Windows.
   (Contributed by Antoine Pitrou in :issue:`8828`.)
 
+* The stat family of functions (:func:`~os.stat`, :func:`~os.fstat`,
+  and :func:`~os.lstat`) now support reading a file's timestamps
+  with nanosecond precision.  Symmetrically, :func:`~os.utime`
+  can now write file timestamps with nanosecond precision.  (Contributed by
+  Larry Hastings in :issue:`14127`.)
+
 * The new :func:`os.get_terminal_size` function queries the size of the
   terminal attached to a file descriptor. See also
   :func:`shutil.get_terminal_size`.
@@ -1510,6 +1516,11 @@
     path also specifying the user/group names and not only their numeric
     ids. (Contributed by Sandro Tosi in :issue:`12191`)
 
+* :func:`~shutil.copy2` and :func:`~shutil.copystat` now preserve file
+  timestamps with nanosecond precision on platforms that support it.
+  They also preserve file "extended attributes" on Linux.  (Contributed
+  by Larry Hastings in :issue:`14127` and  :issue:`15238`.)
+
 * The new :func:`shutil.get_terminal_size` function returns the size of the
   terminal window the interpreter is attached to.
   (Contributed by Zbigniew J?drzejewski-Szmek in :issue:`13609`.)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 18:40:57 2012
From: python-checkins at python.org (larry.hastings)
Date: Fri, 21 Sep 2012 18:40:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Mention_that_=22defaults?=
 =?utf-8?q?=22_can_be_None_for_inspect=2Egetfullargspec=2E?=
Message-ID: <3XNgY539c7zQtQ@mail.python.org>

http://hg.python.org/cpython/rev/b0ad15e15dab
changeset:   79092:b0ad15e15dab
user:        Larry Hastings <larry at hastings.org>
date:        Fri Sep 21 09:40:41 2012 -0700
summary:
  Mention that "defaults" can be None for inspect.getfullargspec.
Also minor formatting cleanups.

files:
  Doc/library/inspect.rst |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -675,9 +675,9 @@
    :term:`named tuple` ``ArgSpec(args, varargs, keywords, defaults)`` is
    returned. *args* is a list of the argument names. *varargs* and *keywords*
    are the names of the ``*`` and ``**`` arguments or ``None``. *defaults* is a
-   tuple of default argument values or None if there are no default arguments;
-   if this tuple has *n* elements, they correspond to the last *n* elements
-   listed in *args*.
+   tuple of default argument values or ``None`` if there are no default
+   arguments; if this tuple has *n* elements, they correspond to the last
+   *n* elements listed in *args*.
 
    .. deprecated:: 3.0
       Use :func:`getfullargspec` instead, which provides information about
@@ -693,8 +693,9 @@
    annotations)``
 
    *args* is a list of the argument names.  *varargs* and *varkw* are the names
-   of the ``*`` and ``**`` arguments or ``None``.  *defaults* is an n-tuple of
-   the default values of the last n arguments.  *kwonlyargs* is a list of
+   of the ``*`` and ``**`` arguments or ``None``.  *defaults* is an *n*-tuple
+   of the default values of the last *n* arguments, or ``None`` if there are no
+   default arguments.  *kwonlyargs* is a list of
    keyword-only argument names.  *kwonlydefaults* is a dictionary mapping names
    from kwonlyargs to defaults.  *annotations* is a dictionary mapping argument
    names to annotations.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 21 19:12:24 2012
From: python-checkins at python.org (larry.hastings)
Date: Fri, 21 Sep 2012 19:12:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Cleanup/rewrite_shutil_doc?=
 =?utf-8?q?s_regarding_follow=5Fsymlinks_and_copying_attributes=2E?=
Message-ID: <3XNhFN2G2lzQp8@mail.python.org>

http://hg.python.org/cpython/rev/3e677956eef4
changeset:   79093:3e677956eef4
user:        Larry Hastings <larry at hastings.org>
date:        Fri Sep 21 10:12:14 2012 -0700
summary:
  Cleanup/rewrite shutil docs regarding follow_symlinks and copying attributes.

files:
  Doc/library/shutil.rst |  115 +++++++++++++++++++++-------
  1 files changed, 84 insertions(+), 31 deletions(-)


diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -50,14 +50,15 @@
 .. function:: copyfile(src, dst, *, follow_symlinks=True)
 
    Copy the contents (no metadata) of the file named *src* to a file named
-   *dst* and return *dst*.  *dst* must be the complete target file name; look at
-   :func:`shutil.copy` for a copy that accepts a target directory path.  If
-   *src* and *dst* are the same files, :exc:`Error` is raised.
+   *dst* and return *dst*.  *src* and *dst* are path names given as strings.
+   *dst* must be the complete target file name; look at :func:`shutil.copy`
+   for a copy that accepts a target directory path.  If *src* and *dst*
+   specify the same file, :exc:`Error` is raised.
 
-   The destination location must be writable; otherwise,  an :exc:`OSError` exception
-   will be raised. If *dst* already exists, it will be replaced.   Special files
-   such as character or block devices and pipes cannot be copied with this
-   function.  *src* and *dst* are path names given as strings.
+   The destination location must be writable; otherwise, an :exc:`OSError`
+   exception will be raised. If *dst* already exists, it will be replaced.
+   Special files such as character or block devices and pipes cannot be
+   copied with this function.
 
    If *follow_symlinks* is false and *src* is a symbolic link,
    a new symbolic link will be created instead of copying the
@@ -71,52 +72,104 @@
 .. function:: copymode(src, dst, *, follow_symlinks=True)
 
    Copy the permission bits from *src* to *dst*.  The file contents, owner, and
-   group are unaffected.  *src* and *dst* are path names given as strings.  If
-   *follow_symlinks* is false, *src* is a symbolic link, and the operating
-   system supports modes for symbolic links (for example BSD-based ones),
-   the mode of the link will be copied.
+   group are unaffected.  *src* and *dst* are path names given as strings.
+   If *follow_symlinks* is false, and both *src* and *dst* are symbolic links,
+   :func:`copymode` will attempt to modify the mode of *dst* itself (rather
+   than the file it points to).  This functionality is not available on every
+   platform; please see :func:`copystat` for more information.  If
+   :func:`copymode` cannot modify symbolic links on the local platform, and it
+   is asked to do so, it will do nothing and return.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument.
 
 .. function:: copystat(src, dst, *, follow_symlinks=True)
 
-   Copy the permission bits, last access time, last modification time, and flags
-   from *src* to *dst*.  The file contents, owner, and group are unaffected.  *src*
-   and *dst* are path names given as strings.  If *follow_symlinks* is false, and
-   *src* and *dst* are both symbolic links, the stats of the link will be copied as
-   far as the platform allows.  On Linux, :func:`copystat` also copies the
-   "extended attributes" where possible.
+   Copy the permission bits, last access time, last modification time, and
+   flags from *src* to *dst*.  On Linux, :func:`copystat` also copies the
+   "extended attributes" where possible.  The file contents, owner, and
+   group are unaffected.  *src* and *dst* are path names given as strings.
+
+   If *follow_symlinks* is false, and *src* and *dst* both
+   refer to symbolic links, :func:`copystat` will operate on
+   the symbolic links themselves rather than the files the
+   symbolic links refer to--reading the information from the
+   *src* symbolic link, and writing the information to the
+   *dst* symbolic link.
+
+   .. note::
+
+      Not all platforms provide the ability to examine and
+      modify symbolic links.  Python itself can tell you what
+      functionality is locally available.
+
+      * If ``os.chmod in os.supports_follow_symlinks`` is
+        ``True``, :func:`copystat` can modify the permission
+        bits of a symbolic link.
+
+      * If ``os.utime in os.supports_follow_symlinks`` is
+        ``True``, :func:`copystat` can modify the last access
+        and modification times of a symbolic link.
+
+      * If ``os.chflags in os.supports_follow_symlinks`` is
+        ``True``, :func:`copystat` can modify the flags of
+        a symbolic link.  (``os.chflags`` is not available on
+        all platforms.)
+
+      On platforms where some or all of this functionality
+      is unavailable, when asked to modify a symbolic link,
+      :func:`copystat` will copy everything it can.
+      :func:`copystat` never returns failure.
+
+      Please see :data:`os.supports_follow_symlinks`
+      for more information.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument and support for Linux extended attributes.
 
 .. function:: copy(src, dst, *, follow_symlinks=True)
 
-   Copy the file *src* to the file or directory *dst* and return the file's
-   destination.  If *dst* is a directory, a
-   file with the same basename as *src*  is created (or overwritten) in the
-   directory specified.  Permission bits are copied.  *src* and *dst* are path
-   names given as strings.  If *follow_symlinks* is false, symbolic
-   links won't be followed but recreated instead -- this resembles GNU's
-   :program:`cp -P`.
+   Copies the file *src* to the file or directory *dst*.  *src* and *dst*
+   should be strings.  If *dst* specifies a directory, the file will be
+   copied into *dst* using the base filename from *src*.  Returns the
+   path to the newly created file.
+
+   If *follow_symlinks* is false, and *src* is a symbolic link,
+   *dst* will be created as a symbolic link.  If *follow_symlinks*
+   is true and *src* is a symbolic link, *dst* will be a copy of
+   the file *src* refers to.
+
+   :func:`copy` copies the file data and the file's permission
+   mode (see :func:`os.chmod`).  Other metadata, like the
+   file's creation and modification times, is not preserved.
+   To preserve all file metadata from the original, use
+   :func:`~shutil.copy2` instead.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument.
-      Now returns *dst*.
+      Now returns path to the newly created file.
 
 .. function:: copy2(src, dst, *, follow_symlinks=True)
 
-   Similar to :func:`shutil.copy`, including that the destination is
-   returned, but metadata is copied as well. This is similar to the Unix
-   command :program:`cp -p`.  If *follow_symlinks* is false,
-   symbolic links won't be followed but recreated instead -- this resembles
-   GNU's :program:`cp -P`.
+   Identical to :func:`~shutil.copy` except that :func:`copy2`
+   also attempts to preserve all file metadata.
+
+   When *follow_symlinks* is false, and *src* is a symbolic
+   link, :func:`copy2` attempts to copy all metadata from the
+   *src* symbolic link to the newly-created *dst* symbolic link.
+   However, this functionality is not available on all platforms.
+   On platforms where some or all of this functionality is
+   unavailable, :func:`copy2` will preserve all the metadata
+   it can; :func:`copy2` never returns failure.
+
+   :func:`copy2` uses :func:`copystat` to copy the file metadata.
+   Please see :func:`copystat` for more information
+   about platform support for modifying symbolic link metadata.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument, try to copy extended
       file system attributes too (currently Linux only).
-      Now returns *dst*.
+      Now returns path to the newly created file.
 
 .. function:: ignore_patterns(\*patterns)
 

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Sat Sep 22 06:00:03 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sat, 22 Sep 2012 06:00:03 +0200
Subject: [Python-checkins] Daily reference leaks (3e677956eef4): sum=0
Message-ID: <E1TFGst-0000EB-4i@ap.vmr.nerim.net>

results for 3e677956eef4 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog9aulym', '-x']

From python-checkins at python.org  Sat Sep 22 10:25:42 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 22 Sep 2012 10:25:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTQ5LCAxNTg5?=
 =?utf-8?q?9=3A_avoid_using_non-latin1_chars_in_the_doc_=28they_break_=60m?=
 =?utf-8?q?ake?=
Message-ID: <3XP4WB09rZzQpV@mail.python.org>

http://hg.python.org/cpython/rev/0799fd1f8887
changeset:   79094:0799fd1f8887
branch:      3.2
parent:      79089:aa73e60f65e9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 22 11:23:06 2012 +0300
summary:
  #15949, 15899: avoid using non-latin1 chars in the doc (they break `make all-pdf`).

files:
  Doc/howto/unicode.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -262,8 +262,8 @@
         ...
     UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
       invalid start byte
-    >>> b'\x80abc'.decode("utf-8", "replace")
-    '?abc'
+    >>> b'\x80abc'.decode("utf-8", "replace")  #doctest: +SKIP
+    '?abc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 22 10:25:43 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sat, 22 Sep 2012 10:25:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1OTQ5LCAxNTg5OTogbWVyZ2Ugd2l0aCAzLjIu?=
Message-ID: <3XP4WC3XZbzQqK@mail.python.org>

http://hg.python.org/cpython/rev/832999a97e59
changeset:   79095:832999a97e59
parent:      79093:3e677956eef4
parent:      79094:0799fd1f8887
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Sep 22 11:25:22 2012 +0300
summary:
  #15949, 15899: merge with 3.2.

files:
  Doc/howto/unicode.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -262,8 +262,8 @@
         ...
     UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
       invalid start byte
-    >>> b'\x80abc'.decode("utf-8", "replace")
-    '?abc'
+    >>> b'\x80abc'.decode("utf-8", "replace")  #doctest: +SKIP
+    '?abc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 22 13:15:58 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 22 Sep 2012 13:15:58 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Add_3=2E3rc3=2E?=
Message-ID: <3XP8Hf2RLpzQqm@mail.python.org>

http://hg.python.org/peps/rev/4ec477b30383
changeset:   4516:4ec477b30383
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 22 13:12:34 2012 +0200
summary:
  Add 3.3rc3.

files:
  pep-0398.txt |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/pep-0398.txt b/pep-0398.txt
--- a/pep-0398.txt
+++ b/pep-0398.txt
@@ -45,7 +45,8 @@
 - 3.3.0 beta 2: August 11, 2012
 - 3.3.0 candidate 1: August 25, 2012
 - 3.3.0 candidate 2: September 8, 2012
-- 3.3.0 final: September 22, 2012
+- 3.3.0 candidate 3: September 22, 2012
+- 3.3.0 final: September 29, 2012
 
 .. don't forget to update final date above as well
 

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sat Sep 22 16:00:50 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 22 Sep 2012 16:00:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=2315925=3A_fix_regression?=
 =?utf-8?q?=3A_return_None_for_null_and_non-date_strings=2E?=
Message-ID: <3XPCxt6ZvrzQnH@mail.python.org>

http://hg.python.org/cpython/rev/3b03d31f6a79
changeset:   79096:3b03d31f6a79
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 22 09:59:51 2012 -0400
summary:
  #15925: fix regression: return None for null and non-date strings.

Since the logic for null detection had to move into the _parseaddr
functions, I removed the wrappers from email.utils and just import the
_parseaddr functions directly.

files:
  Lib/email/_parseaddr.py           |   4 +++
  Lib/email/utils.py                |  24 +-----------------
  Lib/test/test_email/test_email.py |  13 ++++++++-
  Misc/NEWS                         |   3 ++
  4 files changed, 20 insertions(+), 24 deletions(-)


diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -48,6 +48,8 @@
     Accounts for military timezones.
     """
     res = _parsedate_tz(data)
+    if not res:
+        return
     if res[9] is None:
         res[9] = 0
     return tuple(res)
@@ -62,6 +64,8 @@
     source timezone really was UTC.
 
     """
+    if not data:
+        return
     data = data.split()
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -37,10 +37,7 @@
 from email._parseaddr import AddressList as _AddressList
 from email._parseaddr import mktime_tz
 
-# We need wormarounds for bugs in these methods in older Pythons (see below)
-from email._parseaddr import parsedate as _parsedate
-from email._parseaddr import parsedate_tz as _parsedate_tz
-from email._parseaddr import _parsedate_tz as __parsedate_tz
+from email._parseaddr import parsedate, parsedate_tz, _parsedate_tz
 
 from quopri import decodestring as _qdecode
 
@@ -222,25 +219,8 @@
     return msgid
 
 
-
-# These functions are in the standalone mimelib version only because they've
-# subsequently been fixed in the latest Python versions.  We use this to worm
-# around broken older Pythons.
-def parsedate(data):
-    if not data:
-        return None
-    return _parsedate(data)
-
-
-def parsedate_tz(data):
-    if not data:
-        return None
-    return _parsedate_tz(data)
-
 def parsedate_to_datetime(data):
-    if not data:
-        return None
-    *dtuple, tz = __parsedate_tz(data)
+    *dtuple, tz = _parsedate_tz(data)
     if tz is None:
         return datetime.datetime(*dtuple[:6])
     return datetime.datetime(*dtuple[:6],
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -2718,8 +2718,17 @@
             utils.formatdate(now, localtime=False, usegmt=True),
             time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.gmtime(now)))
 
-    def test_parsedate_none(self):
-        self.assertEqual(utils.parsedate(''), None)
+    # parsedate and parsedate_tz will become deprecated interfaces someday
+    def test_parsedate_returns_None_for_invalid_strings(self):
+        self.assertIsNone(utils.parsedate(''))
+        self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate('0'))
+        self.assertIsNone(utils.parsedate_tz('0'))
+        self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
+        self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time'))
+        # Not a part of the spec but, but this has historically worked:
+        self.assertIsNone(utils.parsedate(None))
+        self.assertIsNone(utils.parsedate_tz(None))
 
     def test_parsedate_compact(self):
         # The FWS after the comma is optional
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@
 Library
 -------
 
+- Issue #15925: fixed regression in email.utils.parsedate and parsedate_tz
+  handling of empty and non-date strings.
+
 - Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
   datetime.MAXYEAR.  Patch by C?dric Krier.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 05:26:14 2012
From: python-checkins at python.org (daniel.holth)
Date: Sun, 23 Sep 2012 05:26:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_recapitalize_PyPy?=
Message-ID: <3XPYqB1KprzQtW@mail.python.org>

http://hg.python.org/peps/rev/ef571dfb0d00
changeset:   4517:ef571dfb0d00
user:        Daniel Holth <dholth at fastmail.fm>
date:        Sat Sep 22 23:26:05 2012 -0400
summary:
  recapitalize PyPy

files:
  pep-0425.txt |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/pep-0425.txt b/pep-0425.txt
--- a/pep-0425.txt
+++ b/pep-0425.txt
@@ -82,7 +82,7 @@
 Other Python implementations should use `sys.implementation.name`.
 
 The version is `py_version_nodot`.  CPython gets away with no dot,
-but if one is needed the underscore `_` is used instead.  Pypy should
+but if one is needed the underscore `_` is used instead.  PyPy should
 probably use its own versions here `pp18`, `pp19`.
 
 The version can be just the major version `2` or `3` `py2`, `py3` for

-- 
Repository URL: http://hg.python.org/peps

From solipsis at pitrou.net  Sun Sep 23 06:05:39 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Sun, 23 Sep 2012 06:05:39 +0200
Subject: [Python-checkins] Daily reference leaks (3b03d31f6a79): sum=0
Message-ID: <E1TFdRr-0006tT-4g@ap.vmr.nerim.net>

results for 3b03d31f6a79 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogpPoexi', '-x']

From python-checkins at python.org  Sun Sep 23 11:13:21 2012
From: python-checkins at python.org (victor.stinner)
Date: Sun, 23 Sep 2012 11:13:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=235969=3A_faulthand?=
 =?utf-8?q?ler_module=3A_rename_dump=5Ftracebacks=5Flater=28=29_to?=
Message-ID: <3XPjWj5XQmzQwc@mail.python.org>

http://hg.python.org/cpython/rev/abf23c22231e
changeset:   79097:abf23c22231e
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sun Sep 23 11:06:21 2012 +0200
summary:
  Issue #5969: faulthandler module: rename dump_tracebacks_later() to
dump_traceback_later() and cancel_dump_tracebacks_later() to
cancel_dump_traceback_later().

files:
  Doc/library/faulthandler.rst  |   8 ++--
  Lib/test/test_faulthandler.py |  38 +++++++++++-----------
  Misc/NEWS                     |   3 +
  Modules/faulthandler.c        |  28 ++++++++--------
  4 files changed, 40 insertions(+), 37 deletions(-)


diff --git a/Doc/library/faulthandler.rst b/Doc/library/faulthandler.rst
--- a/Doc/library/faulthandler.rst
+++ b/Doc/library/faulthandler.rst
@@ -71,7 +71,7 @@
 Dump the tracebacks after a timeout
 -----------------------------------
 
-.. function:: dump_tracebacks_later(timeout, repeat=False, file=sys.stderr, exit=False)
+.. function:: dump_traceback_later(timeout, repeat=False, file=sys.stderr, exit=False)
 
    Dump the tracebacks of all threads, after a timeout of *timeout* seconds, or
    every *timeout* seconds if *repeat* is ``True``.  If *exit* is ``True``, call
@@ -84,9 +84,9 @@
    This function is implemented using a watchdog thread and therefore is not
    available if Python is compiled with threads disabled.
 
-.. function:: cancel_dump_tracebacks_later()
+.. function:: cancel_dump_traceback_later()
 
-   Cancel the last call to :func:`dump_tracebacks_later`.
+   Cancel the last call to :func:`dump_traceback_later`.
 
 
 Dump the traceback on a user signal
@@ -112,7 +112,7 @@
 File descriptor issue
 ---------------------
 
-:func:`enable`, :func:`dump_tracebacks_later` and :func:`register` keep the
+:func:`enable`, :func:`dump_traceback_later` and :func:`register` keep the
 file descriptor of their *file* argument. If the file is closed and its file
 descriptor is reused by a new file, or if :func:`os.dup2` is used to replace
 the file descriptor, the traceback will be written into a different file. Call
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -407,7 +407,7 @@
         with temporary_filename() as filename:
             self.check_dump_traceback_threads(filename)
 
-    def _check_dump_tracebacks_later(self, repeat, cancel, filename, loops):
+    def _check_dump_traceback_later(self, repeat, cancel, filename, loops):
         """
         Check how many times the traceback is written in timeout x 2.5 seconds,
         or timeout x 3.5 seconds if cancel is True: 1, 2 or 3 times depending
@@ -422,11 +422,11 @@
 
 def func(timeout, repeat, cancel, file, loops):
     for loop in range(loops):
-        faulthandler.dump_tracebacks_later(timeout, repeat=repeat, file=file)
+        faulthandler.dump_traceback_later(timeout, repeat=repeat, file=file)
         if cancel:
-            faulthandler.cancel_dump_tracebacks_later()
+            faulthandler.cancel_dump_traceback_later()
         time.sleep(timeout * 5)
-        faulthandler.cancel_dump_tracebacks_later()
+        faulthandler.cancel_dump_traceback_later()
 
 timeout = {timeout}
 repeat = {repeat}
@@ -462,9 +462,9 @@
             self.assertEqual(trace, '')
         self.assertEqual(exitcode, 0)
 
-    @unittest.skipIf(not hasattr(faulthandler, 'dump_tracebacks_later'),
-                     'need faulthandler.dump_tracebacks_later()')
-    def check_dump_tracebacks_later(self, repeat=False, cancel=False,
+    @unittest.skipIf(not hasattr(faulthandler, 'dump_traceback_later'),
+                     'need faulthandler.dump_traceback_later()')
+    def check_dump_traceback_later(self, repeat=False, cancel=False,
                                     file=False, twice=False):
         if twice:
             loops = 2
@@ -472,25 +472,25 @@
             loops = 1
         if file:
             with temporary_filename() as filename:
-                self._check_dump_tracebacks_later(repeat, cancel,
+                self._check_dump_traceback_later(repeat, cancel,
                                                   filename, loops)
         else:
-            self._check_dump_tracebacks_later(repeat, cancel, None, loops)
+            self._check_dump_traceback_later(repeat, cancel, None, loops)
 
-    def test_dump_tracebacks_later(self):
-        self.check_dump_tracebacks_later()
+    def test_dump_traceback_later(self):
+        self.check_dump_traceback_later()
 
-    def test_dump_tracebacks_later_repeat(self):
-        self.check_dump_tracebacks_later(repeat=True)
+    def test_dump_traceback_later_repeat(self):
+        self.check_dump_traceback_later(repeat=True)
 
-    def test_dump_tracebacks_later_cancel(self):
-        self.check_dump_tracebacks_later(cancel=True)
+    def test_dump_traceback_later_cancel(self):
+        self.check_dump_traceback_later(cancel=True)
 
-    def test_dump_tracebacks_later_file(self):
-        self.check_dump_tracebacks_later(file=True)
+    def test_dump_traceback_later_file(self):
+        self.check_dump_traceback_later(file=True)
 
-    def test_dump_tracebacks_later_twice(self):
-        self.check_dump_tracebacks_later(twice=True)
+    def test_dump_traceback_later_twice(self):
+        self.check_dump_traceback_later(twice=True)
 
     @unittest.skipIf(not hasattr(faulthandler, "register"),
                      "need faulthandler.register")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,9 @@
 Library
 -------
 
+- Issue #5969: faulthandler module: rename dump_tracebacks_later() to
+  dump_traceback_later() and cancel_dump_tracebacks_later() to
+  cancel_dump_traceback_later().
 
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -462,7 +462,7 @@
 }
 
 static void
-cancel_dump_tracebacks_later(void)
+cancel_dump_traceback_later(void)
 {
     /* Notify cancellation */
     PyThread_release_lock(thread.cancel_event);
@@ -509,7 +509,7 @@
 }
 
 static PyObject*
-faulthandler_dump_tracebacks_later(PyObject *self,
+faulthandler_dump_traceback_later(PyObject *self,
                                    PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = {"timeout", "repeat", "file", "exit", NULL};
@@ -524,7 +524,7 @@
     size_t header_len;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "d|iOi:dump_tracebacks_later", kwlist,
+        "d|iOi:dump_traceback_later", kwlist,
         &timeout, &repeat, &file, &exit))
         return NULL;
     if ((timeout * 1e6) >= (double) PY_TIMEOUT_MAX) {
@@ -552,7 +552,7 @@
     header_len = strlen(header);
 
     /* Cancel previous thread, if running */
-    cancel_dump_tracebacks_later();
+    cancel_dump_traceback_later();
 
     Py_XDECREF(thread.file);
     Py_INCREF(file);
@@ -582,9 +582,9 @@
 }
 
 static PyObject*
-faulthandler_cancel_dump_tracebacks_later_py(PyObject *self)
+faulthandler_cancel_dump_traceback_later_py(PyObject *self)
 {
-    cancel_dump_tracebacks_later();
+    cancel_dump_traceback_later();
     Py_RETURN_NONE;
 }
 #endif  /* FAULTHANDLER_LATER */
@@ -970,16 +970,16 @@
                "dump the traceback of the current thread, or of all threads "
                "if all_threads is True, into file")},
 #ifdef FAULTHANDLER_LATER
-    {"dump_tracebacks_later",
-     (PyCFunction)faulthandler_dump_tracebacks_later, METH_VARARGS|METH_KEYWORDS,
-     PyDoc_STR("dump_tracebacks_later(timeout, repeat=False, file=sys.stderrn, exit=False):\n"
+    {"dump_traceback_later",
+     (PyCFunction)faulthandler_dump_traceback_later, METH_VARARGS|METH_KEYWORDS,
+     PyDoc_STR("dump_traceback_later(timeout, repeat=False, file=sys.stderrn, exit=False):\n"
                "dump the traceback of all threads in timeout seconds,\n"
                "or each timeout seconds if repeat is True. If exit is True, "
                "call _exit(1) which is not safe.")},
-    {"cancel_dump_tracebacks_later",
-     (PyCFunction)faulthandler_cancel_dump_tracebacks_later_py, METH_NOARGS,
-     PyDoc_STR("cancel_dump_tracebacks_later():\ncancel the previous call "
-               "to dump_tracebacks_later().")},
+    {"cancel_dump_traceback_later",
+     (PyCFunction)faulthandler_cancel_dump_traceback_later_py, METH_NOARGS,
+     PyDoc_STR("cancel_dump_traceback_later():\ncancel the previous call "
+               "to dump_traceback_later().")},
 #endif
 
 #ifdef FAULTHANDLER_USER
@@ -1120,7 +1120,7 @@
 #ifdef FAULTHANDLER_LATER
     /* later */
     if (thread.cancel_event) {
-        cancel_dump_tracebacks_later();
+        cancel_dump_traceback_later();
         PyThread_release_lock(thread.cancel_event);
         PyThread_free_lock(thread.cancel_event);
         thread.cancel_event = NULL;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 11:15:23 2012
From: python-checkins at python.org (victor.stinner)
Date: Sun, 23 Sep 2012 11:15:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315969=3A_Fix_the_?=
	=?utf-8?q?issue_number_in_Misc/NEWS?=
Message-ID: <3XPjZ31rBkzQwc@mail.python.org>

http://hg.python.org/cpython/rev/178f9042af81
changeset:   79098:178f9042af81
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sun Sep 23 11:11:07 2012 +0200
summary:
  Issue #15969: Fix the issue number in Misc/NEWS

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,7 +127,7 @@
 Library
 -------
 
-- Issue #5969: faulthandler module: rename dump_tracebacks_later() to
+- Issue #15969: faulthandler module: rename dump_tracebacks_later() to
   dump_traceback_later() and cancel_dump_tracebacks_later() to
   cancel_dump_traceback_later().
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 14:42:20 2012
From: python-checkins at python.org (daniel.holth)
Date: Sun, 23 Sep 2012 14:42:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_full_text_of_wheel_PEP?=
Message-ID: <3XPp8r1d08zQwj@mail.python.org>

http://hg.python.org/peps/rev/5ffb06c1de60
changeset:   4518:5ffb06c1de60
parent:      4516:4ec477b30383
user:        Daniel Holth <dholth at fastmail.fm>
date:        Sat Sep 22 23:24:31 2012 -0400
summary:
  full text of wheel PEP

files:
  pep-0427.txt |  295 +++++++++++++++++++++++++++++++++++++-
  1 files changed, 284 insertions(+), 11 deletions(-)


diff --git a/pep-0427.txt b/pep-0427.txt
--- a/pep-0427.txt
+++ b/pep-0427.txt
@@ -1,4 +1,4 @@
-PEP: 426
+PEP: 427
 Title: The Wheel Binary Package Format 1.0
 Version: $Revision$
 Last-Modified: $Date$
@@ -13,18 +13,291 @@
 Abstract
 ========
 
-This PEP describes a binary format for Python called wheel.
+This PEP describes a built-package format for Python called wheel.
+
+A wheel is a ZIP-format archive with a specially formatted file name and
+the .whl extension. It contains a single distribution nearly as it would
+be installed according to PEP 376 with a particular installation scheme.
+A wheel file may be installed by simply unpacking into site-packages
+with the standard ?unzip? tool, while preserving enough information
+to spread its contents out onto their final paths at any later time.
+
+Rationale
+=========
+
+Python needs a package format that is easier to install than sdist.
+Python?s sdist packages are defined by and require the distutils and
+setuptools build systems, running arbitrary code to build-and-install,
+and re-compile, code just so it can be installed into a new virtualenv.
+This system of conflating build-install is slow, hard to maintain, and
+hinders innovation in both build systems and installers.
+
+Wheel attempts to remedy these problems by providing a simpler interface
+between the build system and the installer. The wheel binary package
+format frees installers from having to know about the build system,
+saves time by amortizing compile time over many installations, and
+removes the need to install a build system in the target environment.
+
+Details
+=======
+
+Installing a wheel ?distribution-1.0.py32.none.any.whl?
+-------------------------------------------------------
+
+#. Unpack.
+
+    a. Parse distribution-1.0.dist-info/WHEEL.
+    b. Check that installer is compatible with Wheel-Version. Warn if minor
+       version is greater, abort if major version is greater.
+    c. If Root-Is-Purelib == ?true?, unpack archive into purelib
+       (site-packages).
+    d. Else unpack archive into platlib (site-packages).
+
+#. Spread.
+
+    a. Unpacked archive includes distribution-1.0.dist-info/ and (if there
+       is data) distribution-1.0.data/
+    b. Move each subtree of distribution-1.0.data/ onto its destination
+       path. Each subdirectory of distribution-1.0.data/ is a key into
+       sysconfig.get\_paths(), such as
+       distribution-1.0.data/(config\|purelib\|platlib\|scripts).
+       See` <http://docs.python.org/dev/packaging/setupcfg.html#resources>`_`http://docs.python.org/dev/packaging/setupcfg.html#resources <http://docs.python.org/dev/packaging/setupcfg.html#resources>`_
+    c. If applicable, update scripts starting with ?#!python? to point to
+       the correct interpreter.
+    d. Update distribution-1.0.dist.info/RECORD with the installed paths.
+    e. Remove empty distribution-1.0.data directory.
+
+File Format
+-----------
+
+File name convention
+~~~~~~~~~~~~~~~~~~~~
+
+The wheel filename is {distribution}-{version}(-{build tag})?-{python
+tag}-{abi tag}-{platform tag}.whl
+
+distribution
+    Distribution name, e.g. ?django?, ?pyramid?
+
+version
+    PEP-386 compliant version, e.g. 1.0
+
+build tag
+    Optional build number. Must start with a digit. A tie breaker if two
+    wheels have the same version. Sort as None if unspecified, else sort
+    the initial digits as a number, and the remainder lexicographically.
+
+language implementation and version tag
+    ?py27? ?py2? ?py3?
+
+abi tag
+    ?cp33m?, ?abi3?, ?none?
+
+platform tag
+    ?linux\_x86\_64?, ?any?
+
+For example, distribution-1.0-1-py27-none-any.whl is the first build
+of a package called 'distribution', and is compatible with Python 2.7
+(any Python 2.7 implementation), with no abi (pure Python), on any CPU
+architecture.
+
+The last three components of the filename before the extension are
+called ?compatibility tags.? The compatibility tags express
+the package?s basic interpreter requirements and are detailed
+in `PEP 425 <http://hg.python.org/peps/file/tip/pep-0425.txt>`_.
+
+
+File contents
+~~~~~~~~~~~~~
+
+#. Wheel files contain a folder {distribution}-{version}.dist-info/ with
+   the PEP 426 metadata (Metadata version 1.3 or greater) and an
+   additional file WHEEL with metadata about the archive itself.
+#. The root of a .whl is installed into one of purelib or platlib.
+#. Wheel files contain metadata about the wheel format itself in
+   {distribution}-{version}.dist-info/WHEEL::
+
+    Wheel-Version: 1.0
+    Generator: bdist_wheel 0.7
+    Root-Is-Purelib: true
+
+#. Wheel-Version is the version number of the Wheel specification.
+   Generator is the name and optionally the version of the software that
+   produced the archive. Root-Is-Purelib is true if the top level
+   directory of the archive should be installed into purelib; otherwise
+   the root should be installed into platlib.
+#. A wheel installer should warn if Wheel-Version is greater than the
+   version it supports, and fail if Wheel-Version has a greater major
+   version than the version it supports.
+#. If a .whl contains scripts, both purelib and platlib, or any other
+   files that are not installed on sys.path, they are found in
+   {distribution}-{version}.data/{key}, where {key} is an index into
+   sysconfig.get\_paths().
+#. Wheel, being an installation format that is intended to work across
+   multiple versions of Python, does not generally include .pyc files.
+#. Wheel does not contain setup.py or setup.cfg.
+
+
+The .dist-info directory
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Wheel .dist-info directories include at a minimum METADATA, WHEEL,
+   and RECORD.
+#. METADATA is the PEP 426 metadata (Metadata version 1.3 or greater)
+#. WHEEL is the wheel metadata, specific to a build of the package.
+#. RECORD is a list of (almost) all the files in the wheel and their
+   secure hashes. Unlike PEP 376, every file except RECORD, which cannot
+   contain a hash of itself, must include its hash. The hash algorithm
+   must be sha256 or better; specifically, md5 and sha1 are not
+   permitted, as signed wheel files rely on the strong hashes in RECORD to
+   validate the integrity of the archive.
+#. INSTALLER and REQUESTED are not included in the archive.
+#. RECORD.jws is used for digital signatures. It is not mentioned in
+   RECORD.
+#. RECORD.p7s is reserved as a courtesy to anyone who would prefer to
+   use s/mime signatures to secure their wheel files. It is not
+   mentioned in RECORD.
+#. During extraction, wheel installers verify all the hashes in RECORD
+   against the file contents. Apart from RECORD and its signatures,
+   installation will fail if any file in the archive is not both
+   mentioned and correctly hashed in RECORD.
+
+
+The .data directory
+^^^^^^^^^^^^^^^^^^^
+
+Any file that is not normally installed inside site-packages goes into
+the .data directory, named as the .dist-info directory but with the
+.data/ extension::
+
+    distribution-1.0.dist-info/
+
+    distribution-1.0.data/
+
+The .data directory contains subdirectories named after the keys of
+sysconfig.get\_paths(), and those subdirectories contain the scripts,
+headers, documentation and so forth from the distribution. During
+installation the contents of these subdirectories are moved onto their
+destination paths.
+
+
+Signed wheel files
+------------------
+
+Wheel files include an extended RECORD that enables digital signatures.
+PEP 376?s RECORD is altered to include
+digestname=urlsafe\_b64encode\_nopad(digest) (urlsafe base64 encoding
+with no trailing = characters) as the second column instead of an
+md5sum. All possible entries are hashed, including any generated files
+such as .pyc files, but not RECORD. For example::
+
+    file.py,sha256=AVTFPZpEKzuHr7OvQZmhaU3LvwKz06AJw8mT\_pNh2yI,3144
+    distribution-1.0.dist-info/RECORD,,
+
+RECORD.jws is not mentioned in RECORD at all. Every other file in the
+archive must have a correct hash in RECORD, or the installation will
+fail.
+
+The signature is one or more JSON Web Signature JSON Serialization
+(JWS-JS) signatures stored in a file RECORD.jws adjacent to RECORD.
+
+A signature-aware installer can be instructed to check for a particular
+Ed25519 public key by using an extended ?extras? syntax.::
+
+    # request a normal optional feature "extra", and indicate
+    # the package should be signed by a particular 
+    # urlsafe-b64encode-nopad encoded ed25519 public key:
+    package[extra, ed25519=ouBJlTJJ4SJXoy8Bi1KRlewWLU6JW7HUXTgvU1YRuiA]
+
+An application could distribute a requires.txt file with many such lines
+for all its dependencies and their public keys. By installing from this
+file an application?s users would know whether the applicaton?s
+dependencies came from the correct publishers.
+
+Applications that wish to ?fail open? for backwards compatibility with
+non-signature-aware installers should specify that their package
+provides the extra ed25519=(key) with no associated dependencies.
+
+Key distribution is outside the scope of this spec. Public wheel signing
+keys could be signed with the packager?s GPG key or stored at
+an https://-protected URL.
+
+
+JSON Web Signatures Extensions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Ed25519 algorithm is used as an extension to the JSON Web Signatures
+specification. Wheel uses alg="Ed25519" in the header. The key attribute
+holds the signature?s public JSON Web Key. For JSON Web Key / JSON
+Private Key the verifying (public) key is called vk and the signing
+(private) key is called sk.
+
+Example header::
+
+    {
+     "alg": "Ed25519",
+     "typ": "JWT",
+     "key": {
+     "alg": "Ed25519",
+     "vk": "tmAYCrSfj8gtJ10v3VkvW7jOndKmQIYE12hgnFu3cvk"
+     }
+    }
+
+A future version of wheel may omit typ.
+
+Example payload::
+
+    { "hash": "sha256=ADD-r2urObZHcxBW3Cr-vDCu5RJwT4CaRTHiFmbcIYY" }
+
+A future version of wheel may include timestamps in the payload or in
+the signature.
+
+See
+
+- http://self-issued.info/docs/draft-ietf-jose-json-web-signature.html
+- http://self-issued.info/docs/draft-jones-json-web-signature-json-serialization-01.html 
+- http://self-issued.info/docs/draft-ietf-jose-json-web-key-05.html
+- http://self-issued.info/docs/draft-jones-jose-json-private-key-00.html 
+
+
+Comparison to .egg
+------------------
+
+#. Wheel is an installation format; egg is importable. Wheel archives do
+   not need to include .pyc and are less tied to a specific Python
+   version or implementation. Wheel can install (pure Python) packages
+   built with previous versions of Python so you don?t always have to
+   wait for the packager to catch up.
+#. Wheel uses .dist-info directories; egg uses .egg-info. Wheel is
+   compatible with the new world of Python packaging and the new
+   concepts it brings.
+#. Wheel has a richer file naming convention for today?s
+   multi-implementation world. A single wheel archive can indicate its
+   compatibility with a number of Python language versions and
+   implementations, ABIs, and system architectures. Historically the ABI
+   has been specific to a CPython release, wheel is ready for the stable
+   ABI.
+#. Wheel is lossless. The first wheel implementation bdist\_wheel always
+   generates egg-info, and then converts it to a .whl. It is also
+   possible to convert existing eggs and bdist\_wininst distributions.
+#. Wheel is versioned. Every wheel file contains the version of the
+   wheel specification and the implementation that packaged it.
+   Hopefully the next migration can simply be to Wheel 2.0.
+#. Wheel is a reference to the other Python.
+
+
+FAQ
+===
+
+Wheel defines a .data directory. Should I put all my data there?
+    No. The word 'data' is used only because it is short, and is only
+    meant to indicate files that are not installed into site-packages.
+    This specification does not have an opinion on how you should organize
+    your code.
+
 
 Copyright
 =========
 
-This document has been placed in the public domain.
+This document has been placed into the public domain.
 
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 70
-   End:

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 23 14:42:22 2012
From: python-checkins at python.org (daniel.holth)
Date: Sun, 23 Sep 2012 14:42:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps_=28merge_default_-=3E_default=29?=
	=?utf-8?q?=3A_merge?=
Message-ID: <3XPp8t16RRzQwj@mail.python.org>

http://hg.python.org/peps/rev/6bab51bc9eaf
changeset:   4519:6bab51bc9eaf
parent:      4517:ef571dfb0d00
parent:      4518:5ffb06c1de60
user:        Daniel Holth <dholth at fastmail.fm>
date:        Mon Jan 07 19:41:36 2002 -0500
summary:
  merge

files:
  pep-0427.txt |  295 +++++++++++++++++++++++++++++++++++++-
  1 files changed, 284 insertions(+), 11 deletions(-)


diff --git a/pep-0427.txt b/pep-0427.txt
--- a/pep-0427.txt
+++ b/pep-0427.txt
@@ -1,4 +1,4 @@
-PEP: 426
+PEP: 427
 Title: The Wheel Binary Package Format 1.0
 Version: $Revision$
 Last-Modified: $Date$
@@ -13,18 +13,291 @@
 Abstract
 ========
 
-This PEP describes a binary format for Python called wheel.
+This PEP describes a built-package format for Python called wheel.
+
+A wheel is a ZIP-format archive with a specially formatted file name and
+the .whl extension. It contains a single distribution nearly as it would
+be installed according to PEP 376 with a particular installation scheme.
+A wheel file may be installed by simply unpacking into site-packages
+with the standard ?unzip? tool, while preserving enough information
+to spread its contents out onto their final paths at any later time.
+
+Rationale
+=========
+
+Python needs a package format that is easier to install than sdist.
+Python?s sdist packages are defined by and require the distutils and
+setuptools build systems, running arbitrary code to build-and-install,
+and re-compile, code just so it can be installed into a new virtualenv.
+This system of conflating build-install is slow, hard to maintain, and
+hinders innovation in both build systems and installers.
+
+Wheel attempts to remedy these problems by providing a simpler interface
+between the build system and the installer. The wheel binary package
+format frees installers from having to know about the build system,
+saves time by amortizing compile time over many installations, and
+removes the need to install a build system in the target environment.
+
+Details
+=======
+
+Installing a wheel ?distribution-1.0.py32.none.any.whl?
+-------------------------------------------------------
+
+#. Unpack.
+
+    a. Parse distribution-1.0.dist-info/WHEEL.
+    b. Check that installer is compatible with Wheel-Version. Warn if minor
+       version is greater, abort if major version is greater.
+    c. If Root-Is-Purelib == ?true?, unpack archive into purelib
+       (site-packages).
+    d. Else unpack archive into platlib (site-packages).
+
+#. Spread.
+
+    a. Unpacked archive includes distribution-1.0.dist-info/ and (if there
+       is data) distribution-1.0.data/
+    b. Move each subtree of distribution-1.0.data/ onto its destination
+       path. Each subdirectory of distribution-1.0.data/ is a key into
+       sysconfig.get\_paths(), such as
+       distribution-1.0.data/(config\|purelib\|platlib\|scripts).
+       See` <http://docs.python.org/dev/packaging/setupcfg.html#resources>`_`http://docs.python.org/dev/packaging/setupcfg.html#resources <http://docs.python.org/dev/packaging/setupcfg.html#resources>`_
+    c. If applicable, update scripts starting with ?#!python? to point to
+       the correct interpreter.
+    d. Update distribution-1.0.dist.info/RECORD with the installed paths.
+    e. Remove empty distribution-1.0.data directory.
+
+File Format
+-----------
+
+File name convention
+~~~~~~~~~~~~~~~~~~~~
+
+The wheel filename is {distribution}-{version}(-{build tag})?-{python
+tag}-{abi tag}-{platform tag}.whl
+
+distribution
+    Distribution name, e.g. ?django?, ?pyramid?
+
+version
+    PEP-386 compliant version, e.g. 1.0
+
+build tag
+    Optional build number. Must start with a digit. A tie breaker if two
+    wheels have the same version. Sort as None if unspecified, else sort
+    the initial digits as a number, and the remainder lexicographically.
+
+language implementation and version tag
+    ?py27? ?py2? ?py3?
+
+abi tag
+    ?cp33m?, ?abi3?, ?none?
+
+platform tag
+    ?linux\_x86\_64?, ?any?
+
+For example, distribution-1.0-1-py27-none-any.whl is the first build
+of a package called 'distribution', and is compatible with Python 2.7
+(any Python 2.7 implementation), with no abi (pure Python), on any CPU
+architecture.
+
+The last three components of the filename before the extension are
+called ?compatibility tags.? The compatibility tags express
+the package?s basic interpreter requirements and are detailed
+in `PEP 425 <http://hg.python.org/peps/file/tip/pep-0425.txt>`_.
+
+
+File contents
+~~~~~~~~~~~~~
+
+#. Wheel files contain a folder {distribution}-{version}.dist-info/ with
+   the PEP 426 metadata (Metadata version 1.3 or greater) and an
+   additional file WHEEL with metadata about the archive itself.
+#. The root of a .whl is installed into one of purelib or platlib.
+#. Wheel files contain metadata about the wheel format itself in
+   {distribution}-{version}.dist-info/WHEEL::
+
+    Wheel-Version: 1.0
+    Generator: bdist_wheel 0.7
+    Root-Is-Purelib: true
+
+#. Wheel-Version is the version number of the Wheel specification.
+   Generator is the name and optionally the version of the software that
+   produced the archive. Root-Is-Purelib is true if the top level
+   directory of the archive should be installed into purelib; otherwise
+   the root should be installed into platlib.
+#. A wheel installer should warn if Wheel-Version is greater than the
+   version it supports, and fail if Wheel-Version has a greater major
+   version than the version it supports.
+#. If a .whl contains scripts, both purelib and platlib, or any other
+   files that are not installed on sys.path, they are found in
+   {distribution}-{version}.data/{key}, where {key} is an index into
+   sysconfig.get\_paths().
+#. Wheel, being an installation format that is intended to work across
+   multiple versions of Python, does not generally include .pyc files.
+#. Wheel does not contain setup.py or setup.cfg.
+
+
+The .dist-info directory
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. Wheel .dist-info directories include at a minimum METADATA, WHEEL,
+   and RECORD.
+#. METADATA is the PEP 426 metadata (Metadata version 1.3 or greater)
+#. WHEEL is the wheel metadata, specific to a build of the package.
+#. RECORD is a list of (almost) all the files in the wheel and their
+   secure hashes. Unlike PEP 376, every file except RECORD, which cannot
+   contain a hash of itself, must include its hash. The hash algorithm
+   must be sha256 or better; specifically, md5 and sha1 are not
+   permitted, as signed wheel files rely on the strong hashes in RECORD to
+   validate the integrity of the archive.
+#. INSTALLER and REQUESTED are not included in the archive.
+#. RECORD.jws is used for digital signatures. It is not mentioned in
+   RECORD.
+#. RECORD.p7s is reserved as a courtesy to anyone who would prefer to
+   use s/mime signatures to secure their wheel files. It is not
+   mentioned in RECORD.
+#. During extraction, wheel installers verify all the hashes in RECORD
+   against the file contents. Apart from RECORD and its signatures,
+   installation will fail if any file in the archive is not both
+   mentioned and correctly hashed in RECORD.
+
+
+The .data directory
+^^^^^^^^^^^^^^^^^^^
+
+Any file that is not normally installed inside site-packages goes into
+the .data directory, named as the .dist-info directory but with the
+.data/ extension::
+
+    distribution-1.0.dist-info/
+
+    distribution-1.0.data/
+
+The .data directory contains subdirectories named after the keys of
+sysconfig.get\_paths(), and those subdirectories contain the scripts,
+headers, documentation and so forth from the distribution. During
+installation the contents of these subdirectories are moved onto their
+destination paths.
+
+
+Signed wheel files
+------------------
+
+Wheel files include an extended RECORD that enables digital signatures.
+PEP 376?s RECORD is altered to include
+digestname=urlsafe\_b64encode\_nopad(digest) (urlsafe base64 encoding
+with no trailing = characters) as the second column instead of an
+md5sum. All possible entries are hashed, including any generated files
+such as .pyc files, but not RECORD. For example::
+
+    file.py,sha256=AVTFPZpEKzuHr7OvQZmhaU3LvwKz06AJw8mT\_pNh2yI,3144
+    distribution-1.0.dist-info/RECORD,,
+
+RECORD.jws is not mentioned in RECORD at all. Every other file in the
+archive must have a correct hash in RECORD, or the installation will
+fail.
+
+The signature is one or more JSON Web Signature JSON Serialization
+(JWS-JS) signatures stored in a file RECORD.jws adjacent to RECORD.
+
+A signature-aware installer can be instructed to check for a particular
+Ed25519 public key by using an extended ?extras? syntax.::
+
+    # request a normal optional feature "extra", and indicate
+    # the package should be signed by a particular 
+    # urlsafe-b64encode-nopad encoded ed25519 public key:
+    package[extra, ed25519=ouBJlTJJ4SJXoy8Bi1KRlewWLU6JW7HUXTgvU1YRuiA]
+
+An application could distribute a requires.txt file with many such lines
+for all its dependencies and their public keys. By installing from this
+file an application?s users would know whether the applicaton?s
+dependencies came from the correct publishers.
+
+Applications that wish to ?fail open? for backwards compatibility with
+non-signature-aware installers should specify that their package
+provides the extra ed25519=(key) with no associated dependencies.
+
+Key distribution is outside the scope of this spec. Public wheel signing
+keys could be signed with the packager?s GPG key or stored at
+an https://-protected URL.
+
+
+JSON Web Signatures Extensions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Ed25519 algorithm is used as an extension to the JSON Web Signatures
+specification. Wheel uses alg="Ed25519" in the header. The key attribute
+holds the signature?s public JSON Web Key. For JSON Web Key / JSON
+Private Key the verifying (public) key is called vk and the signing
+(private) key is called sk.
+
+Example header::
+
+    {
+     "alg": "Ed25519",
+     "typ": "JWT",
+     "key": {
+     "alg": "Ed25519",
+     "vk": "tmAYCrSfj8gtJ10v3VkvW7jOndKmQIYE12hgnFu3cvk"
+     }
+    }
+
+A future version of wheel may omit typ.
+
+Example payload::
+
+    { "hash": "sha256=ADD-r2urObZHcxBW3Cr-vDCu5RJwT4CaRTHiFmbcIYY" }
+
+A future version of wheel may include timestamps in the payload or in
+the signature.
+
+See
+
+- http://self-issued.info/docs/draft-ietf-jose-json-web-signature.html
+- http://self-issued.info/docs/draft-jones-json-web-signature-json-serialization-01.html 
+- http://self-issued.info/docs/draft-ietf-jose-json-web-key-05.html
+- http://self-issued.info/docs/draft-jones-jose-json-private-key-00.html 
+
+
+Comparison to .egg
+------------------
+
+#. Wheel is an installation format; egg is importable. Wheel archives do
+   not need to include .pyc and are less tied to a specific Python
+   version or implementation. Wheel can install (pure Python) packages
+   built with previous versions of Python so you don?t always have to
+   wait for the packager to catch up.
+#. Wheel uses .dist-info directories; egg uses .egg-info. Wheel is
+   compatible with the new world of Python packaging and the new
+   concepts it brings.
+#. Wheel has a richer file naming convention for today?s
+   multi-implementation world. A single wheel archive can indicate its
+   compatibility with a number of Python language versions and
+   implementations, ABIs, and system architectures. Historically the ABI
+   has been specific to a CPython release, wheel is ready for the stable
+   ABI.
+#. Wheel is lossless. The first wheel implementation bdist\_wheel always
+   generates egg-info, and then converts it to a .whl. It is also
+   possible to convert existing eggs and bdist\_wininst distributions.
+#. Wheel is versioned. Every wheel file contains the version of the
+   wheel specification and the implementation that packaged it.
+   Hopefully the next migration can simply be to Wheel 2.0.
+#. Wheel is a reference to the other Python.
+
+
+FAQ
+===
+
+Wheel defines a .data directory. Should I put all my data there?
+    No. The word 'data' is used only because it is short, and is only
+    meant to indicate files that are not installed into site-packages.
+    This specification does not have an opinion on how you should organize
+    your code.
+
 
 Copyright
 =========
 
-This document has been placed in the public domain.
+This document has been placed into the public domain.
 
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 70
-   End:

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 23 15:03:44 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 23 Sep 2012 15:03:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTQ5LCAjMTU4?=
 =?utf-8?q?99=3A_use_=5Cufffd_instead_of_=3F=2E?=
Message-ID: <3XPpdX3srHzQwk@mail.python.org>

http://hg.python.org/cpython/rev/9c666683e309
changeset:   79099:9c666683e309
branch:      3.2
parent:      79094:0799fd1f8887
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Sep 23 15:55:14 2012 +0300
summary:
  #15949, #15899: use \ufffd instead of ?.

files:
  Doc/howto/unicode.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -262,8 +262,8 @@
         ...
     UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
       invalid start byte
-    >>> b'\x80abc'.decode("utf-8", "replace")  #doctest: +SKIP
-    '?abc'
+    >>> b'\x80abc'.decode("utf-8", "replace")
+    '\ufffdabc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 15:03:46 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 23 Sep 2012 15:03:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1OTQ5LCAjMTU4OTk6IG1lcmdlIHdpdGggMy4yLg==?=
Message-ID: <3XPpdZ1FzTzQxj@mail.python.org>

http://hg.python.org/cpython/rev/1aebae2f68da
changeset:   79100:1aebae2f68da
parent:      79098:178f9042af81
parent:      79099:9c666683e309
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Sep 23 16:03:21 2012 +0300
summary:
  #15949, #15899: merge with 3.2.

files:
  Doc/howto/unicode.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -262,8 +262,8 @@
         ...
     UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
       invalid start byte
-    >>> b'\x80abc'.decode("utf-8", "replace")  #doctest: +SKIP
-    '?abc'
+    >>> b'\x80abc'.decode("utf-8", "replace")
+    '\ufffdabc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 15:54:12 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 23 Sep 2012 15:54:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_C-style_comments=2E?=
Message-ID: <3XPqlm20S9zQwr@mail.python.org>

http://hg.python.org/cpython/rev/0ca953f944cc
changeset:   79101:0ca953f944cc
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 23 15:46:09 2012 +0200
summary:
  Use C-style comments.

files:
  Modules/_decimal/libmpdec/mpdecimal.c |  54 +++++++-------
  1 files changed, 27 insertions(+), 27 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -5063,28 +5063,28 @@
         return;
     }
 
-    m = (la+1)/2;  // ceil(la/2)
+    m = (la+1)/2;  /* ceil(la/2) */
 
     /* lb <= m < la */
     if (lb <= m) {
 
         /* lb can now be larger than la-m */
         if (lb > la-m) {
-            lt = lb + lb + 1;       // space needed for result array
-            mpd_uint_zero(w, lt);   // clear result array
-            _karatsuba_rec(w, b, a+m, w+lt, lb, la-m); // b*ah
+            lt = lb + lb + 1;       /* space needed for result array */
+            mpd_uint_zero(w, lt);   /* clear result array */
+            _karatsuba_rec(w, b, a+m, w+lt, lb, la-m); /* b*ah */
         }
         else {
-            lt = (la-m) + (la-m) + 1;  // space needed for result array
-            mpd_uint_zero(w, lt);      // clear result array
-            _karatsuba_rec(w, a+m, b, w+lt, la-m, lb); // ah*b
-        }
-        _mpd_baseaddto(c+m, w, (la-m)+lb);      // add ah*b*B**m
-
-        lt = m + m + 1;         // space needed for the result array
-        mpd_uint_zero(w, lt);   // clear result array
-        _karatsuba_rec(w, a, b, w+lt, m, lb);  // al*b
-        _mpd_baseaddto(c, w, m+lb);    // add al*b
+            lt = (la-m) + (la-m) + 1;  /* space needed for result array */
+            mpd_uint_zero(w, lt);      /* clear result array */
+            _karatsuba_rec(w, a+m, b, w+lt, la-m, lb); /* ah*b */
+        }
+        _mpd_baseaddto(c+m, w, (la-m)+lb);      /* add ah*b*B**m */
+
+        lt = m + m + 1;         /* space needed for the result array */
+        mpd_uint_zero(w, lt);   /* clear result array */
+        _karatsuba_rec(w, a, b, w+lt, m, lb);  /* al*b */
+        _mpd_baseaddto(c, w, m+lb);    /* add al*b */
 
         return;
     }
@@ -5360,34 +5360,34 @@
         return 1;
     }
 
-    m = (la+1)/2;  // ceil(la/2)
+    m = (la+1)/2;  /* ceil(la/2) */
 
     /* lb <= m < la */
     if (lb <= m) {
 
         /* lb can now be larger than la-m */
         if (lb > la-m) {
-            lt = lb + lb + 1;       // space needed for result array
-            mpd_uint_zero(w, lt);   // clear result array
-            if (!_karatsuba_rec_fnt(w, b, a+m, w+lt, lb, la-m)) { // b*ah
+            lt = lb + lb + 1;       /* space needed for result array */
+            mpd_uint_zero(w, lt);   /* clear result array */
+            if (!_karatsuba_rec_fnt(w, b, a+m, w+lt, lb, la-m)) { /* b*ah */
                 return 0; /* GCOV_UNLIKELY */
             }
         }
         else {
-            lt = (la-m) + (la-m) + 1;  // space needed for result array
-            mpd_uint_zero(w, lt);      // clear result array
-            if (!_karatsuba_rec_fnt(w, a+m, b, w+lt, la-m, lb)) { // ah*b
+            lt = (la-m) + (la-m) + 1;  /* space needed for result array */
+            mpd_uint_zero(w, lt);      /* clear result array */
+            if (!_karatsuba_rec_fnt(w, a+m, b, w+lt, la-m, lb)) { /* ah*b */
                 return 0; /* GCOV_UNLIKELY */
             }
         }
-        _mpd_baseaddto(c+m, w, (la-m)+lb); // add ah*b*B**m
-
-        lt = m + m + 1;         // space needed for the result array
-        mpd_uint_zero(w, lt);   // clear result array
-        if (!_karatsuba_rec_fnt(w, a, b, w+lt, m, lb)) {  // al*b
+        _mpd_baseaddto(c+m, w, (la-m)+lb); /* add ah*b*B**m */
+
+        lt = m + m + 1;         /* space needed for the result array */
+        mpd_uint_zero(w, lt);   /* clear result array */
+        if (!_karatsuba_rec_fnt(w, a, b, w+lt, m, lb)) {  /* al*b */
             return 0; /* GCOV_UNLIKELY */
         }
-        _mpd_baseaddto(c, w, m+lb);       // add al*b
+        _mpd_baseaddto(c, w, m+lb);       /* add al*b */
 
         return 1;
     }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 15:59:31 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 23 Sep 2012 15:59:31 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_C-style_comments_=28re?=
 =?utf-8?q?quired_for_the_AIX_build_slave=29=2E?=
Message-ID: <3XPqsv5WP7zQy4@mail.python.org>

http://hg.python.org/cpython/rev/c843ec292a8b
changeset:   79102:c843ec292a8b
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 23 15:51:16 2012 +0200
summary:
  Use C-style comments (required for the AIX build slave).

files:
  Modules/unicodedata.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -1236,8 +1236,8 @@
         PyErr_Format(PyExc_KeyError, "undefined character name '%s'", name);
         return NULL;
     }
-    // check if code is in the PUA range that we use for named sequences
-    // and convert it
+    /* check if code is in the PUA range that we use for named sequences
+       and convert it */
     if (IS_NAMED_SEQ(code)) {
         index = code-named_sequences_start;
         return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 16:11:25 2012
From: python-checkins at python.org (christian.heimes)
Date: Sun, 23 Sep 2012 16:11:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_C-style_comments_for_C?=
	=?utf-8?q?89_/_ANSI_C_compatibility?=
Message-ID: <3XPr7d3lTszQxQ@mail.python.org>

http://hg.python.org/cpython/rev/267a0969884a
changeset:   79103:267a0969884a
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 23 16:11:15 2012 +0200
summary:
  Use C-style comments for C89 / ANSI C compatibility

files:
  Modules/posixmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -10495,7 +10495,7 @@
         static Py_ssize_t buffer_sizes[] = { 256, XATTR_LIST_MAX, 0 };
         Py_ssize_t buffer_size = buffer_sizes[i];
         if (!buffer_size) {
-            // ERANGE
+            /* ERANGE */
             path_error("listxattr", &path);
             break;
         }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 16:15:14 2012
From: python-checkins at python.org (christian.heimes)
Date: Sun, 23 Sep 2012 16:15:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_GCC_doesn=27t_support_type?=
 =?utf-8?q?of_in_strict_ansi_mode_=28e=2Eg=2E_-ansi_or_-std=3Dc89=29?=
Message-ID: <3XPrD22XRyzQwD@mail.python.org>

http://hg.python.org/cpython/rev/50dd7426b880
changeset:   79104:50dd7426b880
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 23 16:15:01 2012 +0200
summary:
  GCC doesn't support typeof in strict ansi mode (e.g. -ansi or -std=c89)

files:
  Include/pymacro.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Include/pymacro.h b/Include/pymacro.h
--- a/Include/pymacro.h
+++ b/Include/pymacro.h
@@ -30,7 +30,7 @@
    error (see Py_BUILD_ASSERT_EXPR).
 
    Written by Rusty Russell, public domain, http://ccodearchive.net/ */
-#if defined(__GNUC__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__))
 /* Two gcc extensions.
    &a[0] degrades to a pointer: a different type from an array */
 #define Py_ARRAY_LENGTH(array) \

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 18:19:48 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 23 Sep 2012 18:19:48 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_=2316006=3A_fix_typo_in_PEP_2?=
	=?utf-8?b?MTMu?=
Message-ID: <3XPtzm3cDnzQm2@mail.python.org>

http://hg.python.org/peps/rev/94dbf7d100f3
changeset:   4520:94dbf7d100f3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Sep 23 19:19:29 2012 +0300
summary:
  #16006: fix typo in PEP 213.

files:
  pep-0213.txt |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/pep-0213.txt b/pep-0213.txt
--- a/pep-0213.txt
+++ b/pep-0213.txt
@@ -26,7 +26,7 @@
 
 Justification
 
-    cenario 1:
+    Scenario 1:
 
         You have a deployed class that works on an attribute named
         "stdout". After a while, you think it would be better to

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 23 18:21:43 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 23 Sep 2012 18:21:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_indentation_of_example?=
 =?utf-8?q?s_in_lzma_module_documentation=2E?=
Message-ID: <3XPv1z1cvbzQpY@mail.python.org>

http://hg.python.org/cpython/rev/95b5dd0ec727
changeset:   79105:95b5dd0ec727
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Sep 23 18:08:57 2012 +0200
summary:
  Fix indentation of examples in lzma module documentation.

files:
  Doc/library/lzma.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/lzma.rst b/Doc/library/lzma.rst
--- a/Doc/library/lzma.rst
+++ b/Doc/library/lzma.rst
@@ -336,14 +336,14 @@
 
    import lzma
    with lzma.LZMAFile("file.xz") as f:
-      file_content = f.read()
+       file_content = f.read()
 
 Creating a compressed file::
 
    import lzma
    data = b"Insert Data Here"
    with lzma.LZMAFile("file.xz", "w") as f:
-      f.write(data)
+       f.write(data)
 
 Compressing data in memory::
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 18:21:44 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 23 Sep 2012 18:21:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Prefer_lzma=2Eopen=28=29_o?=
 =?utf-8?q?ver_lzma=2ELZMAFile=28=29_in_lzma_module_documentation=2E?=
Message-ID: <3XPv205Qh4zQwM@mail.python.org>

http://hg.python.org/cpython/rev/d81b9e46c06b
changeset:   79106:d81b9e46c06b
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Sep 23 18:20:23 2012 +0200
summary:
  Prefer lzma.open() over lzma.LZMAFile() in lzma module documentation.

files:
  Doc/library/lzma.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/lzma.rst b/Doc/library/lzma.rst
--- a/Doc/library/lzma.rst
+++ b/Doc/library/lzma.rst
@@ -335,14 +335,14 @@
 Reading in a compressed file::
 
    import lzma
-   with lzma.LZMAFile("file.xz") as f:
+   with lzma.open("file.xz") as f:
        file_content = f.read()
 
 Creating a compressed file::
 
    import lzma
    data = b"Insert Data Here"
-   with lzma.LZMAFile("file.xz", "w") as f:
+   with lzma.open("file.xz", "w") as f:
        f.write(data)
 
 Compressing data in memory::
@@ -367,7 +367,7 @@
    import lzma
    with open("file.xz", "wb") as f:
        f.write(b"This data will not be compressed\n")
-       with lzma.LZMAFile(f, "w") as lzf:
+       with lzma.open(f, "w") as lzf:
            lzf.write(b"This *will* be compressed\n")
        f.write(b"Not compressed\n")
 
@@ -378,5 +378,5 @@
        {"id": lzma.FILTER_DELTA, "dist": 5},
        {"id": lzma.FILTER_LZMA2, "preset": 7 | lzma.PRESET_EXTREME},
    ]
-   with lzma.LZMAFile("file.xz", "w", filters=my_filters) as f:
+   with lzma.open("file.xz", "w", filters=my_filters) as f:
        f.write(b"blah blah blah")

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 18:38:20 2012
From: python-checkins at python.org (raymond.hettinger)
Date: Sun, 23 Sep 2012 18:38:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Issue_=2315270=2E__Appeas?=
 =?utf-8?q?e_critics_by_removing_a_reference_to_the_docs_for_super=28=29?=
 =?utf-8?q?=2E?=
Message-ID: <3XPvP81wFXzQtS@mail.python.org>

http://hg.python.org/devguide/rev/100909b4def0
changeset:   552:100909b4def0
user:        Raymond Hettinger <python at rcn.com>
date:        Sun Sep 23 09:38:11 2012 -0700
summary:
  Issue #15270.  Appease critics by removing a reference to the docs for super().

files:
  documenting.rst |  6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)


diff --git a/documenting.rst b/documenting.rst
--- a/documenting.rst
+++ b/documenting.rst
@@ -203,12 +203,6 @@
 text.  Long descriptions full of corner cases and caveats can create the
 impression that a function is more complex or harder to use than it actually is.
 
-The documentation for :func:`super` is an example of where a good deal of
-information was condensed into a few short paragraphs.  Discussion of
-:func:`super` could have filled a chapter in a book, but it is often easier to
-grasp a terse description than a lengthy narrative.
-
-
 Code Examples
 -------------
 

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Sun Sep 23 20:01:13 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 23 Sep 2012 20:01:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1Mzc5?=
 =?utf-8?q?=3A_Fix_passing_of_non-BMP_characters_as_integers_for_the_charm?=
 =?utf-8?q?ap?=
Message-ID: <3XPxDn37lJzR0X@mail.python.org>

http://hg.python.org/cpython/rev/620d23f7ad41
changeset:   79107:620d23f7ad41
branch:      3.2
parent:      79099:9c666683e309
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 23 19:55:21 2012 +0200
summary:
  Issue #15379: Fix passing of non-BMP characters as integers for the charmap decoder (already working as unicode strings).
Patch by Serhiy Storchaka.

files:
  Lib/test/test_codeccallbacks.py |    2 +-
  Lib/test/test_codecs.py         |  105 ++++++++++++++++++++
  Misc/NEWS                       |    3 +
  Objects/unicodeobject.c         |   28 ++++-
  4 files changed, 135 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py
--- a/Lib/test/test_codeccallbacks.py
+++ b/Lib/test/test_codeccallbacks.py
@@ -744,7 +744,7 @@
                 raise ValueError
         self.assertRaises(UnicodeError, codecs.charmap_decode, b"\xff", "strict", {0xff: None})
         self.assertRaises(ValueError, codecs.charmap_decode, b"\xff", "strict", D())
-        self.assertRaises(TypeError, codecs.charmap_decode, b"\xff", "strict", {0xff: sys.maxunicode+1})
+        self.assertRaises(TypeError, codecs.charmap_decode, b"\xff", "strict", {0xff: 0x110000})
 
     def test_encodehelper(self):
         # enhance coverage of:
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1546,6 +1546,10 @@
             ("abc", 3)
         )
 
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict", "ab"
+        )
+
         self.assertEqual(
             codecs.charmap_decode(b"\x00\x01\x02", "replace", "ab"),
             ("ab\ufffd", 3)
@@ -1572,6 +1576,107 @@
             ("", len(allbytes))
         )
 
+    def test_decode_with_int2str_map(self):
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: 'c'}),
+            ("abc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'Aa', 1: 'Bb', 2: 'Cc'}),
+            ("AaBbCc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: '\U0010FFFF', 1: 'b', 2: 'c'}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: ''}),
+            ("ab", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: 'a', 1: 'b'}
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b'}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b'}),
+            ("ab", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab", 3)
+        )
+
+        allbytes = bytes(range(256))
+        self.assertEqual(
+            codecs.charmap_decode(allbytes, "ignore", {}),
+            ("", len(allbytes))
+        )
+
+    def test_decode_with_int2int_map(self):
+        a = ord('a')
+        b = ord('b')
+        c = ord('c')
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: a, 1: b, 2: c}),
+            ("abc", 3)
+        )
+
+        # Issue #15379
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 0x10FFFF, 1: b, 2: c}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertRaises(TypeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: 0x110000, 1: b, 2: c}
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: a, 1: b},
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: a, 1: b}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: a, 1: b}),
+            ("ab", 3)
+        )
+
+
 class WithStmtTest(unittest.TestCase):
     def test_encodedfile(self):
         f = io.BytesIO(b"\xc3\xbc")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
+  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
+
 - Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
   sporadic crashes in multi-thread programs when several long deallocator
   chains ran concurrently and involved subclasses of built-in container
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -5250,12 +5250,36 @@
             /* Apply mapping */
             if (PyLong_Check(x)) {
                 long value = PyLong_AS_LONG(x);
-                if (value < 0 || value > 65535) {
+                if (value < 0 || value > 0x10FFFF) {
                     PyErr_SetString(PyExc_TypeError,
-                                    "character mapping must be in range(65536)");
+                                    "character mapping must be in range(0x110000)");
                     Py_DECREF(x);
                     goto onError;
                 }
+
+#ifndef Py_UNICODE_WIDE
+                if (value > 0xFFFF) {
+                    /* see the code for 1-n mapping below */
+                    if (extrachars < 2) {
+                        /* resize first */
+                        Py_ssize_t oldpos = p - PyUnicode_AS_UNICODE(v);
+                        Py_ssize_t needed = 10 - extrachars;
+                        extrachars += needed;
+                        /* XXX overflow detection missing */
+                        if (_PyUnicode_Resize(&v,
+                                              PyUnicode_GET_SIZE(v) + needed) < 0) {
+                            Py_DECREF(x);
+                            goto onError;
+                        }
+                        p = PyUnicode_AS_UNICODE(v) + oldpos;
+                    }
+                    value -= 0x10000;
+                    *p++ = 0xD800 | (value >> 10);
+                    *p++ = 0xDC00 | (value & 0x3FF);
+                    extrachars -= 2;
+                }
+                else
+#endif
                 *p++ = (Py_UNICODE)value;
             }
             else if (x == Py_None) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 20:01:15 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 23 Sep 2012 20:01:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315379=3A_Fix_passing_of_non-BMP_characters_as_i?=
 =?utf-8?q?ntegers_for_the_charmap?=
Message-ID: <3XPxDq2kRqzQyy@mail.python.org>

http://hg.python.org/cpython/rev/c64dec45d46f
changeset:   79108:c64dec45d46f
parent:      79106:d81b9e46c06b
parent:      79107:620d23f7ad41
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 23 20:00:04 2012 +0200
summary:
  Issue #15379: Fix passing of non-BMP characters as integers for the charmap decoder (already working as unicode strings).
Patch by Serhiy Storchaka.

files:
  Lib/test/test_codecs.py |  116 ++++++++++++++++++++++++++++
  Misc/NEWS               |    3 +
  Objects/unicodeobject.c |    7 +-
  3 files changed, 123 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1693,6 +1693,15 @@
         )
 
         self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict", "\U0010FFFFbc"),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict", "ab"
+        )
+
+        self.assertEqual(
             codecs.charmap_decode(b"\x00\x01\x02", "replace", "ab"),
             ("ab\ufffd", 3)
         )
@@ -1718,6 +1727,113 @@
             ("", len(allbytes))
         )
 
+    def test_decode_with_int2str_map(self):
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: 'c'}),
+            ("abc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'Aa', 1: 'Bb', 2: 'Cc'}),
+            ("AaBbCc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: '\U0010FFFF', 1: 'b', 2: 'c'}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: ''}),
+            ("ab", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: 'a', 1: 'b'}
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b'}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b'}),
+            ("ab", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab", 3)
+        )
+
+        allbytes = bytes(range(256))
+        self.assertEqual(
+            codecs.charmap_decode(allbytes, "ignore", {}),
+            ("", len(allbytes))
+        )
+
+    def test_decode_with_int2int_map(self):
+        a = ord('a')
+        b = ord('b')
+        c = ord('c')
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: a, 1: b, 2: c}),
+            ("abc", 3)
+        )
+
+        # Issue #15379
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 0x10FFFF, 1: b, 2: c}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: sys.maxunicode, 1: b, 2: c}),
+            (chr(sys.maxunicode) + "bc", 3)
+        )
+
+        self.assertRaises(TypeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: sys.maxunicode + 1, 1: b, 2: c}
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: a, 1: b},
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: a, 1: b}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: a, 1: b}),
+            ("ab", 3)
+        )
+
+
 class WithStmtTest(unittest.TestCase):
     def test_encodedfile(self):
         f = io.BytesIO(b"\xc3\xbc")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
+  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
+
 - Issue #15144: Fix possible integer overflow when handling pointers as
   integer values, by using Py_uintptr_t instead of size_t.  Patch by
   Serhiy Storchaka.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -7525,9 +7525,10 @@
             /* Apply mapping */
             if (PyLong_Check(x)) {
                 long value = PyLong_AS_LONG(x);
-                if (value < 0 || value > 65535) {
-                    PyErr_SetString(PyExc_TypeError,
-                                    "character mapping must be in range(65536)");
+                if (value < 0 || value > MAX_UNICODE) {
+                    PyErr_Format(PyExc_TypeError,
+                                 "character mapping must be in range(0x%lx)",
+                                 (unsigned long)MAX_UNICODE + 1);
                     Py_DECREF(x);
                     goto onError;
                 }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 23 21:38:05 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 23 Sep 2012 21:38:05 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Edit_PEP_427_for_markup_and_a?=
	=?utf-8?q?dd_missing_footer=2E?=
Message-ID: <3XPzNY2LHJzQwj@mail.python.org>

http://hg.python.org/peps/rev/01b538da5942
changeset:   4521:01b538da5942
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 23 21:37:59 2012 +0200
summary:
  Edit PEP 427 for markup and add missing footer.

files:
  pep-0427.txt |  265 ++++++++++++++++++++------------------
  1 files changed, 141 insertions(+), 124 deletions(-)


diff --git a/pep-0427.txt b/pep-0427.txt
--- a/pep-0427.txt
+++ b/pep-0427.txt
@@ -3,136 +3,142 @@
 Version: $Revision$
 Last-Modified: $Date$
 Author: Daniel Holth <dholth at fastmail.fm>
-Discussions-To: Distutils SIG
+Discussions-To: <distutils-sig at python.org>
 Status: Draft
 Type: Standards Track
 Content-Type: text/x-rst
-Created: 20 Sep 2012
+Created: 20-Sep-2012
+Post-History:
 
 
 Abstract
 ========
 
-This PEP describes a built-package format for Python called wheel.
+This PEP describes a built-package format for Python called "wheel".
 
-A wheel is a ZIP-format archive with a specially formatted file name and
-the .whl extension. It contains a single distribution nearly as it would
-be installed according to PEP 376 with a particular installation scheme.
-A wheel file may be installed by simply unpacking into site-packages
-with the standard ?unzip? tool, while preserving enough information
-to spread its contents out onto their final paths at any later time.
+A wheel is a ZIP-format archive with a specially formatted file name
+and the ``.whl`` extension.  It contains a single distribution nearly
+as it would be installed according to PEP 376 with a particular
+installation scheme.  A wheel file may be installed by simply
+unpacking into site-packages with the standard 'unzip' tool, while
+preserving enough information to spread its contents out onto their
+final paths at any later time.
+
 
 Rationale
 =========
 
 Python needs a package format that is easier to install than sdist.
-Python?s sdist packages are defined by and require the distutils and
+Python's sdist packages are defined by and require the distutils and
 setuptools build systems, running arbitrary code to build-and-install,
-and re-compile, code just so it can be installed into a new virtualenv.
-This system of conflating build-install is slow, hard to maintain, and
-hinders innovation in both build systems and installers.
+and re-compile, code just so it can be installed into a new
+virtualenv.  This system of conflating build-install is slow, hard to
+maintain, and hinders innovation in both build systems and installers.
 
-Wheel attempts to remedy these problems by providing a simpler interface
-between the build system and the installer. The wheel binary package
-format frees installers from having to know about the build system,
-saves time by amortizing compile time over many installations, and
-removes the need to install a build system in the target environment.
+Wheel attempts to remedy these problems by providing a simpler
+interface between the build system and the installer.  The wheel
+binary package format frees installers from having to know about the
+build system, saves time by amortizing compile time over many
+installations, and removes the need to install a build system in the
+target environment.
+
 
 Details
 =======
 
-Installing a wheel ?distribution-1.0.py32.none.any.whl?
+Installing a wheel 'distribution-1.0.py32.none.any.whl'
 -------------------------------------------------------
 
 #. Unpack.
 
-    a. Parse distribution-1.0.dist-info/WHEEL.
-    b. Check that installer is compatible with Wheel-Version. Warn if minor
-       version is greater, abort if major version is greater.
-    c. If Root-Is-Purelib == ?true?, unpack archive into purelib
-       (site-packages).
-    d. Else unpack archive into platlib (site-packages).
+  a. Parse ``distribution-1.0.dist-info/WHEEL``.
+  b. Check that installer is compatible with Wheel-Version.  Warn if
+     minor version is greater, abort if major version is greater.
+  c. If Root-Is-Purelib == 'true', unpack archive into purelib
+     (site-packages).
+  d. Else unpack archive into platlib (site-packages).
 
 #. Spread.
 
-    a. Unpacked archive includes distribution-1.0.dist-info/ and (if there
-       is data) distribution-1.0.data/
-    b. Move each subtree of distribution-1.0.data/ onto its destination
-       path. Each subdirectory of distribution-1.0.data/ is a key into
-       sysconfig.get\_paths(), such as
-       distribution-1.0.data/(config\|purelib\|platlib\|scripts).
-       See` <http://docs.python.org/dev/packaging/setupcfg.html#resources>`_`http://docs.python.org/dev/packaging/setupcfg.html#resources <http://docs.python.org/dev/packaging/setupcfg.html#resources>`_
-    c. If applicable, update scripts starting with ?#!python? to point to
-       the correct interpreter.
-    d. Update distribution-1.0.dist.info/RECORD with the installed paths.
-    e. Remove empty distribution-1.0.data directory.
+  a. Unpacked archive includes ``distribution-1.0.dist-info/`` and (if
+     there is data) ``distribution-1.0.data/``.
+  b. Move each subtree of ``distribution-1.0.data/`` onto its
+     destination path. Each subdirectory of ``distribution-1.0.data/``
+     is a key into ``sysconfig.get_paths()``, such as
+     ``distribution-1.0.data/(config|purelib|platlib|scripts)``.  See
+     http://docs.python.org/dev/packaging/setupcfg.html#resources.
+  c. If applicable, update scripts starting with ``#!python`` to point
+     to the correct interpreter.
+  d. Update ``distribution-1.0.dist.info/RECORD`` with the installed
+     paths.
+  e. Remove empty ``distribution-1.0.data`` directory.
 
 File Format
 -----------
 
 File name convention
-~~~~~~~~~~~~~~~~~~~~
+''''''''''''''''''''
 
-The wheel filename is {distribution}-{version}(-{build tag})?-{python
-tag}-{abi tag}-{platform tag}.whl
+The wheel filename is ``{distribution}-{version}(-{build
+tag})?-{python tag}-{abi tag}-{platform tag}.whl``.
 
 distribution
-    Distribution name, e.g. ?django?, ?pyramid?
+    Distribution name, e.g. 'django', 'pyramid'.
 
 version
-    PEP-386 compliant version, e.g. 1.0
+    PEP-386 compliant version, e.g. 1.0.
 
 build tag
-    Optional build number. Must start with a digit. A tie breaker if two
-    wheels have the same version. Sort as None if unspecified, else sort
-    the initial digits as a number, and the remainder lexicographically.
+    Optional build number.  Must start with a digit.  A tie breaker if
+    two wheels have the same version.  Sort as None if unspecified,
+    else sort the initial digits as a number, and the remainder
+    lexicographically.
 
 language implementation and version tag
-    ?py27? ?py2? ?py3?
+    E.g. 'py27', 'py2', 'py3'.
 
 abi tag
-    ?cp33m?, ?abi3?, ?none?
+    E.g. 'cp33m', 'abi3', 'none'.
 
 platform tag
-    ?linux\_x86\_64?, ?any?
+    E.g. 'linux_x86_64', 'any'.
 
-For example, distribution-1.0-1-py27-none-any.whl is the first build
-of a package called 'distribution', and is compatible with Python 2.7
-(any Python 2.7 implementation), with no abi (pure Python), on any CPU
-architecture.
+For example, ``distribution-1.0-1-py27-none-any.whl`` is the first
+build of a package called 'distribution', and is compatible with
+Python 2.7 (any Python 2.7 implementation), with no ABI (pure Python),
+on any CPU architecture.
 
 The last three components of the filename before the extension are
-called ?compatibility tags.? The compatibility tags express
-the package?s basic interpreter requirements and are detailed
-in `PEP 425 <http://hg.python.org/peps/file/tip/pep-0425.txt>`_.
+called "compatibility tags."  The compatibility tags express the
+package's basic interpreter requirements and are detailed in PEP 425.
 
 
 File contents
-~~~~~~~~~~~~~
+'''''''''''''
 
-#. Wheel files contain a folder {distribution}-{version}.dist-info/ with
-   the PEP 426 metadata (Metadata version 1.3 or greater) and an
+#. Wheel files contain a folder {distribution}-{version}.dist-info/
+   with the PEP 426 metadata (Metadata version 1.3 or greater) and an
    additional file WHEEL with metadata about the archive itself.
 #. The root of a .whl is installed into one of purelib or platlib.
 #. Wheel files contain metadata about the wheel format itself in
-   {distribution}-{version}.dist-info/WHEEL::
+   ``{distribution}-{version}.dist-info/WHEEL``::
 
-    Wheel-Version: 1.0
-    Generator: bdist_wheel 0.7
-    Root-Is-Purelib: true
+       Wheel-Version: 1.0
+       Generator: bdist_wheel 0.7
+       Root-Is-Purelib: true
 
 #. Wheel-Version is the version number of the Wheel specification.
-   Generator is the name and optionally the version of the software that
-   produced the archive. Root-Is-Purelib is true if the top level
-   directory of the archive should be installed into purelib; otherwise
-   the root should be installed into platlib.
+   Generator is the name and optionally the version of the software
+   that produced the archive. Root-Is-Purelib is true if the top level
+   directory of the archive should be installed into purelib;
+   otherwise the root should be installed into platlib.
 #. A wheel installer should warn if Wheel-Version is greater than the
    version it supports, and fail if Wheel-Version has a greater major
    version than the version it supports.
 #. If a .whl contains scripts, both purelib and platlib, or any other
-   files that are not installed on sys.path, they are found in
-   {distribution}-{version}.data/{key}, where {key} is an index into
-   sysconfig.get\_paths().
+   files that are not installed on ``sys.path``, they are found in
+   ``{distribution}-{version}.data/{key}``, where ``{key}`` is an
+   index into ``sysconfig.get_paths()``.
 #. Wheel, being an installation format that is intended to work across
    multiple versions of Python, does not generally include .pyc files.
 #. Wheel does not contain setup.py or setup.cfg.
@@ -146,19 +152,19 @@
 #. METADATA is the PEP 426 metadata (Metadata version 1.3 or greater)
 #. WHEEL is the wheel metadata, specific to a build of the package.
 #. RECORD is a list of (almost) all the files in the wheel and their
-   secure hashes. Unlike PEP 376, every file except RECORD, which cannot
-   contain a hash of itself, must include its hash. The hash algorithm
-   must be sha256 or better; specifically, md5 and sha1 are not
-   permitted, as signed wheel files rely on the strong hashes in RECORD to
-   validate the integrity of the archive.
+   secure hashes.  Unlike PEP 376, every file except RECORD, which
+   cannot contain a hash of itself, must include its hash.  The hash
+   algorithm must be sha256 or better; specifically, md5 and sha1 are
+   not permitted, as signed wheel files rely on the strong hashes in
+   RECORD to validate the integrity of the archive.
 #. INSTALLER and REQUESTED are not included in the archive.
-#. RECORD.jws is used for digital signatures. It is not mentioned in
+#. RECORD.jws is used for digital signatures.  It is not mentioned in
    RECORD.
 #. RECORD.p7s is reserved as a courtesy to anyone who would prefer to
-   use s/mime signatures to secure their wheel files. It is not
+   use s/mime signatures to secure their wheel files.  It is not
    mentioned in RECORD.
 #. During extraction, wheel installers verify all the hashes in RECORD
-   against the file contents. Apart from RECORD and its signatures,
+   against the file contents.  Apart from RECORD and its signatures,
    installation will fail if any file in the archive is not both
    mentioned and correctly hashed in RECORD.
 
@@ -175,62 +181,62 @@
     distribution-1.0.data/
 
 The .data directory contains subdirectories named after the keys of
-sysconfig.get\_paths(), and those subdirectories contain the scripts,
-headers, documentation and so forth from the distribution. During
-installation the contents of these subdirectories are moved onto their
-destination paths.
+``sysconfig.get_paths()``, and those subdirectories contain the
+scripts, headers, documentation and so forth from the distribution.
+During installation the contents of these subdirectories are moved
+onto their destination paths.
 
 
 Signed wheel files
 ------------------
 
-Wheel files include an extended RECORD that enables digital signatures.
-PEP 376?s RECORD is altered to include
-digestname=urlsafe\_b64encode\_nopad(digest) (urlsafe base64 encoding
-with no trailing = characters) as the second column instead of an
-md5sum. All possible entries are hashed, including any generated files
-such as .pyc files, but not RECORD. For example::
+Wheel files include an extended RECORD that enables digital
+signatures.  PEP 376's RECORD is altered to include
+``digestname=urlsafe_b64encode_nopad(digest)`` (urlsafe base64
+encoding with no trailing = characters) as the second column instead
+of an md5sum.  All possible entries are hashed, including any
+generated files such as .pyc files, but not RECORD. For example::
 
     file.py,sha256=AVTFPZpEKzuHr7OvQZmhaU3LvwKz06AJw8mT\_pNh2yI,3144
     distribution-1.0.dist-info/RECORD,,
 
-RECORD.jws is not mentioned in RECORD at all. Every other file in the
+RECORD.jws is not mentioned in RECORD at all.  Every other file in the
 archive must have a correct hash in RECORD, or the installation will
 fail.
 
 The signature is one or more JSON Web Signature JSON Serialization
 (JWS-JS) signatures stored in a file RECORD.jws adjacent to RECORD.
 
-A signature-aware installer can be instructed to check for a particular
-Ed25519 public key by using an extended ?extras? syntax.::
+A signature-aware installer can be instructed to check for a
+particular Ed25519 public key by using an extended "extras" syntax.::
 
     # request a normal optional feature "extra", and indicate
     # the package should be signed by a particular 
     # urlsafe-b64encode-nopad encoded ed25519 public key:
     package[extra, ed25519=ouBJlTJJ4SJXoy8Bi1KRlewWLU6JW7HUXTgvU1YRuiA]
 
-An application could distribute a requires.txt file with many such lines
-for all its dependencies and their public keys. By installing from this
-file an application?s users would know whether the applicaton?s
-dependencies came from the correct publishers.
+An application could distribute a requires.txt file with many such
+lines for all its dependencies and their public keys.  By installing
+from this file an application's users would know whether the
+application's dependencies came from the correct publishers.
 
-Applications that wish to ?fail open? for backwards compatibility with
+Applications that wish to "fail open" for backwards compatibility with
 non-signature-aware installers should specify that their package
-provides the extra ed25519=(key) with no associated dependencies.
+provides the extra ``ed25519=(key)`` with no associated dependencies.
 
-Key distribution is outside the scope of this spec. Public wheel signing
-keys could be signed with the packager?s GPG key or stored at
-an https://-protected URL.
+Key distribution is outside the scope of this spec.  Public wheel
+signing keys could be signed with the packager's GPG key or stored at
+an ``https://`` protected URL.
 
 
 JSON Web Signatures Extensions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+''''''''''''''''''''''''''''''
 
-The Ed25519 algorithm is used as an extension to the JSON Web Signatures
-specification. Wheel uses alg="Ed25519" in the header. The key attribute
-holds the signature?s public JSON Web Key. For JSON Web Key / JSON
-Private Key the verifying (public) key is called vk and the signing
-(private) key is called sk.
+The Ed25519 algorithm is used as an extension to the JSON Web
+Signatures specification.  Wheel uses ``alg="Ed25519"`` in the header.
+The key attribute holds the signature's public JSON Web Key.  For JSON
+Web Key / JSON Private Key the verifying (public) key is called vk and
+the signing (private) key is called sk.
 
 Example header::
 
@@ -243,7 +249,7 @@
      }
     }
 
-A future version of wheel may omit typ.
+A future version of wheel may omit ``typ``.
 
 Example payload::
 
@@ -255,32 +261,33 @@
 See
 
 - http://self-issued.info/docs/draft-ietf-jose-json-web-signature.html
-- http://self-issued.info/docs/draft-jones-json-web-signature-json-serialization-01.html 
+- http://self-issued.info/docs/draft-jones-json-web-signature-json-serialization-01.html
 - http://self-issued.info/docs/draft-ietf-jose-json-web-key-05.html
-- http://self-issued.info/docs/draft-jones-jose-json-private-key-00.html 
+- http://self-issued.info/docs/draft-jones-jose-json-private-key-00.html
 
 
 Comparison to .egg
 ------------------
 
-#. Wheel is an installation format; egg is importable. Wheel archives do
-   not need to include .pyc and are less tied to a specific Python
+#. Wheel is an installation format; egg is importable.  Wheel archives
+   do not need to include .pyc and are less tied to a specific Python
    version or implementation. Wheel can install (pure Python) packages
-   built with previous versions of Python so you don?t always have to
+   built with previous versions of Python so you don't always have to
    wait for the packager to catch up.
-#. Wheel uses .dist-info directories; egg uses .egg-info. Wheel is
+#. Wheel uses .dist-info directories; egg uses .egg-info.  Wheel is
    compatible with the new world of Python packaging and the new
    concepts it brings.
-#. Wheel has a richer file naming convention for today?s
-   multi-implementation world. A single wheel archive can indicate its
-   compatibility with a number of Python language versions and
-   implementations, ABIs, and system architectures. Historically the ABI
-   has been specific to a CPython release, wheel is ready for the stable
-   ABI.
-#. Wheel is lossless. The first wheel implementation bdist\_wheel always
-   generates egg-info, and then converts it to a .whl. It is also
-   possible to convert existing eggs and bdist\_wininst distributions.
-#. Wheel is versioned. Every wheel file contains the version of the
+#. Wheel has a richer file naming convention for today's
+   multi-implementation world.  A single wheel archive can indicate
+   its compatibility with a number of Python language versions and
+   implementations, ABIs, and system architectures.  Historically the
+   ABI has been specific to a CPython release, wheel is ready for the
+   stable ABI.
+#. Wheel is lossless.  The first wheel implementation bdist_wheel
+   always generates egg-info, and then converts it to a .whl.  It is
+   also possible to convert existing eggs and bdist_wininst
+   distributions.
+#. Wheel is versioned.  Every wheel file contains the version of the
    wheel specification and the implementation that packaged it.
    Hopefully the next migration can simply be to Wheel 2.0.
 #. Wheel is a reference to the other Python.
@@ -290,10 +297,10 @@
 ===
 
 Wheel defines a .data directory. Should I put all my data there?
-    No. The word 'data' is used only because it is short, and is only
+    No.  The word 'data' is used only because it is short, and is only
     meant to indicate files that are not installed into site-packages.
-    This specification does not have an opinion on how you should organize
-    your code.
+    This specification does not have an opinion on how you should
+    organize your code.
 
 
 Copyright
@@ -301,3 +308,13 @@
 
 This document has been placed into the public domain.
 
+
+
+..
+   Local Variables:
+   mode: indented-text
+   indent-tabs-mode: nil
+   sentence-end-double-space: t
+   fill-column: 70
+   coding: utf-8
+   End:

-- 
Repository URL: http://hg.python.org/peps

From solipsis at pitrou.net  Mon Sep 24 05:58:03 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Mon, 24 Sep 2012 05:58:03 +0200
Subject: [Python-checkins] Daily reference leaks (c64dec45d46f): sum=0
Message-ID: <E1TFzo3-0003J3-T3@ap.vmr.nerim.net>

results for c64dec45d46f on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogGSy4om', '-x']

From python-checkins at python.org  Mon Sep 24 07:38:03 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:38:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Add_Chris_Jerdonek=2E?=
Message-ID: <3XQDhq6SjVzNW4@mail.python.org>

http://hg.python.org/devguide/rev/c7af5fc88612
changeset:   553:c7af5fc88612
user:        Georg Brandl <georg at python.org>
date:        Mon Sep 24 07:36:07 2012 +0200
summary:
  Add Chris Jerdonek.

files:
  developers.rst |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/developers.rst b/developers.rst
--- a/developers.rst
+++ b/developers.rst
@@ -24,6 +24,9 @@
 Permissions History
 -------------------
 
+- Chris Jerdonek was given push privileges on Sep 24 2012 by GFB, for general
+  contributions, on recommendation by Ezio Melotti.
+
 - Daniel Holth was given push privileges on Sep 9 2012 by GFB, for PEP editing.
 
 - Eric Snow was given push privileges on Sep 5 2012 by Antoine Pitrou for

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Mon Sep 24 07:46:51 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:46:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315895=3A_Fix_FILE?=
 =?utf-8?q?_pointer_leak_in_PyRun=5FSimpleFileExFlags=28=29_when_filename?=
Message-ID: <3XQDtz6QlXzNbm@mail.python.org>

http://hg.python.org/cpython/rev/fe4e6e0d6b0f
changeset:   79109:fe4e6e0d6b0f
parent:      78920:72598063c6c4
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 14:11:03 2012 +0200
summary:
  Issue #15895: Fix FILE pointer leak in PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file and closeit is false.

files:
  Python/pythonrun.c |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1385,7 +1385,7 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, ret;
+    int set_file_name = 0, close_own_fp = 0, ret;
     size_t len;
 
     m = PyImport_AddModule("__main__");
@@ -1419,6 +1419,7 @@
             ret = -1;
             goto done;
         }
+        close_own_fp = 1;
         /* Turn on optimization if a .pyo file is given */
         if (strcmp(ext, ".pyo") == 0)
             Py_OptimizeFlag = 1;
@@ -1449,6 +1450,9 @@
     Py_DECREF(v);
     ret = 0;
   done:
+    if (close_own_fp) {
+        fclose(fp);
+    }
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
     return ret;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:46:53 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:46:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315895=3A_my_analy?=
 =?utf-8?q?sis_was_slightly_off=2E_The_FILE_pointer_is_only_leaked?=
Message-ID: <3XQDv13SHbzNZb@mail.python.org>

http://hg.python.org/cpython/rev/9251fb0440a0
changeset:   79110:9251fb0440a0
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 15:47:28 2012 +0200
summary:
  Issue #15895: my analysis was slightly off. The FILE pointer is only leaked when set_main_loader() fails for a pyc file with closeit=0. In the success case run_pyc_file() does its own cleanup of the fp. I've changed the code to use another FILE ptr for pyc files and moved the fclose() to PyRun_SimpleFileExFlags() to make it more obvious what's happening.

files:
  Python/pythonrun.c |  14 ++++++--------
  1 files changed, 6 insertions(+), 8 deletions(-)


diff --git a/Python/pythonrun.c b/Python/pythonrun.c
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1385,7 +1385,7 @@
 {
     PyObject *m, *d, *v;
     const char *ext;
-    int set_file_name = 0, close_own_fp = 0, ret;
+    int set_file_name = 0, ret;
     size_t len;
 
     m = PyImport_AddModule("__main__");
@@ -1411,15 +1411,15 @@
     len = strlen(filename);
     ext = filename + len - (len > 4 ? 4 : 0);
     if (maybe_pyc_file(fp, filename, ext, closeit)) {
+        FILE *pyc_fp;
         /* Try to run a pyc file. First, re-open in binary */
         if (closeit)
             fclose(fp);
-        if ((fp = fopen(filename, "rb")) == NULL) {
+        if ((pyc_fp = fopen(filename, "rb")) == NULL) {
             fprintf(stderr, "python: Can't reopen .pyc file\n");
             ret = -1;
             goto done;
         }
-        close_own_fp = 1;
         /* Turn on optimization if a .pyo file is given */
         if (strcmp(ext, ".pyo") == 0)
             Py_OptimizeFlag = 1;
@@ -1427,9 +1427,11 @@
         if (set_main_loader(d, filename, "SourcelessFileLoader") < 0) {
             fprintf(stderr, "python: failed to set __main__.__loader__\n");
             ret = -1;
+            fclose(pyc_fp);
             goto done;
         }
-        v = run_pyc_file(fp, filename, d, d, flags);
+        v = run_pyc_file(pyc_fp, filename, d, d, flags);
+        fclose(pyc_fp);
     } else {
         /* When running from stdin, leave __main__.__loader__ alone */
         if (strcmp(filename, "<stdin>") != 0 &&
@@ -1450,9 +1452,6 @@
     Py_DECREF(v);
     ret = 0;
   done:
-    if (close_own_fp) {
-        fclose(fp);
-    }
     if (set_file_name && PyDict_DelItemString(d, "__file__"))
         PyErr_Clear();
     return ret;
@@ -1999,7 +1998,6 @@
     (void) PyMarshal_ReadLongFromFile(fp);
     (void) PyMarshal_ReadLongFromFile(fp);
     v = PyMarshal_ReadLastObjectFromFile(fp);
-    fclose(fp);
     if (v == NULL || !PyCode_Check(v)) {
         Py_XDECREF(v);
         PyErr_SetString(PyExc_RuntimeError,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:46:54 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:46:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Updates_NEWS_for_issue_=23?=
	=?utf-8?q?15895?=
Message-ID: <3XQDv26mSFzNTD@mail.python.org>

http://hg.python.org/cpython/rev/61b1c25d55f2
changeset:   79111:61b1c25d55f2
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 19:28:42 2012 +0200
summary:
  Updates NEWS for issue #15895

files:
  Misc/NEWS |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,7 +2,7 @@
 Python News
 +++++++++++
 
-What's New in Python 3.3.0?
+What's New in Python 3.3.0 Release Candidate 3?
 ===========================
 
 *Release date: XX-Sep-2012*
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- Issue #15895: Fix FILE pointer leak in one error branch of
+  PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
+  is false an and set_main_loader() fails.
+
 Library
 -------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:46:56 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:46:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315882=3A_Change_?=
 =?utf-8?q?=5Fdecimal_to_accept_any_coefficient_tuple_when?=
Message-ID: <3XQDv43C04zNbR@mail.python.org>

http://hg.python.org/cpython/rev/d22ea2aa1057
changeset:   79112:d22ea2aa1057
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Sep 10 19:34:58 2012 +0200
summary:
  Issue #15882: Change _decimal to accept any coefficient tuple when
constructing infinities. This is done for backwards compatibility
with decimal.py: Infinity coefficients are undefined in _decimal
(in accordance with the specification).

files:
  Lib/test/test_decimal.py    |  17 ++++++++++-------
  Misc/NEWS                   |   4 ++++
  Modules/_decimal/_decimal.c |   7 +++++++
  3 files changed, 21 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -1992,7 +1992,8 @@
         d = Decimal("-4.34913534E-17")
         self.assertEqual(d.as_tuple(), (1, (4, 3, 4, 9, 1, 3, 5, 3, 4), -25) )
 
-        # XXX non-compliant infinity payload.
+        # The '0' coefficient is implementation specific to decimal.py.
+        # It has no meaning in the C-version and is ignored there.
         d = Decimal("Infinity")
         self.assertEqual(d.as_tuple(), (0, (0,), 'F') )
 
@@ -2012,12 +2013,14 @@
         d = Decimal( (1, (), 'n') )
         self.assertEqual(d.as_tuple(), (1, (), 'n') )
 
-        # XXX coefficient in infinity should raise an error
-        if self.decimal == P:
-            d = Decimal( (0, (4, 5, 3, 4), 'F') )
-            self.assertEqual(d.as_tuple(), (0, (0,), 'F'))
-            d = Decimal( (1, (0, 2, 7, 1), 'F') )
-            self.assertEqual(d.as_tuple(), (1, (0,), 'F'))
+        # For infinities, decimal.py has always silently accepted any
+        # coefficient tuple.
+        d = Decimal( (0, (0,), 'F') )
+        self.assertEqual(d.as_tuple(), (0, (0,), 'F'))
+        d = Decimal( (0, (4, 5, 3, 4), 'F') )
+        self.assertEqual(d.as_tuple(), (0, (0,), 'F'))
+        d = Decimal( (1, (0, 2, 7, 1), 'F') )
+        self.assertEqual(d.as_tuple(), (1, (0,), 'F'))
 
     def test_subclassing(self):
         # Different behaviours when subclassing Decimal
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,10 @@
 Library
 -------
 
+- Issue #15882: Change _decimal to accept any coefficient tuple when
+  constructing infinities. This is done for backwards compatibility
+  with decimal.py: Infinity coefficients are undefined in _decimal
+  (in accordance with the specification).
 
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -2364,6 +2364,7 @@
     long sign, l;
     mpd_ssize_t exp = 0;
     Py_ssize_t i, mem, tsize;
+    int is_infinite = 0;
     int n;
 
     assert(PyTuple_Check(dectuple));
@@ -2399,6 +2400,7 @@
         /* special */
         if (PyUnicode_CompareWithASCIIString(tmp, "F") == 0) {
             strcat(sign_special, "Inf");
+            is_infinite = 1;
         }
         else if (PyUnicode_CompareWithASCIIString(tmp, "n") == 0) {
             strcat(sign_special, "NaN");
@@ -2470,6 +2472,11 @@
                 "coefficient must be a tuple of digits");
             goto error;
         }
+        if (is_infinite) {
+            /* accept but ignore any well-formed coefficient for compatibility
+               with decimal.py */
+            continue;
+        }
         *cp++ = (char)l + '0';
     }
     *cp = '\0';

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:46:58 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:46:58 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Spacing_fix=2E?=
Message-ID: <3XQDv60Dd8zNc6@mail.python.org>

http://hg.python.org/cpython/rev/106735d8caaf
changeset:   79113:106735d8caaf
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 22 08:53:12 2012 +0200
summary:
  Spacing fix.

files:
  Misc/NEWS |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,7 @@
   with decimal.py: Infinity coefficients are undefined in _decimal
   (in accordance with the specification).
 
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:46:59 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:46:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315977=3A_Fix_memo?=
 =?utf-8?q?ry_leak_in_Modules/=5Fssl=2Ec_when_the_function?=
Message-ID: <3XQDv74V4FzNbm@mail.python.org>

http://hg.python.org/cpython/rev/4cf53684e14e
changeset:   79114:4cf53684e14e
user:        Christian Heimes <christian at cheimes.de>
date:        Thu Sep 20 12:42:54 2012 +0200
summary:
  Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols() is called multiple times

files:
  Misc/NEWS      |  3 +++
  Modules/_ssl.c |  7 +++++++
  2 files changed, 10 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -201,6 +201,9 @@
 - Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by
   Daniel Ellis.
 
+- Issue #15977: Fix memory leak in Modules/_ssl.c when the function
+  _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
+
 Tests
 -----
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1713,6 +1713,9 @@
         return NULL;
     }
     self->ctx = ctx;
+#ifdef OPENSSL_NPN_NEGOTIATED
+    self->npn_protocols = NULL;
+#endif
     /* Defaults */
     SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL);
     SSL_CTX_set_options(self->ctx,
@@ -1812,6 +1815,10 @@
     if (!PyArg_ParseTuple(args, "y*:set_npn_protocols", &protos))
         return NULL;
 
+    if (self->npn_protocols != NULL) {
+        PyMem_Free(self->npn_protocols);
+    }
+
     self->npn_protocols = PyMem_Malloc(protos.len);
     if (self->npn_protocols == NULL) {
         PyBuffer_Release(&protos);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:01 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:01 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_NEWS_entry_location=2E?=
Message-ID: <3XQDv91jgKzN8C@mail.python.org>

http://hg.python.org/cpython/rev/65a46f5d7bd0
changeset:   79115:65a46f5d7bd0
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 22 08:56:12 2012 +0200
summary:
  Fix NEWS entry location.

files:
  Misc/NEWS |  11 +++++++----
  1 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,4 +1,4 @@
-+++++++++++
+s+++++++++++
 Python News
 +++++++++++
 
@@ -22,6 +22,12 @@
   with decimal.py: Infinity coefficients are undefined in _decimal
   (in accordance with the specification).
 
+Extension Modules
+-----------------
+
+- Issue #15977: Fix memory leak in Modules/_ssl.c when the function
+  _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
+
 
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
@@ -201,9 +207,6 @@
 - Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by
   Daniel Ellis.
 
-- Issue #15977: Fix memory leak in Modules/_ssl.c when the function
-  _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
-
 Tests
 -----
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:02 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:02 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2315969=3A_rename_?=
 =?utf-8?q?new_API_to_have_consistent_names_in_the_faulthandler?=
Message-ID: <3XQDvB6QLVzNSn@mail.python.org>

http://hg.python.org/cpython/rev/eede0bf3ceac
changeset:   79116:eede0bf3ceac
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 22 08:58:55 2012 +0200
summary:
  Closes #15969: rename new API to have consistent names in the faulthandler module.

files:
  Doc/library/faulthandler.rst  |   8 ++--
  Lib/test/test_faulthandler.py |  38 +++++++++++-----------
  Misc/NEWS                     |   4 ++
  Modules/faulthandler.c        |  28 ++++++++--------
  4 files changed, 41 insertions(+), 37 deletions(-)


diff --git a/Doc/library/faulthandler.rst b/Doc/library/faulthandler.rst
--- a/Doc/library/faulthandler.rst
+++ b/Doc/library/faulthandler.rst
@@ -71,7 +71,7 @@
 Dump the tracebacks after a timeout
 -----------------------------------
 
-.. function:: dump_tracebacks_later(timeout, repeat=False, file=sys.stderr, exit=False)
+.. function:: dump_traceback_later(timeout, repeat=False, file=sys.stderr, exit=False)
 
    Dump the tracebacks of all threads, after a timeout of *timeout* seconds, or
    every *timeout* seconds if *repeat* is ``True``.  If *exit* is ``True``, call
@@ -84,9 +84,9 @@
    This function is implemented using a watchdog thread and therefore is not
    available if Python is compiled with threads disabled.
 
-.. function:: cancel_dump_tracebacks_later()
+.. function:: cancel_dump_traceback_later()
 
-   Cancel the last call to :func:`dump_tracebacks_later`.
+   Cancel the last call to :func:`dump_traceback_later`.
 
 
 Dump the traceback on a user signal
@@ -112,7 +112,7 @@
 File descriptor issue
 ---------------------
 
-:func:`enable`, :func:`dump_tracebacks_later` and :func:`register` keep the
+:func:`enable`, :func:`dump_traceback_later` and :func:`register` keep the
 file descriptor of their *file* argument. If the file is closed and its file
 descriptor is reused by a new file, or if :func:`os.dup2` is used to replace
 the file descriptor, the traceback will be written into a different file. Call
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -407,7 +407,7 @@
         with temporary_filename() as filename:
             self.check_dump_traceback_threads(filename)
 
-    def _check_dump_tracebacks_later(self, repeat, cancel, filename, loops):
+    def _check_dump_traceback_later(self, repeat, cancel, filename, loops):
         """
         Check how many times the traceback is written in timeout x 2.5 seconds,
         or timeout x 3.5 seconds if cancel is True: 1, 2 or 3 times depending
@@ -422,11 +422,11 @@
 
 def func(timeout, repeat, cancel, file, loops):
     for loop in range(loops):
-        faulthandler.dump_tracebacks_later(timeout, repeat=repeat, file=file)
+        faulthandler.dump_traceback_later(timeout, repeat=repeat, file=file)
         if cancel:
-            faulthandler.cancel_dump_tracebacks_later()
+            faulthandler.cancel_dump_traceback_later()
         time.sleep(timeout * 5)
-        faulthandler.cancel_dump_tracebacks_later()
+        faulthandler.cancel_dump_traceback_later()
 
 timeout = {timeout}
 repeat = {repeat}
@@ -462,9 +462,9 @@
             self.assertEqual(trace, '')
         self.assertEqual(exitcode, 0)
 
-    @unittest.skipIf(not hasattr(faulthandler, 'dump_tracebacks_later'),
-                     'need faulthandler.dump_tracebacks_later()')
-    def check_dump_tracebacks_later(self, repeat=False, cancel=False,
+    @unittest.skipIf(not hasattr(faulthandler, 'dump_traceback_later'),
+                     'need faulthandler.dump_traceback_later()')
+    def check_dump_traceback_later(self, repeat=False, cancel=False,
                                     file=False, twice=False):
         if twice:
             loops = 2
@@ -472,25 +472,25 @@
             loops = 1
         if file:
             with temporary_filename() as filename:
-                self._check_dump_tracebacks_later(repeat, cancel,
+                self._check_dump_traceback_later(repeat, cancel,
                                                   filename, loops)
         else:
-            self._check_dump_tracebacks_later(repeat, cancel, None, loops)
+            self._check_dump_traceback_later(repeat, cancel, None, loops)
 
-    def test_dump_tracebacks_later(self):
-        self.check_dump_tracebacks_later()
+    def test_dump_traceback_later(self):
+        self.check_dump_traceback_later()
 
-    def test_dump_tracebacks_later_repeat(self):
-        self.check_dump_tracebacks_later(repeat=True)
+    def test_dump_traceback_later_repeat(self):
+        self.check_dump_traceback_later(repeat=True)
 
-    def test_dump_tracebacks_later_cancel(self):
-        self.check_dump_tracebacks_later(cancel=True)
+    def test_dump_traceback_later_cancel(self):
+        self.check_dump_traceback_later(cancel=True)
 
-    def test_dump_tracebacks_later_file(self):
-        self.check_dump_tracebacks_later(file=True)
+    def test_dump_traceback_later_file(self):
+        self.check_dump_traceback_later(file=True)
 
-    def test_dump_tracebacks_later_twice(self):
-        self.check_dump_tracebacks_later(twice=True)
+    def test_dump_traceback_later_twice(self):
+        self.check_dump_traceback_later(twice=True)
 
     @unittest.skipIf(not hasattr(faulthandler, "register"),
                      "need faulthandler.register")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,10 @@
 - Issue #15977: Fix memory leak in Modules/_ssl.c when the function
   _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
 
+- Issue #5969: faulthandler module: rename dump_tracebacks_later() to
+  dump_traceback_later() and cancel_dump_tracebacks_later() to
+  cancel_dump_traceback_later().
+
 
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -462,7 +462,7 @@
 }
 
 static void
-cancel_dump_tracebacks_later(void)
+cancel_dump_traceback_later(void)
 {
     /* Notify cancellation */
     PyThread_release_lock(thread.cancel_event);
@@ -509,7 +509,7 @@
 }
 
 static PyObject*
-faulthandler_dump_tracebacks_later(PyObject *self,
+faulthandler_dump_traceback_later(PyObject *self,
                                    PyObject *args, PyObject *kwargs)
 {
     static char *kwlist[] = {"timeout", "repeat", "file", "exit", NULL};
@@ -524,7 +524,7 @@
     size_t header_len;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-        "d|iOi:dump_tracebacks_later", kwlist,
+        "d|iOi:dump_traceback_later", kwlist,
         &timeout, &repeat, &file, &exit))
         return NULL;
     if ((timeout * 1e6) >= (double) PY_TIMEOUT_MAX) {
@@ -552,7 +552,7 @@
     header_len = strlen(header);
 
     /* Cancel previous thread, if running */
-    cancel_dump_tracebacks_later();
+    cancel_dump_traceback_later();
 
     Py_XDECREF(thread.file);
     Py_INCREF(file);
@@ -582,9 +582,9 @@
 }
 
 static PyObject*
-faulthandler_cancel_dump_tracebacks_later_py(PyObject *self)
+faulthandler_cancel_dump_traceback_later_py(PyObject *self)
 {
-    cancel_dump_tracebacks_later();
+    cancel_dump_traceback_later();
     Py_RETURN_NONE;
 }
 #endif  /* FAULTHANDLER_LATER */
@@ -970,16 +970,16 @@
                "dump the traceback of the current thread, or of all threads "
                "if all_threads is True, into file")},
 #ifdef FAULTHANDLER_LATER
-    {"dump_tracebacks_later",
-     (PyCFunction)faulthandler_dump_tracebacks_later, METH_VARARGS|METH_KEYWORDS,
-     PyDoc_STR("dump_tracebacks_later(timeout, repeat=False, file=sys.stderrn, exit=False):\n"
+    {"dump_traceback_later",
+     (PyCFunction)faulthandler_dump_traceback_later, METH_VARARGS|METH_KEYWORDS,
+     PyDoc_STR("dump_traceback_later(timeout, repeat=False, file=sys.stderrn, exit=False):\n"
                "dump the traceback of all threads in timeout seconds,\n"
                "or each timeout seconds if repeat is True. If exit is True, "
                "call _exit(1) which is not safe.")},
-    {"cancel_dump_tracebacks_later",
-     (PyCFunction)faulthandler_cancel_dump_tracebacks_later_py, METH_NOARGS,
-     PyDoc_STR("cancel_dump_tracebacks_later():\ncancel the previous call "
-               "to dump_tracebacks_later().")},
+    {"cancel_dump_traceback_later",
+     (PyCFunction)faulthandler_cancel_dump_traceback_later_py, METH_NOARGS,
+     PyDoc_STR("cancel_dump_traceback_later():\ncancel the previous call "
+               "to dump_traceback_later().")},
 #endif
 
 #ifdef FAULTHANDLER_USER
@@ -1120,7 +1120,7 @@
 #ifdef FAULTHANDLER_LATER
     /* later */
     if (thread.cancel_event) {
-        cancel_dump_tracebacks_later();
+        cancel_dump_traceback_later();
         PyThread_release_lock(thread.cancel_event);
         PyThread_free_lock(thread.cancel_event);
         thread.cancel_event = NULL;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:04 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2315925=3A_fix_reg?=
 =?utf-8?q?ression_in_parsedate=28=29_and_parsedate=5Ftz=28=29_that_should?=
Message-ID: <3XQDvD4db1zNc4@mail.python.org>

http://hg.python.org/cpython/rev/c1e9a1fc6931
changeset:   79117:c1e9a1fc6931
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 22 09:03:56 2012 +0200
summary:
  Closes #15925: fix regression in parsedate() and parsedate_tz() that should return None if unable to parse the argument.

files:
  Lib/email/_parseaddr.py           |   4 +++
  Lib/email/utils.py                |  24 +-----------------
  Lib/test/test_email/test_email.py |  13 ++++++++-
  Misc/NEWS                         |   4 +++
  4 files changed, 21 insertions(+), 24 deletions(-)


diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py
--- a/Lib/email/_parseaddr.py
+++ b/Lib/email/_parseaddr.py
@@ -48,6 +48,8 @@
     Accounts for military timezones.
     """
     res = _parsedate_tz(data)
+    if not res:
+        return
     if res[9] is None:
         res[9] = 0
     return tuple(res)
@@ -62,6 +64,8 @@
     source timezone really was UTC.
 
     """
+    if not data:
+        return
     data = data.split()
     # The FWS after the comma after the day-of-week is optional, so search and
     # adjust for this.
diff --git a/Lib/email/utils.py b/Lib/email/utils.py
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -37,10 +37,7 @@
 from email._parseaddr import AddressList as _AddressList
 from email._parseaddr import mktime_tz
 
-# We need wormarounds for bugs in these methods in older Pythons (see below)
-from email._parseaddr import parsedate as _parsedate
-from email._parseaddr import parsedate_tz as _parsedate_tz
-from email._parseaddr import _parsedate_tz as __parsedate_tz
+from email._parseaddr import parsedate, parsedate_tz, _parsedate_tz
 
 from quopri import decodestring as _qdecode
 
@@ -222,25 +219,8 @@
     return msgid
 
 
-
-# These functions are in the standalone mimelib version only because they've
-# subsequently been fixed in the latest Python versions.  We use this to worm
-# around broken older Pythons.
-def parsedate(data):
-    if not data:
-        return None
-    return _parsedate(data)
-
-
-def parsedate_tz(data):
-    if not data:
-        return None
-    return _parsedate_tz(data)
-
 def parsedate_to_datetime(data):
-    if not data:
-        return None
-    *dtuple, tz = __parsedate_tz(data)
+    *dtuple, tz = _parsedate_tz(data)
     if tz is None:
         return datetime.datetime(*dtuple[:6])
     return datetime.datetime(*dtuple[:6],
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -2718,8 +2718,17 @@
             utils.formatdate(now, localtime=False, usegmt=True),
             time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.gmtime(now)))
 
-    def test_parsedate_none(self):
-        self.assertEqual(utils.parsedate(''), None)
+    # parsedate and parsedate_tz will become deprecated interfaces someday
+    def test_parsedate_returns_None_for_invalid_strings(self):
+        self.assertIsNone(utils.parsedate(''))
+        self.assertIsNone(utils.parsedate_tz(''))
+        self.assertIsNone(utils.parsedate('0'))
+        self.assertIsNone(utils.parsedate_tz('0'))
+        self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
+        self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time'))
+        # Not a part of the spec but, but this has historically worked:
+        self.assertIsNone(utils.parsedate(None))
+        self.assertIsNone(utils.parsedate_tz(None))
 
     def test_parsedate_compact(self):
         # The FWS after the comma is optional
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,10 @@
   with decimal.py: Infinity coefficients are undefined in _decimal
   (in accordance with the specification).
 
+- Issue #15925: Fix a regression in email.util where the parsedate() and
+  parsedate_tz() functions did not return None anymore when the argument could
+  not be parsed.
+
 Extension Modules
 -----------------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:06 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315926=3A_Fix_cras?=
 =?utf-8?q?h_after_multiple_reinitializations_of_the_interpreter=2E?=
Message-ID: <3XQDvG14TfzNbV@mail.python.org>

http://hg.python.org/cpython/rev/6708224f8bee
changeset:   79118:6708224f8bee
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Sep 12 18:01:36 2012 +0200
summary:
  Issue #15926: Fix crash after multiple reinitializations of the interpreter.

files:
  Misc/NEWS             |  2 ++
  Modules/posixmodule.c |  2 +-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #15926: Fix crash after multiple reinitializations of the interpreter.
+
 - Issue #15895: Fix FILE pointer leak in one error branch of
   PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
   is false an and set_main_loader() fails.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -11852,7 +11852,6 @@
 
         /* initialize TerminalSize_info */
         PyStructSequence_InitType(&TerminalSizeType, &TerminalSize_desc);
-        Py_INCREF(&TerminalSizeType);
     }
 #if defined(HAVE_WAITID) && !defined(__APPLE__)
     Py_INCREF((PyObject*) &WaitidResultType);
@@ -11915,6 +11914,7 @@
 
 #endif /* __APPLE__ */
 
+    Py_INCREF(&TerminalSizeType);
     PyModule_AddObject(m, "terminal_size", (PyObject*) &TerminalSizeType);
 
     billion = PyLong_FromLong(1000000000);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:07 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2315973=3A_fix_a_s?=
 =?utf-8?q?egmentation_fault_when_comparing_timezone_objects=2E?=
Message-ID: <3XQDvH4Kd2zMlF@mail.python.org>

http://hg.python.org/cpython/rev/ec77f8fb9958
changeset:   79119:ec77f8fb9958
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 22 09:23:12 2012 +0200
summary:
  Closes #15973: fix a segmentation fault when comparing timezone objects.

files:
  Lib/datetime.py            |  2 ++
  Lib/test/datetimetester.py |  2 ++
  Misc/NEWS                  |  3 +++
  Modules/_datetimemodule.c  |  6 ++++++
  4 files changed, 13 insertions(+), 0 deletions(-)


diff --git a/Lib/datetime.py b/Lib/datetime.py
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -1854,6 +1854,8 @@
         return (self._offset, self._name)
 
     def __eq__(self, other):
+        if type(other) != timezone:
+            return False
         return self._offset == other._offset
 
     def __hash__(self):
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -235,6 +235,8 @@
         self.assertEqual(timezone(-5 * HOUR), timezone(-5 * HOUR, 'EST'))
         with self.assertRaises(TypeError): timezone(ZERO) < timezone(ZERO)
         self.assertIn(timezone(ZERO), {timezone(ZERO)})
+        self.assertTrue(timezone(ZERO) != None)
+        self.assertFalse(timezone(ZERO) ==  None)
 
     def test_aware_datetime(self):
         # test that timezone instances can be used by datetime
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,9 @@
 Extension Modules
 -----------------
 
+- Issue #15973: Fix a segmentation fault when comparing datetime timezone
+  objects.
+
 - Issue #15977: Fix memory leak in Modules/_ssl.c when the function
   _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
 
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
--- a/Modules/_datetimemodule.c
+++ b/Modules/_datetimemodule.c
@@ -3215,6 +3215,12 @@
 {
     if (op != Py_EQ && op != Py_NE)
         Py_RETURN_NOTIMPLEMENTED;
+    if (Py_TYPE(other) != &PyDateTime_TimeZoneType) {
+	if (op == Py_EQ)
+	    Py_RETURN_FALSE;
+	else
+	    Py_RETURN_TRUE;
+    }
     return delta_richcompare(self->offset, other->offset, op);
 }
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:09 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2315900=3A_Fixed_re?=
 =?utf-8?q?ference_leak_in_PyUnicode=5FTranslateCharmap=28=29?=
Message-ID: <3XQDvK0RyqzNW4@mail.python.org>

http://hg.python.org/cpython/rev/89f62f143920
changeset:   79120:89f62f143920
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 11 14:03:25 2012 +0200
summary:
  Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap()

files:
  Misc/NEWS               |   2 ++
  Objects/unicodeobject.c |  11 +++++------
  2 files changed, 7 insertions(+), 6 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap().
+
 - Issue #15926: Fix crash after multiple reinitializations of the interpreter.
 
 - Issue #15895: Fix FILE pointer leak in one error branch of
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8585,10 +8585,13 @@
                            PyObject *mapping,
                            const char *errors)
 {
+    PyObject *result;
     PyObject *unicode = PyUnicode_FromUnicode(p, size);
     if (!unicode)
         return NULL;
-    return _PyUnicode_TranslateCharmap(unicode, mapping, errors);
+    result = _PyUnicode_TranslateCharmap(unicode, mapping, errors);
+    Py_DECREF(unicode);
+    return result;
 }
 
 PyObject *
@@ -8600,14 +8603,10 @@
 
     str = PyUnicode_FromObject(str);
     if (str == NULL)
-        goto onError;
+        return NULL;
     result = _PyUnicode_TranslateCharmap(str, mapping, errors);
     Py_DECREF(str);
     return result;
-
-  onError:
-    Py_XDECREF(str);
-    return NULL;
 }
 
 static Py_UCS4

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:10 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_out-of-bounce_write_?=
 =?utf-8?q?to_rawmode_buffer=2E_The_fixed_size_buffer_wasn=27t?=
Message-ID: <3XQDvL3ZwBzNNt@mail.python.org>

http://hg.python.org/cpython/rev/305b55c3ccd1
changeset:   79121:305b55c3ccd1
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 03:50:48 2012 +0200
summary:
  Fixed out-of-bounce write to rawmode buffer. The fixed size buffer wasn't enlarged for the new 'x' flag. The buffer may contain the 5 flags xrwa+ and the \0 byte

files:
  Modules/_io/_iomodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -229,7 +229,7 @@
     int creating = 0, reading = 0, writing = 0, appending = 0, updating = 0;
     int text = 0, binary = 0, universal = 0;
 
-    char rawmode[5], *m;
+    char rawmode[6], *m;
     int line_buffering, isatty;
 
     PyObject *raw, *modeobj = NULL, *buffer = NULL, *wrapper = NULL;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:12 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_What=27s_New_entries_f?=
 =?utf-8?q?or_some_minor_work_I_did_in_3=2E3=2E?=
Message-ID: <3XQDvN0C28zNSn@mail.python.org>

http://hg.python.org/cpython/rev/f1cf605fe924
changeset:   79122:f1cf605fe924
user:        Larry Hastings <larry at hastings.org>
date:        Fri Sep 21 09:30:19 2012 -0700
summary:
  Add What's New entries for some minor work I did in 3.3.

files:
  Doc/whatsnew/3.3.rst |  13 ++++++++++++-
  1 files changed, 12 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1322,7 +1322,7 @@
   files and directories, it is more reliable (and also faster) to manipulate
   file descriptors instead of file names. Python 3.3 enhances existing functions
   and introduces new functions to work on file descriptors (:issue:`4761`,
-  :issue:`10755`).
+  :issue:`10755` and :issue:`14626`).
 
   - The :mod:`os` module has a new :func:`~os.fwalk` function similar to
     :func:`~os.walk` except that it also yields file descriptors referring to the
@@ -1355,6 +1355,12 @@
   Windows.
   (Contributed by Antoine Pitrou in :issue:`8828`.)
 
+* The stat family of functions (:func:`~os.stat`, :func:`~os.fstat`,
+  and :func:`~os.lstat`) now support reading a file's timestamps
+  with nanosecond precision.  Symmetrically, :func:`~os.utime`
+  can now write file timestamps with nanosecond precision.  (Contributed by
+  Larry Hastings in :issue:`14127`.)
+
 * The new :func:`os.get_terminal_size` function queries the size of the
   terminal attached to a file descriptor. See also
   :func:`shutil.get_terminal_size`.
@@ -1474,6 +1480,11 @@
     path also specifying the user/group names and not only their numeric
     ids. (Contributed by Sandro Tosi in :issue:`12191`)
 
+* :func:`~shutil.copy2` and :func:`~shutil.copystat` now preserve file
+  timestamps with nanosecond precision on platforms that support it.
+  They also preserve file "extended attributes" on Linux.  (Contributed
+  by Larry Hastings in :issue:`14127` and  :issue:`15238`.)
+
 * The new :func:`shutil.get_terminal_size` function returns the size of the
   terminal window the interpreter is attached to.
   (Contributed by Zbigniew J?drzejewski-Szmek in :issue:`13609`.)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:13 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Mention_that_=22defaults?=
 =?utf-8?q?=22_can_be_None_for_inspect=2Egetfullargspec=2E?=
Message-ID: <3XQDvP3pbSzNb1@mail.python.org>

http://hg.python.org/cpython/rev/b2fd5e3b4fcd
changeset:   79123:b2fd5e3b4fcd
user:        Larry Hastings <larry at hastings.org>
date:        Fri Sep 21 09:40:41 2012 -0700
summary:
  Mention that "defaults" can be None for inspect.getfullargspec.
Also minor formatting cleanups.

files:
  Doc/library/inspect.rst |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -675,9 +675,9 @@
    :term:`named tuple` ``ArgSpec(args, varargs, keywords, defaults)`` is
    returned. *args* is a list of the argument names. *varargs* and *keywords*
    are the names of the ``*`` and ``**`` arguments or ``None``. *defaults* is a
-   tuple of default argument values or None if there are no default arguments;
-   if this tuple has *n* elements, they correspond to the last *n* elements
-   listed in *args*.
+   tuple of default argument values or ``None`` if there are no default
+   arguments; if this tuple has *n* elements, they correspond to the last
+   *n* elements listed in *args*.
 
    .. deprecated:: 3.0
       Use :func:`getfullargspec` instead, which provides information about
@@ -693,8 +693,9 @@
    annotations)``
 
    *args* is a list of the argument names.  *varargs* and *varkw* are the names
-   of the ``*`` and ``**`` arguments or ``None``.  *defaults* is an n-tuple of
-   the default values of the last n arguments.  *kwonlyargs* is a list of
+   of the ``*`` and ``**`` arguments or ``None``.  *defaults* is an *n*-tuple
+   of the default values of the last *n* arguments, or ``None`` if there are no
+   default arguments.  *kwonlyargs* is a list of
    keyword-only argument names.  *kwonlydefaults* is a dictionary mapping names
    from kwonlyargs to defaults.  *annotations* is a dictionary mapping argument
    names to annotations.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:15 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Cleanup/rewrite_shutil_doc?=
 =?utf-8?q?s_regarding_follow=5Fsymlinks_and_copying_attributes=2E?=
Message-ID: <3XQDvR1D6PzNPb@mail.python.org>

http://hg.python.org/cpython/rev/76b1c73f53aa
changeset:   79124:76b1c73f53aa
user:        Larry Hastings <larry at hastings.org>
date:        Fri Sep 21 10:12:14 2012 -0700
summary:
  Cleanup/rewrite shutil docs regarding follow_symlinks and copying attributes.

files:
  Doc/library/shutil.rst |  115 +++++++++++++++++++++-------
  1 files changed, 84 insertions(+), 31 deletions(-)


diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -50,14 +50,15 @@
 .. function:: copyfile(src, dst, *, follow_symlinks=True)
 
    Copy the contents (no metadata) of the file named *src* to a file named
-   *dst* and return *dst*.  *dst* must be the complete target file name; look at
-   :func:`shutil.copy` for a copy that accepts a target directory path.  If
-   *src* and *dst* are the same files, :exc:`Error` is raised.
+   *dst* and return *dst*.  *src* and *dst* are path names given as strings.
+   *dst* must be the complete target file name; look at :func:`shutil.copy`
+   for a copy that accepts a target directory path.  If *src* and *dst*
+   specify the same file, :exc:`Error` is raised.
 
-   The destination location must be writable; otherwise,  an :exc:`OSError` exception
-   will be raised. If *dst* already exists, it will be replaced.   Special files
-   such as character or block devices and pipes cannot be copied with this
-   function.  *src* and *dst* are path names given as strings.
+   The destination location must be writable; otherwise, an :exc:`OSError`
+   exception will be raised. If *dst* already exists, it will be replaced.
+   Special files such as character or block devices and pipes cannot be
+   copied with this function.
 
    If *follow_symlinks* is false and *src* is a symbolic link,
    a new symbolic link will be created instead of copying the
@@ -71,52 +72,104 @@
 .. function:: copymode(src, dst, *, follow_symlinks=True)
 
    Copy the permission bits from *src* to *dst*.  The file contents, owner, and
-   group are unaffected.  *src* and *dst* are path names given as strings.  If
-   *follow_symlinks* is false, *src* is a symbolic link, and the operating
-   system supports modes for symbolic links (for example BSD-based ones),
-   the mode of the link will be copied.
+   group are unaffected.  *src* and *dst* are path names given as strings.
+   If *follow_symlinks* is false, and both *src* and *dst* are symbolic links,
+   :func:`copymode` will attempt to modify the mode of *dst* itself (rather
+   than the file it points to).  This functionality is not available on every
+   platform; please see :func:`copystat` for more information.  If
+   :func:`copymode` cannot modify symbolic links on the local platform, and it
+   is asked to do so, it will do nothing and return.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument.
 
 .. function:: copystat(src, dst, *, follow_symlinks=True)
 
-   Copy the permission bits, last access time, last modification time, and flags
-   from *src* to *dst*.  The file contents, owner, and group are unaffected.  *src*
-   and *dst* are path names given as strings.  If *follow_symlinks* is false, and
-   *src* and *dst* are both symbolic links, the stats of the link will be copied as
-   far as the platform allows.  On Linux, :func:`copystat` also copies the
-   "extended attributes" where possible.
+   Copy the permission bits, last access time, last modification time, and
+   flags from *src* to *dst*.  On Linux, :func:`copystat` also copies the
+   "extended attributes" where possible.  The file contents, owner, and
+   group are unaffected.  *src* and *dst* are path names given as strings.
+
+   If *follow_symlinks* is false, and *src* and *dst* both
+   refer to symbolic links, :func:`copystat` will operate on
+   the symbolic links themselves rather than the files the
+   symbolic links refer to--reading the information from the
+   *src* symbolic link, and writing the information to the
+   *dst* symbolic link.
+
+   .. note::
+
+      Not all platforms provide the ability to examine and
+      modify symbolic links.  Python itself can tell you what
+      functionality is locally available.
+
+      * If ``os.chmod in os.supports_follow_symlinks`` is
+        ``True``, :func:`copystat` can modify the permission
+        bits of a symbolic link.
+
+      * If ``os.utime in os.supports_follow_symlinks`` is
+        ``True``, :func:`copystat` can modify the last access
+        and modification times of a symbolic link.
+
+      * If ``os.chflags in os.supports_follow_symlinks`` is
+        ``True``, :func:`copystat` can modify the flags of
+        a symbolic link.  (``os.chflags`` is not available on
+        all platforms.)
+
+      On platforms where some or all of this functionality
+      is unavailable, when asked to modify a symbolic link,
+      :func:`copystat` will copy everything it can.
+      :func:`copystat` never returns failure.
+
+      Please see :data:`os.supports_follow_symlinks`
+      for more information.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument and support for Linux extended attributes.
 
 .. function:: copy(src, dst, *, follow_symlinks=True)
 
-   Copy the file *src* to the file or directory *dst* and return the file's
-   destination.  If *dst* is a directory, a
-   file with the same basename as *src*  is created (or overwritten) in the
-   directory specified.  Permission bits are copied.  *src* and *dst* are path
-   names given as strings.  If *follow_symlinks* is false, symbolic
-   links won't be followed but recreated instead -- this resembles GNU's
-   :program:`cp -P`.
+   Copies the file *src* to the file or directory *dst*.  *src* and *dst*
+   should be strings.  If *dst* specifies a directory, the file will be
+   copied into *dst* using the base filename from *src*.  Returns the
+   path to the newly created file.
+
+   If *follow_symlinks* is false, and *src* is a symbolic link,
+   *dst* will be created as a symbolic link.  If *follow_symlinks*
+   is true and *src* is a symbolic link, *dst* will be a copy of
+   the file *src* refers to.
+
+   :func:`copy` copies the file data and the file's permission
+   mode (see :func:`os.chmod`).  Other metadata, like the
+   file's creation and modification times, is not preserved.
+   To preserve all file metadata from the original, use
+   :func:`~shutil.copy2` instead.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument.
-      Now returns *dst*.
+      Now returns path to the newly created file.
 
 .. function:: copy2(src, dst, *, follow_symlinks=True)
 
-   Similar to :func:`shutil.copy`, including that the destination is
-   returned, but metadata is copied as well. This is similar to the Unix
-   command :program:`cp -p`.  If *follow_symlinks* is false,
-   symbolic links won't be followed but recreated instead -- this resembles
-   GNU's :program:`cp -P`.
+   Identical to :func:`~shutil.copy` except that :func:`copy2`
+   also attempts to preserve all file metadata.
+
+   When *follow_symlinks* is false, and *src* is a symbolic
+   link, :func:`copy2` attempts to copy all metadata from the
+   *src* symbolic link to the newly-created *dst* symbolic link.
+   However, this functionality is not available on all platforms.
+   On platforms where some or all of this functionality is
+   unavailable, :func:`copy2` will preserve all the metadata
+   it can; :func:`copy2` never returns failure.
+
+   :func:`copy2` uses :func:`copystat` to copy the file metadata.
+   Please see :func:`copystat` for more information
+   about platform support for modifying symbolic link metadata.
 
    .. versionchanged:: 3.3
       Added *follow_symlinks* argument, try to copy extended
       file system attributes too (currently Linux only).
-      Now returns *dst*.
+      Now returns path to the newly created file.
 
 .. function:: ignore_patterns(\*patterns)
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:16 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_issue_number=2E?=
Message-ID: <3XQDvS4JCZzNSn@mail.python.org>

http://hg.python.org/cpython/rev/b8b5ef366bdc
changeset:   79125:b8b5ef366bdc
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 23 11:17:01 2012 +0200
summary:
  Fix issue number.

files:
  Misc/NEWS |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -39,7 +39,7 @@
 - Issue #15977: Fix memory leak in Modules/_ssl.c when the function
   _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
 
-- Issue #5969: faulthandler module: rename dump_tracebacks_later() to
+- Issue #15969: faulthandler module: rename dump_tracebacks_later() to
   dump_traceback_later() and cancel_dump_tracebacks_later() to
   cancel_dump_traceback_later().
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:18 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_memory_leak_in_error?=
 =?utf-8?q?_branch_of_formatfloat=28=29=2E_CID_719687?=
Message-ID: <3XQDvV0MTMzNDF@mail.python.org>

http://hg.python.org/cpython/rev/d000fb73153e
changeset:   79126:d000fb73153e
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 11:48:41 2012 +0200
summary:
  Fixed memory leak in error branch of formatfloat(). CID 719687

files:
  Objects/unicodeobject.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13237,8 +13237,10 @@
         return -1;
     len = strlen(p);
     if (writer) {
-        if (_PyUnicodeWriter_Prepare(writer, len, 127) == -1)
+        if (_PyUnicodeWriter_Prepare(writer, len, 127) == -1) {
+            PyMem_Free(p);
             return -1;
+        }
         unicode_write_cstr(writer->buffer, writer->pos, p, len);
         writer->pos += len;
     }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:19 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fixed_reference_leak_in_er?=
 =?utf-8?q?ror_branch_of_=5Fbufferedreader=5Fread=5Fall=28=29=2E_The?=
Message-ID: <3XQDvW602FzNbV@mail.python.org>

http://hg.python.org/cpython/rev/b7c6dd1eaba2
changeset:   79127:b7c6dd1eaba2
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 10 17:46:09 2012 +0200
summary:
  Fixed reference leak in error branch of _bufferedreader_read_all(). The variable data can contain a bytes object but it wasn't cleaned up when PyList_New() failed. CID 715364

files:
  Modules/_io/bufferedio.c |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -1499,8 +1499,10 @@
     }
 
     chunks = PyList_New(0);
-    if (chunks == NULL)
+    if (chunks == NULL) {
+        Py_XDECREF(data);
         return NULL;
+    }
 
     while (1) {
         if (data) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:21 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_C-style_comments=2E?=
Message-ID: <3XQDvY35F9zNPb@mail.python.org>

http://hg.python.org/cpython/rev/962c02da78e2
changeset:   79128:962c02da78e2
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 23 15:46:09 2012 +0200
summary:
  Use C-style comments.

files:
  Modules/_decimal/libmpdec/mpdecimal.c |  54 +++++++-------
  1 files changed, 27 insertions(+), 27 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -5063,28 +5063,28 @@
         return;
     }
 
-    m = (la+1)/2;  // ceil(la/2)
+    m = (la+1)/2;  /* ceil(la/2) */
 
     /* lb <= m < la */
     if (lb <= m) {
 
         /* lb can now be larger than la-m */
         if (lb > la-m) {
-            lt = lb + lb + 1;       // space needed for result array
-            mpd_uint_zero(w, lt);   // clear result array
-            _karatsuba_rec(w, b, a+m, w+lt, lb, la-m); // b*ah
+            lt = lb + lb + 1;       /* space needed for result array */
+            mpd_uint_zero(w, lt);   /* clear result array */
+            _karatsuba_rec(w, b, a+m, w+lt, lb, la-m); /* b*ah */
         }
         else {
-            lt = (la-m) + (la-m) + 1;  // space needed for result array
-            mpd_uint_zero(w, lt);      // clear result array
-            _karatsuba_rec(w, a+m, b, w+lt, la-m, lb); // ah*b
-        }
-        _mpd_baseaddto(c+m, w, (la-m)+lb);      // add ah*b*B**m
-
-        lt = m + m + 1;         // space needed for the result array
-        mpd_uint_zero(w, lt);   // clear result array
-        _karatsuba_rec(w, a, b, w+lt, m, lb);  // al*b
-        _mpd_baseaddto(c, w, m+lb);    // add al*b
+            lt = (la-m) + (la-m) + 1;  /* space needed for result array */
+            mpd_uint_zero(w, lt);      /* clear result array */
+            _karatsuba_rec(w, a+m, b, w+lt, la-m, lb); /* ah*b */
+        }
+        _mpd_baseaddto(c+m, w, (la-m)+lb);      /* add ah*b*B**m */
+
+        lt = m + m + 1;         /* space needed for the result array */
+        mpd_uint_zero(w, lt);   /* clear result array */
+        _karatsuba_rec(w, a, b, w+lt, m, lb);  /* al*b */
+        _mpd_baseaddto(c, w, m+lb);    /* add al*b */
 
         return;
     }
@@ -5360,34 +5360,34 @@
         return 1;
     }
 
-    m = (la+1)/2;  // ceil(la/2)
+    m = (la+1)/2;  /* ceil(la/2) */
 
     /* lb <= m < la */
     if (lb <= m) {
 
         /* lb can now be larger than la-m */
         if (lb > la-m) {
-            lt = lb + lb + 1;       // space needed for result array
-            mpd_uint_zero(w, lt);   // clear result array
-            if (!_karatsuba_rec_fnt(w, b, a+m, w+lt, lb, la-m)) { // b*ah
+            lt = lb + lb + 1;       /* space needed for result array */
+            mpd_uint_zero(w, lt);   /* clear result array */
+            if (!_karatsuba_rec_fnt(w, b, a+m, w+lt, lb, la-m)) { /* b*ah */
                 return 0; /* GCOV_UNLIKELY */
             }
         }
         else {
-            lt = (la-m) + (la-m) + 1;  // space needed for result array
-            mpd_uint_zero(w, lt);      // clear result array
-            if (!_karatsuba_rec_fnt(w, a+m, b, w+lt, la-m, lb)) { // ah*b
+            lt = (la-m) + (la-m) + 1;  /* space needed for result array */
+            mpd_uint_zero(w, lt);      /* clear result array */
+            if (!_karatsuba_rec_fnt(w, a+m, b, w+lt, la-m, lb)) { /* ah*b */
                 return 0; /* GCOV_UNLIKELY */
             }
         }
-        _mpd_baseaddto(c+m, w, (la-m)+lb); // add ah*b*B**m
-
-        lt = m + m + 1;         // space needed for the result array
-        mpd_uint_zero(w, lt);   // clear result array
-        if (!_karatsuba_rec_fnt(w, a, b, w+lt, m, lb)) {  // al*b
+        _mpd_baseaddto(c+m, w, (la-m)+lb); /* add ah*b*B**m */
+
+        lt = m + m + 1;         /* space needed for the result array */
+        mpd_uint_zero(w, lt);   /* clear result array */
+        if (!_karatsuba_rec_fnt(w, a, b, w+lt, m, lb)) {  /* al*b */
             return 0; /* GCOV_UNLIKELY */
         }
-        _mpd_baseaddto(c, w, m+lb);       // add al*b
+        _mpd_baseaddto(c, w, m+lb);       /* add al*b */
 
         return 1;
     }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:22 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_C-style_comments_=28re?=
 =?utf-8?q?quired_for_the_AIX_build_slave=29=2E?=
Message-ID: <3XQDvZ63WkzNHB@mail.python.org>

http://hg.python.org/cpython/rev/d614cc4cd6c6
changeset:   79129:d614cc4cd6c6
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 23 15:51:16 2012 +0200
summary:
  Use C-style comments (required for the AIX build slave).

files:
  Modules/unicodedata.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -1236,8 +1236,8 @@
         PyErr_Format(PyExc_KeyError, "undefined character name '%s'", name);
         return NULL;
     }
-    // check if code is in the PUA range that we use for named sequences
-    // and convert it
+    /* check if code is in the PUA range that we use for named sequences
+       and convert it */
     if (IS_NAMED_SEQ(code)) {
         index = code-named_sequences_start;
         return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:24 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Use_C-style_comments_for_C?=
	=?utf-8?q?89_/_ANSI_C_compatibility?=
Message-ID: <3XQDvc29yjzNbR@mail.python.org>

http://hg.python.org/cpython/rev/df513bee8b05
changeset:   79130:df513bee8b05
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 23 16:11:15 2012 +0200
summary:
  Use C-style comments for C89 / ANSI C compatibility

files:
  Modules/posixmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -10488,7 +10488,7 @@
         static Py_ssize_t buffer_sizes[] = { 256, XATTR_LIST_MAX, 0 };
         Py_ssize_t buffer_size = buffer_sizes[i];
         if (!buffer_size) {
-            // ERANGE
+            /* ERANGE */
             path_error("listxattr", &path);
             break;
         }

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:25 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_GCC_doesn=27t_support_type?=
 =?utf-8?q?of_in_strict_ansi_mode_=28e=2Eg=2E_-ansi_or_-std=3Dc89=29?=
Message-ID: <3XQDvd5Lp5zNPb@mail.python.org>

http://hg.python.org/cpython/rev/a2bb835cac21
changeset:   79131:a2bb835cac21
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 23 16:15:01 2012 +0200
summary:
  GCC doesn't support typeof in strict ansi mode (e.g. -ansi or -std=c89)

files:
  Include/pymacro.h |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Include/pymacro.h b/Include/pymacro.h
--- a/Include/pymacro.h
+++ b/Include/pymacro.h
@@ -30,7 +30,7 @@
    error (see Py_BUILD_ASSERT_EXPR).
 
    Written by Rusty Russell, public domain, http://ccodearchive.net/ */
-#if defined(__GNUC__)
+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__))
 /* Two gcc extensions.
    &a[0] degrades to a pointer: a different type from an array */
 #define Py_ARRAY_LENGTH(array) \

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:27 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_news_entries_for_recen?=
	=?utf-8?q?t_changes=2E?=
Message-ID: <3XQDvg1K8bzNLZ@mail.python.org>

http://hg.python.org/cpython/rev/f833ba3e68f1
changeset:   79132:f833ba3e68f1
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 23 17:11:26 2012 +0200
summary:
  Add news entries for recent changes.

files:
  Misc/NEWS |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,8 @@
   PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
   is false an and set_main_loader() fails.
 
+- Fixes for a few crash and memory leak regressions found by Coverity.
+
 Library
 -------
 
@@ -43,6 +45,7 @@
   dump_traceback_later() and cancel_dump_tracebacks_later() to
   cancel_dump_traceback_later().
 
+- _decimal module: use only C 89 style comments.
 
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:28 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Bump_to_3=2E3=2E0rc3=2E?=
Message-ID: <3XQDvh4QwZzNRp@mail.python.org>

http://hg.python.org/cpython/rev/c191d21cefaf
changeset:   79133:c191d21cefaf
tag:         v3.3.0rc3
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 23 17:15:21 2012 +0200
summary:
  Bump to 3.3.0rc3.

files:
  Include/patchlevel.h      |  4 ++--
  Lib/distutils/__init__.py |  2 +-
  Lib/idlelib/idlever.py    |  2 +-
  Misc/NEWS                 |  8 ++++----
  Misc/RPM/python-3.3.spec  |  2 +-
  README                    |  2 +-
  6 files changed, 10 insertions(+), 10 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	0
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	2
+#define PY_RELEASE_SERIAL	3
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc2+"
+#define PY_VERSION      	"3.3.0rc3"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc2"
+__version__ = "3.3.0rc3"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.0rc2"
+IDLE_VERSION = "3.3.0rc3"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1,11 +1,11 @@
-s+++++++++++
++++++++++++
 Python News
 +++++++++++
 
 What's New in Python 3.3.0 Release Candidate 3?
-===========================
-
-*Release date: XX-Sep-2012*
+===============================================
+
+*Release date: 23-Sep-2012*
 
 Core and Builtins
 -----------------
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
--- a/Misc/RPM/python-3.3.spec
+++ b/Misc/RPM/python-3.3.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0rc2
+%define version 3.3.0rc3
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.3.0 release candidate 2
+This is Python version 3.3.0 release candidate 3
 ================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:30 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Added_tag_v3=2E3=2E0rc3_fo?=
	=?utf-8?q?r_changeset_c191d21cefaf?=
Message-ID: <3XQDvk0YbgzNNt@mail.python.org>

http://hg.python.org/cpython/rev/ecddcf3f886e
changeset:   79134:ecddcf3f886e
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 23 17:15:25 2012 +0200
summary:
  Added tag v3.3.0rc3 for changeset c191d21cefaf

files:
  .hgtags |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -107,3 +107,4 @@
 4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
+c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:31 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:31 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Post-release_updates=2E?=
Message-ID: <3XQDvl4rNCzN1x@mail.python.org>

http://hg.python.org/cpython/rev/b356eab13d86
changeset:   79135:b356eab13d86
user:        Georg Brandl <georg at python.org>
date:        Mon Sep 24 07:42:20 2012 +0200
summary:
  Post-release updates.

files:
  Include/patchlevel.h |   2 +-
  Misc/NEWS            |  12 ++++++++++++
  2 files changed, 13 insertions(+), 1 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,7 +23,7 @@
 #define PY_RELEASE_SERIAL	3
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc3"
+#define PY_VERSION      	"3.3.0rc3+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,18 @@
 Python News
 +++++++++++
 
+What's New in Python 3.3.0?
+===========================
+
+*Release date: XX-Sep-2012*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
 What's New in Python 3.3.0 Release Candidate 3?
 ===============================================
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:47:33 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:47:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_with_3=2E3=2E0_release_clone=2E?=
Message-ID: <3XQDvn3nYtzNZb@mail.python.org>

http://hg.python.org/cpython/rev/3d9c323711d0
changeset:   79136:3d9c323711d0
parent:      79108:c64dec45d46f
parent:      79135:b356eab13d86
user:        Georg Brandl <georg at python.org>
date:        Mon Sep 24 07:46:35 2012 +0200
summary:
  Merge with 3.3.0 release clone.

files:
  .hgtags                   |    1 +
  Include/patchlevel.h      |    4 +-
  Lib/distutils/__init__.py |    2 +-
  Lib/idlelib/idlever.py    |    2 +-
  Misc/NEWS                 |  144 +++++++++++++++----------
  Misc/RPM/python-3.3.spec  |    2 +-
  README                    |    2 +-
  7 files changed, 91 insertions(+), 66 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -107,3 +107,4 @@
 4972a8f1b2aa3d7cdd64dc96aa7fa112fe1ea343 v3.3.0b2
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
+c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	0
 #define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	2
+#define PY_RELEASE_SERIAL	3
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc2+"
+#define PY_VERSION      	"3.3.0rc3+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc2"
+__version__ = "3.3.0rc3"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.0rc2"
+IDLE_VERSION = "3.3.0rc3"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,8 +2,8 @@
 Python News
 +++++++++++
 
-What's New in Python 3.3.1
-==========================
+What's New in Python 3.3.1?
+===========================
 
 *Release date: XX-XX-XXXX*
 
@@ -20,14 +20,6 @@
 - Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
   (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
 
-- Issue #15926: Fix crash after multiple reinitializations of the interpreter.
-
-- Issue #15895: Fix FILE pointer leak in one error branch of
-  PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
-  is false an and set_main_loader() fails.
-
-- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
-
 - Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 
 - Issue #15846: Fix SystemError which happened when using ast.parse in an
@@ -39,24 +31,16 @@
 Library
 -------
 
-- Issue #15925: fixed regression in email.utils.parsedate and parsedate_tz
-  handling of empty and non-date strings.
-
-- Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
+- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
   datetime.MAXYEAR.  Patch by C?dric Krier.
 
 - Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
   elements 'meta' and 'param'.
 
-- Issue #15842: the SocketIO.{readable,writable,seekable} methods now
+- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
   raise ValueError when the file-like object is closed.  Patch by Alessandro
   Moura.
 
-- Issue #15882: Change _decimal to accept any coefficient tuple when
-  constructing infinities. This is done for backwards compatibility
-  with decimal.py: Infinity coefficients are undefined in _decimal
-  (in accordance with the specification).
-
 - Issue #15876: Fix a refleak in the curses module: window.encoding.
 
 - Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
@@ -87,53 +71,93 @@
 Extension Modules
 -----------------
 
+Tests
+-----
+
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
+Build
+-----
+
+- Issue #15819: Make sure we can build Python out-of-tree from a readonly
+  source directory.  (Somewhat related to Issue #9860.)
+
+Documentation
+-------------
+
+- Issue #11964: Document a change in v3.2 to the behavior of the indent
+  parameter of json encoding operations.
+
+Tools/Demos
+-----------
+
+
+What's New in Python 3.3.0?
+===========================
+
+*Release date: XX-Sep-2012*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
+What's New in Python 3.3.0 Release Candidate 3?
+===============================================
+
+*Release date: 23-Sep-2012*
+
+Core and Builtins
+-----------------
+
+- Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap().
+
+- Issue #15926: Fix crash after multiple reinitializations of the interpreter.
+
+- Issue #15895: Fix FILE pointer leak in one error branch of
+  PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
+  is false an and set_main_loader() fails.
+
+- Fixes for a few crash and memory leak regressions found by Coverity.
+
+Library
+-------
+
+- Issue #15882: Change _decimal to accept any coefficient tuple when
+  constructing infinities. This is done for backwards compatibility
+  with decimal.py: Infinity coefficients are undefined in _decimal
+  (in accordance with the specification).
+
+- Issue #15925: Fix a regression in email.util where the parsedate() and
+  parsedate_tz() functions did not return None anymore when the argument could
+  not be parsed.
+
+Extension Modules
+-----------------
+
+- Issue #15973: Fix a segmentation fault when comparing datetime timezone
+  objects.
+
 - Issue #15977: Fix memory leak in Modules/_ssl.c when the function
   _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
 
-Tests
------
-
-- Issue #15304: Fix warning message when os.chdir() fails inside
-  test.support.temp_cwd().  Patch by Chris Jerdonek.
-
-
-- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
-  by Serhiy Storchaka.
-
-- Issue #15557: Added a test suite for the webbrowser module, thanks
-  to Anton Barkovsky.
-
-Build
------
-
-- Issue #15819: Make sure we can build Python out-of-tree from a readonly
-  source directory.  (Somewhat related to Issue #9860.)
-
-Documentation
--------------
-
-- Issue #11964: Document a change in v3.2 to the behavior of the indent
-  parameter of json encoding operations.
-
-Tools/Demos
------------
-
-
-What's New in Python 3.3.0?
-===========================
-
-*Release date: XX-Sep-2012*
-
-Core and Builtins
------------------
-
-Library
--------
-
 - Issue #15969: faulthandler module: rename dump_tracebacks_later() to
   dump_traceback_later() and cancel_dump_tracebacks_later() to
   cancel_dump_traceback_later().
 
+- _decimal module: use only C 89 style comments.
+
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
--- a/Misc/RPM/python-3.3.spec
+++ b/Misc/RPM/python-3.3.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0rc2
+%define version 3.3.0rc3
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is Python version 3.3.0 release candidate 2
+This is Python version 3.3.0 release candidate 3
 ================================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 07:58:00 2012
From: python-checkins at python.org (georg.brandl)
Date: Mon, 24 Sep 2012 07:58:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?devguide=3A_Mention_the_need_to_flip_?=
 =?utf-8?q?the_=22is_committer=22_bit_in_the_tracker_account_settings?=
Message-ID: <3XQF7r2xwwzMlw@mail.python.org>

http://hg.python.org/devguide/rev/73a88ec5cb7f
changeset:   554:73a88ec5cb7f
user:        Georg Brandl <georg at python.org>
date:        Mon Sep 24 07:56:26 2012 +0200
summary:
  Mention the need to flip the "is committer" bit in the tracker account settings when becoming a committer.

files:
  coredev.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/coredev.rst b/coredev.rst
--- a/coredev.rst
+++ b/coredev.rst
@@ -48,6 +48,8 @@
 
 If you did not gain the Developer role in the `issue tracker`_ before gaining
 commit privileges, please say so. This will allow issues to be assigned to you.
+A tracker admin should also flip your "is committer" bit in the tracker's
+account screen.
 
 It is expected that on the issue tracker you have a username in the form of
 "first_name.last_name". If your initial issue tracker username is not of this
@@ -60,9 +62,8 @@
 
 You need to generate an SSH 2 RSA key to be able to commit code. You may have
 multiple keys if you wish (e.g., for work and home). Send your key as an
-attachment in an email to hgaccounts at python.org (do not paste it in
-the email as SSH keys have specific formatting requirements). Help in
-generating an SSH key can be found in the :ref:`faq`.
+attachment in an email to hgaccounts at python.org. Help in generating an SSH key
+can be found in the :ref:`faq`.
 
 Your SSH key will be set to a username in the form of "first_name.last_name".
 This should match your username on the issue tracker.

-- 
Repository URL: http://hg.python.org/devguide

From python-checkins at python.org  Mon Sep 24 13:28:20 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 24 Sep 2012 13:28:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MDEy?=
 =?utf-8?q?=3A_Fix_a_regression_in_pyexpat=2E_The_parser=27s_UseForeignDTD?=
 =?utf-8?b?KCk=?=
Message-ID: <3XQNT04djdzNKy@mail.python.org>

http://hg.python.org/cpython/rev/22ddf77e0497
changeset:   79137:22ddf77e0497
branch:      3.2
parent:      79107:620d23f7ad41
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 24 13:17:08 2012 +0200
summary:
  Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
method doesn't require an argument again.

files:
  Lib/test/test_pyexpat.py |  10 ++++++++++
  Misc/NEWS                |   3 +++
  Modules/pyexpat.c        |   2 +-
  3 files changed, 14 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -641,6 +641,16 @@
         parser.Parse("<?xml version='1.0'?><element/>")
         self.assertEqual(handler_call_args, [(None, None)])
 
+        # test UseForeignDTD() is equal to UseForeignDTD(True)
+        handler_call_args[:] = []
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD()
+        parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_ALWAYS)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse("<?xml version='1.0'?><element/>")
+        self.assertEqual(handler_call_args, [(None, None)])
+
     def test_ignore_use_foreign_dtd(self):
         """
         If UseForeignDTD is passed True and a document with an external
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -482,6 +482,9 @@
 Extension Modules
 -----------------
 
+- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
+  method doesn't require an argument again.
+
 - Issue #15676: Now "mmap" check for empty files before doing the
   offset check.  Patch by Steven Willis.
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1035,7 +1035,7 @@
     PyObject *flagobj = NULL;
     int flag = 1;
     enum XML_Error rc;
-    if (!PyArg_ParseTuple(args, "O:UseForeignDTD", &flagobj))
+    if (!PyArg_ParseTuple(args, "|O:UseForeignDTD", &flagobj))
         return NULL;
     if (flagobj != NULL) {
         flag = PyObject_IsTrue(flagobj);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 13:28:22 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 24 Sep 2012 13:28:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MDEy?=
 =?utf-8?q?=3A_Fix_a_regression_in_pyexpat=2E_The_parser=27s_UseForeignDTD?=
 =?utf-8?b?KCk=?=
Message-ID: <3XQNT24C7CzNbV@mail.python.org>

http://hg.python.org/cpython/rev/3e0d632ce910
changeset:   79138:3e0d632ce910
branch:      2.7
parent:      79088:bfdf366a779a
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 24 13:17:08 2012 +0200
summary:
  Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
method doesn't require an argument again.

files:
  Lib/test/test_pyexpat.py |  55 +++++++++++++++++++++++++++-
  Misc/NEWS                |   6 +++
  Modules/pyexpat.c        |   2 +-
  3 files changed, 61 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -588,6 +588,58 @@
         except expat.ExpatError as e:
             self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14')
 
+class ForeignDTDTests(unittest.TestCase):
+    """
+    Tests for the UseForeignDTD method of expat parser objects.
+    """
+    def test_use_foreign_dtd(self):
+        """
+        If UseForeignDTD is passed True and a document without an external
+        entity reference is parsed, ExternalEntityRefHandler is first called
+        with None for the public and system ids.
+        """
+        handler_call_args = []
+        def resolve_entity(context, base, system_id, public_id):
+            handler_call_args.append((public_id, system_id))
+            return 1
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD(True)
+        parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_ALWAYS)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse("<?xml version='1.0'?><element/>")
+        self.assertEqual(handler_call_args, [(None, None)])
+
+        # test UseForeignDTD() is equal to UseForeignDTD(True)
+        handler_call_args[:] = []
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD()
+        parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_ALWAYS)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse("<?xml version='1.0'?><element/>")
+        self.assertEqual(handler_call_args, [(None, None)])
+
+    def test_ignore_use_foreign_dtd(self):
+        """
+        If UseForeignDTD is passed True and a document with an external
+        entity reference is parsed, ExternalEntityRefHandler is called with
+        the public and system ids from the document.
+        """
+        handler_call_args = []
+        def resolve_entity(context, base, system_id, public_id):
+            handler_call_args.append((public_id, system_id))
+            return 1
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD(True)
+        parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_ALWAYS)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse(
+            "<?xml version='1.0'?><!DOCTYPE foo PUBLIC 'bar' 'baz'><element/>")
+        self.assertEqual(handler_call_args, [("bar", "baz")])
+
+
 def test_main():
     run_unittest(SetAttributeTest,
                  ParseTest,
@@ -598,7 +650,8 @@
                  PositionTest,
                  sf1296433Test,
                  ChardataBufferTest,
-                 MalformedInputText)
+                 MalformedInputText,
+                 ForeignDTDTests)
 
 if __name__ == "__main__":
     test_main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -379,6 +379,12 @@
 - Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils
   on Windows.
 
+Extension Modules
+-----------------
+
+- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
+  method doesn't require an argument again.
+
 Tests
 -----
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1176,7 +1176,7 @@
     PyObject *flagobj = NULL;
     int flag = 1;
     enum XML_Error rc;
-    if (!PyArg_ParseTuple(args, "O:UseForeignDTD", &flagobj))
+    if (!PyArg_ParseTuple(args, "|O:UseForeignDTD", &flagobj))
         return NULL;
     if (flagobj != NULL) {
         flag = PyObject_IsTrue(flagobj);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 13:28:24 2012
From: python-checkins at python.org (christian.heimes)
Date: Mon, 24 Sep 2012 13:28:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316012=3A_Fix_a_regression_in_pyexpat=2E_The_par?=
 =?utf-8?q?ser=27s_UseForeignDTD=28=29?=
Message-ID: <3XQNT40WDTzNcF@mail.python.org>

http://hg.python.org/cpython/rev/0f55ad9b07c8
changeset:   79139:0f55ad9b07c8
parent:      79136:3d9c323711d0
parent:      79137:22ddf77e0497
user:        Christian Heimes <christian at cheimes.de>
date:        Mon Sep 24 13:27:28 2012 +0200
summary:
  Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
method doesn't require an argument again.

files:
  Lib/test/test_pyexpat.py |  10 ++++++++++
  Misc/NEWS                |   3 +++
  Modules/pyexpat.c        |   2 +-
  3 files changed, 14 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -641,6 +641,16 @@
         parser.Parse("<?xml version='1.0'?><element/>")
         self.assertEqual(handler_call_args, [(None, None)])
 
+        # test UseForeignDTD() is equal to UseForeignDTD(True)
+        handler_call_args[:] = []
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD()
+        parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_ALWAYS)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse("<?xml version='1.0'?><element/>")
+        self.assertEqual(handler_call_args, [(None, None)])
+
     def test_ignore_use_foreign_dtd(self):
         """
         If UseForeignDTD is passed True and a document with an external
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -71,6 +71,9 @@
 Extension Modules
 -----------------
 
+- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
+  method doesn't require an argument again.
+
 Tests
 -----
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1035,7 +1035,7 @@
 {
     int flag = 1;
     enum XML_Error rc;
-    if (!PyArg_ParseTuple(args, "p:UseForeignDTD", &flag))
+    if (!PyArg_ParseTuple(args, "|p:UseForeignDTD", &flag))
         return NULL;
     rc = XML_UseForeignDTD(self->itself, flag ? XML_TRUE : XML_FALSE);
     if (rc != XML_ERROR_NONE) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 15:58:36 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 15:58:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MDE0OiBmaXgg?=
	=?utf-8?q?broken_link=2E?=
Message-ID: <3XQRpN1LBszNPm@mail.python.org>

http://hg.python.org/cpython/rev/5f19c505ecea
changeset:   79140:5f19c505ecea
branch:      2.7
parent:      79138:3e0d632ce910
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 16:56:59 2012 +0300
summary:
  #16014: fix broken link.

files:
  Doc/license.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -309,7 +309,7 @@
 ----------------
 
 The :mod:`_random` module includes code based on a download from
-http://www.math.keio.ac.jp/ matumoto/MT2002/emt19937ar.html. The following are
+http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html. The following are
 the verbatim comments from the original code::
 
    A C-program for MT19937, with initialization improved 2002/1/26.
@@ -350,8 +350,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: matumoto at math.keio.ac.jp
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
 
 
 Sockets

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 15:58:37 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 15:58:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MDE0OiBmaXgg?=
	=?utf-8?q?broken_link=2E?=
Message-ID: <3XQRpP6jhvzNcl@mail.python.org>

http://hg.python.org/cpython/rev/74b4c8c2894f
changeset:   79141:74b4c8c2894f
branch:      3.2
parent:      79137:22ddf77e0497
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 16:56:59 2012 +0300
summary:
  #16014: fix broken link.

files:
  Doc/license.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -325,7 +325,7 @@
 ----------------
 
 The :mod:`_random` module includes code based on a download from
-http://www.math.keio.ac.jp/ matumoto/MT2002/emt19937ar.html. The following are
+http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html. The following are
 the verbatim comments from the original code::
 
    A C-program for MT19937, with initialization improved 2002/1/26.
@@ -366,8 +366,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: matumoto at math.keio.ac.jp
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
 
 
 Sockets

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 15:58:39 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 15:58:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE2MDE0OiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XQRpR3qXQzNcH@mail.python.org>

http://hg.python.org/cpython/rev/6db739d611fd
changeset:   79142:6db739d611fd
parent:      79139:0f55ad9b07c8
parent:      79141:74b4c8c2894f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 16:58:14 2012 +0300
summary:
  #16014: merge with 3.2.

files:
  Doc/license.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -327,7 +327,7 @@
 ----------------
 
 The :mod:`_random` module includes code based on a download from
-http://www.math.keio.ac.jp/ matumoto/MT2002/emt19937ar.html. The following are
+http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html. The following are
 the verbatim comments from the original code::
 
    A C-program for MT19937, with initialization improved 2002/1/26.
@@ -368,8 +368,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: matumoto at math.keio.ac.jp
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
 
 
 Sockets

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 16:08:26 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 16:08:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MDE3OiBjYXBp?=
	=?utf-8?q?talize_URLs=2E?=
Message-ID: <3XQS1k6dqbzNZn@mail.python.org>

http://hg.python.org/cpython/rev/063a052af878
changeset:   79143:063a052af878
branch:      2.7
parent:      79140:5f19c505ecea
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 17:06:11 2012 +0300
summary:
  #16017: capitalize URLs.

files:
  Doc/tutorial/stdlib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -145,7 +145,7 @@
 ===============
 
 There are a number of modules for accessing the internet and processing internet
-protocols. Two of the simplest are :mod:`urllib2` for retrieving data from urls
+protocols. Two of the simplest are :mod:`urllib2` for retrieving data from URLs
 and :mod:`smtplib` for sending mail::
 
    >>> import urllib2

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 16:08:29 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 16:08:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MDE3OiBjYXBp?=
	=?utf-8?q?talize_URLs=2E?=
Message-ID: <3XQS1n5tR2zNcl@mail.python.org>

http://hg.python.org/cpython/rev/d7455cceb917
changeset:   79144:d7455cceb917
branch:      3.2
parent:      79141:74b4c8c2894f
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 17:07:39 2012 +0300
summary:
  #16017: capitalize URLs.

files:
  Doc/tutorial/stdlib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -148,7 +148,7 @@
 
 There are a number of modules for accessing the internet and processing internet
 protocols. Two of the simplest are :mod:`urllib.request` for retrieving data
-from urls and :mod:`smtplib` for sending mail::
+from URLs and :mod:`smtplib` for sending mail::
 
    >>> from urllib.request import urlopen
    >>> for line in urlopen('http://tycho.usno.navy.mil/cgi-bin/timer.pl'):

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 16:08:31 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 16:08:31 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE2MDE3OiBtZXJnZSB3aXRoIDMuMi4=?=
Message-ID: <3XQS1q2wNXzNZn@mail.python.org>

http://hg.python.org/cpython/rev/d6e4080960a3
changeset:   79145:d6e4080960a3
parent:      79142:6db739d611fd
parent:      79144:d7455cceb917
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 17:08:05 2012 +0300
summary:
  #16017: merge with 3.2.

files:
  Doc/tutorial/stdlib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -148,7 +148,7 @@
 
 There are a number of modules for accessing the internet and processing internet
 protocols. Two of the simplest are :mod:`urllib.request` for retrieving data
-from urls and :mod:`smtplib` for sending mail::
+from URLs and :mod:`smtplib` for sending mail::
 
    >>> from urllib.request import urlopen
    >>> for line in urlopen('http://tycho.usno.navy.mil/cgi-bin/timer.pl'):

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 16:32:04 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 16:32:04 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MDE5LCAjMTYw?=
 =?utf-8?q?20=3A_fix_syntax_highlight=2E?=
Message-ID: <3XQSY058yQzNRp@mail.python.org>

http://hg.python.org/cpython/rev/ce943bce76c9
changeset:   79146:ce943bce76c9
branch:      2.7
parent:      79143:063a052af878
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 17:30:39 2012 +0300
summary:
  #16019, #16020: fix syntax highlight.

files:
  Doc/tutorial/stdlib2.rst |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -95,7 +95,7 @@
    >>> d = dict(item='unladen swallow')
    >>> t.substitute(d)
    Traceback (most recent call last):
-     . . .
+     ...
    KeyError: 'owner'
    >>> t.safe_substitute(d)
    'Return the unladen swallow to $owner.'
@@ -218,7 +218,9 @@
    logging.error('Error occurred')
    logging.critical('Critical error -- shutting down')
 
-This produces the following output::
+This produces the following output:
+
+.. code-block:: none
 
    WARNING:root:Warning:config file server.conf not found
    ERROR:root:Error occurred
@@ -309,6 +311,8 @@
    >>> print "Handling", d.popleft()
    Handling task1
 
+::
+
    unsearched = deque([starting_node])
    def breadth_first_search(unsearched):
        node = unsearched.popleft()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 16:32:07 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 16:32:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MDE5LCAjMTYw?=
 =?utf-8?q?20=3A_fix_syntax_highlight=2E?=
Message-ID: <3XQSY333MYzNc7@mail.python.org>

http://hg.python.org/cpython/rev/101354f95a07
changeset:   79147:101354f95a07
branch:      3.2
parent:      79144:d7455cceb917
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 17:30:39 2012 +0300
summary:
  #16019, #16020: fix syntax highlight.

files:
  Doc/tutorial/stdlib2.rst |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -95,7 +95,7 @@
    >>> d = dict(item='unladen swallow')
    >>> t.substitute(d)
    Traceback (most recent call last):
-     . . .
+     ...
    KeyError: 'owner'
    >>> t.safe_substitute(d)
    'Return the unladen swallow to $owner.'
@@ -218,7 +218,9 @@
    logging.error('Error occurred')
    logging.critical('Critical error -- shutting down')
 
-This produces the following output::
+This produces the following output:
+
+.. code-block:: none
 
    WARNING:root:Warning:config file server.conf not found
    ERROR:root:Error occurred
@@ -309,6 +311,8 @@
    >>> print("Handling", d.popleft())
    Handling task1
 
+::
+
    unsearched = deque([starting_node])
    def breadth_first_search(unsearched):
        node = unsearched.popleft()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 16:32:09 2012
From: python-checkins at python.org (ezio.melotti)
Date: Mon, 24 Sep 2012 16:32:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE2MDE5LCAjMTYwMjA6IG1lcmdlIHdpdGggMy4yLg==?=
Message-ID: <3XQSY50NpzzNfm@mail.python.org>

http://hg.python.org/cpython/rev/62ddf16eea24
changeset:   79148:62ddf16eea24
parent:      79145:d6e4080960a3
parent:      79147:101354f95a07
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Sep 24 17:31:37 2012 +0300
summary:
  #16019, #16020: merge with 3.2.

files:
  Doc/tutorial/stdlib2.rst |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -95,7 +95,7 @@
    >>> d = dict(item='unladen swallow')
    >>> t.substitute(d)
    Traceback (most recent call last):
-     . . .
+     ...
    KeyError: 'owner'
    >>> t.safe_substitute(d)
    'Return the unladen swallow to $owner.'
@@ -220,7 +220,9 @@
    logging.error('Error occurred')
    logging.critical('Critical error -- shutting down')
 
-This produces the following output::
+This produces the following output:
+
+.. code-block:: none
 
    WARNING:root:Warning:config file server.conf not found
    ERROR:root:Error occurred
@@ -311,6 +313,8 @@
    >>> print("Handling", d.popleft())
    Handling task1
 
+::
+
    unsearched = deque([starting_node])
    def breadth_first_search(unsearched):
        node = unsearched.popleft()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 21:17:33 2012
From: python-checkins at python.org (mark.dickinson)
Date: Mon, 24 Sep 2012 21:17:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE0MTY3?=
 =?utf-8?q?=3A_restore_statement_about_breaks_in_finally_clauses=2E?=
Message-ID: <3XQZtP4xFGzQT5@mail.python.org>

http://hg.python.org/cpython/rev/485902ecf0ee
changeset:   79149:485902ecf0ee
branch:      3.2
parent:      79147:101354f95a07
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Mon Sep 24 20:16:38 2012 +0100
summary:
  Issue #14167: restore statement about breaks in finally clauses.

files:
  Doc/reference/compound_stmts.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -307,11 +307,11 @@
 :keyword:`try` clause is executed, including any :keyword:`except` and
 :keyword:`else` clauses.  If an exception occurs in any of the clauses and is
 not handled, the exception is temporarily saved. The :keyword:`finally` clause
-is executed.  If there is a saved exception or :keyword:`break` statement,
-it is re-raised at the end of the :keyword:`finally` clause. If the
-:keyword:`finally` clause raises another exception the saved exception
-is set as the context of the new exception; if the :keyword:`finally` clause
-executes a :keyword:`return` statement, the saved exception is discarded::
+is executed.  If there is a saved exception it is re-raised at the end of the
+:keyword:`finally` clause.  If the :keyword:`finally` clause raises another
+exception, the saved exception is set as the context of the new exception.
+If the :keyword:`finally` clause executes a :keyword:`return` or :keyword:`break`
+statement, the saved exception is discarded::
 
     def f():
         try:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 21:17:35 2012
From: python-checkins at python.org (mark.dickinson)
Date: Mon, 24 Sep 2012 21:17:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2314167=3A_merge_fix_from_3=2E2_branch=2E?=
Message-ID: <3XQZtR4RLvzQW4@mail.python.org>

http://hg.python.org/cpython/rev/f5ed3a5440b2
changeset:   79150:f5ed3a5440b2
parent:      79148:62ddf16eea24
parent:      79149:485902ecf0ee
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Mon Sep 24 20:17:17 2012 +0100
summary:
  Issue #14167: merge fix from 3.2 branch.

files:
  Doc/reference/compound_stmts.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -307,11 +307,11 @@
 :keyword:`try` clause is executed, including any :keyword:`except` and
 :keyword:`else` clauses.  If an exception occurs in any of the clauses and is
 not handled, the exception is temporarily saved. The :keyword:`finally` clause
-is executed.  If there is a saved exception or :keyword:`break` statement,
-it is re-raised at the end of the :keyword:`finally` clause. If the
-:keyword:`finally` clause raises another exception the saved exception
-is set as the context of the new exception; if the :keyword:`finally` clause
-executes a :keyword:`return` statement, the saved exception is discarded::
+is executed.  If there is a saved exception it is re-raised at the end of the
+:keyword:`finally` clause.  If the :keyword:`finally` clause raises another
+exception, the saved exception is set as the context of the new exception.
+If the :keyword:`finally` clause executes a :keyword:`return` or :keyword:`break`
+statement, the saved exception is discarded::
 
     def f():
         try:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 21:25:46 2012
From: python-checkins at python.org (mark.dickinson)
Date: Mon, 24 Sep 2012 21:25:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE0MTY3?=
 =?utf-8?q?=3A_restore_statement_about_breaks_in_finally_clauses=3B_remove?=
Message-ID: <3XQb3t4JCRzQVd@mail.python.org>

http://hg.python.org/cpython/rev/f51d11405f1d
changeset:   79151:f51d11405f1d
branch:      2.7
parent:      79146:ce943bce76c9
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Mon Sep 24 20:25:24 2012 +0100
summary:
  Issue #14167: restore statement about breaks in finally clauses; remove statement about exception chaining.

files:
  Doc/reference/compound_stmts.rst |  18 ++++++++----------
  1 files changed, 8 insertions(+), 10 deletions(-)


diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -290,16 +290,14 @@
 
 .. index:: keyword: finally
 
-If :keyword:`finally` is present, it specifies a 'cleanup' handler.
-The :keyword:`try` clause is executed, including any :keyword:`except`
-and :keyword:`else` clauses.  If an exception occurs in any of the
-clauses and is not handled, the exception is temporarily saved. The
-:keyword:`finally` clause is executed.  If there is a saved exception
-or :keyword:`break` statement, it is re-raised at the end of the
-:keyword:`finally` clause. If the :keyword:`finally` clause raises
-another exception the saved exception is set as the context of the new
-exception; if the :keyword:`finally` clause executes a
-:keyword:`return` statement, the saved exception is discarded::
+If :keyword:`finally` is present, it specifies a 'cleanup' handler.  The
+:keyword:`try` clause is executed, including any :keyword:`except` and
+:keyword:`else` clauses.  If an exception occurs in any of the clauses and is
+not handled, the exception is temporarily saved. The :keyword:`finally` clause
+is executed.  If there is a saved exception, it is re-raised at the end of the
+:keyword:`finally` clause. If the :keyword:`finally` clause raises another
+exception or executes a :keyword:`return` or :keyword:`break` statement, the
+saved exception is dicarded::
 
     def f():
         try:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Mon Sep 24 23:23:38 2012
From: python-checkins at python.org (victor.stinner)
Date: Mon, 24 Sep 2012 23:23:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Close_=2316022=3A_What=27s?=
 =?utf-8?q?_New_in_Python_3=2E3_document_is_no_more_at_beta_stage?=
Message-ID: <3XQdgt46yzzQjP@mail.python.org>

http://hg.python.org/cpython/rev/35289291a2e6
changeset:   79152:35289291a2e6
parent:      79150:f5ed3a5440b2
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Sep 24 23:19:17 2012 +0200
summary:
  Close #16022: What's New in Python 3.3 document is no more at beta stage

files:
  Doc/whatsnew/3.3.rst |  4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -48,10 +48,6 @@
 
 This article explains the new features in Python 3.3, compared to 3.2.
 
-.. note:: Beta users should be aware that this document is currently in
-   draft form. It will be updated substantially as Python 3.3 moves towards
-   release, so it's worth checking back even after reading earlier versions.
-
 
 Summary -- Release highlights
 =============================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 04:38:26 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Tue, 25 Sep 2012 04:38:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MDE1?=
 =?utf-8?q?=3A_Fix_NameError_doctest_example_in_tutorial_introduction=2E?=
Message-ID: <3XQmg61ZhSzQmX@mail.python.org>

http://hg.python.org/cpython/rev/5f4841977bee
changeset:   79153:5f4841977bee
branch:      3.2
parent:      79149:485902ecf0ee
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Mon Sep 24 19:28:59 2012 -0700
summary:
  Issue #16015: Fix NameError doctest example in tutorial introduction.

files:
  Doc/tutorial/introduction.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -94,8 +94,7 @@
 Variables must be "defined" (assigned a value) before they can be used, or an
 error will occur::
 
-   >>> # try to access an undefined variable
-   ... n
+   >>> n  # try to access an undefined variable
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    NameError: name 'n' is not defined

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 04:38:28 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Tue, 25 Sep 2012 04:38:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316015=3A_Merge_fix_from_3=2E2=2E?=
Message-ID: <3XQmg809vLzQrN@mail.python.org>

http://hg.python.org/cpython/rev/dae33c2e916b
changeset:   79154:dae33c2e916b
parent:      79152:35289291a2e6
parent:      79153:5f4841977bee
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Mon Sep 24 19:31:09 2012 -0700
summary:
  Issue #16015: Merge fix from 3.2.

files:
  Doc/tutorial/introduction.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -94,8 +94,7 @@
 Variables must be "defined" (assigned a value) before they can be used, or an
 error will occur::
 
-   >>> # try to access an undefined variable
-   ... n
+   >>> n  # try to access an undefined variable
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    NameError: name 'n' is not defined

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 04:38:29 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Tue, 25 Sep 2012 04:38:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MDE1?=
 =?utf-8?q?=3A_Fix_NameError_doctest_example_in_tutorial_introduction=2E?=
Message-ID: <3XQmg9381wzNh7@mail.python.org>

http://hg.python.org/cpython/rev/878c33d2f301
changeset:   79155:878c33d2f301
branch:      2.7
parent:      79151:f51d11405f1d
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Mon Sep 24 19:33:32 2012 -0700
summary:
  Issue #16015: Fix NameError doctest example in tutorial introduction.

files:
  Doc/tutorial/introduction.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -82,8 +82,7 @@
 Variables must be "defined" (assigned a value) before they can be used, or an
 error will occur::
 
-   >>> # try to access an undefined variable
-   ... n
+   >>> n  # try to access an undefined variable
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    NameError: name 'n' is not defined

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Tue Sep 25 06:01:44 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Tue, 25 Sep 2012 06:01:44 +0200
Subject: [Python-checkins] Daily reference leaks (35289291a2e6): sum=0
Message-ID: <E1TGMLA-0004Ek-MT@ap.vmr.nerim.net>

results for 35289291a2e6 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/refloggtIIPk', '-x']

From python-checkins at python.org  Tue Sep 25 11:37:30 2012
From: python-checkins at python.org (senthil.kumaran)
Date: Tue, 25 Sep 2012 11:37:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MDEz?=
 =?utf-8?q?=3A_Fix_CSV_Reader_parsing_issue_with_ending_quote_characters?=
 =?utf-8?q?=2E_Patch?=
Message-ID: <3XQxyf3KYbzNLV@mail.python.org>

http://hg.python.org/cpython/rev/e9c005676d6e
changeset:   79156:e9c005676d6e
branch:      3.2
parent:      79153:5f4841977bee
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 25 02:30:27 2012 -0700
summary:
  Issue #16013: Fix CSV Reader parsing issue with ending quote characters. Patch by Serhiy Storchaka.

files:
  Lib/test/test_csv.py |   9 +++++++++
  Misc/NEWS            |   3 +++
  Modules/_csv.c       |  10 +++++++---
  3 files changed, 19 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -225,6 +225,15 @@
         self.assertRaises(csv.Error, self._read_test, ['a,b\nc,d'], [])
         self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], [])
 
+    def test_read_eof(self):
+        self._read_test(['a,"'], [['a', '']])
+        self._read_test(['"a'], [['a']])
+        self._read_test(['^'], [['\n']], escapechar='^')
+        self.assertRaises(csv.Error, self._read_test, ['a,"'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test, ['"a'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test,
+                          ['^'], [], escapechar='^', strict=True)
+
     def test_read_escape(self):
         self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\')
         self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,9 @@
 Library
 -------
 
+- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
+  Patch by Serhiy Storchaka.
+
 - Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
   datetime.MAXYEAR.  Patch by C?dric Krier.
 
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -759,9 +759,13 @@
         lineobj = PyIter_Next(self->input_iter);
         if (lineobj == NULL) {
             /* End of input OR exception */
-            if (!PyErr_Occurred() && self->field_len != 0)
-                PyErr_Format(error_obj,
-                             "newline inside string");
+            if (!PyErr_Occurred() && (self->field_len != 0 ||
+                                      self->state == IN_QUOTED_FIELD)) {
+                if (self->dialect->strict)
+                    PyErr_SetString(error_obj, "unexpected end of data");
+                else if (parse_save_field(self) >= 0)
+                    break;
+            }
             return NULL;
         }
         if (!PyUnicode_Check(lineobj)) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 11:37:32 2012
From: python-checkins at python.org (senthil.kumaran)
Date: Tue, 25 Sep 2012 11:37:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_merge_3=2E2=3A_Issue_=2316013=3A_Fix_CSV_Reader_parsing_?=
 =?utf-8?q?issue_with_ending_quote?=
Message-ID: <3XQxyh1WrHzQd5@mail.python.org>

http://hg.python.org/cpython/rev/25f0756deeae
changeset:   79157:25f0756deeae
parent:      79154:dae33c2e916b
parent:      79156:e9c005676d6e
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 25 02:37:20 2012 -0700
summary:
  merge 3.2: Issue #16013: Fix CSV Reader parsing issue with ending quote characters. Patch by Serhiy Storchaka.

files:
  Lib/test/test_csv.py |   9 +++++++++
  Misc/NEWS            |   3 +++
  Modules/_csv.c       |  11 ++++++++---
  3 files changed, 20 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -225,6 +225,15 @@
         self.assertRaises(csv.Error, self._read_test, ['a,b\nc,d'], [])
         self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], [])
 
+    def test_read_eof(self):
+        self._read_test(['a,"'], [['a', '']])
+        self._read_test(['"a'], [['a']])
+        self._read_test(['^'], [['\n']], escapechar='^')
+        self.assertRaises(csv.Error, self._read_test, ['a,"'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test, ['"a'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test,
+                          ['^'], [], escapechar='^', strict=True)
+
     def test_read_escape(self):
         self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\')
         self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,9 @@
 Library
 -------
 
+- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
+  Patch by Serhiy Storchaka.
+
 - Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
   datetime.MAXYEAR.  Patch by C?dric Krier.
 
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -788,9 +788,14 @@
         lineobj = PyIter_Next(self->input_iter);
         if (lineobj == NULL) {
             /* End of input OR exception */
-            if (!PyErr_Occurred() && self->field_len != 0)
-                PyErr_Format(_csvstate_global->error_obj,
-                             "newline inside string");
+            if (!PyErr_Occurred() && (self->field_len != 0 ||
+                                      self->state == IN_QUOTED_FIELD)) {
+                if (self->dialect->strict)
+                    PyErr_SetString(_csvstate_global->error_obj,
+                                    "unexpected end of data");
+                else if (parse_save_field(self) >= 0)
+                    break;
+            }
             return NULL;
         }
         if (!PyUnicode_Check(lineobj)) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 11:48:43 2012
From: python-checkins at python.org (senthil.kumaran)
Date: Tue, 25 Sep 2012 11:48:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogMi43IDogSXNzdWUg?=
 =?utf-8?q?=2316013=3A_Fix_CSV_Reader_parsing_issue_with_ending_quote_char?=
 =?utf-8?q?acters=2E?=
Message-ID: <3XQyCb6l2KzQl5@mail.python.org>

http://hg.python.org/cpython/rev/5f0465d0e91e
changeset:   79158:5f0465d0e91e
branch:      2.7
parent:      79155:878c33d2f301
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Sep 25 02:48:21 2012 -0700
summary:
  2.7 : Issue #16013: Fix CSV Reader parsing issue with ending quote characters. Patch by Serhiy Storchaka.

files:
  Lib/test/test_csv.py |   9 +++++++++
  Misc/NEWS            |   3 +++
  Modules/_csv.c       |  10 +++++++---
  3 files changed, 19 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -243,6 +243,15 @@
         self.assertRaises(csv.Error, self._read_test, ['a,b\nc,d'], [])
         self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], [])
 
+    def test_read_eof(self):
+        self._read_test(['a,"'], [['a', '']])
+        self._read_test(['"a'], [['a']])
+        self._read_test(['^'], [['\n']], escapechar='^')
+        self.assertRaises(csv.Error, self._read_test, ['a,"'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test, ['"a'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test,
+                          ['^'], [], escapechar='^', strict=True)
+
     def test_read_escape(self):
         self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\')
         self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,9 @@
 Library
 -------
 
+- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
+  Patch by Serhiy Storchaka.
+
 - Issue #15421: fix an OverflowError in Calendar.itermonthdates() after
   datetime.MAXYEAR.  Patch by C?dric Krier.
 
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -788,9 +788,13 @@
         lineobj = PyIter_Next(self->input_iter);
         if (lineobj == NULL) {
             /* End of input OR exception */
-            if (!PyErr_Occurred() && self->field_len != 0)
-                PyErr_Format(error_obj,
-                             "newline inside string");
+            if (!PyErr_Occurred() && (self->field_len != 0 ||
+                                      self->state == IN_QUOTED_FIELD)) {
+                if (self->dialect->strict)
+                    PyErr_SetString(error_obj, "unexpected end of data");
+                else if (parse_save_field(self) >= 0 )
+                    break;
+            }
             return NULL;
         }
         ++self->line_num;

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 13:29:55 2012
From: python-checkins at python.org (christian.heimes)
Date: Tue, 25 Sep 2012 13:29:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE2MDM3?=
 =?utf-8?q?=3A_Limit_httplib=27s_=5Fread=5Fstatus=28=29_function_to_work_a?=
 =?utf-8?q?round_broken?=
Message-ID: <3XR0SM0ZYPzQff@mail.python.org>

http://hg.python.org/cpython/rev/8a22a2804a66
changeset:   79159:8a22a2804a66
branch:      2.7
user:        Christian Heimes <christian at cheimes.de>
date:        Tue Sep 25 13:29:30 2012 +0200
summary:
  Issue #16037: Limit httplib's _read_status() function to work around broken
HTTP servers and reduce memory usage. It's actually a backport of a Python
3.2 fix. Thanks to Adrien Kunysz.

files:
  Lib/httplib.py |  4 +++-
  Misc/NEWS      |  4 ++++
  2 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Lib/httplib.py b/Lib/httplib.py
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -362,7 +362,9 @@
 
     def _read_status(self):
         # Initialize with Simple-Response defaults
-        line = self.fp.readline()
+        line = self.fp.readline(_MAXLINE + 1)
+        if len(line) > _MAXLINE:
+            raise LineTooLong("header line")
         if self.debuglevel > 0:
             print "reply:", repr(line)
         if not line:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,10 @@
 Core and Builtins
 -----------------
 
+- Issue #16037: Limit httplib's _read_status() function to work around broken
+  HTTP servers and reduce memory usage. It's actually a backport of a Python
+  3.2 fix. Thanks to Adrien Kunysz.
+
 - Issue #13992: The trashcan mechanism is now thread-safe.  This eliminates
   sporadic crashes in multi-thread programs when several long deallocator
   chains ran concurrently and involved subclasses of built-in container

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 13:35:22 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Tue, 25 Sep 2012 13:35:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MDE1?=
 =?utf-8?q?=3A_Make_welcome_message_more_realistic_in_tutorial_example=2E?=
Message-ID: <3XR0Zf3HxMzQnY@mail.python.org>

http://hg.python.org/cpython/rev/d2df5bc89fc9
changeset:   79160:d2df5bc89fc9
branch:      3.2
parent:      79156:e9c005676d6e
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Tue Sep 25 04:20:29 2012 -0700
summary:
  Issue #16015: Make welcome message more realistic in tutorial example.

files:
  Doc/tutorial/interpreter.rst |  8 +++++---
  1 files changed, 5 insertions(+), 3 deletions(-)


diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -12,7 +12,9 @@
 
 The Python interpreter is usually installed as :file:`/usr/local/bin/python3.2`
 on those machines where it is available; putting :file:`/usr/local/bin` in your
-Unix shell's search path makes it possible to start it by typing the command ::
+Unix shell's search path makes it possible to start it by typing the command:
+
+.. code-block:: text
 
    python3.2
 
@@ -94,8 +96,8 @@
 before printing the first prompt::
 
    $ python3.2
-   Python 3.2 (py3k, Sep 12 2007, 12:21:02)
-   [GCC 3.4.6 20060404 (Red Hat 3.4.6-8)] on linux2
+   Python 3.2.3 (default, May  3 2012, 15:54:42)
+   [GCC 4.6.3] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>>
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 13:35:23 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Tue, 25 Sep 2012 13:35:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316015=3A_Merge_and_update_from_3=2E2=2E?=
Message-ID: <3XR0Zg6zrNzQpC@mail.python.org>

http://hg.python.org/cpython/rev/fcb5bc824e3e
changeset:   79161:fcb5bc824e3e
parent:      79157:25f0756deeae
parent:      79160:d2df5bc89fc9
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Tue Sep 25 04:33:24 2012 -0700
summary:
  Issue #16015: Merge and update from 3.2.

files:
  Doc/tutorial/interpreter.rst |  8 +++++---
  1 files changed, 5 insertions(+), 3 deletions(-)


diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -12,7 +12,9 @@
 
 The Python interpreter is usually installed as :file:`/usr/local/bin/python3.3`
 on those machines where it is available; putting :file:`/usr/local/bin` in your
-Unix shell's search path makes it possible to start it by typing the command ::
+Unix shell's search path makes it possible to start it by typing the command:
+
+.. code-block:: text
 
    python3.3
 
@@ -94,8 +96,8 @@
 before printing the first prompt::
 
    $ python3.3
-   Python 3.3 (py3k, Sep 12 2007, 12:21:02)
-   [GCC 3.4.6 20060404 (Red Hat 3.4.6-8)] on linux2
+   Python 3.3 (default, Sep 24 2012, 09:25:04)
+   [GCC 4.6.3] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>>
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 16:26:19 2012
From: python-checkins at python.org (brett.cannon)
Date: Tue, 25 Sep 2012 16:26:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Make_the_decimal_bench_fil?=
 =?utf-8?q?e_run_under_Python_2=2E7=2E?=
Message-ID: <3XR4Mv59RmzQn5@mail.python.org>

http://hg.python.org/cpython/rev/663bc120ab27
changeset:   79162:663bc120ab27
user:        Brett Cannon <brett at python.org>
date:        Tue Sep 25 10:23:47 2012 -0400
summary:
  Make the decimal bench file run under Python 2.7.

files:
  Modules/_decimal/tests/bench.py |  46 ++++++++++++--------
  1 files changed, 28 insertions(+), 18 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -10,7 +10,10 @@
 
 import time
 from math import log, ceil
-from test.support import import_fresh_module
+try:
+  from test.support import import_fresh_module
+except ImportError:
+  from test.test_support import import_fresh_module
 
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
@@ -69,9 +72,13 @@
 
 for prec in [9, 19]:
     print("\nPrecision: %d decimal digits\n" % prec)
-    for func in [pi_float, pi_cdecimal, pi_decimal]:
+    to_benchmark = [pi_float, pi_decimal]
+    if C is not None:
+      to_benchmark.append(pi_cdecimal)
+    for func in to_benchmark:
         start = time.time()
-        C.getcontext().prec = prec
+        if C is not None:
+          C.getcontext().prec = prec
         P.getcontext().prec = prec
         for i in range(10000):
             x = func()
@@ -84,25 +91,27 @@
 print("#                               Factorial")
 print("# ======================================================================\n")
 
-c = C.getcontext()
-c.prec = C.MAX_PREC
-c.Emax = C.MAX_EMAX
-c.Emin = C.MIN_EMIN
+if C is not None:
+  c = C.getcontext()
+  c.prec = C.MAX_PREC
+  c.Emax = C.MAX_EMAX
+  c.Emin = C.MIN_EMIN
 
 for n in [100000, 1000000]:
 
     print("n = %d\n" % n)
 
-    # C version of decimal
-    start_calc = time.time()
-    x = factorial(C.Decimal(n), 0)
-    end_calc = time.time()
-    start_conv = time.time()
-    sx = str(x)
-    end_conv = time.time()
-    print("cdecimal:")
-    print("calculation time: %fs" % (end_calc-start_calc))
-    print("conversion time: %fs\n" % (end_conv-start_conv))
+    if C is not None:
+      # C version of decimal
+      start_calc = time.time()
+      x = factorial(C.Decimal(n), 0)
+      end_calc = time.time()
+      start_conv = time.time()
+      sx = str(x)
+      end_conv = time.time()
+      print("cdecimal:")
+      print("calculation time: %fs" % (end_calc-start_calc))
+      print("conversion time: %fs\n" % (end_conv-start_conv))
 
     # Python integers
     start_calc = time.time()
@@ -116,4 +125,5 @@
     print("calculation time: %fs" % (end_calc-start_calc))
     print("conversion time: %fs\n\n" % (end_conv-start_conv))
 
-    assert(sx == sy)
+    if C is not None:
+      assert(sx == sy)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 16:26:21 2012
From: python-checkins at python.org (brett.cannon)
Date: Tue, 25 Sep 2012 16:26:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_whitespace=2E?=
Message-ID: <3XR4Mx3K1VzNp1@mail.python.org>

http://hg.python.org/cpython/rev/7343ee2ed580
changeset:   79163:7343ee2ed580
user:        Brett Cannon <brett at python.org>
date:        Tue Sep 25 10:25:41 2012 -0400
summary:
  Fix whitespace.

files:
  Modules/_decimal/tests/bench.py |  36 ++++++++++----------
  1 files changed, 18 insertions(+), 18 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -11,9 +11,9 @@
 import time
 from math import log, ceil
 try:
-  from test.support import import_fresh_module
+    from test.support import import_fresh_module
 except ImportError:
-  from test.test_support import import_fresh_module
+    from test.test_support import import_fresh_module
 
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
@@ -74,7 +74,7 @@
     print("\nPrecision: %d decimal digits\n" % prec)
     to_benchmark = [pi_float, pi_decimal]
     if C is not None:
-      to_benchmark.append(pi_cdecimal)
+        to_benchmark.append(pi_cdecimal)
     for func in to_benchmark:
         start = time.time()
         if C is not None:
@@ -92,26 +92,26 @@
 print("# ======================================================================\n")
 
 if C is not None:
-  c = C.getcontext()
-  c.prec = C.MAX_PREC
-  c.Emax = C.MAX_EMAX
-  c.Emin = C.MIN_EMIN
+    c = C.getcontext()
+    c.prec = C.MAX_PREC
+    c.Emax = C.MAX_EMAX
+    c.Emin = C.MIN_EMIN
 
 for n in [100000, 1000000]:
 
     print("n = %d\n" % n)
 
     if C is not None:
-      # C version of decimal
-      start_calc = time.time()
-      x = factorial(C.Decimal(n), 0)
-      end_calc = time.time()
-      start_conv = time.time()
-      sx = str(x)
-      end_conv = time.time()
-      print("cdecimal:")
-      print("calculation time: %fs" % (end_calc-start_calc))
-      print("conversion time: %fs\n" % (end_conv-start_conv))
+        # C version of decimal
+        start_calc = time.time()
+        x = factorial(C.Decimal(n), 0)
+        end_calc = time.time()
+        start_conv = time.time()
+        sx = str(x)
+        end_conv = time.time()
+        print("cdecimal:")
+        print("calculation time: %fs" % (end_calc-start_calc))
+        print("conversion time: %fs\n" % (end_conv-start_conv))
 
     # Python integers
     start_calc = time.time()
@@ -126,4 +126,4 @@
     print("conversion time: %fs\n\n" % (end_conv-start_conv))
 
     if C is not None:
-      assert(sx == sy)
+        assert(sx == sy)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 16:26:23 2012
From: python-checkins at python.org (brett.cannon)
Date: Tue, 25 Sep 2012 16:26:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_whitespace=2E?=
Message-ID: <3XR4Mz0MTXzQq5@mail.python.org>

http://hg.python.org/cpython/rev/6948debfaa19
changeset:   79164:6948debfaa19
user:        Brett Cannon <brett at python.org>
date:        Tue Sep 25 10:26:15 2012 -0400
summary:
  Fix whitespace.

files:
  Modules/_decimal/tests/bench.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -78,7 +78,7 @@
     for func in to_benchmark:
         start = time.time()
         if C is not None:
-          C.getcontext().prec = prec
+            C.getcontext().prec = prec
         P.getcontext().prec = prec
         for i in range(10000):
             x = func()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 16:48:34 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 25 Sep 2012 16:48:34 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogLSBJc3N1ZSAjMTU5?=
 =?utf-8?q?35=3A_Clarification_of_argparse_docs=2C_re=3A_add=5Fargument=28?=
 =?utf-8?q?=29_type_and?=
Message-ID: <3XR4sZ26p6zQmf@mail.python.org>

http://hg.python.org/cpython/rev/b624059a8dac
changeset:   79165:b624059a8dac
branch:      2.7
parent:      79159:8a22a2804a66
user:        Barry Warsaw <barry at python.org>
date:        Tue Sep 25 10:32:53 2012 -0400
summary:
  - Issue #15935: Clarification of argparse docs, re: add_argument() type and
  default arguments.  Patch contributed by Chris Jerdonek.

files:
  Doc/library/argparse.rst |  14 ++++++++++++++
  Misc/NEWS                |   3 +++
  2 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -906,6 +906,17 @@
    >>> parser.parse_args(''.split())
    Namespace(foo=42)
 
+If the ``default`` value is a string, the parser parses the value as if it
+were a command-line argument.  In particular, the parser applies any type_
+conversion argument, if provided, before setting the attribute on the
+:class:`Namespace` return value.  Otherwise, the parser uses the value as is::
+
+   >>> parser = argparse.ArgumentParser()
+   >>> parser.add_argument('--length', default='10', type=int)
+   >>> parser.add_argument('--width', default=10.5, type=int)
+   >>> parser.parse_args()
+   Namespace(length=10, width=10.5)
+
 For positional arguments with nargs_ equal to ``?`` or ``*``, the ``default`` value
 is used when no command-line argument was present::
 
@@ -944,6 +955,9 @@
    >>> parser.parse_args('2 temp.txt'.split())
    Namespace(bar=<open file 'temp.txt', mode 'r' at 0x...>, foo=2)
 
+See the section on the default_ keyword argument for information on when the
+``type`` argument is applied to default arguments.
+
 To ease the use of various types of files, the argparse module provides the
 factory FileType which takes the ``mode=`` and ``bufsize=`` arguments of the
 ``file`` object.  For example, ``FileType('w')`` can be used to create a
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -442,6 +442,9 @@
 Documentation
 -------------
 
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
 - Issue #13769: Document the effect of ensure_ascii to the return type
   of JSON decoding functions.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 16:48:37 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 25 Sep 2012 16:48:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogLSBJc3N1ZSAjMTU5?=
 =?utf-8?q?35=3A_Clarification_of_argparse_docs=2C_re=3A_add=5Fargument=28?=
 =?utf-8?q?=29_type_and?=
Message-ID: <3XR4sd0gJnzNnR@mail.python.org>

http://hg.python.org/cpython/rev/b738e42e664a
changeset:   79166:b738e42e664a
branch:      3.2
parent:      79160:d2df5bc89fc9
user:        Barry Warsaw <barry at python.org>
date:        Tue Sep 25 10:37:58 2012 -0400
summary:
  - Issue #15935: Clarification of argparse docs, re: add_argument() type and
  default arguments.  Patch contributed by Chris Jerdonek.

files:
  Doc/library/argparse.rst |  14 ++++++++++++++
  Misc/NEWS                |   3 +++
  2 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -904,6 +904,17 @@
    >>> parser.parse_args(''.split())
    Namespace(foo=42)
 
+If the ``default`` value is a string, the parser parses the value as if it
+were a command-line argument.  In particular, the parser applies any type_
+conversion argument, if provided, before setting the attribute on the
+:class:`Namespace` return value.  Otherwise, the parser uses the value as is::
+
+   >>> parser = argparse.ArgumentParser()
+   >>> parser.add_argument('--length', default='10', type=int)
+   >>> parser.add_argument('--width', default=10.5, type=int)
+   >>> parser.parse_args()
+   Namespace(length=10, width=10.5)
+
 For positional arguments with nargs_ equal to ``?`` or ``*``, the ``default`` value
 is used when no command-line argument was present::
 
@@ -942,6 +953,9 @@
    >>> parser.parse_args('2 temp.txt'.split())
    Namespace(bar=<_io.TextIOWrapper name='temp.txt' encoding='UTF-8'>, foo=2)
 
+See the section on the default_ keyword argument for information on when the
+``type`` argument is applied to default arguments.
+
 To ease the use of various types of files, the argparse module provides the
 factory FileType which takes the ``mode=`` and ``bufsize=`` arguments of the
 :func:`open` function.  For example, ``FileType('w')`` can be used to create a
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -589,6 +589,9 @@
 Documentation
 -------------
 
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
 - Issue #11964: Document a change in v3.2 to the behavior of the indent
   parameter of json encoding operations.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 16:48:38 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 25 Sep 2012 16:48:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_3=2E2_except_the_massive_Misc/NEWS_conflict=2C_so_?=
 =?utf-8?q?hand_apply_the_NEWS_entry=2E?=
Message-ID: <3XR4sf5t21zQnN@mail.python.org>

http://hg.python.org/cpython/rev/cce2bfe03dc5
changeset:   79167:cce2bfe03dc5
parent:      79161:fcb5bc824e3e
parent:      79166:b738e42e664a
user:        Barry Warsaw <barry at python.org>
date:        Tue Sep 25 10:47:55 2012 -0400
summary:
  Merge 3.2 except the massive Misc/NEWS conflict, so hand apply the NEWS entry.

files:
  Doc/library/argparse.rst |  14 ++++++++++++++
  Misc/NEWS                |   3 +++
  2 files changed, 17 insertions(+), 0 deletions(-)


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -923,6 +923,17 @@
    >>> parser.parse_args(''.split())
    Namespace(foo=42)
 
+If the ``default`` value is a string, the parser parses the value as if it
+were a command-line argument.  In particular, the parser applies any type_
+conversion argument, if provided, before setting the attribute on the
+:class:`Namespace` return value.  Otherwise, the parser uses the value as is::
+
+   >>> parser = argparse.ArgumentParser()
+   >>> parser.add_argument('--length', default='10', type=int)
+   >>> parser.add_argument('--width', default=10.5, type=int)
+   >>> parser.parse_args()
+   Namespace(length=10, width=10.5)
+
 For positional arguments with nargs_ equal to ``?`` or ``*``, the ``default`` value
 is used when no command-line argument was present::
 
@@ -961,6 +972,9 @@
    >>> parser.parse_args('2 temp.txt'.split())
    Namespace(bar=<_io.TextIOWrapper name='temp.txt' encoding='UTF-8'>, foo=2)
 
+See the section on the default_ keyword argument for information on when the
+``type`` argument is applied to default arguments.
+
 To ease the use of various types of files, the argparse module provides the
 factory FileType which takes the ``mode=`` and ``bufsize=`` arguments of the
 :func:`open` function.  For example, ``FileType('w')`` can be used to create a
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -99,6 +99,9 @@
 Documentation
 -------------
 
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
 - Issue #11964: Document a change in v3.2 to the behavior of the indent
   parameter of json encoding operations.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 16:48:40 2012
From: python-checkins at python.org (barry.warsaw)
Date: Tue, 25 Sep 2012 16:48:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3XR4sh39tFzQnM@mail.python.org>

http://hg.python.org/cpython/rev/e4e7cca4dc39
changeset:   79168:e4e7cca4dc39
parent:      79167:cce2bfe03dc5
parent:      79164:6948debfaa19
user:        Barry Warsaw <barry at python.org>
date:        Tue Sep 25 10:48:25 2012 -0400
summary:
  merge

files:
  Modules/_decimal/tests/bench.py |  46 ++++++++++++--------
  1 files changed, 28 insertions(+), 18 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -10,7 +10,10 @@
 
 import time
 from math import log, ceil
-from test.support import import_fresh_module
+try:
+    from test.support import import_fresh_module
+except ImportError:
+    from test.test_support import import_fresh_module
 
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
@@ -69,9 +72,13 @@
 
 for prec in [9, 19]:
     print("\nPrecision: %d decimal digits\n" % prec)
-    for func in [pi_float, pi_cdecimal, pi_decimal]:
+    to_benchmark = [pi_float, pi_decimal]
+    if C is not None:
+        to_benchmark.append(pi_cdecimal)
+    for func in to_benchmark:
         start = time.time()
-        C.getcontext().prec = prec
+        if C is not None:
+            C.getcontext().prec = prec
         P.getcontext().prec = prec
         for i in range(10000):
             x = func()
@@ -84,25 +91,27 @@
 print("#                               Factorial")
 print("# ======================================================================\n")
 
-c = C.getcontext()
-c.prec = C.MAX_PREC
-c.Emax = C.MAX_EMAX
-c.Emin = C.MIN_EMIN
+if C is not None:
+    c = C.getcontext()
+    c.prec = C.MAX_PREC
+    c.Emax = C.MAX_EMAX
+    c.Emin = C.MIN_EMIN
 
 for n in [100000, 1000000]:
 
     print("n = %d\n" % n)
 
-    # C version of decimal
-    start_calc = time.time()
-    x = factorial(C.Decimal(n), 0)
-    end_calc = time.time()
-    start_conv = time.time()
-    sx = str(x)
-    end_conv = time.time()
-    print("cdecimal:")
-    print("calculation time: %fs" % (end_calc-start_calc))
-    print("conversion time: %fs\n" % (end_conv-start_conv))
+    if C is not None:
+        # C version of decimal
+        start_calc = time.time()
+        x = factorial(C.Decimal(n), 0)
+        end_calc = time.time()
+        start_conv = time.time()
+        sx = str(x)
+        end_conv = time.time()
+        print("cdecimal:")
+        print("calculation time: %fs" % (end_calc-start_calc))
+        print("conversion time: %fs\n" % (end_conv-start_conv))
 
     # Python integers
     start_calc = time.time()
@@ -116,4 +125,5 @@
     print("calculation time: %fs" % (end_calc-start_calc))
     print("conversion time: %fs\n\n" % (end_conv-start_conv))
 
-    assert(sx == sy)
+    if C is not None:
+        assert(sx == sy)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:00:25 2012
From: python-checkins at python.org (brett.cannon)
Date: Tue, 25 Sep 2012 17:00:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?benchmarks=3A_Add_the_chameleon_bench?=
	=?utf-8?q?mark_from_PyPy=2E?=
Message-ID: <3XR57F12GvzQnH@mail.python.org>

http://hg.python.org/benchmarks/rev/e2dd5d15cd78
changeset:   182:e2dd5d15cd78
user:        Brett Cannon <brett at python.org>
date:        Tue Sep 25 11:00:17 2012 -0400
summary:
  Add the chameleon benchmark from PyPy.

files:
  lib/Chameleon-2.9.2/.gitignore                                                             |    12 +
  lib/Chameleon-2.9.2/CHANGES.rst                                                            |  1075 ++++++
  lib/Chameleon-2.9.2/COPYRIGHT.txt                                                          |     7 +
  lib/Chameleon-2.9.2/LICENSE.txt                                                            |   185 +
  lib/Chameleon-2.9.2/Makefile                                                               |    89 +
  lib/Chameleon-2.9.2/PKG-INFO                                                               |  1122 ++++++
  lib/Chameleon-2.9.2/README.rst                                                             |    25 +
  lib/Chameleon-2.9.2/benchmarks/bm_chameleon.py                                             |   128 +
  lib/Chameleon-2.9.2/benchmarks/bm_mako.py                                                  |   153 +
  lib/Chameleon-2.9.2/benchmarks/util.py                                                     |    51 +
  lib/Chameleon-2.9.2/distribute_setup.py                                                    |   485 ++
  lib/Chameleon-2.9.2/docs/conf.py                                                           |   194 +
  lib/Chameleon-2.9.2/docs/configuration.rst                                                 |    43 +
  lib/Chameleon-2.9.2/docs/index.rst                                                         |   217 +
  lib/Chameleon-2.9.2/docs/integration.rst                                                   |    41 +
  lib/Chameleon-2.9.2/docs/library.rst                                                       |   238 +
  lib/Chameleon-2.9.2/docs/reference.rst                                                     |  1695 ++++++++++
  lib/Chameleon-2.9.2/setup.cfg                                                              |    14 +
  lib/Chameleon-2.9.2/setup.py                                                               |    90 +
  lib/Chameleon-2.9.2/src/Chameleon.egg-info/PKG-INFO                                        |  1122 ++++++
  lib/Chameleon-2.9.2/src/Chameleon.egg-info/SOURCES.txt                                     |   380 ++
  lib/Chameleon-2.9.2/src/Chameleon.egg-info/dependency_links.txt                            |     1 +
  lib/Chameleon-2.9.2/src/Chameleon.egg-info/not-zip-safe                                    |     1 +
  lib/Chameleon-2.9.2/src/Chameleon.egg-info/top_level.txt                                   |     1 +
  lib/Chameleon-2.9.2/src/chameleon/__init__.py                                              |     5 +
  lib/Chameleon-2.9.2/src/chameleon/ast24.py                                                 |   135 +
  lib/Chameleon-2.9.2/src/chameleon/astutil.py                                               |   926 +++++
  lib/Chameleon-2.9.2/src/chameleon/benchmark.py                                             |   478 ++
  lib/Chameleon-2.9.2/src/chameleon/codegen.py                                               |   221 +
  lib/Chameleon-2.9.2/src/chameleon/compiler.py                                              |  1553 +++++++++
  lib/Chameleon-2.9.2/src/chameleon/config.py                                                |    47 +
  lib/Chameleon-2.9.2/src/chameleon/exc.py                                                   |   289 +
  lib/Chameleon-2.9.2/src/chameleon/i18n.py                                                  |   120 +
  lib/Chameleon-2.9.2/src/chameleon/interfaces.py                                            |   102 +
  lib/Chameleon-2.9.2/src/chameleon/loader.py                                                |   174 +
  lib/Chameleon-2.9.2/src/chameleon/metal.py                                                 |    23 +
  lib/Chameleon-2.9.2/src/chameleon/namespaces.py                                            |     9 +
  lib/Chameleon-2.9.2/src/chameleon/nodes.py                                                 |   210 +
  lib/Chameleon-2.9.2/src/chameleon/parser.py                                                |   238 +
  lib/Chameleon-2.9.2/src/chameleon/program.py                                               |    38 +
  lib/Chameleon-2.9.2/src/chameleon/py25.py                                                  |    36 +
  lib/Chameleon-2.9.2/src/chameleon/py26.py                                                  |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tal.py                                                   |   479 ++
  lib/Chameleon-2.9.2/src/chameleon/tales.py                                                 |   541 +++
  lib/Chameleon-2.9.2/src/chameleon/template.py                                              |   332 +
  lib/Chameleon-2.9.2/src/chameleon/tests/__init__.py                                        |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-interpolation.txt                       |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.html                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.pt                       |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002-repeat-scope.pt                         |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003-content.pt                              |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004-attributes.pt                           |    18 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005-default.pt                              |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006-attribute-interpolation.pt              |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007-content-interpolation.pt                |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008-builtins.pt                             |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009-literals.pt                             |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010-structure.pt                            |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011-messages.pt                             |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012-translation.pt                          |    21 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013-repeat-nested.pt                        |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014-repeat-nested-similar.pt                |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015-translation-nested.pt                   |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016-explicit-translation.pt                 |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017-omit-tag.pt                             |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018-translation-nested-dynamic.pt           |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019-replace.pt                              |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020-on-error.pt                             |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021-translation-domain.pt                   |    16 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022-switch.pt                               |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023-condition.pt                            |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024-namespace-elements.pt                   |    16 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025-repeat-whitespace.pt                    |    14 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026-repeat-variable.pt                      |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027-attribute-replacement.pt                |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028-attribute-toggle.pt                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029-attribute-ordering.pt                   |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030-repeat-tuples.pt                        |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031-namespace-with-tal.pt                   |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032-master-template.pt                      |    20 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033-use-macro-trivial.pt                    |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034-use-template-as-macro.pt                |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035-use-macro-with-fill-slot.pt             |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036-use-macro-inherits-dynamic-scope.pt     |     2 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037-use-macro-local-variable-scope.pt       |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038-use-macro-globals.pt                    |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039-globals.pt                              |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040-macro-using-template-symbol.pt          |    20 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041-translate-nested-names.pt               |    22 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042-use-macro-fill-footer.pt                |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043-macro-nested-dynamic-vars.pt            |    19 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044-tuple-define.pt                         |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044.xml                                     |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045-namespaces.pt                           |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046-extend-macro.pt                         |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047-use-extended-macro.pt                   |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048-use-extended-macro-fill-original.pt     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/049-entities-in-attributes.pt               |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/049.xml                                     |   Bin 
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/050-define-macro-and-use-not-extend.pt      |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/050.xml                                     |   Bin 
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/051-use-non-extended-macro.pt               |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/051.xml                                     |   Bin 
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052-i18n-domain-inside-filled-slot.pt       |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053-special-characters-in-attributes.pt     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054-import-expression.pt                    |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054.xml                                     |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055-attribute-fallback-to-dict-lookup.pt    |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056-comment-attribute.pt                    |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057-order.pt                                |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058-script.pt                               |    16 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059-embedded-javascript.pt                  |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059.xml                                     |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060-macro-with-multiple-same-slots.pt       |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061-fill-one-slot-but-two-defined.pt        |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062-comments-and-expressions.pt             |    27 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063-continuation.pt                         |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064-tags-and-special-characters.pt          |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065-use-macro-in-fill.pt                    |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066-load-expression.pt                      |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066.xml                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067-attribute-decode.pt                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068-less-than-greater-than-in-attributes.pt |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069-translation-domain-and-macro.pt         |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070-translation-domain-and-use-macro.pt     |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071-html-attribute-defaults.pt              |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072-repeat-interpolation.pt                 |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073-utf8-encoded.pt                         |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074-encoded-template.pt                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075-nested-macros.pt                        |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076-nested-macro-override.pt                |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076.xml                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077-i18n-attributes.pt                      |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078-tags-and-newlines.pt                    |    23 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079-implicit-i18n.pt                        |    16 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080-xmlns-namespace-on-tal.pt               |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081-load-spec.pt                            |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081.xml                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082-load-spec-computed.pt                   |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083-template-dict-to-macro.pt               |     2 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084-interpolation-in-cdata.pt               |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084.xml                                     |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085-nested-translation.pt                   |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086-self-closing.pt                         |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087-code-blocks.pt                          |    28 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088-python-newlines.pt                      |     2 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/089.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/090.xml                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/091.xml                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/092.xml                                     |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/093.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/094.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/095.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/096.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/097.xml                                     |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/098.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/099.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/100.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101-unclosed-tags.html                      |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102-unquoted-attributes.html                |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103-simple-attribute.html                   |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/104.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/105.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/106.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/107.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/108.xml                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/109.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/110.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/111.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/112.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/113.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/114.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/115.xml                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/116.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/117.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/118.xml                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/119.xml                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/greeting.pt                                 |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.pt                              |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.txt                             |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.html                                   |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.txt                                    |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/002.pt                                     |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/003.pt                                     |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/004.pt                                     |    18 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/005.pt                                     |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/006.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/007.pt                                     |    14 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/008.pt                                     |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/009.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/010.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011-en.pt                                  |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012-en.pt                                  |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/013.pt                                     |    22 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/014.pt                                     |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015-en.pt                                  |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016-en.pt                                  |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/017.pt                                     |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018-en.pt                                  |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018.pt                                     |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/019.pt                                     |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/020.pt                                     |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021-en.pt                                  |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021.pt                                     |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/022.pt                                     |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/023.pt                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/024.pt                                     |    14 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/025.pt                                     |    23 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/026.pt                                     |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/027.pt                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/028.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/029.pt                                     |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/030.pt                                     |    10 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/031.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/032.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/033.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/034.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/035.pt                                     |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/036.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/037.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/038.pt                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/039.pt                                     |     0 
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/040.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/041.pt                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/042.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/043.pt                                     |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/044.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/045.pt                                     |    12 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/046.pt                                     |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/047.pt                                     |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/048.pt                                     |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/049.pt                                     |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/050.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/051.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/052.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/053.pt                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/054.pt                                     |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/055.pt                                     |     4 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/056.pt                                     |     7 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/057.pt                                     |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/058.pt                                     |    16 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/059.pt                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/060.pt                                     |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/061.pt                                     |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/062.pt                                     |    27 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/063.pt                                     |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/064.pt                                     |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/065.pt                                     |    13 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/066.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/067.pt                                     |     6 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/068.pt                                     |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069-en.pt                                  |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070-en.pt                                  |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/071.pt                                     |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/072.pt                                     |    19 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/073.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/074.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/075.pt                                     |    19 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/076.pt                                     |    17 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077-en.pt                                  |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077.pt                                     |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/078.pt                                     |    11 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079-en.pt                                  |    16 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079.pt                                     |    16 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/080.pt                                     |     3 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/081.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/082.pt                                     |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/083.pt                                     |    15 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/084.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085-en.pt                                  |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085.pt                                     |     9 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/086.pt                                     |    18 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/087.pt                                     |    25 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/088.pt                                     |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/101.html                                   |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/102.html                                   |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/103.html                                   |     8 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/greeting.pt                                |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.pt                             |     5 +
  lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.txt                            |     1 +
  lib/Chameleon-2.9.2/src/chameleon/tests/test_doctests.py                                   |    40 +
  lib/Chameleon-2.9.2/src/chameleon/tests/test_loader.py                                     |    79 +
  lib/Chameleon-2.9.2/src/chameleon/tests/test_parser.py                                     |    92 +
  lib/Chameleon-2.9.2/src/chameleon/tests/test_sniffing.py                                   |   124 +
  lib/Chameleon-2.9.2/src/chameleon/tests/test_templates.py                                  |   679 ++++
  lib/Chameleon-2.9.2/src/chameleon/tests/test_tokenizer.py                                  |    47 +
  lib/Chameleon-2.9.2/src/chameleon/tokenize.py                                              |   144 +
  lib/Chameleon-2.9.2/src/chameleon/utils.py                                                 |   429 ++
  lib/Chameleon-2.9.2/src/chameleon/zpt/__init__.py                                          |     1 +
  lib/Chameleon-2.9.2/src/chameleon/zpt/loader.py                                            |    30 +
  lib/Chameleon-2.9.2/src/chameleon/zpt/program.py                                           |   751 ++++
  lib/Chameleon-2.9.2/src/chameleon/zpt/template.py                                          |   409 ++
  lib/Chameleon-2.9.2/src/ordereddict.py                                                     |   127 +
  lib/Chameleon-2.9.2/tox.ini                                                                |    53 +
  make_perf3.sh                                                                              |     9 +-
  perf.py                                                                                    |    16 +-
  performance/bm_chameleon.py                                                                |    40 +
  385 files changed, 18931 insertions(+), 3 deletions(-)


diff --git a/lib/Chameleon-2.9.2/.gitignore b/lib/Chameleon-2.9.2/.gitignore
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/.gitignore
@@ -0,0 +1,12 @@
+*.pyc
+*.egg
+*.egg-info
+.coverage
+.tox/
+coverage.xml
+nosetests.xml
+*.tar.gz
+env25/
+env26/
+env27/
+env32/
diff --git a/lib/Chameleon-2.9.2/CHANGES.rst b/lib/Chameleon-2.9.2/CHANGES.rst
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/CHANGES.rst
@@ -0,0 +1,1075 @@
+Changes
+=======
+
+2.9.2 (2012-06-06)
+------------------
+
+Bugfixes:
+
+- Fixed a PyPy incompatibility.
+
+- Fixed issue #109 which caused testing failures on some platforms.
+
+2.9.1 (2012-06-01)
+------------------
+
+Bugfixes:
+
+- Fixed issue #103. The ``tal:on-error`` statement now always adds an
+  explicit end-tag to the element, even with a substitution content of
+  nothing.
+
+- Fixed issue #113. The ``tal:on-error`` statement now works correctly
+  also for dynamic attributes. That is, the fallback tag now includes
+  only static attributes.
+
+- Fixed name error which prevented the benchmark from running
+  correctly.
+
+Compatibility:
+
+- Fixed deprecation warning on Python 3 for zope interface implements
+  declaration. This fixes issue #116.
+
+2.9.0 (2012-05-31)
+------------------
+
+Features:
+
+- The translation function now gets the ``econtext`` argument as the
+  value for ``context``. Note that historically, this was usually an
+  HTTP request which might provide language negotiation data through a
+  dictionary interface.
+  [alvinyue]
+
+Bugfixes:
+
+- Fixed import alias issue which would lead to a syntax error in
+  generated Python code. Fixes issue #114.
+
+2.8.5 (2012-05-02)
+------------------
+
+Bugfixes:
+
+- Fixed minor installation issues on Python 2.5 and 3.
+  [ppaez]
+
+- Ensure output is unicode even when trivial (an empty string).
+
+2.8.4 (2012-04-18)
+------------------
+
+Features:
+
+- In exception output, long filenames are now truncated to 60
+  characters of output, preventing line wrap which makes it difficult
+  to scan the exception output.
+
+Bugfixes:
+
+- Include filename and location in exception output for exceptions
+  raised during compilation.
+
+- If a trivial translation substitution variable is given (i.e. an
+  empty string), simply ignore it. This fixes issue #106.
+
+2.8.3 (2012-04-16)
+------------------
+
+Features:
+
+- Log template source on debug-level before cooking.
+
+- The `target_language` argument, if given, is now available as a
+  variable in templates.
+
+2.8.2 (2012-03-30)
+------------------
+
+Features:
+
+- Temporary caches used in debug mode are cleaned up eagerly, rather
+  than waiting for process termination.
+  [mitchellrj]
+
+Bugfixes:
+
+- The `index`, `start` and `end` methods on the TAL repeat object are
+  now callable. This fixes an incompatibility with ZPT.
+
+- The loader now correctly handles absolute paths on Windows.
+  [rdale]
+
+2.8.1 (2012-03-29)
+------------------
+
+Features:
+
+- The exception formatter now lists errors in 'wrapping order'. This
+  means that the innermost, and presumably most relevant exception is
+  shown last.
+
+Bugfixes:
+
+- The exception formatter now correctly recognizes nested errors and
+  does not rewrap the dynamically generated exception class.
+
+- The exception formatter now correctly sets the ``__module__``
+  attribute to that of the original exception class.
+
+2.8.0 (2012-02-29)
+------------------
+
+Features:
+
+- Added support for code blocks using the `<?python ... ?>` processing
+  instruction syntax.
+
+  The scope is name assignments is up until the nearest macro
+  definition, or the template itself if macros are not used.
+
+Bugfixes:
+
+- Fall back to the exception class' ``__new__`` method to safely
+  create an exception object that is not implemented in Python.
+
+- The exception formatter now keeps track of already formatted
+  exceptions, and ignores them from further output.
+
+2.7.4 (2012-02-27)
+------------------
+
+- The error handler now invokes the ``__init__`` method of
+  ``BaseException`` instead of the possibly overriden method (which
+  may take required arguments). This fixes issue #97.
+  [j23d, malthe]
+
+2.7.3 (2012-01-16)
+------------------
+
+Bugfixes:
+
+- The trim whitespace option now correctly trims actual whitespace to
+  a single character, appearing either to the left or to the right of
+  an element prefix or suffix string.
+
+2.7.2 (2012-01-08)
+------------------
+
+Features:
+
+- Added option ``trim_attribute_space`` that decides whether attribute
+  whitespace is stripped (at most down to a single space). This option
+  exists to provide compatibility with the reference
+  implementation. Fixes issue #85.
+
+Bugfixes:
+
+- Ignore unhashable builtins when generating a reverse builtin
+  map to quickly look up a builtin value.
+  [malthe]
+
+- Apply translation mapping even when a translation function is not
+  available. This fixes issue #83.
+  [malthe]
+
+- Fixed issue #80. The translation domain for a slot is defined by the
+  source document, i.e. the template providing the content for a slot
+  whether it be the default or provided through ``metal:fill-slot``.
+  [jcbrand]
+
+- In certain circumstances, a Unicode non-breaking space character would cause
+  a define clause to fail to parse.
+
+2.7.1 (2011-12-29)
+------------------
+
+Features:
+
+- Enable expression interpolation in CDATA.
+
+- The page template class now implements dictionary access to macros::
+
+     template[name]
+
+  This is a short-hand for::
+
+     template.macros[name]
+
+Bugfixes:
+
+- An invalid define clause would be silently ignored; we now raise a
+  language error exception. This fixes issue #79.
+
+- Fixed regression where ``${...}`` interpolation expressions could
+  not span multiple lines. This fixes issue #77.
+
+2.7.0 (2011-12-13)
+------------------
+
+Features:
+
+- The ``load:`` expression now derives from the string expression such
+  that the ``${...}`` operator can be used for expression
+  interpolation.
+
+- The ``load:`` expression now accepts asset specs; these are resolved
+  by the ``pkg_resources.resource_filename`` function::
+
+    <package_name>:<path>
+
+  An example from the test suite::
+
+    chameleon:tests/inputs/hello_world.pt
+
+Bugfixes:
+
+- If an attribute name for translation was not a valid Python
+  identifier, the compiler would generate invalid code. This has been
+  fixed, and the compiler now also throws an exception if an attribute
+  specification contains a comma. (Note that the only valid separator
+  character is the semicolon, when specifying attributes for
+  translation via the ``i18n:translate`` statement). This addresses
+  issue #76.
+
+2.6.2 (2011-12-08)
+------------------
+
+Bugfixes:
+
+- Fixed issue where ``tal:on-error`` would not respect
+  ``tal:omit-tag`` or namespace elements which are omitted by default
+  (such as ``<tal:block />``).
+
+- Fixed issue where ``macros`` attribute would not be available on
+  file-based templates due to incorrect initialization.
+
+- The ``TryExcept`` and ``TryFinally`` AST nodes are not available on
+  Python 3.3. These have been aliased to ``Try``. This fixes issue
+  #75.
+
+Features:
+
+- The TAL repeat item now makes a security declaration that grants
+  access to unprotected subobjects on the Zope 2 platform::
+
+    __allow_access_to_unprotected_subobjects__ = True
+
+  This is required for legacy compatibility and does not affect other
+  environments.
+
+- The template object now has a method ``write(body)`` which
+  explicitly decodes and cooks a string input.
+
+- Added configuration option ``loader_class`` which sets the class
+  used to create the template loader object.
+
+  The class (essentially a callable) is created at template
+  construction time.
+
+2.6.1 (2011-11-30)
+------------------
+
+Bugfixes:
+
+- Decode HTML entities in expression interpolation strings. This fixes
+  issue #74.
+
+- Allow ``xml`` and ``xmlns`` attributes on TAL, I18N and METAL
+  namespace elements. This fixes issue #73.
+
+2.6.0 (2011-11-24)
+------------------
+
+Features:
+
+- Added support for implicit translation:
+
+  The ``implicit_i18n_translate`` option enables implicit translation
+  of text. The ``implicit_i18n_attributes`` enables implicit
+  translation of attributes. The latter must be a set and for an
+  attribute to be implicitly translated, its lowercase string value
+  must be included in the set.
+
+- Added option ``strict`` (enabled by default) which decides whether
+  expressions are required to be valid at compile time. That is, if
+  not set, an exception is only raised for an invalid expression at
+  evaluation time.
+
+- An expression error now results in an exception only if the
+  expression is attempted evaluated during a rendering.
+
+- Added a configuration option ``prepend_relative_search_path`` which
+  decides whether the path relative to a file-based template is
+  prepended to the load search path. The default is ``True``.
+
+- Added a configuration option ``search_path`` to the file-based
+  template class, which adds additional paths to the template load
+  instance bound to the ``load:`` expression. The option takes a
+  string path or an iterable yielding string paths. The default value
+  is the empty set.
+
+Bugfixes:
+
+- Exception instances now support pickle/unpickle.
+
+- An attributes in i18n:attributes no longer needs to match an
+  existing or dynamic attribute in order to appear in the
+  element. This fixes issue #66.
+
+2.5.3 (2011-10-23)
+------------------
+
+Bugfixes:
+
+- Fixed an issue where a nested macro slot definition would fail even
+  though there existed a parent macro definition. This fixes issue
+  #69.
+
+2.5.2 (2011-10-12)
+------------------
+
+Bugfixes:
+
+- Fixed an issue where technically invalid input would result in a
+  compiler error.
+
+Features:
+
+- The markup class now inherits from the unicode string type such that
+  it's compatible with the string interface.
+
+2.5.1 (2011-09-29)
+------------------
+
+Bugfixes:
+
+- The symbol names "convert", "decode" and "translate" are now no
+  longer set as read-only *compiler internals*. This fixes issue #65.
+
+- Fixed an issue where a macro extension chain nested two levels (a
+  template uses a macro that extends a macro) would lose the middle
+  slot definitions if slots were defined nested.
+
+  The compiler now throws an error if a nested slot definition is used
+  outside a macro extension context.
+
+2.5.0 (2011-09-23)
+------------------
+
+Features:
+
+- An expression type ``structure:`` is now available which wraps the
+  expression result as *structure* such that it is not escaped on
+  insertion, e.g.::
+
+    <div id="content">
+       ${structure: context.body}
+    </div>
+
+  This also means that the ``structure`` keyword for ``tal:content``
+  and ``tal:replace`` now has an alternative spelling via the
+  expression type ``structure:``.
+
+- The string-based template constructor now accepts encoded input.
+
+2.4.6 (2011-09-23)
+------------------
+
+Bugfixes:
+
+- The ``tal:on-error`` statement should catch all exceptions.
+
+- Fixed issue that would prevent escaping of interpolation expression
+  values appearing in text.
+
+2.4.5 (2011-09-21)
+------------------
+
+Bugfixes:
+
+- The ``tal:on-error`` handler should have a ``error`` variable
+  defined that has the value of the exception thrown.
+
+- The ``tal:on-error`` statement is a substitution statement and
+  should support the "text" and "structure" insertion methods.
+
+2.4.4 (2011-09-15)
+------------------
+
+Bugfixes:
+
+- An encoding specified in the XML document preamble is now read and
+  used to decode the template input to unicode. This fixes issue #55.
+
+- Encoded expression input on Python 3 is now correctly
+  decoded. Previously, the string representation output would be
+  included instead of an actually decoded string.
+
+- Expression result conversion steps are now correctly included in
+  error handling such that the exception output points to the
+  expression location.
+
+2.4.3 (2011-09-13)
+------------------
+
+Features:
+
+- When an encoding is provided, pass the 'ignore' flag to avoid
+  decoding issues with bad input.
+
+Bugfixes:
+
+- Fixed pypy compatibility issue (introduced in previous release).
+
+2.4.2 (2011-09-13)
+------------------
+
+Bugfixes:
+
+- Fixed an issue in the compiler where an internal variable (such as a
+  translation default value) would be cached, resulting in variable
+  scope corruption (see issue #49).
+
+2.4.1 (2011-09-08)
+------------------
+
+Bugfixes:
+
+- Fixed an issue where a default value for an attribute would
+  sometimes spill over into another attribute.
+
+- Fixed issue where the use of the ``default`` name in an attribute
+  interpolation expression would print the attribute value. This is
+  unexpected, because it's an expression, not a static text suitable
+  for output. An attribute value of ``default`` now correctly drops
+  the attribute.
+
+2.4.0 (2011-08-22)
+------------------
+
+Features:
+
+- Added an option ``boolean_attributes`` to evaluate and render a
+  provided set of attributes using a boolean logic: if the attribute
+  is a true value, the value will be the attribute name, otherwise the
+  attribute is dropped.
+
+  In the reference implementation, the following attributes are
+  configured as boolean values when the template is rendered in
+  HTML-mode::
+
+      "compact", "nowrap", "ismap", "declare", "noshade",
+      "checked", "disabled", "readonly", "multiple", "selected",
+      "noresize", "defer"
+
+  Note that in Chameleon, these attributes must be manually provided.
+
+Bugfixes:
+
+- The carriage return character (used on Windows platforms) would
+  incorrectly be included in Python comments.
+
+  It is now replaced with a line break.
+
+  This fixes issue #44.
+
+2.3.8 (2011-08-19)
+------------------
+
+- Fixed import error that affected Python 2.5 only.
+
+2.3.7 (2011-08-19)
+------------------
+
+Features:
+
+- Added an option ``literal_false`` that disables the default behavior
+  of dropping an attribute for a value of ``False`` (in addition to
+  ``None``). This modified behavior is the behavior exhibited in
+  reference implementation.
+
+Bugfixes:
+
+- Undo attribute special HTML attribute behavior (see previous
+  release).
+
+  This turned out not to be a compatible behavior; rather, boolean
+  values should simply be coerced to a string.
+
+  Meanwhile, the reference implementation does support an HTML mode in
+  which the special attribute behavior is exhibited.
+
+  We do not currently support this mode.
+
+2.3.6 (2011-08-18)
+------------------
+
+Features:
+
+- Certain HTML attribute names now have a special behavior for a
+  attribute value of ``True`` (or ``default`` if no default is
+  defined). For these attributes, this return value will result in the
+  name being printed as the value::
+
+    <input type="input" tal:attributes="checked True" />
+
+  will be rendered as::
+
+    <input type="input" checked="checked" />
+
+  This behavior is compatible with the reference implementation.
+
+2.3.5 (2011-08-18)
+------------------
+
+Features:
+
+- Added support for the set operator (``{item, item, ...}``).
+
+Bugfixes:
+
+- If macro is defined on the same element as a translation name, this
+  no longer results in a "translation name not allowed outside
+  translation" error. This fixes issue #43.
+
+- Attribute fallback to dictionary lookup now works on multiple items
+  (e.g. ``d1.d2.d2``). This fixes issue #42.
+
+2.3.4 (2011-08-16)
+------------------
+
+Features:
+
+- When inserting content in either attributes or text, a value of
+  ``True`` (like ``False`` and ``None``) will result in no
+  action.
+
+- Use statically assigned variables for ``"attrs"`` and
+  ``"default"``. This change yields a performance improvement of
+  15-20%.
+
+- The template loader class now accepts an optional argument
+  ``default_extension`` which accepts a filename extension which will
+  be appended to the filename if there's not already an extension.
+
+Bugfixes:
+
+- The default symbol is now ``True`` for an attribute if the attribute
+  default is not provided. Note that the result is that the attribute
+  is dropped. This fixes issue #41.
+
+- Fixed an issue where assignment to a variable ``"type"`` would
+  fail. This fixes issue #40.
+
+- Fixed an issue where an (unsuccesful) assignment for a repeat loop
+  to a compiler internal name would not result in an error.
+
+- If the translation function returns the identical object, manually
+  coerce it to string. This fixes a compatibility issue with
+  translation functions which do not convert non-string objects to a
+  string value, but simply return them unchanged.
+
+2.3.3 (2011-08-15)
+------------------
+
+Features:
+
+- The ``load:`` expression now passes the initial keyword arguments to
+  its template loader (e.g. ``auto_reload`` and ``encoding``).
+
+- In the exception output, string variable values are now limited to a
+  limited output of characters, single line only.
+
+Bugfixes:
+
+- Fixed horizontal alignment of exception location info
+  (i.e. 'String:', 'Filename:' and 'Location:') such that they match
+  the template exception formatter.
+
+2.3.2 (2011-08-11)
+------------------
+
+Bugfixes:
+
+- Fixed issue where i18n:domain would not be inherited through macros
+  and slots. This fixes issue #37.
+
+2.3.1 (2011-08-11)
+------------------
+
+Features:
+
+- The ``Builtin`` node type may now be used to represent any Python
+  local or global name. This allows expression compilers to refer to
+  e.g. ``get`` or ``getitem``, or to explicit require a builtin object
+  such as one from the ``extra_builtins`` dictionary.
+
+Bugfixes:
+
+- Builtins which are not explicitly disallowed may now be redefined
+  and used as variables (e.g. ``nothing``).
+
+- Fixed compiler issue with circular node annotation loop.
+
+2.3 (2011-08-10)
+----------------
+
+Features:
+
+- Added support for the following syntax to disable inline evaluation
+  in a comment:
+
+    <!--? comment appears verbatim (no ${...} evaluation) -->
+
+  Note that the initial question mark character (?) will be omitted
+  from output.
+
+- The parser now accepts '<' and '>' in attributes. Note that this is
+  invalid markup. Previously, the '<' would not be accepted as a valid
+  attribute value, but this would result in an 'unexpected end tag'
+  error elsewhere. This fixes issue #38.
+
+- The expression compiler now provides methods ``assign_text`` and
+  ``assign_value`` such that a template engine might configure this
+  value conversion to support e.g. encoded strings.
+
+  Note that currently, the only client for the ``assign_text`` method
+  is the string expression type.
+
+- Enable template loader for string-based template classes. Note that
+  the ``filename`` keyword argument may be provided on initialization
+  to identify the template source by filename. This fixes issue #36.
+
+- Added ``extra_builtins`` option to the page template class. These
+  builtins are added to the default builtins dictionary at cook time
+  and may be provided at initialization using the ``extra_builtins``
+  keyword argument.
+
+Bugfixes:
+
+- If a translation domain is set for a fill slot, use this setting
+  instead of the macro template domain.
+
+- The Python expression compiler now correctly decodes HTML entities
+  ``'gt'`` and ``'lt'``. This fixes issue #32.
+
+- The string expression compiler now correctly handles encoded text
+  (when support for encoded strings is enabled). This fixes issue #35.
+
+- Fixed an issue where setting the ``filename`` attribute on a
+  file-based template would not automatically cause an invalidation.
+
+- Exceptions raised by Chameleon can now be copied via
+  ``copy.copy``. This fixes issue #36.
+  [leorochael]
+
+- If copying the exception fails in the exception handler, simply
+  re-raise the original exception and log a warning.
+
+2.2 (2011-07-28)
+----------------
+
+Features:
+
+- Added new expression type ``load:`` that allows loading a
+  template. Both relative and absolute paths are supported. If the
+  path given is relative, then it will be resolved with respect to the
+  directory of the template.
+
+- Added support for dynamic evaluation of expressions.
+
+  Note that this is to support legacy applications. It is not
+  currently wired into the provided template classes.
+
+- Template classes now have a ``builtins`` attribute which may be used
+  to define built-in variables always available in the template
+  variable scope.
+
+Incompatibilities:
+
+- The file-based template class no longer accepts a parameter
+  ``loader``. This parameter would be used to load a template from a
+  relative path, using a ``find(filename)`` method. This was however,
+  undocumented, and probably not very useful since we have the
+  ``TemplateLoader`` mechanism already.
+
+- The compiled template module now contains an ``initialize`` function
+  which takes values that map to the template builtins. The return
+  value of this function is a dictionary that contains the render
+  functions.
+
+Bugfixes:
+
+- The file-based template class no longer verifies the existance of a
+  template file (using ``os.lstat``). This now happens implicitly if
+  eager parsing is enabled, or otherwise when first needed (e.g. at
+  render time).
+
+  This is classified as a bug fix because the previous behavior was
+  probably not what you'd expect, especially if an application
+  initializes a lot of templates without needing to render them
+  immediately.
+
+2.1.1 (2011-07-28)
+------------------
+
+Features:
+
+- Improved exception display. The expression string is now shown in
+  the context of the original source (if available) with a marker
+  string indicating the location of the expression in the template
+  source.
+
+Bugfixes:
+
+- The ``structure`` insertion mode now correctly decodes entities for
+  any expression type (including ``string:``). This fixes issue #30.
+
+- Don't show internal variables in the exception formatter variable
+  listing.
+
+2.1 (2011-07-25)
+----------------
+
+Features:
+
+- Expression interpolation (using the ``${...}`` operator and
+  previously also ``$identifier``) now requires braces everywhere
+  except inside the ``string:`` expression type.
+
+  This change is motivated by a number of legacy templates in which
+  the interpolation format without braces ``$identifier`` appears as
+  text.
+
+2.0.2 (2011-07-25)
+------------------
+
+Bugfixes:
+
+- Don't use dynamic variable scope for lambda-scoped variables (#27).
+
+- Avoid duplication of exception class and message in traceback.
+
+- Fixed issue where a ``metal:fill-slot`` would be ignored if a macro
+  was set to be used on the same element (#16).
+
+2.0.1 (2011-07-23)
+------------------
+
+Bugfixes:
+
+- Fixed issue where global variable definition from macro slots would
+  fail (they would instead be local). This also affects error
+  reporting from inside slots because this would be recorded
+  internally as a global.
+
+- Fixed issue with template cache digest (used for filenames); modules
+  are now invalidated whenever any changes are made to the
+  distribution set available (packages on ``sys.path``).
+
+- Fixed exception handler to better let exceptions propagate through
+  the renderer.
+
+- The disk-based module compiler now mangles template source filenames
+  such that the output Python module is valid and at root level (dots
+  and hyphens are replaced by an underscore). This fixes issue #17.
+
+- Fixed translations (i18n) on Python 2.5.
+
+2.0 (2011-07-14)
+----------------
+
+- Point release.
+
+2.0-rc14 (2011-07-13)
+---------------------
+
+Bugfixes:
+
+- The tab character (``\t``) is now parsed correctly when used inside
+  tags.
+
+Features:
+
+- The ``RepeatDict`` class now works as a proxy behind a seperate
+  dictionary instance.
+
+- Added template constructor option ``keep_body`` which is a flag
+  (also available as a class attribute) that controls whether to save
+  the template body input in the ``body`` attribute.
+
+  This is disabled by default, unless debug-mode is enabled.
+
+- The page template loader class now accepts an optional ``formats``
+  argument which can be used to select an alternative template class.
+
+2.0-rc13 (2011-07-07)
+---------------------
+
+Bugfixes:
+
+- The backslash character (followed by optional whitespace and a line
+  break) was not correctly interpreted as a continuation for Python
+  expressions.
+
+Features:
+
+- The Python expression implementation is now more flexible for
+  external subclassing via a new ``parse`` method.
+
+2.0-rc12 (2011-07-04)
+---------------------
+
+Bugfixes:
+
+- Initial keyword arguments passed to a template now no longer "leak"
+  into the template variable space after a macro call.
+
+- An unexpected end tag is now an unrecoverable error.
+
+Features:
+
+- Improve exception output.
+
+2.0-rc11 (2011-05-26)
+---------------------
+
+Bugfixes:
+
+- Fixed issue where variable names that begin with an underscore were
+  seemingly allowed, but their use resulted in a compiler error.
+
+Features:
+
+- Template variable names are now allowed to be prefixed with a single
+  underscore, but not two or more (reserved for internal use).
+
+  Examples of valid names::
+
+    item
+    ITEM
+    _item
+    camelCase
+    underscore_delimited
+    help
+
+- Added support for Genshi's comment "drop" syntax::
+
+    <!--! This comment will be dropped -->
+
+  Note the additional exclamation (!) character.
+
+  This fixes addresses issue #10.
+
+2.0-rc10 (2011-05-24)
+---------------------
+
+Bugfixes:
+
+- The ``tal:attributes`` statement now correctly operates
+  case-insensitive. The attribute name given in the statement will
+  replace an existing attribute with the same name, without respect to
+  case.
+
+Features:
+
+- Added ``meta:interpolation`` statement to control expression
+  interpolation setting.
+
+  Strings that disable the setting: ``"off"`` and ``"false"``.
+  Strings that enable the setting: ``"on"`` and ``"true"``.
+
+- Expression interpolation now works inside XML comments.
+
+2.0-rc9 (2011-05-05)
+--------------------
+
+Features:
+
+- Better debugging support for string decode and conversion. If a
+  naive join fails, each element in the output will now be attempted
+  coerced to unicode to try and trigger the failure near to the bad
+  string.
+
+2.0-rc8 (2011-04-11)
+--------------------
+
+Bugfixes:
+
+- If a macro defines two slots with the same name, a caller will now
+  fill both with a single usage.
+
+- If a valid of ``None`` is provided as the translation function
+  argument, we now fall back to the class default.
+
+2.0-rc7 (2011-03-29)
+--------------------
+
+Bugfixes:
+
+- Fixed issue with Python 2.5 compatibility AST. This affected at
+  least PyPy 1.4.
+
+Features:
+
+- The ``auto_reload`` setting now defaults to the class value; the
+  base template class gives a default value of
+  ``chameleon.config.AUTO_RELOAD``. This change allows a subclass to
+  provide a custom default value (such as an application-specific
+  debug mode setting).
+
+
+2.0-rc6 (2011-03-19)
+--------------------
+
+Features:
+
+- Added support for ``target_language`` keyword argument to render
+  method. If provided, the argument will be curried onto the
+  translation function.
+
+Bugfixes:
+
+- The HTML entities 'lt', 'gt' and 'quot' appearing inside content
+  subtition expressions are now translated into their native character
+  values. This fixes an issue where you could not dynamically create
+  elements using the ``structure`` (which is possible in ZPT). The
+  need to create such structure stems from the lack of an expression
+  interpolation operator in ZPT.
+
+- Fixed duplicate file pointer issue with test suite (affected Windows
+  platforms only). This fixes issue #9.
+  [oliora]
+
+- Use already open file using ``os.fdopen`` when trying to write out
+  the module source. This fixes LP #731803.
+
+
+2.0-rc5 (2011-03-07)
+--------------------
+
+Bugfixes:
+
+- Fixed a number of issues concerning the escaping of attribute
+  values:
+
+  1) Static attribute values are now included as they appear in the
+     source.
+
+     This means that invalid attribute values such as ``"true &&
+     false"`` are now left alone. It's not the job of the template
+     engine to correct such markup, at least not in the default mode
+     of operation.
+
+  2) The string expression compiler no longer unescapes
+     values. Instead, this is left to each expression
+     compiler. Currently only the Python expression compiler unescapes
+     its input.
+
+  3) The dynamic escape code sequence now correctly only replaces
+     ampersands that are part of an HTML escape format.
+
+Imports:
+
+- The page template classes and the loader class can now be imported
+  directly from the ``chameleon`` module.
+
+Features:
+
+- If a custom template loader is not provided, relative paths are now
+  resolved using ``os.abspath`` (i.e. to the current working
+  directory).
+
+- Absolute paths are normalized using ``os.path.normpath`` and
+  ``os.path.expanduser``. This ensures that all paths are kept in
+  their "canonical" form.
+
+
+2.0-rc4 (2011-03-03)
+--------------------
+
+Bugfixes:
+
+- Fixed an issue where the output of an end-to-end string expression
+  would raise an exception if the expression evaluated to ``None`` (it
+  should simply output nothing).
+
+- The ``convert`` function (which is configurable on the template
+  class level) now defaults to the ``translate`` function (at
+  run-time).
+
+  This fixes an issue where message objects were not translated (and
+  thus converted to a string) using the a provided ``translate``
+  function.
+
+- Fixed string interpolation issue where an expression immediately
+  succeeded by a right curly bracket would not parse.
+
+  This fixes issue #5.
+
+- Fixed error where ``tal:condition`` would be evaluated after
+  ``tal:repeat``.
+
+Features:
+
+- Python expression is now a TALES expression. That means that the
+  pipe operator can be used to chain two or more expressions in a
+  try-except sequence.
+
+  This behavior was ported from the 1.x series. Note that while it's
+  still possible to use the pipe character ("|") in an expression, it
+  must now be escaped.
+
+- The template cache can now be shared by multiple processes.
+
+
+2.0-rc3 (2011-03-02)
+--------------------
+
+Bugfixes:
+
+- Fixed ``atexit`` handler.
+
+  This fixes issue #3.
+
+- If a cache directory is specified, it will now be used even when not
+  in debug mode.
+
+- Allow "comment" attribute in the TAL namespace.
+
+  This fixes an issue in the sense that the reference engine allows
+  any attribute within the TAL namespace. However, only "comment" is
+  in common use.
+
+- The template constructor now accepts a flag ``debug`` which puts the
+  template *instance* into debug-mode regardless of the global
+  setting.
+
+  This fixes issue #1.
+
+Features:
+
+- Added exception handler for exceptions raised while evaluating an
+  expression.
+
+  This handler raises (or attempts to) a new exception of the type
+  ``RenderError``, with an additional base class of the original
+  exception class. The string value of the exception is a formatted
+  error message which includes the expression that caused the
+  exception.
+
+  If we are unable to create the exception class, the original
+  exception is re-raised.
+
+2.0-rc2 (2011-02-28)
+--------------------
+
+- Fixed upload issue.
+
+2.0-rc1 (2011-02-28)
+--------------------
+
+- Initial public release. See documentation for what's new in this
+  series.
diff --git a/lib/Chameleon-2.9.2/COPYRIGHT.txt b/lib/Chameleon-2.9.2/COPYRIGHT.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/COPYRIGHT.txt
@@ -0,0 +1,7 @@
+Copyright (c) 2011 Malthe Borch and Contributors. All Rights Reserved.
+
+Portions (c) Zope Foundation and contributors (http://www.zope.org/).
+
+Portions (c) Edgewall Software.
+
+Portions (c) 2008 Armin Ronacher.
diff --git a/lib/Chameleon-2.9.2/LICENSE.txt b/lib/Chameleon-2.9.2/LICENSE.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/LICENSE.txt
@@ -0,0 +1,185 @@
+The majority of the code in Chameleon is supplied under this license:
+
+  A copyright notice accompanies this license document that identifies
+  the copyright holders.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  1.  Redistributions in source code must retain the accompanying
+      copyright notice, this list of conditions, and the following
+      disclaimer.
+
+  2.  Redistributions in binary form must reproduce the accompanying
+      copyright notice, this list of conditions, and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+  3.  Names of the copyright holders must not be used to endorse or
+      promote products derived from this software without prior
+      written permission from the copyright holders.
+
+  4.  If any files are modified, you must cause the modified files to
+      carry prominent notices stating that you changed the files and
+      the date of any change.
+
+  Disclaimer
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND
+    ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+Portions of the code in Chameleon are supplied under the ZPL (headers
+within individiual files indicate that these portions are licensed
+under the ZPL):
+
+  Zope Public License (ZPL) Version 2.1
+  -------------------------------------
+
+  A copyright notice accompanies this license document that
+  identifies the copyright holders.
+
+  This license has been certified as open source. It has also
+  been designated as GPL compatible by the Free Software
+  Foundation (FSF).
+
+  Redistribution and use in source and binary forms, with or
+  without modification, are permitted provided that the
+  following conditions are met:
+
+  1. Redistributions in source code must retain the
+     accompanying copyright notice, this list of conditions,
+     and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the accompanying
+     copyright notice, this list of conditions, and the
+     following disclaimer in the documentation and/or other
+     materials provided with the distribution.
+
+  3. Names of the copyright holders must not be used to
+     endorse or promote products derived from this software
+     without prior written permission from the copyright
+     holders.
+
+  4. The right to distribute this software or to use it for
+     any purpose does not give you the right to use
+     Servicemarks (sm) or Trademarks (tm) of the copyright
+     holders. Use of them is covered by separate agreement
+     with the copyright holders.
+
+  5. If any files are modified, you must cause the modified
+     files to carry prominent notices stating that you changed
+     the files and the date of any change.
+
+  Disclaimer
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+    AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+    NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+    NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+    DAMAGE.
+
+Portions of the code in Chameleon are supplied under the BSD license
+(headers within individiual files indicate that these portions are
+licensed under this license):
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+   3. The name of the author may not be used to endorse or promote
+      products derived from this software without specific prior
+      written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+  IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Portions of the code in Chameleon are supplied under the Python
+License (headers within individiual files indicate that these portions
+are licensed under this license):
+
+  PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+  --------------------------------------------
+
+  1. This LICENSE AGREEMENT is between the Python Software Foundation
+  ("PSF"), and the Individual or Organization ("Licensee") accessing and
+  otherwise using this software ("Python") in source or binary form and
+  its associated documentation.
+
+  2. Subject to the terms and conditions of this License Agreement, PSF
+  hereby grants Licensee a nonexclusive, royalty-free, world-wide
+  license to reproduce, analyze, test, perform and/or display publicly,
+  prepare derivative works, distribute, and otherwise use Python
+  alone or in any derivative version, provided, however, that PSF's
+  License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+  2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
+  are retained in Python alone or in any derivative version prepared
+  by Licensee.
+
+  3. In the event Licensee prepares a derivative work that is based on
+  or incorporates Python or any part thereof, and wants to make
+  the derivative work available to others as provided herein, then
+  Licensee hereby agrees to include in any such work a brief summary of
+  the changes made to Python.
+
+  4. PSF is making Python available to Licensee on an "AS IS"
+  basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+  IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+  DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+  FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+  INFRINGE ANY THIRD PARTY RIGHTS.
+
+  5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+  FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+  A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+  OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+  6. This License Agreement will automatically terminate upon a material
+  breach of its terms and conditions.
+
+  7. Nothing in this License Agreement shall be deemed to create any
+  relationship of agency, partnership, or joint venture between PSF and
+  Licensee.  This License Agreement does not grant permission to use PSF
+  trademarks or trade name in a trademark sense to endorse or promote
+  products or services of Licensee, or any third party.
+
+  8. By copying, installing or otherwise using Python, Licensee
+  agrees to be bound by the terms and conditions of this License
+  Agreement.
diff --git a/lib/Chameleon-2.9.2/Makefile b/lib/Chameleon-2.9.2/Makefile
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/Makefile
@@ -0,0 +1,89 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    = docs
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS)
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html      to make standalone HTML files"
+	@echo "  dirhtml   to make HTML files named index.html in directories"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  changes   to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Chameleon.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Chameleon.qhc"
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/lib/Chameleon-2.9.2/PKG-INFO b/lib/Chameleon-2.9.2/PKG-INFO
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/PKG-INFO
@@ -0,0 +1,1122 @@
+Metadata-Version: 1.1
+Name: Chameleon
+Version: 2.9.2
+Summary: Fast HTML/XML Template Compiler.
+Home-page: http://www.pagetemplates.org/
+Author: Malthe Borch
+Author-email: mborch at gmail.com
+License: BSD-like (http://repoze.org/license.html)
+Description: Overview
+        ========
+        
+        Chameleon is an HTML/XML template engine for `Python
+        <http://www.python.org>`_. It uses the *page templates* language.
+        
+        You can use it in any Python web application with just about any
+        version of Python (2.5 and up, including 3.x and `pypy
+        <http://pypy.org>`_).
+        
+        Visit the `website <http://pagetemplates.org>`_ for more information
+        or the `documentation <http://pagetemplates.org/docs/latest/>`_.
+        
+        License and Copyright
+        ---------------------
+        
+        This software is made available as-is under a BSD-like license [1]_
+        (see included copyright notice).
+        
+        
+        Notes
+        -----
+        
+        .. [1] This software is licensed under the `Repoze
+               <http://repoze.org/license.html>`_ license.
+        
+        
+        Changes
+        =======
+        
+        2.9.2 (2012-06-06)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed a PyPy incompatibility.
+        
+        - Fixed issue #109 which caused testing failures on some platforms.
+        
+        2.9.1 (2012-06-01)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue #103. The ``tal:on-error`` statement now always adds an
+          explicit end-tag to the element, even with a substitution content of
+          nothing.
+        
+        - Fixed issue #113. The ``tal:on-error`` statement now works correctly
+          also for dynamic attributes. That is, the fallback tag now includes
+          only static attributes.
+        
+        - Fixed name error which prevented the benchmark from running
+          correctly.
+        
+        Compatibility:
+        
+        - Fixed deprecation warning on Python 3 for zope interface implements
+          declaration. This fixes issue #116.
+        
+        2.9.0 (2012-05-31)
+        ------------------
+        
+        Features:
+        
+        - The translation function now gets the ``econtext`` argument as the
+          value for ``context``. Note that historically, this was usually an
+          HTTP request which might provide language negotiation data through a
+          dictionary interface.
+          [alvinyue]
+        
+        Bugfixes:
+        
+        - Fixed import alias issue which would lead to a syntax error in
+          generated Python code. Fixes issue #114.
+        
+        2.8.5 (2012-05-02)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed minor installation issues on Python 2.5 and 3.
+          [ppaez]
+        
+        - Ensure output is unicode even when trivial (an empty string).
+        
+        2.8.4 (2012-04-18)
+        ------------------
+        
+        Features:
+        
+        - In exception output, long filenames are now truncated to 60
+          characters of output, preventing line wrap which makes it difficult
+          to scan the exception output.
+        
+        Bugfixes:
+        
+        - Include filename and location in exception output for exceptions
+          raised during compilation.
+        
+        - If a trivial translation substitution variable is given (i.e. an
+          empty string), simply ignore it. This fixes issue #106.
+        
+        2.8.3 (2012-04-16)
+        ------------------
+        
+        Features:
+        
+        - Log template source on debug-level before cooking.
+        
+        - The `target_language` argument, if given, is now available as a
+          variable in templates.
+        
+        2.8.2 (2012-03-30)
+        ------------------
+        
+        Features:
+        
+        - Temporary caches used in debug mode are cleaned up eagerly, rather
+          than waiting for process termination.
+          [mitchellrj]
+        
+        Bugfixes:
+        
+        - The `index`, `start` and `end` methods on the TAL repeat object are
+          now callable. This fixes an incompatibility with ZPT.
+        
+        - The loader now correctly handles absolute paths on Windows.
+          [rdale]
+        
+        2.8.1 (2012-03-29)
+        ------------------
+        
+        Features:
+        
+        - The exception formatter now lists errors in 'wrapping order'. This
+          means that the innermost, and presumably most relevant exception is
+          shown last.
+        
+        Bugfixes:
+        
+        - The exception formatter now correctly recognizes nested errors and
+          does not rewrap the dynamically generated exception class.
+        
+        - The exception formatter now correctly sets the ``__module__``
+          attribute to that of the original exception class.
+        
+        2.8.0 (2012-02-29)
+        ------------------
+        
+        Features:
+        
+        - Added support for code blocks using the `<?python ... ?>` processing
+          instruction syntax.
+        
+          The scope is name assignments is up until the nearest macro
+          definition, or the template itself if macros are not used.
+        
+        Bugfixes:
+        
+        - Fall back to the exception class' ``__new__`` method to safely
+          create an exception object that is not implemented in Python.
+        
+        - The exception formatter now keeps track of already formatted
+          exceptions, and ignores them from further output.
+        
+        2.7.4 (2012-02-27)
+        ------------------
+        
+        - The error handler now invokes the ``__init__`` method of
+          ``BaseException`` instead of the possibly overriden method (which
+          may take required arguments). This fixes issue #97.
+          [j23d, malthe]
+        
+        2.7.3 (2012-01-16)
+        ------------------
+        
+        Bugfixes:
+        
+        - The trim whitespace option now correctly trims actual whitespace to
+          a single character, appearing either to the left or to the right of
+          an element prefix or suffix string.
+        
+        2.7.2 (2012-01-08)
+        ------------------
+        
+        Features:
+        
+        - Added option ``trim_attribute_space`` that decides whether attribute
+          whitespace is stripped (at most down to a single space). This option
+          exists to provide compatibility with the reference
+          implementation. Fixes issue #85.
+        
+        Bugfixes:
+        
+        - Ignore unhashable builtins when generating a reverse builtin
+          map to quickly look up a builtin value.
+          [malthe]
+        
+        - Apply translation mapping even when a translation function is not
+          available. This fixes issue #83.
+          [malthe]
+        
+        - Fixed issue #80. The translation domain for a slot is defined by the
+          source document, i.e. the template providing the content for a slot
+          whether it be the default or provided through ``metal:fill-slot``.
+          [jcbrand]
+        
+        - In certain circumstances, a Unicode non-breaking space character would cause
+          a define clause to fail to parse.
+        
+        2.7.1 (2011-12-29)
+        ------------------
+        
+        Features:
+        
+        - Enable expression interpolation in CDATA.
+        
+        - The page template class now implements dictionary access to macros::
+        
+             template[name]
+        
+          This is a short-hand for::
+        
+             template.macros[name]
+        
+        Bugfixes:
+        
+        - An invalid define clause would be silently ignored; we now raise a
+          language error exception. This fixes issue #79.
+        
+        - Fixed regression where ``${...}`` interpolation expressions could
+          not span multiple lines. This fixes issue #77.
+        
+        2.7.0 (2011-12-13)
+        ------------------
+        
+        Features:
+        
+        - The ``load:`` expression now derives from the string expression such
+          that the ``${...}`` operator can be used for expression
+          interpolation.
+        
+        - The ``load:`` expression now accepts asset specs; these are resolved
+          by the ``pkg_resources.resource_filename`` function::
+        
+            <package_name>:<path>
+        
+          An example from the test suite::
+        
+            chameleon:tests/inputs/hello_world.pt
+        
+        Bugfixes:
+        
+        - If an attribute name for translation was not a valid Python
+          identifier, the compiler would generate invalid code. This has been
+          fixed, and the compiler now also throws an exception if an attribute
+          specification contains a comma. (Note that the only valid separator
+          character is the semicolon, when specifying attributes for
+          translation via the ``i18n:translate`` statement). This addresses
+          issue #76.
+        
+        2.6.2 (2011-12-08)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where ``tal:on-error`` would not respect
+          ``tal:omit-tag`` or namespace elements which are omitted by default
+          (such as ``<tal:block />``).
+        
+        - Fixed issue where ``macros`` attribute would not be available on
+          file-based templates due to incorrect initialization.
+        
+        - The ``TryExcept`` and ``TryFinally`` AST nodes are not available on
+          Python 3.3. These have been aliased to ``Try``. This fixes issue
+          #75.
+        
+        Features:
+        
+        - The TAL repeat item now makes a security declaration that grants
+          access to unprotected subobjects on the Zope 2 platform::
+        
+            __allow_access_to_unprotected_subobjects__ = True
+        
+          This is required for legacy compatibility and does not affect other
+          environments.
+        
+        - The template object now has a method ``write(body)`` which
+          explicitly decodes and cooks a string input.
+        
+        - Added configuration option ``loader_class`` which sets the class
+          used to create the template loader object.
+        
+          The class (essentially a callable) is created at template
+          construction time.
+        
+        2.6.1 (2011-11-30)
+        ------------------
+        
+        Bugfixes:
+        
+        - Decode HTML entities in expression interpolation strings. This fixes
+          issue #74.
+        
+        - Allow ``xml`` and ``xmlns`` attributes on TAL, I18N and METAL
+          namespace elements. This fixes issue #73.
+        
+        2.6.0 (2011-11-24)
+        ------------------
+        
+        Features:
+        
+        - Added support for implicit translation:
+        
+          The ``implicit_i18n_translate`` option enables implicit translation
+          of text. The ``implicit_i18n_attributes`` enables implicit
+          translation of attributes. The latter must be a set and for an
+          attribute to be implicitly translated, its lowercase string value
+          must be included in the set.
+        
+        - Added option ``strict`` (enabled by default) which decides whether
+          expressions are required to be valid at compile time. That is, if
+          not set, an exception is only raised for an invalid expression at
+          evaluation time.
+        
+        - An expression error now results in an exception only if the
+          expression is attempted evaluated during a rendering.
+        
+        - Added a configuration option ``prepend_relative_search_path`` which
+          decides whether the path relative to a file-based template is
+          prepended to the load search path. The default is ``True``.
+        
+        - Added a configuration option ``search_path`` to the file-based
+          template class, which adds additional paths to the template load
+          instance bound to the ``load:`` expression. The option takes a
+          string path or an iterable yielding string paths. The default value
+          is the empty set.
+        
+        Bugfixes:
+        
+        - Exception instances now support pickle/unpickle.
+        
+        - An attributes in i18n:attributes no longer needs to match an
+          existing or dynamic attribute in order to appear in the
+          element. This fixes issue #66.
+        
+        2.5.3 (2011-10-23)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where a nested macro slot definition would fail even
+          though there existed a parent macro definition. This fixes issue
+          #69.
+        
+        2.5.2 (2011-10-12)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where technically invalid input would result in a
+          compiler error.
+        
+        Features:
+        
+        - The markup class now inherits from the unicode string type such that
+          it's compatible with the string interface.
+        
+        2.5.1 (2011-09-29)
+        ------------------
+        
+        Bugfixes:
+        
+        - The symbol names "convert", "decode" and "translate" are now no
+          longer set as read-only *compiler internals*. This fixes issue #65.
+        
+        - Fixed an issue where a macro extension chain nested two levels (a
+          template uses a macro that extends a macro) would lose the middle
+          slot definitions if slots were defined nested.
+        
+          The compiler now throws an error if a nested slot definition is used
+          outside a macro extension context.
+        
+        2.5.0 (2011-09-23)
+        ------------------
+        
+        Features:
+        
+        - An expression type ``structure:`` is now available which wraps the
+          expression result as *structure* such that it is not escaped on
+          insertion, e.g.::
+        
+            <div id="content">
+               ${structure: context.body}
+            </div>
+        
+          This also means that the ``structure`` keyword for ``tal:content``
+          and ``tal:replace`` now has an alternative spelling via the
+          expression type ``structure:``.
+        
+        - The string-based template constructor now accepts encoded input.
+        
+        2.4.6 (2011-09-23)
+        ------------------
+        
+        Bugfixes:
+        
+        - The ``tal:on-error`` statement should catch all exceptions.
+        
+        - Fixed issue that would prevent escaping of interpolation expression
+          values appearing in text.
+        
+        2.4.5 (2011-09-21)
+        ------------------
+        
+        Bugfixes:
+        
+        - The ``tal:on-error`` handler should have a ``error`` variable
+          defined that has the value of the exception thrown.
+        
+        - The ``tal:on-error`` statement is a substitution statement and
+          should support the "text" and "structure" insertion methods.
+        
+        2.4.4 (2011-09-15)
+        ------------------
+        
+        Bugfixes:
+        
+        - An encoding specified in the XML document preamble is now read and
+          used to decode the template input to unicode. This fixes issue #55.
+        
+        - Encoded expression input on Python 3 is now correctly
+          decoded. Previously, the string representation output would be
+          included instead of an actually decoded string.
+        
+        - Expression result conversion steps are now correctly included in
+          error handling such that the exception output points to the
+          expression location.
+        
+        2.4.3 (2011-09-13)
+        ------------------
+        
+        Features:
+        
+        - When an encoding is provided, pass the 'ignore' flag to avoid
+          decoding issues with bad input.
+        
+        Bugfixes:
+        
+        - Fixed pypy compatibility issue (introduced in previous release).
+        
+        2.4.2 (2011-09-13)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue in the compiler where an internal variable (such as a
+          translation default value) would be cached, resulting in variable
+          scope corruption (see issue #49).
+        
+        2.4.1 (2011-09-08)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where a default value for an attribute would
+          sometimes spill over into another attribute.
+        
+        - Fixed issue where the use of the ``default`` name in an attribute
+          interpolation expression would print the attribute value. This is
+          unexpected, because it's an expression, not a static text suitable
+          for output. An attribute value of ``default`` now correctly drops
+          the attribute.
+        
+        2.4.0 (2011-08-22)
+        ------------------
+        
+        Features:
+        
+        - Added an option ``boolean_attributes`` to evaluate and render a
+          provided set of attributes using a boolean logic: if the attribute
+          is a true value, the value will be the attribute name, otherwise the
+          attribute is dropped.
+        
+          In the reference implementation, the following attributes are
+          configured as boolean values when the template is rendered in
+          HTML-mode::
+        
+              "compact", "nowrap", "ismap", "declare", "noshade",
+              "checked", "disabled", "readonly", "multiple", "selected",
+              "noresize", "defer"
+        
+          Note that in Chameleon, these attributes must be manually provided.
+        
+        Bugfixes:
+        
+        - The carriage return character (used on Windows platforms) would
+          incorrectly be included in Python comments.
+        
+          It is now replaced with a line break.
+        
+          This fixes issue #44.
+        
+        2.3.8 (2011-08-19)
+        ------------------
+        
+        - Fixed import error that affected Python 2.5 only.
+        
+        2.3.7 (2011-08-19)
+        ------------------
+        
+        Features:
+        
+        - Added an option ``literal_false`` that disables the default behavior
+          of dropping an attribute for a value of ``False`` (in addition to
+          ``None``). This modified behavior is the behavior exhibited in
+          reference implementation.
+        
+        Bugfixes:
+        
+        - Undo attribute special HTML attribute behavior (see previous
+          release).
+        
+          This turned out not to be a compatible behavior; rather, boolean
+          values should simply be coerced to a string.
+        
+          Meanwhile, the reference implementation does support an HTML mode in
+          which the special attribute behavior is exhibited.
+        
+          We do not currently support this mode.
+        
+        2.3.6 (2011-08-18)
+        ------------------
+        
+        Features:
+        
+        - Certain HTML attribute names now have a special behavior for a
+          attribute value of ``True`` (or ``default`` if no default is
+          defined). For these attributes, this return value will result in the
+          name being printed as the value::
+        
+            <input type="input" tal:attributes="checked True" />
+        
+          will be rendered as::
+        
+            <input type="input" checked="checked" />
+        
+          This behavior is compatible with the reference implementation.
+        
+        2.3.5 (2011-08-18)
+        ------------------
+        
+        Features:
+        
+        - Added support for the set operator (``{item, item, ...}``).
+        
+        Bugfixes:
+        
+        - If macro is defined on the same element as a translation name, this
+          no longer results in a "translation name not allowed outside
+          translation" error. This fixes issue #43.
+        
+        - Attribute fallback to dictionary lookup now works on multiple items
+          (e.g. ``d1.d2.d2``). This fixes issue #42.
+        
+        2.3.4 (2011-08-16)
+        ------------------
+        
+        Features:
+        
+        - When inserting content in either attributes or text, a value of
+          ``True`` (like ``False`` and ``None``) will result in no
+          action.
+        
+        - Use statically assigned variables for ``"attrs"`` and
+          ``"default"``. This change yields a performance improvement of
+          15-20%.
+        
+        - The template loader class now accepts an optional argument
+          ``default_extension`` which accepts a filename extension which will
+          be appended to the filename if there's not already an extension.
+        
+        Bugfixes:
+        
+        - The default symbol is now ``True`` for an attribute if the attribute
+          default is not provided. Note that the result is that the attribute
+          is dropped. This fixes issue #41.
+        
+        - Fixed an issue where assignment to a variable ``"type"`` would
+          fail. This fixes issue #40.
+        
+        - Fixed an issue where an (unsuccesful) assignment for a repeat loop
+          to a compiler internal name would not result in an error.
+        
+        - If the translation function returns the identical object, manually
+          coerce it to string. This fixes a compatibility issue with
+          translation functions which do not convert non-string objects to a
+          string value, but simply return them unchanged.
+        
+        2.3.3 (2011-08-15)
+        ------------------
+        
+        Features:
+        
+        - The ``load:`` expression now passes the initial keyword arguments to
+          its template loader (e.g. ``auto_reload`` and ``encoding``).
+        
+        - In the exception output, string variable values are now limited to a
+          limited output of characters, single line only.
+        
+        Bugfixes:
+        
+        - Fixed horizontal alignment of exception location info
+          (i.e. 'String:', 'Filename:' and 'Location:') such that they match
+          the template exception formatter.
+        
+        2.3.2 (2011-08-11)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where i18n:domain would not be inherited through macros
+          and slots. This fixes issue #37.
+        
+        2.3.1 (2011-08-11)
+        ------------------
+        
+        Features:
+        
+        - The ``Builtin`` node type may now be used to represent any Python
+          local or global name. This allows expression compilers to refer to
+          e.g. ``get`` or ``getitem``, or to explicit require a builtin object
+          such as one from the ``extra_builtins`` dictionary.
+        
+        Bugfixes:
+        
+        - Builtins which are not explicitly disallowed may now be redefined
+          and used as variables (e.g. ``nothing``).
+        
+        - Fixed compiler issue with circular node annotation loop.
+        
+        2.3 (2011-08-10)
+        ----------------
+        
+        Features:
+        
+        - Added support for the following syntax to disable inline evaluation
+          in a comment:
+        
+            <!--? comment appears verbatim (no ${...} evaluation) -->
+        
+          Note that the initial question mark character (?) will be omitted
+          from output.
+        
+        - The parser now accepts '<' and '>' in attributes. Note that this is
+          invalid markup. Previously, the '<' would not be accepted as a valid
+          attribute value, but this would result in an 'unexpected end tag'
+          error elsewhere. This fixes issue #38.
+        
+        - The expression compiler now provides methods ``assign_text`` and
+          ``assign_value`` such that a template engine might configure this
+          value conversion to support e.g. encoded strings.
+        
+          Note that currently, the only client for the ``assign_text`` method
+          is the string expression type.
+        
+        - Enable template loader for string-based template classes. Note that
+          the ``filename`` keyword argument may be provided on initialization
+          to identify the template source by filename. This fixes issue #36.
+        
+        - Added ``extra_builtins`` option to the page template class. These
+          builtins are added to the default builtins dictionary at cook time
+          and may be provided at initialization using the ``extra_builtins``
+          keyword argument.
+        
+        Bugfixes:
+        
+        - If a translation domain is set for a fill slot, use this setting
+          instead of the macro template domain.
+        
+        - The Python expression compiler now correctly decodes HTML entities
+          ``'gt'`` and ``'lt'``. This fixes issue #32.
+        
+        - The string expression compiler now correctly handles encoded text
+          (when support for encoded strings is enabled). This fixes issue #35.
+        
+        - Fixed an issue where setting the ``filename`` attribute on a
+          file-based template would not automatically cause an invalidation.
+        
+        - Exceptions raised by Chameleon can now be copied via
+          ``copy.copy``. This fixes issue #36.
+          [leorochael]
+        
+        - If copying the exception fails in the exception handler, simply
+          re-raise the original exception and log a warning.
+        
+        2.2 (2011-07-28)
+        ----------------
+        
+        Features:
+        
+        - Added new expression type ``load:`` that allows loading a
+          template. Both relative and absolute paths are supported. If the
+          path given is relative, then it will be resolved with respect to the
+          directory of the template.
+        
+        - Added support for dynamic evaluation of expressions.
+        
+          Note that this is to support legacy applications. It is not
+          currently wired into the provided template classes.
+        
+        - Template classes now have a ``builtins`` attribute which may be used
+          to define built-in variables always available in the template
+          variable scope.
+        
+        Incompatibilities:
+        
+        - The file-based template class no longer accepts a parameter
+          ``loader``. This parameter would be used to load a template from a
+          relative path, using a ``find(filename)`` method. This was however,
+          undocumented, and probably not very useful since we have the
+          ``TemplateLoader`` mechanism already.
+        
+        - The compiled template module now contains an ``initialize`` function
+          which takes values that map to the template builtins. The return
+          value of this function is a dictionary that contains the render
+          functions.
+        
+        Bugfixes:
+        
+        - The file-based template class no longer verifies the existance of a
+          template file (using ``os.lstat``). This now happens implicitly if
+          eager parsing is enabled, or otherwise when first needed (e.g. at
+          render time).
+        
+          This is classified as a bug fix because the previous behavior was
+          probably not what you'd expect, especially if an application
+          initializes a lot of templates without needing to render them
+          immediately.
+        
+        2.1.1 (2011-07-28)
+        ------------------
+        
+        Features:
+        
+        - Improved exception display. The expression string is now shown in
+          the context of the original source (if available) with a marker
+          string indicating the location of the expression in the template
+          source.
+        
+        Bugfixes:
+        
+        - The ``structure`` insertion mode now correctly decodes entities for
+          any expression type (including ``string:``). This fixes issue #30.
+        
+        - Don't show internal variables in the exception formatter variable
+          listing.
+        
+        2.1 (2011-07-25)
+        ----------------
+        
+        Features:
+        
+        - Expression interpolation (using the ``${...}`` operator and
+          previously also ``$identifier``) now requires braces everywhere
+          except inside the ``string:`` expression type.
+        
+          This change is motivated by a number of legacy templates in which
+          the interpolation format without braces ``$identifier`` appears as
+          text.
+        
+        2.0.2 (2011-07-25)
+        ------------------
+        
+        Bugfixes:
+        
+        - Don't use dynamic variable scope for lambda-scoped variables (#27).
+        
+        - Avoid duplication of exception class and message in traceback.
+        
+        - Fixed issue where a ``metal:fill-slot`` would be ignored if a macro
+          was set to be used on the same element (#16).
+        
+        2.0.1 (2011-07-23)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where global variable definition from macro slots would
+          fail (they would instead be local). This also affects error
+          reporting from inside slots because this would be recorded
+          internally as a global.
+        
+        - Fixed issue with template cache digest (used for filenames); modules
+          are now invalidated whenever any changes are made to the
+          distribution set available (packages on ``sys.path``).
+        
+        - Fixed exception handler to better let exceptions propagate through
+          the renderer.
+        
+        - The disk-based module compiler now mangles template source filenames
+          such that the output Python module is valid and at root level (dots
+          and hyphens are replaced by an underscore). This fixes issue #17.
+        
+        - Fixed translations (i18n) on Python 2.5.
+        
+        2.0 (2011-07-14)
+        ----------------
+        
+        - Point release.
+        
+        2.0-rc14 (2011-07-13)
+        ---------------------
+        
+        Bugfixes:
+        
+        - The tab character (``\t``) is now parsed correctly when used inside
+          tags.
+        
+        Features:
+        
+        - The ``RepeatDict`` class now works as a proxy behind a seperate
+          dictionary instance.
+        
+        - Added template constructor option ``keep_body`` which is a flag
+          (also available as a class attribute) that controls whether to save
+          the template body input in the ``body`` attribute.
+        
+          This is disabled by default, unless debug-mode is enabled.
+        
+        - The page template loader class now accepts an optional ``formats``
+          argument which can be used to select an alternative template class.
+        
+        2.0-rc13 (2011-07-07)
+        ---------------------
+        
+        Bugfixes:
+        
+        - The backslash character (followed by optional whitespace and a line
+          break) was not correctly interpreted as a continuation for Python
+          expressions.
+        
+        Features:
+        
+        - The Python expression implementation is now more flexible for
+          external subclassing via a new ``parse`` method.
+        
+        2.0-rc12 (2011-07-04)
+        ---------------------
+        
+        Bugfixes:
+        
+        - Initial keyword arguments passed to a template now no longer "leak"
+          into the template variable space after a macro call.
+        
+        - An unexpected end tag is now an unrecoverable error.
+        
+        Features:
+        
+        - Improve exception output.
+        
+        2.0-rc11 (2011-05-26)
+        ---------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where variable names that begin with an underscore were
+          seemingly allowed, but their use resulted in a compiler error.
+        
+        Features:
+        
+        - Template variable names are now allowed to be prefixed with a single
+          underscore, but not two or more (reserved for internal use).
+        
+          Examples of valid names::
+        
+            item
+            ITEM
+            _item
+            camelCase
+            underscore_delimited
+            help
+        
+        - Added support for Genshi's comment "drop" syntax::
+        
+            <!--! This comment will be dropped -->
+        
+          Note the additional exclamation (!) character.
+        
+          This fixes addresses issue #10.
+        
+        2.0-rc10 (2011-05-24)
+        ---------------------
+        
+        Bugfixes:
+        
+        - The ``tal:attributes`` statement now correctly operates
+          case-insensitive. The attribute name given in the statement will
+          replace an existing attribute with the same name, without respect to
+          case.
+        
+        Features:
+        
+        - Added ``meta:interpolation`` statement to control expression
+          interpolation setting.
+        
+          Strings that disable the setting: ``"off"`` and ``"false"``.
+          Strings that enable the setting: ``"on"`` and ``"true"``.
+        
+        - Expression interpolation now works inside XML comments.
+        
+        2.0-rc9 (2011-05-05)
+        --------------------
+        
+        Features:
+        
+        - Better debugging support for string decode and conversion. If a
+          naive join fails, each element in the output will now be attempted
+          coerced to unicode to try and trigger the failure near to the bad
+          string.
+        
+        2.0-rc8 (2011-04-11)
+        --------------------
+        
+        Bugfixes:
+        
+        - If a macro defines two slots with the same name, a caller will now
+          fill both with a single usage.
+        
+        - If a valid of ``None`` is provided as the translation function
+          argument, we now fall back to the class default.
+        
+        2.0-rc7 (2011-03-29)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed issue with Python 2.5 compatibility AST. This affected at
+          least PyPy 1.4.
+        
+        Features:
+        
+        - The ``auto_reload`` setting now defaults to the class value; the
+          base template class gives a default value of
+          ``chameleon.config.AUTO_RELOAD``. This change allows a subclass to
+          provide a custom default value (such as an application-specific
+          debug mode setting).
+        
+        
+        2.0-rc6 (2011-03-19)
+        --------------------
+        
+        Features:
+        
+        - Added support for ``target_language`` keyword argument to render
+          method. If provided, the argument will be curried onto the
+          translation function.
+        
+        Bugfixes:
+        
+        - The HTML entities 'lt', 'gt' and 'quot' appearing inside content
+          subtition expressions are now translated into their native character
+          values. This fixes an issue where you could not dynamically create
+          elements using the ``structure`` (which is possible in ZPT). The
+          need to create such structure stems from the lack of an expression
+          interpolation operator in ZPT.
+        
+        - Fixed duplicate file pointer issue with test suite (affected Windows
+          platforms only). This fixes issue #9.
+          [oliora]
+        
+        - Use already open file using ``os.fdopen`` when trying to write out
+          the module source. This fixes LP #731803.
+        
+        
+        2.0-rc5 (2011-03-07)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed a number of issues concerning the escaping of attribute
+          values:
+        
+          1) Static attribute values are now included as they appear in the
+             source.
+        
+             This means that invalid attribute values such as ``"true &&
+             false"`` are now left alone. It's not the job of the template
+             engine to correct such markup, at least not in the default mode
+             of operation.
+        
+          2) The string expression compiler no longer unescapes
+             values. Instead, this is left to each expression
+             compiler. Currently only the Python expression compiler unescapes
+             its input.
+        
+          3) The dynamic escape code sequence now correctly only replaces
+             ampersands that are part of an HTML escape format.
+        
+        Imports:
+        
+        - The page template classes and the loader class can now be imported
+          directly from the ``chameleon`` module.
+        
+        Features:
+        
+        - If a custom template loader is not provided, relative paths are now
+          resolved using ``os.abspath`` (i.e. to the current working
+          directory).
+        
+        - Absolute paths are normalized using ``os.path.normpath`` and
+          ``os.path.expanduser``. This ensures that all paths are kept in
+          their "canonical" form.
+        
+        
+        2.0-rc4 (2011-03-03)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where the output of an end-to-end string expression
+          would raise an exception if the expression evaluated to ``None`` (it
+          should simply output nothing).
+        
+        - The ``convert`` function (which is configurable on the template
+          class level) now defaults to the ``translate`` function (at
+          run-time).
+        
+          This fixes an issue where message objects were not translated (and
+          thus converted to a string) using the a provided ``translate``
+          function.
+        
+        - Fixed string interpolation issue where an expression immediately
+          succeeded by a right curly bracket would not parse.
+        
+          This fixes issue #5.
+        
+        - Fixed error where ``tal:condition`` would be evaluated after
+          ``tal:repeat``.
+        
+        Features:
+        
+        - Python expression is now a TALES expression. That means that the
+          pipe operator can be used to chain two or more expressions in a
+          try-except sequence.
+        
+          This behavior was ported from the 1.x series. Note that while it's
+          still possible to use the pipe character ("|") in an expression, it
+          must now be escaped.
+        
+        - The template cache can now be shared by multiple processes.
+        
+        
+        2.0-rc3 (2011-03-02)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed ``atexit`` handler.
+        
+          This fixes issue #3.
+        
+        - If a cache directory is specified, it will now be used even when not
+          in debug mode.
+        
+        - Allow "comment" attribute in the TAL namespace.
+        
+          This fixes an issue in the sense that the reference engine allows
+          any attribute within the TAL namespace. However, only "comment" is
+          in common use.
+        
+        - The template constructor now accepts a flag ``debug`` which puts the
+          template *instance* into debug-mode regardless of the global
+          setting.
+        
+          This fixes issue #1.
+        
+        Features:
+        
+        - Added exception handler for exceptions raised while evaluating an
+          expression.
+        
+          This handler raises (or attempts to) a new exception of the type
+          ``RenderError``, with an additional base class of the original
+          exception class. The string value of the exception is a formatted
+          error message which includes the expression that caused the
+          exception.
+        
+          If we are unable to create the exception class, the original
+          exception is re-raised.
+        
+        2.0-rc2 (2011-02-28)
+        --------------------
+        
+        - Fixed upload issue.
+        
+        2.0-rc1 (2011-02-28)
+        --------------------
+        
+        - Initial public release. See documentation for what's new in this
+          series.
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.1
+Classifier: Programming Language :: Python :: 3.2
diff --git a/lib/Chameleon-2.9.2/README.rst b/lib/Chameleon-2.9.2/README.rst
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/README.rst
@@ -0,0 +1,25 @@
+Overview
+========
+
+Chameleon is an HTML/XML template engine for `Python
+<http://www.python.org>`_. It uses the *page templates* language.
+
+You can use it in any Python web application with just about any
+version of Python (2.5 and up, including 3.x and `pypy
+<http://pypy.org>`_).
+
+Visit the `website <http://pagetemplates.org>`_ for more information
+or the `documentation <http://pagetemplates.org/docs/latest/>`_.
+
+License and Copyright
+---------------------
+
+This software is made available as-is under a BSD-like license [1]_
+(see included copyright notice).
+
+
+Notes
+-----
+
+.. [1] This software is licensed under the `Repoze
+       <http://repoze.org/license.html>`_ license.
diff --git a/lib/Chameleon-2.9.2/benchmarks/bm_chameleon.py b/lib/Chameleon-2.9.2/benchmarks/bm_chameleon.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/benchmarks/bm_chameleon.py
@@ -0,0 +1,128 @@
+#!/usr/bin/python2
+
+"""
+Benchmark for test the performance of Chameleon page template engine.
+"""
+
+__author__ = "mborch at gmail.com (Malthe Borch)"
+
+# Python imports
+import os
+import sys
+import optparse
+import time
+
+# Local imports
+import util
+
+
+def relative(*args):
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), *args)
+
+sys.path.insert(0, relative('..', 'src'))
+
+# Chameleon imports
+from chameleon import PageTemplate
+
+
+LOREM_IPSUM = """Quisque lobortis hendrerit posuere. Curabitur
+aliquet consequat sapien molestie pretium. Nunc adipiscing luc
+tus mi, viverra porttitor lorem vulputate et. Ut at purus sem,
+sed tincidunt ante. Vestibulum ante ipsum primis in faucibus
+orci luctus et ultrices posuere cubilia Curae; Praesent pulvinar
+sodales justo at congue. Praesent aliquet facilisis nisl a
+molestie. Sed tempus nisl ut augue eleifend tincidunt. Sed a
+lacinia nulla. Cras tortor est, mollis et consequat at,
+vulputate et orci. Nulla sollicitudin"""
+
+BASE_TEMPLATE = '''
+<tal:macros condition="False">
+    <table metal:define-macro="table">
+       <tr tal:repeat="row table">
+          <td tal:repeat="col row">${col}</td>
+       </tr>
+    </table>
+    <img metal:define-macro="img" src="${src}" alt="${alt}" />
+</tal:macros>
+<html metal:define-macro="master">
+    <head><title>${title.strip()}</title></head>
+    <body metal:define-slot="body" />
+</html>
+'''
+
+PAGE_TEMPLATE = '''
+<html metal:define-macro="master" metal:extend-macro="base.macros['master']">
+<body metal:fill-slot="body">
+<table metal:use-macro="base.macros['table']" />
+images:
+<tal:images repeat="nr xrange(img_count)">
+    <img tal:define="src '/foo/bar/baz.png';
+                     alt 'no image :o'"
+         metal:use-macro="base.macros['img']" />
+</tal:images>
+<metal:body define-slot="body" />
+<p tal:repeat="nr paragraphs">${lorem}</p>
+<table metal:use-macro="base.macros['table']" />
+</body>
+</html>
+'''
+
+CONTENT_TEMPLATE = '''
+<html metal:use-macro="page.macros['master']">
+<span metal:define-macro="fun1">fun1</span>
+<span metal:define-macro="fun2">fun2</span>
+<span metal:define-macro="fun3">fun3</span>
+<span metal:define-macro="fun4">fun4</span>
+<span metal:define-macro="fun5">fun5</span>
+<span metal:define-macro="fun6">fun6</span>
+<body metal:fill-slot="body">
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Nam laoreet justo in velit faucibus lobortis. Sed dictum sagittis
+volutpat. Sed adipiscing vestibulum consequat. Nullam laoreet, ante
+nec pretium varius, libero arcu porttitor orci, id cursus odio nibh
+nec leo. Vestibulum dapibus pellentesque purus, sed bibendum tortor
+laoreet id. Praesent quis sodales ipsum. Fusce ut ligula sed diam
+pretium sagittis vel at ipsum. Nulla sagittis sem quam, et volutpat
+velit. Fusce dapibus ligula quis lectus ultricies tempor. Pellente</p>
+<span metal:use-macro="template.macros['fun1']" />
+<span metal:use-macro="template.macros['fun2']" />
+<span metal:use-macro="template.macros['fun3']" />
+<span metal:use-macro="template.macros['fun4']" />
+<span metal:use-macro="template.macros['fun5']" />
+<span metal:use-macro="template.macros['fun6']" />
+</body>
+</html>
+'''
+
+
+def test_mako(count):
+    template = PageTemplate(CONTENT_TEMPLATE)
+    base = PageTemplate(BASE_TEMPLATE)
+    page = PageTemplate(PAGE_TEMPLATE)
+
+    table = [xrange(150) for i in xrange(150)]
+    paragraphs = xrange(50)
+    title = 'Hello world!'
+
+    times = []
+    for i in range(count):
+        t0 = time.time()
+        data = template.render(
+            table=table, paragraphs=paragraphs,
+            lorem=LOREM_IPSUM, title=title,
+            img_count=50,
+            base=base,
+            page=page,
+            )
+        t1 = time.time()
+        times.append(t1-t0)
+    return times
+
+if __name__ == "__main__":
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description=("Test the performance of Chameleon templates."))
+    util.add_standard_options_to(parser)
+    (options, args) = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, test_mako)
diff --git a/lib/Chameleon-2.9.2/benchmarks/bm_mako.py b/lib/Chameleon-2.9.2/benchmarks/bm_mako.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/benchmarks/bm_mako.py
@@ -0,0 +1,153 @@
+#!/usr/bin/python
+
+"""
+Benchmark for test the performance of Mako templates engine.
+Includes:
+    -two template inherences
+    -HTML escaping, XML escaping, URL escaping, whitespace trimming
+    -function defitions and calls
+    -forloops
+"""
+
+__author__ = "virhilo at gmail.com (Lukasz Fidosz)"
+
+# Python imports
+import os
+import sys
+import optparse
+import time
+
+# Local imports
+import util
+
+def relative(*args):
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), *args)
+
+sys.path.insert(0, relative('..', 'lib'))
+
+# Mako imports
+from mako.template import Template
+from mako.lookup import TemplateLookup
+
+
+LOREM_IPSUM = """Quisque lobortis hendrerit posuere. Curabitur
+aliquet consequat sapien molestie pretium. Nunc adipiscing luc
+tus mi, viverra porttitor lorem vulputate et. Ut at purus sem,
+sed tincidunt ante. Vestibulum ante ipsum primis in faucibus 
+orci luctus et ultrices posuere cubilia Curae; Praesent pulvinar
+sodales justo at congue. Praesent aliquet facilisis nisl a
+molestie. Sed tempus nisl ut augue eleifend tincidunt. Sed a
+lacinia nulla. Cras tortor est, mollis et consequat at,
+vulputate et orci. Nulla sollicitudin"""
+
+BASE_TEMPLATE = """
+<%def name="render_table(table)">
+    <table>
+    % for row in table:
+        <tr>
+        % for col in row:
+            <td>${col|h}</td>
+        % endfor
+        </tr>
+    % endfor
+    </table>
+</%def>
+<%def name="img(src, alt)">
+    <img src="${src|u}" alt="${alt}" />
+</%def>
+<html>
+    <head><title>${title|h,trim}</title></head>
+    <body>
+        ${next.body()}
+    </body>
+<html>
+"""
+
+PAGE_TEMPLATE = """
+<%inherit file="base.mako"/>
+<table>
+    % for row in table:
+        <tr>
+            % for col in row:
+                <td>${col}</td>
+            % endfor
+        </tr>
+    % endfor
+</table>
+% for nr in xrange(img_count):
+    ${parent.img('/foo/bar/baz.png', 'no image :o')}
+% endfor
+${next.body()}
+% for nr in paragraphs:
+    <p>${lorem|x}</p>
+% endfor
+${parent.render_table(table)}
+"""
+
+CONTENT_TEMPLATE = """
+<%inherit file="page.mako"/>
+<%def name="fun1()">
+    <span>fun1</span>
+</%def>
+<%def name="fun2()">
+    <span>fun2</span>
+</%def>
+<%def name="fun3()">
+    <span>foo3</span>
+</%def>
+<%def name="fun4()">
+    <span>foo4</span>
+</%def>
+<%def name="fun5()">
+    <span>foo5</span>
+</%def>
+<%def name="fun6()">
+    <span>foo6</span>
+</%def>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Nam laoreet justo in velit faucibus lobortis. Sed dictum sagittis
+volutpat. Sed adipiscing vestibulum consequat. Nullam laoreet, ante
+nec pretium varius, libero arcu porttitor orci, id cursus odio nibh
+nec leo. Vestibulum dapibus pellentesque purus, sed bibendum tortor
+laoreet id. Praesent quis sodales ipsum. Fusce ut ligula sed diam
+pretium sagittis vel at ipsum. Nulla sagittis sem quam, et volutpat
+velit. Fusce dapibus ligula quis lectus ultricies tempor. Pellente</p>
+${fun1()}
+${fun2()}
+${fun3()}
+${fun4()}
+${fun5()}
+${fun6()}
+"""
+
+
+def test_mako(count):
+
+    lookup = TemplateLookup()
+    lookup.put_string('base.mako', BASE_TEMPLATE)
+    lookup.put_string('page.mako', PAGE_TEMPLATE)
+
+    template = Template(CONTENT_TEMPLATE, lookup=lookup)
+    
+    table = [xrange(150) for i in xrange(150)]
+    paragraphs = xrange(50)
+    title = 'Hello world!'
+
+    times = []
+    for i in range(count):
+        t0 = time.time()
+        data = template.render(table=table, paragraphs=paragraphs,
+                               lorem=LOREM_IPSUM, title=title,
+                               img_count=50)
+        t1 = time.time()
+        times.append(t1-t0)
+    return times
+
+if __name__ == "__main__":
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description=("Test the performance of Mako templates."))
+    util.add_standard_options_to(parser)
+    (options, args) = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, test_mako)
diff --git a/lib/Chameleon-2.9.2/benchmarks/util.py b/lib/Chameleon-2.9.2/benchmarks/util.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/benchmarks/util.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+
+"""Utility code for benchmark scripts."""
+
+__author__ = "collinwinter at google.com (Collin Winter)"
+
+import math
+import operator
+
+
+def run_benchmark(options, num_runs, bench_func, *args):
+    """Run the given benchmark, print results to stdout.
+
+    Args:
+        options: optparse.Values instance.
+        num_runs: number of times to run the benchmark
+        bench_func: benchmark function. `num_runs, *args` will be passed to this
+            function. This should return a list of floats (benchmark execution
+            times).
+    """
+    if options.profile:
+        import cProfile
+        prof = cProfile.Profile()
+        prof.runcall(bench_func, num_runs, *args)
+        prof.print_stats(sort=options.profile_sort)
+    else:
+        data = bench_func(num_runs, *args)
+        if options.take_geo_mean:
+            product = reduce(operator.mul, data, 1)
+            print math.pow(product, 1.0 / len(data))
+        else:
+            for x in data:
+                print x
+
+
+def add_standard_options_to(parser):
+    """Add a bunch of common command-line flags to an existing OptionParser.
+
+    This function operates on `parser` in-place.
+
+    Args:
+        parser: optparse.OptionParser instance.
+    """
+    parser.add_option("-n", action="store", type="int", default=100,
+                      dest="num_runs", help="Number of times to run the test.")
+    parser.add_option("--profile", action="store_true",
+                      help="Run the benchmark through cProfile.")
+    parser.add_option("--profile_sort", action="store", type="str",
+                      default="time", help="Column to sort cProfile output by.")
+    parser.add_option("--take_geo_mean", action="store_true",
+                      help="Return the geo mean, rather than individual data.")
diff --git a/lib/Chameleon-2.9.2/distribute_setup.py b/lib/Chameleon-2.9.2/distribute_setup.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/distribute_setup.py
@@ -0,0 +1,485 @@
+#!python
+"""Bootstrap distribute installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import os
+import sys
+import time
+import fnmatch
+import tempfile
+import tarfile
+from distutils import log
+
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
+try:
+    import subprocess
+
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        return subprocess.call(args) == 0
+
+except ImportError:
+    # will be used for python 2.3
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        # quoting arguments if windows
+        if sys.platform == 'win32':
+            def quote(arg):
+                if ' ' in arg:
+                    return '"%s"' % arg
+                return arg
+            args = [quote(arg) for arg in args]
+        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
+
+DEFAULT_VERSION = "0.6.14"
+DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+SETUPTOOLS_FAKED_VERSION = "0.6c11"
+
+SETUPTOOLS_PKG_INFO = """\
+Metadata-Version: 1.0
+Name: setuptools
+Version: %s
+Summary: xxxx
+Home-page: xxx
+Author: xxx
+Author-email: xxx
+License: xxx
+Description: xxx
+""" % SETUPTOOLS_FAKED_VERSION
+
+
+def _install(tarball):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # installing
+        log.warn('Installing Distribute')
+        if not _python_cmd('setup.py', 'install'):
+            log.warn('Something went wrong during the installation.')
+            log.warn('See the error message above.')
+    finally:
+        os.chdir(old_wd)
+
+
+def _build_egg(egg, tarball, to_dir):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # building an egg
+        log.warn('Building a Distribute egg in %s', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+
+    finally:
+        os.chdir(old_wd)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
+
+
+def _do_download(version, download_base, to_dir, download_delay):
+    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
+                       % (version, sys.version_info[0], sys.version_info[1]))
+    if not os.path.exists(egg):
+        tarball = download_setuptools(version, download_base,
+                                      to_dir, download_delay)
+        _build_egg(egg, tarball, to_dir)
+    sys.path.insert(0, egg)
+    import setuptools
+    setuptools.bootstrap_install_from = egg
+
+
+def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                   to_dir=os.curdir, download_delay=15, no_fake=True):
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    was_imported = 'pkg_resources' in sys.modules or \
+        'setuptools' in sys.modules
+    try:
+        try:
+            import pkg_resources
+            if not hasattr(pkg_resources, '_distribute'):
+                if not no_fake:
+                    _fake_setuptools()
+                raise ImportError
+        except ImportError:
+            return _do_download(version, download_base, to_dir, download_delay)
+        try:
+            pkg_resources.require("distribute>="+version)
+            return
+        except pkg_resources.VersionConflict:
+            e = sys.exc_info()[1]
+            if was_imported:
+                sys.stderr.write(
+                "The required version of distribute (>=%s) is not available,\n"
+                "and can't be installed while this script is running. Please\n"
+                "install a more recent version first, using\n"
+                "'easy_install -U distribute'."
+                "\n\n(Currently using %r)\n" % (version, e.args[0]))
+                sys.exit(2)
+            else:
+                del pkg_resources, sys.modules['pkg_resources']    # reload ok
+                return _do_download(version, download_base, to_dir,
+                                    download_delay)
+        except pkg_resources.DistributionNotFound:
+            return _do_download(version, download_base, to_dir,
+                                download_delay)
+    finally:
+        if not no_fake:
+            _create_fake_setuptools_pkg_info(to_dir)
+
+def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                        to_dir=os.curdir, delay=15):
+    """Download distribute from a specified location and return its filename
+
+    `version` should be a valid distribute version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    `delay` is the number of seconds to pause before an actual download
+    attempt.
+    """
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
+    tgz_name = "distribute-%s.tar.gz" % version
+    url = download_base + tgz_name
+    saveto = os.path.join(to_dir, tgz_name)
+    src = dst = None
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            log.warn("Downloading %s", url)
+            src = urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = src.read()
+            dst = open(saveto, "wb")
+            dst.write(data)
+        finally:
+            if src:
+                src.close()
+            if dst:
+                dst.close()
+    return os.path.realpath(saveto)
+
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            if not hasattr(DirectorySandbox, '_old'):
+                def violation(*args):
+                    pass
+                DirectorySandbox._old = DirectorySandbox._violation
+                DirectorySandbox._violation = violation
+                patched = True
+            else:
+                patched = False
+        except ImportError:
+            patched = False
+
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
+
+    return __no_sandbox
+
+def _patch_file(path, content):
+    """Will backup the file then patch it"""
+    existing_content = open(path).read()
+    if existing_content == content:
+        # already patched
+        log.warn('Already patched.')
+        return False
+    log.warn('Patching...')
+    _rename_path(path)
+    f = open(path, 'w')
+    try:
+        f.write(content)
+    finally:
+        f.close()
+    return True
+
+_patch_file = _no_sandbox(_patch_file)
+
+def _same_content(path, content):
+    return open(path).read() == content
+
+def _rename_path(path):
+    new_name = path + '.OLD.%s' % time.time()
+    log.warn('Renaming %s into %s', path, new_name)
+    os.rename(path, new_name)
+    return new_name
+
+def _remove_flat_installation(placeholder):
+    if not os.path.isdir(placeholder):
+        log.warn('Unkown installation at %s', placeholder)
+        return False
+    found = False
+    for file in os.listdir(placeholder):
+        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
+            found = True
+            break
+    if not found:
+        log.warn('Could not locate setuptools*.egg-info')
+        return
+
+    log.warn('Removing elements out of the way...')
+    pkg_info = os.path.join(placeholder, file)
+    if os.path.isdir(pkg_info):
+        patched = _patch_egg_dir(pkg_info)
+    else:
+        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
+
+    if not patched:
+        log.warn('%s already patched.', pkg_info)
+        return False
+    # now let's move the files out of the way
+    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
+        element = os.path.join(placeholder, element)
+        if os.path.exists(element):
+            _rename_path(element)
+        else:
+            log.warn('Could not find the %s element of the '
+                     'Setuptools distribution', element)
+    return True
+
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
+
+def _after_install(dist):
+    log.warn('After install bootstrap.')
+    placeholder = dist.get_command_obj('install').install_purelib
+    _create_fake_setuptools_pkg_info(placeholder)
+
+def _create_fake_setuptools_pkg_info(placeholder):
+    if not placeholder or not os.path.exists(placeholder):
+        log.warn('Could not find the install location')
+        return
+    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+            (SETUPTOOLS_FAKED_VERSION, pyver)
+    pkg_info = os.path.join(placeholder, setuptools_file)
+    if os.path.exists(pkg_info):
+        log.warn('%s already exists', pkg_info)
+        return
+
+    log.warn('Creating %s', pkg_info)
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+
+    pth_file = os.path.join(placeholder, 'setuptools.pth')
+    log.warn('Creating %s', pth_file)
+    f = open(pth_file, 'w')
+    try:
+        f.write(os.path.join(os.curdir, setuptools_file))
+    finally:
+        f.close()
+
+_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
+
+def _patch_egg_dir(path):
+    # let's check if it's already patched
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    if os.path.exists(pkg_info):
+        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
+            log.warn('%s already patched.', pkg_info)
+            return False
+    _rename_path(path)
+    os.mkdir(path)
+    os.mkdir(os.path.join(path, 'EGG-INFO'))
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+    return True
+
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
+
+def _before_install():
+    log.warn('Before install bootstrap.')
+    _fake_setuptools()
+
+
+def _under_prefix(location):
+    if 'install' not in sys.argv:
+        return True
+    args = sys.argv[sys.argv.index('install')+1:]
+    for index, arg in enumerate(args):
+        for option in ('--root', '--prefix'):
+            if arg.startswith('%s=' % option):
+                top_dir = arg.split('root=')[-1]
+                return location.startswith(top_dir)
+            elif arg == option:
+                if len(args) > index:
+                    top_dir = args[index+1]
+                    return location.startswith(top_dir)
+        if arg == '--user' and USER_SITE is not None:
+            return location.startswith(USER_SITE)
+    return True
+
+
+def _fake_setuptools():
+    log.warn('Scanning installed packages')
+    try:
+        import pkg_resources
+    except ImportError:
+        # we're cool
+        log.warn('Setuptools or Distribute does not seem to be installed.')
+        return
+    ws = pkg_resources.working_set
+    try:
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
+                                  replacement=False))
+    except TypeError:
+        # old distribute API
+        setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
+
+    if setuptools_dist is None:
+        log.warn('No setuptools distribution found')
+        return
+    # detecting if it was already faked
+    setuptools_location = setuptools_dist.location
+    log.warn('Setuptools installation detected at %s', setuptools_location)
+
+    # if --root or --preix was provided, and if
+    # setuptools is not located in them, we don't patch it
+    if not _under_prefix(setuptools_location):
+        log.warn('Not patching, --root or --prefix is installing Distribute'
+                 ' in another location')
+        return
+
+    # let's see if its an egg
+    if not setuptools_location.endswith('.egg'):
+        log.warn('Non-egg installation')
+        res = _remove_flat_installation(setuptools_location)
+        if not res:
+            return
+    else:
+        log.warn('Egg installation')
+        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
+        if (os.path.exists(pkg_info) and
+            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
+            log.warn('Already patched.')
+            return
+        log.warn('Patching...')
+        # let's create a fake egg replacing setuptools one
+        res = _patch_egg_dir(setuptools_location)
+        if not res:
+            return
+    log.warn('Patched done.')
+    _relaunch()
+
+
+def _relaunch():
+    log.warn('Relaunching...')
+    # we have to relaunch the process
+    # pip marker to avoid a relaunch bug
+    if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
+        sys.argv[0] = 'setup.py'
+    args = [sys.executable] + sys.argv
+    sys.exit(subprocess.call(args))
+
+
+def _extractall(self, path=".", members=None):
+    """Extract all members from the archive to the current working
+       directory and set owner, modification time and permissions on
+       directories afterwards. `path' specifies a different directory
+       to extract to. `members' is optional and must be a subset of the
+       list returned by getmembers().
+    """
+    import copy
+    import operator
+    from tarfile import ExtractError
+    directories = []
+
+    if members is None:
+        members = self
+
+    for tarinfo in members:
+        if tarinfo.isdir():
+            # Extract directories with a safe mode.
+            directories.append(tarinfo)
+            tarinfo = copy.copy(tarinfo)
+            tarinfo.mode = 448 # decimal for oct 0700
+        self.extract(tarinfo, path)
+
+    # Reverse sort directories.
+    if sys.version_info < (2, 4):
+        def sorter(dir1, dir2):
+            return cmp(dir1.name, dir2.name)
+        directories.sort(sorter)
+        directories.reverse()
+    else:
+        directories.sort(key=operator.attrgetter('name'), reverse=True)
+
+    # Set correct owner, mtime and filemode on directories.
+    for tarinfo in directories:
+        dirpath = os.path.join(path, tarinfo.name)
+        try:
+            self.chown(tarinfo, dirpath)
+            self.utime(tarinfo, dirpath)
+            self.chmod(tarinfo, dirpath)
+        except ExtractError:
+            e = sys.exc_info()[1]
+            if self.errorlevel > 1:
+                raise
+            else:
+                self._dbg(1, "tarfile: %s" % e)
+
+
+def main(argv, version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    tarball = download_setuptools()
+    _install(tarball)
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
diff --git a/lib/Chameleon-2.9.2/docs/conf.py b/lib/Chameleon-2.9.2/docs/conf.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/docs/conf.py
@@ -0,0 +1,194 @@
+# -*- coding: utf-8 -*-
+#
+# Chameleon documentation build configuration file, created by
+# sphinx-quickstart on Sun Nov  1 16:08:00 2009.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.append(os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Chameleon'
+copyright = u'2008-2011 by Malthe Borch and the Repoze Community'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '2.8'
+# The full version, including alpha/beta/rc tags.
+release = '2.8.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of documents that shouldn't be included in the build.
+#unused_docs = []
+
+# List of directories, relative to source directory, that shouldn't be searched
+# for source files.
+exclude_trees = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+html_title = "Chameleon %s documentation" % version
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bchameleonm,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_use_modindex = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = ''
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'chameleondoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'chameleon.tex', u'Chameleon Documentation',
+   u'Malthe Borch et. al', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_use_modindex = True
diff --git a/lib/Chameleon-2.9.2/docs/configuration.rst b/lib/Chameleon-2.9.2/docs/configuration.rst
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/docs/configuration.rst
@@ -0,0 +1,43 @@
+Configuration
+=============
+
+Most settings can be provided as keyword-arguments to the template
+constructor classes.
+
+There are certain settings which are required at environment
+level. Acceptable values are ``"0"``, ``"1"``, or the literals
+``"true"`` or ``"false"`` (case-insensitive).
+
+General usage
+-------------
+
+The following settings are useful in general.
+
+``CHAMELEON_EAGER``
+   Parse and compile templates on instantiation.
+
+``CHAMELEON_CACHE``
+
+   When set to a file system path, the template compiler will write
+   its output to files in this directory and use it as a cache.
+
+   This not only enables you to see the compiler output, but also
+   speeds up startup.
+
+``CHAMELEON_RELOAD``
+   This setting controls the default value of the ``auto_reload``
+   parameter.
+
+Development
+-----------
+
+The following settings are mostly useful during development or
+debugging of the library itself.
+
+``CHAMELEON_DEBUG``
+
+   Enables a set of debugging settings which make it easier to
+   discover and research issues with the engine itself.
+
+   This implicitly enables auto-reload for any template.
+
diff --git a/lib/Chameleon-2.9.2/docs/index.rst b/lib/Chameleon-2.9.2/docs/index.rst
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/docs/index.rst
@@ -0,0 +1,217 @@
+Chameleon
+=========
+
+Chameleon is an HTML/XML template engine for `Python
+<http://www.python.org>`_.
+
+It's designed to generate the document output of a web application,
+typically HTML markup or XML.
+
+The language used is *page templates*, originally a `Zope
+<http://www.zope.org>`_ invention [1]_, but available here as a
+:ref:`standalone library <no-dependencies>` that you can use in any
+script or application running Python 2.5 and up (including 3.x and
+`pypy <http://pypy.org>`_). It comes with a set of :ref:`new features
+<new-features>`, too.
+
+The template engine compiles templates into Python byte-code and is optimized
+for speed. For a complex template language, the performance is
+:ref:`very good <fast>`.
+
+  *Found a bug?* Please report issues to the `issue tracker <http://github.com/malthe/chameleon/issues>`_.
+
+  *Need help?* Post to the Pylons `discussion list <http://groups.google.com/group/pylons-discuss/>`_ or join the ``#pyramid`` channel on `Freenode IRC <http://freenode.net/>`_.
+
+Getting the code
+----------------
+
+You can `download <http://pypi.python.org/pypi/Chameleon#downloads>`_ the
+package from the Python package index or install the latest release
+using setuptools or the newer `distribute
+<http://packages.python.org/distribute/>`_ (required for Python 3.x)::
+
+  $ easy_install Chameleon
+
+.. _no-dependencies:
+
+There are no required library dependencies on Python 2.7 and up
+[2]_. On 2.5 and 2.6, the `ordereddict
+<http://pypi.python.org/pypi/ordereddict>`_ and `unittest2
+<http://pypi.python.org/pypi/unittest2>`_ packages are set as
+dependencies.
+
+The project is hosted in a `GitHub repository
+<http://github.com/malthe/chameleon>`_. Code contributions are
+welcome. The easiest way is to use the `pull request
+<http://help.github.com/pull-requests/>`_ interface.
+
+
+Introduction
+------------
+
+The *page templates* language is used within your document structure
+as special element attributes and text markup. Using a set of simple
+language constructs, you control the document flow, element
+repetition, text replacement and translation.
+
+.. note:: If you've used page templates in a Zope environment previously, note that Chameleon uses Python as the default expression language (instead of *path* expressions).
+
+The basic language (known as the *template attribute language* or TAL)
+is simple enough to grasp from an example:
+
+.. code-block:: genshi
+
+  <html>
+    <body>
+      <h1>Hello, ${'world'}!</h1>
+      <table>
+        <tr tal:repeat="row 'apple', 'banana', 'pineapple'">
+          <td tal:repeat="col 'juice', 'muffin', 'pie'">
+             ${row.capitalize()} ${col}
+          </td>
+        </tr>
+      </table>
+    </body>
+  </html>
+
+The ``${...}`` notation is short-hand for text insertion [3]_. The
+Python-expression inside the braces is evaluated and the result
+included in the output. By default, the string is escaped before
+insertion. To avoid this, use the ``structure:`` prefix:
+
+.. code-block:: genshi
+
+  <div>${structure: ...}</div>
+
+Note that if the expression result is an object that implements an
+``__html__()`` method [4]_, this method will be called and the result
+treated as "structure". An example of such an object is the
+``Markup`` class that's included as a utility::
+
+  from chameleon.utils import Markup
+  username = "<tt>%s</tt>" % username
+
+The macro language (known as the *macro expansion language* or METAL)
+provides a means of filling in portions of a generic template.
+
+On the left, the macro template; on the right, a template that loads
+and uses the macro, filling in the "content" slot:
+
+.. code-block:: genshi
+
+  <html xmlns="http://www.w3.org/1999/xhtml">             <metal:main use-macro="load: main.pt">
+    <head>                                                   <p metal:fill-slot="content">${structure: document.body}<p/>
+      <title>Example &mdash; ${document.title}</title>    </metal:main>
+    </head>
+    <body>
+      <h1>${document.title}</h1>
+
+      <div id="content">
+        <metal:content define-slot="content" />
+      </div>
+    </body>
+  </html>
+
+In the example, the expression type :ref:`load <load-expression>` is
+used to retrieve a template from the file system using a path relative
+to the calling template.
+
+The METAL system works with TAL such that you can for instance fill in
+a slot that appears in a ``tal:repeat`` loop, or refer to variables
+defined using ``tal:define``.
+
+The third language subset is the translation system (known as the
+*internationalization language* or I18N):
+
+.. code-block:: genshi
+
+  <html i18n:domain="example">
+
+    ...
+
+    <div i18n:translate="">
+       You have <span i18n:name="amount">${round(amount, 2)}</span> dollars in your account.
+    </div>
+
+    ...
+
+  </html>
+
+Each translation message is marked up using ``i18n:translate`` and
+values can be mapped using ``i18n:name``. Attributes are marked for
+translation using ``i18n:attributes``. The template engine generates
+`gettext <http://www.gnu.org/s/gettext/>`_ translation strings from
+the markup::
+
+  "You have ${amount} dollars in your account."
+
+If you use a web framework such as `Pyramid
+<https://docs.pylonsproject.org/docs/pyramid.html>`_, the translation
+system is set up automatically and will negotiate on a *target
+language* based on the HTTP request or other parameter. If not, then
+you need to configure this manually.
+
+Next steps
+----------
+
+This was just an introduction. There are a number of other basic
+statements that you need to know in order to use the language. This is
+all covered in the :ref:`language reference <language-reference>`.
+
+If you're already familiar with the page template language, you can
+skip ahead to the :ref:`getting started <getting-started-with-cpt>`
+section to learn how to use the template engine in your code.
+
+To learn about integration with your favorite web framework see the
+section on :ref:`framework integration <framework-integration>`.
+
+License
+-------
+
+This software is made available under a BSD-like license.
+
+
+Contents
+========
+
+.. toctree::
+   :maxdepth: 2
+
+   library.rst
+   reference.rst
+   integration.rst
+   configuration.rst
+
+Indices and Tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+Notes
+=====
+
+.. [1] The template language specifications and API for the Page
+       Templates engine are based on Zope Page Templates (see in
+       particular `zope.pagetemplate
+       <http://pypi.python.org/pypi/zope.pagetemplate>`_). However,
+       the Chameleon compiler and Page Templates engine is an entirely
+       new codebase, packaged as a standalone distribution. It does
+       not require a Zope software environment.
+
+.. [2] The translation system in Chameleon is pluggable and based on
+       `gettext <http://www.gnu.org/s/gettext/>`_.
+       There is built-in support for the `zope.i18n
+       <http://pypi.python.org/pypi/zope.i18n>`_ package. If this
+       package is installed, it will be used by default. The
+       `translationstring
+       <http://pypi.python.org/pypi/translationstring>`_ package
+       offers some of the same helper and utility classes, without the
+       Zope application interface.
+
+.. [3] This syntax was taken from `Genshi <http://genshi.edgewall.org/>`_.
+
+.. [4] See the `WebHelpers
+       <https://docs.pylonsproject.org/projects/webhelpers/dev/modules/html/__init__.html>`_
+       library which provide a simple wrapper around this method.
diff --git a/lib/Chameleon-2.9.2/docs/integration.rst b/lib/Chameleon-2.9.2/docs/integration.rst
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/docs/integration.rst
@@ -0,0 +1,41 @@
+.. _framework-integration:
+
+Integration
+===========
+
+Integration with Chameleon is available for a number of popular web
+frameworks. The framework will usually provide loading mechanisms and
+translation (internationalization) configuration.
+
+Pyramid
+-------
+
+Chameleon is the default template engine for the `Pyramid
+<http://pylonsproject.org/projects/pyramid/about>`_ framework. See the
+section on `Page Templates
+<http://docs.pylonsproject.org/projects/pyramid/1.1/narr/templates.html#chameleon-zpt-templates>`_ for a complete reference.
+
+Zope 2 / Plone
+--------------
+
+Install the `five.pt <http://pypi.python.org/pypi/five.pt>`_ package
+to replace the reference template engine (globally).
+
+Zope Toolkit (ZTK)
+------------------
+
+Install the `z3c.pt <http://pypi.python.org/pypi/z3c.pt>`_ package for
+applications based on the `Zope Toolkit
+<http://docs.zope.org/zopetoolkit/>`_ (ZTK). Note that you need to
+explicit use the template classes from this package.
+
+Grok
+----
+
+Support for the `Grok <http://grok.zope.org/>`_ framework is available
+in the `grokcore.chameleon
+<http://pypi.python.org/pypi/grokcore.chameleon>`_ package.
+
+This package will setup Grok's policy for templating integration and
+associate the Chameleon template components for the ``.cpt`` template
+filename extension.
diff --git a/lib/Chameleon-2.9.2/docs/library.rst b/lib/Chameleon-2.9.2/docs/library.rst
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/docs/library.rst
@@ -0,0 +1,238 @@
+Library Documentation
+=====================
+
+This section documents the package as a Python library. To learn about
+the page template language, consult the :ref:`language reference
+<language-reference>`.
+
+.. _getting-started-with-cpt:
+
+Getting started
+---------------
+
+There are several template constructor classes available, one for each
+of the combinations *text* or *xml*, and *string* or *file*.
+
+The file-based constructor requires an absolute path. To set up a
+templates directory *once*, use the template loader class::
+
+  import os
+
+  path = os.path.dirname(__file__)
+
+  from chameleon import PageTemplateLoader
+  templates = PageTemplateLoader(os.path.join(path, "templates"))
+
+Then, to load a template relative to the provided path, use dictionary
+syntax::
+
+  template = templates['hello.pt']
+
+Alternatively, use the appropriate template class directly. Let's try
+with a string input::
+
+  from chameleon import PageTemplate
+  template = PageTemplate("<div>Hello, ${name}.</div>")
+
+All template instances are callable. Provide variables by keyword
+argument::
+
+  >>> template(name='John')
+  '<div>Hello, John.</div>'
+
+.. _fast:
+
+Performance
+-----------
+
+The template engine compiles (or *translates*) template source code
+into Python byte-code. In simple templates this yields an increase in
+performance of about 7 times in comparison to the reference
+implementation.
+
+In benchmarks for the content management system `Plone
+<http://www.plone.org>`_, switching to Chameleon yields a request to
+response improvement of 20-50%.
+
+Extension
+---------
+
+You can extend the language through the expression engine by writing
+your own expression compiler.
+
+Let's try and write an expression compiler for an expression type that
+will simply uppercase the supplied value. We'll call it ``upper``.
+
+You can write such a compiler as a closure:
+
+.. code-block:: python
+
+   import ast
+
+   def uppercase_expression(string):
+       def compiler(target, engine):
+           uppercased = self.string.uppercase()
+           value = ast.Str(uppercased)
+           return [ast.Assign(targets=[target], value=value)]
+       return compiler
+
+To make it available under a certain prefix, we'll add it to the
+expression types dictionary.
+
+.. code-block:: python
+
+   from chameleon import PageTemplate
+   PageTemplate.expression_types['upper'] = uppercase_expression
+
+Alternatively, you could subclass the template class and set the
+attribute ``expression_types`` to a dictionary that includes your
+expression:
+
+.. code-block:: python
+
+   from chameleon import PageTemplateFile
+   from chameleon.tales import PythonExpr
+
+   class MyPageTemplateFile(PageTemplateFile):
+       expression_types = {
+           'python': PythonExpr,
+           'upper': uppercase_expression
+           }
+
+You can now uppercase strings *natively* in your templates::
+
+  <div tal:content="upper: hello, world" />
+
+It's probably best to stick with a Python expression::
+
+  <div tal:content="'hello, world'.upper()" />
+
+
+.. _whats-new:
+
+Changes between 1.x and 2.x
+---------------------------
+
+This sections describes new features, improvements and changes from
+1.x to 2.x.
+
+New parser
+~~~~~~~~~~
+
+This series features a new, custom-built parser, implemented in pure
+Python. It parses both HTML and XML inputs (the previous parser relied
+on the expat system library and was more strict about its input).
+
+The main benefit of the new parser is that the compiler is now able to
+point to the source location of parse- and compilation errors much
+more accurately. This should be a great aid in debugging these errors.
+
+Compatible output
+~~~~~~~~~~~~~~~~~
+
+The 2.x engine matches the output of the reference implementation more
+closely (usually exactly). There are less differences altogether; for
+instance, the method of escaping TALES expression (usually a
+semicolon) has been changed to match that of the reference
+implementation.
+
+New language features
+~~~~~~~~~~~~~~~~~~~~~
+
+This series also introduces a number of new language features:
+
+1. Support for the ``tal:on-error`` from the reference specification
+   has been added.
+
+2. Two new attributes ``tal:switch`` and ``tal:case`` have been added
+   to make element conditions more flexible.
+
+
+Code improvements
+~~~~~~~~~~~~~~~~~
+
+The template classes have been refactored and simplified allowing
+better reuse of code and more intuitive APIs on the lower levels.
+
+Expression engine
+~~~~~~~~~~~~~~~~~
+
+The expression engine has been redesigned to make it easier to
+understand and extend. The new engine is based on the ``ast`` module
+(available since Python 2.6; backports included for Python 2.5). This
+means that expression compilers now need to return a valid list of AST
+statements that include an assignment to the target node.
+
+Compiler
+~~~~~~~~
+
+The new compiler has been optimized for complex templates. As a
+result, in the benchmark suite included with the package, this
+compiler scores about half of the 1.x series. For most real world
+applications, the engine should still perform as well as the 1.x
+series.
+
+
+API reference
+-------------
+
+This section describes the documented API of the library.
+
+Template classes
+~~~~~~~~~~~~~~~~
+
+Use the ``PageTemplate*`` template classes to define a template from a
+string or file input:
+
+.. automodule:: chameleon
+
+  .. autoclass:: chameleon.PageTemplate
+
+     Note: The remaining classes take the same general configuration
+     arguments.
+
+     .. automethod:: render
+
+  .. autoclass:: chameleon.PageTemplateFile(filename, **config)
+
+  .. autoclass:: chameleon.PageTextTemplate
+
+  .. autoclass:: chameleon.PageTextTemplateFile
+
+Template loader
+~~~~~~~~~~~~~~~
+
+Some systems have framework support for loading templates from
+files. The following loader class is directly compatible with the
+Pylons framework and may be adapted to other frameworks:
+
+.. class:: chameleon.PageTemplateLoader(search_path=None, default_extension=None, **config)
+
+   Load templates from ``search_path`` (must be a string or a list of
+   strings)::
+
+     templates = PageTemplateLoader(path)
+     example = templates['example.pt']
+
+   If ``default_extension`` is provided, this will be added to inputs
+   that do not already have an extension::
+
+     templates = PageTemplateLoader(path, ".pt")
+     example = templates['example']
+
+   Any additional keyword arguments will be passed to the template
+   constructor::
+
+     templates = PageTemplateLoader(path, debug=True, encoding="utf-8")
+
+   .. automethod:: load
+
+Expression engine
+~~~~~~~~~~~~~~~~~
+
+For advanced integration, the compiler module provides support for
+dynamic expression evaluation:
+
+.. automodule:: chameleon.compiler
+
+  .. autoclass:: chameleon.compiler.ExpressionEvaluator
diff --git a/lib/Chameleon-2.9.2/docs/reference.rst b/lib/Chameleon-2.9.2/docs/reference.rst
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/docs/reference.rst
@@ -0,0 +1,1695 @@
+:tocdepth: 4
+
+.. _language-reference:
+
+.. highlight:: xml
+
+Language Reference
+==================
+
+The language reference is structured such that it can be read as a
+general introduction to the *page templates* language.
+
+It's split into parts that correspond to each of the main language
+features.
+
+Syntax
+######
+
+You can safely :ref:`skip this section <tal>` if you're familiar with
+how template languages work or just want to learn by example.
+
+An *attribute language* is a programming language designed to render
+documents written in XML or HTML markup.  The input must be a
+well-formed document.  The output from the template is usually
+XML-like but isn't required to be well-formed.
+
+The statements of the language are document tags with special
+attributes, and look like this::
+
+    <p namespace-prefix:command="argument"> ... </p>
+
+In the above example, the attribute
+``namespace-prefix:command="argument"`` is the statement, and the
+entire paragraph tag is the statement's element.  The statement's
+element is the portion of the document on which this statement
+operates.
+
+The namespace prefixes are typically declared once, at the top of a
+template (note that prefix declarations for the template language
+namespaces are omitted from the template output)::
+
+  <html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:tal="http://xml.zope.org/namespaces/tal"
+        xmlns:metal="http://xml.zope.org/namespaces/metal"
+        xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+    ...
+  </html>
+
+Thankfully, sane namespace prefix defaults are in place to let us skip
+most of the boilerplate::
+
+  <html xmlns="http://www.w3.org/1999/xhtml">
+    <body>
+      <p tal:content="text"> ... </p>
+    </body>
+  </html>
+
+Note how ``tal`` is used without an explicit namespace
+declaration. Chameleon sets up defaults for ``metal`` and ``i18n`` as
+well.
+
+.. note:: Default prefixes are a special feature of Chameleon.
+
+.. _tal:
+
+Basics (TAL)
+############
+
+The *template attribute language* is used to create dynamic XML-like
+content.  It allows elements of a document to be replaced, repeated,
+or omitted.
+
+Statements
+----------
+
+These are the available statements:
+
+==================  ==============
+ Statement           Description
+==================  ==============
+``tal:define``      Define variables.
+``tal:switch``      Defines a switch condition
+``tal:condition``   Include element only if expression is true.
+``tal:repeat``      Repeat an element.
+``tal:case``        Includes element only if expression is equal to parent switch.
+``tal:content``     Substitute the content of an element.
+``tal:replace``     Replace the element with dynamic content.
+``tal:omit-tag``    Omit the element tags, leaving only the inner content.
+``tal:attributes``  Dynamically change or insert element attributes.
+``tal:on-error``    Substitute the content of an element if processing fails.
+==================  ==============
+
+When there is only one TAL statement per element, the order in which
+they are executed is simple.  Starting with the root element, each
+element's statements are executed, then each of its child elements is
+visited, in order, to do the same::
+
+  <html>
+    <meta>
+      <title tal:content="context.title" />
+    </meta>
+    <body>
+      <div tal:condition="items">
+        <p>These are your items:</p>
+        <ul>
+          <li tal:repeat="item items" tal:content="item" />
+        </ul>
+      </div>
+    </body>
+  </html>
+
+Any combination of statements may appear on the same element, except
+that the ``tal:content`` and ``tal:replace`` statements may not be
+used on the same element.
+
+.. note:: The ``tal:case`` and ``tal:switch`` statements are available
+          in Chameleon only.
+
+TAL does not use use the order in which statements are written in the
+tag to determine the order in which they are executed.  When an
+element has multiple statements, they are executed in the order
+printed in the table above.
+
+There is a reasoning behind this ordering.  Because users often want
+to set up variables for use in other statements contained within this
+element or subelements, ``tal:define`` is executed first. Then any
+switch statement. ``tal:condition`` follows, then ``tal:repeat``, then
+``tal:case``. We are now rendering an element; first ``tal:content``
+or ``tal:replace``. Finally, before ``tal:attributes``, we have
+``tal:omit-tag`` (which is implied with ``tal:replace``).
+
+.. note:: *TALES* is used as the expression language for the "stuff in
+   the quotes". The default syntax is simply Python, but
+   other inputs are possible --- see the section on :ref:`expressions
+   <tales>`.
+
+``tal:attributes``
+^^^^^^^^^^^^^^^^^^
+
+Updates or inserts element attributes.
+
+::
+
+  tal:attributes="href request.url"
+
+Syntax
+~~~~~~
+
+``tal:attributes`` syntax::
+
+    argument             ::= attribute_statement [';' attribute_statement]*
+    attribute_statement  ::= attribute_name expression
+    attribute_name       ::= [namespace-prefix ':'] Name
+    namespace-prefix     ::= Name
+
+
+Description
+~~~~~~~~~~~
+
+The ``tal:attributes`` statement replaces the value of an attribute
+(or creates an attribute) with a dynamic value.  The
+value of each expression is converted to a string, if necessary.
+
+.. note:: You can qualify an attribute name with a namespace prefix,
+   for example ``html:table``, if you are generating an XML document
+   with multiple namespaces.
+
+If an attribute expression evaluates to ``None``, the attribute is
+deleted from the statement element (or simply not inserted).
+
+If the expression evaluates to the symbol ``default`` (a symbol which
+is always available when evaluating attributes), its value is defined
+as the default static attribute value. If there is no such default
+value, a return value of ``default`` will drop the attribute.
+
+If you use ``tal:attributes`` on an element with an active
+``tal:replace`` command, the ``tal:attributes`` statement is ignored.
+
+If you use ``tal:attributes`` on an element with a ``tal:repeat``
+statement, the replacement is made on each repetition of the element,
+and the replacement expression is evaluated fresh for each repetition.
+
+.. note:: If you want to include a semicolon (";") in an expression, it
+          must be escaped by doubling it (";;") [1]_.
+
+Examples
+~~~~~~~~
+
+Replacing a link::
+
+    <a href="/sample/link.html"
+       tal:attributes="href context.url()"
+       >
+       ...
+    </a>
+
+Replacing two attributes::
+
+    <textarea rows="80" cols="20"
+              tal:attributes="rows request.rows();cols request.cols()"
+        />
+
+A checkbox input::
+
+    <input type="input" tal:attributes="checked True" />
+
+``tal:condition``
+^^^^^^^^^^^^^^^^^
+
+Conditionally includes or omits an element::
+
+  <div tal:condition="comments">
+    ...
+  </div>
+
+Syntax
+~~~~~~
+
+``tal:condition`` syntax::
+
+    argument ::= expression
+
+Description
+~~~~~~~~~~~
+
+ The ``tal:condition`` statement includes the statement element in the
+ template only if the condition is met, and omits it otherwise.  If
+ its expression evaluates to a *true* value, then normal processing of
+ the element continues, otherwise the statement element is immediately
+ removed from the template.  For these purposes, the value ``nothing``
+ is false, and ``default`` has the same effect as returning a true
+ value.
+
+.. note:: Like Python itself, ZPT considers None, zero, empty strings,
+   empty sequences, empty dictionaries, and instances which return a
+   nonzero value from ``__len__`` or ``__nonzero__`` false; all other
+   values are true, including ``default``.
+
+Examples
+~~~~~~~~
+
+Test a variable before inserting it::
+
+        <p tal:condition="request.message" tal:content="request.message" />
+
+Testing for odd/even in a repeat-loop::
+
+        <div tal:repeat="item range(10)">
+          <p tal:condition="repeat.item.even">Even</p>
+          <p tal:condition="repeat.item.odd">Odd</p>
+        </div>
+
+``tal:content``
+^^^^^^^^^^^^^^^
+
+Replaces the content of an element.
+
+Syntax
+~~~~~~
+
+``tal:content`` syntax::
+
+        argument ::= (['text'] | 'structure') expression
+
+Description
+~~~~~~~~~~~
+
+Rather than replacing an entire element, you can insert text or
+structure in place of its children with the ``tal:content`` statement.
+The statement argument is exactly like that of ``tal:replace``, and is
+interpreted in the same fashion.  If the expression evaluates to
+``nothing``, the statement element is left childless.  If the
+expression evaluates to ``default``, then the element's contents are
+evaluated.
+
+The default replacement behavior is ``text``, which replaces
+angle-brackets and ampersands with their HTML entity equivalents.  The
+``structure`` keyword passes the replacement text through unchanged,
+allowing HTML/XML markup to be inserted.  This can break your page if
+the text contains unanticipated markup (eg.  text submitted via a web
+form), which is the reason that it is not the default.
+
+.. note:: The ``structure`` keyword exists to provide backwards
+          compatibility.  In Chameleon, the ``structure:`` expression
+          type provides the same functionality (also for inline
+          expressions).
+
+
+Examples
+~~~~~~~~
+
+Inserting the user name::
+
+        <p tal:content="user.getUserName()">Fred Farkas</p>
+
+Inserting HTML/XML::
+
+        <p tal:content="structure context.getStory()">
+           Marked <b>up</b> content goes here.
+        </p>
+
+``tal:define``
+^^^^^^^^^^^^^^
+
+Defines local variables.
+
+Syntax
+~~~~~~
+
+``tal:define`` syntax::
+
+    argument ::= define_scope [';' define_scope]*
+    define_scope ::= (['local'] | 'global')
+    define_var define_var ::= variable_name
+    expression variable_name ::= Name
+
+Description
+~~~~~~~~~~~
+
+The ``tal:define`` statement defines variables.  When you define a
+local variable in a statement element, you can use that variable in
+that element and the elements it contains.  If you redefine a variable
+in a contained element, the new definition hides the outer element's
+definition within the inner element.
+
+Note that valid variable names are any Python identifier string
+including underscore, although two or more leading underscores are
+disallowed (used internally by the compiler). Further, names are
+case-sensitive.
+
+Python builtins are always "in scope", but most of them may be
+redefined (such as ``help``). Exceptions are:: ``float``, ``int``,
+``len``, ``long``, ``str``, ``None``, ``True`` and ``False``.
+
+In addition, the following names are reserved: ``econtext``,
+``rcontext``, ``translate``, ``decode`` and ``convert``.
+
+If the expression associated with a variable evaluates to ``nothing``,
+then that variable has the value ``nothing``, and may be used as such
+in further expressions. Likewise, if the expression evaluates to
+``default``, then the variable has the value ``default``, and may be
+used as such in further expressions.
+
+You can define two different kinds of variables: *local* and
+*global*. When you define a local variable in a statement element, you
+can only use that variable in that element and the elements it
+contains. If you redefine a local variable in a contained element, the
+new definition hides the outer element's definition within the inner
+element. When you define a global variables, you can use it in any
+element processed after the defining element. If you redefine a global
+variable, you replace its definition for the rest of the template.
+
+To set the definition scope of a variable, use the keywords ``local``
+or ``global`` in front of the assignment. The default setting is
+``local``; thus, in practice, only the ``global`` keyword is used.
+
+.. note:: If you want to include a semicolon (";") in an expression, it
+          must be escaped by doubling it (";;") [1]_.
+
+Examples
+~~~~~~~~
+
+Defining a variable::
+
+        tal:define="company_name 'Zope Corp, Inc.'"
+
+Defining two variables, where the second depends on the first::
+
+        tal:define="mytitle context.title; tlen len(mytitle)"
+
+
+``tal:switch`` and ``tal:case``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Defines a switch clause.
+
+::
+
+  <ul tal:switch="len(items) % 2">
+    <li tal:case="True">odd</li>
+    <li tal:case="False">even</li>
+  </ul>
+
+Syntax
+~~~~~~
+
+``tal:case`` and ``tal:switch`` syntax::
+
+    argument ::= expression
+
+Description
+~~~~~~~~~~~
+
+The *switch* and *case* construct is a short-hand syntax for
+evaluating a set of expressions against a parent value.
+
+The ``tal:switch`` statement is used to set a new parent value and the
+``tal:case`` statement works like a condition and only allows content
+if the expression matches the value.
+
+Note that if the case expression is the symbol ``default``, it always
+matches the switch.
+
+.. note:: These statements are only available in Chameleon 2.x and not
+          part of the ZPT specification.
+
+Examples
+~~~~~~~~
+
+::
+
+  <ul tal:switch="item.type">
+    <li tal:case="'document'">
+      Document
+    </li>
+    <li tal:case="'folder'">
+      Folder
+    </li>
+  </ul>
+
+Note that any and all cases that match the switch will be included.
+
+
+``tal:omit-tag``
+^^^^^^^^^^^^^^^^
+
+Removes an element, leaving its contents.
+
+Syntax
+~~~~~~
+
+``tal:omit-tag`` syntax::
+
+        argument ::= [ expression ]
+
+Description
+~~~~~~~~~~~
+
+The ``tal:omit-tag`` statement leaves the contents of an element in
+place while omitting the surrounding start and end tags.
+
+If the expression evaluates to a *false* value, then normal processing
+of the element continues and the tags are not omitted.  If the
+expression evaluates to a *true* value, or no expression is provided,
+the statement element is replaced with its contents.
+
+.. note:: Like Python itself, ZPT considers None, zero, empty strings,
+   empty sequences, empty dictionaries, and instances which return a
+   nonzero value from ``__len__`` or ``__nonzero__`` false; all other
+   values are true, including ``default``.
+
+Examples
+~~~~~~~~
+
+Unconditionally omitting a tag::
+
+        <div tal:omit-tag="" comment="This tag will be removed">
+          <i>...but this text will remain.</i>
+        </div>
+
+Conditionally omitting a tag::
+
+        <b tal:omit-tag="not:bold">I may be bold.</b>
+
+The above example will omit the ``b`` tag if the variable ``bold`` is false.
+
+Creating ten paragraph tags, with no enclosing tag::
+
+        <span tal:repeat="n range(10)"
+              tal:omit-tag="">
+          <p tal:content="n">1</p>
+        </span>
+
+.. _tal_repeat:
+
+``tal:repeat``
+^^^^^^^^^^^^^^
+
+Repeats an element.
+
+Syntax
+~~~~~~
+
+``tal:repeat`` syntax::
+
+        argument      ::= variable_name expression
+        variable_name ::= Name
+
+Description
+~~~~~~~~~~~
+
+The ``tal:repeat`` statement replicates a sub-tree of your document
+once for each item in a sequence. The expression should evaluate to a
+sequence. If the sequence is empty, then the statement element is
+deleted, otherwise it is repeated for each value in the sequence.  If
+the expression is ``default``, then the element is left unchanged, and
+no new variables are defined.
+
+The ``variable_name`` is used to define a local variable and a repeat
+variable. For each repetition, the local variable is set to the
+current sequence element, and the repeat variable is set to an
+iteration object.
+
+Repeat variables
+~~~~~~~~~~~~~~~~~
+
+You use repeat variables to access information about the current
+repetition (such as the repeat index).  The repeat variable has the
+same name as the local variable, but is only accessible through the
+built-in variable named ``repeat``.
+
+The following information is available from the repeat variable:
+
+==================  ==============
+ Attribute           Description
+==================  ==============
+``index``           Repetition number, starting from zero.
+``number``          Repetition number, starting from one.
+``even``            True for even-indexed repetitions (0, 2, 4, ...).
+``odd``             True for odd-indexed repetitions (1, 3, 5, ...).
+``start``           True for the starting repetition (index 0).
+``end``             True for the ending, or final, repetition.
+``first``           True for the first item in a group - see note below
+``last``            True for the last item in a group - see note below
+``length``          Length of the sequence, which will be the total number of repetitions.
+``letter``          Repetition number as a lower-case letter: "a" - "z", "aa" - "az", "ba" - "bz", ..., "za" - "zz", "aaa" - "aaz", and so forth.
+``Letter``          Upper-case version of *letter*.
+``roman``           Repetition number as a lower-case roman numeral: "i", "ii", "iii", "iv", "v", etc.
+``Roman``           Upper-case version of *roman*.
+==================  ==============
+
+You can access the contents of the repeat variable using either
+dictionary- or attribute-style access, e.g. ``repeat['item'].start``
+or ``repeat.item.start``.
+
+.. note:: For legacy compatibility, the attributes ``odd``, ``even``, ``number``, ``letter``, ``Letter``, ``roman``, and ``Roman`` are callable (returning ``self``).
+
+Note that ``first`` and ``last`` are intended for use with sorted
+sequences.  They try to divide the sequence into group of items with
+the same value.
+
+Examples
+~~~~~~~~
+
+Iterating over a sequence of strings::    
+
+        <p tal:repeat="txt ('one', 'two', 'three')">
+           <span tal:replace="txt" />
+        </p>
+
+Inserting a sequence of table rows, and using the repeat variable
+to number the rows::
+
+        <table>
+          <tr tal:repeat="item here.cart">
+              <td tal:content="repeat.item.number">1</td>
+              <td tal:content="item.description">Widget</td>
+              <td tal:content="item.price">$1.50</td>
+          </tr>
+        </table>
+
+Nested repeats::
+
+        <table border="1">
+          <tr tal:repeat="row range(10)">
+            <td tal:repeat="column range(10)">
+              <span tal:define="x repeat.row.number; 
+                                y repeat.column.number; 
+                                z x * y"
+                    tal:replace="string:$x * $y = $z">1 * 1 = 1</span>
+            </td>
+          </tr>
+        </table>
+
+Insert objects. Separates groups of objects by type by drawing a rule
+between them::
+
+        <div tal:repeat="object objects">
+          <h2 tal:condition="repeat.object.first.meta_type"
+            tal:content="object.type">Meta Type</h2>
+          <p tal:content="object.id">Object ID</p>
+          <hr tal:condition="object.last.meta_type" />
+        </div>
+
+.. note:: the objects in the above example should already be sorted by
+   type.
+
+``tal:replace``
+^^^^^^^^^^^^^^^
+
+Replaces an element.
+
+Syntax
+~~~~~~
+
+``tal:replace`` syntax::
+
+        argument ::= ['structure'] expression
+
+Description
+~~~~~~~~~~~
+
+
+The ``tal:replace`` statement replaces an element with dynamic
+content.  It replaces the statement element with either text or a
+structure (unescaped markup). The body of the statement is an
+expression with an optional type prefix. The value of the expression
+is converted into an escaped string unless you provide the 'structure' prefix. Escaping consists of converting ``&amp;`` to
+``&amp;amp;``, ``&lt;`` to ``&amp;lt;``, and ``&gt;`` to ``&amp;gt;``.
+
+.. note:: If the inserted object provides an ``__html__`` method, that method is called with the result inserted as structure. This feature is not implemented by ZPT.
+
+If the expression evaluates to ``None``, the element is simply removed.  If the value is ``default``, then the element is left unchanged.
+
+Examples
+~~~~~~~~
+
+Inserting a title::
+
+        <span tal:replace="context.title">Title</span>
+
+Inserting HTML/XML::
+
+        <div tal:replace="structure table" />
+
+.. _tales:
+
+Expressions (TALES)
+###################
+
+The *Template Attribute Language Expression Syntax* (TALES) standard
+describes expressions that supply :ref:`tal` and
+:ref:`metal` with data.  TALES is *one* possible expression
+syntax for these languages, but they are not bound to this definition.
+Similarly, TALES could be used in a context having nothing to do with
+TAL or METAL.
+
+TALES expressions are described below with any delimiter or quote
+markup from higher language layers removed.  Here is the basic
+definition of TALES syntax::
+
+      Expression  ::= [type_prefix ':'] String
+      type_prefix ::= Name
+
+Here are some simple examples::
+
+      1 + 2
+      None
+      string:Hello, ${view.user_name}
+
+The optional *type prefix* determines the semantics and syntax of the
+*expression string* that follows it.  A given implementation of TALES
+can define any number of expression types, with whatever syntax you
+like. It also determines which expression type is indicated by
+omitting the prefix.
+
+Types
+-----
+
+These are the available TALES expression types:
+
+=============  ==============
+ Prefix        Description
+=============  ==============
+``exists``     Evaluate the result inside an exception handler; if one of the exceptions ``AttributeError``, ``LookupError``, ``TypeError``, ``NameError``, or ``KeyError`` is raised during evaluation, the result is ``False``, otherwise ``True``. Note that the original result is discarded in any case.
+``import``     Import a global symbol using dotted notation.
+``load``       Load a template relative to the current template or absolute.
+``not``        Negate the expression result
+``python``     Evaluate a Python expression
+``string``     Format a string
+``structure``  Wraps the expression result as *structure*.
+=============  ==============
+
+.. note:: The default expression type is ``python``.
+
+.. warning:: The Zope reference engine defaults to a ``path``
+             expression type, which is closely tied to the Zope
+             framework. This expression is not implemented in
+             Chameleon (but it's available in a Zope framework
+             compatibility package).
+
+There's a mechanism to allow fallback to alternative expressions, if
+one should fail (raise an exception). The pipe character ('|') is used
+to separate two expressions::
+
+  <div tal:define="page request.GET['page'] | 0">
+
+This mechanism applies only to the ``python`` expression type, and by
+derivation ``string``.
+
+.. _tales_built_in_names:
+
+``python``
+^^^^^^^^^^
+
+Evaluates a Python expression.
+
+Syntax
+~~~~~~
+
+Python expression syntax::
+
+        Any valid Python language expression
+
+Description
+~~~~~~~~~~~
+
+Python expressions are executed natively within the translated
+template source code. There is no built-in security apparatus.
+
+``string``
+^^^^^^^^^^
+
+Syntax
+~~~~~~
+
+String expression syntax::
+
+        string_expression ::= ( plain_string | [ varsub ] )*
+        varsub            ::= ( '$' Variable ) | ( '${ Expression }' )
+        plain_string      ::= ( '$$' | non_dollar )*
+        non_dollar        ::= any character except '$'
+
+Description
+~~~~~~~~~~~
+
+String expressions interpret the expression string as text. If no
+expression string is supplied the resulting string is *empty*. The
+string can contain variable substitutions of the form ``$name`` or
+``${expression}``, where ``name`` is a variable name, and ``expression`` is a TALES-expression. The escaped string value of the expression is inserted into the string.
+
+.. note:: To prevent a ``$`` from being interpreted this
+   way, it must be escaped as ``$$``.
+
+Examples
+~~~~~~~~
+
+Basic string formatting::
+
+    <span tal:replace="string:$this and $that">
+      Spam and Eggs
+    </span>
+
+    <p tal:content="string:${request.form['total']}">
+      total: 12
+    </p>
+
+Including a dollar sign::
+
+    <p tal:content="string:$$$cost">
+      cost: $42.00
+    </p>
+
+.. _import-expression:
+
+``import``
+^^^^^^^^^^
+
+Imports a module global.
+
+.. _structure-expression:
+
+``structure``
+^^^^^^^^^^^^^
+
+Wraps the expression result as *structure*: The replacement text is
+inserted into the document without escaping, allowing HTML/XML markup
+to be inserted.  This can break your page if the text contains
+unanticipated markup (eg.  text submitted via a web form), which is
+the reason that it is not the default.
+
+.. _load-expression:
+
+``load``
+^^^^^^^^
+
+Loads a template instance.
+
+Syntax
+~~~~~~
+
+Load expression syntax::
+
+         Relative or absolute file path
+
+Description
+~~~~~~~~~~~
+
+The template will be loaded using the same template class as the
+calling template.
+
+Examples
+~~~~~~~~
+
+Loading a template and using it as a macro::
+
+  <div tal:define="master load: ../master.pt" metal:use-macro="master" />
+
+
+Built-in names
+--------------
+
+These are the names always available in the TALES expression namespace:
+
+- ``default`` - special value used to specify that existing text or attributes should not be replaced. See the documentation for individual TAL statements for details on how they interpret *default*.
+
+- ``repeat`` - the *repeat* variables; see :ref:`tal_repeat` for more
+  information.
+
+- ``template`` - reference to the template which was first called; this symbol is carried over when using macros.
+
+- ``macros`` - reference to the macros dictionary that corresponds to the current template.
+
+
+.. _metal:
+
+Macros (METAL)
+##############
+
+The *Macro Expansion Template Attribute Language* (METAL) standard is
+a facility for HTML/XML macro preprocessing. It can be used in
+conjunction with or independently of TAL and TALES.
+
+Macros provide a way to define a chunk of presentation in one
+template, and share it in others, so that changes to the macro are
+immediately reflected in all of the places that share it.
+Additionally, macros are always fully expanded, even in a template's
+source text, so that the template appears very similar to its final
+rendering.
+
+A single Page Template can accomodate multiple macros.
+
+Namespace
+---------
+
+The METAL namespace URI and recommended alias are currently defined
+as::
+
+        xmlns:metal="http://xml.zope.org/namespaces/metal"
+
+Just like the TAL namespace URI, this URI is not attached to a web
+page; it's just a unique identifier.  This identifier must be used in
+all templates which use METAL.
+
+Statements
+----------
+
+METAL defines a number of statements:
+
+* ``metal:define-macro`` Define a macro.
+* ``metal:use-macro`` Use a macro.
+* ``metal:extend-macro`` Extend a macro.
+* ``metal:define-slot`` Define a macro customization point.
+* ``metal:fill-slot`` Customize a macro.
+
+Although METAL does not define the syntax of expression non-terminals,
+leaving that up to the implementation, a canonical expression syntax
+for use in METAL arguments is described in TALES Specification.
+
+``define-macro``
+^^^^^^^^^^^^^^^^
+
+Defines a macro.
+
+Syntax
+~~~~~~
+
+``metal:define-macro`` syntax::
+
+        argument ::= Name
+
+Description
+~~~~~~~~~~~
+
+The ``metal:define-macro`` statement defines a macro. The macro is named
+by the statement expression, and is defined as the element and its
+sub-tree.
+
+Examples
+~~~~~~~~
+
+Simple macro definition::
+
+        <p metal:define-macro="copyright">
+          Copyright 2011, <em>Foobar</em> Inc.
+        </p>
+
+``define-slot``
+^^^^^^^^^^^^^^^
+
+Defines a macro customization point.
+
+Syntax
+~~~~~~
+
+``metal:define-slot`` syntax::
+
+        argument ::= Name
+
+Description
+~~~~~~~~~~~
+
+The ``metal:define-slot`` statement defines a macro customization
+point or *slot*. When a macro is used, its slots can be replaced, in
+order to customize the macro. Slot definitions provide default content
+for the slot. You will get the default slot contents if you decide not
+to customize the macro when using it.
+
+The ``metal:define-slot`` statement must be used inside a
+``metal:define-macro`` statement.
+
+Slot names must be unique within a macro.
+
+Examples
+~~~~~~~~
+
+Simple macro with slot::
+
+        <p metal:define-macro="hello">
+          Hello <b metal:define-slot="name">World</b>
+        </p>
+
+This example defines a macro with one slot named ``name``. When you use
+this macro you can customize the ``b`` element by filling the ``name``
+slot.
+
+``fill-slot``
+^^^^^^^^^^^^^
+
+Customize a macro.
+
+Syntax
+~~~~~~
+
+``metal:fill-slot`` syntax::
+
+        argument ::= Name
+
+Description
+~~~~~~~~~~~
+
+The ``metal:fill-slot`` statement customizes a macro by replacing a
+*slot* in the macro with the statement element (and its content).
+
+The ``metal:fill-slot`` statement must be used inside a
+``metal:use-macro`` statement.
+
+Slot names must be unique within a macro.
+
+If the named slot does not exist within the macro, the slot
+contents will be silently dropped.
+
+Examples
+~~~~~~~~
+
+Given this macro::
+
+        <p metal:define-macro="hello">
+          Hello <b metal:define-slot="name">World</b>
+        </p>
+
+You can fill the ``name`` slot like so::
+
+        <p metal:use-macro="container['master.html'].macros.hello">
+          Hello <b metal:fill-slot="name">Kevin Bacon</b>
+        </p>
+
+``use-macro``
+^^^^^^^^^^^^^
+
+Use a macro.
+
+Syntax
+~~~~~~
+
+``metal:use-macro`` syntax::
+
+        argument ::= expression
+
+Description
+~~~~~~~~~~~
+
+The ``metal:use-macro`` statement replaces the statement element with
+a macro. The statement expression describes a macro definition.
+
+.. note:: In Chameleon the expression may point to a template instance; in this case it will be rendered in its entirety.
+
+``extend-macro``
+^^^^^^^^^^^^^^^^
+
+Extends a macro.
+
+Syntax
+~~~~~~
+
+``metal:extend-macro`` syntax::
+
+        argument ::= expression
+
+Description
+~~~~~~~~~~~
+
+To extend an existing macro, choose a name for the macro and add a
+define-macro attribute to a document element with the name as the
+argument. Add an extend-macro attribute to the document element with
+an expression referencing the base macro as the argument. The
+extend-macro must be used in conjunction with define-macro, and must
+not be used with use-macro. The element's subtree is the macro
+body.
+
+Examples
+~~~~~~~~
+
+::
+
+        <div metal:define-macro="page-header"
+             metal:extend-macro="standard_macros['page-header']">
+          <div metal:fill-slot="breadcrumbs">
+            You are here:
+            <div metal:define-slot="breadcrumbs"/>
+          </div>
+        </div>
+
+
+.. _i18n:
+
+Translation (I18N)
+##################
+
+Translation of template contents and attributes is supported via the
+``i18n`` namespace and message objects.
+
+Messages
+--------
+
+The translation machinery defines a message as *any object* which is
+not a string or a number and which does not provide an ``__html__``
+method.
+
+When any such object is inserted into the template, the translate
+function is invoked first to see if it needs translation. The result
+is always coerced to a native string before it's inserted into the
+template.
+
+Translation function
+--------------------
+
+The simplest way to hook into the translation machinery is to provide
+a translation function to the template constructor or at
+render-time. In either case it should be passed as the keyword
+argument ``translate``.
+
+The function has the following signature:
+
+.. code-block:: python
+
+   def translate(msgid, domain=None, mapping=None, context=None, target_language=None, default=None):
+       ...
+
+The result should be a string or ``None``. If another type of object
+is returned, it's automatically coerced into a string.
+
+If `zope.i18n <http://pypi.python.org/pypi/zope.i18n>`_ is available,
+the translation machinery defaults to using its translation
+function. Note that this function requires messages to conform to the
+message class from `zope.i18nmessageid
+<http://pypi.python.org/pypi/zope.i18nmessageid>`_; specifically,
+messages must have attributes ``domain``, ``mapping`` and
+``default``. Example use:
+
+.. code-block:: python
+
+   from zope.i18nmessageid import MessageFactory
+   _ = MessageFactory("food")
+
+   apple = _(u"Apple")
+
+There's currently no further support for other translation frameworks.
+
+Using Zope's translation framework
+-----------------------------------
+
+The translation function from ``zope.i18n`` relies on *translation
+domains* to provide translations.
+
+These are components that are registered for some translation domain
+identifier and which implement a ``translate`` method that translates
+messages for that domain.
+
+.. note:: To register translation domain components, the Zope Component Architecture must be used (see `zope.component <http://pypi.python.org/pypi/zope.component>`_).
+
+The easiest way to configure translation domains is to use the the
+``registerTranslations`` ZCML-directive; this requires the use of the
+`zope.configuration <http://pypi.python.org/pypi/zope.configuration>`_
+package. This will set up translation domains and gettext catalogs
+automatically:
+
+.. code-block:: xml
+
+  <configure xmlns="http://namespaces.zope.org/zope"
+             xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+
+     <i18n:registerTranslations directory="locales" />
+
+  </configure>
+
+The ``./locales`` directory must follow a particular directory
+structure:
+
+.. code-block:: bash
+
+  ./locales/en/LC_MESSAGES
+  ./locales/de/LC_MESSAGES
+  ...
+
+In each of the ``LC_MESSAGES`` directories, one `GNU gettext
+<http://en.wikipedia.org/wiki/GNU_gettext>`_ file in the ``.po``
+format must be present per translation domain:
+
+.. code-block:: po
+
+  # ./locales/de/LC_MESSAGES/food.po
+
+  msgid ""
+  msgstr ""
+  "MIME-Version: 1.0\n"
+  "Content-Type: text/plain; charset=UTF-8\n"
+  "Content-Transfer-Encoding: 8bit\n"
+
+  msgid "Apple"
+  msgstr "Apfel"
+
+It may be necessary to compile the message catalog using the
+``msgfmt`` utility. This will produce a ``.mo`` file.
+
+Translation domains without gettext
+-----------------------------------
+
+The following example demonstrates how to manually set up and
+configure a translation domain for which messages are provided
+directly::
+
+  from zope import component
+  from zope.i18n.simpletranslationdomain import SimpleTranslationDomain
+
+  food = SimpleTranslationDomain("food", {
+      ('de', u'Apple'): u'Apfel',
+      })
+
+  component.provideUtility(food, food.domain)
+
+An example of a custom translation domain class::
+
+  from zope import interface
+
+  class TranslationDomain(object):
+       interface.implements(ITranslationDomain)
+
+       def translate(self, msgid, mapping=None, context=None,
+                    target_language=None, default=None):
+
+           ...
+
+  component.provideUtility(TranslationDomain(), name="custom")
+
+This approach can be used to integrate other translation catalog
+implementations.
+
+.. highlight:: xml
+
+Namespace
+---------
+
+The ``i18n`` namespace URI and recommended prefix are currently
+defined as::
+
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+
+This is not a URL, but merely a unique identifier.  Do not expect a
+browser to resolve it successfully.
+
+Statements
+----------
+
+The allowable ``i18n`` statements are:
+
+- ``i18n:translate``
+- ``i18n:domain``
+- ``i18n:source``
+- ``i18n:target``
+- ``i18n:name``
+- ``i18n:attributes``
+- ``i18n:data``
+
+``i18n:translate``
+^^^^^^^^^^^^^^^^^^
+
+This attribute is used to mark units of text for translation.  If this
+attribute is specified with an empty string as the value, the message
+ID is computed from the content of the element bearing this attribute.
+Otherwise, the value of the element gives the message ID.
+
+``i18n:domain``
+^^^^^^^^^^^^^^^
+
+The ``i18n:domain`` attribute is used to specify the domain to be used
+to get the translation.  If not specified, the translation services
+will use a default domain.  The value of the attribute is used
+directly; it is not a TALES expression.
+
+``i18n:source``
+^^^^^^^^^^^^^^^
+
+The ``i18n:source`` attribute specifies the language of the text to be
+translated.  The default is ``nothing``, which means we don't provide
+this information to the translation services.
+
+
+``i18n:target``
+^^^^^^^^^^^^^^^
+
+The ``i18n:target`` attribute specifies the language of the
+translation we want to get.  If the value is ``default``, the language
+negotiation services will be used to choose the destination language.
+If the value is ``nothing``, no translation will be performed; this
+can be used to suppress translation within a larger translated unit.
+Any other value must be a language code.
+
+The attribute value is a TALES expression; the result of evaluating
+the expression is the language code or one of the reserved values.
+
+.. note:: ``i18n:target`` is primarily used for hints to text
+   extraction tools and translation teams.  If you had some text that
+   should only be translated to e.g. German, then it probably
+   shouldn't be wrapped in an ``i18n:translate`` span.
+
+``i18n:name``
+^^^^^^^^^^^^^
+
+Name the content of the current element for use in interpolation
+within translated content.  This allows a replaceable component in
+content to be re-ordered by translation.  For example::
+
+    <span i18n:translate=''>
+      <span tal:replace='context.name' i18n:name='name' /> was born in
+      <span tal:replace='context.country_of_birth' i18n:name='country' />.
+    </span>
+
+would cause this text to be passed to the translation service::
+
+    "${name} was born in ${country}."
+
+``i18n:attributes``
+^^^^^^^^^^^^^^^^^^^
+
+This attribute will allow us to translate attributes of HTML tags,
+such as the ``alt`` attribute in the ``img`` tag. The
+``i18n:attributes`` attribute specifies a list of attributes to be
+translated with optional message IDs for each; if multiple attribute
+names are given, they must be separated by semicolons.  Message IDs
+used in this context must not include whitespace.
+
+Note that the value of the particular attributes come either from the
+HTML attribute value itself or from the data inserted by
+``tal:attributes``.
+
+If an attibute is to be both computed using ``tal:attributes`` and
+translated, the translation service is passed the result of the TALES
+expression for that attribute.
+
+An example::
+
+    <img src="http://foo.com/logo" alt="Visit us"
+         tal:attributes="alt context.greeting"
+         i18n:attributes="alt"
+         >
+
+In this example, we let ``tal:attributes`` set the value of the ``alt``
+attribute to the text "Stop by for a visit!".  This text will be
+passed to the translation service, which uses the result of language
+negotiation to translate "Stop by for a visit!" into the requested
+language.  The example text in the template, "Visit us", will simply
+be discarded.
+
+Another example, with explicit message IDs::
+
+    <img src="../icons/uparrow.png" alt="Up"
+         i18n:attributes="src up-arrow-icon; alt up-arrow-alttext"
+         >
+
+Here, the message ID ``up-arrow-icon`` will be used to generate the
+link to an icon image file, and the message ID 'up-arrow-alttext' will
+be used for the "alt" text.
+
+``i18n:data``
+^^^^^^^^^^^^^
+
+Since TAL always returns strings, we need a way in ZPT to translate
+objects, one of the most obvious cases being ``datetime`` objects. The
+``data`` attribute will allow us to specify such an object, and
+``i18n:translate`` will provide us with a legal format string for that
+object.  If ``data`` is used, ``i18n:translate`` must be used to give
+an explicit message ID, rather than relying on a message ID computed
+from the content.
+
+Relation with TAL processing
+----------------------------
+
+The attributes defined in the ``i18n`` namespace modify the behavior
+of the TAL interpreter for the ``tal:attributes``, ``tal:content``,
+``tal:repeat``, and ``tal:replace`` attributes, but otherwise do not
+affect TAL processing.
+
+Since these attributes only affect TAL processing by causing
+translations to occur at specific times, using these with a TAL
+processor which does not support the ``i18n`` namespace degrades well;
+the structural expectations for a template which uses the ``i18n``
+support is no different from those for a page which does not.  The
+only difference is that translations will not be performed in a legacy
+processor.
+
+Relation with METAL processing
+-------------------------------
+
+When using translation with METAL macros, the internationalization
+context is considered part of the specific documents that page
+components are retrieved from rather than part of the combined page.
+This makes the internationalization context lexical rather than
+dynamic, making it easier for a site builder to understand the
+behavior of each element with respect to internationalization.
+
+Let's look at an example to see what this means::
+
+    <html i18n:translate='' i18n:domain='EventsCalendar'
+          metal:use-macro="container['master.html'].macros.thismonth">
+
+      <div metal:fill-slot='additional-notes'>
+        <ol tal:condition="context.notes">
+          <li tal:repeat="note context.notes">
+             <tal:block tal:omit-tag=""
+                        tal:condition="note.heading">
+               <strong tal:content="note.heading">
+                 Note heading goes here
+               </strong>
+               <br />
+             </tal:block>
+             <span tal:replace="note/description">
+               Some longer explanation for the note goes here.
+             </span>
+          </li>
+        </ol>
+      </div>
+
+    </html>
+
+And the macro source::
+
+    <html i18n:domain='CalendarService'>
+      <div tal:replace='python:DateTime().Month()'
+           i18n:translate=''>January</div>
+
+      <!-- really hairy TAL code here ;-) -->
+
+      <div define-slot="additional-notes">
+        Place for the application to add additional notes if desired.
+      </div>
+
+    </html>
+
+Note that the macro is using a different domain than the application
+(which it should be).  With lexical scoping, no special markup needs
+to be applied to cause the slot-filler in the application to be part
+of the same domain as the rest of the application's page components.
+If dynamic scoping were used, the internationalization context would
+need to be re-established in the slot-filler.
+
+
+Extracting translatable message
+-------------------------------
+
+Translators use `PO files
+<http://www.gnu.org/software/hello/manual/gettext/PO-Files.html>`_
+when translating messages. To create and update PO files you need to
+do two things: *extract* all messages from python and templates files
+and store them in a ``.pot`` file, and for each language *update* its
+``.po`` file.  Chameleon facilitates this by providing extractors for
+`Babel <http://babel.edgewall.org/>`_.  To use this you need modify
+``setup.py``. For example:
+
+.. code-block:: python
+
+   from setuptools import setup
+
+   setup(name="mypackage",
+         install_requires = [
+               "Babel",
+               ],
+         message_extractors = { "src": [
+               ("**.py",   "chameleon_python", None ),
+               ("**.pt",   "chameleon_xml", None ),
+               ]},
+         )
+
+This tells Babel to scan the ``src`` directory while using the
+``chameleon_python`` extractor for all ``.py`` files and the
+``chameleon_xml`` extractor for all ``.pt`` files.
+
+You can now use Babel to manage your PO files:
+
+.. code-block:: bash
+
+   python setup.py extract_messages --output-file=i18n/mydomain.pot
+   python setup.py update_catalog \
+             -l nl \
+             -i i18n/mydomain.pot \
+             -o i18n/nl/LC_MESSAGES/mydomain.po
+   python setup.py compile_catalog \
+             --directory i18n --locale nl
+
+You can also configure default options in a ``setup.cfg`` file. For example::
+
+   [compile_catalog]
+   domain = mydomain
+   directory = i18n
+   
+   [extract_messages]
+   copyright_holder = Acme Inc.
+   output_file = i18n/mydomain.pot
+   charset = UTF-8
+
+   [init_catalog]
+   domain = mydomain
+   input_file = i18n/mydomain.pot
+   output_dir = i18n
+
+   [update_catalog]
+   domain = mydomain
+   input_file = i18n/mydomain.pot
+   output_dir = i18n
+   previous = true
+
+You can now use the Babel commands directly::
+
+   python setup.py extract_messages
+   python setup.py update_catalog
+   python setup.py compile_catalog
+
+
+${...} operator
+###############
+
+The ``${...}`` notation is short-hand for text insertion. The
+Python-expression inside the braces is evaluated and the result
+included in the output (all inserted text is escaped by default):
+
+.. code-block:: html
+
+  <div id="section-${index + 1}">
+    ${content}
+  </div>
+
+To escape this behavior, prefix the notation with a backslash
+character: ``\${...}``.
+
+Note that if an object implements the ``__html__`` method, the result
+of this method will be inserted as-is (without XML escaping).
+
+Code blocks
+###########
+
+The ``<?python ... ?>`` notation allows you to embed Python code in
+templates:
+
+.. code-block:: html
+
+  <div>
+    <?python numbers = map(str, range(1, 10)) ?>
+    Please input a number from the range ${", ".join(numbers)}.
+  </div>
+
+The scope of name assignments is up to the nearest macro definition,
+or the template, if macros are not used.
+
+Note that code blocks can span multiple line and start on the next
+line of where the processing instruction begins:
+
+.. code-block:: html
+
+  <?python
+    foo = [1, 2, 3]
+  ?>
+
+You can use this to debug templates:
+
+.. code-block:: html
+
+  <div>
+    <?python import pdb; pdb.set_trace() ?>
+  </div>
+
+
+Markup comments
+###############
+
+You can apply the "!" and "?" modifiers to change how comments are
+processed:
+
+Drop
+
+  ``<!--! This comment will be dropped from output -->``
+
+Verbatim
+
+  ``<!--? This comment will be included verbatim -->``
+
+  That is, evaluation of ``${...}`` expressions is disabled if the
+  comment opens with the "?" character.
+
+
+.. _new-features:
+
+Language extensions
+###################
+
+Chameleon extends the *page template* language with a new expression
+types and language features. Some take inspiration from `Genshi
+<http://genshi.edgewall.org/>`_.
+
+    *New expression types*
+
+       The :ref:`structure <structure-expression>` expression wraps an
+       expression result as *structure*::
+
+         <div>${structure: body.text}</div>
+
+       The :ref:`import <import-expression>` expression imports module globals::
+
+         <div tal:define="compile import: re.compile">
+           ...
+         </div>
+
+       The :ref:`load <load-expression>` expression loads templates
+       relative to the current template::
+
+         <div tal:define="compile load: main.pt">
+           ...
+         </div>
+
+    *Tuple unpacking*
+
+       The ``tal:define`` and ``tal:repeat`` statements support tuple
+       unpacking::
+
+          tal:define="(a, b, c) [1, 2, 3]"
+
+       Extended `iterable unpacking
+       <http://www.python.org/dev/peps/pep-3132/>`_ using the asterisk
+       character is not currently supported (even for versions of
+       Python that support it natively).
+
+    *Dictionary lookup as fallback after attribute error*
+
+       If attribute lookup (using the ``obj.<name>`` syntax) raises an
+       ``AttributeError`` exception, a secondary lookup is attempted
+       using dictionary lookup --- ``obj['<name>']``.
+
+       Behind the scenes, this is done by rewriting all
+       attribute-lookups to a custom lookup call:
+
+       .. code-block:: python
+
+            def lookup_attr(obj, key):
+                try:
+                    return getattr(obj, key)
+                except AttributeError as exc:
+                    try:
+                        get = obj.__getitem__
+                    except AttributeError:
+                        raise exc
+                    try:
+                        return get(key)
+                    except KeyError:
+                        raise exc
+
+    *Inline string substitution*
+
+       In element attributes and in the text or tail of an element,
+       string expression interpolation is available using the
+       ``${...}`` syntax::
+
+          <span class="content-${item_type}">
+             ${title or item_id}
+          </span>
+
+    *Code blocks*
+
+        Using ``<?python ... ?>`` notation, you can embed Python
+        statements in your templates:
+
+        .. code-block:: html
+
+          <div>
+            <?python numbers = map(str, range(1, 10)) ?>
+            Please input a number from the range ${", ".join(numbers)}.
+          </div>
+
+    *Literal content*
+
+       While the ``tal:content`` and ``tal:repeat`` attributes both
+       support the ``structure`` keyword which inserts the content as
+       a literal (without XML-escape), an object may also provide an
+       ``__html__`` method to the same effect.
+
+       The result of the method will be inserted as *structure*.
+
+       This is particularly useful for content which is substituted
+       using the expression operator: ``"${...}"`` since the
+       ``structure`` keyword is not allowed here.
+
+    *Switch statement*
+
+       Two new attributes have been added: ``tal:switch`` and
+       ``tal:case``. A case attribute works like a condition and only
+       allows content if the value matches that of the nearest parent
+       switch value.
+
+
+Incompatibilities and differences
+#################################
+
+There are a number of incompatibilities and differences between the
+Chameleon language implementation and the Zope reference
+implementation (ZPT):
+
+    *Default expression*
+
+       The default expression type is Python.
+
+    *Template arguments*
+
+      Arguments passed by keyword to the render- or call method are
+      inserted directly into the template execution namespace. This is
+      different from ZPT where these are only available through the
+      ``options`` dictionary.
+
+      Zope::
+
+        <div tal:content="options/title" />
+
+      Chameleon::
+
+        <div tal:content="title" />
+
+    *Special symbols*
+
+      The ``CONTEXTS`` symbol is not available.
+
+The `z3c.pt <http://pypi.python.org/pypi/z3c.pt>`_ package works as a
+compatibility layer. The template classes in this package provide a
+implementation which is fully compatible with ZPT.
+
+Notes
+#####
+
+.. [1] This has been changed in 2.x. Previously, it was up to the
+       expression engine to parse the expression values including any
+       semicolons and since for instance Python-expressions can never
+       end in a semicolon, it was possible to clearly distinguish
+       between the different uses of the symbol, e.g.
+
+       ::
+
+         tal:define="text 'Hello world; goodbye world'"
+
+       The semicolon appearing in the definition above is part of the
+       Python-expression simply because it makes the expression
+       valid. Meanwhile:
+
+       ::
+
+         tal:define="text1 'Hello world'; text2 'goodbye world'"
+
+       The semicolon here must denote a second variable definition
+       because there is no valid Python-expression that includes it.
+
+       While this behavior works well in practice, it is incompatible
+       with the reference specification, and also blurs the interface
+       between the compiler and the expression engine. In 2.x we
+       therefore have to escape the semicolon by doubling it (as
+       defined by the specification):
+
+       ::
+
+         tal:define="text 'Hello world;; goodbye world'"
+
diff --git a/lib/Chameleon-2.9.2/setup.cfg b/lib/Chameleon-2.9.2/setup.cfg
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/setup.cfg
@@ -0,0 +1,14 @@
+[easy_install]
+zip_ok = false
+
+[nosetests]
+match = ^test
+nocapture = 1
+cover-package = tree.codegen, tree.lexer, tree.parser, tree.nodes, tree.translation, tree.language, tree.tales, tree.expressions
+cover-erase = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/lib/Chameleon-2.9.2/setup.py b/lib/Chameleon-2.9.2/setup.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/setup.py
@@ -0,0 +1,90 @@
+__version__ = '2.9.2'
+
+import os
+import sys
+
+try:
+    from distribute_setup import use_setuptools
+    use_setuptools()
+except:  # doesn't work under tox/pip
+    pass
+
+from setuptools import setup, find_packages
+from setuptools.command.test import test
+
+here = os.path.abspath(os.path.dirname(__file__))
+try:
+    README = open(os.path.join(here, 'README.rst')).read()
+    CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
+except:  # doesn't work under tox/pip
+    README = ''
+    CHANGES = ''
+
+install_requires = []
+
+version = sys.version_info[:3]
+if version < (2, 7, 0):
+    install_requires.append("ordereddict")
+    install_requires.append("unittest2")
+
+
+class Benchmark(test):
+    description = "Run benchmarks"
+    user_options = []
+    test_suite = None
+
+    def initialize_options(self):
+        """init options"""
+        pass
+
+    def finalize_options(self):
+        """finalize options"""
+
+        self.distribution.tests_require = [
+            'zope.pagetemplate',
+            'zope.component',
+            'zope.i18n',
+            'zope.testing']
+
+    def run(self):
+        test.run(self)
+        self.with_project_on_sys_path(self.run_benchmark)
+
+    def run_benchmark(self):
+        from chameleon import benchmark
+        print("running benchmark...")
+
+        benchmark.start()
+
+setup(
+    name="Chameleon",
+    version=__version__,
+    description="Fast HTML/XML Template Compiler.",
+    long_description="\n\n".join((README, CHANGES)),
+    classifiers=[
+       "Development Status :: 5 - Production/Stable",
+       "Intended Audience :: Developers",
+       "Programming Language :: Python",
+       "Programming Language :: Python :: 2",
+       "Programming Language :: Python :: 3",
+       "Programming Language :: Python :: 2.5",
+       "Programming Language :: Python :: 2.6",
+       "Programming Language :: Python :: 2.7",
+       "Programming Language :: Python :: 3.1",
+       "Programming Language :: Python :: 3.2",
+      ],
+    author="Malthe Borch",
+    author_email="mborch at gmail.com",
+    url="http://www.pagetemplates.org/",
+    license='BSD-like (http://repoze.org/license.html)',
+    packages=find_packages('src'),
+    package_dir = {'': 'src'},
+    include_package_data=True,
+    install_requires=install_requires,
+    zip_safe=False,
+    test_suite="chameleon.tests",
+    cmdclass={
+        'benchmark': Benchmark,
+        }
+    )
+
diff --git a/lib/Chameleon-2.9.2/src/Chameleon.egg-info/PKG-INFO b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/PKG-INFO
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/PKG-INFO
@@ -0,0 +1,1122 @@
+Metadata-Version: 1.1
+Name: Chameleon
+Version: 2.9.2
+Summary: Fast HTML/XML Template Compiler.
+Home-page: http://www.pagetemplates.org/
+Author: Malthe Borch
+Author-email: mborch at gmail.com
+License: BSD-like (http://repoze.org/license.html)
+Description: Overview
+        ========
+        
+        Chameleon is an HTML/XML template engine for `Python
+        <http://www.python.org>`_. It uses the *page templates* language.
+        
+        You can use it in any Python web application with just about any
+        version of Python (2.5 and up, including 3.x and `pypy
+        <http://pypy.org>`_).
+        
+        Visit the `website <http://pagetemplates.org>`_ for more information
+        or the `documentation <http://pagetemplates.org/docs/latest/>`_.
+        
+        License and Copyright
+        ---------------------
+        
+        This software is made available as-is under a BSD-like license [1]_
+        (see included copyright notice).
+        
+        
+        Notes
+        -----
+        
+        .. [1] This software is licensed under the `Repoze
+               <http://repoze.org/license.html>`_ license.
+        
+        
+        Changes
+        =======
+        
+        2.9.2 (2012-06-06)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed a PyPy incompatibility.
+        
+        - Fixed issue #109 which caused testing failures on some platforms.
+        
+        2.9.1 (2012-06-01)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue #103. The ``tal:on-error`` statement now always adds an
+          explicit end-tag to the element, even with a substitution content of
+          nothing.
+        
+        - Fixed issue #113. The ``tal:on-error`` statement now works correctly
+          also for dynamic attributes. That is, the fallback tag now includes
+          only static attributes.
+        
+        - Fixed name error which prevented the benchmark from running
+          correctly.
+        
+        Compatibility:
+        
+        - Fixed deprecation warning on Python 3 for zope interface implements
+          declaration. This fixes issue #116.
+        
+        2.9.0 (2012-05-31)
+        ------------------
+        
+        Features:
+        
+        - The translation function now gets the ``econtext`` argument as the
+          value for ``context``. Note that historically, this was usually an
+          HTTP request which might provide language negotiation data through a
+          dictionary interface.
+          [alvinyue]
+        
+        Bugfixes:
+        
+        - Fixed import alias issue which would lead to a syntax error in
+          generated Python code. Fixes issue #114.
+        
+        2.8.5 (2012-05-02)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed minor installation issues on Python 2.5 and 3.
+          [ppaez]
+        
+        - Ensure output is unicode even when trivial (an empty string).
+        
+        2.8.4 (2012-04-18)
+        ------------------
+        
+        Features:
+        
+        - In exception output, long filenames are now truncated to 60
+          characters of output, preventing line wrap which makes it difficult
+          to scan the exception output.
+        
+        Bugfixes:
+        
+        - Include filename and location in exception output for exceptions
+          raised during compilation.
+        
+        - If a trivial translation substitution variable is given (i.e. an
+          empty string), simply ignore it. This fixes issue #106.
+        
+        2.8.3 (2012-04-16)
+        ------------------
+        
+        Features:
+        
+        - Log template source on debug-level before cooking.
+        
+        - The `target_language` argument, if given, is now available as a
+          variable in templates.
+        
+        2.8.2 (2012-03-30)
+        ------------------
+        
+        Features:
+        
+        - Temporary caches used in debug mode are cleaned up eagerly, rather
+          than waiting for process termination.
+          [mitchellrj]
+        
+        Bugfixes:
+        
+        - The `index`, `start` and `end` methods on the TAL repeat object are
+          now callable. This fixes an incompatibility with ZPT.
+        
+        - The loader now correctly handles absolute paths on Windows.
+          [rdale]
+        
+        2.8.1 (2012-03-29)
+        ------------------
+        
+        Features:
+        
+        - The exception formatter now lists errors in 'wrapping order'. This
+          means that the innermost, and presumably most relevant exception is
+          shown last.
+        
+        Bugfixes:
+        
+        - The exception formatter now correctly recognizes nested errors and
+          does not rewrap the dynamically generated exception class.
+        
+        - The exception formatter now correctly sets the ``__module__``
+          attribute to that of the original exception class.
+        
+        2.8.0 (2012-02-29)
+        ------------------
+        
+        Features:
+        
+        - Added support for code blocks using the `<?python ... ?>` processing
+          instruction syntax.
+        
+          The scope is name assignments is up until the nearest macro
+          definition, or the template itself if macros are not used.
+        
+        Bugfixes:
+        
+        - Fall back to the exception class' ``__new__`` method to safely
+          create an exception object that is not implemented in Python.
+        
+        - The exception formatter now keeps track of already formatted
+          exceptions, and ignores them from further output.
+        
+        2.7.4 (2012-02-27)
+        ------------------
+        
+        - The error handler now invokes the ``__init__`` method of
+          ``BaseException`` instead of the possibly overriden method (which
+          may take required arguments). This fixes issue #97.
+          [j23d, malthe]
+        
+        2.7.3 (2012-01-16)
+        ------------------
+        
+        Bugfixes:
+        
+        - The trim whitespace option now correctly trims actual whitespace to
+          a single character, appearing either to the left or to the right of
+          an element prefix or suffix string.
+        
+        2.7.2 (2012-01-08)
+        ------------------
+        
+        Features:
+        
+        - Added option ``trim_attribute_space`` that decides whether attribute
+          whitespace is stripped (at most down to a single space). This option
+          exists to provide compatibility with the reference
+          implementation. Fixes issue #85.
+        
+        Bugfixes:
+        
+        - Ignore unhashable builtins when generating a reverse builtin
+          map to quickly look up a builtin value.
+          [malthe]
+        
+        - Apply translation mapping even when a translation function is not
+          available. This fixes issue #83.
+          [malthe]
+        
+        - Fixed issue #80. The translation domain for a slot is defined by the
+          source document, i.e. the template providing the content for a slot
+          whether it be the default or provided through ``metal:fill-slot``.
+          [jcbrand]
+        
+        - In certain circumstances, a Unicode non-breaking space character would cause
+          a define clause to fail to parse.
+        
+        2.7.1 (2011-12-29)
+        ------------------
+        
+        Features:
+        
+        - Enable expression interpolation in CDATA.
+        
+        - The page template class now implements dictionary access to macros::
+        
+             template[name]
+        
+          This is a short-hand for::
+        
+             template.macros[name]
+        
+        Bugfixes:
+        
+        - An invalid define clause would be silently ignored; we now raise a
+          language error exception. This fixes issue #79.
+        
+        - Fixed regression where ``${...}`` interpolation expressions could
+          not span multiple lines. This fixes issue #77.
+        
+        2.7.0 (2011-12-13)
+        ------------------
+        
+        Features:
+        
+        - The ``load:`` expression now derives from the string expression such
+          that the ``${...}`` operator can be used for expression
+          interpolation.
+        
+        - The ``load:`` expression now accepts asset specs; these are resolved
+          by the ``pkg_resources.resource_filename`` function::
+        
+            <package_name>:<path>
+        
+          An example from the test suite::
+        
+            chameleon:tests/inputs/hello_world.pt
+        
+        Bugfixes:
+        
+        - If an attribute name for translation was not a valid Python
+          identifier, the compiler would generate invalid code. This has been
+          fixed, and the compiler now also throws an exception if an attribute
+          specification contains a comma. (Note that the only valid separator
+          character is the semicolon, when specifying attributes for
+          translation via the ``i18n:translate`` statement). This addresses
+          issue #76.
+        
+        2.6.2 (2011-12-08)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where ``tal:on-error`` would not respect
+          ``tal:omit-tag`` or namespace elements which are omitted by default
+          (such as ``<tal:block />``).
+        
+        - Fixed issue where ``macros`` attribute would not be available on
+          file-based templates due to incorrect initialization.
+        
+        - The ``TryExcept`` and ``TryFinally`` AST nodes are not available on
+          Python 3.3. These have been aliased to ``Try``. This fixes issue
+          #75.
+        
+        Features:
+        
+        - The TAL repeat item now makes a security declaration that grants
+          access to unprotected subobjects on the Zope 2 platform::
+        
+            __allow_access_to_unprotected_subobjects__ = True
+        
+          This is required for legacy compatibility and does not affect other
+          environments.
+        
+        - The template object now has a method ``write(body)`` which
+          explicitly decodes and cooks a string input.
+        
+        - Added configuration option ``loader_class`` which sets the class
+          used to create the template loader object.
+        
+          The class (essentially a callable) is created at template
+          construction time.
+        
+        2.6.1 (2011-11-30)
+        ------------------
+        
+        Bugfixes:
+        
+        - Decode HTML entities in expression interpolation strings. This fixes
+          issue #74.
+        
+        - Allow ``xml`` and ``xmlns`` attributes on TAL, I18N and METAL
+          namespace elements. This fixes issue #73.
+        
+        2.6.0 (2011-11-24)
+        ------------------
+        
+        Features:
+        
+        - Added support for implicit translation:
+        
+          The ``implicit_i18n_translate`` option enables implicit translation
+          of text. The ``implicit_i18n_attributes`` enables implicit
+          translation of attributes. The latter must be a set and for an
+          attribute to be implicitly translated, its lowercase string value
+          must be included in the set.
+        
+        - Added option ``strict`` (enabled by default) which decides whether
+          expressions are required to be valid at compile time. That is, if
+          not set, an exception is only raised for an invalid expression at
+          evaluation time.
+        
+        - An expression error now results in an exception only if the
+          expression is attempted evaluated during a rendering.
+        
+        - Added a configuration option ``prepend_relative_search_path`` which
+          decides whether the path relative to a file-based template is
+          prepended to the load search path. The default is ``True``.
+        
+        - Added a configuration option ``search_path`` to the file-based
+          template class, which adds additional paths to the template load
+          instance bound to the ``load:`` expression. The option takes a
+          string path or an iterable yielding string paths. The default value
+          is the empty set.
+        
+        Bugfixes:
+        
+        - Exception instances now support pickle/unpickle.
+        
+        - An attributes in i18n:attributes no longer needs to match an
+          existing or dynamic attribute in order to appear in the
+          element. This fixes issue #66.
+        
+        2.5.3 (2011-10-23)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where a nested macro slot definition would fail even
+          though there existed a parent macro definition. This fixes issue
+          #69.
+        
+        2.5.2 (2011-10-12)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where technically invalid input would result in a
+          compiler error.
+        
+        Features:
+        
+        - The markup class now inherits from the unicode string type such that
+          it's compatible with the string interface.
+        
+        2.5.1 (2011-09-29)
+        ------------------
+        
+        Bugfixes:
+        
+        - The symbol names "convert", "decode" and "translate" are now no
+          longer set as read-only *compiler internals*. This fixes issue #65.
+        
+        - Fixed an issue where a macro extension chain nested two levels (a
+          template uses a macro that extends a macro) would lose the middle
+          slot definitions if slots were defined nested.
+        
+          The compiler now throws an error if a nested slot definition is used
+          outside a macro extension context.
+        
+        2.5.0 (2011-09-23)
+        ------------------
+        
+        Features:
+        
+        - An expression type ``structure:`` is now available which wraps the
+          expression result as *structure* such that it is not escaped on
+          insertion, e.g.::
+        
+            <div id="content">
+               ${structure: context.body}
+            </div>
+        
+          This also means that the ``structure`` keyword for ``tal:content``
+          and ``tal:replace`` now has an alternative spelling via the
+          expression type ``structure:``.
+        
+        - The string-based template constructor now accepts encoded input.
+        
+        2.4.6 (2011-09-23)
+        ------------------
+        
+        Bugfixes:
+        
+        - The ``tal:on-error`` statement should catch all exceptions.
+        
+        - Fixed issue that would prevent escaping of interpolation expression
+          values appearing in text.
+        
+        2.4.5 (2011-09-21)
+        ------------------
+        
+        Bugfixes:
+        
+        - The ``tal:on-error`` handler should have a ``error`` variable
+          defined that has the value of the exception thrown.
+        
+        - The ``tal:on-error`` statement is a substitution statement and
+          should support the "text" and "structure" insertion methods.
+        
+        2.4.4 (2011-09-15)
+        ------------------
+        
+        Bugfixes:
+        
+        - An encoding specified in the XML document preamble is now read and
+          used to decode the template input to unicode. This fixes issue #55.
+        
+        - Encoded expression input on Python 3 is now correctly
+          decoded. Previously, the string representation output would be
+          included instead of an actually decoded string.
+        
+        - Expression result conversion steps are now correctly included in
+          error handling such that the exception output points to the
+          expression location.
+        
+        2.4.3 (2011-09-13)
+        ------------------
+        
+        Features:
+        
+        - When an encoding is provided, pass the 'ignore' flag to avoid
+          decoding issues with bad input.
+        
+        Bugfixes:
+        
+        - Fixed pypy compatibility issue (introduced in previous release).
+        
+        2.4.2 (2011-09-13)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue in the compiler where an internal variable (such as a
+          translation default value) would be cached, resulting in variable
+          scope corruption (see issue #49).
+        
+        2.4.1 (2011-09-08)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where a default value for an attribute would
+          sometimes spill over into another attribute.
+        
+        - Fixed issue where the use of the ``default`` name in an attribute
+          interpolation expression would print the attribute value. This is
+          unexpected, because it's an expression, not a static text suitable
+          for output. An attribute value of ``default`` now correctly drops
+          the attribute.
+        
+        2.4.0 (2011-08-22)
+        ------------------
+        
+        Features:
+        
+        - Added an option ``boolean_attributes`` to evaluate and render a
+          provided set of attributes using a boolean logic: if the attribute
+          is a true value, the value will be the attribute name, otherwise the
+          attribute is dropped.
+        
+          In the reference implementation, the following attributes are
+          configured as boolean values when the template is rendered in
+          HTML-mode::
+        
+              "compact", "nowrap", "ismap", "declare", "noshade",
+              "checked", "disabled", "readonly", "multiple", "selected",
+              "noresize", "defer"
+        
+          Note that in Chameleon, these attributes must be manually provided.
+        
+        Bugfixes:
+        
+        - The carriage return character (used on Windows platforms) would
+          incorrectly be included in Python comments.
+        
+          It is now replaced with a line break.
+        
+          This fixes issue #44.
+        
+        2.3.8 (2011-08-19)
+        ------------------
+        
+        - Fixed import error that affected Python 2.5 only.
+        
+        2.3.7 (2011-08-19)
+        ------------------
+        
+        Features:
+        
+        - Added an option ``literal_false`` that disables the default behavior
+          of dropping an attribute for a value of ``False`` (in addition to
+          ``None``). This modified behavior is the behavior exhibited in
+          reference implementation.
+        
+        Bugfixes:
+        
+        - Undo attribute special HTML attribute behavior (see previous
+          release).
+        
+          This turned out not to be a compatible behavior; rather, boolean
+          values should simply be coerced to a string.
+        
+          Meanwhile, the reference implementation does support an HTML mode in
+          which the special attribute behavior is exhibited.
+        
+          We do not currently support this mode.
+        
+        2.3.6 (2011-08-18)
+        ------------------
+        
+        Features:
+        
+        - Certain HTML attribute names now have a special behavior for a
+          attribute value of ``True`` (or ``default`` if no default is
+          defined). For these attributes, this return value will result in the
+          name being printed as the value::
+        
+            <input type="input" tal:attributes="checked True" />
+        
+          will be rendered as::
+        
+            <input type="input" checked="checked" />
+        
+          This behavior is compatible with the reference implementation.
+        
+        2.3.5 (2011-08-18)
+        ------------------
+        
+        Features:
+        
+        - Added support for the set operator (``{item, item, ...}``).
+        
+        Bugfixes:
+        
+        - If macro is defined on the same element as a translation name, this
+          no longer results in a "translation name not allowed outside
+          translation" error. This fixes issue #43.
+        
+        - Attribute fallback to dictionary lookup now works on multiple items
+          (e.g. ``d1.d2.d2``). This fixes issue #42.
+        
+        2.3.4 (2011-08-16)
+        ------------------
+        
+        Features:
+        
+        - When inserting content in either attributes or text, a value of
+          ``True`` (like ``False`` and ``None``) will result in no
+          action.
+        
+        - Use statically assigned variables for ``"attrs"`` and
+          ``"default"``. This change yields a performance improvement of
+          15-20%.
+        
+        - The template loader class now accepts an optional argument
+          ``default_extension`` which accepts a filename extension which will
+          be appended to the filename if there's not already an extension.
+        
+        Bugfixes:
+        
+        - The default symbol is now ``True`` for an attribute if the attribute
+          default is not provided. Note that the result is that the attribute
+          is dropped. This fixes issue #41.
+        
+        - Fixed an issue where assignment to a variable ``"type"`` would
+          fail. This fixes issue #40.
+        
+        - Fixed an issue where an (unsuccesful) assignment for a repeat loop
+          to a compiler internal name would not result in an error.
+        
+        - If the translation function returns the identical object, manually
+          coerce it to string. This fixes a compatibility issue with
+          translation functions which do not convert non-string objects to a
+          string value, but simply return them unchanged.
+        
+        2.3.3 (2011-08-15)
+        ------------------
+        
+        Features:
+        
+        - The ``load:`` expression now passes the initial keyword arguments to
+          its template loader (e.g. ``auto_reload`` and ``encoding``).
+        
+        - In the exception output, string variable values are now limited to a
+          limited output of characters, single line only.
+        
+        Bugfixes:
+        
+        - Fixed horizontal alignment of exception location info
+          (i.e. 'String:', 'Filename:' and 'Location:') such that they match
+          the template exception formatter.
+        
+        2.3.2 (2011-08-11)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where i18n:domain would not be inherited through macros
+          and slots. This fixes issue #37.
+        
+        2.3.1 (2011-08-11)
+        ------------------
+        
+        Features:
+        
+        - The ``Builtin`` node type may now be used to represent any Python
+          local or global name. This allows expression compilers to refer to
+          e.g. ``get`` or ``getitem``, or to explicit require a builtin object
+          such as one from the ``extra_builtins`` dictionary.
+        
+        Bugfixes:
+        
+        - Builtins which are not explicitly disallowed may now be redefined
+          and used as variables (e.g. ``nothing``).
+        
+        - Fixed compiler issue with circular node annotation loop.
+        
+        2.3 (2011-08-10)
+        ----------------
+        
+        Features:
+        
+        - Added support for the following syntax to disable inline evaluation
+          in a comment:
+        
+            <!--? comment appears verbatim (no ${...} evaluation) -->
+        
+          Note that the initial question mark character (?) will be omitted
+          from output.
+        
+        - The parser now accepts '<' and '>' in attributes. Note that this is
+          invalid markup. Previously, the '<' would not be accepted as a valid
+          attribute value, but this would result in an 'unexpected end tag'
+          error elsewhere. This fixes issue #38.
+        
+        - The expression compiler now provides methods ``assign_text`` and
+          ``assign_value`` such that a template engine might configure this
+          value conversion to support e.g. encoded strings.
+        
+          Note that currently, the only client for the ``assign_text`` method
+          is the string expression type.
+        
+        - Enable template loader for string-based template classes. Note that
+          the ``filename`` keyword argument may be provided on initialization
+          to identify the template source by filename. This fixes issue #36.
+        
+        - Added ``extra_builtins`` option to the page template class. These
+          builtins are added to the default builtins dictionary at cook time
+          and may be provided at initialization using the ``extra_builtins``
+          keyword argument.
+        
+        Bugfixes:
+        
+        - If a translation domain is set for a fill slot, use this setting
+          instead of the macro template domain.
+        
+        - The Python expression compiler now correctly decodes HTML entities
+          ``'gt'`` and ``'lt'``. This fixes issue #32.
+        
+        - The string expression compiler now correctly handles encoded text
+          (when support for encoded strings is enabled). This fixes issue #35.
+        
+        - Fixed an issue where setting the ``filename`` attribute on a
+          file-based template would not automatically cause an invalidation.
+        
+        - Exceptions raised by Chameleon can now be copied via
+          ``copy.copy``. This fixes issue #36.
+          [leorochael]
+        
+        - If copying the exception fails in the exception handler, simply
+          re-raise the original exception and log a warning.
+        
+        2.2 (2011-07-28)
+        ----------------
+        
+        Features:
+        
+        - Added new expression type ``load:`` that allows loading a
+          template. Both relative and absolute paths are supported. If the
+          path given is relative, then it will be resolved with respect to the
+          directory of the template.
+        
+        - Added support for dynamic evaluation of expressions.
+        
+          Note that this is to support legacy applications. It is not
+          currently wired into the provided template classes.
+        
+        - Template classes now have a ``builtins`` attribute which may be used
+          to define built-in variables always available in the template
+          variable scope.
+        
+        Incompatibilities:
+        
+        - The file-based template class no longer accepts a parameter
+          ``loader``. This parameter would be used to load a template from a
+          relative path, using a ``find(filename)`` method. This was however,
+          undocumented, and probably not very useful since we have the
+          ``TemplateLoader`` mechanism already.
+        
+        - The compiled template module now contains an ``initialize`` function
+          which takes values that map to the template builtins. The return
+          value of this function is a dictionary that contains the render
+          functions.
+        
+        Bugfixes:
+        
+        - The file-based template class no longer verifies the existance of a
+          template file (using ``os.lstat``). This now happens implicitly if
+          eager parsing is enabled, or otherwise when first needed (e.g. at
+          render time).
+        
+          This is classified as a bug fix because the previous behavior was
+          probably not what you'd expect, especially if an application
+          initializes a lot of templates without needing to render them
+          immediately.
+        
+        2.1.1 (2011-07-28)
+        ------------------
+        
+        Features:
+        
+        - Improved exception display. The expression string is now shown in
+          the context of the original source (if available) with a marker
+          string indicating the location of the expression in the template
+          source.
+        
+        Bugfixes:
+        
+        - The ``structure`` insertion mode now correctly decodes entities for
+          any expression type (including ``string:``). This fixes issue #30.
+        
+        - Don't show internal variables in the exception formatter variable
+          listing.
+        
+        2.1 (2011-07-25)
+        ----------------
+        
+        Features:
+        
+        - Expression interpolation (using the ``${...}`` operator and
+          previously also ``$identifier``) now requires braces everywhere
+          except inside the ``string:`` expression type.
+        
+          This change is motivated by a number of legacy templates in which
+          the interpolation format without braces ``$identifier`` appears as
+          text.
+        
+        2.0.2 (2011-07-25)
+        ------------------
+        
+        Bugfixes:
+        
+        - Don't use dynamic variable scope for lambda-scoped variables (#27).
+        
+        - Avoid duplication of exception class and message in traceback.
+        
+        - Fixed issue where a ``metal:fill-slot`` would be ignored if a macro
+          was set to be used on the same element (#16).
+        
+        2.0.1 (2011-07-23)
+        ------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where global variable definition from macro slots would
+          fail (they would instead be local). This also affects error
+          reporting from inside slots because this would be recorded
+          internally as a global.
+        
+        - Fixed issue with template cache digest (used for filenames); modules
+          are now invalidated whenever any changes are made to the
+          distribution set available (packages on ``sys.path``).
+        
+        - Fixed exception handler to better let exceptions propagate through
+          the renderer.
+        
+        - The disk-based module compiler now mangles template source filenames
+          such that the output Python module is valid and at root level (dots
+          and hyphens are replaced by an underscore). This fixes issue #17.
+        
+        - Fixed translations (i18n) on Python 2.5.
+        
+        2.0 (2011-07-14)
+        ----------------
+        
+        - Point release.
+        
+        2.0-rc14 (2011-07-13)
+        ---------------------
+        
+        Bugfixes:
+        
+        - The tab character (``\t``) is now parsed correctly when used inside
+          tags.
+        
+        Features:
+        
+        - The ``RepeatDict`` class now works as a proxy behind a seperate
+          dictionary instance.
+        
+        - Added template constructor option ``keep_body`` which is a flag
+          (also available as a class attribute) that controls whether to save
+          the template body input in the ``body`` attribute.
+        
+          This is disabled by default, unless debug-mode is enabled.
+        
+        - The page template loader class now accepts an optional ``formats``
+          argument which can be used to select an alternative template class.
+        
+        2.0-rc13 (2011-07-07)
+        ---------------------
+        
+        Bugfixes:
+        
+        - The backslash character (followed by optional whitespace and a line
+          break) was not correctly interpreted as a continuation for Python
+          expressions.
+        
+        Features:
+        
+        - The Python expression implementation is now more flexible for
+          external subclassing via a new ``parse`` method.
+        
+        2.0-rc12 (2011-07-04)
+        ---------------------
+        
+        Bugfixes:
+        
+        - Initial keyword arguments passed to a template now no longer "leak"
+          into the template variable space after a macro call.
+        
+        - An unexpected end tag is now an unrecoverable error.
+        
+        Features:
+        
+        - Improve exception output.
+        
+        2.0-rc11 (2011-05-26)
+        ---------------------
+        
+        Bugfixes:
+        
+        - Fixed issue where variable names that begin with an underscore were
+          seemingly allowed, but their use resulted in a compiler error.
+        
+        Features:
+        
+        - Template variable names are now allowed to be prefixed with a single
+          underscore, but not two or more (reserved for internal use).
+        
+          Examples of valid names::
+        
+            item
+            ITEM
+            _item
+            camelCase
+            underscore_delimited
+            help
+        
+        - Added support for Genshi's comment "drop" syntax::
+        
+            <!--! This comment will be dropped -->
+        
+          Note the additional exclamation (!) character.
+        
+          This fixes addresses issue #10.
+        
+        2.0-rc10 (2011-05-24)
+        ---------------------
+        
+        Bugfixes:
+        
+        - The ``tal:attributes`` statement now correctly operates
+          case-insensitive. The attribute name given in the statement will
+          replace an existing attribute with the same name, without respect to
+          case.
+        
+        Features:
+        
+        - Added ``meta:interpolation`` statement to control expression
+          interpolation setting.
+        
+          Strings that disable the setting: ``"off"`` and ``"false"``.
+          Strings that enable the setting: ``"on"`` and ``"true"``.
+        
+        - Expression interpolation now works inside XML comments.
+        
+        2.0-rc9 (2011-05-05)
+        --------------------
+        
+        Features:
+        
+        - Better debugging support for string decode and conversion. If a
+          naive join fails, each element in the output will now be attempted
+          coerced to unicode to try and trigger the failure near to the bad
+          string.
+        
+        2.0-rc8 (2011-04-11)
+        --------------------
+        
+        Bugfixes:
+        
+        - If a macro defines two slots with the same name, a caller will now
+          fill both with a single usage.
+        
+        - If a valid of ``None`` is provided as the translation function
+          argument, we now fall back to the class default.
+        
+        2.0-rc7 (2011-03-29)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed issue with Python 2.5 compatibility AST. This affected at
+          least PyPy 1.4.
+        
+        Features:
+        
+        - The ``auto_reload`` setting now defaults to the class value; the
+          base template class gives a default value of
+          ``chameleon.config.AUTO_RELOAD``. This change allows a subclass to
+          provide a custom default value (such as an application-specific
+          debug mode setting).
+        
+        
+        2.0-rc6 (2011-03-19)
+        --------------------
+        
+        Features:
+        
+        - Added support for ``target_language`` keyword argument to render
+          method. If provided, the argument will be curried onto the
+          translation function.
+        
+        Bugfixes:
+        
+        - The HTML entities 'lt', 'gt' and 'quot' appearing inside content
+          subtition expressions are now translated into their native character
+          values. This fixes an issue where you could not dynamically create
+          elements using the ``structure`` (which is possible in ZPT). The
+          need to create such structure stems from the lack of an expression
+          interpolation operator in ZPT.
+        
+        - Fixed duplicate file pointer issue with test suite (affected Windows
+          platforms only). This fixes issue #9.
+          [oliora]
+        
+        - Use already open file using ``os.fdopen`` when trying to write out
+          the module source. This fixes LP #731803.
+        
+        
+        2.0-rc5 (2011-03-07)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed a number of issues concerning the escaping of attribute
+          values:
+        
+          1) Static attribute values are now included as they appear in the
+             source.
+        
+             This means that invalid attribute values such as ``"true &&
+             false"`` are now left alone. It's not the job of the template
+             engine to correct such markup, at least not in the default mode
+             of operation.
+        
+          2) The string expression compiler no longer unescapes
+             values. Instead, this is left to each expression
+             compiler. Currently only the Python expression compiler unescapes
+             its input.
+        
+          3) The dynamic escape code sequence now correctly only replaces
+             ampersands that are part of an HTML escape format.
+        
+        Imports:
+        
+        - The page template classes and the loader class can now be imported
+          directly from the ``chameleon`` module.
+        
+        Features:
+        
+        - If a custom template loader is not provided, relative paths are now
+          resolved using ``os.abspath`` (i.e. to the current working
+          directory).
+        
+        - Absolute paths are normalized using ``os.path.normpath`` and
+          ``os.path.expanduser``. This ensures that all paths are kept in
+          their "canonical" form.
+        
+        
+        2.0-rc4 (2011-03-03)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed an issue where the output of an end-to-end string expression
+          would raise an exception if the expression evaluated to ``None`` (it
+          should simply output nothing).
+        
+        - The ``convert`` function (which is configurable on the template
+          class level) now defaults to the ``translate`` function (at
+          run-time).
+        
+          This fixes an issue where message objects were not translated (and
+          thus converted to a string) using the a provided ``translate``
+          function.
+        
+        - Fixed string interpolation issue where an expression immediately
+          succeeded by a right curly bracket would not parse.
+        
+          This fixes issue #5.
+        
+        - Fixed error where ``tal:condition`` would be evaluated after
+          ``tal:repeat``.
+        
+        Features:
+        
+        - Python expression is now a TALES expression. That means that the
+          pipe operator can be used to chain two or more expressions in a
+          try-except sequence.
+        
+          This behavior was ported from the 1.x series. Note that while it's
+          still possible to use the pipe character ("|") in an expression, it
+          must now be escaped.
+        
+        - The template cache can now be shared by multiple processes.
+        
+        
+        2.0-rc3 (2011-03-02)
+        --------------------
+        
+        Bugfixes:
+        
+        - Fixed ``atexit`` handler.
+        
+          This fixes issue #3.
+        
+        - If a cache directory is specified, it will now be used even when not
+          in debug mode.
+        
+        - Allow "comment" attribute in the TAL namespace.
+        
+          This fixes an issue in the sense that the reference engine allows
+          any attribute within the TAL namespace. However, only "comment" is
+          in common use.
+        
+        - The template constructor now accepts a flag ``debug`` which puts the
+          template *instance* into debug-mode regardless of the global
+          setting.
+        
+          This fixes issue #1.
+        
+        Features:
+        
+        - Added exception handler for exceptions raised while evaluating an
+          expression.
+        
+          This handler raises (or attempts to) a new exception of the type
+          ``RenderError``, with an additional base class of the original
+          exception class. The string value of the exception is a formatted
+          error message which includes the expression that caused the
+          exception.
+        
+          If we are unable to create the exception class, the original
+          exception is re-raised.
+        
+        2.0-rc2 (2011-02-28)
+        --------------------
+        
+        - Fixed upload issue.
+        
+        2.0-rc1 (2011-02-28)
+        --------------------
+        
+        - Initial public release. See documentation for what's new in this
+          series.
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.1
+Classifier: Programming Language :: Python :: 3.2
diff --git a/lib/Chameleon-2.9.2/src/Chameleon.egg-info/SOURCES.txt b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/SOURCES.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/SOURCES.txt
@@ -0,0 +1,380 @@
+.gitignore
+CHANGES.rst
+COPYRIGHT.txt
+LICENSE.txt
+Makefile
+README.rst
+distribute_setup.py
+setup.cfg
+setup.py
+tox.ini
+benchmarks/bm_chameleon.py
+benchmarks/bm_mako.py
+benchmarks/util.py
+docs/conf.py
+docs/configuration.rst
+docs/index.rst
+docs/integration.rst
+docs/library.rst
+docs/reference.rst
+src/Chameleon.egg-info/PKG-INFO
+src/Chameleon.egg-info/SOURCES.txt
+src/Chameleon.egg-info/dependency_links.txt
+src/Chameleon.egg-info/not-zip-safe
+src/Chameleon.egg-info/top_level.txt
+src/chameleon/__init__.py
+src/chameleon/ast24.py
+src/chameleon/astutil.py
+src/chameleon/benchmark.py
+src/chameleon/codegen.py
+src/chameleon/compiler.py
+src/chameleon/config.py
+src/chameleon/exc.py
+src/chameleon/i18n.py
+src/chameleon/interfaces.py
+src/chameleon/loader.py
+src/chameleon/metal.py
+src/chameleon/namespaces.py
+src/chameleon/nodes.py
+src/chameleon/parser.py
+src/chameleon/program.py
+src/chameleon/py25.py
+src/chameleon/py26.py
+src/chameleon/tal.py
+src/chameleon/tales.py
+src/chameleon/template.py
+src/chameleon/tokenize.py
+src/chameleon/utils.py
+src/chameleon/tests/__init__.py
+src/chameleon/tests/test_doctests.py
+src/chameleon/tests/test_loader.py
+src/chameleon/tests/test_parser.py
+src/chameleon/tests/test_sniffing.py
+src/chameleon/tests/test_templates.py
+src/chameleon/tests/test_tokenizer.py
+src/chameleon/tests/inputs/001-interpolation.txt
+src/chameleon/tests/inputs/001-variable-scope.html
+src/chameleon/tests/inputs/001-variable-scope.pt
+src/chameleon/tests/inputs/001.xml
+src/chameleon/tests/inputs/002-repeat-scope.pt
+src/chameleon/tests/inputs/002.xml
+src/chameleon/tests/inputs/003-content.pt
+src/chameleon/tests/inputs/003.xml
+src/chameleon/tests/inputs/004-attributes.pt
+src/chameleon/tests/inputs/004.xml
+src/chameleon/tests/inputs/005-default.pt
+src/chameleon/tests/inputs/005.xml
+src/chameleon/tests/inputs/006-attribute-interpolation.pt
+src/chameleon/tests/inputs/006.xml
+src/chameleon/tests/inputs/007-content-interpolation.pt
+src/chameleon/tests/inputs/007.xml
+src/chameleon/tests/inputs/008-builtins.pt
+src/chameleon/tests/inputs/008.xml
+src/chameleon/tests/inputs/009-literals.pt
+src/chameleon/tests/inputs/009.xml
+src/chameleon/tests/inputs/010-structure.pt
+src/chameleon/tests/inputs/010.xml
+src/chameleon/tests/inputs/011-messages.pt
+src/chameleon/tests/inputs/011.xml
+src/chameleon/tests/inputs/012-translation.pt
+src/chameleon/tests/inputs/012.xml
+src/chameleon/tests/inputs/013-repeat-nested.pt
+src/chameleon/tests/inputs/013.xml
+src/chameleon/tests/inputs/014-repeat-nested-similar.pt
+src/chameleon/tests/inputs/014.xml
+src/chameleon/tests/inputs/015-translation-nested.pt
+src/chameleon/tests/inputs/015.xml
+src/chameleon/tests/inputs/016-explicit-translation.pt
+src/chameleon/tests/inputs/016.xml
+src/chameleon/tests/inputs/017-omit-tag.pt
+src/chameleon/tests/inputs/017.xml
+src/chameleon/tests/inputs/018-translation-nested-dynamic.pt
+src/chameleon/tests/inputs/018.xml
+src/chameleon/tests/inputs/019-replace.pt
+src/chameleon/tests/inputs/019.xml
+src/chameleon/tests/inputs/020-on-error.pt
+src/chameleon/tests/inputs/020.xml
+src/chameleon/tests/inputs/021-translation-domain.pt
+src/chameleon/tests/inputs/021.xml
+src/chameleon/tests/inputs/022-switch.pt
+src/chameleon/tests/inputs/022.xml
+src/chameleon/tests/inputs/023-condition.pt
+src/chameleon/tests/inputs/023.xml
+src/chameleon/tests/inputs/024-namespace-elements.pt
+src/chameleon/tests/inputs/024.xml
+src/chameleon/tests/inputs/025-repeat-whitespace.pt
+src/chameleon/tests/inputs/025.xml
+src/chameleon/tests/inputs/026-repeat-variable.pt
+src/chameleon/tests/inputs/026.xml
+src/chameleon/tests/inputs/027-attribute-replacement.pt
+src/chameleon/tests/inputs/027.xml
+src/chameleon/tests/inputs/028-attribute-toggle.pt
+src/chameleon/tests/inputs/028.xml
+src/chameleon/tests/inputs/029-attribute-ordering.pt
+src/chameleon/tests/inputs/029.xml
+src/chameleon/tests/inputs/030-repeat-tuples.pt
+src/chameleon/tests/inputs/030.xml
+src/chameleon/tests/inputs/031-namespace-with-tal.pt
+src/chameleon/tests/inputs/031.xml
+src/chameleon/tests/inputs/032-master-template.pt
+src/chameleon/tests/inputs/032.xml
+src/chameleon/tests/inputs/033-use-macro-trivial.pt
+src/chameleon/tests/inputs/033.xml
+src/chameleon/tests/inputs/034-use-template-as-macro.pt
+src/chameleon/tests/inputs/034.xml
+src/chameleon/tests/inputs/035-use-macro-with-fill-slot.pt
+src/chameleon/tests/inputs/035.xml
+src/chameleon/tests/inputs/036-use-macro-inherits-dynamic-scope.pt
+src/chameleon/tests/inputs/036.xml
+src/chameleon/tests/inputs/037-use-macro-local-variable-scope.pt
+src/chameleon/tests/inputs/037.xml
+src/chameleon/tests/inputs/038-use-macro-globals.pt
+src/chameleon/tests/inputs/038.xml
+src/chameleon/tests/inputs/039-globals.pt
+src/chameleon/tests/inputs/039.xml
+src/chameleon/tests/inputs/040-macro-using-template-symbol.pt
+src/chameleon/tests/inputs/040.xml
+src/chameleon/tests/inputs/041-translate-nested-names.pt
+src/chameleon/tests/inputs/041.xml
+src/chameleon/tests/inputs/042-use-macro-fill-footer.pt
+src/chameleon/tests/inputs/042.xml
+src/chameleon/tests/inputs/043-macro-nested-dynamic-vars.pt
+src/chameleon/tests/inputs/043.xml
+src/chameleon/tests/inputs/044-tuple-define.pt
+src/chameleon/tests/inputs/044.xml
+src/chameleon/tests/inputs/045-namespaces.pt
+src/chameleon/tests/inputs/045.xml
+src/chameleon/tests/inputs/046-extend-macro.pt
+src/chameleon/tests/inputs/046.xml
+src/chameleon/tests/inputs/047-use-extended-macro.pt
+src/chameleon/tests/inputs/047.xml
+src/chameleon/tests/inputs/048-use-extended-macro-fill-original.pt
+src/chameleon/tests/inputs/048.xml
+src/chameleon/tests/inputs/049-entities-in-attributes.pt
+src/chameleon/tests/inputs/049.xml
+src/chameleon/tests/inputs/050-define-macro-and-use-not-extend.pt
+src/chameleon/tests/inputs/050.xml
+src/chameleon/tests/inputs/051-use-non-extended-macro.pt
+src/chameleon/tests/inputs/051.xml
+src/chameleon/tests/inputs/052-i18n-domain-inside-filled-slot.pt
+src/chameleon/tests/inputs/052.xml
+src/chameleon/tests/inputs/053-special-characters-in-attributes.pt
+src/chameleon/tests/inputs/053.xml
+src/chameleon/tests/inputs/054-import-expression.pt
+src/chameleon/tests/inputs/054.xml
+src/chameleon/tests/inputs/055-attribute-fallback-to-dict-lookup.pt
+src/chameleon/tests/inputs/055.xml
+src/chameleon/tests/inputs/056-comment-attribute.pt
+src/chameleon/tests/inputs/056.xml
+src/chameleon/tests/inputs/057-order.pt
+src/chameleon/tests/inputs/057.xml
+src/chameleon/tests/inputs/058-script.pt
+src/chameleon/tests/inputs/058.xml
+src/chameleon/tests/inputs/059-embedded-javascript.pt
+src/chameleon/tests/inputs/059.xml
+src/chameleon/tests/inputs/060-macro-with-multiple-same-slots.pt
+src/chameleon/tests/inputs/060.xml
+src/chameleon/tests/inputs/061-fill-one-slot-but-two-defined.pt
+src/chameleon/tests/inputs/061.xml
+src/chameleon/tests/inputs/062-comments-and-expressions.pt
+src/chameleon/tests/inputs/062.xml
+src/chameleon/tests/inputs/063-continuation.pt
+src/chameleon/tests/inputs/063.xml
+src/chameleon/tests/inputs/064-tags-and-special-characters.pt
+src/chameleon/tests/inputs/064.xml
+src/chameleon/tests/inputs/065-use-macro-in-fill.pt
+src/chameleon/tests/inputs/065.xml
+src/chameleon/tests/inputs/066-load-expression.pt
+src/chameleon/tests/inputs/066.xml
+src/chameleon/tests/inputs/067-attribute-decode.pt
+src/chameleon/tests/inputs/067.xml
+src/chameleon/tests/inputs/068-less-than-greater-than-in-attributes.pt
+src/chameleon/tests/inputs/068.xml
+src/chameleon/tests/inputs/069-translation-domain-and-macro.pt
+src/chameleon/tests/inputs/069.xml
+src/chameleon/tests/inputs/070-translation-domain-and-use-macro.pt
+src/chameleon/tests/inputs/070.xml
+src/chameleon/tests/inputs/071-html-attribute-defaults.pt
+src/chameleon/tests/inputs/071.xml
+src/chameleon/tests/inputs/072-repeat-interpolation.pt
+src/chameleon/tests/inputs/072.xml
+src/chameleon/tests/inputs/073-utf8-encoded.pt
+src/chameleon/tests/inputs/073.xml
+src/chameleon/tests/inputs/074-encoded-template.pt
+src/chameleon/tests/inputs/074.xml
+src/chameleon/tests/inputs/075-nested-macros.pt
+src/chameleon/tests/inputs/075.xml
+src/chameleon/tests/inputs/076-nested-macro-override.pt
+src/chameleon/tests/inputs/076.xml
+src/chameleon/tests/inputs/077-i18n-attributes.pt
+src/chameleon/tests/inputs/077.xml
+src/chameleon/tests/inputs/078-tags-and-newlines.pt
+src/chameleon/tests/inputs/078.xml
+src/chameleon/tests/inputs/079-implicit-i18n.pt
+src/chameleon/tests/inputs/079.xml
+src/chameleon/tests/inputs/080-xmlns-namespace-on-tal.pt
+src/chameleon/tests/inputs/080.xml
+src/chameleon/tests/inputs/081-load-spec.pt
+src/chameleon/tests/inputs/081.xml
+src/chameleon/tests/inputs/082-load-spec-computed.pt
+src/chameleon/tests/inputs/082.xml
+src/chameleon/tests/inputs/083-template-dict-to-macro.pt
+src/chameleon/tests/inputs/083.xml
+src/chameleon/tests/inputs/084-interpolation-in-cdata.pt
+src/chameleon/tests/inputs/084.xml
+src/chameleon/tests/inputs/085-nested-translation.pt
+src/chameleon/tests/inputs/085.xml
+src/chameleon/tests/inputs/086-self-closing.pt
+src/chameleon/tests/inputs/086.xml
+src/chameleon/tests/inputs/087-code-blocks.pt
+src/chameleon/tests/inputs/087.xml
+src/chameleon/tests/inputs/088-python-newlines.pt
+src/chameleon/tests/inputs/088.xml
+src/chameleon/tests/inputs/089.xml
+src/chameleon/tests/inputs/090.xml
+src/chameleon/tests/inputs/091.xml
+src/chameleon/tests/inputs/092.xml
+src/chameleon/tests/inputs/093.xml
+src/chameleon/tests/inputs/094.xml
+src/chameleon/tests/inputs/095.xml
+src/chameleon/tests/inputs/096.xml
+src/chameleon/tests/inputs/097.xml
+src/chameleon/tests/inputs/098.xml
+src/chameleon/tests/inputs/099.xml
+src/chameleon/tests/inputs/100.xml
+src/chameleon/tests/inputs/101-unclosed-tags.html
+src/chameleon/tests/inputs/101.xml
+src/chameleon/tests/inputs/102-unquoted-attributes.html
+src/chameleon/tests/inputs/102.xml
+src/chameleon/tests/inputs/103-simple-attribute.html
+src/chameleon/tests/inputs/103.xml
+src/chameleon/tests/inputs/104.xml
+src/chameleon/tests/inputs/105.xml
+src/chameleon/tests/inputs/106.xml
+src/chameleon/tests/inputs/107.xml
+src/chameleon/tests/inputs/108.xml
+src/chameleon/tests/inputs/109.xml
+src/chameleon/tests/inputs/110.xml
+src/chameleon/tests/inputs/111.xml
+src/chameleon/tests/inputs/112.xml
+src/chameleon/tests/inputs/113.xml
+src/chameleon/tests/inputs/114.xml
+src/chameleon/tests/inputs/115.xml
+src/chameleon/tests/inputs/116.xml
+src/chameleon/tests/inputs/117.xml
+src/chameleon/tests/inputs/118.xml
+src/chameleon/tests/inputs/119.xml
+src/chameleon/tests/inputs/greeting.pt
+src/chameleon/tests/inputs/hello_world.pt
+src/chameleon/tests/inputs/hello_world.txt
+src/chameleon/tests/outputs/001.html
+src/chameleon/tests/outputs/001.pt
+src/chameleon/tests/outputs/001.txt
+src/chameleon/tests/outputs/002.pt
+src/chameleon/tests/outputs/003.pt
+src/chameleon/tests/outputs/004.pt
+src/chameleon/tests/outputs/005.pt
+src/chameleon/tests/outputs/006.pt
+src/chameleon/tests/outputs/007.pt
+src/chameleon/tests/outputs/008.pt
+src/chameleon/tests/outputs/009.pt
+src/chameleon/tests/outputs/010.pt
+src/chameleon/tests/outputs/011-en.pt
+src/chameleon/tests/outputs/011.pt
+src/chameleon/tests/outputs/012-en.pt
+src/chameleon/tests/outputs/012.pt
+src/chameleon/tests/outputs/013.pt
+src/chameleon/tests/outputs/014.pt
+src/chameleon/tests/outputs/015-en.pt
+src/chameleon/tests/outputs/015.pt
+src/chameleon/tests/outputs/016-en.pt
+src/chameleon/tests/outputs/016.pt
+src/chameleon/tests/outputs/017.pt
+src/chameleon/tests/outputs/018-en.pt
+src/chameleon/tests/outputs/018.pt
+src/chameleon/tests/outputs/019.pt
+src/chameleon/tests/outputs/020.pt
+src/chameleon/tests/outputs/021-en.pt
+src/chameleon/tests/outputs/021.pt
+src/chameleon/tests/outputs/022.pt
+src/chameleon/tests/outputs/023.pt
+src/chameleon/tests/outputs/024.pt
+src/chameleon/tests/outputs/025.pt
+src/chameleon/tests/outputs/026.pt
+src/chameleon/tests/outputs/027.pt
+src/chameleon/tests/outputs/028.pt
+src/chameleon/tests/outputs/029.pt
+src/chameleon/tests/outputs/030.pt
+src/chameleon/tests/outputs/031.pt
+src/chameleon/tests/outputs/032.pt
+src/chameleon/tests/outputs/033.pt
+src/chameleon/tests/outputs/034.pt
+src/chameleon/tests/outputs/035.pt
+src/chameleon/tests/outputs/036.pt
+src/chameleon/tests/outputs/037.pt
+src/chameleon/tests/outputs/038.pt
+src/chameleon/tests/outputs/039.pt
+src/chameleon/tests/outputs/040.pt
+src/chameleon/tests/outputs/041.pt
+src/chameleon/tests/outputs/042.pt
+src/chameleon/tests/outputs/043.pt
+src/chameleon/tests/outputs/044.pt
+src/chameleon/tests/outputs/045.pt
+src/chameleon/tests/outputs/046.pt
+src/chameleon/tests/outputs/047.pt
+src/chameleon/tests/outputs/048.pt
+src/chameleon/tests/outputs/049.pt
+src/chameleon/tests/outputs/050.pt
+src/chameleon/tests/outputs/051.pt
+src/chameleon/tests/outputs/052.pt
+src/chameleon/tests/outputs/053.pt
+src/chameleon/tests/outputs/054.pt
+src/chameleon/tests/outputs/055.pt
+src/chameleon/tests/outputs/056.pt
+src/chameleon/tests/outputs/057.pt
+src/chameleon/tests/outputs/058.pt
+src/chameleon/tests/outputs/059.pt
+src/chameleon/tests/outputs/060.pt
+src/chameleon/tests/outputs/061.pt
+src/chameleon/tests/outputs/062.pt
+src/chameleon/tests/outputs/063.pt
+src/chameleon/tests/outputs/064.pt
+src/chameleon/tests/outputs/065.pt
+src/chameleon/tests/outputs/066.pt
+src/chameleon/tests/outputs/067.pt
+src/chameleon/tests/outputs/068.pt
+src/chameleon/tests/outputs/069-en.pt
+src/chameleon/tests/outputs/069.pt
+src/chameleon/tests/outputs/070-en.pt
+src/chameleon/tests/outputs/070.pt
+src/chameleon/tests/outputs/071.pt
+src/chameleon/tests/outputs/072.pt
+src/chameleon/tests/outputs/073.pt
+src/chameleon/tests/outputs/074.pt
+src/chameleon/tests/outputs/075.pt
+src/chameleon/tests/outputs/076.pt
+src/chameleon/tests/outputs/077-en.pt
+src/chameleon/tests/outputs/077.pt
+src/chameleon/tests/outputs/078.pt
+src/chameleon/tests/outputs/079-en.pt
+src/chameleon/tests/outputs/079.pt
+src/chameleon/tests/outputs/080.pt
+src/chameleon/tests/outputs/081.pt
+src/chameleon/tests/outputs/082.pt
+src/chameleon/tests/outputs/083.pt
+src/chameleon/tests/outputs/084.pt
+src/chameleon/tests/outputs/085-en.pt
+src/chameleon/tests/outputs/085.pt
+src/chameleon/tests/outputs/086.pt
+src/chameleon/tests/outputs/087.pt
+src/chameleon/tests/outputs/088.pt
+src/chameleon/tests/outputs/101.html
+src/chameleon/tests/outputs/102.html
+src/chameleon/tests/outputs/103.html
+src/chameleon/tests/outputs/greeting.pt
+src/chameleon/tests/outputs/hello_world.pt
+src/chameleon/tests/outputs/hello_world.txt
+src/chameleon/zpt/__init__.py
+src/chameleon/zpt/loader.py
+src/chameleon/zpt/program.py
+src/chameleon/zpt/template.py
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/Chameleon.egg-info/dependency_links.txt b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/dependency_links.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/dependency_links.txt
@@ -0,0 +1,1 @@
+
diff --git a/lib/Chameleon-2.9.2/src/Chameleon.egg-info/not-zip-safe b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/not-zip-safe
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/not-zip-safe
@@ -0,0 +1,1 @@
+
diff --git a/lib/Chameleon-2.9.2/src/Chameleon.egg-info/top_level.txt b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/top_level.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/Chameleon.egg-info/top_level.txt
@@ -0,0 +1,1 @@
+chameleon
diff --git a/lib/Chameleon-2.9.2/src/chameleon/__init__.py b/lib/Chameleon-2.9.2/src/chameleon/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/__init__.py
@@ -0,0 +1,5 @@
+from .zpt.template import PageTemplate
+from .zpt.template import PageTemplateFile
+from .zpt.template import PageTextTemplate
+from .zpt.template import PageTextTemplateFile
+from .zpt.loader import TemplateLoader as PageTemplateLoader
diff --git a/lib/Chameleon-2.9.2/src/chameleon/ast24.py b/lib/Chameleon-2.9.2/src/chameleon/ast24.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/ast24.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2008 by Armin Ronacher.
+# License: Python License.
+#
+
+import _ast
+
+from _ast import *
+
+
+def fix_missing_locations(node):
+    """
+    When you compile a node tree with compile(), the compiler expects lineno and
+    col_offset attributes for every node that supports them.  This is rather
+    tedious to fill in for generated nodes, so this helper adds these attributes
+    recursively where not already set, by setting them to the values of the
+    parent node.  It works recursively starting at *node*.
+    """
+    def _fix(node, lineno, col_offset):
+        if 'lineno' in node._attributes:
+            if not hasattr(node, 'lineno'):
+                node.lineno = lineno
+            else:
+                lineno = node.lineno
+        if 'col_offset' in node._attributes:
+            if not hasattr(node, 'col_offset'):
+                node.col_offset = col_offset
+            else:
+                col_offset = node.col_offset
+        for child in iter_child_nodes(node):
+            _fix(child, lineno, col_offset)
+    _fix(node, 1, 0)
+    return node
+
+
+def iter_child_nodes(node):
+    """
+    Yield all direct child nodes of *node*, that is, all fields that are nodes
+    and all items of fields that are lists of nodes.
+    """
+    for name, field in iter_fields(node):
+        if isinstance(field, (AST, _ast.AST)):
+            yield field
+        elif isinstance(field, list):
+            for item in field:
+                if isinstance(item, (AST, _ast.AST)):
+                    yield item
+
+
+def iter_fields(node):
+    """
+    Yield a tuple of ``(fieldname, value)`` for each field in ``node._fields``
+    that is present on *node*.
+    """
+
+    for field in node._fields or ():
+        try:
+            yield field, getattr(node, field)
+        except AttributeError:
+            pass
+
+
+def walk(node):
+    """
+    Recursively yield all child nodes of *node*, in no specified order.  This is
+    useful if you only want to modify nodes in place and don't care about the
+    context.
+    """
+    from collections import deque
+    todo = deque([node])
+    while todo:
+        node = todo.popleft()
+        todo.extend(iter_child_nodes(node))
+        yield node
+
+
+class NodeVisitor(object):
+    """
+    A node visitor base class that walks the abstract syntax tree and calls a
+    visitor function for every node found.  This function may return a value
+    which is forwarded by the `visit` method.
+
+    This class is meant to be subclassed, with the subclass adding visitor
+    methods.
+
+    Per default the visitor functions for the nodes are ``'visit_'`` +
+    class name of the node.  So a `TryFinally` node visit function would
+    be `visit_TryFinally`.  This behavior can be changed by overriding
+    the `visit` method.  If no visitor function exists for a node
+    (return value `None`) the `generic_visit` visitor is used instead.
+
+    Don't use the `NodeVisitor` if you want to apply changes to nodes during
+    traversing.  For this a special visitor exists (`NodeTransformer`) that
+    allows modifications.
+    """
+
+    def visit(self, node):
+        """Visit a node."""
+        method = 'visit_' + node.__class__.__name__
+        visitor = getattr(self, method, self.generic_visit)
+        return visitor(node)
+
+    def generic_visit(self, node):
+        """Called if no explicit visitor function exists for a node."""
+        for field, value in iter_fields(node):
+            if isinstance(value, list):
+                for item in value:
+                    if isinstance(item, (AST, _ast.AST)):
+                        self.visit(item)
+            elif isinstance(value, (AST, _ast.AST)):
+                self.visit(value)
+
+
+class AST(object):
+    _fields = ()
+    _attributes = 'lineno', 'col_offset'
+
+    def __init__(self, *args, **kwargs):
+        self.__dict__.update(kwargs)
+        self._fields = self._fields or ()
+        for name, value in zip(self._fields, args):
+            setattr(self, name, value)
+
+
+for name, cls in _ast.__dict__.items():
+    if isinstance(cls, type) and issubclass(cls, _ast.AST):
+        try:
+            cls.__bases__ = (AST, ) + cls.__bases__
+        except TypeError:
+            pass
+
+
+class ExceptHandler(AST):
+    _fields = "type", "name", "body"
diff --git a/lib/Chameleon-2.9.2/src/chameleon/astutil.py b/lib/Chameleon-2.9.2/src/chameleon/astutil.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/astutil.py
@@ -0,0 +1,926 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2008-2009 Edgewall Software
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://genshi.edgewall.org/wiki/License.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For the exact contribution history, see the revision
+# history and logs, available at http://genshi.edgewall.org/log/.
+
+"""Support classes for generating code from abstract syntax trees."""
+
+try:
+    import ast
+except ImportError:
+    from chameleon import ast24 as ast
+
+import sys
+import logging
+import weakref
+
+node_annotations = weakref.WeakKeyDictionary()
+
+try:
+    node_annotations[ast.Name()] = None
+except TypeError:
+    logging.debug(
+        "Unable to create weak references to AST nodes. " \
+        "A lock will be used around compilation loop."
+        )
+
+    node_annotations = {}
+
+__docformat__ = 'restructuredtext en'
+
+
+def annotated(value):
+    node = load("annotation")
+    node_annotations[node] = value
+    return node
+
+
+def parse(source, mode='eval'):
+    return compile(source, '', mode, ast.PyCF_ONLY_AST)
+
+
+def load(name):
+    return ast.Name(id=name, ctx=ast.Load())
+
+
+def store(name):
+    return ast.Name(id=name, ctx=ast.Store())
+
+
+def param(name):
+    return ast.Name(id=name, ctx=ast.Param())
+
+
+def delete(name):
+    return ast.Name(id=name, ctx=ast.Del())
+
+
+def subscript(name, value, ctx):
+    return ast.Subscript(
+        value=value,
+        slice=ast.Index(value=ast.Str(s=name)),
+        ctx=ctx,
+        )
+
+
+def walk_names(target, mode):
+    for node in ast.walk(target):
+        if isinstance(node, ast.Name) and \
+               isinstance(node.ctx, mode):
+            yield node.id
+
+
+def copy(source, target):
+    target.__class__ = source.__class__
+    target.__dict__ = source.__dict__
+
+
+def swap(root, replacement, name):
+    for node in ast.walk(root):
+        if (isinstance(node, ast.Name) and
+            isinstance(node.ctx, ast.Load) and
+            node.id == name):
+            assert hasattr(replacement, '_fields')
+            node_annotations.setdefault(node, replacement)
+
+
+def marker(name):
+    return ast.Str(s="__%s" % name)
+
+
+class Node(object):
+    """AST baseclass that gives us a convenient initialization
+    method. We explicitly declare and use the ``_fields`` attribute."""
+
+    _fields = ()
+
+    def __init__(self, *args, **kwargs):
+        assert isinstance(self._fields, tuple)
+        self.__dict__.update(kwargs)
+        for name, value in zip(self._fields, args):
+            setattr(self, name, value)
+
+    def __repr__(self):
+        """Poor man's single-line pretty printer."""
+
+        name = type(self).__name__
+        return '<%s%s at %x>' % (
+            name,
+            "".join(" %s=%r" % (name, getattr(self, name, "\"?\""))
+                        for name in self._fields),
+            id(self)
+            )
+
+
+class Builtin(Node):
+    """Represents a Python builtin.
+
+    Used when a builtin is used internally by the compiler, to avoid
+    clashing with a user assignment (e.g. ``help`` is a builtin, but
+    also commonly assigned in templates).
+    """
+
+    _fields = "id", "ctx"
+
+    ctx = ast.Load()
+
+
+class Symbol(Node):
+    """Represents an importable symbol."""
+
+    _fields = "value",
+
+
+class Static(Node):
+    """Represents a static value."""
+
+    _fields = "value", "name"
+
+    name = None
+
+
+class Comment(Node):
+    _fields = "text", "space", "stmt"
+
+    stmt = None
+    space = ""
+
+
+class ASTCodeGenerator(object):
+    """General purpose base class for AST transformations.
+
+    Every visitor method can be overridden to return an AST node that has been
+    altered or replaced in some way.
+    """
+
+    def __init__(self, tree):
+        self.lines_info = []
+        self.line_info = []
+        self.lines = []
+        self.line = ""
+        self.last = None
+        self.indent = 0
+        self.blame_stack = []
+        self.visit(tree)
+
+        if self.line.strip():
+            self._new_line()
+
+        self.line = None
+        self.line_info = None
+
+        # strip trivial lines
+        self.code = "\n".join(
+            line.strip() and line or ""
+            for line in self.lines
+            )
+
+    def _change_indent(self, delta):
+        self.indent += delta
+
+    def _new_line(self):
+        if self.line is not None:
+            self.lines.append(self.line)
+            self.lines_info.append(self.line_info)
+        self.line = ' ' * 4 * self.indent
+        if len(self.blame_stack) == 0:
+            self.line_info = []
+            self.last = None
+        else:
+            self.line_info = [(0, self.blame_stack[-1],)]
+            self.last = self.blame_stack[-1]
+
+    def _write(self, s):
+        if len(s) == 0:
+            return
+        if len(self.blame_stack) == 0:
+            if self.last is not None:
+                self.last = None
+                self.line_info.append((len(self.line), self.last))
+        else:
+            if self.last != self.blame_stack[-1]:
+                self.last = self.blame_stack[-1]
+                self.line_info.append((len(self.line), self.last))
+        self.line += s
+
+    def flush(self):
+        if self.line:
+            self._new_line()
+
+    def visit(self, node):
+        if node is None:
+            return None
+        if type(node) is tuple:
+            return tuple([self.visit(n) for n in node])
+        try:
+            self.blame_stack.append((node.lineno, node.col_offset,))
+            info = True
+        except AttributeError:
+            info = False
+        visitor = getattr(self, 'visit_%s' % node.__class__.__name__, None)
+        if visitor is None:
+            raise Exception('No handler for ``%s`` (%s).' % (
+                node.__class__.__name__, repr(node)))
+        ret = visitor(node)
+        if info:
+            self.blame_stack.pop()
+        return ret
+
+    def visit_Module(self, node):
+        for n in node.body:
+            self.visit(n)
+    visit_Interactive = visit_Module
+    visit_Suite = visit_Module
+
+    def visit_Expression(self, node):
+        return self.visit(node.body)
+
+    # arguments = (expr* args, identifier? vararg,
+    #              identifier? kwarg, expr* defaults)
+    def visit_arguments(self, node):
+        first = True
+        no_default_count = len(node.args) - len(node.defaults)
+        for i, arg in enumerate(node.args):
+            if not first:
+                self._write(', ')
+            else:
+                first = False
+            self.visit(arg)
+            if i >= no_default_count:
+                self._write('=')
+                self.visit(node.defaults[i - no_default_count])
+        if getattr(node, 'vararg', None):
+            if not first:
+                self._write(', ')
+            else:
+                first = False
+            self._write('*' + node.vararg)
+        if getattr(node, 'kwarg', None):
+            if not first:
+                self._write(', ')
+            else:
+                first = False
+            self._write('**' + node.kwarg)
+
+    def visit_arg(self, node):
+        self._write(node.arg)
+
+    # FunctionDef(identifier name, arguments args,
+    #                           stmt* body, expr* decorators)
+    def visit_FunctionDef(self, node):
+        self._new_line()
+        for decorator in getattr(node, 'decorator_list', ()):
+            self._new_line()
+            self._write('@')
+            self.visit(decorator)
+        self._new_line()
+        self._write('def ' + node.name + '(')
+        self.visit(node.args)
+        self._write('):')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+
+    # ClassDef(identifier name, expr* bases, stmt* body)
+    def visit_ClassDef(self, node):
+        self._new_line()
+        self._write('class ' + node.name)
+        if node.bases:
+            self._write('(')
+            self.visit(node.bases[0])
+            for base in node.bases[1:]:
+                self._write(', ')
+                self.visit(base)
+            self._write(')')
+        self._write(':')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+
+    # Return(expr? value)
+    def visit_Return(self, node):
+        self._new_line()
+        self._write('return')
+        if getattr(node, 'value', None):
+            self._write(' ')
+            self.visit(node.value)
+
+    # Delete(expr* targets)
+    def visit_Delete(self, node):
+        self._new_line()
+        self._write('del ')
+        self.visit(node.targets[0])
+        for target in node.targets[1:]:
+            self._write(', ')
+            self.visit(target)
+
+    # Assign(expr* targets, expr value)
+    def visit_Assign(self, node):
+        self._new_line()
+        for target in node.targets:
+            self.visit(target)
+            self._write(' = ')
+        self.visit(node.value)
+
+    # AugAssign(expr target, operator op, expr value)
+    def visit_AugAssign(self, node):
+        self._new_line()
+        self.visit(node.target)
+        self._write(' ' + self.binary_operators[node.op.__class__] + '= ')
+        self.visit(node.value)
+
+    # Print(expr? dest, expr* values, bool nl)
+    def visit_Print(self, node):
+        self._new_line()
+        self._write('print')
+        if getattr(node, 'dest', None):
+            self._write(' >> ')
+            self.visit(node.dest)
+            if getattr(node, 'values', None):
+                self._write(', ')
+        else:
+            self._write(' ')
+        if getattr(node, 'values', None):
+            self.visit(node.values[0])
+            for value in node.values[1:]:
+                self._write(', ')
+                self.visit(value)
+        if not node.nl:
+            self._write(',')
+
+    # For(expr target, expr iter, stmt* body, stmt* orelse)
+    def visit_For(self, node):
+        self._new_line()
+        self._write('for ')
+        self.visit(node.target)
+        self._write(' in ')
+        self.visit(node.iter)
+        self._write(':')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+        if getattr(node, 'orelse', None):
+            self._new_line()
+            self._write('else:')
+            self._change_indent(1)
+            for statement in node.orelse:
+                self.visit(statement)
+            self._change_indent(-1)
+
+    # While(expr test, stmt* body, stmt* orelse)
+    def visit_While(self, node):
+        self._new_line()
+        self._write('while ')
+        self.visit(node.test)
+        self._write(':')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+        if getattr(node, 'orelse', None):
+            self._new_line()
+            self._write('else:')
+            self._change_indent(1)
+            for statement in node.orelse:
+                self.visit(statement)
+            self._change_indent(-1)
+
+    # If(expr test, stmt* body, stmt* orelse)
+    def visit_If(self, node):
+        self._new_line()
+        self._write('if ')
+        self.visit(node.test)
+        self._write(':')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+        if getattr(node, 'orelse', None):
+            self._new_line()
+            self._write('else:')
+            self._change_indent(1)
+            for statement in node.orelse:
+                self.visit(statement)
+            self._change_indent(-1)
+
+    # With(expr context_expr, expr? optional_vars, stmt* body)
+    def visit_With(self, node):
+        self._new_line()
+        self._write('with ')
+        self.visit(node.context_expr)
+        if getattr(node, 'optional_vars', None):
+            self._write(' as ')
+            self.visit(node.optional_vars)
+        self._write(':')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+
+    # Raise(expr? type, expr? inst, expr? tback)
+    def visit_Raise(self, node):
+        self._new_line()
+        self._write('raise')
+        if not getattr(node, "type", None):
+            exc = getattr(node, "exc", None)
+            if exc is None:
+                return
+            self._write(' ')
+            return self.visit(exc)
+        self._write(' ')
+        self.visit(node.type)
+        if not node.inst:
+            return
+        self._write(', ')
+        self.visit(node.inst)
+        if not node.tback:
+            return
+        self._write(', ')
+        self.visit(node.tback)
+
+    # Try(stmt* body, excepthandler* handlers, stmt* orelse, stmt* finalbody)
+    def visit_Try(self, node):
+        self._new_line()
+        self._write('try:')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+        if getattr(node, 'handlers', None):
+            for handler in node.handlers:
+                self.visit(handler)
+        self._new_line()
+
+        if getattr(node, 'orelse', None):
+            self._write('else:')
+            self._change_indent(1)
+            for statement in node.orelse:
+                self.visit(statement)
+            self._change_indent(-1)
+
+        if getattr(node, 'finalbody', None):
+            self._new_line()
+            self._write('finally:')
+            self._change_indent(1)
+            for statement in node.finalbody:
+                self.visit(statement)
+            self._change_indent(-1)
+
+    # TryExcept(stmt* body, excepthandler* handlers, stmt* orelse)
+    def visit_TryExcept(self, node):
+        self._new_line()
+        self._write('try:')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+        if getattr(node, 'handlers', None):
+            for handler in node.handlers:
+                self.visit(handler)
+        self._new_line()
+        if getattr(node, 'orelse', None):
+            self._write('else:')
+            self._change_indent(1)
+            for statement in node.orelse:
+                self.visit(statement)
+            self._change_indent(-1)
+
+    # excepthandler = (expr? type, expr? name, stmt* body)
+    def visit_ExceptHandler(self, node):
+        self._new_line()
+        self._write('except')
+        if getattr(node, 'type', None):
+            self._write(' ')
+            self.visit(node.type)
+        if getattr(node, 'name', None):
+            if sys.version_info[0] == 2:
+                assert getattr(node, 'type', None)
+                self._write(', ')
+            else:
+                self._write(' as ')
+            self.visit(node.name)
+        self._write(':')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+    visit_excepthandler = visit_ExceptHandler
+
+    # TryFinally(stmt* body, stmt* finalbody)
+    def visit_TryFinally(self, node):
+        self._new_line()
+        self._write('try:')
+        self._change_indent(1)
+        for statement in node.body:
+            self.visit(statement)
+        self._change_indent(-1)
+
+        if getattr(node, 'finalbody', None):
+            self._new_line()
+            self._write('finally:')
+            self._change_indent(1)
+            for statement in node.finalbody:
+                self.visit(statement)
+            self._change_indent(-1)
+
+    # Assert(expr test, expr? msg)
+    def visit_Assert(self, node):
+        self._new_line()
+        self._write('assert ')
+        self.visit(node.test)
+        if getattr(node, 'msg', None):
+            self._write(', ')
+            self.visit(node.msg)
+
+    def visit_alias(self, node):
+        self._write(node.name)
+        if getattr(node, 'asname', None):
+            self._write(' as ')
+            self._write(node.asname)
+
+    # Import(alias* names)
+    def visit_Import(self, node):
+        self._new_line()
+        self._write('import ')
+        self.visit(node.names[0])
+        for name in node.names[1:]:
+            self._write(', ')
+            self.visit(name)
+
+    # ImportFrom(identifier module, alias* names, int? level)
+    def visit_ImportFrom(self, node):
+        self._new_line()
+        self._write('from ')
+        if node.level:
+            self._write('.' * node.level)
+        self._write(node.module)
+        self._write(' import ')
+        self.visit(node.names[0])
+        for name in node.names[1:]:
+            self._write(', ')
+            self.visit(name)
+
+    # Exec(expr body, expr? globals, expr? locals)
+    def visit_Exec(self, node):
+        self._new_line()
+        self._write('exec ')
+        self.visit(node.body)
+        if not node.globals:
+            return
+        self._write(', ')
+        self.visit(node.globals)
+        if not node.locals:
+            return
+        self._write(', ')
+        self.visit(node.locals)
+
+    # Global(identifier* names)
+    def visit_Global(self, node):
+        self._new_line()
+        self._write('global ')
+        self.visit(node.names[0])
+        for name in node.names[1:]:
+            self._write(', ')
+            self.visit(name)
+
+    # Expr(expr value)
+    def visit_Expr(self, node):
+        self._new_line()
+        self.visit(node.value)
+
+    # Pass
+    def visit_Pass(self, node):
+        self._new_line()
+        self._write('pass')
+
+    # Break
+    def visit_Break(self, node):
+        self._new_line()
+        self._write('break')
+
+    # Continue
+    def visit_Continue(self, node):
+        self._new_line()
+        self._write('continue')
+
+    ### EXPRESSIONS
+    def with_parens(f):
+        def _f(self, node):
+            self._write('(')
+            f(self, node)
+            self._write(')')
+        return _f
+
+    bool_operators = {ast.And: 'and', ast.Or: 'or'}
+
+    # BoolOp(boolop op, expr* values)
+    @with_parens
+    def visit_BoolOp(self, node):
+        joiner = ' ' + self.bool_operators[node.op.__class__] + ' '
+        self.visit(node.values[0])
+        for value in node.values[1:]:
+            self._write(joiner)
+            self.visit(value)
+
+    binary_operators = {
+        ast.Add: '+',
+        ast.Sub: '-',
+        ast.Mult: '*',
+        ast.Div: '/',
+        ast.Mod: '%',
+        ast.Pow: '**',
+        ast.LShift: '<<',
+        ast.RShift: '>>',
+        ast.BitOr: '|',
+        ast.BitXor: '^',
+        ast.BitAnd: '&',
+        ast.FloorDiv: '//'
+    }
+
+    # BinOp(expr left, operator op, expr right)
+    @with_parens
+    def visit_BinOp(self, node):
+        self.visit(node.left)
+        self._write(' ' + self.binary_operators[node.op.__class__] + ' ')
+        self.visit(node.right)
+
+    unary_operators = {
+        ast.Invert: '~',
+        ast.Not: 'not',
+        ast.UAdd: '+',
+        ast.USub: '-',
+    }
+
+    # UnaryOp(unaryop op, expr operand)
+    def visit_UnaryOp(self, node):
+        self._write(self.unary_operators[node.op.__class__] + ' ')
+        self.visit(node.operand)
+
+    # Lambda(arguments args, expr body)
+    @with_parens
+    def visit_Lambda(self, node):
+        self._write('lambda ')
+        self.visit(node.args)
+        self._write(': ')
+        self.visit(node.body)
+
+    # IfExp(expr test, expr body, expr orelse)
+    @with_parens
+    def visit_IfExp(self, node):
+        self.visit(node.body)
+        self._write(' if ')
+        self.visit(node.test)
+        self._write(' else ')
+        self.visit(node.orelse)
+
+    # Dict(expr* keys, expr* values)
+    def visit_Dict(self, node):
+        self._write('{')
+        for key, value in zip(node.keys, node.values):
+            self.visit(key)
+            self._write(': ')
+            self.visit(value)
+            self._write(', ')
+        self._write('}')
+
+    def visit_Set(self, node):
+        self._write('{')
+        elts = list(node.elts)
+        last = elts.pop()
+        for elt in elts:
+            self.visit(elt)
+            self._write(', ')
+        self.visit(last)
+        self._write('}')
+
+    # ListComp(expr elt, comprehension* generators)
+    def visit_ListComp(self, node):
+        self._write('[')
+        self.visit(node.elt)
+        for generator in node.generators:
+            # comprehension = (expr target, expr iter, expr* ifs)
+            self._write(' for ')
+            self.visit(generator.target)
+            self._write(' in ')
+            self.visit(generator.iter)
+            for ifexpr in generator.ifs:
+                self._write(' if ')
+                self.visit(ifexpr)
+        self._write(']')
+
+    # GeneratorExp(expr elt, comprehension* generators)
+    def visit_GeneratorExp(self, node):
+        self._write('(')
+        self.visit(node.elt)
+        for generator in node.generators:
+            # comprehension = (expr target, expr iter, expr* ifs)
+            self._write(' for ')
+            self.visit(generator.target)
+            self._write(' in ')
+            self.visit(generator.iter)
+            for ifexpr in generator.ifs:
+                self._write(' if ')
+                self.visit(ifexpr)
+        self._write(')')
+
+    # Yield(expr? value)
+    def visit_Yield(self, node):
+        self._write('yield')
+        if getattr(node, 'value', None):
+            self._write(' ')
+            self.visit(node.value)
+
+    comparison_operators = {
+        ast.Eq: '==',
+        ast.NotEq: '!=',
+        ast.Lt: '<',
+        ast.LtE: '<=',
+        ast.Gt: '>',
+        ast.GtE: '>=',
+        ast.Is: 'is',
+        ast.IsNot: 'is not',
+        ast.In: 'in',
+        ast.NotIn: 'not in',
+    }
+
+    # Compare(expr left, cmpop* ops, expr* comparators)
+    @with_parens
+    def visit_Compare(self, node):
+        self.visit(node.left)
+        for op, comparator in zip(node.ops, node.comparators):
+            self._write(' ' + self.comparison_operators[op.__class__] + ' ')
+            self.visit(comparator)
+
+    # Call(expr func, expr* args, keyword* keywords,
+    #                         expr? starargs, expr? kwargs)
+    def visit_Call(self, node):
+        self.visit(node.func)
+        self._write('(')
+        first = True
+        for arg in node.args:
+            if not first:
+                self._write(', ')
+            first = False
+            self.visit(arg)
+
+        for keyword in node.keywords:
+            if not first:
+                self._write(', ')
+            first = False
+            # keyword = (identifier arg, expr value)
+            self._write(keyword.arg)
+            self._write('=')
+            self.visit(keyword.value)
+        if getattr(node, 'starargs', None):
+            if not first:
+                self._write(', ')
+            first = False
+            self._write('*')
+            self.visit(node.starargs)
+
+        if getattr(node, 'kwargs', None):
+            if not first:
+                self._write(', ')
+            first = False
+            self._write('**')
+            self.visit(node.kwargs)
+        self._write(')')
+
+    # Repr(expr value)
+    def visit_Repr(self, node):
+        self._write('`')
+        self.visit(node.value)
+        self._write('`')
+
+    # Num(object n)
+    def visit_Num(self, node):
+        self._write(repr(node.n))
+
+    # Str(string s)
+    def visit_Str(self, node):
+        self._write(repr(node.s))
+
+    # Attribute(expr value, identifier attr, expr_context ctx)
+    def visit_Attribute(self, node):
+        self.visit(node.value)
+        self._write('.')
+        self._write(node.attr)
+
+    # Subscript(expr value, slice slice, expr_context ctx)
+    def visit_Subscript(self, node):
+        self.visit(node.value)
+        self._write('[')
+
+        def _process_slice(node):
+            if isinstance(node, ast.Ellipsis):
+                self._write('...')
+            elif isinstance(node, ast.Slice):
+                if getattr(node, 'lower', 'None'):
+                    self.visit(node.lower)
+                self._write(':')
+                if getattr(node, 'upper', None):
+                    self.visit(node.upper)
+                if getattr(node, 'step', None):
+                    self._write(':')
+                    self.visit(node.step)
+            elif isinstance(node, ast.Index):
+                self.visit(node.value)
+            elif isinstance(node, ast.ExtSlice):
+                self.visit(node.dims[0])
+                for dim in node.dims[1:]:
+                    self._write(', ')
+                    self.visit(dim)
+            else:
+                raise NotImplemented('Slice type not implemented')
+        _process_slice(node.slice)
+        self._write(']')
+
+    # Name(identifier id, expr_context ctx)
+    def visit_Name(self, node):
+        self._write(node.id)
+
+    # List(expr* elts, expr_context ctx)
+    def visit_List(self, node):
+        self._write('[')
+        for elt in node.elts:
+            self.visit(elt)
+            self._write(', ')
+        self._write(']')
+
+    # Tuple(expr *elts, expr_context ctx)
+    def visit_Tuple(self, node):
+        self._write('(')
+        for elt in node.elts:
+            self.visit(elt)
+            self._write(', ')
+        self._write(')')
+
+
+class AnnotationAwareVisitor(ast.NodeVisitor):
+    def visit(self, node):
+        annotation = node_annotations.get(node)
+        if annotation is not None:
+            assert hasattr(annotation, '_fields')
+            node = annotation
+
+        super(AnnotationAwareVisitor, self).visit(node)
+
+    def apply_transform(self, node):
+        if node not in node_annotations:
+            result = self.transform(node)
+            if result is not None and result is not node:
+                node_annotations[node] = result
+
+
+class NameLookupRewriteVisitor(AnnotationAwareVisitor):
+    def __init__(self, transform):
+        self.transform = transform
+        self.transformed = set()
+        self.scopes = [set()]
+
+    def __call__(self, node):
+        self.visit(node)
+        return self.transformed
+
+    def visit_Name(self, node):
+        scope = self.scopes[-1]
+        if isinstance(node.ctx, ast.Param):
+            scope.add(node.id)
+        elif node.id not in scope:
+            self.transformed.add(node.id)
+            self.apply_transform(node)
+
+    def visit_FunctionDef(self, node):
+        self.scopes[-1].add(node.name)
+
+    def visit_alias(self, node):
+        name = node.asname if node.asname is not None else node.name
+        self.scopes[-1].add(name)
+
+    def visit_Lambda(self, node):
+        self.scopes.append(set())
+        try:
+            self.visit(node.args)
+            self.visit(node.body)
+        finally:
+            self.scopes.pop()
+
+
+class ItemLookupOnAttributeErrorVisitor(AnnotationAwareVisitor):
+    def __init__(self, transform):
+        self.transform = transform
+
+    def visit_Attribute(self, node):
+        self.generic_visit(node)
+        self.apply_transform(node)
diff --git a/lib/Chameleon-2.9.2/src/chameleon/benchmark.py b/lib/Chameleon-2.9.2/src/chameleon/benchmark.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/benchmark.py
@@ -0,0 +1,478 @@
+import unittest
+import time
+import os
+import re
+from .utils import text_
+
+re_amp = re.compile(r'&(?!([A-Za-z]+|#[0-9]+);)')
+
+BIGTABLE_ZPT = """\
+<table xmlns="http://www.w3.org/1999/xhtml"
+xmlns:tal="http://xml.zope.org/namespaces/tal">
+<tr tal:repeat="row python: options['table']">
+<td tal:repeat="c python: row.values()">
+<span tal:define="d python: c + 1"
+tal:attributes="class python: 'column-' + str(d)"
+tal:content="python: d" />
+</td>
+</tr>
+</table>"""
+
+MANY_STRINGS_ZPT = """\
+<table xmlns="http://www.w3.org/1999/xhtml"
+xmlns:tal="http://xml.zope.org/namespaces/tal">
+<tr tal:repeat="i python: xrange(1000)">
+<td tal:content="string: number ${i}" />
+</tr>
+</table>
+"""
+
+HELLO_WORLD_ZPT = """\
+<html xmlns="http://www.w3.org/1999/xhtml"
+xmlns:tal="http://xml.zope.org/namespaces/tal">
+<body>
+<h1>Hello, world!</h1>
+</body>
+</html>
+"""
+
+I18N_ZPT = """\
+<html xmlns="http://www.w3.org/1999/xhtml"
+xmlns:tal="http://xml.zope.org/namespaces/tal"
+xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+  <body>
+    <div tal:repeat="i python: xrange(10)">
+      <div i18n:translate="">
+        Hello world!
+      </div>
+      <div i18n:translate="hello_world">
+        Hello world!
+      </div>
+      <div i18n:translate="">
+        <sup>Hello world!</sup>
+      </div>
+    </div>
+  </body>
+</html>
+"""
+
+
+def benchmark(title):
+    def decorator(f):
+        def wrapper(*args):
+            print(
+                "==========================\n " \
+                "%s\n==========================" % \
+                title)
+            return f(*args)
+        return wrapper
+    return decorator
+
+
+def timing(func, *args, **kwargs):
+    t1 = t2 = time.time()
+    i = 0
+    while t2 - t1 < 3:
+        func(**kwargs)
+        func(**kwargs)
+        func(**kwargs)
+        func(**kwargs)
+        i += 4
+        t2 = time.time()
+    return float(10 * (t2 - t1)) / i
+
+
+START = 0
+END = 1
+TAG = 2
+
+
+def yield_tokens(table=None):
+    index = []
+    tag = index.append
+    _re_amp = re_amp
+    tag(START)
+    yield "<", "html", "", ">\n"
+    for r in table:
+        tag(START)
+        yield "<", "tr", "", ">\n"
+
+        for c in r.values():
+            d = c + 1
+            tag(START)
+            yield "<", "td", "", ">\n"
+
+            _tmp5 = d
+            if not isinstance(_tmp5, unicode):
+                _tmp5 = str(_tmp5)
+            if ('&' in _tmp5):
+                if (';' in _tmp5):
+                    _tmp5 = _re_amp.sub('&amp;', _tmp5)
+                else:
+                    _tmp5 = _tmp5.replace('&', '&amp;')
+            if ('<' in _tmp5):
+                _tmp5 = _tmp5.replace('<', '&lt;')
+            if ('>' in _tmp5):
+                _tmp5 = _tmp5.replace('>', '&gt;')
+            if ('"' in _tmp5):
+                _tmp5 = _tmp5.replace('"', '&quot;')
+            _tmp5 = "column-%s" % _tmp5
+
+            _tmp = d
+            if (_tmp.__class__ not in (str, unicode, int, float, )):
+                raise
+            if (_tmp is not None):
+                if not isinstance(_tmp, unicode):
+                    _tmp = str(_tmp)
+                if ('&' in _tmp):
+                    if (';' in _tmp):
+                        _tmp = _re_amp.sub('&amp;', _tmp)
+                    else:
+                        _tmp = _tmp.replace('&', '&amp;')
+                if ('<' in _tmp):
+                    _tmp = _tmp.replace('<', '&lt;')
+                if ('>' in _tmp):
+                    _tmp = _tmp.replace('>', '&gt;')
+            tag(START)
+
+            t = ["classicism"]
+
+            yield "<", "span", " ", t[0], '="', _tmp5, '"', ">\n"
+            tag(END)
+            yield "</", "span", ">\n"
+            tag(END)
+            yield "</", "td", ">\n"
+        tag(END)
+        yield "</", "tr", ">\n"
+    tag(END)
+    yield "</", "html", ">\n"
+
+
+def yield_tokens_dict_version(**kwargs):
+    index = []
+    tag = index.append
+    _re_amp = re_amp
+    tag(START)
+    yield "<", "html", "", ">\n"
+
+    for r in kwargs['table']:
+        kwargs['r'] = r
+        tag(START)
+        yield "<", "tr", "", ">\n"
+
+        for c in kwargs['r'].values():
+            kwargs['d'] = c + 1
+            tag(START)
+            yield "<", "td", "", ">\n"
+
+            _tmp5 = kwargs['d']
+            if not isinstance(_tmp5, unicode):
+                _tmp5 = str(_tmp5)
+            if ('&' in _tmp5):
+                if (';' in _tmp5):
+                    _tmp5 = _re_amp.sub('&amp;', _tmp5)
+                else:
+                    _tmp5 = _tmp5.replace('&', '&amp;')
+            if ('<' in _tmp5):
+                _tmp5 = _tmp5.replace('<', '&lt;')
+            if ('>' in _tmp5):
+                _tmp5 = _tmp5.replace('>', '&gt;')
+            if ('"' in _tmp5):
+                _tmp5 = _tmp5.replace('"', '&quot;')
+            _tmp5 = "column-%s" % _tmp5
+
+            _tmp = kwargs['d']
+            if (_tmp.__class__ not in (str, unicode, int, float, )):
+                raise
+            if (_tmp is not None):
+                if not isinstance(_tmp, unicode):
+                    _tmp = str(_tmp)
+                if ('&' in _tmp):
+                    if (';' in _tmp):
+                        _tmp = _re_amp.sub('&amp;', _tmp)
+                    else:
+                        _tmp = _tmp.replace('&', '&amp;')
+                if ('<' in _tmp):
+                    _tmp = _tmp.replace('<', '&lt;')
+                if ('>' in _tmp):
+                    _tmp = _tmp.replace('>', '&gt;')
+            tag(START)
+
+            t = ["classicism"]
+
+            yield "<", "span", " ", t[0], '="', _tmp5, '"', ">\n"
+            tag(END)
+            yield "</", "span", ">\n"
+            tag(END)
+            yield "</", "td", ">\n"
+        tag(END)
+        yield "</", "tr", ">\n"
+    tag(END)
+    yield "</", "html", ">\n"
+
+
+def yield_stream(table=None):
+    _re_amp = re_amp
+    yield START, ("html", "", "\n"), None
+    for r in table:
+        yield START, ("tr", "", "\n"), None
+
+        for c in r.values():
+            d = c + 1
+            yield START, ("td", "", "\n"), None
+
+            _tmp5 = d
+            if not isinstance(_tmp5, unicode):
+                _tmp5 = str(_tmp5)
+            if ('&' in _tmp5):
+                if (';' in _tmp5):
+                    _tmp5 = _re_amp.sub('&amp;', _tmp5)
+                else:
+                    _tmp5 = _tmp5.replace('&', '&amp;')
+            if ('<' in _tmp5):
+                _tmp5 = _tmp5.replace('<', '&lt;')
+            if ('>' in _tmp5):
+                _tmp5 = _tmp5.replace('>', '&gt;')
+            if ('"' in _tmp5):
+                _tmp5 = _tmp5.replace('"', '&quot;')
+            _tmp5 = "column-%s" % _tmp5
+
+            _tmp = d
+            if (_tmp.__class__ not in (str, unicode, int, float, )):
+                raise
+            if (_tmp is not None):
+                if not isinstance(_tmp, unicode):
+                    _tmp = str(_tmp)
+                if ('&' in _tmp):
+                    if (';' in _tmp):
+                        _tmp = _re_amp.sub('&amp;', _tmp)
+                    else:
+                        _tmp = _tmp.replace('&', '&amp;')
+                if ('<' in _tmp):
+                    _tmp = _tmp.replace('<', '&lt;')
+                if ('>' in _tmp):
+                    _tmp = _tmp.replace('>', '&gt;')
+            yield START, ("span", "", _tmp, " ", "class", _tmp5), None
+
+            yield END, ("span", "", "\n"), None
+            yield END, ("td", "", "\n"), None
+        yield END, ("tr", "", "\n"), None
+    yield END, ("html", "", "\n"), None
+
+from itertools import chain
+
+
+def bigtable_python_tokens(table=None, renderer=None):
+    iterable = renderer(table=table)
+    stream = chain(*iterable)
+    return "".join(stream)
+
+
+def bigtable_python_stream(table=None, renderer=None):
+    stream = renderer(table=table)
+    return "".join(stream_output(stream))
+
+
+def bigtable_python_stream_with_filter(table=None, renderer=None):
+    stream = renderer(table=table)
+    return "".join(stream_output(uppercase_filter(stream)))
+
+
+def uppercase_filter(stream):
+    for kind, data, pos in stream:
+        if kind is START:
+            data = (data[0], data[1], data[2].upper(),) + data[3:]
+        elif kind is END:
+            data = (data[0], data[1], data[2].upper())
+        elif kind is TAG:
+            raise NotImplemented
+        yield kind, data, pos
+
+
+def stream_output(stream):
+    for kind, data, pos in stream:
+        if kind is START:
+            tag = data[0]
+            yield "<%s" % tag
+            l = len(data)
+
+            # optimize for common cases
+            if l == 3:
+                pass
+            elif l == 6:
+                yield '%s%s="%s"' % (data[3], data[4], data[5])
+            else:
+                i = 3
+                while i < l:
+                    yield '%s%s="%s"' % (data[i], data[i + 1], data[i + 2])
+                    i += 3
+            yield "%s>%s" % (data[1], data[2])
+        elif kind is END:
+            yield "</%s%s>%s" % data
+        elif kind is TAG:
+            raise NotImplemented
+
+
+class Benchmarks(unittest.TestCase):
+    table = [dict(a=1, b=2, c=3, d=4, e=5, f=6, g=7, h=8, i=9, j=10) \
+             for x in range(1000)]
+
+    def setUp(self):
+        # set up i18n component
+        from zope.i18n import translate
+        from zope.i18n.interfaces import INegotiator
+        from zope.i18n.interfaces import ITranslationDomain
+        from zope.i18n.negotiator import Negotiator
+        from zope.i18n.simpletranslationdomain import SimpleTranslationDomain
+        from zope.i18n.tests.test_negotiator import Env
+        from zope.tales.tales import Context
+
+        self.env = Env(('klingon', 'da', 'en', 'fr', 'no'))
+
+        class ZopeI18NContext(Context):
+
+            def translate(self, msgid, domain=None, context=None,
+                          mapping=None, default=None):
+                context = self.vars['options']['env']
+                return translate(msgid, domain, mapping,
+                                 context=context, default=default)
+
+        def _getContext(self, contexts=None, **kwcontexts):
+            if contexts is not None:
+                if kwcontexts:
+                    kwcontexts.update(contexts)
+                else:
+                    kwcontexts = contexts
+            return ZopeI18NContext(self, kwcontexts)
+
+        def _pt_getEngineContext(namespace):
+            self = namespace['template']
+            engine = self.pt_getEngine()
+            return _getContext(engine, namespace)
+
+        import zope.component
+        zope.component.provideUtility(Negotiator(), INegotiator)
+        catalog = SimpleTranslationDomain('domain')
+        zope.component.provideUtility(catalog, ITranslationDomain, 'domain')
+        self.files = os.path.abspath(os.path.join(__file__, '..', 'input'))
+
+    @staticmethod
+    def _chameleon(body, **kwargs):
+        from .zpt.template import PageTemplate
+        return PageTemplate(body, **kwargs)
+
+    @staticmethod
+    def _zope(body):
+        from zope.pagetemplate.pagetemplatefile import PageTemplate
+        template = PageTemplate()
+        template.pt_edit(body, 'text/xhtml')
+        return template
+
+    @benchmark(text_("BIGTABLE [python]"))
+    def test_bigtable(self):
+        options = {'table': self.table}
+
+        t_chameleon = timing(self._chameleon(BIGTABLE_ZPT), options=options)
+        print("chameleon:         %7.2f" % t_chameleon)
+
+        t_chameleon_utf8 = timing(
+            self._chameleon(BIGTABLE_ZPT, encoding='utf-8'), options=options)
+        print("chameleon (utf-8): %7.2f" % t_chameleon_utf8)
+
+        t_tokens = timing(
+            bigtable_python_tokens, table=self.table, renderer=yield_tokens)
+        print("token:             %7.2f" % t_tokens)
+
+        t_tokens_dict_version = timing(
+            bigtable_python_tokens, table=self.table,
+            renderer=yield_tokens_dict_version)
+        print("token (dict):      %7.2f" % t_tokens_dict_version)
+
+        t_stream = timing(
+            bigtable_python_stream, table=self.table, renderer=yield_stream)
+        print("stream:            %7.2f" % t_stream)
+
+        t_zope = timing(self._zope(BIGTABLE_ZPT), table=self.table)
+        print("zope.pagetemplate: %7.2f" % t_zope)
+        print("                  %7.1fX" % (t_zope / t_chameleon))
+
+        print("--------------------------")
+        print("check: %d vs %d" % (
+            len(self._chameleon(BIGTABLE_ZPT)(options=options)),
+            len(self._zope(BIGTABLE_ZPT)(table=self.table))))
+        print("--------------------------")
+
+    @benchmark(text_("MANY STRINGS [python]"))
+    def test_many_strings(self):
+        t_chameleon = timing(self._chameleon(MANY_STRINGS_ZPT))
+        print("chameleon:         %7.2f" % t_chameleon)
+        t_zope = timing(self._zope(MANY_STRINGS_ZPT))
+        print("zope.pagetemplate: %7.2f" % t_zope)
+        print("                  %7.1fX" % (t_zope / t_chameleon))
+
+        print("--------------------------")
+        print("check: %d vs %d" % (
+            len(self._chameleon(MANY_STRINGS_ZPT)()),
+            len(self._zope(MANY_STRINGS_ZPT)())))
+        print("--------------------------")
+
+    @benchmark(text_("HELLO WORLD"))
+    def test_hello_world(self):
+        t_chameleon = timing(self._chameleon(HELLO_WORLD_ZPT)) * 1000
+        print("chameleon:         %7.2f" % t_chameleon)
+        t_zope = timing(self._zope(HELLO_WORLD_ZPT)) * 1000
+        print("zope.pagetemplate: %7.2f" % t_zope)
+        print("                  %7.1fX" % (t_zope / t_chameleon))
+
+        print("--------------------------")
+        print("check: %d vs %d" % (
+            len(self._chameleon(HELLO_WORLD_ZPT)()),
+            len(self._zope(HELLO_WORLD_ZPT)())))
+        print("--------------------------")
+
+    @benchmark(text_("I18N"))
+    def test_i18n(self):
+        from zope.i18n import translate
+        t_chameleon = timing(
+            self._chameleon(I18N_ZPT),
+            translate=translate,
+            language="klingon") * 1000
+        print("chameleon:         %7.2f" % t_chameleon)
+        t_zope = timing(self._zope(I18N_ZPT), env=self.env) * 1000
+        print("zope.pagetemplate: %7.2f" % t_zope)
+        print("                  %7.1fX" % (t_zope / t_chameleon))
+
+    @benchmark(text_("COMPILATION"))
+    def test_compilation(self):
+        template = self._chameleon(HELLO_WORLD_ZPT)
+
+        def chameleon_cook_and_render(template=template):
+            template.cook(HELLO_WORLD_ZPT)
+            template()
+
+        t_chameleon = timing(chameleon_cook_and_render) * 1000
+        print("chameleon:         %7.2f" % t_chameleon)
+
+        template = self._zope(HELLO_WORLD_ZPT)
+
+        def zope_cook_and_render(templte=template):
+            template._cook()
+            template()
+
+        t_zope = timing(zope_cook_and_render) * 1000
+        print("zope.pagetemplate: %7.2f" % t_zope)
+        print("                    %0.3fX" % (t_zope / t_chameleon))
+
+
+def start():
+    result = unittest.TestResult()
+    test = unittest.makeSuite(Benchmarks)
+    test.run(result)
+
+    for error in result.errors:
+        print("Error in %s...\n" % error[0])
+        print(error[1])
+
+    for failure in result.failures:
+        print("Failure in %s...\n" % failure[0])
+        print(failure[1])
diff --git a/lib/Chameleon-2.9.2/src/chameleon/codegen.py b/lib/Chameleon-2.9.2/src/chameleon/codegen.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/codegen.py
@@ -0,0 +1,221 @@
+try:
+    import ast
+except ImportError:
+    from chameleon import ast24 as ast
+
+import inspect
+import textwrap
+import types
+import copy
+
+try:
+    import __builtin__ as builtins
+except ImportError:
+    import builtins
+
+reverse_builtin_map = {}
+for name, value in builtins.__dict__.items():
+    try:
+        hash(value)
+    except TypeError:
+        continue
+
+    reverse_builtin_map[value] = name
+
+try:
+    basestring
+except NameError:
+    basestring = str
+
+from .astutil import ASTCodeGenerator
+from .astutil import load
+from .astutil import store
+from .astutil import parse
+from .astutil import Builtin
+from .astutil import Symbol
+from .astutil import node_annotations
+
+from .exc import CompilationError
+
+
+try:
+    NATIVE_NUMBERS = int, float, long, bool
+except NameError:
+    NATIVE_NUMBERS = int, float, bool
+
+
+def template(function, mode='exec', **kw):
+    def wrapper(*vargs, **kwargs):
+        symbols = dict(zip(args, vargs + defaults))
+        symbols.update(kwargs)
+
+        class Visitor(ast.NodeVisitor):
+            def visit_Name(self, node):
+                value = symbols.get(node.id, self)
+                if value is not self:
+                    if isinstance(value, basestring):
+                        value = load(value)
+                    if isinstance(value, type) or value in reverse_builtin_map:
+                        name = reverse_builtin_map.get(value)
+                        if name is not None:
+                            value = Builtin(name)
+                        else:
+                            value = Symbol(value)
+
+                    assert node not in node_annotations
+                    assert hasattr(value, '_fields')
+                    node_annotations[node] = value
+
+        expr = parse(source, mode=mode)
+        if not isinstance(function, basestring):
+            expr = expr.body[0]
+
+        Visitor().visit(expr)
+        return expr.body
+
+    if isinstance(function, basestring):
+        source = function
+        defaults = args = ()
+        return wrapper(**kw)
+
+    source = textwrap.dedent(inspect.getsource(function))
+    argspec = inspect.getargspec(function)
+    args = argspec[0]
+    defaults = argspec[3] or ()
+    return wrapper
+
+
+class TemplateCodeGenerator(ASTCodeGenerator):
+    """Extends the standard Python code generator class with handlers
+    for the helper node classes:
+
+    - Symbol (an importable value)
+    - Static (value that can be made global)
+    - Builtin (from the builtins module)
+    - Marker (short-hand for a unique static object)
+
+    """
+
+    names = ()
+
+    def __init__(self, tree):
+        self.imports = {}
+        self.defines = {}
+        self.markers = {}
+
+        # Generate code
+        super(TemplateCodeGenerator, self).__init__(tree)
+
+    def visit_Module(self, node):
+        super(TemplateCodeGenerator, self).visit_Module(node)
+
+        # Make sure we terminate the line printer
+        self.flush()
+
+        # Clear lines array for import visits
+        body = self.lines
+        self.lines = []
+
+        while self.defines:
+            name, node = self.defines.popitem()
+            assignment = ast.Assign(targets=[store(name)], value=node)
+            self.visit(assignment)
+
+        # Make sure we terminate the line printer
+        self.flush()
+
+        # Clear lines array for import visits
+        defines = self.lines
+        self.lines = []
+
+        while self.imports:
+            value, node = self.imports.popitem()
+
+            if isinstance(value, types.ModuleType):
+                stmt = ast.Import(
+                    names=[ast.alias(name=value.__name__, asname=node.id)])
+            elif hasattr(value, '__name__'):
+                path = reverse_builtin_map.get(value)
+                if path is None:
+                    path = value.__module__
+                    name = value.__name__
+                stmt = ast.ImportFrom(
+                    module=path,
+                    names=[ast.alias(name=name, asname=node.id)],
+                    level=0,
+                )
+            else:
+                raise TypeError(value)
+
+            self.visit(stmt)
+
+        # Clear last import
+        self.flush()
+
+        # Stich together lines
+        self.lines += defines + body
+
+    def define(self, name, node):
+        assert node is not None
+        value = self.defines.get(name)
+
+        if value is node:
+            pass
+        elif value is None:
+            self.defines[name] = node
+        else:
+            raise CompilationError(
+                "Duplicate symbol name for define.", name)
+
+        return load(name)
+
+    def require(self, value):
+        if value is None:
+            return load("None")
+
+        if isinstance(value, NATIVE_NUMBERS):
+            return ast.Num(value)
+
+        node = self.imports.get(value)
+        if node is None:
+            # we come up with a unique symbol based on the class name
+            name = "_%s" % getattr(value, '__name__', str(value)).\
+                   rsplit('.', 1)[-1]
+            node = load(name)
+            self.imports[value] = store(node.id)
+
+        return node
+
+    def visit(self, node):
+        annotation = node_annotations.get(node)
+        if annotation is None:
+            super(TemplateCodeGenerator, self).visit(node)
+        else:
+            self.visit(annotation)
+
+    def visit_Comment(self, node):
+        if node.stmt is None:
+            self._new_line()
+        else:
+            self.visit(node.stmt)
+
+        for line in node.text.replace('\r', '\n').split('\n'):
+            self._new_line()
+            self._write("%s#%s" % (node.space, line))
+
+    def visit_Builtin(self, node):
+        name = load(node.id)
+        self.visit(name)
+
+    def visit_Symbol(self, node):
+        node = self.require(node.value)
+        self.visit(node)
+
+    def visit_Static(self, node):
+        if node.name is None:
+            name = "_static_%d" % id(node.value)
+        else:
+            name = node.name
+
+        node = self.define(name, node.value)
+        self.visit(node)
diff --git a/lib/Chameleon-2.9.2/src/chameleon/compiler.py b/lib/Chameleon-2.9.2/src/chameleon/compiler.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/compiler.py
@@ -0,0 +1,1553 @@
+import re
+import sys
+import itertools
+import logging
+import threading
+import functools
+import collections
+import pickle
+import textwrap
+
+from .astutil import load
+from .astutil import store
+from .astutil import param
+from .astutil import swap
+from .astutil import subscript
+from .astutil import node_annotations
+from .astutil import annotated
+from .astutil import NameLookupRewriteVisitor
+from .astutil import Comment
+from .astutil import Symbol
+from .astutil import Builtin
+
+from .codegen import TemplateCodeGenerator
+from .codegen import template
+
+from .tal import ErrorInfo
+from .tal import NAME
+from .i18n import fast_translate
+
+from .nodes import Text
+from .nodes import Value
+from .nodes import Substitution
+from .nodes import Assignment
+from .nodes import Module
+from .nodes import Context
+
+from .tokenize import Token
+from .config import DEBUG_MODE
+from .exc import TranslationError
+from .exc import ExpressionError
+from .parser import groupdict
+
+from .utils import DebuggingOutputStream
+from .utils import char2entity
+from .utils import ListDictProxy
+from .utils import native_string
+from .utils import byte_string
+from .utils import string_type
+from .utils import unicode_string
+from .utils import version
+from .utils import ast
+from .utils import safe_native
+from .utils import builtins
+from .utils import decode_htmlentities
+
+
+if version >= (3, 0, 0):
+    long = int
+
+log = logging.getLogger('chameleon.compiler')
+
+COMPILER_INTERNALS_OR_DISALLOWED = set([
+    "econtext",
+    "rcontext",
+    "str",
+    "int",
+    "float",
+    "long",
+    "len",
+    "None",
+    "True",
+    "False",
+    "RuntimeError",
+    ])
+
+
+RE_MANGLE = re.compile('[^\w_]')
+RE_NAME = re.compile('^%s$' % NAME)
+
+if DEBUG_MODE:
+    LIST = template("cls()", cls=DebuggingOutputStream, mode="eval")
+else:
+    LIST = template("[]", mode="eval")
+
+
+def identifier(prefix, suffix=None):
+    return "__%s_%s" % (prefix, mangle(suffix or id(prefix)))
+
+
+def mangle(string):
+    return RE_MANGLE.sub('_', str(string)).replace('\n', '')
+
+
+def load_econtext(name):
+    return template("getitem(KEY)", KEY=ast.Str(s=name), mode="eval")
+
+
+def store_econtext(name):
+    name = native_string(name)
+    return subscript(name, load("econtext"), ast.Store())
+
+
+def store_rcontext(name):
+    name = native_string(name)
+    return subscript(name, load("rcontext"), ast.Store())
+
+
+def set_error(token, exception):
+    try:
+        line, column = token.location
+        filename = token.filename
+    except AttributeError:
+        line, column = 0, 0
+        filename = "<string>"
+
+    string = safe_native(token)
+
+    return template(
+        "rcontext.setdefault('__error__', [])."
+        "append((string, line, col, src, exc))",
+        string=ast.Str(s=string),
+        line=ast.Num(n=line),
+        col=ast.Num(n=column),
+        src=ast.Str(s=filename),
+        sys=Symbol(sys),
+        exc=exception,
+        )
+
+
+def try_except_wrap(stmts, token):
+    exception = template(
+        "exc_info()[1]", exc_info=Symbol(sys.exc_info), mode="eval"
+        )
+
+    body = set_error(token, exception) + template("raise")
+
+    return ast.TryExcept(
+        body=stmts,
+        handlers=[ast.ExceptHandler(body=body)],
+        )
+
+
+ at template
+def emit_node(node):  # pragma: no cover
+    __append(node)
+
+
+ at template
+def emit_node_if_non_trivial(node):  # pragma: no cover
+    if node is not None:
+        __append(node)
+
+
+ at template
+def emit_bool(target, s, default_marker=None,
+                 default=None):  # pragma: no cover
+    if target is default_marker:
+        target = default
+    elif target:
+        target = s
+    else:
+        target = None
+
+
+ at template
+def emit_convert(
+    target, encoded=byte_string, str=unicode_string,
+    long=long, type=type,
+    default_marker=None, default=None):  # pragma: no cover
+    if target is None:
+        pass
+    elif target is default_marker:
+        target = default
+    else:
+        __tt = type(target)
+
+        if __tt is int or __tt is float or __tt is long:
+            target = str(target)
+        elif __tt is encoded:
+            target = decode(target)
+        elif __tt is not str:
+            try:
+                target = target.__html__
+            except AttributeError:
+                __converted = convert(target)
+                target = str(target) if target is __converted else __converted
+            else:
+                target = target()
+
+
+ at template
+def emit_translate(target, msgid, default=None):  # pragma: no cover
+    target = translate(msgid, default=default, domain=__i18n_domain)
+
+
+ at template
+def emit_convert_and_escape(
+    target, quote=None, quote_entity=None, str=unicode_string, long=long,
+    type=type, encoded=byte_string,
+    default_marker=None, default=None):  # pragma: no cover
+    if target is None:
+        pass
+    elif target is default_marker:
+        target = default
+    else:
+        __tt = type(target)
+
+        if __tt is int or __tt is float or __tt is long:
+            target = str(target)
+        else:
+            try:
+                if __tt is encoded:
+                    target = decode(target)
+                elif __tt is not str:
+                    try:
+                        target = target.__html__
+                    except:
+                        __converted = convert(target)
+                        target = str(target) if target is __converted \
+                                 else __converted
+                    else:
+                        raise RuntimeError
+            except RuntimeError:
+                target = target()
+            else:
+                if target is not None:
+                    try:
+                        escape = __re_needs_escape(target) is not None
+                    except TypeError:
+                        pass
+                    else:
+                        if escape:
+                            # Character escape
+                            if '&' in target:
+                                target = target.replace('&', '&amp;')
+                            if '<' in target:
+                                target = target.replace('<', '&lt;')
+                            if '>' in target:
+                                target = target.replace('>', '&gt;')
+                            if quote is not None and quote in target:
+                                target = target.replace(quote, quote_entity)
+
+
+class Interpolator(object):
+    braces_required_regex = re.compile(
+        r'(?<!\\)\$({(?P<expression>.*)})',
+        re.DOTALL)
+
+    braces_optional_regex = re.compile(
+        r'(?<!\\)\$({(?P<expression>.*)}|(?P<variable>[A-Za-z][A-Za-z0-9_]*))',
+        re.DOTALL)
+
+    def __init__(self, expression, braces_required, translate=False):
+        self.expression = expression
+        self.regex = self.braces_required_regex if braces_required else \
+                     self.braces_optional_regex
+        self.translate = translate
+
+    def __call__(self, name, engine):
+        """The strategy is to find possible expression strings and
+        call the ``validate`` function of the parser to validate.
+
+        For every possible starting point, the longest possible
+        expression is tried first, then the second longest and so
+        forth.
+
+        Example 1:
+
+          ${'expressions use the ${<expression>} format'}
+
+        The entire expression is attempted first and it is also the
+        only one that validates.
+
+        Example 2:
+
+          ${'Hello'} ${'world!'}
+
+        Validation of the longest possible expression (the entire
+        string) will fail, while the second round of attempts,
+        ``${'Hello'}`` and ``${'world!'}`` respectively, validate.
+
+        """
+
+        body = []
+        nodes = []
+        text = self.expression
+
+        expr_map = {}
+        translate = self.translate
+
+        while text:
+            matched = text
+            m = self.regex.search(matched)
+            if m is None:
+                nodes.append(ast.Str(s=text))
+                break
+
+            part = text[:m.start()]
+            text = text[m.start():]
+
+            if part:
+                node = ast.Str(s=part)
+                nodes.append(node)
+
+            if not body:
+                target = name
+            else:
+                target = store("%s_%d" % (name.id, text.pos))
+
+            while True:
+                d = groupdict(m, matched)
+                string = d["expression"] or d["variable"] or ""
+
+                string = decode_htmlentities(string)
+
+                try:
+                    compiler = engine.parse(string)
+                    body += compiler.assign_text(target)
+                except ExpressionError:
+                    matched = matched[m.start():m.end() - 1]
+                    m = self.regex.search(matched)
+                    if m is None:
+                        raise
+                else:
+                    break
+
+            # If one or more expressions are not simple names, we
+            # disable translation.
+            if RE_NAME.match(string) is None:
+                translate = False
+
+            # if this is the first expression, use the provided
+            # assignment name; otherwise, generate one (here based
+            # on the string position)
+            node = load(target.id)
+            nodes.append(node)
+
+            expr_map[node] = safe_native(string)
+
+            text = text[len(m.group()):]
+
+        if len(nodes) == 1:
+            target = nodes[0]
+
+            if translate and isinstance(target, ast.Str):
+                target = template(
+                    "translate(msgid, domain=__i18n_domain, context=econtext)",
+                    msgid=target, mode="eval",
+                    )
+        else:
+            if translate:
+                formatting_string = ""
+                keys = []
+                values = []
+
+                for node in nodes:
+                    if isinstance(node, ast.Str):
+                        formatting_string += node.s
+                    else:
+                        string = expr_map[node]
+                        formatting_string += "${%s}" % string
+                        keys.append(ast.Str(s=string))
+                        values.append(node)
+
+                target = template(
+                    "translate(msgid, mapping=mapping, domain=__i18n_domain, context=econtext)",
+                    msgid=ast.Str(s=formatting_string),
+                    mapping=ast.Dict(keys=keys, values=values),
+                    mode="eval"
+                    )
+            else:
+                nodes = [
+                    template(
+                        "NODE if NODE is not None else ''",
+                        NODE=node, mode="eval"
+                        )
+                    for node in nodes
+                    ]
+
+                target = ast.BinOp(
+                    left=ast.Str(s="%s" * len(nodes)),
+                    op=ast.Mod(),
+                    right=ast.Tuple(elts=nodes, ctx=ast.Load()))
+
+        body += [ast.Assign(targets=[name], value=target)]
+        return body
+
+
+class ExpressionEngine(object):
+    """Expression engine.
+
+    This test demonstrates how to configure and invoke the engine.
+
+    >>> from chameleon import tales
+    >>> parser = tales.ExpressionParser({
+    ...     'python': tales.PythonExpr,
+    ...     'not': tales.NotExpr,
+    ...     'exists': tales.ExistsExpr,
+    ...     'string': tales.StringExpr,
+    ...     }, 'python')
+
+    >>> engine = ExpressionEngine(parser)
+
+    An expression evaluation function:
+
+    >>> eval = lambda expression: tales.test(
+    ...     tales.IdentityExpr(expression), engine)
+
+    We have provided 'python' as the default expression type. This
+    means that when no prefix is given, the expression is evaluated as
+    a Python expression:
+
+    >>> eval('not False')
+    True
+
+    Note that the ``type`` prefixes bind left. If ``not`` and
+    ``exits`` are two expression type prefixes, consider the
+    following::
+
+    >>> eval('not: exists: int(None)')
+    True
+
+    The pipe operator binds right. In the following example, but
+    arguments are evaluated against ``not: exists: ``.
+
+    >>> eval('not: exists: help')
+    False
+
+    >>> eval('string:test ${1}${2}')
+    'test 12'
+
+    """
+
+    supported_char_escape_set = set(('&', '<', '>'))
+
+    def __init__(self, parser, char_escape=(),
+                 default=None, default_marker=None):
+        self._parser = parser
+        self._char_escape = char_escape
+        self._default = default
+        self._default_marker = default_marker
+
+    def __call__(self, string, target):
+        # BBB: This method is deprecated. Instead, a call should first
+        # be made to ``parse`` and then one of the assignment methods
+        # ("value" or "text").
+
+        compiler = self.parse(string)
+        return compiler(string, target)
+
+    def parse(self, string):
+        expression = self._parser(string)
+        compiler = self.get_compiler(expression, string)
+        return ExpressionCompiler(compiler, self)
+
+    def get_compiler(self, expression, string):
+        def compiler(target, engine, result_type=None, *args):
+            stmts = expression(target, engine)
+
+            if result_type is not None:
+                method = getattr(self, '_convert_%s' % result_type)
+                steps = method(target, *args)
+                stmts.extend(steps)
+
+            return [try_except_wrap(stmts, string)]
+
+        return compiler
+
+    def _convert_bool(self, target, s):
+        """Converts value given by ``target`` to a string ``s`` if the
+        target is a true value, otherwise ``None``.
+        """
+
+        return emit_bool(
+            target, ast.Str(s=s),
+            default=self._default,
+            default_marker=self._default_marker
+            )
+
+    def _convert_text(self, target):
+        """Converts value given by ``target`` to text."""
+
+        if self._char_escape:
+            # This is a cop-out - we really only support a very select
+            # set of escape characters
+            other = set(self._char_escape) - self.supported_char_escape_set
+
+            if other:
+                for supported in '"', '\'', '':
+                    if supported in self._char_escape:
+                        quote = supported
+                        break
+                else:
+                    raise RuntimeError(
+                        "Unsupported escape set: %s." % repr(self._char_escape)
+                        )
+            else:
+                quote = '\0'
+
+            entity = char2entity(quote or '\0')
+
+            return emit_convert_and_escape(
+                target,
+                quote=ast.Str(s=quote),
+                quote_entity=ast.Str(s=entity),
+                default=self._default,
+                default_marker=self._default_marker,
+                )
+
+        return emit_convert(
+            target,
+            default=self._default,
+            default_marker=self._default_marker,
+            )
+
+
+class ExpressionCompiler(object):
+    def __init__(self, compiler, engine):
+        self.compiler = compiler
+        self.engine = engine
+
+    def assign_bool(self, target, s):
+        return self.compiler(target, self.engine, "bool", s)
+
+    def assign_text(self, target):
+        return self.compiler(target, self.engine, "text")
+
+    def assign_value(self, target):
+        return self.compiler(target, self.engine)
+
+
+class ExpressionEvaluator(object):
+    """Evaluates dynamic expression.
+
+    This is not particularly efficient, but supported for legacy
+    applications.
+
+    >>> from chameleon import tales
+    >>> parser = tales.ExpressionParser({'python': tales.PythonExpr}, 'python')
+    >>> engine = functools.partial(ExpressionEngine, parser)
+
+    >>> evaluate = ExpressionEvaluator(engine, {
+    ...     'foo': 'bar',
+    ...     })
+
+    The evaluation function is passed the local and remote context,
+    the expression type and finally the expression.
+
+    >>> evaluate({'boo': 'baz'}, {}, 'python', 'foo + boo')
+    'barbaz'
+
+    The cache is now primed:
+
+    >>> evaluate({'boo': 'baz'}, {}, 'python', 'foo + boo')
+    'barbaz'
+
+    Note that the call method supports currying of the expression
+    argument:
+
+    >>> python = evaluate({'boo': 'baz'}, {}, 'python')
+    >>> python('foo + boo')
+    'barbaz'
+
+    """
+
+    __slots__ = "_engine", "_cache", "_names", "_builtins"
+
+    def __init__(self, engine, builtins):
+        self._engine = engine
+        self._names, self._builtins = zip(*builtins.items())
+        self._cache = {}
+
+    def __call__(self, econtext, rcontext, expression_type, string=None):
+        if string is None:
+            return functools.partial(
+                self.__call__, econtext, rcontext, expression_type
+                )
+
+        expression = "%s:%s" % (expression_type, string)
+
+        try:
+            evaluate = self._cache[expression]
+        except KeyError:
+            assignment = Assignment(["_result"], expression, True)
+            module = Module("evaluate", Context(assignment))
+
+            compiler = Compiler(
+                self._engine, module, ('econtext', 'rcontext') + self._names
+                )
+
+            env = {}
+            exec(compiler.code, env)
+            evaluate = self._cache[expression] = env["evaluate"]
+
+        evaluate(econtext, rcontext, *self._builtins)
+        return econtext['_result']
+
+
+class NameTransform(object):
+    """
+    >>> nt = NameTransform(
+    ...     set(('foo', 'bar', )), {'boo': 'boz'},
+    ...     ('econtext', ),
+    ... )
+
+    >>> def test(node):
+    ...     rewritten = nt(node)
+    ...     module = ast.Module([ast.fix_missing_locations(rewritten)])
+    ...     codegen = TemplateCodeGenerator(module)
+    ...     return codegen.code
+
+    Any odd name:
+
+    >>> test(load('frobnitz'))
+    "getitem('frobnitz')"
+
+    A 'builtin' name will first be looked up via ``get`` allowing fall
+    back to the global builtin value:
+
+    >>> test(load('foo'))
+    "get('foo', foo)"
+
+    Internal names (with two leading underscores) are left alone:
+
+    >>> test(load('__internal'))
+    '__internal'
+
+    Compiler internals or disallowed names:
+
+    >>> test(load('econtext'))
+    'econtext'
+
+    Aliased names:
+
+    >>> test(load('boo'))
+    'boz'
+
+    """
+
+    def __init__(self, builtins, aliases, internals):
+        self.builtins = builtins
+        self.aliases = aliases
+        self.internals = internals
+
+    def __call__(self, node):
+        name = node.id
+
+        # Don't rewrite names that begin with an underscore; they are
+        # internal and can be assumed to be locally defined. This
+        # policy really should be part of the template program, not
+        # defined here in the compiler.
+        if name.startswith('__') or name in self.internals:
+            return node
+
+        if isinstance(node.ctx, ast.Store):
+            return store_econtext(name)
+
+        aliased = self.aliases.get(name)
+        if aliased is not None:
+            return load(aliased)
+
+        # If the name is a Python global, first try acquiring it from
+        # the dynamic context, then fall back to the global.
+        if name in self.builtins:
+            return template(
+                "get(key, name)",
+                mode="eval",
+                key=ast.Str(s=name),
+                name=load(name),
+                )
+
+        # Otherwise, simply acquire it from the dynamic context.
+        return load_econtext(name)
+
+
+class ExpressionTransform(object):
+    """Internal wrapper to transform expression nodes into assignment
+    statements.
+
+    The node input may use the provided expression engine, but other
+    expression node types are supported such as ``Builtin`` which
+    simply resolves a built-in name.
+
+    Used internally be the compiler.
+    """
+
+    loads_symbol = Symbol(pickle.loads)
+
+    def __init__(self, engine_factory, cache, visitor, strict=True):
+        self.engine_factory = engine_factory
+        self.cache = cache
+        self.strict = strict
+        self.visitor = visitor
+
+    def __call__(self, expression, target):
+        if isinstance(target, string_type):
+            target = store(target)
+
+        try:
+            stmts = self.translate(expression, target)
+        except ExpressionError:
+            if self.strict:
+                raise
+
+            exc = sys.exc_info()[1]
+            p = pickle.dumps(exc)
+
+            stmts = template(
+                "__exc = loads(p)", loads=self.loads_symbol, p=ast.Str(s=p)
+                )
+
+            token = Token(exc.token, exc.offset, filename=exc.filename)
+
+            stmts += set_error(token, load("__exc"))
+            stmts += [ast.Raise(exc=load("__exc"))]
+
+        # Apply visitor to each statement
+        for stmt in stmts:
+            self.visitor(stmt)
+
+        return stmts
+
+    def translate(self, expression, target):
+        if isinstance(target, string_type):
+            target = store(target)
+
+        cached = self.cache.get(expression)
+
+        if cached is not None:
+            stmts = [ast.Assign(targets=[target], value=cached)]
+        elif isinstance(expression, ast.expr):
+            stmts = [ast.Assign(targets=[target], value=expression)]
+        else:
+            # The engine interface supports simple strings, which
+            # default to expression nodes
+            if isinstance(expression, string_type):
+                expression = Value(expression, True)
+
+            kind = type(expression).__name__
+            visitor = getattr(self, "visit_%s" % kind)
+            stmts = visitor(expression, target)
+
+            # Add comment
+            target_id = getattr(target, "id", target)
+            comment = Comment(" %r -> %s" % (expression, target_id))
+            stmts.insert(0, comment)
+
+        return stmts
+
+    def visit_Value(self, node, target):
+        engine = self.engine_factory()
+        compiler = engine.parse(node.value)
+        return compiler.assign_value(target)
+
+    def visit_Default(self, node, target):
+        value = annotated(node.marker)
+        return [ast.Assign(targets=[target], value=value)]
+
+    def visit_Substitution(self, node, target):
+        engine = self.engine_factory(
+            char_escape=node.char_escape,
+            default=node.default,
+            )
+        compiler = engine.parse(node.value)
+        return compiler.assign_text(target)
+
+    def visit_Negate(self, node, target):
+        return self.translate(node.value, target) + \
+               template("TARGET = not TARGET", TARGET=target)
+
+    def visit_Identity(self, node, target):
+        expression = self.translate(node.expression, "__expression")
+        value = self.translate(node.value, "__value")
+
+        return expression + value + \
+               template("TARGET = __expression is __value", TARGET=target)
+
+    def visit_Equality(self, node, target):
+        expression = self.translate(node.expression, "__expression")
+        value = self.translate(node.value, "__value")
+
+        return expression + value + \
+               template("TARGET = __expression == __value", TARGET=target)
+
+    def visit_Boolean(self, node, target):
+        engine = self.engine_factory()
+        compiler = engine.parse(node.value)
+        return compiler.assign_bool(target, node.s)
+
+    def visit_Interpolation(self, node, target):
+        expr = node.value
+        if isinstance(expr, Substitution):
+            engine = self.engine_factory(
+                char_escape=expr.char_escape,
+                default=expr.default,
+                )
+        elif isinstance(expr, Value):
+            engine = self.engine_factory()
+        else:
+            raise RuntimeError("Bad value: %r." % node.value)
+
+        interpolator = Interpolator(
+            expr.value, node.braces_required, node.translation
+            )
+
+        compiler = engine.get_compiler(interpolator, expr.value)
+        return compiler(target, engine)
+
+    def visit_Translate(self, node, target):
+        if node.msgid is not None:
+            msgid = ast.Str(s=node.msgid)
+        else:
+            msgid = target
+        return self.translate(node.node, target) + \
+               emit_translate(target, msgid, default=target)
+
+    def visit_Static(self, node, target):
+        value = annotated(node)
+        return [ast.Assign(targets=[target], value=value)]
+
+    def visit_Builtin(self, node, target):
+        value = annotated(node)
+        return [ast.Assign(targets=[target], value=value)]
+
+
+class Compiler(object):
+    """Generic compiler class.
+
+    Iterates through nodes and yields Python statements which form a
+    template program.
+    """
+
+    exceptions = NameError, \
+                 ValueError, \
+                 AttributeError, \
+                 LookupError, \
+                 TypeError
+
+    defaults = {
+        'translate': Symbol(fast_translate),
+        'decode': Builtin("str"),
+        'convert': Builtin("str"),
+        }
+
+    lock = threading.Lock()
+
+    global_builtins = set(builtins.__dict__)
+
+    def __init__(self, engine_factory, node, builtins={}, strict=True):
+        self._scopes = [set()]
+        self._expression_cache = {}
+        self._translations = []
+        self._builtins = builtins
+        self._aliases = [{}]
+        self._macros = []
+        self._current_slot = []
+
+        internals = COMPILER_INTERNALS_OR_DISALLOWED | \
+                    set(self.defaults)
+
+        transform = NameTransform(
+            self.global_builtins | set(builtins),
+            ListDictProxy(self._aliases),
+            internals,
+            )
+
+        self._visitor = visitor = NameLookupRewriteVisitor(transform)
+
+        self._engine = ExpressionTransform(
+            engine_factory,
+            self._expression_cache,
+            visitor,
+            strict=strict,
+            )
+
+        if isinstance(node_annotations, dict):
+            self.lock.acquire()
+            backup = node_annotations.copy()
+        else:
+            backup = None
+
+        try:
+            module = ast.Module([])
+            module.body += self.visit(node)
+            ast.fix_missing_locations(module)
+            generator = TemplateCodeGenerator(module)
+        finally:
+            if backup is not None:
+                node_annotations.clear()
+                node_annotations.update(backup)
+                self.lock.release()
+
+        self.code = generator.code
+
+    def visit(self, node):
+        if node is None:
+            return ()
+        kind = type(node).__name__
+        visitor = getattr(self, "visit_%s" % kind)
+        iterator = visitor(node)
+        return list(iterator)
+
+    def visit_Sequence(self, node):
+        for item in node.items:
+            for stmt in self.visit(item):
+                yield stmt
+
+    def visit_Element(self, node):
+        self._aliases.append(self._aliases[-1].copy())
+
+        for stmt in self.visit(node.start):
+            yield stmt
+
+        for stmt in self.visit(node.content):
+            yield stmt
+
+        if node.end is not None:
+            for stmt in self.visit(node.end):
+                yield stmt
+
+        self._aliases.pop()
+
+    def visit_Module(self, node):
+        body = []
+
+        body += template("import re")
+        body += template("import functools")
+        body += template("__marker = object()")
+        body += template(
+            r"g_re_amp = re.compile(r'&(?!([A-Za-z]+|#[0-9]+);)')"
+        )
+        body += template(
+            r"g_re_needs_escape = re.compile(r'[&<>\"\']').search")
+
+        body += template(
+            r"__re_whitespace = "
+            r"functools.partial(re.compile('\s+').sub, ' ')",
+        )
+
+        # Visit module content
+        program = self.visit(node.program)
+
+        body += [ast.FunctionDef(
+            name=node.name, args=ast.arguments(
+                args=[param(b) for b in self._builtins],
+                defaults=(),
+                ),
+            body=program
+            )]
+
+        return body
+
+    def visit_MacroProgram(self, node):
+        functions = []
+
+        # Visit defined macros
+        macros = getattr(node, "macros", ())
+        names = []
+        for macro in macros:
+            stmts = self.visit(macro)
+            function = stmts[-1]
+            names.append(function.name)
+            functions += stmts
+
+        # Return function dictionary
+        functions += [ast.Return(value=ast.Dict(
+            keys=[ast.Str(s=name) for name in names],
+            values=[load(name) for name in names],
+            ))]
+
+        return functions
+
+    def visit_Context(self, node):
+        return template("getitem = econtext.__getitem__") + \
+               template("get = econtext.get") + \
+               self.visit(node.node)
+
+    def visit_Macro(self, node):
+        body = []
+
+        # Initialization
+        body += template("__append = __stream.append")
+        body += template("__re_amp = g_re_amp")
+        body += template("__re_needs_escape = g_re_needs_escape")
+
+        # Resolve defaults
+        for name in self.defaults:
+            body += template(
+                "NAME = econtext[KEY]",
+                NAME=name, KEY=ast.Str(s="__" + name)
+            )
+
+        # Internal set of defined slots
+        self._slots = set()
+
+        # Visit macro body
+        nodes = itertools.chain(*tuple(map(self.visit, node.body)))
+
+        # Slot resolution
+        for name in self._slots:
+            body += template(
+                "try: NAME = econtext[KEY].pop()\n"
+                "except: NAME = None",
+                KEY=ast.Str(s=name), NAME=store(name))
+
+        # Append visited nodes
+        body += nodes
+
+        function_name = "render" if node.name is None else \
+                        "render_%s" % mangle(node.name)
+
+        function = ast.FunctionDef(
+            name=function_name, args=ast.arguments(
+                args=[
+                    param("__stream"),
+                    param("econtext"),
+                    param("rcontext"),
+                    param("__i18n_domain"),
+                    ],
+                defaults=[load("None")],
+            ),
+            body=body
+            )
+
+        yield function
+
+    def visit_Text(self, node):
+        return emit_node(ast.Str(s=node.value))
+
+    def visit_Domain(self, node):
+        backup = "__previous_i18n_domain_%d" % id(node)
+        return template("BACKUP = __i18n_domain", BACKUP=backup) + \
+               template("__i18n_domain = NAME", NAME=ast.Str(s=node.name)) + \
+               self.visit(node.node) + \
+               template("__i18n_domain = BACKUP", BACKUP=backup)
+
+    def visit_OnError(self, node):
+        body = []
+
+        fallback = identifier("__fallback")
+        body += template("fallback = len(__stream)", fallback=fallback)
+
+        self._enter_assignment((node.name, ))
+        fallback_body = self.visit(node.fallback)
+        self._leave_assignment((node.name, ))
+
+        error_assignment = template(
+            "econtext[key] = cls(__exc, rcontext['__error__'][-1][1:3])",
+            cls=ErrorInfo,
+            key=ast.Str(s=node.name),
+            )
+
+        body += [ast.TryExcept(
+            body=self.visit(node.node),
+            handlers=[ast.ExceptHandler(
+                type=ast.Tuple(elts=[Builtin("Exception")], ctx=ast.Load()),
+                name=store("__exc"),
+                body=(error_assignment + \
+                      template("del __stream[fallback:]", fallback=fallback) + \
+                      fallback_body
+                      ),
+                )]
+            )]
+
+        return body
+
+    def visit_Content(self, node):
+        name = "__content"
+        body = self._engine(node.expression, store(name))
+
+        if node.translate:
+            body += emit_translate(name, name)
+
+        if node.char_escape:
+            body += emit_convert_and_escape(name)
+        else:
+            body += emit_convert(name)
+
+        body += template("if NAME is not None: __append(NAME)", NAME=name)
+
+        return body
+
+    def visit_Interpolation(self, node):
+        name = identifier("content")
+        return self._engine(node, name) + \
+               emit_node_if_non_trivial(name)
+
+    def visit_Alias(self, node):
+        assert len(node.names) == 1
+        name = node.names[0]
+        target = self._aliases[-1][name] = identifier(name, id(node))
+        return self._engine(node.expression, target)
+
+    def visit_Assignment(self, node):
+        for name in node.names:
+            if name in COMPILER_INTERNALS_OR_DISALLOWED:
+                raise TranslationError(
+                    "Name disallowed by compiler.", name
+                    )
+
+            if name.startswith('__'):
+                raise TranslationError(
+                    "Name disallowed by compiler (double underscore).",
+                    name
+                    )
+
+        assignment = self._engine(node.expression, store("__value"))
+
+        if len(node.names) != 1:
+            target = ast.Tuple(
+                elts=[store_econtext(name) for name in node.names],
+                ctx=ast.Store(),
+            )
+        else:
+            target = store_econtext(node.names[0])
+
+        assignment.append(ast.Assign(targets=[target], value=load("__value")))
+
+        for name in node.names:
+            if not node.local:
+                assignment += template(
+                    "rcontext[KEY] = __value", KEY=ast.Str(s=native_string(name))
+                    )
+
+        return assignment
+
+    def visit_Define(self, node):
+        scope = set(self._scopes[-1])
+        self._scopes.append(scope)
+
+        for assignment in node.assignments:
+            if assignment.local:
+                for stmt in self._enter_assignment(assignment.names):
+                    yield stmt
+
+            for stmt in self.visit(assignment):
+                yield stmt
+
+        for stmt in self.visit(node.node):
+            yield stmt
+
+        for assignment in node.assignments:
+            if assignment.local:
+                for stmt in self._leave_assignment(assignment.names):
+                    yield stmt
+
+        self._scopes.pop()
+
+    def visit_Omit(self, node):
+        return self.visit_Condition(node)
+
+    def visit_Condition(self, node):
+        target = "__condition"
+        assignment = self._engine(node.expression, target)
+
+        assert assignment
+
+        for stmt in assignment:
+            yield stmt
+
+        body = self.visit(node.node) or [ast.Pass()]
+
+        orelse = getattr(node, "orelse", None)
+        if orelse is not None:
+            orelse = self.visit(orelse)
+
+        test = load(target)
+
+        yield ast.If(test=test, body=body, orelse=orelse)
+
+    def visit_Translate(self, node):
+        """Translation.
+
+        Visit items and assign output to a default value.
+
+        Finally, compile a translation expression and use either
+        result or default.
+        """
+
+        body = []
+
+        # Track the blocks of this translation
+        self._translations.append(set())
+
+        # Prepare new stream
+        append = identifier("append", id(node))
+        stream = identifier("stream", id(node))
+        body += template("s = new_list", s=stream, new_list=LIST) + \
+                template("a = s.append", a=append, s=stream)
+
+        # Visit body to generate the message body
+        code = self.visit(node.node)
+        swap(ast.Suite(body=code), load(append), "__append")
+        body += code
+
+        # Reduce white space and assign as message id
+        msgid = identifier("msgid", id(node))
+        body += template(
+            "msgid = __re_whitespace(''.join(stream)).strip()",
+            msgid=msgid, stream=stream
+        )
+
+        default = msgid
+
+        # Compute translation block mapping if applicable
+        names = self._translations[-1]
+        if names:
+            keys = []
+            values = []
+
+            for name in names:
+                stream, append = self._get_translation_identifiers(name)
+                keys.append(ast.Str(s=name))
+                values.append(load(stream))
+
+                # Initialize value
+                body.insert(
+                    0, ast.Assign(
+                        targets=[store(stream)],
+                        value=ast.Str(s=native_string(""))))
+
+            mapping = ast.Dict(keys=keys, values=values)
+        else:
+            mapping = None
+
+        # if this translation node has a name, use it as the message id
+        if node.msgid:
+            msgid = ast.Str(s=node.msgid)
+
+        # emit the translation expression
+        body += template(
+            "__append(translate("
+            "msgid, mapping=mapping, default=default, domain=__i18n_domain, context=econtext))",
+            msgid=msgid, default=default, mapping=mapping
+            )
+
+        # pop away translation block reference
+        self._translations.pop()
+
+        return body
+
+    def visit_Start(self, node):
+        try:
+            line, column = node.prefix.location
+        except AttributeError:
+            line, column = 0, 0
+
+        yield Comment(
+            " %s%s ... (%d:%d)\n"
+            " --------------------------------------------------------" % (
+                node.prefix, node.name, line, column))
+
+        if node.attributes:
+            for stmt in emit_node(ast.Str(s=node.prefix + node.name)):
+                yield stmt
+
+            for attribute in node.attributes:
+                for stmt in self.visit(attribute):
+                    yield stmt
+
+            for stmt in emit_node(ast.Str(s=node.suffix)):
+                yield stmt
+        else:
+            for stmt in emit_node(
+                ast.Str(s=node.prefix + node.name + node.suffix)):
+                yield stmt
+
+    def visit_End(self, node):
+        for stmt in emit_node(ast.Str(
+            s=node.prefix + node.name + node.space + node.suffix)):
+            yield stmt
+
+    def visit_Attribute(self, node):
+        f = node.space + node.name + node.eq + node.quote + "%s" + node.quote
+
+        # Static attributes are just outputted directly
+        if isinstance(node.expression, ast.Str):
+            s = f % node.expression.s
+            return template("__append(S)", S=ast.Str(s=s))
+
+        target = identifier("attr", node.name)
+        body = self._engine(node.expression, store(target))
+        return body + template(
+            "if TARGET is not None: __append(FORMAT % TARGET)",
+            FORMAT=ast.Str(s=f),
+            TARGET=target,
+            )
+
+    def visit_Cache(self, node):
+        body = []
+
+        for expression in node.expressions:
+            name = identifier("cache", id(expression))
+            target = store(name)
+
+            # Skip re-evaluation
+            if self._expression_cache.get(expression):
+                continue
+
+            body += self._engine(expression, target)
+            self._expression_cache[expression] = target
+
+        body += self.visit(node.node)
+
+        return body
+
+    def visit_UseInternalMacro(self, node):
+        if node.name is None:
+            render = "render"
+        else:
+            render = "render_%s" % mangle(node.name)
+
+        return template(
+            "f(__stream, econtext.copy(), rcontext, __i18n_domain)",
+            f=render) + \
+            template("econtext.update(rcontext)")
+
+    def visit_DefineSlot(self, node):
+        name = "__slot_%s" % mangle(node.name)
+        body = self.visit(node.node)
+
+        self._slots.add(name)
+
+        orelse = template(
+            "SLOT(__stream, econtext.copy(), rcontext)",
+            SLOT=name)
+        test = ast.Compare(
+            left=load(name),
+            ops=[ast.Is()],
+            comparators=[load("None")]
+            )
+
+        return [
+            ast.If(test=test, body=body or [ast.Pass()], orelse=orelse)
+            ]
+
+    def visit_Name(self, node):
+        """Translation name."""
+
+        if not self._translations:
+            raise TranslationError(
+                "Not allowed outside of translation.", node.name)
+
+        if node.name in self._translations[-1]:
+            raise TranslationError(
+                "Duplicate translation name: %s." % node.name)
+
+        self._translations[-1].add(node.name)
+        body = []
+
+        # prepare new stream
+        stream, append = self._get_translation_identifiers(node.name)
+        body += template("s = new_list", s=stream, new_list=LIST) + \
+                template("a = s.append", a=append, s=stream)
+
+        # generate code
+        code = self.visit(node.node)
+        swap(ast.Suite(body=code), load(append), "__append")
+        body += code
+
+        # output msgid
+        text = Text('${%s}' % node.name)
+        body += self.visit(text)
+
+        # Concatenate stream
+        body += template("stream = ''.join(stream)", stream=stream)
+
+        return body
+
+    def visit_CodeBlock(self, node):
+        stmts = template(textwrap.dedent(node.source.strip('\n')))
+
+        for stmt in stmts:
+            self._visitor(stmt)
+
+        return stmts
+
+    def visit_UseExternalMacro(self, node):
+        self._macros.append(node.extend)
+
+        callbacks = []
+        for slot in node.slots:
+            key = "__slot_%s" % mangle(slot.name)
+            fun = "__fill_%s" % mangle(slot.name)
+
+            self._current_slot.append(slot.name)
+
+            body = template("getitem = econtext.__getitem__") + \
+                   template("get = econtext.get") + \
+                   self.visit(slot.node)
+
+            assert self._current_slot.pop() == slot.name
+
+            callbacks.append(
+                ast.FunctionDef(
+                    name=fun,
+                    args=ast.arguments(
+                        args=[
+                            param("__stream"),
+                            param("econtext"),
+                            param("rcontext"),
+                            param("__i18n_domain"),
+                            ],
+                        defaults=[load("__i18n_domain")],
+                        ),
+                    body=body or [ast.Pass()],
+                ))
+
+            key = ast.Str(s=key)
+
+            assignment = template(
+                "_slots = econtext[KEY] = DEQUE((NAME,))",
+                KEY=key, NAME=fun, DEQUE=Symbol(collections.deque),
+                )
+
+            if node.extend:
+                append = template("_slots.appendleft(NAME)", NAME=fun)
+
+                assignment = [ast.TryExcept(
+                    body=template("_slots = getitem(KEY)", KEY=key),
+                    handlers=[ast.ExceptHandler(body=assignment)],
+                    orelse=append,
+                    )]
+
+            callbacks.extend(assignment)
+
+        assert self._macros.pop() == node.extend
+
+        assignment = self._engine(node.expression, store("__macro"))
+
+        return (
+            callbacks + \
+            assignment + \
+            template(
+                "__macro.include(__stream, econtext.copy(), " \
+                "rcontext, __i18n_domain)") + \
+            template("econtext.update(rcontext)")
+            )
+
+    def visit_Repeat(self, node):
+        # Used for loop variable definition and restore
+        self._scopes.append(set())
+
+        # Variable assignment and repeat key for single- and
+        # multi-variable repeat clause
+        if node.local:
+            contexts = "econtext",
+        else:
+            contexts = "econtext", "rcontext"
+
+        for name in node.names:
+            if name in COMPILER_INTERNALS_OR_DISALLOWED:
+                raise TranslationError(
+                    "Name disallowed by compiler.", name
+                    )
+
+        if len(node.names) > 1:
+            targets = [
+                ast.Tuple(elts=[
+                    subscript(native_string(name), load(context), ast.Store())
+                    for name in node.names], ctx=ast.Store())
+                for context in contexts
+                ]
+
+            key = ast.Tuple(
+                elts=[ast.Str(s=name) for name in node.names],
+                ctx=ast.Load())
+        else:
+            name = node.names[0]
+            targets = [
+                subscript(native_string(name), load(context), ast.Store())
+                for context in contexts
+                ]
+
+            key = ast.Str(s=node.names[0])
+
+        index = identifier("__index", id(node))
+        assignment = [ast.Assign(targets=targets, value=load("__item"))]
+
+        # Make repeat assignment in outer loop
+        names = node.names
+        local = node.local
+
+        outer = self._engine(node.expression, store("__iterator"))
+
+        if local:
+            outer[:] = list(self._enter_assignment(names)) + outer
+
+        outer += template(
+            "__iterator, INDEX = getitem('repeat')(key, __iterator)",
+            key=key, INDEX=index
+            )
+
+        # Set a trivial default value for each name assigned to make
+        # sure we assign a value even if the iteration is empty
+        outer += [ast.Assign(
+            targets=[store_econtext(name)
+                     for name in node.names],
+            value=load("None"))
+              ]
+
+        # Compute inner body
+        inner = self.visit(node.node)
+
+        # After each iteration, decrease the index
+        inner += template("index -= 1", index=index)
+
+        # For items up to N - 1, emit repeat whitespace
+        inner += template(
+            "if INDEX > 0: __append(WHITESPACE)",
+            INDEX=index, WHITESPACE=ast.Str(s=node.whitespace)
+            )
+
+        # Main repeat loop
+        outer += [ast.For(
+            target=store("__item"),
+            iter=load("__iterator"),
+            body=assignment + inner,
+            )]
+
+        # Finally, clean up assignment if it's local
+        if outer:
+            outer += self._leave_assignment(names)
+
+        self._scopes.pop()
+
+        return outer
+
+    def _get_translation_identifiers(self, name):
+        assert self._translations
+        prefix = id(self._translations[-1])
+        stream = identifier("stream_%d" % prefix, name)
+        append = identifier("append_%d" % prefix, name)
+        return stream, append
+
+    def _enter_assignment(self, names):
+        for name in names:
+            for stmt in template(
+                "BACKUP = get(KEY, __marker)",
+                BACKUP=identifier("backup_%s" % name, id(names)),
+                KEY=ast.Str(s=native_string(name)),
+                ):
+                yield stmt
+
+    def _leave_assignment(self, names):
+        for name in names:
+            for stmt in template(
+                "if BACKUP is __marker: del econtext[KEY]\n"
+                "else:                 econtext[KEY] = BACKUP",
+                BACKUP=identifier("backup_%s" % name, id(names)),
+                KEY=ast.Str(s=native_string(name)),
+                ):
+                yield stmt
diff --git a/lib/Chameleon-2.9.2/src/chameleon/config.py b/lib/Chameleon-2.9.2/src/chameleon/config.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/config.py
@@ -0,0 +1,47 @@
+import os
+import logging
+
+log = logging.getLogger('chameleon.config')
+
+# Define which values are read as true
+TRUE = ('y', 'yes', 't', 'true', 'on', '1')
+
+# If eager parsing is enabled, templates are parsed upon
+# instantiation, rather than when first called upon; this mode is
+# useful for verifying validity of templates across a project
+EAGER_PARSING = os.environ.pop('CHAMELEON_EAGER', 'false')
+EAGER_PARSING = EAGER_PARSING.lower() in TRUE
+
+# Debug mode is mostly useful for debugging the template engine
+# itself. When enabled, generated source code is written to disk to
+# ease step-debugging and some log levels are lowered to increase
+# output. Also, the generated source code is available in the
+# ``source`` attribute of the template instance if compilation
+# succeeded.
+DEBUG_MODE = os.environ.pop('CHAMELEON_DEBUG', 'false')
+DEBUG_MODE = DEBUG_MODE.lower() in TRUE
+
+# If a cache directory is specified, template source code will be
+# persisted on disk and reloaded between sessions
+path = os.environ.pop('CHAMELEON_CACHE', None)
+if path is not None:
+    CACHE_DIRECTORY = os.path.abspath(path)
+    if not os.path.exists(CACHE_DIRECTORY):
+        raise ValueError(
+            "Cache directory does not exist: %s." % CACHE_DIRECTORY
+            )
+    log.info("directory cache: %s." % CACHE_DIRECTORY)
+else:
+    CACHE_DIRECTORY = None
+
+# When auto-reload is enabled, templates are reloaded on file change.
+AUTO_RELOAD = os.environ.pop('CHAMELEON_RELOAD', 'false')
+AUTO_RELOAD = AUTO_RELOAD.lower() in TRUE
+
+for key in os.environ:
+    if key.lower().startswith('chameleon'):
+        log.warn("unknown environment variable set: \"%s\"." % key)
+
+# This is the slice length of the expression displayed in the
+# formatted exception string
+SOURCE_EXPRESSION_MARKER_LENGTH = 60
diff --git a/lib/Chameleon-2.9.2/src/chameleon/exc.py b/lib/Chameleon-2.9.2/src/chameleon/exc.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/exc.py
@@ -0,0 +1,289 @@
+# -*- coding: utf-8 -*-
+
+import traceback
+
+from .utils import format_kwargs
+from .utils import safe_native
+from .tokenize import Token
+from .config import SOURCE_EXPRESSION_MARKER_LENGTH as LENGTH
+
+
+def compute_source_marker(line, column, expression, size):
+    """Computes source marker location string.
+
+    >>> def test(l, c, e, s):
+    ...     s, marker = compute_source_marker(l, c, e, s)
+    ...     out = s + '\\n' + marker
+    ...
+    ...     # Replace dot with middle-dot to work around doctest ellipsis
+    ...     print(out.replace('...', '??????'))
+
+    >>> test('foo bar', 4, 'bar', 7)
+    foo bar
+        ^^^
+
+    >>> test('foo ${bar}', 4, 'bar', 10)
+    foo ${bar}
+          ^^^
+
+    >>> test('  foo bar', 6, 'bar', 6)
+    ?????? oo bar
+           ^^^
+
+    >>> test('  foo bar baz  ', 6, 'bar', 6)
+    ?????? o bar ??????
+          ^^^
+
+    The entire expression is always shown, even if ``size`` does not
+    accomodate for it.
+
+    >>> test('  foo bar baz  ', 6, 'bar baz', 10)
+    ?????? oo bar baz
+           ^^^^^^^
+
+    >>> test('      foo bar', 10, 'bar', 5)
+    ?????? o bar
+          ^^^
+
+    >>> test('      foo bar', 10, 'boo', 5)
+    ?????? o bar
+          ^
+
+    """
+
+    s = line.lstrip()
+    column -= len(line) - len(s)
+    s = s.rstrip()
+
+    try:
+        i  = s[column:].index(expression)
+    except ValueError:
+        # If we can't find the expression
+        # (this shouldn't happen), simply
+        # use a standard size marker
+        marker = "^"
+    else:
+        column += i
+        marker = "^" * len(expression)
+
+    if len(expression) > size:
+        offset = column
+        size = len(expression)
+    else:
+        window = (size - len(expression)) / 2.0
+        offset = column - window
+        offset -= min(3, max(0, column + window + len(expression) - len(s)))
+        offset = int(offset)
+
+    if offset > 0:
+        s = s[offset:]
+        r = s.lstrip()
+        d = len(s) - len(r)
+        s = "... " + r
+        column += 4 - d
+        column -= offset
+
+        # This also adds to the displayed length
+        size += 4
+
+    if len(s) > size:
+        s = s[:size].rstrip() + " ..."
+
+    return s, column * " " + marker
+
+
+def ellipsify(string, limit):
+    if len(string) > limit:
+        return "... " + string[-(limit - 4):]
+
+
+def reconstruct_exc(cls, state):
+    exc = Exception.__new__(cls)
+    exc.__dict__ = state
+    return exc
+
+
+class TemplateError(Exception):
+    """An error raised by Chameleon.
+
+    >>> from chameleon.tokenize import Token
+    >>> token = Token('token')
+    >>> message = 'message'
+
+    Make sure the exceptions can be copied:
+
+    >>> from copy import copy
+    >>> copy(TemplateError(message, token))
+    TemplateError('message', 'token')
+
+    And pickle/unpickled:
+
+    >>> from pickle import dumps, loads
+    >>> loads(dumps(TemplateError(message, token)))
+    TemplateError('message', 'token')
+
+    """
+
+    def __init__(self, msg, token):
+        if not isinstance(token, Token):
+            token = Token(token, 0)
+
+        self.msg = msg
+        self.token = safe_native(token)
+        self.offset = getattr(token, "pos", 0)
+        self.filename = token.filename
+
+    def __copy__(self):
+        inst = Exception.__new__(type(self))
+        inst.__dict__ = self.__dict__.copy()
+        return inst
+
+    def __reduce__(self):
+        return reconstruct_exc, (type(self), self.__dict__)
+
+    def __str__(self):
+        text = "%s\n\n" % self.msg
+        text += " - String:     \"%s\"" % self.token
+
+        if self.filename:
+            text += "\n"
+            text += " - Filename:   %s" % self.filename
+
+        try:
+            line, column = self.token.location
+        except AttributeError:
+            pass
+        else:
+            text += "\n"
+            text += " - Location:   (%d:%d)" % (line, column)
+
+        return text
+
+    def __repr__(self):
+        try:
+            return "%s('%s', '%s')" % (
+                self.__class__.__name__, self.msg, self.token
+                )
+        except AttributeError:
+            return object.__repr__(self)
+
+
+class ParseError(TemplateError):
+    """An error occurred during parsing.
+
+    Indicates an error on the structural level.
+    """
+
+
+class CompilationError(TemplateError):
+    """An error occurred during compilation.
+
+    Indicates a general compilation error.
+    """
+
+
+class TranslationError(TemplateError):
+    """An error occurred during translation.
+
+    Indicates a general translation error.
+    """
+
+
+class LanguageError(CompilationError):
+    """Language syntax error.
+
+    Indicates a syntactical error due to incorrect usage of the
+    template language.
+    """
+
+
+class ExpressionError(LanguageError):
+    """An error occurred compiling an expression.
+
+    Indicates a syntactical error in an expression.
+    """
+
+
+class ExceptionFormatter(object):
+    def __init__(self, errors, econtext, rcontext):
+        kwargs = rcontext.copy()
+        kwargs.update(econtext)
+
+        for name in tuple(kwargs):
+            if name.startswith('__'):
+                del kwargs[name]
+
+        self._errors = errors
+        self._kwargs = kwargs
+
+    def __call__(self):
+        # Format keyword arguments; consecutive arguments are indented
+        # for readability
+        try:
+            formatted = format_kwargs(self._kwargs)
+        except:
+            # the ``pprint.pformat`` method calls the representation
+            # method of the arguments; this may fail and since we're
+            # already in an exception handler, there's no point in
+            # pursuing this further
+            formatted = ()
+
+        for index, string in enumerate(formatted[1:]):
+            formatted[index + 1] = " " * 15 + string
+
+        out = []
+        seen = set()
+
+        for error in reversed(self._errors):
+            expression, line, column, filename, exc = error
+
+            if exc in seen:
+                continue
+
+            seen.add(exc)
+
+            if isinstance(exc, UnicodeDecodeError):
+                string = safe_native(exc.object)
+
+                s, marker = compute_source_marker(
+                    string, exc.start, string[exc.start:exc.end], LENGTH
+                    )
+
+                out.append(" - Stream:     %s" % s)
+                out.append("               %s" % marker)
+
+            _filename = ellipsify(filename, 60) if filename else "<string>"
+
+            out.append(" - Expression: \"%s\"" % expression)
+            out.append(" - Filename:   %s" % _filename)
+            out.append(" - Location:   (%d:%d)" % (line, column))
+
+            if filename and line and column:
+                try:
+                    f = open(filename, 'r')
+                except IOError:
+                    pass
+                else:
+                    try:
+                        # Pick out source line and format marker
+                        for i, l in enumerate(f):
+                            if i + 1 == line:
+                                s, marker = compute_source_marker(
+                                    l, column, expression, LENGTH
+                                    )
+
+                                out.append(" - Source:     %s" % s)
+                                out.append("               %s" % marker)
+                                break
+                    finally:
+                        f.close()
+
+        out.append(" - Arguments:  %s" % "\n".join(formatted))
+
+        formatted = traceback.format_exception_only(type(exc), exc)[-1]
+        formatted_class = "%s:" % type(exc).__name__
+
+        if formatted.startswith(formatted_class):
+            formatted = formatted[len(formatted_class):].lstrip()
+
+        return "\n".join(map(safe_native, [formatted] + out))
diff --git a/lib/Chameleon-2.9.2/src/chameleon/i18n.py b/lib/Chameleon-2.9.2/src/chameleon/i18n.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/i18n.py
@@ -0,0 +1,120 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+import re
+
+from .exc import CompilationError
+from .utils import unicode_string
+
+NAME_RE = r"[a-zA-Z][-a-zA-Z0-9_]*"
+
+WHITELIST = frozenset([
+    "translate",
+    "domain",
+    "target",
+    "source",
+    "attributes",
+    "data",
+    "name",
+    "mode",
+    "xmlns",
+    "xml"
+    ])
+
+_interp_regex = re.compile(r'(?<!\$)(\$(?:(%(n)s)|{(%(n)s)}))'
+    % ({'n': NAME_RE}))
+
+
+try:  # pragma: no cover
+    str = unicode
+except NameError:
+    pass
+
+try:  # pragma: no cover
+    # optional: `zope.i18n`, `zope.i18nmessageid`
+    from zope.i18n import interpolate
+    from zope.i18n import translate
+    from zope.i18nmessageid import Message
+except ImportError:   # pragma: no cover
+
+    def fast_translate(msgid, domain=None, mapping=None, context=None,
+                       target_language=None, default=None):
+        if default is None:
+            return msgid
+
+        if mapping:
+            def replace(match):
+                whole, param1, param2 = match.groups()
+                return unicode_string(mapping.get(param1 or param2, whole))
+            return _interp_regex.sub(replace, default)
+
+        return default
+else:   # pragma: no cover
+    def fast_translate(msgid, domain=None, mapping=None, context=None,
+                       target_language=None, default=None):
+        if msgid is None:
+            return
+
+        if target_language is not None or context is not None:
+            result = translate(
+                msgid, domain=domain, mapping=mapping, context=context,
+                target_language=target_language, default=default)
+            if result != msgid:
+                return result
+
+        if isinstance(msgid, Message):
+            default = msgid.default
+            mapping = msgid.mapping
+
+        if default is None:
+            default = str(msgid)
+
+        if not isinstance(default, basestring):
+            return default
+
+        return interpolate(default, mapping)
+
+
+def parse_attributes(attrs, xml=True):
+    d = {}
+
+    # filter out empty items, eg:
+    # i18n:attributes="value msgid; name msgid2;"
+    # would result in 3 items where the last one is empty
+    attrs = [spec for spec in attrs.split(";") if spec]
+
+    for spec in attrs:
+        if ',' in spec:
+            raise CompilationError(
+                "Attribute must not contain comma. Use semicolon to "
+                "list multiple attributes", spec
+                )
+        parts = spec.split()
+        if len(parts) == 2:
+            attr, msgid = parts
+        elif len(parts) == 1:
+            attr = parts[0]
+            msgid = None
+        else:
+            raise CompilationError(
+                "Illegal i18n:attributes specification.", spec)
+        if not xml:
+            attr = attr.lower()
+        attr = attr.strip()
+        if attr in d:
+            raise CompilationError(
+                "Attribute may only be specified once in i18n:attributes", attr)
+        d[attr] = msgid
+
+    return d
diff --git a/lib/Chameleon-2.9.2/src/chameleon/interfaces.py b/lib/Chameleon-2.9.2/src/chameleon/interfaces.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/interfaces.py
@@ -0,0 +1,102 @@
+from zope.interface import Interface
+from zope.interface import Attribute
+
+
+class ITALExpressionErrorInfo(Interface):
+
+    type = Attribute("type",
+                     "The exception class.")
+
+    value = Attribute("value",
+                      "The exception instance.")
+
+    lineno = Attribute("lineno",
+                       "The line number the error occurred on in the source.")
+
+    offset = Attribute("offset",
+                       "The character offset at which the error occurred.")
+
+
+class ITALIterator(Interface):  # pragma: no cover
+    """A TAL iterator
+
+    Not to be confused with a Python iterator.
+    """
+
+    def next():
+        """Advance to the next value in the iteration, if possible
+
+        Return a true value if it was possible to advance and return
+        a false value otherwise.
+        """
+
+
+class ITALESIterator(ITALIterator):  # pragma: no cover
+    """TAL Iterator provided by TALES
+
+    Values of this iterator are assigned to items in the repeat namespace.
+
+    For example, with a TAL statement like: tal:repeat="item items",
+    an iterator will be assigned to "repeat/item".  The iterator
+    provides a number of handy methods useful in writing TAL loops.
+
+    The results are undefined of calling any of the methods except
+    'length' before the first iteration.
+    """
+
+    def index():
+        """Return the position (starting with "0") within the iteration
+        """
+
+    def number():
+        """Return the position (starting with "1") within the iteration
+        """
+
+    def even():
+        """Return whether the current position is even
+        """
+
+    def odd():
+        """Return whether the current position is odd
+        """
+
+    def parity():
+        """Return 'odd' or 'even' depending on the position's parity
+
+        Useful for assigning CSS class names to table rows.
+        """
+
+    def start():
+        """Return whether the current position is the first position
+        """
+
+    def end():
+        """Return whether the current position is the last position
+        """
+
+    def letter():
+        """Return the position (starting with "a") within the iteration
+        """
+
+    def Letter():
+        """Return the position (starting with "A") within the iteration
+        """
+
+    def roman():
+        """Return the position (starting with "i") within the iteration
+        """
+
+    def Roman():
+        """Return the position (starting with "I") within the iteration
+        """
+
+    def item():
+        """Return the item at the current position
+        """
+
+    def length():
+        """Return the length of the sequence
+
+        Note that this may fail if the TAL iterator was created on a Python
+        iterator.
+        """
diff --git a/lib/Chameleon-2.9.2/src/chameleon/loader.py b/lib/Chameleon-2.9.2/src/chameleon/loader.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/loader.py
@@ -0,0 +1,174 @@
+import functools
+import imp
+import logging
+import os
+import py_compile
+import shutil
+import sys
+import tempfile
+import warnings
+
+import pkg_resources
+
+log = logging.getLogger('chameleon.loader')
+
+try:
+    str = unicode
+except NameError:
+    basestring = str
+
+
+def cache(func):
+    def load(self, *args, **kwargs):
+        template = self.registry.get(args)
+        if template is None:
+            self.registry[args] = template = func(self, *args, **kwargs)
+        return template
+    return load
+
+
+def abspath_from_asset_spec(spec):
+    pname, filename = spec.split(':', 1)
+    return pkg_resources.resource_filename(pname, filename)
+
+if os.name == "nt":
+    def abspath_from_asset_spec(spec, f=abspath_from_asset_spec):
+        if spec[1] == ":":
+            return spec
+        return f(spec)
+
+
+class TemplateLoader(object):
+    """Template loader class.
+
+    To load templates using relative filenames, pass a sequence of
+    paths (or a single path) as ``search_path``.
+
+    To apply a default filename extension to inputs which do not have
+    an extension already (i.e. no dot), provide this as
+    ``default_extension`` (e.g. ``'.pt'``).
+
+    Additional keyword-arguments will be passed on to the template
+    constructor.
+    """
+
+    default_extension = None
+
+    def __init__(self, search_path=None, default_extension=None, **kwargs):
+        if search_path is None:
+            search_path = []
+        if isinstance(search_path, basestring):
+            search_path = [search_path]
+        if default_extension is not None:
+            self.default_extension = ".%s" % default_extension.lstrip('.')
+        self.search_path = search_path
+        self.registry = {}
+        self.kwargs = kwargs
+
+    @cache
+    def load(self, spec, cls=None):
+        if cls is None:
+            raise ValueError("Unbound template loader.")
+
+        spec = spec.strip()
+
+        if self.default_extension is not None and '.' not in spec:
+            spec += self.default_extension
+
+        if ':' in spec:
+            spec = abspath_from_asset_spec(spec)
+
+        if os.path.isabs(spec):
+            return cls(spec, **self.kwargs)
+
+        for path in self.search_path:
+            path = os.path.join(path, spec)
+            if os.path.exists(path):
+                return cls(path, **self.kwargs)
+
+        raise ValueError("Template not found: %s." % spec)
+
+    def bind(self, cls):
+        return functools.partial(self.load, cls=cls)
+
+
+class MemoryLoader(object):
+    def build(self, source, filename):
+        code = compile(source, filename, 'exec')
+        env = {}
+        exec(code, env)
+        return env
+
+    def get(self, name):
+        return None
+
+
+class ModuleLoader(object):
+    def __init__(self, path, remove=False):
+        self.path = path
+        self.remove = remove
+
+    def __del__(self, shutil=shutil):
+        if not self.remove:
+            return
+        try:
+            shutil.rmtree(self.path)
+        except:
+            warnings.warn("Could not clean up temporary file path: %s" % (self.path,))
+
+    def get(self, filename):
+        path = os.path.join(self.path, filename)
+        if os.path.exists(path):
+            log.debug("loading module from cache: %s." % filename)
+            base, ext = os.path.splitext(filename)
+            return self._load(base, path)
+        else:
+            log.debug('cache miss: %s' % filename)
+
+    def build(self, source, filename):
+        imp.acquire_lock()
+        try:
+            d = self.get(filename)
+            if d is not None:
+                return d
+
+            base, ext = os.path.splitext(filename)
+            name = os.path.join(self.path, base + ".py")
+
+            log.debug("writing source to disk (%d bytes)." % len(source))
+            fd, fn = tempfile.mkstemp(prefix=base, suffix='.tmp', dir=self.path)
+            temp = os.fdopen(fd, 'w')
+
+            try:
+                try:
+                    temp.write("%s\n" % '# -*- coding: utf-8 -*-')
+                    temp.write(source)
+                finally:
+                    temp.close()
+            except:
+                os.remove(fn)
+                raise
+
+            os.rename(fn, name)
+            log.debug("compiling %s into byte-code..." % filename)
+            py_compile.compile(name)
+
+            return self._load(base, name)
+        finally:
+            imp.release_lock()
+
+    def _load(self, base, filename):
+        imp.acquire_lock()
+        try:
+            module = sys.modules.get(base)
+            if module is None:
+                f = open(filename, 'rb')
+                try:
+                    assert base not in sys.modules
+                    module = imp.load_source(base, filename, f)
+                finally:
+                    f.close()
+        finally:
+            imp.release_lock()
+
+        return module.__dict__
diff --git a/lib/Chameleon-2.9.2/src/chameleon/metal.py b/lib/Chameleon-2.9.2/src/chameleon/metal.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/metal.py
@@ -0,0 +1,23 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+WHITELIST = frozenset([
+    "define-macro",
+    "extend-macro",
+    "use-macro",
+    "define-slot",
+    "fill-slot",
+    "xmlns",
+    "xml"
+    ])
diff --git a/lib/Chameleon-2.9.2/src/chameleon/namespaces.py b/lib/Chameleon-2.9.2/src/chameleon/namespaces.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/namespaces.py
@@ -0,0 +1,9 @@
+XML_NS = "http://www.w3.org/XML/1998/namespace"
+XMLNS_NS = "http://www.w3.org/2000/xmlns/"
+XHTML_NS = "http://www.w3.org/1999/xhtml"
+TAL_NS = "http://xml.zope.org/namespaces/tal"
+META_NS = "http://xml.zope.org/namespaces/meta"
+METAL_NS = "http://xml.zope.org/namespaces/metal"
+XI_NS = "http://www.w3.org/2001/XInclude"
+I18N_NS = "http://xml.zope.org/namespaces/i18n"
+PY_NS = "http://genshi.edgewall.org/"
diff --git a/lib/Chameleon-2.9.2/src/chameleon/nodes.py b/lib/Chameleon-2.9.2/src/chameleon/nodes.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/nodes.py
@@ -0,0 +1,210 @@
+from .astutil import Node
+
+
+class UseExternalMacro(Node):
+    """Extend external macro."""
+
+    _fields = "expression", "slots", "extend"
+
+
+class Sequence(Node):
+    """Element sequence."""
+
+    _fields = "items",
+
+
+class Content(Node):
+    """Content substitution."""
+
+    _fields = "expression", "char_escape", "translate"
+
+
+class Default(Node):
+    """Represents a default value."""
+
+    _fields = "marker",
+
+
+class CodeBlock(Node):
+    _fields = "source",
+
+
+class Value(Node):
+    """Expression object value."""
+
+    _fields = "value",
+
+    def __repr__(self):
+        try:
+            line, column = self.value.location
+        except AttributeError:
+            line, column = 0, 0
+
+        return "<%s %r (%d:%d)>" % (
+            type(self).__name__, self.value, line, column
+            )
+
+
+class Substitution(Value):
+    """Expression value for text substitution."""
+
+    _fields = "value", "char_escape", "default"
+
+    default = None
+
+
+class Boolean(Value):
+    _fields = "value", "s"
+
+
+class Negate(Node):
+    """Wraps an expression with a negation."""
+
+    _fields = "value",
+
+
+class Element(Node):
+    """XML element."""
+
+    _fields = "start", "end", "content"
+
+
+class Attribute(Node):
+    """Element attribute."""
+
+    _fields = "name", "expression", "quote", "eq", "space"
+
+
+class Start(Node):
+    """Start-tag."""
+
+    _fields = "name", "prefix", "suffix", "attributes"
+
+
+class End(Node):
+    """End-tag."""
+
+    _fields = "name", "space", "prefix", "suffix"
+
+
+class Condition(Node):
+    """Node visited only if some condition holds."""
+
+    _fields = "expression", "node", "orelse"
+
+
+class Identity(Node):
+    """Condition expression that is true on identity."""
+
+    _fields = "expression", "value"
+
+
+class Equality(Node):
+    """Condition expression that is true on equality."""
+
+    _fields = "expression", "value"
+
+
+class Cache(Node):
+    """Cache (evaluate only once) the value of ``expression`` inside
+    ``node``.
+    """
+
+    _fields = "expressions", "node"
+
+
+class Assignment(Node):
+    """Variable assignment."""
+
+    _fields = "names", "expression", "local"
+
+
+class Alias(Assignment):
+    """Alias assignment.
+
+    Note that ``expression`` should be a cached or global value.
+    """
+
+    local = False
+
+
+class Define(Node):
+    """Variable definition in scope."""
+
+    _fields = "assignments", "node"
+
+
+class Repeat(Assignment):
+    """Iterate over provided assignment and repeat body."""
+
+    _fields = "names", "expression", "local", "whitespace", "node"
+
+
+class Macro(Node):
+    """Macro definition."""
+
+    _fields = "name", "body"
+
+
+class Program(Node):
+    _fields = "name", "body"
+
+
+class Module(Node):
+    _fields = "name", "program",
+
+
+class Context(Node):
+    _fields = "node",
+
+
+class Text(Node):
+    """Static text output."""
+
+    _fields = "value",
+
+
+class Interpolation(Text):
+    """String interpolation output."""
+
+    _fields = "value", "braces_required", "translation"
+
+
+class Translate(Node):
+    """Translate node."""
+
+    _fields = "msgid", "node"
+
+
+class Name(Node):
+    """Translation name."""
+
+    _fields = "name", "node"
+
+
+class Domain(Node):
+    """Update translation domain."""
+
+    _fields = "name", "node"
+
+
+class OnError(Node):
+    _fields = "fallback", "name", "node"
+
+
+class UseInternalMacro(Node):
+    """Use internal macro (defined inside same program)."""
+
+    _fields = "name",
+
+
+class FillSlot(Node):
+    """Fill a macro slot."""
+
+    _fields = "name", "node"
+
+
+class DefineSlot(Node):
+    """Define a macro slot."""
+
+    _fields = "name", "node"
diff --git a/lib/Chameleon-2.9.2/src/chameleon/parser.py b/lib/Chameleon-2.9.2/src/chameleon/parser.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/parser.py
@@ -0,0 +1,238 @@
+import re
+import logging
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
+
+from .exc import ParseError
+from .namespaces import XML_NS
+from .tokenize import Token
+
+match_tag_prefix_and_name = re.compile(
+    r'^(?P<prefix></?)(?P<name>([^:\n ]+:)?[^ \n\t>/]+)'
+    '(?P<suffix>(?P<space>\s*)/?>)?',
+    re.UNICODE | re.DOTALL)
+match_single_attribute = re.compile(
+    r'(?P<space>\s+)(?!\d)'
+    r'(?P<name>[^ =/>\n\t]+)'
+    r'((?P<eq>\s*=\s*)'
+    r'((?P<quote>[\'"])(?P<value>.*?)(?P=quote)|'
+    r'(?P<alt_value>[^\s\'">/]+))|'
+    r'(?P<simple_value>(?![ \\n\\t\\r]*=)))',
+    re.UNICODE | re.DOTALL)
+match_comment = re.compile(
+    r'^<!--(?P<text>.*)-->$', re.DOTALL)
+match_cdata = re.compile(
+    r'^<!\[CDATA\[(?P<text>.*)\]>$', re.DOTALL)
+match_declaration = re.compile(
+    r'^<!(?P<text>[^>]+)>$', re.DOTALL)
+match_processing_instruction = re.compile(
+    r'^<\?(?P<name>\w+)(?P<text>.*?)\?>', re.DOTALL)
+match_xml_declaration = re.compile(r'^<\?xml(?=[ /])', re.DOTALL)
+
+log = logging.getLogger('chameleon.parser')
+
+
+def substitute(regex, repl, token):
+    if not isinstance(token, Token):
+        token = Token(token)
+
+    return Token(
+        regex.sub(repl, token),
+        token.pos,
+        token.source,
+        token.filename
+        )
+
+
+def groups(m, token):
+    result = []
+    for i, group in enumerate(m.groups()):
+        if group is not None:
+            j, k = m.span(i + 1)
+            group = token[j:k]
+
+        result.append(group)
+
+    return tuple(result)
+
+
+def groupdict(m, token):
+    d = m.groupdict()
+    for name, value in d.items():
+        if value is not None:
+            i, j = m.span(name)
+            d[name] = token[i:j]
+
+    return d
+
+
+def match_tag(token, regex=match_tag_prefix_and_name):
+    m = regex.match(token)
+    d = groupdict(m, token)
+
+    end = m.end()
+    token = token[end:]
+
+    attrs = d['attrs'] = []
+    for m in match_single_attribute.finditer(token):
+        attr = groupdict(m, token)
+        alt_value = attr.pop('alt_value', None)
+        if alt_value is not None:
+            attr['value'] = alt_value
+            attr['quote'] = ''
+        simple_value = attr.pop('simple_value', None)
+        if simple_value is not None:
+            attr['quote'] = ''
+            attr['value'] = ''
+            attr['eq'] = ''
+        attrs.append(attr)
+        d['suffix'] = token[m.end():]
+
+    return d
+
+
+def parse_tag(token, namespace):
+    node = match_tag(token)
+
+    update_namespace(node['attrs'], namespace)
+
+    if ':' in node['name']:
+        prefix = node['name'].split(':')[0]
+    else:
+        prefix = None
+
+    default = node['namespace'] = namespace.get(prefix, XML_NS)
+
+    node['ns_attrs'] = unpack_attributes(
+        node['attrs'], namespace, default)
+
+    return node
+
+
+def update_namespace(attributes, namespace):
+    # possibly update namespaces; we do this in a separate step
+    # because this assignment is irrespective of order
+    for attribute in attributes:
+        name = attribute['name']
+        value = attribute['value']
+        if name == 'xmlns':
+            namespace[None] = value
+        elif name.startswith('xmlns:'):
+            namespace[name[6:]] = value
+
+
+def unpack_attributes(attributes, namespace, default):
+    namespaced = OrderedDict()
+
+    for index, attribute in enumerate(attributes):
+        name = attribute['name']
+        value = attribute['value']
+
+        if ':' in name:
+            prefix = name.split(':')[0]
+            name = name[len(prefix) + 1:]
+            try:
+                ns = namespace[prefix]
+            except KeyError:
+                raise KeyError(
+                    "Undefined namespace prefix: %s." % prefix)
+        else:
+            ns = default
+        namespaced[ns, name] = value
+
+    return namespaced
+
+
+def identify(string):
+    if string.startswith("<"):
+        if string.startswith("<!--"):
+            return "comment"
+        if string.startswith("<![CDATA["):
+            return "cdata"
+        if string.startswith("<!"):
+            return "declaration"
+        if string.startswith("<?xml"):
+            return "xml_declaration"
+        if string.startswith("<?"):
+            return "processing_instruction"
+        if string.startswith("</"):
+            return "end_tag"
+        if string.endswith("/>"):
+            return "empty_tag"
+        if string.endswith(">"):
+            return "start_tag"
+        return "error"
+    return "text"
+
+
+class ElementParser(object):
+    """Parses tokens into elements."""
+
+    def __init__(self, stream, default_namespaces):
+        self.stream = stream
+        self.queue = []
+        self.index = []
+        self.namespaces = [default_namespaces.copy()]
+
+    def __iter__(self):
+        for token in self.stream:
+            item = self.parse(token)
+            self.queue.append(item)
+
+        return iter(self.queue)
+
+    def parse(self, token):
+        kind = identify(token)
+        visitor = getattr(self, "visit_%s" % kind, self.visit_default)
+        return visitor(kind, token)
+
+    def visit_comment(self, kind, token):
+        return "comment", (token, )
+
+    def visit_cdata(self, kind, token):
+        return "cdata", (token, )
+
+    def visit_default(self, kind, token):
+        return "default", (token, )
+
+    def visit_processing_instruction(self, kind, token):
+        m = match_processing_instruction.match(token)
+        return "processing_instruction", (groupdict(m, token), )
+
+    def visit_text(self, kind, token):
+        return kind, (token, )
+
+    def visit_start_tag(self, kind, token):
+        namespace = self.namespaces[-1].copy()
+        self.namespaces.append(namespace)
+        node = parse_tag(token, namespace)
+        self.index.append((node['name'], len(self.queue)))
+        return kind, (node, )
+
+    def visit_end_tag(self, kind, token):
+        try:
+            namespace = self.namespaces.pop()
+        except IndexError:
+            raise ParseError("Unexpected end tag.", token)
+
+        node = parse_tag(token, namespace)
+
+        while self.index:
+            name, pos = self.index.pop()
+            if name == node['name']:
+                start, = self.queue.pop(pos)[1]
+                children = self.queue[pos:]
+                del self.queue[pos:]
+                break
+        else:
+            raise ParseError("Unexpected end tag.", token)
+
+        return "element", (start, node, children)
+
+    def visit_empty_tag(self, kind, token):
+        namespace = self.namespaces[-1].copy()
+        node = parse_tag(token, namespace)
+        return "element", (node, None, [])
diff --git a/lib/Chameleon-2.9.2/src/chameleon/program.py b/lib/Chameleon-2.9.2/src/chameleon/program.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/program.py
@@ -0,0 +1,38 @@
+try:
+    str = unicode
+except NameError:
+    long = int
+
+from .tokenize import iter_xml
+from .tokenize import iter_text
+from .parser import ElementParser
+from .namespaces import XML_NS
+from .namespaces import XMLNS_NS
+
+
+class ElementProgram(object):
+    DEFAULT_NAMESPACES = {
+        'xmlns': XMLNS_NS,
+        'xml': XML_NS,
+        }
+
+    tokenizers = {
+        'xml': iter_xml,
+        'text': iter_text,
+        }
+
+    def __init__(self, source, mode="xml", filename=None):
+        tokenizer = self.tokenizers[mode]
+        tokens = tokenizer(source, filename)
+        parser = ElementParser(tokens, self.DEFAULT_NAMESPACES)
+
+        self.body = []
+
+        for kind, args in parser:
+            node = self.visit(kind, args)
+            if node is not None:
+                self.body.append(node)
+
+    def visit(self, kind, args):
+        visitor = getattr(self, "visit_%s" % kind)
+        return visitor(*args)
diff --git a/lib/Chameleon-2.9.2/src/chameleon/py25.py b/lib/Chameleon-2.9.2/src/chameleon/py25.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/py25.py
@@ -0,0 +1,36 @@
+import sys
+
+def lookup_attr(obj, key):
+    try:
+        return getattr(obj, key)
+    except AttributeError:
+        exc = sys.exc_info()[1]
+        try:
+            get = obj.__getitem__
+        except AttributeError:
+            raise exc
+        try:
+            return get(key)
+        except KeyError:
+            raise exc
+
+def exec_(code, globs=None, locs=None):
+    """Execute code in a namespace."""
+    if globs is None:
+        frame = sys._getframe(1)
+        globs = frame.f_globals
+        if locs is None:
+            locs = frame.f_locals
+        del frame
+    elif locs is None:
+        locs = globs
+    exec("""exec code in globs, locs""")
+
+
+exec_("""def raise_with_traceback(exc, tb):
+    raise type(exc), exc, tb
+""")
+
+
+def next(iter):
+    return iter.next()
diff --git a/lib/Chameleon-2.9.2/src/chameleon/py26.py b/lib/Chameleon-2.9.2/src/chameleon/py26.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/py26.py
@@ -0,0 +1,15 @@
+import sys
+
+def lookup_attr(obj, key):
+    try:
+        return getattr(obj, key)
+    except AttributeError:
+        exc = sys.exc_info()[1]
+        try:
+            get = obj.__getitem__
+        except AttributeError:
+            raise exc
+        try:
+            return get(key)
+        except KeyError:
+            raise exc
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tal.py b/lib/Chameleon-2.9.2/src/chameleon/tal.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tal.py
@@ -0,0 +1,479 @@
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+import re
+import copy
+
+from .exc import LanguageError
+from .utils import descriptorint
+from .utils import descriptorstr
+from .namespaces import XMLNS_NS
+from .parser import groups
+
+
+try:
+    next
+except NameError:
+    from chameleon.py25 import next
+
+try:
+    # optional library: `zope.interface`
+    import interfaces
+    import zope.interface
+except ImportError:
+    interfaces = None
+
+
+NAME = r"[a-zA-Z_][-a-zA-Z0-9_]*"
+DEFINE_RE = re.compile(r"(?s)\s*(?:(global|local)\s+)?" +
+                       r"(%s|\(%s(?:,\s*%s)*\))\s+(.*)\Z" % (NAME, NAME, NAME),
+                       re.UNICODE)
+SUBST_RE = re.compile(r"\s*(?:(text|structure)\s+)?(.*)\Z", re.S | re.UNICODE)
+ATTR_RE = re.compile(r"\s*([^\s]+)\s+([^\s].*)\Z", re.S | re.UNICODE)
+
+ENTITY_RE = re.compile(r'(&(#?)(x?)(\d{1,5}|\w{1,8});)')
+
+WHITELIST = frozenset([
+    "define",
+    "comment",
+    "condition",
+    "content",
+    "replace",
+    "repeat",
+    "attributes",
+    "on-error",
+    "omit-tag",
+    "script",
+    "switch",
+    "case",
+    "xmlns",
+    "xml"
+    ])
+
+
+def split_parts(arg):
+    # Break in pieces at undoubled semicolons and
+    # change double semicolons to singles:
+    i = 0
+    while i < len(arg):
+        m = ENTITY_RE.search(arg[i:])
+        if m is None:
+            break
+        arg = arg[:i + m.end()] + ';' + arg[i + m.end():]
+        i += m.end()
+
+    arg = arg.replace(";;", "\0")
+    parts = arg.split(';')
+    parts = [p.replace("\0", ";") for p in parts]
+    if len(parts) > 1 and not parts[-1].strip():
+        del parts[-1]  # It ended in a semicolon
+
+    return parts
+
+
+def parse_attributes(clause):
+    attrs = {}
+    for part in split_parts(clause):
+        m = ATTR_RE.match(part)
+        if not m:
+            raise LanguageError(
+                "Bad syntax in attributes.", clause)
+        name, expr = groups(m, part)
+        if name in attrs:
+            raise LanguageError(
+                "Duplicate attribute name in attributes.", part)
+
+        attrs[name] = expr
+
+    return attrs
+
+
+def parse_substitution(clause):
+    m = SUBST_RE.match(clause)
+    if m is None:
+        raise LanguageError(
+            "Invalid content substitution syntax.", clause)
+
+    key, expression = groups(m, clause)
+    if not key:
+        key = "text"
+
+    return key, expression
+
+
+def parse_defines(clause):
+    """
+    Parses a tal:define value.
+
+    # Basic syntax, implicit local
+    >>> parse_defines('hello lovely')
+    [('local', ('hello',), 'lovely')]
+
+    # Explicit local
+    >>> parse_defines('local hello lovely')
+    [('local', ('hello',), 'lovely')]
+
+    # With global
+    >>> parse_defines('global hello lovely')
+    [('global', ('hello',), 'lovely')]
+
+    # Multiple expressions
+    >>> parse_defines('hello lovely; tea time')
+    [('local', ('hello',), 'lovely'), ('local', ('tea',), 'time')]
+
+    # With multiple names
+    >>> parse_defines('(hello, howdy) lovely')
+    [('local', ['hello', 'howdy'], 'lovely')]
+
+    # With unicode whitespace
+    >>> try:
+    ...     s = '\xc2\xa0hello lovely'.decode('utf-8')
+    ... except AttributeError:
+    ...     s = '\xa0hello lovely'
+    >>> from chameleon.utils import unicode_string
+    >>> parse_defines(s) == [
+    ...     ('local', ('hello',), 'lovely')
+    ... ]
+    True
+
+    """
+    defines = []
+    for part in split_parts(clause):
+        m = DEFINE_RE.match(part)
+        if m is None:
+            raise LanguageError("Invalid define syntax", part)
+        context, name, expr = groups(m, part)
+        context = context or "local"
+
+        if name.startswith('('):
+            names = [n.strip() for n in name.strip('()').split(',')]
+        else:
+            names = (name,)
+
+        defines.append((context, names, expr))
+
+    return defines
+
+
+def prepare_attributes(attrs, dyn_attributes, i18n_attributes,
+                       ns_attributes, drop_ns):
+    drop = set([attribute['name'] for attribute, (ns, value)
+                in zip(attrs, ns_attributes)
+                if ns in drop_ns or (
+                    ns == XMLNS_NS and
+                    attribute['value'] in drop_ns
+                    )
+                ])
+
+    attributes = []
+    normalized = {}
+
+    for attribute in attrs:
+        name = attribute['name']
+
+        if name in drop:
+            continue
+
+        attributes.append((
+            name,
+            attribute['value'],
+            attribute['quote'],
+            attribute['space'],
+            attribute['eq'],
+            None,
+            ))
+
+        normalized[name.lower()] = len(attributes) - 1
+
+    for name, expr in dyn_attributes.items():
+        index = normalized.get(name.lower())
+        if index is not None:
+            _, text, quote, space, eq, _ = attributes[index]
+            add = attributes.__setitem__
+        else:
+            text = None
+            quote = '"'
+            space = " "
+            eq = "="
+            index = len(attributes)
+            add = attributes.insert
+            normalized[name.lower()] = len(attributes) - 1
+
+        attribute = name, text, quote, space, eq, expr
+        add(index, attribute)
+
+    for name in i18n_attributes:
+        attr = name.lower()
+        if attr not in normalized:
+            attributes.append((name, name, '"', " ", "=", None))
+            normalized[attr] = len(attributes) - 1
+
+    return attributes
+
+
+class RepeatItem(object):
+    __slots__ = "length", "_iterator"
+
+    __allow_access_to_unprotected_subobjects__ = True
+
+    def __init__(self, iterator, length):
+        self.length = length
+        self._iterator = iterator
+
+    def __iter__(self):
+        return self._iterator
+
+    try:
+        iter(()).__len__
+    except AttributeError:
+        @descriptorint
+        def index(self):
+            try:
+                remaining = self._iterator.__length_hint__()
+            except AttributeError:
+                remaining = len(tuple(copy.copy(self._iterator)))
+            return self.length - remaining - 1
+    else:
+        @descriptorint
+        def index(self):
+            remaining = self._iterator.__len__()
+            return self.length - remaining - 1
+
+    @descriptorint
+    def start(self):
+        return self.index == 0
+
+    @descriptorint
+    def end(self):
+        return self.index == self.length - 1
+
+    @descriptorint
+    def number(self):
+        return self.index + 1
+
+    @descriptorstr
+    def odd(self):
+        """Returns a true value if the item index is odd.
+
+        >>> it = RepeatItem(iter(("apple", "pear")), 2)
+
+        >>> next(it._iterator)
+        'apple'
+        >>> it.odd()
+        ''
+
+        >>> next(it._iterator)
+        'pear'
+        >>> it.odd()
+        'odd'
+        """
+
+        return self.index % 2 == 1 and 'odd' or ''
+
+    @descriptorstr
+    def even(self):
+        """Returns a true value if the item index is even.
+
+        >>> it = RepeatItem(iter(("apple", "pear")), 2)
+
+        >>> next(it._iterator)
+        'apple'
+        >>> it.even()
+        'even'
+
+        >>> next(it._iterator)
+        'pear'
+        >>> it.even()
+        ''
+        """
+
+        return self.index % 2 == 0 and 'even' or ''
+
+    def next(self):
+        raise NotImplementedError(
+            "Method not implemented (can't update local variable).")
+
+    def _letter(self, base=ord('a'), radix=26):
+        """Get the iterator position as a lower-case letter
+
+        >>> it = RepeatItem(iter(("apple", "pear", "orange")), 3)
+        >>> next(it._iterator)
+        'apple'
+        >>> it.letter()
+        'a'
+        >>> next(it._iterator)
+        'pear'
+        >>> it.letter()
+        'b'
+        >>> next(it._iterator)
+        'orange'
+        >>> it.letter()
+        'c'
+        """
+
+        index = self.index
+        if index < 0:
+            raise TypeError("No iteration position")
+        s = ""
+        while 1:
+            index, off = divmod(index, radix)
+            s = chr(base + off) + s
+            if not index:
+                return s
+
+    letter = descriptorstr(_letter)
+
+    @descriptorstr
+    def Letter(self):
+        """Get the iterator position as an upper-case letter
+
+        >>> it = RepeatItem(iter(("apple", "pear", "orange")), 3)
+        >>> next(it._iterator)
+        'apple'
+        >>> it.Letter()
+        'A'
+        >>> next(it._iterator)
+        'pear'
+        >>> it.Letter()
+        'B'
+        >>> next(it._iterator)
+        'orange'
+        >>> it.Letter()
+        'C'
+        """
+
+        return self._letter(base=ord('A'))
+
+    @descriptorstr
+    def Roman(self, rnvalues=(
+                    (1000, 'M'), (900, 'CM'), (500, 'D'), (400, 'CD'),
+                    (100, 'C'), (90, 'XC'), (50, 'L'), (40, 'XL'),
+                    (10, 'X'), (9, 'IX'), (5, 'V'), (4, 'IV'), (1, 'I'))):
+        """Get the iterator position as an upper-case roman numeral
+
+        >>> it = RepeatItem(iter(("apple", "pear", "orange")), 3)
+        >>> next(it._iterator)
+        'apple'
+        >>> it.Roman()
+        'I'
+        >>> next(it._iterator)
+        'pear'
+        >>> it.Roman()
+        'II'
+        >>> next(it._iterator)
+        'orange'
+        >>> it.Roman()
+        'III'
+        """
+
+        n = self.index + 1
+        s = ""
+        for v, r in rnvalues:
+            rct, n = divmod(n, v)
+            s = s + r * rct
+        return s
+
+    @descriptorstr
+    def roman(self):
+        """Get the iterator position as a lower-case roman numeral
+
+        >>> it = RepeatItem(iter(("apple", "pear", "orange")), 3)
+        >>> next(it._iterator)
+        'apple'
+        >>> it.roman()
+        'i'
+        >>> next(it._iterator)
+        'pear'
+        >>> it.roman()
+        'ii'
+        >>> next(it._iterator)
+        'orange'
+        >>> it.roman()
+        'iii'
+        """
+
+        return self.Roman().lower()
+
+
+if interfaces is not None:
+    zope.interface.classImplements(RepeatItem, interfaces.ITALESIterator)
+
+
+class RepeatDict(dict):
+    """Repeat dictionary implementation.
+
+    >>> repeat = RepeatDict({})
+    >>> iterator, length = repeat('numbers', range(5))
+    >>> length
+    5
+
+    >>> repeat['numbers']
+    <chameleon.tal.RepeatItem object at ...>
+
+    """
+
+    __slots__ = "__setitem__", "__getitem__", "__getattr__"
+
+    def __init__(self, d):
+        self.__setitem__ = d.__setitem__
+        self.__getitem__ = d.__getitem__
+        self.__getattr__ = d.__getitem__
+
+    def __call__(self, key, iterable):
+        """We coerce the iterable to a tuple and return an iterator
+        after registering it in the repeat dictionary."""
+
+        try:
+            iterable = tuple(iterable)
+        except TypeError:
+            if iterable is None:
+                iterable = ()
+            else:
+                # The message below to the TypeError is the Python
+                # 2.5-style exception message. Python 2.4.X also
+                # raises a TypeError, but with a different message.
+                # ("TypeError: iteration over non-sequence").  The
+                # Python 2.5 error message is more helpful.  We
+                # construct the 2.5-style message explicitly here so
+                # that both Python 2.4.X and Python 2.5+ will raise
+                # the same error.  This makes writing the tests eaiser
+                # and makes the output easier to understand.
+                raise TypeError("%r object is not iterable" %
+                                type(iterable).__name__)
+
+        length = len(iterable)
+        iterator = iter(iterable)
+
+        # Insert as repeat item
+        self[key] = RepeatItem(iterator, length)
+
+        return iterator, length
+
+
+class ErrorInfo(object):
+    """Information about an exception passed to an on-error handler."""
+
+    def __init__(self, err, position=(None, None)):
+        if isinstance(err, Exception):
+            self.type = err.__class__
+            self.value = err
+        else:
+            self.type = err
+            self.value = None
+        self.lineno = position[0]
+        self.offset = position[1]
+
+
+if interfaces is not None:
+    zope.interface.classImplements(ErrorInfo, interfaces.ITALExpressionErrorInfo)
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tales.py b/lib/Chameleon-2.9.2/src/chameleon/tales.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tales.py
@@ -0,0 +1,541 @@
+import re
+import sys
+
+from .astutil import parse
+from .astutil import store
+from .astutil import load
+from .astutil import ItemLookupOnAttributeErrorVisitor
+from .codegen import TemplateCodeGenerator
+from .codegen import template
+from .codegen import reverse_builtin_map
+from .astutil import Builtin
+from .astutil import Symbol
+from .exc import ExpressionError
+from .utils import resolve_dotted
+from .utils import Markup
+from .utils import ast
+from .tokenize import Token
+from .parser import substitute
+from .compiler import Interpolator
+
+try:
+    from .py26 import lookup_attr
+except SyntaxError:
+    from .py25 import lookup_attr
+
+
+split_parts = re.compile(r'(?<!\\)\|')
+match_prefix = re.compile(r'^\s*([a-z\-_]+):').match
+re_continuation = re.compile(r'\\\s*$', re.MULTILINE)
+
+try:
+    from __builtin__ import basestring
+except ImportError:
+    basestring = str
+
+
+def resolve_global(value):
+    name = reverse_builtin_map.get(value)
+    if name is not None:
+        return Builtin(name)
+
+    return Symbol(value)
+
+
+def test(expression, engine=None, **env):
+    if engine is None:
+        engine = SimpleEngine()
+
+    body = expression(store("result"), engine)
+    module = ast.Module(body)
+    module = ast.fix_missing_locations(module)
+    env['rcontext'] = {}
+    source = TemplateCodeGenerator(module).code
+    code = compile(source, '<string>', 'exec')
+    exec(code, env)
+    result = env["result"]
+
+    if isinstance(result, basestring):
+        result = str(result)
+
+    return result
+
+
+def transform_attribute(node):
+    return template(
+        "lookup(object, name)",
+        lookup=Symbol(lookup_attr),
+        object=node.value,
+        name=ast.Str(s=node.attr),
+        mode="eval"
+        )
+
+
+class TalesExpr(object):
+    """Base class.
+
+    This class helps implementations for the Template Attribute
+    Language Expression Syntax (TALES).
+
+    The syntax evaluates one or more expressions, separated by '|'
+    (pipe). The first expression that succeeds, is returned.
+
+    Expression:
+
+      expression    := (type ':')? line ('|' expression)?
+      line          := .*
+
+    Expression lines may not contain the pipe character unless
+    escaped. It has a special meaning:
+
+    If the expression to the left of the pipe fails (raises one of the
+    exceptions listed in ``catch_exceptions``), evaluation proceeds to
+    the expression(s) on the right.
+
+    Subclasses must implement ``translate`` which assigns a value for
+    a given expression.
+
+    >>> class PythonPipeExpr(TalesExpr):
+    ...     def translate(self, expression, target):
+    ...         compiler = PythonExpr(expression)
+    ...         return compiler(target, None)
+
+    >>> test(PythonPipeExpr('foo | bar | 42'))
+    42
+
+    >>> test(PythonPipeExpr('foo|42'))
+    42
+    """
+
+    exceptions = NameError, \
+                 ValueError, \
+                 AttributeError, \
+                 LookupError, \
+                 TypeError
+
+    def __init__(self, expression):
+        self.expression = expression
+
+    def __call__(self, target, engine):
+        remaining = self.expression
+        assignments = []
+
+        while remaining:
+            if match_prefix(remaining) is not None:
+                compiler = engine.parse(remaining)
+                assignment = compiler.assign_value(target)
+                remaining = ""
+            else:
+                for m in split_parts.finditer(remaining):
+                    expression = remaining[:m.start()]
+                    remaining = remaining[m.end():]
+                    break
+                else:
+                    expression = remaining
+                    remaining = ""
+
+                expression = expression.replace('\\|', '|')
+                assignment = self.translate(expression, target)
+            assignments.append(assignment)
+
+        if not assignments:
+            assignments.append(
+                self.translate(remaining, target)
+                )
+
+        for i, assignment in enumerate(reversed(assignments)):
+            if i == 0:
+                body = assignment
+            else:
+                body = [ast.TryExcept(
+                    body=assignment,
+                    handlers=[ast.ExceptHandler(
+                        type=ast.Tuple(
+                            elts=map(resolve_global, self.exceptions),
+                            ctx=ast.Load()),
+                        name=None,
+                        body=body,
+                        )],
+                    )]
+
+        return body
+
+    def translate(self, expression, target):
+        """Return statements that assign a value to ``target``."""
+
+        raise NotImplementedError(
+            "Must be implemented by a subclass.")
+
+
+class PathExpr(TalesExpr):
+    """Path expression compiler.
+
+    Syntax::
+
+        PathExpr ::= Path [ '|' Path ]*
+        Path ::= variable [ '/' URL_Segment ]*
+        variable ::= Name
+
+    For example::
+
+        request/cookies/oatmeal
+        nothing
+        here/some-file 2001_02.html.tar.gz/foo
+        root/to/branch | default
+
+    When a path expression is evaluated, it attempts to traverse
+    each path, from left to right, until it succeeds or runs out of
+    paths. To traverse a path, it first fetches the object stored in
+    the variable. For each path segment, it traverses from the current
+    object to the subobject named by the path segment.
+
+    Once a path has been successfully traversed, the resulting object
+    is the value of the expression. If it is a callable object, such
+    as a method or class, it is called.
+
+    The semantics of traversal (and what it means to be callable) are
+    implementation-dependent (see the ``translate`` method).
+    """
+
+    def translate(self, expression, target):
+        raise NotImplementedError(
+            "Path expressions are not yet implemented. "
+            "It's unclear whether a general implementation "
+            "can be devised.")
+
+
+class PythonExpr(TalesExpr):
+    """Python expression compiler.
+
+    >>> test(PythonExpr('2 + 2'))
+    4
+
+    The Python expression is a TALES expression. That means we can use
+    the pipe operator:
+
+    >>> test(PythonExpr('foo | 2 + 2 | 5'))
+    4
+
+    To include a pipe character, use a backslash escape sequence:
+
+    >>> test(PythonExpr('\"\|\"'))
+    '|'
+    """
+
+    transform = ItemLookupOnAttributeErrorVisitor(transform_attribute)
+
+    def parse(self, string):
+        return parse(string, 'eval').body
+
+    def translate(self, expression, target):
+        # Strip spaces
+        string = expression.strip()
+
+        # Conver line continuations to newlines
+        string = substitute(re_continuation, '\n', string)
+
+        # Convert newlines to spaces
+        string = string.replace('\n', ' ')
+
+        try:
+            value = self.parse(string)
+        except SyntaxError:
+            exc = sys.exc_info()[1]
+            raise ExpressionError(exc.msg, string)
+
+        # Transform attribute lookups to allow fallback to item lookup
+        self.transform.visit(value)
+
+        return [ast.Assign(targets=[target], value=value)]
+
+
+class ImportExpr(object):
+    re_dotted = re.compile(r'^[A-Za-z.]+$')
+
+    def __init__(self, expression):
+        self.expression = expression
+
+    def __call__(self, target, engine):
+        string = self.expression.strip().replace('\n', ' ')
+        value = template(
+            "RESOLVE(NAME)",
+            RESOLVE=Symbol(resolve_dotted),
+            NAME=ast.Str(s=string),
+            mode="eval",
+            )
+        return [ast.Assign(targets=[target], value=value)]
+
+
+class NotExpr(object):
+    """Negates the expression.
+
+    >>> engine = SimpleEngine(PythonExpr)
+
+    >>> test(NotExpr('False'), engine)
+    True
+    >>> test(NotExpr('True'), engine)
+    False
+    """
+
+    def __init__(self, expression):
+        self.expression = expression
+
+    def __call__(self, target, engine):
+        compiler = engine.parse(self.expression)
+        body = compiler.assign_value(target)
+        return body + template("target = not target", target=target)
+
+
+class StructureExpr(object):
+    """Wraps the expression result as 'structure'.
+
+    >>> engine = SimpleEngine(PythonExpr)
+
+    >>> test(StructureExpr('\"<tt>foo</tt>\"'), engine)
+    '<tt>foo</tt>'
+    """
+
+    wrapper_class = Symbol(Markup)
+
+    def __init__(self, expression):
+        self.expression = expression
+
+    def __call__(self, target, engine):
+        compiler = engine.parse(self.expression)
+        body = compiler.assign_value(target)
+        return body + template(
+            "target = wrapper(target)",
+            target=target,
+            wrapper=self.wrapper_class
+            )
+
+
+class IdentityExpr(object):
+    """Identity expression.
+
+    Exists to demonstrate the interface.
+
+    >>> test(IdentityExpr('42'))
+    42
+    """
+
+    def __init__(self, expression):
+        self.expression = expression
+
+    def __call__(self, target, engine):
+        compiler = engine.parse(self.expression)
+        return compiler.assign_value(target)
+
+
+class StringExpr(object):
+    """Similar to the built-in ``string.Template``, but uses an
+    expression engine to support pluggable string substitution
+    expressions.
+
+    Expr string:
+
+      string       := (text | substitution) (string)?
+      substitution := ('$' variable | '${' expression '}')
+      text         := .*
+
+    In other words, an expression string can contain multiple
+    substitutions. The text- and substitution parts will be
+    concatenated back into a string.
+
+    >>> test(StringExpr('Hello ${name}!'), name='world')
+    'Hello world!'
+
+    In the default configuration, braces may be omitted if the
+    expression is an identifier.
+
+    >>> test(StringExpr('Hello $name!'), name='world')
+    'Hello world!'
+
+    The ``braces_required`` flag changes this setting:
+
+    >>> test(StringExpr('Hello $name!', True))
+    'Hello $name!'
+
+    We can escape interpolation using the standard escaping
+    syntax:
+
+    >>> test(StringExpr('\\${name}'))
+    '\\\${name}'
+
+    Multiple interpolations in one:
+
+    >>> test(StringExpr(\"Hello ${'a'}${'b'}${'c'}!\"))
+    'Hello abc!'
+
+    Here's a more involved example taken from a javascript source:
+
+    >>> result = test(StringExpr(\"\"\"
+    ... function(oid) {
+    ...     $('#' + oid).autocomplete({source: ${'source'}});
+    ... }
+    ... \"\"\"))
+
+    >>> 'source: source' in result
+    True
+
+    In the above examples, the expression is evaluated using the
+    dummy engine which just returns the input as a string.
+
+    As an example, we'll implement an expression engine which
+    instead counts the number of characters in the expresion and
+    returns an integer result.
+
+    >>> class engine:
+    ...     @staticmethod
+    ...     def parse(expression):
+    ...         class compiler:
+    ...             @staticmethod
+    ...             def assign_text(target):
+    ...                 return [
+    ...                     ast.Assign(
+    ...                         targets=[target],
+    ...                         value=ast.Num(n=len(expression))
+    ...                     )]
+    ...
+    ...         return compiler
+
+    This will demonstrate how the string expression coerces the
+    input to a string.
+
+    >>> expr = StringExpr(
+    ...    'There are ${hello world} characters in \"hello world\"')
+
+    We evaluate the expression using the new engine:
+
+    >>> test(expr, engine)
+    'There are 11 characters in \"hello world\"'
+    """
+
+    def __init__(self, expression, braces_required=False):
+        # The code relies on the expression being a token string
+        if not isinstance(expression, Token):
+            expression = Token(expression, 0)
+
+        self.translator = Interpolator(expression, braces_required)
+
+    def __call__(self, name, engine):
+        return self.translator(name, engine)
+
+
+class ProxyExpr(StringExpr):
+    def __init__(self, name, *args):
+        super(ProxyExpr, self).__init__(*args)
+        self.name = name
+
+    def __call__(self, target, engine):
+        assignment = super(ProxyExpr, self).__call__(target, engine)
+        return assignment + [
+            ast.Assign(targets=[target], value=ast.Call(
+                func=load(self.name),
+                args=[target],
+                keywords=[],
+                starargs=None,
+                kwargs=None
+                ))
+            ]
+
+
+class ExistsExpr(object):
+    """Boolean wrapper.
+
+    Return 0 if the expression results in an exception, otherwise 1.
+
+    As a means to generate exceptions, we set up an expression engine
+    which evaluates the provided expression using Python:
+
+    >>> engine = SimpleEngine(PythonExpr)
+
+    >>> test(ExistsExpr('int(0)'), engine)
+    1
+    >>> test(ExistsExpr('int(None)'), engine)
+    0
+
+    """
+
+    exceptions = AttributeError, LookupError, TypeError, NameError, KeyError
+
+    def __init__(self, expression):
+        self.expression = expression
+
+    def __call__(self, target, engine):
+        ignore = store("_ignore")
+        compiler = engine.parse(self.expression)
+        body = compiler.assign_value(ignore)
+
+        classes = map(resolve_global, self.exceptions)
+
+        return [
+            ast.TryExcept(
+                body=body,
+                handlers=[ast.ExceptHandler(
+                    type=ast.Tuple(elts=classes, ctx=ast.Load()),
+                    name=None,
+                    body=template("target = 0", target=target),
+                    )],
+                orelse=template("target = 1", target=target)
+                )
+            ]
+
+
+class ExpressionParser(object):
+    def __init__(self, factories, default):
+        self.factories = factories
+        self.default = default
+
+    def __call__(self, expression):
+        m = match_prefix(expression)
+        if m is not None:
+            prefix = m.group(1)
+            expression = expression[m.end():]
+        else:
+            prefix = self.default
+
+        try:
+            factory = self.factories[prefix]
+        except KeyError:
+            exc = sys.exc_info()[1]
+            raise LookupError(
+                "Unknown expression type: %s." % str(exc)
+                )
+
+        return factory(expression)
+
+
+class SimpleEngine(object):
+    expression = PythonExpr
+
+    def __init__(self, expression=None):
+        if expression is not None:
+            self.expression = expression
+
+    def parse(self, string):
+        compiler = self.expression(string)
+        return SimpleCompiler(compiler, self)
+
+
+class SimpleCompiler(object):
+    def __init__(self, compiler, engine):
+        self.compiler = compiler
+        self.engine = engine
+
+    def assign_text(self, target):
+        """Assign expression string as a text value."""
+
+        return self._assign_value_and_coerce(target, "str")
+
+    def assign_value(self, target):
+        """Assign expression string as object value."""
+
+        return self.compiler(target, self.engine)
+
+    def _assign_value_and_coerce(self, target, builtin):
+        return self.assign_value(target) + template(
+            "target = builtin(target)",
+            target=target,
+            builtin=builtin
+            )
diff --git a/lib/Chameleon-2.9.2/src/chameleon/template.py b/lib/Chameleon-2.9.2/src/chameleon/template.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/template.py
@@ -0,0 +1,332 @@
+from __future__ import with_statement
+
+import os
+import sys
+import copy
+import hashlib
+import shutil
+import logging
+import tempfile
+import inspect
+
+pkg_digest = hashlib.sha1(__name__.encode('utf-8'))
+
+try:
+    import pkg_resources
+except ImportError:
+    logging.info("Setuptools not installed. Unable to determine version.")
+else:
+    for path in sys.path:
+        for distribution in pkg_resources.find_distributions(path):
+            if distribution.has_version():
+                version = distribution.version.encode('utf-8')
+                pkg_digest.update(version)
+
+
+from .exc import TemplateError
+from .exc import ExceptionFormatter
+from .compiler import Compiler
+from .config import DEBUG_MODE
+from .config import AUTO_RELOAD
+from .config import EAGER_PARSING
+from .config import CACHE_DIRECTORY
+from .loader import ModuleLoader
+from .loader import MemoryLoader
+from .nodes import Module
+from .utils import DebuggingOutputStream
+from .utils import Scope
+from .utils import join
+from .utils import mangle
+from .utils import create_formatted_exception
+from .utils import read_bytes
+from .utils import raise_with_traceback
+from .utils import byte_string
+
+
+log = logging.getLogger('chameleon.template')
+
+
+def _make_module_loader():
+    remove = False
+    if CACHE_DIRECTORY:
+        path = CACHE_DIRECTORY
+    else:
+        path = tempfile.mkdtemp()
+        remove = True
+
+    return ModuleLoader(path)
+
+
+class BaseTemplate(object):
+    """Template base class.
+
+    Takes a string input which must be one of the following:
+
+    - a unicode string (or string on Python 3);
+    - a utf-8 encoded byte string;
+    - a byte string for an XML document that defines an encoding
+      in the document premamble;
+    - an HTML document that specifies the encoding via the META tag.
+
+    Note that the template input is decoded, parsed and compiled on
+    initialization.
+    """
+
+    default_encoding = "utf-8"
+
+    # This attribute is strictly informational in this template class
+    # and is used in exception formatting. It may be set on
+    # initialization using the optional ``filename`` keyword argument.
+    filename = '<string>'
+
+    _cooked = False
+
+    if DEBUG_MODE or CACHE_DIRECTORY:
+        loader = _make_module_loader()
+    else:
+        loader = MemoryLoader()
+
+    if DEBUG_MODE:
+        output_stream_factory = DebuggingOutputStream
+    else:
+        output_stream_factory = list
+
+    debug = DEBUG_MODE
+
+    # The ``builtins`` dictionary can be used by a template class to
+    # add symbols which may not be redefined and which are (cheaply)
+    # available in the template variable scope
+    builtins = {}
+
+    # The ``builtins`` dictionary is updated with this dictionary at
+    # cook time. Note that it can be provided at class initialization
+    # using the ``extra_builtins`` keyword argument.
+    extra_builtins = {}
+
+    # Expression engine must be provided by subclass
+    engine = None
+
+    # When ``strict`` is set, expressions must be valid at compile
+    # time. When not set, this is only required at evaluation time.
+    strict = True
+
+    def __init__(self, body=None, **config):
+        self.__dict__.update(config)
+
+        if body is not None:
+            self.write(body)
+
+        # This is only necessary if the ``debug`` flag was passed as a
+        # keyword argument
+        if self.__dict__.get('debug') is True:
+            self.loader = _make_module_loader()
+
+    def __call__(self, **kwargs):
+        return self.render(**kwargs)
+
+    def __repr__(self):
+        return "<%s %s>" % (self.__class__.__name__, self.filename)
+
+    @property
+    def keep_body(self):
+        # By default, we only save the template body if we're
+        # in debugging mode (to save memory).
+        return self.__dict__.get('keep_body', DEBUG_MODE)
+
+    @property
+    def keep_source(self):
+        # By default, we only save the generated source code if we're
+        # in debugging mode (to save memory).
+        return self.__dict__.get('keep_source', DEBUG_MODE)
+
+    def cook(self, body):
+        digest = self._digest(body)
+        builtins_dict = self.builtins.copy()
+        builtins_dict.update(self.extra_builtins)
+        names, builtins = zip(*builtins_dict.items())
+        program = self._cook(body, digest, names)
+
+        initialize = program['initialize']
+        functions = initialize(*builtins)
+
+        for name, function in functions.items():
+            setattr(self, "_" + name, function)
+
+        self._cooked = True
+
+        if self.keep_body:
+            self.body = body
+
+    def cook_check(self):
+        assert self._cooked
+
+    def parse(self, body):
+        raise NotImplementedError("Must be implemented by subclass.")
+
+    def render(self, **__kw):
+        econtext = Scope(__kw)
+        rcontext = {}
+        self.cook_check()
+        stream = self.output_stream_factory()
+        try:
+            self._render(stream, econtext, rcontext)
+        except:
+            cls, exc, tb = sys.exc_info()
+            errors = rcontext.get('__error__')
+            if errors:
+                formatter = exc.__str__
+                if isinstance(formatter, ExceptionFormatter):
+                    if errors is not formatter._errors:
+                        formatter._errors.extend(errors)
+                    raise
+
+                formatter = ExceptionFormatter(errors, econtext, rcontext)
+
+                try:
+                    exc = create_formatted_exception(exc, cls, formatter)
+                except TypeError:
+                    pass
+
+                raise_with_traceback(exc, tb)
+
+            raise
+
+        return join(stream)
+
+    def write(self, body):
+        if isinstance(body, byte_string):
+            body, encoding, content_type = read_bytes(
+                body, self.default_encoding
+                )
+        else:
+            content_type = body.startswith('<?xml')
+            encoding = None
+
+        self.content_type = content_type
+        self.content_encoding = encoding
+
+        self.cook(body)
+
+    def _get_module_name(self, digest):
+        return "%s.py" % digest
+
+    def _cook(self, body, digest, builtins):
+        name = self._get_module_name(digest)
+        cooked = self.loader.get(name)
+        if cooked is None:
+            try:
+                source = self._make(body, builtins)
+                if self.debug:
+                    source = "# template: %s\n#\n%s" % (self.filename, source)
+                if self.keep_source:
+                    self.source = source
+                cooked = self.loader.build(source, name)
+            except TemplateError:
+                exc = sys.exc_info()[1]
+                exc.filename = self.filename
+                raise
+        elif self.keep_source:
+            module = sys.modules.get(cooked.get('__name__'))
+            if module is not None:
+                self.source = inspect.getsource(module)
+            else:
+                self.source = None
+
+        return cooked
+
+    def _digest(self, body):
+        class_name = type(self).__name__.encode('utf-8')
+        sha = pkg_digest.copy()
+        sha.update(body.encode('utf-8', 'ignore'))
+        sha.update(class_name)
+        return sha.hexdigest()
+
+    def _compile(self, program, builtins):
+        compiler = Compiler(self.engine, program, builtins, strict=self.strict)
+        return compiler.code
+
+    def _make(self, body, builtins):
+        program = self.parse(body)
+        module = Module("initialize", program)
+        return self._compile(module, builtins)
+
+
+class BaseTemplateFile(BaseTemplate):
+    """File-based template base class.
+
+    Relative path names are supported only when a template loader is
+    provided as the ``loader`` parameter.
+    """
+
+    # Auto reload is not enabled by default because it's a significant
+    # performance hit
+    auto_reload = AUTO_RELOAD
+
+    def __init__(self, filename, auto_reload=None, **config):
+        # Normalize filename
+        filename = os.path.abspath(
+            os.path.normpath(os.path.expanduser(filename))
+            )
+
+        self.filename = filename
+
+        # Override reload setting only if value is provided explicitly
+        if auto_reload is not None:
+            self.auto_reload = auto_reload
+
+        super(BaseTemplateFile, self).__init__(**config)
+
+        if EAGER_PARSING:
+            self.cook_check()
+
+    def cook_check(self):
+        if self.auto_reload:
+            mtime = self.mtime()
+
+            if mtime != self._v_last_read:
+                self._v_last_read = mtime
+                self._cooked = False
+
+        if self._cooked is False:
+            body = self.read()
+            log.debug("cooking %r (%d bytes)..." % (self.filename, len(body)))
+            self.cook(body)
+
+    def mtime(self):
+        try:
+            return os.path.getmtime(self.filename)
+        except (IOError, OSError):
+            return 0
+
+    def read(self):
+        with open(self.filename, "rb") as f:
+            data = f.read()
+
+        body, encoding, content_type = read_bytes(
+            data, self.default_encoding
+            )
+
+        # In non-XML mode, we support various platform-specific line
+        # endings and convert them to the UNIX newline character
+        if content_type != "text/xml" and '\r' in body:
+            body = body.replace('\r\n', '\n').replace('\r', '\n')
+
+        self.content_type = content_type
+        self.content_encoding = encoding
+
+        return body
+
+    def _get_module_name(self, digest):
+        filename = os.path.basename(self.filename)
+        mangled = mangle(filename)
+        return "%s_%s.py" % (mangled, digest)
+
+    def _get_filename(self):
+        return self.__dict__.get('filename')
+
+    def _set_filename(self, filename):
+        self.__dict__['filename'] = filename
+        self._v_last_read = None
+        self._cooked = False
+
+    filename = property(_get_filename, _set_filename)
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/__init__.py b/lib/Chameleon-2.9.2/src/chameleon/tests/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/__init__.py
@@ -0,0 +1,1 @@
+#
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-interpolation.txt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-interpolation.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-interpolation.txt
@@ -0,0 +1,1 @@
+${'<Hello world>'}<&>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.html b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.html
@@ -0,0 +1,7 @@
+<html>
+  <body py:with="text 'Hello world!'">
+    ${text}
+    $text
+  </body>
+  ${text | 'Goodbye world!'}
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001-variable-scope.pt
@@ -0,0 +1,11 @@
+<html>
+  <body tal:define="text 'Hello world!'">
+    ${text}
+  </body>
+  <tal:check condition="exists: text">
+    bad
+  </tal:check>
+  <tal:check condition="not: exists: text">
+    ok
+  </tal:check>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/001.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002-repeat-scope.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002-repeat-scope.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002-repeat-scope.pt
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <div tal:repeat="text ('Hello', 'Goodbye')">
+      <span tal:repeat="char ('!', '.')">${text}${char}</span>
+    </div>
+    <tal:check condition="not: exists: text">ok</tal:check>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/002.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc ></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003-content.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003-content.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003-content.pt
@@ -0,0 +1,17 @@
+<html>
+  <body>
+    <div tal:content="'Hello world!'" />
+    <div tal:content="'Hello world!'" />1
+   2<div tal:content="'Hello world!'" />
+    <div tal:content="'Hello world!'" />3
+    <div tal:content="'Hello world!'">4</div>5
+   6<div tal:content="'Hello world!'"></div>
+    <div tal:content="1" />
+    <div tal:content="1.0" />
+    <div tal:content="True" />
+    <div tal:content="False" />
+    <div tal:content="0" />
+    <div tal:content="None" />
+    <div tal:replace="content" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/003.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc >
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004-attributes.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004-attributes.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004-attributes.pt
@@ -0,0 +1,18 @@
+<html>
+  <body>
+    <span tal:attributes="class 'hello'" />
+    <span class="goodbye" tal:attributes="class 'hello'" />
+    <span CLASS="goodbye" tal:attributes="class 'hello'" />
+    <span tal:attributes="class None" />
+    <span a="1" b="2" c="3" tal:attributes="a None" />
+    <span a="1" b="2" c="3" tal:attributes="b None" />
+    <span a="1" b="2" c="3" tal:attributes="c None" />
+    <span a="1" b="2" c="3" tal:attributes="b None; c None" />
+    <span a="1" b="2" c="3" tal:attributes="b string:;;" />
+    <span a="1" b="2" c="3" tal:attributes="b string:&amp;" />
+    <span class="hello" tal:attributes="class 'goodbye'" />
+    <span class="hello" tal:attributes="class '&quot;goodbye&quot;'" />
+    <span class="hello" tal:attributes="class '\'goodbye\''" />
+    <span class='hello' tal:attributes="class '\'goodbye\''" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/004.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED>
+]>
+<doc a1="v1"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005-default.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005-default.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005-default.pt
@@ -0,0 +1,12 @@
+<html>
+  <body>
+    <img class="default" tal:attributes="class default" />
+    <img tal:attributes="class default" />
+    <span tal:content="default">Default</span>
+    <span tal:content="True">Default</span>
+    <span tal:content="False">Default</span>
+    <span tal:content="default">
+      <em>${'Computed default'}</em>
+    </span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/005.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED>
+]>
+<doc a1 = "v1"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006-attribute-interpolation.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006-attribute-interpolation.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006-attribute-interpolation.pt
@@ -0,0 +1,9 @@
+<html>
+  <body class="ltr" tal:define="hash string:#">
+    <img src="${'#'}" alt="copyright (c) ${2010}" />
+    <img src="" alt="copyright (c) ${2010}" tal:attributes="src string:$hash" />
+    <img src="" alt="copyright (c) ${2010}" tal:attributes="src string:${hash}" />
+    <img src="${None}" alt="$ignored" />
+    <img src="" alt="${'%stype \'str\'%s' % (chr(60), chr(62))}" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/006.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED>
+]>
+<doc a1='v1'></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007-content-interpolation.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007-content-interpolation.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007-content-interpolation.pt
@@ -0,0 +1,15 @@
+<html>
+  <body>
+    ${'Hello world!'}
+    ${literal}
+    ${structure: literal.s}
+    ${"%stype 'str'%s" % (chr(60), chr(62))}
+    &&
+    ${None}
+    ${None or
+      'Hello world'}
+    $leftalone
+    <div>${None}</div>
+    <div>${1 &lt; 2 and 'Hello world' or None}</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/007.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#32;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008-builtins.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008-builtins.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008-builtins.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    ${nothing}
+    <div tal:attributes="class string:dynamic" class="static">
+      ${attrs['class']}
+    </div>
+    <div tal:define="nothing string:nothing">
+      ${nothing}
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/008.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&amp;&lt;&gt;&quot;&apos;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009-literals.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009-literals.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009-literals.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    ${literal}
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/009.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#x20;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010-structure.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010-structure.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010-structure.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div tal:content="text string:1 &lt; 2" />
+    <div tal:content="structure string:2 &lt; 3, 2&amp;3, 2&lt;3, 2&gt;3" />
+    <div tal:content="structure string:3 ${'&lt;'} 4" />
+    <div tal:content="structure '%d &lt; %d' % (4, 5)" />
+    <div tal:replace="structure content" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/010.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED>
+]>
+<doc a1="v1" ></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011-messages.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011-messages.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011-messages.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div tal:content="text message" />
+    <div tal:content="structure message" />
+    <div tal:content="text string:${message}" />
+    <div tal:content="structure string:${message}" />
+    ${message}
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/011.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED a2 CDATA #IMPLIED>
+]>
+<doc a1="v1" a2="v2"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012-translation.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012-translation.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012-translation.pt
@@ -0,0 +1,21 @@
+<html>
+  <body>
+    <div i18n:translate="">
+      Hello world!
+    </div>
+    <div i18n:translate="hello_world">
+      Hello world!
+    </div>
+    <div i18n:translate="">
+      <sup>Hello world!</sup>
+    </div>
+    <div i18n:translate="">
+      Hello <em i18n:name="first">${'world'}</em>!
+      Goodbye <em i18n:name="second">${'planet'}</em>!
+    </div>
+    <div i18n:translate="hello_goodbye">
+      Hello <em i18n:name="first">${'world'}</em>!
+      Goodbye <em i18n:name="second">${'planet'}</em>!
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/012.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc : CDATA #IMPLIED>
+]>
+<doc :="v1"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013-repeat-nested.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013-repeat-nested.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013-repeat-nested.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <table>
+      <tr tal:repeat="i (1,2)">
+        <td tal:repeat="j (1,2)">
+          [${i},${j}]
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/013.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc _.-0123456789 CDATA #IMPLIED>
+]>
+<doc _.-0123456789="v1"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014-repeat-nested-similar.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014-repeat-nested-similar.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014-repeat-nested-similar.pt
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    <span tal:repeat="i (3,4)">
+      <span tal:repeat="j (3,4)">[${i},${j}]</span>
+    </span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/014.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc abcdefghijklmnopqrstuvwxyz CDATA #IMPLIED>
+]>
+<doc abcdefghijklmnopqrstuvwxyz="v1"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015-translation-nested.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015-translation-nested.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015-translation-nested.pt
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    <div i18n:translate="">
+      Price:
+      <span i18n:name="price" i18n:translate="">
+        Per kilo <em i18n:name="amount">${12.5}</em>
+      </span>
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/015.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc ABCDEFGHIJKLMNOPQRSTUVWXYZ CDATA #IMPLIED>
+]>
+<doc ABCDEFGHIJKLMNOPQRSTUVWXYZ="v1"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016-explicit-translation.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016-explicit-translation.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016-explicit-translation.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <div i18n:translate="" tal:content="string:Hello world!">
+      Hello world!
+    </div>
+    <img alt="${'Hello world!'}" i18n:attributes="alt" />
+    <img alt="${'Hello world!'}" i18n:attributes="alt hello_world" />
+    <img tal:attributes="alt 'Hello world!'" i18n:attributes="alt" />
+    <img tal:attributes="alt 'Hello world!'" i18n:attributes="alt hello_world" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/016.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><?pi?></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017-omit-tag.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017-omit-tag.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017-omit-tag.pt
@@ -0,0 +1,12 @@
+<html>
+  <body>
+    <div tal:omit-tag="">Hello world!</div>
+    <div tal:omit-tag="">1
+      Hello world!
+   2</div>3
+   4<div tal:omit-tag="True">Hello world!</div>
+    <div tal:omit-tag="False">Hello world!</div>
+    <div class="omitted" tal:omit-tag="True">Hello world!</div>
+    <div class="${'omitted'}" tal:omit-tag="True">Hello world!</div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/017.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><?pi some data ? > <??></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018-translation-nested-dynamic.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018-translation-nested-dynamic.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018-translation-nested-dynamic.pt
@@ -0,0 +1,13 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+  <div i18n:translate="" tal:omit-tag="">
+      <span i18n:name="monthname"
+            i18n:translate=""
+            tal:content="'october'"
+            tal:omit-tag="">monthname</span>
+      <span i18n:name="year"
+            i18n:translate=""
+            tal:content="1982"
+            tal:omit-tag="">year</span>
+  </div>
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/018.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><![CDATA[<foo>]]></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019-replace.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019-replace.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019-replace.pt
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    <div tal:replace="'Hello world!'" />
+    <div tal:replace="'Hello world!'" />1
+   2<div tal:replace="'Hello world!'" />
+    <div tal:replace="'Hello world!'" />3
+    <div tal:replace="'Hello world!'">4</div>5
+   6<div tal:replace="'Hello world!'"></div>
+    <div tal:replace="1" />
+    <div tal:replace="1.0" />
+    <div tal:replace="True" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/019.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><![CDATA[<&]]></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020-on-error.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020-on-error.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020-on-error.pt
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    <div id="test" tal:attributes="class python: 'abc' + 2" tal:on-error="nothing" />
+    <div tal:on-error="string:${type(error.value).__name__} thrown at ${error.lineno}:${error.offset}.">
+      <div tal:content="undefined" />
+    </div>
+    <div tal:replace="undefined" tal:on-error="nothing" />
+    <div tal:content="undefined" tal:on-error="nothing" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/020.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><![CDATA[<&]>]]]></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021-translation-domain.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021-translation-domain.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021-translation-domain.pt
@@ -0,0 +1,16 @@
+<html>
+  <body i18n:domain="old">
+    <div i18n:domain="new" i18n:translate="">
+      Hello world!
+    </div>
+    <div i18n:translate="">
+      Hello world!
+    </div>
+    <div class="test" i18n:domain="new" i18n:attributes="class">
+      Hello world!
+    </div>
+    <div class="test" i18n:domain="new" i18n:attributes="class test_msgid">
+      Hello world!
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/021.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><!-- a comment --></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022-switch.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022-switch.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022-switch.pt
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    <div tal:switch="True">
+      <span tal:case="False">bad</span>
+      <span tal:case="True">ok</span>
+      <span tal:case="not not True">ok</span>
+    </div>
+    <div tal:switch="True">
+      <span tal:case="False">bad</span>
+      <span tal:case="default">ok</span>
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/022.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><!-- a comment ->--></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023-condition.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023-condition.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023-condition.pt
@@ -0,0 +1,6 @@
+<html>
+  <body tal:condition="True">
+    <span tal:define="selector False" tal:condition="selector">bad</span>
+    <span tal:condition="True">ok</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/023.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "">
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024-namespace-elements.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024-namespace-elements.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024-namespace-elements.pt
@@ -0,0 +1,16 @@
+<html>
+  <body>
+    <tal:first>
+      <tal:second>
+        ${'first'}
+      </tal:second>
+      second
+    </tal:first>
+    <tal:block condition="True">
+      ok
+    </tal:block>
+    <tal:block condition="False">
+      bad
+    </tal:block>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/024.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (foo)>
+<!ELEMENT foo (#PCDATA)>
+<!ENTITY e "&#60;foo></foo>">
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025-repeat-whitespace.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025-repeat-whitespace.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025-repeat-whitespace.pt
@@ -0,0 +1,14 @@
+<html>
+  <body>
+    <ul>
+      <tal:item repeat="i (1, 2, 3)"><li tal:content="i" /></tal:item>
+      <span tal:omit-tag="" tal:repeat="j (1, 2, 3)"><li tal:content="j" /></span>
+      <tal:count>
+        <tal:count-loop repeat="count (1, 2, 3)">
+          <span tal:replace="count"
+                /><tal:comma condition="not repeat['count'].end">,</tal:comma>
+       </tal:count-loop>
+      </tal:count>.
+    </ul>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/025.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (foo*)>
+<!ELEMENT foo (#PCDATA)>
+]>
+<doc><foo/><foo></foo></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026-repeat-variable.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026-repeat-variable.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026-repeat-variable.pt
@@ -0,0 +1,13 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+  <ul>
+    <li tal:attributes="class repeat['i'].even()+repeat['i'].odd()" name="${i}-${repeat.i.index}" tal:repeat="i range(3)"><span tal:replace="i" /></li>
+  </ul>
+  <ul>
+    <li tal:attributes="class repeat['i'].even+repeat['i'].odd"
+        tal:repeat="i range(3)"><span tal:replace="i" /></li>
+  </ul>
+  <ul>
+    <li tal:repeat="i range(3)"><span tal:condition="repeat['i'].even" tal:replace="repeat['i'].even" /><span tal:condition="repeat['i'].odd" tal:replace="repeat['i'].odd" /></li>
+  </ul>
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/026.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (foo*)>
+<!ELEMENT foo EMPTY>
+]>
+<doc><foo/><foo></foo></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027-attribute-replacement.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027-attribute-replacement.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027-attribute-replacement.pt
@@ -0,0 +1,11 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+  <span id="test"
+        class="dummy"
+        onClick=""
+        tal:define="a 'abc'"
+        tal:attributes="class 'def' + a + default; style 'hij'; onClick 'alert();;'"
+        tal:content="a + 'ghi'" />
+  <span tal:replace="'Hello World!'">Hello <b>Universe</b>!</span>
+  <span tal:replace="'Hello World!'"><b>Hello Universe!</b></span>
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/027.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (foo*)>
+<!ELEMENT foo ANY>
+]>
+<doc><foo/><foo></foo></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028-attribute-toggle.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028-attribute-toggle.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028-attribute-toggle.pt
@@ -0,0 +1,6 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+  <option tal:attributes="selected True"></option>
+  <option tal:attributes="selected False"></option>
+  <option tal:attributes="selected None"></option>
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/028.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029-attribute-ordering.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029-attribute-ordering.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029-attribute-ordering.pt
@@ -0,0 +1,5 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+     xmlns:tal="http://xml.zope.org/namespaces/tal">
+  <a rel="self" href="http://repoze.org" id="link-id"
+     tal:attributes="href 'http://python.org'" />
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/029.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0'?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030-repeat-tuples.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030-repeat-tuples.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030-repeat-tuples.pt
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    <div tal:repeat="(i, j) ((1, 2), (3, 4))">
+      ${repeat['i', 'j'].number}, ${i}, ${j}
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/030.xml
@@ -0,0 +1,5 @@
+<?xml version = "1.0"?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031-namespace-with-tal.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031-namespace-with-tal.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031-namespace-with-tal.pt
@@ -0,0 +1,7 @@
+<div>
+  <tal:example replace="'Hello World!'" />
+  <tal:example tal:replace="'Hello World!'" />
+  <tal:div content="'Hello World!'" />
+  <tal:multiple repeat="i range(3)" replace="i" />
+  <tal:div condition="True">True</tal:div>
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/031.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032-master-template.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032-master-template.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032-master-template.pt
@@ -0,0 +1,20 @@
+<html i18n:domain="master" metal:define-macro="main" tal:define="content nothing">
+  <head>
+    <title metal:define-slot="title"
+           metal:define-macro="title"
+           tal:define="has_title exists: title"
+           tal:content="title if has_title else default">Master template</title>
+  </head>
+  <body>
+    <div id="content">
+      <metal:content define-slot="content">
+        <!-- content here -->
+      </metal:content>
+    </div>
+    <div id="footer">
+      <metal:footer define-slot="body-footer" tal:content="nothing">
+        <!-- footer here -->
+      </metal:footer>
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/032.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' standalone='yes'?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033-use-macro-trivial.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033-use-macro-trivial.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033-use-macro-trivial.pt
@@ -0,0 +1,1 @@
+<html metal:use-macro="load('032-master-template.pt').macros['main']" />
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/033.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding="UTF-8" standalone='yes'?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034-use-template-as-macro.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034-use-template-as-macro.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034-use-template-as-macro.pt
@@ -0,0 +1,1 @@
+<html metal:use-macro="load('032-master-template.pt')" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/034.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc/>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035-use-macro-with-fill-slot.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035-use-macro-with-fill-slot.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035-use-macro-with-fill-slot.pt
@@ -0,0 +1,5 @@
+<html metal:use-macro="load('032-master-template.pt').macros['main']">
+  <title metal:fill-slot="title" tal:define="kind 'New'">
+    ${kind} title
+  </title>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/035.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc />
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036-use-macro-inherits-dynamic-scope.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036-use-macro-inherits-dynamic-scope.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036-use-macro-inherits-dynamic-scope.pt
@@ -0,0 +1,2 @@
+<html tal:define="title string:New title"
+      metal:use-macro="load('032-master-template.pt').macros['main']" />
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/036.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
+<?pi data?>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037-use-macro-local-variable-scope.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037-use-macro-local-variable-scope.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037-use-macro-local-variable-scope.pt
@@ -0,0 +1,5 @@
+<html metal:use-macro="load('032-master-template.pt').macros['main']" >
+  <metal:content metal:fill-slot="content">
+    <span tal:condition="content is None">ok</span>
+  </metal:content>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/037.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
+<!-- comment -->
+
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038-use-macro-globals.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038-use-macro-globals.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038-use-macro-globals.pt
@@ -0,0 +1,6 @@
+<metal:globals use-macro="load('039-globals.pt')"  />
+<html>
+  <body>
+    <span tal:condition="content is None">ok</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/038.xml
@@ -0,0 +1,6 @@
+<!-- comment -->
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
+
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039-globals.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039-globals.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039-globals.pt
@@ -0,0 +1,1 @@
+<tal:globals define="global content None" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/039.xml
@@ -0,0 +1,5 @@
+<?pi data?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040-macro-using-template-symbol.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040-macro-using-template-symbol.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040-macro-using-template-symbol.pt
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      metal:define-macro="master"
+      template-macros="${' '.join(template.macros.names)}"
+      macros="${' '.join(macros.names)}">
+    <metal:block tal:define="foo 'foo'">
+      ${foo}
+      <div metal:define-slot="content" tal:replace="None">
+         <!-- will be replaced -->
+      </div>
+      <span template-macros="${' '.join(template.macros.names)}"
+            macros="${' '.join(macros.names)}">
+         <!-- demonstrate difference between
+              `template` and `macros` symbol -->
+      </span>
+    </metal:block>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/040.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED>
+]>
+<doc a1="&quot;&lt;&amp;&gt;&apos;"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041-translate-nested-names.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041-translate-nested-names.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041-translate-nested-names.pt
@@ -0,0 +1,22 @@
+<html>
+  <body>
+    <div i18n:translate="">
+      Hello
+      <tal:nested condition="True">
+        <span i18n:name="world">world!</span>
+      </tal:nested>
+    </div>
+    <div i18n:translate="hello">
+      Hello
+      <tal:nested condition="True">
+        <span i18n:name="world">world!</span>
+      </tal:nested>
+    </div>
+    <div i18n:translate="">
+      Goodbye
+      <tal:nested condition="False">
+        <span i18n:name="world">world!</span>
+      </tal:nested>
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/041.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED>
+]>
+<doc a1="&#65;"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042-use-macro-fill-footer.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042-use-macro-fill-footer.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042-use-macro-fill-footer.pt
@@ -0,0 +1,3 @@
+<html metal:use-macro="load('032-master-template.pt').macros['main']">
+  <metal:footer fill-slot="body-footer">New footer</metal:footer>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/042.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#00000000000000000000000000000000065;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043-macro-nested-dynamic-vars.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043-macro-nested-dynamic-vars.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043-macro-nested-dynamic-vars.pt
@@ -0,0 +1,19 @@
+<html>
+  <body>
+    <tal:macros condition="0">
+
+      <metal:outer define-macro="outer">
+        <metal:inner use-macro="template.macros['inner']" />
+      </metal:outer>
+
+      <metal:inner define-macro="inner">
+        ${title}
+      </metal:inner>
+
+    </tal:macros>
+
+    <div tal:define="title string:My title"
+         metal:use-macro="template.macros['outer']"
+         />
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/043.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ATTLIST doc a1 CDATA #IMPLIED>
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc a1="foo
+bar"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044-tuple-define.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044-tuple-define.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044-tuple-define.pt
@@ -0,0 +1,5 @@
+<html>
+  <body tal:define="(a, b) 'a', 'b'">
+    ${a}, ${b}
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/044.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (e*)>
+<!ELEMENT e EMPTY>
+<!ATTLIST e a1 CDATA "v1" a2 CDATA "v2" a3 CDATA #IMPLIED>
+]>
+<doc>
+<e a3="v3"/>
+<e a1="w1"/>
+<e a2="w2" a3="v3"/>
+</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045-namespaces.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045-namespaces.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045-namespaces.pt
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE application [
+  <!ENTITY nbsp "\&#160;">
+]>
+<application xmlns="http://research.sun.com/wadl/2006/10"
+             xsi:schemaLocation="http://research.sun.com/wadl/2006/10/wadl.xsd"
+             xmlns:wadl="http://research.sun.com/wadl/2006/10"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:tal="http://xml.zope.org/namespaces/tal">
+  <resources tal:define="path '/'">
+    <resource path="${path}">ZZZ&nbsp;YYY&nbsp;XXX</resource>
+  </resources>
+</application>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/045.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA "v1">
+<!ATTLIST doc a1 CDATA "z1">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046-extend-macro.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046-extend-macro.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046-extend-macro.pt
@@ -0,0 +1,6 @@
+<html metal:define-macro="extended"
+      metal:extend-macro="load('032-master-template.pt').macros['main']">
+  <metal:footer fill-slot="body-footer">
+    <span metal:define-slot="kind">New</span> footer
+  </metal:footer>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/046.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA "v1">
+<!ATTLIST doc a2 CDATA "v2">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047-use-extended-macro.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047-use-extended-macro.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047-use-extended-macro.pt
@@ -0,0 +1,3 @@
+<html metal:use-macro="load('046-extend-macro.pt').macros['extended']">
+  <em metal:fill-slot="kind">Extended</em>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/047.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>X
+Y</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048-use-extended-macro-fill-original.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048-use-extended-macro-fill-original.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048-use-extended-macro-fill-original.pt
@@ -0,0 +1,5 @@
+<html metal:use-macro="load('046-extend-macro.pt').macros['extended']">
+  <metal:footer fill-slot="body-footer">
+    Extended footer
+  </metal:footer>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/048.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>]</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/049-entities-in-attributes.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/049-entities-in-attributes.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/049-entities-in-attributes.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <pre tal:content="string:amp=&amp;amp; lt=&amp;lt;"  />
+    <pre tal:content="structure string:amp=&amp;amp; lt=&amp;lt;"  />
+    <script tal:replace="structure string:&lt;script /&gt;" />
+    <script tal:replace="string:&lt;script /&gt;" />
+    <script tal:replace="string:${'&lt;'}script /${'&gt;'}" />
+    <script tal:replace="structure string:${'&lt;'}script /${'&gt;'}" />
+    <img alt="1 &lt; 2: ${1 &lt; 2}" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/049.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/049.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c3cc797b5954881cc794f6720674a8bfa13aacbe
GIT binary patch
[stripped]
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/050-define-macro-and-use-not-extend.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/050-define-macro-and-use-not-extend.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/050-define-macro-and-use-not-extend.pt
@@ -0,0 +1,6 @@
+<html metal:define-macro="main"
+      metal:use-macro="load('032-master-template.pt').macros['main']">
+  <metal:content fill-slot="content">
+     Default content
+  </metal:content>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/050.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/050.xml
new file mode 100644
index 0000000000000000000000000000000000000000..12303b1af2185eb29894629b99431fea831367b1
GIT binary patch
[stripped]
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/051-use-non-extended-macro.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/051-use-non-extended-macro.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/051-use-non-extended-macro.pt
@@ -0,0 +1,5 @@
+<html metal:use-macro="load('050-define-macro-and-use-not-extend.pt').macros['main']">
+  <metal:content fill-slot="content">
+    <span>Filled content</span>
+  </metal:content>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/051.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/051.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7ae8f6c73a4b47ec18492ebefed16c63f5f5ef22
GIT binary patch
[stripped]
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052-i18n-domain-inside-filled-slot.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052-i18n-domain-inside-filled-slot.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052-i18n-domain-inside-filled-slot.pt
@@ -0,0 +1,8 @@
+<html metal:define-macro="main"
+      metal:use-macro="load('032-master-template.pt').macros['main']">
+  <metal:content fill-slot="content">
+    <span i18n:domain="mydomain" i18n:translate="">
+       Translated content
+    </span>
+  </metal:content>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/052.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>????????</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053-special-characters-in-attributes.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053-special-characters-in-attributes.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053-special-characters-in-attributes.pt
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <a tal:attributes="href string:@@view">test</a>
+    <a href="${'@@'}view">test</a>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/053.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ENTITY e "<e/>">
+<!ELEMENT doc (e)>
+<!ELEMENT e EMPTY>
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054-import-expression.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054-import-expression.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054-import-expression.pt
@@ -0,0 +1,3 @@
+<div tal:define="datetime import: datetime.datetime">
+  ${datetime(1984, 12, 31).isoformat()}
+</div>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/054.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+
+
+<doc
+></doc
+>
+
+
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055-attribute-fallback-to-dict-lookup.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055-attribute-fallback-to-dict-lookup.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055-attribute-fallback-to-dict-lookup.pt
@@ -0,0 +1,4 @@
+<div tal:define="obj {'foo': 'bar', 'boo': {'bar': 'baz'}}">
+  ${obj.foo}
+  ${obj.boo.bar}
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/055.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<?pi  data?>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056-comment-attribute.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056-comment-attribute.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056-comment-attribute.pt
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    <tal:first comment="ignored">
+      Namespace tag
+    </tal:first>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/056.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#x0000000000000000000000000000000000000041;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057-order.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057-order.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057-order.pt
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <div tal:condition="False" tal:repeat="item bad_input" />
+    <div tal:define="sequence 1, 2, 3"
+         tal:repeat="item sequence"
+         tal:replace="item" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/057.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (a*)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058-script.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058-script.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058-script.pt
@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <script tal:define="field {'oid': 1}; values 'values'; options 'options'">
+      deform.addCallback(
+        '${field.oid}',
+        function (oid) {
+            $('#' + oid).autocomplete({source: ${values}});
+            $('#' + oid).autocomplete("option", ${options});
+        }
+      );
+    </script>
+  </head>
+  <body>
+    <!-- Form -->
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/058.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ATTLIST doc a1 NMTOKENS #IMPLIED>
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc a1=" 1  	2 	"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059-embedded-javascript.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059-embedded-javascript.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059-embedded-javascript.pt
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <span onclick="alert(true && false);">test</span>
+    <span onclick="alert(${str(True).lower()} && ${str(False).lower()});">test</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/059.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (e*)>
+<!ELEMENT e EMPTY>
+<!ATTLIST e a1 CDATA #IMPLIED a2 CDATA #IMPLIED a3 CDATA #IMPLIED>
+]>
+<doc>
+<e a1="v1" a2="v2" a3="v3"/>
+<e a1="w1" a2="v2"/>
+<e a1="v1" a2="w2" a3="v3"/>
+</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060-macro-with-multiple-same-slots.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060-macro-with-multiple-same-slots.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060-macro-with-multiple-same-slots.pt
@@ -0,0 +1,8 @@
+<html metal:define-macro="main">
+  <head>
+    <title><metal:title define-slot="title">Untitled</metal:title></title>
+  </head>
+  <body>
+    <h1><metal:title define-slot="title">Untitled</metal:title></h1>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/060.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>X&#10;Y</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061-fill-one-slot-but-two-defined.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061-fill-one-slot-but-two-defined.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061-fill-one-slot-but-two-defined.pt
@@ -0,0 +1,3 @@
+<html metal:use-macro="load('060-macro-with-multiple-same-slots.pt').macros['main']">
+  <metal:title fill-slot="title">My document</metal:title>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/061.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#163;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062-comments-and-expressions.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062-comments-and-expressions.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062-comments-and-expressions.pt
@@ -0,0 +1,27 @@
+<div>
+  <!--! ${dropped} -->
+</div>
+
+<div>
+  <!--? ${left alone} -->
+</div>
+
+<div>
+  <!-- ${'not left alone'} -->
+</div>
+
+<div meta:interpolation="true">
+  <!-- ${'not left alone'} -->
+</div>
+
+<div meta:interpolation="false">
+  <!-- ${left alone} -->
+</div>
+
+<!--[if IE ${6}]>
+  Special instructions for IE 6 here
+<![endif]-->
+
+<!--?[if IE 6]>
+  ${left alone}
+<![endif]-->
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/062.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#xe40;&#xe08;&#xe21;??????</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063-continuation.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063-continuation.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063-continuation.pt
@@ -0,0 +1,4 @@
+<div tal:define="foo 1 + \
+                     1">
+  ${foo}
+</div>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/063.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE ??????????????? [
+<!ELEMENT ??????????????? (#PCDATA)>
+]>
+<???????????????></???????????????>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064-tags-and-special-characters.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064-tags-and-special-characters.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064-tags-and-special-characters.pt
@@ -0,0 +1,4 @@
+<tal:block>
+  <div	id="test"	class="${'test'}">
+  </div>
+</tal:block>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/064.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#x10000;&#x10FFFD;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065-use-macro-in-fill.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065-use-macro-in-fill.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065-use-macro-in-fill.pt
@@ -0,0 +1,6 @@
+<html metal:use-macro="load('032-master-template.pt').macros['main']">
+  <title tal:define="title string:Title"
+         metal:fill-slot="title"
+         metal:use-macro="load('032-master-template.pt').macros['title']" />
+  <div metal:fill-slot="content">Content</div>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/065.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ENTITY e "&#60;">
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066-load-expression.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066-load-expression.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066-load-expression.pt
@@ -0,0 +1,1 @@
+<html tal:define="hello_world load: hello_world.pt" metal:use-macro="hello_world" />
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/066.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA #IMPLIED>
+<!-- 34 is double quote -->
+<!ENTITY e1 "&#34;">
+]>
+<doc a1="&e1;"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067-attribute-decode.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067-attribute-decode.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067-attribute-decode.pt
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <img src="#" tal:attributes="class 1 > 0 and 'up' or 0 &lt; 1 and 'down';" />
+    <img src="#" tal:attributes="class 0 &gt; 1 and 'up' or 0 &lt; 1 and 'down';" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/067.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#13;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068-less-than-greater-than-in-attributes.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068-less-than-greater-than-in-attributes.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068-less-than-greater-than-in-attributes.pt
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <span tal:content="string:0 < 1 or 0 > 1" />
+    <span tal:content="structure string:0 < 1 or 0 > 1" />
+    <span class="0 < 1 or 0 > 1" />
+    <span>0 < 1 or 0 > 1</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/068.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "&#13;">
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069-translation-domain-and-macro.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069-translation-domain-and-macro.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069-translation-domain-and-macro.pt
@@ -0,0 +1,3 @@
+<html metal:use-macro="load('032-master-template.pt').macros['main']">
+  <title metal:fill-slot="title" i18n:domain="test" i18n:translate="title">Title</title>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/069.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!NOTATION n PUBLIC "whatever">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070-translation-domain-and-use-macro.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070-translation-domain-and-use-macro.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070-translation-domain-and-use-macro.pt
@@ -0,0 +1,3 @@
+<html i18n:domain="test" metal:use-macro="load('032-master-template.pt').macros['main']">
+  <title metal:fill-slot="title" i18n:translate="title">Title</title>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/070.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ENTITY % e "<!ELEMENT doc (#PCDATA)>">
+%e;
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071-html-attribute-defaults.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071-html-attribute-defaults.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071-html-attribute-defaults.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <input type="input" tal:attributes="checked True" />
+    <input type="input" tal:attributes="checked False" />
+    <input type="input" tal:attributes="checked None" />
+    <input type="input" checked="checked" tal:attributes="checked default" />
+    <input type="input" checked tal:attributes="checked default" />
+    <input type="input" tal:attributes="checked default" />
+    <input type="input" class="field" tal:attributes="class True" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/071.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a ID #IMPLIED>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072-repeat-interpolation.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072-repeat-interpolation.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072-repeat-interpolation.pt
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    <ul>
+      <li tal:repeat="i range(1, 4)" class="${'odd' if i % 2 != 0 else default}">${i}</li>
+    </ul>
+    <ul>
+      <li tal:repeat="i range(1, 4)" class="${'odd' if i % 2 != 0 else None}">${i}</li>
+    </ul>
+    <ul>
+      <li tal:repeat="i range(1, 4)" class="${'odd' if i % 2 != 0 else False}">${i}</li>
+    </ul>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/072.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a IDREF #IMPLIED>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073-utf8-encoded.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073-utf8-encoded.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073-utf8-encoded.pt
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title>${'my title'} ??? ${'my site'}</title></head>
+<body></body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/073.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a IDREFS #IMPLIED>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074-encoded-template.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074-encoded-template.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074-encoded-template.pt
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="windows-1251" ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title>${'my title'} ? ${'my site'}</title></head>
+<body></body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/074.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a ENTITY #IMPLIED>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075-nested-macros.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075-nested-macros.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075-nested-macros.pt
@@ -0,0 +1,11 @@
+<metal:page define-macro="master">
+  <tal:block metal:use-macro="load('032-master-template.pt').macros['main']">
+
+    <metal:block fill-slot="content">
+      <metal:override define-slot="content">
+        foo
+      </metal:override>
+    </metal:block>
+
+  </tal:block>
+</metal:page>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/075.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a ENTITIES #IMPLIED>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076-nested-macro-override.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076-nested-macro-override.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076-nested-macro-override.pt
@@ -0,0 +1,3 @@
+<metal:page use-macro="load('075-nested-macros.pt').macros['master']">
+  <metal:block fill-slot="content">bar</metal:block>
+</metal:page>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/076.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a NOTATION (n1|n2) #IMPLIED>
+<!NOTATION n1 SYSTEM "http://www.w3.org/">
+<!NOTATION n2 SYSTEM "http://www.w3.org/">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077-i18n-attributes.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077-i18n-attributes.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077-i18n-attributes.pt
@@ -0,0 +1,1 @@
+<input type="hidden" id="uploadify_label_file_title" i18n:domain="test" i18n:attributes="value Title" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/077.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a (1|2) #IMPLIED>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078-tags-and-newlines.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078-tags-and-newlines.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078-tags-and-newlines.pt
@@ -0,0 +1,23 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      tal:omit-tag=""
+      tal:define="id 'foo'">
+  <body>
+      <span id="toDataContainer"
+            tal:attributes="id string:${id}-toDataContainer">
+        <script type="text/javascript" tal:content="string:
+          copyDataForSubmit('${id}');">
+          // initial copying of field "field.to" --> "field"
+          copyDataForSubmit("<i tal:replace="${id}"/>");
+        </script>
+      </span>
+      <tal:block
+    repeat="value python: (1, 2, 3)"
+    ><span class="selected-option"
+           tal:content="value"
+    /><tal:block condition="not:repeat.value.end">, </tal:block
+  ></tal:block
+>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/078.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #REQUIRED>
+]>
+<doc a="v"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079-implicit-i18n.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079-implicit-i18n.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079-implicit-i18n.pt
@@ -0,0 +1,16 @@
+<html tal:define="request dict(site_url='http://host')">
+  <head>
+    <title>Welcome</title>
+  </head>
+  <body>
+    <h1>Welcome</h1>
+    <span>An edge case: ${.</span>
+    <img tal:define="site_url request.site_url" alt="Site logo" href="${site_url}/logo.png" />
+    <img alt="Site logo" href="${request.site_url}/logo.png" />
+    <div id="content">
+      foo.
+      <br />
+      bar.
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/079.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #FIXED "v">
+]>
+<doc a="v"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080-xmlns-namespace-on-tal.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080-xmlns-namespace-on-tal.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080-xmlns-namespace-on-tal.pt
@@ -0,0 +1,6 @@
+<tal:component xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
+   Hello world
+</tal:component>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/080.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #FIXED "v">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081-load-spec.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081-load-spec.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081-load-spec.pt
@@ -0,0 +1,1 @@
+<html metal:use-macro="load: chameleon:tests/inputs/hello_world.pt" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/081.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (a, b, c)>
+<!ELEMENT a (a?)>
+<!ELEMENT b (b*)>
+<!ELEMENT c (a | b)+>
+]>
+<doc><a/><b/><c><a/></c></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082-load-spec-computed.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082-load-spec-computed.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082-load-spec-computed.pt
@@ -0,0 +1,1 @@
+<html tal:define="name 'hello_world'" metal:use-macro="load: chameleon:tests/inputs/${name}.pt" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/082.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ENTITY % e SYSTEM "e.dtd">
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083-template-dict-to-macro.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083-template-dict-to-macro.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083-template-dict-to-macro.pt
@@ -0,0 +1,2 @@
+<html tal:define="template load: 032-master-template.pt"
+      metal:use-macro="template['main']" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/083.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ENTITY % e PUBLIC 'whatever' "e.dtd">
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084-interpolation-in-cdata.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084-interpolation-in-cdata.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084-interpolation-in-cdata.pt
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <script>
+      <![CDATA[
+      alert("${'Hello world!'}");
+      ]]>
+    </script>
+  </head>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/084.xml
@@ -0,0 +1,1 @@
+<!DOCTYPE doc [<!ELEMENT doc (#PCDATA)>]><doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085-nested-translation.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085-nested-translation.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085-nested-translation.pt
@@ -0,0 +1,11 @@
+<html tal:define="request dict(site_url='http://host')" i18n:domain="new">
+  <head>
+    <title>Welcome</title>
+  </head>
+  <body>
+    <h1>Welcome</h1>
+    <p i18n:translate="">
+      <a i18n:name="click_here" i18n:translate="" href="${request.site_url}">Click here</a> to continue.
+    </p>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/085.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY % e "<foo>">
+<!ENTITY e "">
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086-self-closing.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086-self-closing.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086-self-closing.pt
@@ -0,0 +1,10 @@
+<html metal:use-macro="load('032-master-template.pt').macros['main']">
+  <body>
+    <div metal:fill-slot="content">
+      <div tal:condition="True">
+        <a href="#">Chart</a>
+        <div id="chart-info"/>
+      </div>
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/086.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "">
+<!ENTITY e "<foo>">
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087-code-blocks.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087-code-blocks.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087-code-blocks.pt
@@ -0,0 +1,28 @@
+<?python
+    foo = [1, 2, 3] ?>
+
+<ul>
+  <li tal:repeat="f foo" tal:content="f" />
+</ul>
+
+<?python
+    foo = [1, 2, 3]
+    boo = [4, 5, 6]
+?>
+
+<ul>
+  <li tal:repeat="(f, g) zip(foo, boo)" tal:content="f + g" />
+</ul>
+
+<div>
+  <?python numbers = map(str, range(1, 10)) ?>
+  Please input a number from the range ${", ".join(numbers)}.
+</div>
+
+<div>
+  <?python
+     def function(i):
+         return i + 1
+     ?>
+  41 + 1 = ${function(41)}.
+</div>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/087.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ENTITY e "<foo/&#62;">
+<!ELEMENT doc (foo)>
+<!ELEMENT foo EMPTY>
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088-python-newlines.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088-python-newlines.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088-python-newlines.pt
@@ -0,0 +1,2 @@
+<span tal:replace="python: ', '.join((
+    'a', 'b', 'c'))" />
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/088.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "&lt;foo>">
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/089.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/089.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/089.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ENTITY e "&#x10000;&#x10FFFD;&#x10FFFF;">
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/090.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/090.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/090.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE doc [
+<!ATTLIST e a NOTATION (n) #IMPLIED>
+<!ELEMENT doc (e)*>
+<!ELEMENT e (#PCDATA)>
+<!NOTATION n PUBLIC "whatever">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/091.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/091.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/091.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE doc [
+<!NOTATION n SYSTEM "http://www.w3.org/">
+<!ENTITY e SYSTEM "http://www.w3.org/" NDATA n>
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a ENTITY "e">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/092.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/092.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/092.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (a)*>
+<!ELEMENT a EMPTY>
+]>
+<doc>
+<a/>
+    <a/>	<a/>
+
+
+</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/093.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/093.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/093.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>
+

</doc>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/094.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/094.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/094.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ENTITY % e "foo">
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a1 CDATA "%e;">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/095.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/095.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/095.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ATTLIST doc a1 CDATA #IMPLIED>
+<!ATTLIST doc a1 NMTOKENS #IMPLIED>
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc a1="1  2"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/096.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/096.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/096.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ATTLIST doc a1 NMTOKENS " 1  	2 	">
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/097.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/097.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/097.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY % e SYSTEM "097.ent">
+<!ATTLIST doc a1 CDATA "v1">
+%e;
+<!ATTLIST doc a2 CDATA "v2">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/098.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/098.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/098.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><?pi x
+y?></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/099.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/099.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/099.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/100.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/100.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/100.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ENTITY e PUBLIC ";!*#@$_%" "100.xml">
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101-unclosed-tags.html b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101-unclosed-tags.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101-unclosed-tags.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1><br><br>Hello world</h1>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/101.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "&#34;">
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102-unquoted-attributes.html b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102-unquoted-attributes.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102-unquoted-attributes.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1 class=title align=center>Hello world</h1>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/102.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a="&#34;"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103-simple-attribute.html b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103-simple-attribute.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103-simple-attribute.html
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <select name="foo2" multiple style="visibility: hidden">
+      <option value="1">this should</option>
+      <option value="2">remain hidden right?</option>
+    </select>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/103.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc>&#60;doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/104.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/104.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/104.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a="x	y"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/105.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/105.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/105.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a="x&#9;y"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/106.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/106.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/106.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a="x&#10;y"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/107.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/107.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/107.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a="x&#13;y"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/108.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/108.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/108.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "
+">
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a="x&e;y"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/109.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/109.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/109.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a=""></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/110.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/110.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/110.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "&#13;&#10;">
+<!ATTLIST doc a CDATA #IMPLIED>
+]>
+<doc a="x&e;y"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/111.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/111.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/111.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST doc a NMTOKENS #IMPLIED>
+]>
+<doc a="&#32;x&#32;&#32;y&#32;"></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/112.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/112.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/112.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (a | b)>
+<!ELEMENT a (#PCDATA)>
+]>
+<doc><a></a></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/113.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/113.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/113.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ATTLIST e a CDATA #IMPLIED>
+]>
+<doc></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/114.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/114.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/114.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e "<![CDATA[&foo;]]>">
+]>
+<doc>&e;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/115.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/115.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/115.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY e1 "&e2;">
+<!ENTITY e2 "v">
+]>
+<doc>&e1;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/116.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/116.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/116.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+]>
+<doc><![CDATA[
+]]></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/117.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/117.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/117.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY rsqb "]">
+]>
+<doc>&rsqb;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/118.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/118.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/118.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE doc [
+<!ELEMENT doc (#PCDATA)>
+<!ENTITY rsqb "]]">
+]>
+<doc>&rsqb;</doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/119.xml b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/119.xml
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/119.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE doc [
+<!ELEMENT doc ANY>
+]>
+<doc><!-- -?? --></doc>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/greeting.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/greeting.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/greeting.pt
@@ -0,0 +1,1 @@
+<div>Hello, ${name | 'undefined'}.</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    ${'Hello world!'}
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.txt b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/inputs/hello_world.txt
@@ -0,0 +1,1 @@
+${'Hello world!'}
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.html b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.html
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    Hello world!
+    Hello world!
+  </body>
+  Goodbye world!
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    Hello world!
+  </body>
+
+
+    ok
+
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.txt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/001.txt
@@ -0,0 +1,1 @@
+<Hello world><&>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/002.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/002.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/002.pt
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    <div>
+      <span>Hello!</span>
+      <span>Hello.</span>
+    </div>
+    <div>
+      <span>Goodbye!</span>
+      <span>Goodbye.</span>
+    </div>
+    ok
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/003.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/003.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/003.pt
@@ -0,0 +1,17 @@
+<html>
+  <body>
+    <div>Hello world!</div>
+    <div>Hello world!</div>1
+   2<div>Hello world!</div>
+    <div>Hello world!</div>3
+    <div>Hello world!</div>5
+   6<div>Hello world!</div>
+    <div>1</div>
+    <div>1.0</div>
+    <div>True</div>
+    <div>False</div>
+    <div>0</div>
+    <div></div>
+    &lt;div&gt;Hello world!&lt;/div&gt;
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/004.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/004.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/004.pt
@@ -0,0 +1,18 @@
+<html>
+  <body>
+    <span class="hello" />
+    <span class="hello" />
+    <span class="hello" />
+    <span />
+    <span b="2" c="3" />
+    <span a="1" c="3" />
+    <span a="1" b="2" />
+    <span a="1" />
+    <span a="1" b=";" c="3" />
+    <span a="1" b="&amp;" c="3" />
+    <span class="goodbye" />
+    <span class="&quot;goodbye&quot;" />
+    <span class="'goodbye'" />
+    <span class='&#39;goodbye&#39;' />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/005.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/005.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/005.pt
@@ -0,0 +1,12 @@
+<html>
+  <body>
+    <img class="default" />
+    <img />
+    <span>Default</span>
+    <span>True</span>
+    <span>False</span>
+    <span>
+      <em>Computed default</em>
+    </span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/006.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/006.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/006.pt
@@ -0,0 +1,9 @@
+<html>
+  <body class="ltr">
+    <img src="#" alt="copyright (c) 2010" />
+    <img src="#" alt="copyright (c) 2010" />
+    <img src="#" alt="copyright (c) 2010" />
+    <img alt="$ignored" />
+    <img src="" alt="&lt;type 'str'&gt;" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/007.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/007.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/007.pt
@@ -0,0 +1,14 @@
+<html>
+  <body>
+    Hello world!
+    <div>Hello world!</div>
+    <div>Hello world!</div>
+    &lt;type 'str'&gt;
+    &&
+
+    Hello world
+    $leftalone
+    <div></div>
+    <div>Hello world</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/008.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/008.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/008.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+
+    <div class="dynamic">
+      static
+    </div>
+    <div>
+      nothing
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/009.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/009.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/009.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <div>Hello world!</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/010.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/010.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/010.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div>1 &lt; 2</div>
+    <div>2 < 3, 2&3, 2<3, 2>3</div>
+    <div>3 < 4</div>
+    <div>4 < 5</div>
+    <div>Hello world!</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011-en.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div>Message ('message' translation into 'en')</div>
+    <div>Message ('message' translation into 'en')</div>
+    <div>Message ('message' translation into 'en')</div>
+    <div>Message ('message' translation into 'en')</div>
+    Message ('message' translation into 'en')
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/011.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div>Message</div>
+    <div>Message</div>
+    <div>Message</div>
+    <div>Message</div>
+    Message
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012-en.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div>Hello world! ('Hello world!' translation into 'en')</div>
+    <div>Hello world! ('hello_world' translation into 'en')</div>
+    <div><sup>Hello world!</sup> ('<sup>Hello world!</sup>' translation into 'en')</div>
+    <div>Hello <em>world</em>! Goodbye <em>planet</em>! ('Hello ${first}! Goodbye ${second}!' translation into 'en')</div>
+    <div>Hello <em>world</em>! Goodbye <em>planet</em>! ('hello_goodbye' translation into 'en')</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/012.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div>Hello world!</div>
+    <div>Hello world!</div>
+    <div><sup>Hello world!</sup></div>
+    <div>Hello <em>world</em>! Goodbye <em>planet</em>!</div>
+    <div>Hello <em>world</em>! Goodbye <em>planet</em>!</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/013.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/013.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/013.pt
@@ -0,0 +1,22 @@
+<html>
+  <body>
+    <table>
+      <tr>
+        <td>
+          [1,1]
+        </td>
+        <td>
+          [1,2]
+        </td>
+      </tr>
+      <tr>
+        <td>
+          [2,1]
+        </td>
+        <td>
+          [2,2]
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/014.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/014.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/014.pt
@@ -0,0 +1,12 @@
+<html>
+  <body>
+    <span>
+      <span>[3,3]</span>
+      <span>[3,4]</span>
+    </span>
+    <span>
+      <span>[4,3]</span>
+      <span>[4,4]</span>
+    </span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015-en.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <div>Price: <span>Per kilo <em>12.5</em> ('Per kilo ${amount}' translation into 'en')</span> ('Price: ${price}' translation into 'en')</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/015.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <div>Price: <span>Per kilo <em>12.5</em></span></div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016-en.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div>Hello world! ('Hello world!' translation into 'en')</div>
+    <img alt="Hello world! ('Hello world!' translation into 'en')" />
+    <img alt="Hello world! ('hello_world' translation into 'en')" />
+    <img alt="Hello world! ('Hello world!' translation into 'en')" />
+    <img alt="Hello world! ('hello_world' translation into 'en')" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/016.pt
@@ -0,0 +1,9 @@
+<html>
+  <body>
+    <div>Hello world!</div>
+    <img alt="Hello world!" />
+    <img alt="Hello world!" />
+    <img alt="Hello world!" />
+    <img alt="Hello world!" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/017.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/017.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/017.pt
@@ -0,0 +1,12 @@
+<html>
+  <body>
+    Hello world!
+    1
+      Hello world!
+   23
+   4Hello world!
+    <div>Hello world!</div>
+    Hello world!
+    Hello world!
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018-en.pt
@@ -0,0 +1,3 @@
+<div xmlns="http://www.w3.org/1999/xhtml">
+  october ('october' translation into 'en') 1982 ('1982' translation into 'en') ('${monthname} ${year}' translation into 'en')
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/018.pt
@@ -0,0 +1,3 @@
+<div xmlns="http://www.w3.org/1999/xhtml">
+  october 1982
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/019.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/019.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/019.pt
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    Hello world!
+    Hello world!1
+   2Hello world!
+    Hello world!3
+    Hello world!5
+   6Hello world!
+    1
+    1.0
+    True
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/020.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/020.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/020.pt
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <div id="test"></div>
+    <div>NameError thrown at 5:24.</div>
+    <div></div>
+    <div></div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021-en.pt
@@ -0,0 +1,12 @@
+<html>
+  <body>
+    <div>Hello world! ('Hello world!' translation into 'en' with domain 'new')</div>
+    <div>Hello world! ('Hello world!' translation into 'en' with domain 'old')</div>
+    <div class="test ('test' translation into 'en' with domain 'new')">
+      Hello world!
+    </div>
+    <div class="test ('test_msgid' translation into 'en' with domain 'new')">
+      Hello world!
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/021.pt
@@ -0,0 +1,12 @@
+<html>
+  <body>
+    <div>Hello world!</div>
+    <div>Hello world!</div>
+    <div class="test">
+      Hello world!
+    </div>
+    <div class="test">
+      Hello world!
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/022.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/022.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/022.pt
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    <div>
+
+      <span>ok</span>
+      <span>ok</span>
+    </div>
+    <div>
+
+      <span>ok</span>
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/023.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/023.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/023.pt
@@ -0,0 +1,6 @@
+<html>
+  <body>
+
+    <span>ok</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/024.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/024.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/024.pt
@@ -0,0 +1,14 @@
+<html>
+  <body>
+
+
+        first
+
+      second
+
+
+      ok
+
+
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/025.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/025.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/025.pt
@@ -0,0 +1,23 @@
+<html>
+  <body>
+    <ul>
+      <li>1</li>
+      <li>2</li>
+      <li>3</li>
+      <li>1</li>
+      <li>2</li>
+      <li>3</li>
+
+
+          1,
+
+
+          2,
+
+
+          3
+
+      .
+    </ul>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/026.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/026.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/026.pt
@@ -0,0 +1,17 @@
+<div xmlns="http://www.w3.org/1999/xhtml">
+  <ul>
+    <li name="0-0" class="even">0</li>
+    <li name="1-1" class="odd">1</li>
+    <li name="2-2" class="even">2</li>
+  </ul>
+  <ul>
+    <li class="even">0</li>
+    <li class="odd">1</li>
+    <li class="even">2</li>
+  </ul>
+  <ul>
+    <li>even</li>
+    <li>odd</li>
+    <li>even</li>
+  </ul>
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/027.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/027.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/027.pt
@@ -0,0 +1,7 @@
+<div xmlns="http://www.w3.org/1999/xhtml">
+  <span id="test"
+        class="defabcdummy"
+        onClick="alert();" style="hij">abcghi</span>
+  Hello World!
+  Hello World!
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/028.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/028.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/028.pt
@@ -0,0 +1,5 @@
+<div xmlns="http://www.w3.org/1999/xhtml">
+  <option selected="True"></option>
+  <option></option>
+  <option></option>
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/029.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/029.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/029.pt
@@ -0,0 +1,3 @@
+<div xmlns="http://www.w3.org/1999/xhtml">
+  <a rel="self" href="http://python.org" id="link-id" />
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/030.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/030.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/030.pt
@@ -0,0 +1,10 @@
+<html>
+  <body>
+    <div>
+      1, 1, 2
+    </div>
+    <div>
+      2, 3, 4
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/031.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/031.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/031.pt
@@ -0,0 +1,9 @@
+<div>
+  Hello World!
+  Hello World!
+  Hello World!
+  0
+  1
+  2
+  True
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/032.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/032.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/032.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/033.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/033.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/033.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/034.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/034.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/034.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/035.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/035.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/035.pt
@@ -0,0 +1,17 @@
+<html>
+  <head>
+    <title>
+    New title
+  </title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/036.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/036.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/036.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>New title</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/037.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/037.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/037.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+    <span>ok</span>
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/038.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/038.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/038.pt
@@ -0,0 +1,6 @@
+
+<html>
+  <body>
+    <span>ok</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/039.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/039.pt
new file mode 100644
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/040.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/040.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/040.pt
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      template-macros="master"
+      macros="master">
+
+      foo
+
+      <span template-macros="master"
+            macros="master">
+         <!-- demonstrate difference between
+              `template` and `macros` symbol -->
+      </span>
+
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/041.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/041.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/041.pt
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    <div>Hello <span>world!</span></div>
+    <div>Hello <span>world!</span></div>
+    <div>Goodbye</div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/042.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/042.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/042.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+      New footer
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/043.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/043.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/043.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+
+
+
+
+        My title
+
+
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/044.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/044.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/044.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    a, b
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/045.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/045.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/045.pt
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE application [
+  <!ENTITY nbsp "\&#160;">
+]>
+<application xmlns="http://research.sun.com/wadl/2006/10"
+             xsi:schemaLocation="http://research.sun.com/wadl/2006/10/wadl.xsd"
+             xmlns:wadl="http://research.sun.com/wadl/2006/10"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <resources>
+    <resource path="/">ZZZ&nbsp;YYY&nbsp;XXX</resource>
+  </resources>
+</application>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/046.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/046.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/046.pt
@@ -0,0 +1,17 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    <span>New</span> footer
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/047.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/047.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/047.pt
@@ -0,0 +1,17 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    <em>Extended</em> footer
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/048.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/048.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/048.pt
@@ -0,0 +1,17 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    Extended footer
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/049.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/049.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/049.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <pre>amp=&amp;amp; lt=&amp;lt;</pre>
+    <pre>amp=&amp; lt=&lt;</pre>
+    <script />
+    &lt;script /&gt;
+    &lt;script /&gt;
+    <script />
+    <img alt="1 &lt; 2: True" />
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/050.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/050.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/050.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+     Default content
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/051.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/051.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/051.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+     Default content
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/052.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/052.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/052.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+    <span>Translated content</span>
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/053.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/053.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/053.pt
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <a href="@@view">test</a>
+    <a href="@@view">test</a>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/054.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/054.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/054.pt
@@ -0,0 +1,3 @@
+<div>
+  1984-12-31T00:00:00
+</div>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/055.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/055.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/055.pt
@@ -0,0 +1,4 @@
+<div>
+  bar
+  baz
+</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/056.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/056.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/056.pt
@@ -0,0 +1,7 @@
+<html>
+  <body>
+
+      Namespace tag
+
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/057.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/057.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/057.pt
@@ -0,0 +1,8 @@
+<html>
+  <body>
+
+    1
+    2
+    3
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/058.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/058.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/058.pt
@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <script>
+      deform.addCallback(
+        '1',
+        function (oid) {
+            $('#' + oid).autocomplete({source: values});
+            $('#' + oid).autocomplete("option", options);
+        }
+      );
+    </script>
+  </head>
+  <body>
+    <!-- Form -->
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/059.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/059.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/059.pt
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <span onclick="alert(true && false);">test</span>
+    <span onclick="alert(true && false);">test</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/060.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/060.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/060.pt
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>Untitled</title>
+  </head>
+  <body>
+    <h1>Untitled</h1>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/061.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/061.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/061.pt
@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <title>My document</title>
+  </head>
+  <body>
+    <h1>My document</h1>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/062.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/062.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/062.pt
@@ -0,0 +1,27 @@
+<div>
+
+</div>
+
+<div>
+  <!-- ${left alone} -->
+</div>
+
+<div>
+  <!-- not left alone -->
+</div>
+
+<div>
+  <!-- not left alone -->
+</div>
+
+<div>
+  <!-- ${left alone} -->
+</div>
+
+<!--[if IE 6]>
+  Special instructions for IE 6 here
+<![endif]-->
+
+<!--[if IE 6]>
+  ${left alone}
+<![endif]-->
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/063.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/063.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/063.pt
@@ -0,0 +1,3 @@
+<div>
+  2
+</div>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/064.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/064.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/064.pt
@@ -0,0 +1,3 @@
+
+  <div	id="test"	class="test">
+  </div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/065.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/065.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/065.pt
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>Title</title>
+  </head>
+  <body>
+    <div id="content">
+      <div>Content</div>
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/066.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/066.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/066.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    Hello world!
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/067.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/067.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/067.pt
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <img src="#" class="up" />
+    <img src="#" class="down" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/068.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/068.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/068.pt
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <span>0 &lt; 1 or 0 &gt; 1</span>
+    <span>0 < 1 or 0 > 1</span>
+    <span class="0 < 1 or 0 > 1" />
+    <span>0 < 1 or 0 > 1</span>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069-en.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Title ('title' translation into 'en' with domain 'test')</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/069.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Title</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070-en.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Title ('title' translation into 'en' with domain 'test')</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/070.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Title</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/071.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/071.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/071.pt
@@ -0,0 +1,11 @@
+<html>
+  <body>
+    <input type="input" checked="True" />
+    <input type="input" />
+    <input type="input" />
+    <input type="input" checked="checked" />
+    <input type="input" checked />
+    <input type="input" />
+    <input type="input" class="True" />
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/072.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/072.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/072.pt
@@ -0,0 +1,19 @@
+<html>
+  <body>
+    <ul>
+      <li class="odd">1</li>
+      <li>2</li>
+      <li class="odd">3</li>
+    </ul>
+    <ul>
+      <li class="odd">1</li>
+      <li>2</li>
+      <li class="odd">3</li>
+    </ul>
+    <ul>
+      <li class="odd">1</li>
+      <li>2</li>
+      <li class="odd">3</li>
+    </ul>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/073.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/073.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/073.pt
@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title>my title ??? my site</title></head>
+<body></body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/074.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/074.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/074.pt
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="windows-1251" ?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title>my title ? my site</title></head>
+<body></body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/075.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/075.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/075.pt
@@ -0,0 +1,19 @@
+
+  <html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+
+        foo
+
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
+
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/076.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/076.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/076.pt
@@ -0,0 +1,17 @@
+
+  <html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+<BLANKLINE>
+      bar
+<BLANKLINE>
+    </div>
+    <div id="footer">
+<BLANKLINE>
+    </div>
+  </body>
+</html>
+
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077-en.pt
@@ -0,0 +1,1 @@
+<input type="hidden" id="uploadify_label_file_title" value="value ('Title' translation into 'en' with domain 'test')" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/077.pt
@@ -0,0 +1,1 @@
+<input type="hidden" id="uploadify_label_file_title" value="value" />
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/078.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/078.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/078.pt
@@ -0,0 +1,11 @@
+
+  <body>
+      <span id="foo-toDataContainer">
+        <script type="text/javascript">
+          copyDataForSubmit('foo');</script>
+      </span>
+      <span class="selected-option">1</span>, 
+      <span class="selected-option">2</span>, 
+      <span class="selected-option">3</span>
+  </body>
+
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079-en.pt
@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <title>Welcome ('Welcome' translation into 'en')</title>
+  </head>
+  <body>
+    <h1>Welcome ('Welcome' translation into 'en')</h1>
+    <span>An edge case: ${. ('An edge case: ${.' translation into 'en')</span>
+    <img alt="Site logo ('Site logo' translation into 'en')" href="http://host/logo.png" />
+    <img alt="Site logo ('Site logo' translation into 'en')" href="http://host/logo.png" />
+    <div id="content">
+      foo. ('foo.' translation into 'en')
+      <br />
+      bar. ('bar.' translation into 'en')
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/079.pt
@@ -0,0 +1,16 @@
+<html>
+  <head>
+    <title>Welcome</title>
+  </head>
+  <body>
+    <h1>Welcome</h1>
+    <span>An edge case: ${.</span>
+    <img alt="Site logo" href="http://host/logo.png" />
+    <img alt="Site logo" href="http://host/logo.png" />
+    <div id="content">
+      foo.
+      <br />
+      bar.
+    </div>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/080.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/080.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/080.pt
@@ -0,0 +1,3 @@
+
+   Hello world
+
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/081.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/081.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/081.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    Hello world!
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/082.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/082.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/082.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    Hello world!
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/083.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/083.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/083.pt
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+
+        <!-- content here -->
+
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/084.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/084.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/084.pt
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <script>
+      <![CDATA[
+      alert("Hello world!");
+      ]]>
+    </script>
+  </head>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085-en.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085-en.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085-en.pt
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>Welcome</title>
+  </head>
+  <body>
+    <h1>Welcome</h1>
+    <p><a href="http://host">Click here ('Click here' translation into 'en' with domain 'new')</a> to continue. ('${click_here} to continue.' translation into 'en' with domain 'new')</p>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/085.pt
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>Welcome</title>
+  </head>
+  <body>
+    <h1>Welcome</h1>
+    <p><a href="http://host">Click here</a> to continue.</p>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/086.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/086.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/086.pt
@@ -0,0 +1,18 @@
+<html>
+  <head>
+    <title>Master template</title>
+  </head>
+  <body>
+    <div id="content">
+      <div>
+      <div>
+        <a href="#">Chart</a>
+        <div id="chart-info"/>
+      </div>
+    </div>
+    </div>
+    <div id="footer">
+
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/087.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/087.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/087.pt
@@ -0,0 +1,25 @@
+
+
+<ul>
+  <li>1</li>
+  <li>2</li>
+  <li>3</li>
+</ul>
+
+
+
+<ul>
+  <li>5</li>
+  <li>7</li>
+  <li>9</li>
+</ul>
+
+<div>
+
+  Please input a number from the range 1, 2, 3, 4, 5, 6, 7, 8, 9.
+</div>
+
+<div>
+
+  41 + 1 = 42.
+</div>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/088.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/088.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/088.pt
@@ -0,0 +1,1 @@
+a, b, c
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/101.html b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/101.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/101.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1><br><br>Hello world</h1>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/102.html b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/102.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/102.html
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    <h1 class=title align=center>Hello world</h1>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/103.html b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/103.html
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/103.html
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <select name="foo2" multiple style="visibility: hidden">
+      <option value="1">this should</option>
+      <option value="2">remain hidden right?</option>
+    </select>
+  </body>
+</html>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/greeting.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/greeting.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/greeting.pt
@@ -0,0 +1,1 @@
+<div>Hello, undefined.</div>
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.pt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.pt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.pt
@@ -0,0 +1,5 @@
+<html>
+  <body>
+    Hello world!
+  </body>
+</html>
\ No newline at end of file
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.txt b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.txt
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/outputs/hello_world.txt
@@ -0,0 +1,1 @@
+Hello world!
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/test_doctests.py b/lib/Chameleon-2.9.2/src/chameleon/tests/test_doctests.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/test_doctests.py
@@ -0,0 +1,40 @@
+import unittest
+import doctest
+
+OPTIONFLAGS = (doctest.ELLIPSIS |
+               doctest.REPORT_ONLY_FIRST_FAILURE)
+
+
+class DoctestCase(unittest.TestCase):
+    def __new__(self, test):
+        return getattr(self, test)()
+
+    @classmethod
+    def test_tal(cls):
+        from chameleon import tal
+        return doctest.DocTestSuite(
+            tal, optionflags=OPTIONFLAGS)
+
+    @classmethod
+    def test_tales(cls):
+        from chameleon import tales
+        return doctest.DocTestSuite(
+            tales, optionflags=OPTIONFLAGS)
+
+    @classmethod
+    def test_utils(cls):
+        from chameleon import utils
+        return doctest.DocTestSuite(
+            utils, optionflags=OPTIONFLAGS)
+
+    @classmethod
+    def test_exc(cls):
+        from chameleon import exc
+        return doctest.DocTestSuite(
+            exc, optionflags=OPTIONFLAGS)
+
+    @classmethod
+    def test_compiler(cls):
+        from chameleon import compiler
+        return doctest.DocTestSuite(
+            compiler, optionflags=OPTIONFLAGS)
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/test_loader.py b/lib/Chameleon-2.9.2/src/chameleon/tests/test_loader.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/test_loader.py
@@ -0,0 +1,79 @@
+import unittest
+
+
+class LoadTests:
+    def _makeOne(self, search_path=None, **kwargs):
+        klass = self._getTargetClass()
+        return klass(search_path, **kwargs)
+
+    def _getTargetClass(self):
+        from chameleon.loader import TemplateLoader
+        return TemplateLoader
+
+    def test_load_relative(self):
+        import os
+        here = os.path.join(os.path.dirname(__file__), "inputs")
+        loader = self._makeOne(search_path=[here])
+        result = self._load(loader, 'hello_world.pt')
+        self.assertEqual(result.filename, os.path.join(here, 'hello_world.pt'))
+
+    def test_consecutive_loads(self):
+        import os
+        here = os.path.join(os.path.dirname(__file__), "inputs")
+        loader = self._makeOne(search_path=[here])
+
+        self.assertTrue(
+            self._load(loader, 'hello_world.pt') is \
+            self._load(loader, 'hello_world.pt'))
+
+    def test_load_relative_badpath_in_searchpath(self):
+        import os
+        here = os.path.join(os.path.dirname(__file__), "inputs")
+        loader = self._makeOne(search_path=[os.path.join(here, 'none'), here])
+        result = self._load(loader, 'hello_world.pt')
+        self.assertEqual(result.filename, os.path.join(here, 'hello_world.pt'))
+
+    def test_load_abs(self):
+        import os
+        here = os.path.join(os.path.dirname(__file__), "inputs")
+        loader = self._makeOne()
+        abs = os.path.join(here, 'hello_world.pt')
+        result = self._load(loader, abs)
+        self.assertEqual(result.filename, abs)
+
+
+class LoadPageTests(unittest.TestCase, LoadTests):
+    def _load(self, loader, filename):
+        from chameleon.zpt import template
+        return loader.load(filename, template.PageTemplateFile)
+
+
+class ZPTLoadTests(unittest.TestCase):
+    def _makeOne(self, *args, **kwargs):
+        import os
+        here = os.path.join(os.path.dirname(__file__), "inputs")
+        from chameleon.zpt import loader
+        return loader.TemplateLoader(here, **kwargs)
+
+    def test_load_xml(self):
+        loader = self._makeOne()
+        template = loader.load("hello_world.pt", "xml")
+        from chameleon.zpt.template import PageTemplateFile
+        self.assertTrue(isinstance(template, PageTemplateFile))
+
+    def test_load_text(self):
+        loader = self._makeOne()
+        template = loader.load("hello_world.txt", "text")
+        from chameleon.zpt.template import PageTextTemplateFile
+        self.assertTrue(isinstance(template, PageTextTemplateFile))
+
+    def test_load_getitem_gets_xml_file(self):
+        loader = self._makeOne()
+        template = loader["hello_world.pt"]
+        from chameleon.zpt.template import PageTemplateFile
+        self.assertTrue(isinstance(template, PageTemplateFile))
+
+
+def test_suite():
+    import sys
+    return unittest.findTestCases(sys.modules[__name__])
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/test_parser.py b/lib/Chameleon-2.9.2/src/chameleon/tests/test_parser.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/test_parser.py
@@ -0,0 +1,92 @@
+from __future__ import with_statement
+
+import sys
+
+from unittest import TestCase
+
+from ..namespaces import XML_NS
+from ..namespaces import XMLNS_NS
+from ..namespaces import PY_NS
+
+
+class ParserTest(TestCase):
+    def test_sample_files(self):
+        import os
+        import traceback
+        path = os.path.join(os.path.dirname(__file__), "inputs")
+        for filename in os.listdir(path):
+            if not filename.endswith('.html'):
+                continue
+
+            with open(os.path.join(path, filename), 'rb') as f:
+                source = f.read()
+
+            from ..utils import read_encoded
+            try:
+                want = read_encoded(source)
+            except UnicodeDecodeError:
+                exc = sys.exc_info()[1]
+                self.fail("%s - %s" % (exc, filename))
+
+            from ..tokenize import iter_xml
+            from ..parser import ElementParser
+            try:
+                tokens = iter_xml(want)
+                parser = ElementParser(tokens, {
+                    'xmlns': XMLNS_NS,
+                    'xml': XML_NS,
+                    'py': PY_NS,
+                    })
+                elements = tuple(parser)
+            except:
+                self.fail(traceback.format_exc())
+
+            output = []
+
+            def render(kind, args):
+                if kind == 'element':
+                    # start tag
+                    tag, end, children = args
+                    output.append("%(prefix)s%(name)s" % tag)
+
+                    for attr in tag['attrs']:
+                        output.append(
+                            "%(space)s%(name)s%(eq)s%(quote)s%(value)s%(quote)s" % \
+                            attr
+                            )
+
+                    output.append("%(suffix)s" % tag)
+
+                    # children
+                    for item in children:
+                        render(*item)
+
+                    # end tag
+                    output.append(
+                        "%(prefix)s%(name)s%(space)s%(suffix)s" % end
+                        )
+                elif kind == 'text':
+                    text = args[0]
+                    output.append(text)
+                elif kind == 'start_tag':
+                    node = args[0]
+                    output.append(
+                        "%(prefix)s%(name)s%(space)s%(suffix)s" % node
+                        )
+                else:
+                    raise RuntimeError("Not implemented: %s." % kind)
+
+            for kind, args in elements:
+                render(kind, args)
+
+            got = "".join(output)
+
+            from doctest import OutputChecker
+            checker = OutputChecker()
+
+            if checker.check_output(want, got, 0) is False:
+                from doctest import Example
+                example = Example(f.name, want)
+                diff = checker.output_difference(
+                    example, got, 0)
+                self.fail("(%s) - \n%s" % (f.name, diff))
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/test_sniffing.py b/lib/Chameleon-2.9.2/src/chameleon/tests/test_sniffing.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/test_sniffing.py
@@ -0,0 +1,124 @@
+from __future__ import with_statement
+
+import os
+import unittest
+import tempfile
+import shutil
+
+from chameleon.utils import unicode_string
+from chameleon.utils import encode_string
+
+
+class TypeSniffingTestCase(unittest.TestCase):
+    def setUp(self):
+        self.tempdir = tempfile.mkdtemp(prefix='chameleon-tests')
+
+    def tearDown(self):
+        shutil.rmtree(self.tempdir)
+
+    def _get_temporary_file(self):
+        filename = os.path.join(self.tempdir, 'template.py')
+        assert not os.path.exists(filename)
+        f = open(filename, 'w')
+        f.flush()
+        f.close()
+        return filename
+
+    def get_template(self, text):
+        fn = self._get_temporary_file()
+
+        with open(fn, 'wb') as tmpfile:
+            tmpfile.write(text)
+
+        from chameleon.template import BaseTemplateFile
+
+        class DummyTemplateFile(BaseTemplateFile):
+            def cook(self, body):
+                self.body = body
+
+        template = DummyTemplateFile(fn)
+        template.cook_check()
+        return template
+
+    def check_content_type(self, text, expected_type):
+        from chameleon.utils import read_bytes
+        content_type = read_bytes(text, 'ascii')[2]
+        self.assertEqual(content_type, expected_type)
+
+    def test_xml_encoding(self):
+        from chameleon.utils import xml_prefixes
+
+        document1 = unicode_string(
+            "<?xml version='1.0' encoding='ascii'?><doc/>"
+            )
+        document2 = unicode_string(
+            "<?xml\tversion='1.0' encoding='ascii'?><doc/>"
+            )
+
+        for bom, encoding in xml_prefixes:
+            try:
+                "".encode(encoding)
+            except LookupError:
+                # System does not support this encoding
+                continue
+
+            self.check_content_type(document1.encode(encoding), "text/xml")
+            self.check_content_type(document2.encode(encoding), "text/xml")
+
+    HTML_PUBLIC_ID = "-//W3C//DTD HTML 4.01 Transitional//EN"
+    HTML_SYSTEM_ID = "http://www.w3.org/TR/html4/loose.dtd"
+
+    # Couldn't find the code that handles this... yet.
+    # def test_sniffer_html_ascii(self):
+    #     self.check_content_type(
+    #         "<!DOCTYPE html [ SYSTEM '%s' ]><html></html>"
+    #         % self.HTML_SYSTEM_ID,
+    #         "text/html")
+    #     self.check_content_type(
+    #         "<html><head><title>sample document</title></head></html>",
+    #         "text/html")
+
+    # TODO: This reflects a case that simply isn't handled by the
+    # sniffer; there are many, but it gets it right more often than
+    # before.
+    def donttest_sniffer_xml_simple(self):
+        self.check_content_type("<doc><element/></doc>", "text/xml")
+
+    def test_html_default_encoding(self):
+        body = encode_string(
+            '<html><head><title>' \
+            '\xc3\x90\xc2\xa2\xc3\x90\xc2\xb5' \
+            '\xc3\x91\xc2\x81\xc3\x91\xc2\x82' \
+            '</title></head></html>')
+
+        template = self.get_template(body)
+        self.assertEqual(template.body, body.decode('utf-8'))
+
+    def test_html_encoding_by_meta(self):
+        body = encode_string(
+            '<html><head><title>' \
+            '\xc3\x92\xc3\xa5\xc3\xb1\xc3\xb2' \
+            '</title><meta http-equiv="Content-Type"' \
+            ' content="text/html; charset=windows-1251"/>' \
+            "</head></html>")
+
+        template = self.get_template(body)
+        self.assertEqual(template.body, body.decode('windows-1251'))
+
+    def test_xhtml(self):
+        body = encode_string(
+            '<html><head><title>' \
+            '\xc3\x92\xc3\xa5\xc3\xb1\xc3\xb2' \
+            '</title><meta http-equiv="Content-Type"' \
+            ' content="text/html; charset=windows-1251"/>' \
+            "</head></html>")
+
+        template = self.get_template(body)
+        self.assertEqual(template.body, body.decode('windows-1251'))
+
+
+def test_suite():
+    return unittest.makeSuite(TypeSniffingTestCase)
+
+if __name__ == "__main__":
+    unittest.main(defaultTest="test_suite")
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/test_templates.py b/lib/Chameleon-2.9.2/src/chameleon/tests/test_templates.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/test_templates.py
@@ -0,0 +1,679 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import with_statement
+
+import re
+import os
+import sys
+import shutil
+import tempfile
+
+from functools import wraps
+from functools import partial
+
+try:
+    from unittest2 import TestCase
+except ImportError:
+    from unittest import TestCase
+
+
+from chameleon.utils import byte_string
+
+
+class Message(object):
+    def __str__(self):
+        return "message"
+
+
+class ImportTestCase(TestCase):
+    def test_pagetemplates(self):
+        from chameleon import PageTemplate
+        from chameleon import PageTemplateFile
+        from chameleon import PageTemplateLoader
+
+    def test_pagetexttemplates(self):
+        from chameleon import PageTextTemplate
+        from chameleon import PageTextTemplateFile
+
+
+class TemplateFileTestCase(TestCase):
+    @property
+    def _class(self):
+        from chameleon.template import BaseTemplateFile
+
+        class TestTemplateFile(BaseTemplateFile):
+            cook_count = 0
+
+            def cook(self, body):
+                self.cook_count += 1
+                self._cooked = True
+
+        return TestTemplateFile
+
+    def setUp(self):
+        self.tempdir = tempfile.mkdtemp(prefix='chameleon-tests')
+
+    def tearDown(self):
+        shutil.rmtree(self.tempdir)
+
+    def _get_temporary_file(self):
+        filename = os.path.join(self.tempdir, 'template.py')
+        assert not os.path.exists(filename)
+        f = open(filename, 'w')
+        f.flush()
+        f.close()
+        return filename
+
+    def test_cook_check(self):
+        fn = self._get_temporary_file()
+        template = self._class(fn)
+        template.cook_check()
+        self.assertEqual(template.cook_count, 1)
+
+    def test_auto_reload(self):
+        fn = self._get_temporary_file()
+
+        # set time in past
+        os.utime(fn, (0, 0))
+
+        template = self._class(fn, auto_reload=True)
+        template.cook_check()
+
+        # a second cook check makes no difference
+        template.cook_check()
+        self.assertEqual(template.cook_count, 1)
+
+        # set current time on file
+        os.utime(fn, None)
+
+        # file is reloaded
+        template.cook_check()
+        self.assertEqual(template.cook_count, 2)
+
+    def test_relative_is_expanded_to_cwd(self):
+        template = self._class("___does_not_exist___")
+        try:
+            template.cook_check()
+        except IOError:
+            exc = sys.exc_info()[1]
+            self.assertEqual(
+                os.getcwd(),
+                os.path.dirname(exc.filename)
+                )
+        else:
+            self.fail("Expected OSError.")
+
+
+class RenderTestCase(TestCase):
+    root = os.path.dirname(__file__)
+
+    def find_files(self, ext):
+        inputs = os.path.join(self.root, "inputs")
+        outputs = os.path.join(self.root, "outputs")
+        for filename in sorted(os.listdir(inputs)):
+            name, extension = os.path.splitext(filename)
+            if extension != ext:
+                continue
+            path = os.path.join(inputs, filename)
+
+            # if there's no output file, treat document as static and
+            # expect intput equal to output
+            import glob
+            globbed = tuple(glob.iglob(os.path.join(
+                outputs, "%s*%s" % (name.split('-', 1)[0], ext))))
+
+            if not globbed:
+                self.fail("Missing output for: %s." % name)
+
+            for output in globbed:
+                name, ext = os.path.splitext(output)
+                basename = os.path.basename(name)
+                if '-' in basename:
+                    language = basename.split('-')[1]
+                else:
+                    language = None
+
+                yield path, output, language
+
+
+class ZopePageTemplatesTest(RenderTestCase):
+    @property
+    def from_string(body):
+        from ..zpt.template import PageTemplate
+        return partial(PageTemplate, keep_source=True)
+
+    @property
+    def from_file(body):
+        from ..zpt.template import PageTemplateFile
+        return partial(PageTemplateFile, keep_source=True)
+
+    def template(body):
+        def decorator(func):
+            @wraps(func)
+            def wrapper(self):
+                template = self.from_string(body)
+                return func(self, template)
+
+            return wrapper
+        return decorator
+
+    def error(body):
+        def decorator(func):
+            @wraps(func)
+            def wrapper(self):
+                from chameleon.exc import TemplateError
+                try:
+                    template = self.from_string(body)
+                except TemplateError:
+                    exc = sys.exc_info()[1]
+                    return func(self, body, exc)
+                else:
+                    self.fail("Expected exception.")
+
+            return wrapper
+        return decorator
+
+    def test_syntax_error_in_strict_mode(self):
+        from chameleon.exc import ExpressionError
+
+        self.assertRaises(
+            ExpressionError,
+            self.from_string,
+            """<tal:block replace='bad /// ' />""",
+            strict=True
+            )
+
+    def test_syntax_error_in_non_strict_mode(self):
+        from chameleon.exc import ExpressionError
+
+        body = """<tal:block replace='bad /// ' />"""
+        template = self.from_string(body, strict=False)
+
+        try:
+            template()
+        except ExpressionError:
+            exc = sys.exc_info()[1]
+            self.assertTrue(body[exc.offset:].startswith('bad ///'))
+        else:
+            self.fail("Expected exception")
+
+    @error("""<tal:dummy attributes=\"dummy 'dummy'\" />""")
+    def test_attributes_on_tal_tag_fails(self, body, exc):
+        self.assertTrue(body[exc.offset:].startswith('dummy'))
+
+    @error("""<tal:dummy i18n:attributes=\"foo, bar\" />""")
+    def test_i18n_attributes_with_non_identifiers(self, body, exc):
+        self.assertTrue(body[exc.offset:].startswith('foo,'))
+
+    @error("""<tal:dummy repeat=\"key,value mydict.items()\">""")
+    def test_repeat_syntax_error_message(self, body, exc):
+        self.assertTrue(body[exc.offset:].startswith('key,value'))
+
+    def test_encoded(self):
+        filename = '074-encoded-template.pt'
+        with open(os.path.join(self.root, 'inputs', filename), 'rb') as f:
+            body = f.read()
+
+        self.from_string(body)
+
+    def test_utf8_encoded(self):
+        filename = '073-utf8-encoded.pt'
+        with open(os.path.join(self.root, 'inputs', filename), 'rb') as f:
+            body = f.read()
+
+        self.from_string(body)
+
+    def test_unicode_decode_error(self):
+        template = self.from_file(
+            os.path.join(self.root, 'inputs', 'greeting.pt')
+            )
+
+        string = native = "the artist formerly known as ????????????"
+        try:
+            string = string.decode('utf-8')
+        except AttributeError:
+            pass
+
+        class name:
+            @staticmethod
+            def __html__():
+                # This raises a decoding exception
+                string.encode('utf-8').decode('ascii')
+
+                self.fail("Expected exception raised.")
+
+        try:
+            template(name=name)
+        except UnicodeDecodeError:
+            exc = sys.exc_info()[1]
+            formatted = str(exc)
+
+            # There's a marker under the expression that has the
+            # unicode decode error
+            self.assertTrue('^^^^^' in formatted)
+            self.assertTrue(native in formatted)
+        else:
+            self.fail("expected error")
+
+    def test_custom_encoding_for_str_or_bytes_in_content(self):
+        string = '<div>????????${text}</div>'
+        try:
+            string = string.decode('utf-8')
+        except AttributeError:
+            pass
+
+        template = self.from_string(string, encoding="windows-1251")
+
+        text = '????????'
+
+        try:
+            text = text.decode('utf-8')
+        except AttributeError:
+            pass
+
+        rendered = template(text=text.encode('windows-1251'))
+
+        self.assertEqual(
+            rendered,
+            string.replace('${text}', text)
+            )
+
+    def test_custom_encoding_for_str_or_bytes_in_attributes(self):
+        string = '<img tal="????????${text}" />'
+        try:
+            string = string.decode('utf-8')
+        except AttributeError:
+            pass
+
+        template = self.from_string(string, encoding="windows-1251")
+
+        text = '????????'
+
+        try:
+            text = text.decode('utf-8')
+        except AttributeError:
+            pass
+
+        rendered = template(text=text.encode('windows-1251'))
+
+        self.assertEqual(
+            rendered,
+            string.replace('${text}', text)
+            )
+
+    def test_null_translate_function(self):
+        template = self.from_string('${test}', translate=None)
+        rendered = template(test=object())
+        self.assertTrue('object' in rendered)
+
+    def test_object_substitution_coerce_to_str(self):
+        template = self.from_string('${test}', translate=None)
+
+        class dummy(object):
+            def __repr__(inst):
+                self.fail("call not expected")
+
+            def __str__(inst):
+                return '<dummy>'
+
+        rendered = template(test=dummy())
+        self.assertEqual(rendered, '&lt;dummy&gt;')
+
+    def test_repr(self):
+        template = self.from_file(
+            os.path.join(self.root, 'inputs', 'hello_world.pt')
+            )
+        self.assertTrue(template.filename in repr(template))
+
+    def test_underscore_variable(self):
+        template = self.from_string(
+            "<div tal:define=\"_dummy 'foo'\">${_dummy}</div>"
+            )
+        self.assertTrue(template(), "<div>foo</div>")
+
+    def test_trim_attribute_space(self):
+        document = '''<div
+                  class="document"
+                  id="test"
+                  tal:attributes="class string:${default} test"
+            />'''
+
+        result1 = self.from_string(
+            document)()
+
+        result2 = self.from_string(
+            document, trim_attribute_space=True)()
+
+        self.assertEqual(result1.count(" "), 49)
+        self.assertEqual(result2.count(" "), 4)
+        self.assertTrue(" />" in result1)
+        self.assertTrue(" />" in result2)
+
+    def test_exception(self):
+        from traceback import format_exception_only
+
+        template = self.from_string(
+            "<div tal:define=\"dummy foo\">${dummy}</div>"
+            )
+        try:
+            template()
+        except:
+            exc = sys.exc_info()[1]
+            formatted = str(exc)
+            self.assertFalse('NameError:' in formatted)
+            self.assertTrue('foo' in formatted)
+            self.assertTrue('(1:23)' in formatted)
+
+            formatted_exc = "\n".join(format_exception_only(type(exc), exc))
+            self.assertTrue('NameError: foo' in formatted_exc)
+        else:
+            self.fail("expected error")
+
+    def test_create_formatted_exception(self):
+        from chameleon.utils import create_formatted_exception
+
+        exc = create_formatted_exception(NameError('foo'), NameError, str)
+        self.assertEqual(exc.args, ('foo', ))
+
+        class MyNameError(NameError):
+            def __init__(self, boo):
+                NameError.__init__(self, boo)
+                self.bar = boo
+
+        exc = create_formatted_exception(MyNameError('foo'), MyNameError, str)
+        self.assertEqual(exc.args, ('foo', ))
+        self.assertEqual(exc.bar, 'foo')
+
+    def test_create_formatted_exception_no_subclass(self):
+        from chameleon.utils import create_formatted_exception
+
+        class DifficultMetaClass(type):
+            def __init__(self, class_name, bases, namespace):
+                if not bases == (BaseException, ):
+                    raise TypeError(bases)
+
+        Difficult = DifficultMetaClass('Difficult', (BaseException, ), {'args': ()})
+
+        exc = create_formatted_exception(Difficult(), Difficult, str)
+        self.assertEqual(exc.args, ())
+
+    def test_error_handler_makes_safe_copy(self):
+        calls = []
+
+        class TestException(Exception):
+            def __init__(self, *args, **kwargs):
+                calls.append((args, kwargs))
+
+        def _render(stream, econtext, rcontext):
+            exc = TestException('foo', bar='baz')
+            rcontext['__error__'] = ('expression', 1, 42, 'test.pt', exc),
+            raise exc
+
+        template = self.from_string("")
+        template._render = _render
+        try:
+            template()
+        except TestException:
+            self.assertEqual(calls, [(('foo', ), {'bar': 'baz'})])
+            exc = sys.exc_info()[1]
+            formatted = str(exc)
+            self.assertTrue('TestException' in formatted)
+            self.assertTrue('"expression"' in formatted)
+            self.assertTrue('(1:42)' in formatted)
+        else:
+            self.fail("unexpected error")
+
+    def test_double_underscore_variable(self):
+        from chameleon.exc import TranslationError
+        self.assertRaises(
+            TranslationError, self.from_string,
+            "<div tal:define=\"__dummy 'foo'\">${__dummy}</div>",
+            )
+
+    def test_compiler_internals_are_disallowed(self):
+        from chameleon.compiler import COMPILER_INTERNALS_OR_DISALLOWED
+        from chameleon.exc import TranslationError
+
+        for name in COMPILER_INTERNALS_OR_DISALLOWED:
+            body = "<d tal:define=\"%s 'foo'\">${%s}</d>" % (name, name)
+            self.assertRaises(TranslationError, self.from_string, body)
+
+    def test_fast_translate_mapping(self):
+        template = self.from_string(
+            '<div i18n:translate="">'
+            '<span i18n:name="name">foo</span>'
+            '</div>')
+
+        self.assertEqual(template(), '<div><span>foo</span></div>')
+
+    def test_translate_is_not_an_internal(self):
+        macro = self.from_string('<span i18n:translate="">bar</span>')
+        template = self.from_string(
+            '''
+            <tal:defs define="translate string:">
+              <span i18n:translate="">foo</span>
+              <metal:macro use-macro="macro" />
+            </tal:defs>
+            ''')
+
+        result = template(macro=macro)
+        self.assertTrue('foo' in result)
+        self.assertTrue('foo' in result)
+
+    def test_literal_false(self):
+        template = self.from_string(
+            '<input type="input" tal:attributes="checked False" />'
+            '<input type="input" tal:attributes="checked True" />'
+            '<input type="input" tal:attributes="checked None" />'
+            '<input type="input" tal:attributes="checked default" />',
+            literal_false=True,
+            )
+
+        self.assertEqual(
+            template(),
+            '<input type="input" checked="False" />'
+            '<input type="input" checked="True" />'
+            '<input type="input" />'
+            '<input type="input" />',
+            template.source
+            )
+
+    def test_boolean_attributes(self):
+        template = self.from_string(
+            '<input type="input" tal:attributes="checked False" />'
+            '<input type="input" tal:attributes="checked True" />'
+            '<input type="input" tal:attributes="checked None" />'
+            '<input type="input" tal:attributes="checked \'\'" />'
+            '<input type="input" tal:attributes="checked default" />'
+            '<input type="input" checked="checked" tal:attributes="checked default" />',
+            boolean_attributes=set(['checked'])
+            )
+
+        self.assertEqual(
+            template(),
+            '<input type="input" />'
+            '<input type="input" checked="checked" />'
+            '<input type="input" />'
+            '<input type="input" />'
+            '<input type="input" />'
+            '<input type="input" checked="checked" />',
+            template.source
+            )
+
+    def test_default_debug_flag(self):
+        from chameleon.config import DEBUG_MODE
+        template = self.from_file(
+            os.path.join(self.root, 'inputs', 'hello_world.pt'),
+            )
+        self.assertEqual(template.debug, DEBUG_MODE)
+        self.assertTrue('debug' not in template.__dict__)
+
+    def test_debug_flag_on_string(self):
+        from chameleon.loader import ModuleLoader
+
+        with open(os.path.join(self.root, 'inputs', 'hello_world.pt')) as f:
+            source = f.read()
+
+        template = self.from_string(source, debug=True)
+
+        self.assertTrue(template.debug)
+        self.assertTrue(isinstance(template.loader, ModuleLoader))
+
+    def test_debug_flag_on_file(self):
+        from chameleon.loader import ModuleLoader
+        template = self.from_file(
+            os.path.join(self.root, 'inputs', 'hello_world.pt'),
+            debug=True,
+            )
+        self.assertTrue(template.debug)
+        self.assertTrue(isinstance(template.loader, ModuleLoader))
+
+    def test_tag_mismatch(self):
+        from chameleon.exc import ParseError
+
+        try:
+            self.from_string("""
+            <div metal:use-macro="layout">
+            <div metal:fill-slot="name"></dav>
+            </div>
+            """)
+        except ParseError:
+            exc = sys.exc_info()[1]
+            self.assertTrue("</dav>" in str(exc))
+        else:
+            self.fail("Expected error.")
+
+
+class ZopeTemplatesTestSuite(RenderTestCase):
+    def setUp(self):
+        self.temp_path = temp_path = tempfile.mkdtemp()
+
+        @self.addCleanup
+        def cleanup(path=temp_path):
+            shutil.rmtree(path)
+
+    def test_pt_files(self):
+        from ..zpt.template import PageTemplateFile
+
+        class Literal(object):
+            def __init__(self, s):
+                self.s = s
+
+            def __html__(self):
+                return self.s
+
+            def __str__(self):
+                raise RuntimeError(
+                    "%r is a literal." % self.s)
+
+        from chameleon.loader import TemplateLoader
+        loader = TemplateLoader(os.path.join(self.root, "inputs"))
+
+        self.execute(
+            ".pt", PageTemplateFile,
+            literal=Literal("<div>Hello world!</div>"),
+            content="<div>Hello world!</div>",
+            message=Message(),
+            load=loader.bind(PageTemplateFile),
+            )
+
+    def test_txt_files(self):
+        from ..zpt.template import PageTextTemplateFile
+        self.execute(".txt", PageTextTemplateFile)
+
+    def execute(self, ext, factory, **kwargs):
+        def translate(msgid, domain=None, mapping=None, context=None,
+                      target_language=None, default=None):
+            if default is None:
+                default = str(msgid)
+
+            if isinstance(msgid, Message):
+                default = "Message"
+
+            if mapping:
+                default = re.sub(r'\${([a-z_]+)}', r'%(\1)s', default) % \
+                          mapping
+
+            if target_language is None:
+                return default
+
+            if domain is None:
+                with_domain = ""
+            else:
+                with_domain = " with domain '%s'" % domain
+
+            stripped = default.rstrip('\n ')
+            return "%s ('%s' translation into '%s'%s)%s" % (
+                stripped, msgid, target_language, with_domain,
+                default[len(stripped):]
+                )
+
+        for input_path, output_path, language in self.find_files(ext):
+            # Make friendly title so we can locate the generated
+            # source when debugging
+            self.shortDescription = lambda: input_path
+
+            # Very implicitly enable implicit translation based on
+            # a string included in the input path:
+            implicit_i18n = 'implicit-i18n' in input_path
+            implicit_i18n_attrs = ("alt", "title") if implicit_i18n else ()
+
+            template = factory(
+                input_path,
+                keep_source=True,
+                strict=False,
+                implicit_i18n_translate=implicit_i18n,
+                implicit_i18n_attributes=implicit_i18n_attrs,
+                )
+
+            params = kwargs.copy()
+            params.update({
+                'translate': translate,
+                'target_language': language,
+                })
+
+            template.cook_check()
+
+            try:
+                got = template.render(**params)
+            except:
+                import traceback
+                e = traceback.format_exc()
+                self.fail("%s\n\n    Example source:\n\n%s" % (e, "\n".join(
+                    ["%#03.d%s" % (lineno + 1, line and " " + line or "")
+                     for (lineno, line) in
+                     enumerate(template.source.split(
+                         '\n'))])))
+
+            if isinstance(got, byte_string):
+                got = got.decode('utf-8')
+
+            from doctest import OutputChecker
+            checker = OutputChecker()
+
+            if not os.path.exists(output_path):
+                output = template.body
+            else:
+                with open(output_path, 'rb') as f:
+                    output = f.read()
+
+            from chameleon.utils import read_xml_encoding
+            from chameleon.utils import detect_encoding
+
+            if template.content_type == 'text/xml':
+                encoding = read_xml_encoding(output) or \
+                           template.default_encoding
+            else:
+                content_type, encoding = detect_encoding(
+                    output, template.default_encoding)
+
+            want = output.decode(encoding)
+
+            if checker.check_output(want, got, 0) is False:
+                from doctest import Example
+                example = Example(input_path, want)
+                diff = checker.output_difference(
+                    example, got, 0)
+                self.fail("(%s) - \n%s\n\nCode:\n%s" % (
+                    input_path, diff.rstrip('\n'),
+                    template.source.encode('utf-8')))
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tests/test_tokenizer.py b/lib/Chameleon-2.9.2/src/chameleon/tests/test_tokenizer.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tests/test_tokenizer.py
@@ -0,0 +1,47 @@
+import sys
+
+from unittest import TestCase
+
+
+class TokenizerTest(TestCase):
+    def test_sample_files(self):
+        import os
+        import traceback
+        path = os.path.join(os.path.dirname(__file__), "inputs")
+        for filename in os.listdir(path):
+            if not filename.endswith('.xml'):
+                continue
+            f = open(os.path.join(path, filename), 'rb')
+            source = f.read()
+            f.close()
+
+            from ..utils import read_encoded
+            try:
+                want = read_encoded(source)
+            except UnicodeDecodeError:
+                exc = sys.exc_info()[1]
+                self.fail("%s - %s" % (exc, filename))
+
+            from ..tokenize import iter_xml
+            try:
+                tokens = iter_xml(want)
+                got = "".join(tokens)
+            except:
+                self.fail(traceback.format_exc())
+
+            from doctest import OutputChecker
+            checker = OutputChecker()
+
+            if checker.check_output(want, got, 0) is False:
+                from doctest import Example
+                example = Example(f.name, want)
+                diff = checker.output_difference(
+                    example, got, 0)
+                self.fail("(%s) - \n%s" % (f.name, diff))
+
+    def test_token(self):
+        from chameleon.tokenize import Token
+        token = Token("abc", 1)
+
+        self.assertTrue(isinstance(token[1:], Token))
+        self.assertEqual(token[1:].pos, 2)
diff --git a/lib/Chameleon-2.9.2/src/chameleon/tokenize.py b/lib/Chameleon-2.9.2/src/chameleon/tokenize.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/tokenize.py
@@ -0,0 +1,144 @@
+# http://code.activestate.com/recipes/65125-xml-lexing-shallow-parsing/
+# by Paul Prescod
+# licensed under the PSF License
+#
+# modified to capture all non-overlapping parts of tokens
+
+import re
+
+try:
+    str = unicode
+except NameError:
+    pass
+
+class recollector:
+    def __init__(self):
+        self.res = {}
+
+    def add(self, name, reg ):
+        re.compile(reg)  # check that it is valid
+        self.res[name] = reg % self.res
+
+collector = recollector()
+a = collector.add
+
+a("TextSE", "[^<]+")
+a("UntilHyphen", "[^-]*-")
+a("Until2Hyphens", "%(UntilHyphen)s(?:[^-]%(UntilHyphen)s)*-")
+a("CommentCE", "%(Until2Hyphens)s>?")
+a("UntilRSBs", "[^\\]]*](?:[^\\]]+])*]+")
+a("CDATA_CE", "%(UntilRSBs)s(?:[^\\]>]%(UntilRSBs)s)*>" )
+a("S", "[ \\n\\t\\r]+")
+a("Simple", "[^\"'>/]+")
+a("NameStrt", "[A-Za-z_:]|[^\\x00-\\x7F]")
+a("NameChar", "[A-Za-z0-9_:.-]|[^\\x00-\\x7F]")
+a("Name", "(?:%(NameStrt)s)(?:%(NameChar)s)*")
+a("QuoteSE", "\"[^\"]*\"|'[^']*'")
+a("DT_IdentSE" , "%(S)s%(Name)s(?:%(S)s(?:%(Name)s|%(QuoteSE)s))*" )
+a("MarkupDeclCE" , "(?:[^\\]\"'><]+|%(QuoteSE)s)*>" )
+a("S1", "[\\n\\r\\t ]")
+a("UntilQMs", "[^?]*\\?+")
+a("PI_Tail" , "\\?>|%(S1)s%(UntilQMs)s(?:[^>?]%(UntilQMs)s)*>" )
+a("DT_ItemSE",
+  "<(?:!(?:--%(Until2Hyphens)s>|[^-]%(MarkupDeclCE)s)|"
+  "\\?%(Name)s(?:%(PI_Tail)s))|%%%(Name)s;|%(S)s"
+)
+a("DocTypeCE" ,
+"%(DT_IdentSE)s(?:%(S)s)?(?:\\[(?:%(DT_ItemSE)s)*](?:%(S)s)?)?>?" )
+a("DeclCE",
+  "--(?:%(CommentCE)s)?|\\[CDATA\\[(?:%(CDATA_CE)s)?|"
+  "DOCTYPE(?:%(DocTypeCE)s)?")
+a("PI_CE", "%(Name)s(?:%(PI_Tail)s)?")
+a("EndTagCE", "%(Name)s(?:%(S)s)?>?")
+a("AttValSE", "\"[^\"]*\"|'[^']*'")
+a("ElemTagCE",
+  "(%(Name)s)(?:(%(S)s)(%(Name)s)(((?:%(S)s)?=(?:%(S)s)?)"
+  "(?:%(AttValSE)s|%(Simple)s)|(?!(?:%(S)s)?=)))*(?:%(S)s)?(/?>)?")
+a("MarkupSPE",
+  "<(?:!(?:%(DeclCE)s)?|"
+  "\\?(?:%(PI_CE)s)?|/(?:%(EndTagCE)s)?|(?:%(ElemTagCE)s)?)")
+a("XML_SPE", "%(TextSE)s|%(MarkupSPE)s")
+a("XML_MARKUP_ONLY_SPE", "%(MarkupSPE)s")
+a("ElemTagSPE", "<|%(Name)s")
+
+re_xml_spe = re.compile(collector.res['XML_SPE'])
+re_markup_only_spe = re.compile(collector.res['XML_MARKUP_ONLY_SPE'])
+
+
+def iter_xml(body, filename=None):
+    for match in re_xml_spe.finditer(body):
+        string = match.group()
+        pos = match.start()
+        yield Token(string, pos, body, filename)
+
+
+def iter_text(body, filename=None):
+    yield Token(body, 0, body, filename)
+
+
+class Token(str):
+    __slots__ = "pos", "source", "filename"
+
+    def __new__(cls, string, pos=0, source=None, filename=None):
+        inst = str.__new__(cls, string)
+        inst.pos = pos
+        inst.source = source
+        inst.filename = filename or ""
+        return inst
+
+    def __getslice__(self, i, j):
+        slice = str.__getslice__(self, i, j)
+        return Token(slice, self.pos + i, self.source, self.filename)
+
+    def __getitem__(self, index):
+        s = str.__getitem__(self, index)
+        if isinstance(index, slice):
+            return Token(
+                s, self.pos + (index.start or 0), self.source, self.filename)
+        return s
+
+    def __add__(self, other):
+        if other is None:
+            return self
+
+        return Token(
+            str.__add__(self, other), self.pos, self.source, self.filename)
+
+    def __eq__(self, other):
+        return str.__eq__(self, other)
+
+    def __hash__(self):
+        return str.__hash__(self)
+
+    def replace(self, *args):
+        s = str.replace(self, *args)
+        return Token(s, self.pos, self.source, self.filename)
+
+    def split(self, *args):
+        l = str.split(self, *args)
+        pos = self.pos
+        for i, s in enumerate(l):
+            l[i] = Token(s, pos, self.source, self.filename)
+            pos += len(s)
+        return l
+
+    def strip(self, *args):
+        return self.lstrip(*args).rstrip(*args)
+
+    def lstrip(self, *args):
+        s = str.lstrip(self, *args)
+        return Token(
+            s, self.pos + len(self) - len(s), self.source, self.filename)
+
+    def rstrip(self, *args):
+        s = str.rstrip(self, *args)
+        return Token(s, self.pos, self.source, self.filename)
+
+    @property
+    def location(self):
+        if self.source is None:
+            return 0, self.pos
+
+        body = self.source[:self.pos]
+        line = body.count('\n')
+        return line + 1, self.pos - body.rfind('\n', 0) - 1
diff --git a/lib/Chameleon-2.9.2/src/chameleon/utils.py b/lib/Chameleon-2.9.2/src/chameleon/utils.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/utils.py
@@ -0,0 +1,429 @@
+import os
+import re
+import sys
+import codecs
+import logging
+
+from copy import copy
+
+version = sys.version_info[:3]
+
+try:
+    import ast as _ast
+except ImportError:
+    from chameleon import ast24 as _ast
+
+
+class ASTProxy(object):
+    aliases = {
+        # Python 3.3
+        'TryExcept': 'Try',
+        'TryFinally': 'Try',
+        }
+
+    def __getattr__(self, name):
+        return _ast.__dict__.get(name) or getattr(_ast, self.aliases[name])
+
+
+ast = ASTProxy()
+
+log = logging.getLogger('chameleon.utils')
+
+# Python 2
+if version < (3, 0, 0):
+    import htmlentitydefs
+    import __builtin__ as builtins
+
+    from .py25 import raise_with_traceback
+
+    chr = unichr
+    native_string = str
+    decode_string = unicode
+    encode_string = str
+    unicode_string = unicode
+    string_type = basestring
+    byte_string = str
+
+    def safe_native(s, encoding='utf-8'):
+        if not isinstance(s, unicode):
+            s = decode_string(s, encoding, 'replace')
+
+        return s.encode(encoding)
+
+# Python 3
+else:
+    from html import entities as htmlentitydefs
+    import builtins
+
+    byte_string = bytes
+    string_type = str
+    native_string = str
+    decode_string = bytes.decode
+    encode_string = lambda s: bytes(s, 'utf-8')
+    unicode_string = str
+
+    def safe_native(s, encoding='utf-8'):
+        if not isinstance(s, str):
+            s = decode_string(s, encoding, 'replace')
+
+        return s
+
+    def raise_with_traceback(exc, tb):
+        exc.__traceback__ = tb
+        raise exc
+
+def text_(s, encoding='latin-1', errors='strict'):
+    """ If ``s`` is an instance of ``byte_string``, return
+    ``s.decode(encoding, errors)``, otherwise return ``s``"""
+    if isinstance(s, byte_string):
+        return s.decode(encoding, errors)
+    return s
+
+entity_re = re.compile(r'&(#?)(x?)(\d{1,5}|\w{1,8});')
+
+module_cache = {}
+
+xml_prefixes = (
+    (codecs.BOM_UTF8, 'utf-8-sig'),
+    (codecs.BOM_UTF16_BE, 'utf-16-be'),
+    (codecs.BOM_UTF16_LE, 'utf-16-le'),
+    (codecs.BOM_UTF16, 'utf-16'),
+    (codecs.BOM_UTF32_BE, 'utf-32-be'),
+    (codecs.BOM_UTF32_LE, 'utf-32-le'),
+    (codecs.BOM_UTF32, 'utf-32'),
+    )
+
+
+def _has_encoding(encoding):
+    try:
+        "".encode(encoding)
+    except LookupError:
+        return False
+    else:
+        return True
+
+
+# Precomputed prefix table
+_xml_prefixes = tuple(
+    (bom, str('<?xml').encode(encoding), encoding)
+    for bom, encoding in reversed(xml_prefixes)
+    if _has_encoding(encoding)
+    )
+
+_xml_decl = encode_string("<?xml")
+
+RE_META = re.compile(
+    r'\s*<meta\s+http-equiv=["\']?Content-Type["\']?'
+    r'\s+content=["\']?([^;]+);\s*charset=([^"\']+)["\']?\s*/?\s*>\s*',
+    re.IGNORECASE
+    )
+
+RE_ENCODING = re.compile(
+    r'encoding\s*=\s*(?:"|\')(?P<encoding>[\w\-]+)(?:"|\')'.encode('ascii'),
+    re.IGNORECASE
+    )
+
+
+def read_encoded(data):
+    return read_bytes(data, "utf-8")[0]
+
+
+def read_bytes(body, default_encoding):
+    for bom, prefix, encoding in _xml_prefixes:
+        if body.startswith(bom):
+            document = body.decode(encoding)
+            return document, encoding, \
+                   "text/xml" if document.startswith("<?xml") else None
+
+        if prefix != encode_string('<?xml') and body.startswith(prefix):
+            return body.decode(encoding), encoding, "text/xml"
+
+    if body.startswith(_xml_decl):
+        content_type = "text/xml"
+
+        encoding = read_xml_encoding(body) or default_encoding
+    else:
+        content_type, encoding = detect_encoding(body, default_encoding)
+
+    return body.decode(encoding), encoding, content_type
+
+
+def detect_encoding(body, default_encoding):
+    if not isinstance(body, str):
+        body = body.decode('ascii', 'ignore')
+
+    match = RE_META.search(body)
+    if match is not None:
+        return match.groups()
+
+    return None, default_encoding
+
+
+def read_xml_encoding(body):
+    if body.startswith('<?xml'.encode('ascii')):
+        match = RE_ENCODING.search(body)
+        if match is not None:
+            return match.group('encoding').decode('ascii')
+
+
+def mangle(filename):
+    """Mangles template filename into top-level Python module name.
+
+    >>> mangle('hello_world.pt')
+    'hello_world'
+
+    >>> mangle('foo.bar.baz.pt')
+    'foo_bar_baz'
+
+    >>> mangle('foo-bar-baz.pt')
+    'foo_bar_baz'
+
+    """
+
+    base, ext = os.path.splitext(filename)
+    return base.replace('.', '_').replace('-', '_')
+
+
+def char2entity(c):
+    cp = ord(c)
+    name = htmlentitydefs.codepoint2name.get(cp)
+    return '&%s;' % name if name is not None else '&#%d;' % cp
+
+
+def substitute_entity(match, n2cp=htmlentitydefs.name2codepoint):
+    ent = match.group(3)
+
+    if match.group(1) == "#":
+        if match.group(2) == '':
+            return chr(int(ent))
+        elif match.group(2) == 'x':
+            return chr(int('0x' + ent, 16))
+    else:
+        cp = n2cp.get(ent)
+
+        if cp:
+            return chr(cp)
+        else:
+            return match.group()
+
+
+def create_formatted_exception(exc, cls, formatter):
+    try:
+        try:
+            new = type(cls.__name__, (cls, Exception), {
+                '__str__': formatter,
+                '__new__': BaseException.__new__,
+                '__module__': cls.__module__,
+                })
+        except TypeError:
+            new = cls
+
+        try:
+            inst = BaseException.__new__(new)
+        except TypeError:
+            inst = cls.__new__(new)
+
+        BaseException.__init__(inst, *exc.args)
+        inst.__dict__ = exc.__dict__
+
+        return inst
+    except ValueError:
+        name = type(exc).__name__
+        log.warn("Unable to copy exception of type '%s'." % name)
+        raise TypeError(exc)
+
+
+def unescape(string):
+    for name in ('lt', 'gt', 'quot'):
+        cp = htmlentitydefs.name2codepoint[name]
+        string = string.replace('&%s;' % name, chr(cp))
+
+    return string
+
+
+_concat = unicode_string("").join
+
+
+def join(stream):
+    """Concatenate stream.
+
+    >>> print(join(('Hello', ' ', 'world')))
+    Hello world
+
+    >>> join(('Hello', 0))
+    Traceback (most recent call last):
+     ...
+    TypeError: ... expected ...
+
+    """
+
+    try:
+        return _concat(stream)
+    except:
+        # Loop through stream and coerce each element into unicode;
+        # this should raise an exception
+        for element in stream:
+            unicode_string(element)
+
+        # In case it didn't, re-raise the original exception
+        raise
+
+
+def decode_htmlentities(string):
+    """
+    >>> native_string(decode_htmlentities('&amp;amp;'))
+    '&amp;'
+
+    """
+
+    decoded = entity_re.subn(substitute_entity, string)[0]
+
+    # preserve input token data
+    return string.replace(string, decoded)
+
+
+# Taken from zope.dottedname
+def _resolve_dotted(name, module=None):
+    name = name.split('.')
+    if not name[0]:
+        if module is None:
+            raise ValueError("relative name without base module")
+        module = module.split('.')
+        name.pop(0)
+        while not name[0]:
+            module.pop()
+            name.pop(0)
+        name = module + name
+
+    used = name.pop(0)
+    found = __import__(used)
+    for n in name:
+        used += '.' + n
+        try:
+            found = getattr(found, n)
+        except AttributeError:
+            __import__(used)
+            found = getattr(found, n)
+
+    return found
+
+
+def resolve_dotted(dotted):
+    if not dotted in module_cache:
+        resolved = _resolve_dotted(dotted)
+        module_cache[dotted] = resolved
+    return module_cache[dotted]
+
+
+def limit_string(s, max_length=53):
+    if len(s) > max_length:
+        return s[:max_length - 3] + '...'
+
+    return s
+
+
+def format_kwargs(kwargs):
+    items = []
+    for name, value in kwargs.items():
+        if isinstance(value, string_type):
+            short = limit_string(value)
+            items.append((name, short.replace('\n', '\\n')))
+        elif isinstance(value, (int, float)):
+            items.append((name, value))
+        elif isinstance(value, dict):
+            items.append((name, '{...} (%d)' % len(value)))
+        else:
+            items.append((name,
+                "<%s %s at %s>" % (
+                    type(value).__name__,
+                    getattr(value, '__name__', "-"),
+                    hex(abs(id(value))))))
+
+    return ["%s: %s" % item for item in items]
+
+
+class callablestr(str):
+    __slots__ = ()
+
+    def __call__(self):
+        return self
+
+
+class callableint(int):
+    __slots__ = ()
+
+    def __call__(self):
+        return self
+
+
+class descriptorstr(object):
+    __slots__ = "function", "__name__"
+
+    def __init__(self, function):
+        self.function = function
+        self.__name__ = function.__name__
+
+    def __get__(self, context, cls):
+        return callablestr(self.function(context))
+
+
+class descriptorint(object):
+    __slots__ = "function", "__name__"
+
+    def __init__(self, function):
+        self.function = function
+        self.__name__ = function.__name__
+
+    def __get__(self, context, cls):
+        return callableint(self.function(context))
+
+
+class DebuggingOutputStream(list):
+    def append(self, value):
+        if not isinstance(value, string_type):
+            raise TypeError(value)
+
+        unicode_string(value)
+        list.append(self, value)
+
+
+class Scope(dict):
+    set_local = setLocal = dict.__setitem__
+
+    __slots__ = "set_global",
+
+    def __new__(cls, *args):
+        inst = dict.__new__(cls, *args)
+        inst.set_global = inst.__setitem__
+        return inst
+
+    def __getitem__(self, key):
+        try:
+            return dict.__getitem__(self, key)
+        except KeyError:
+            raise NameError(key)
+
+    @property
+    def vars(self):
+        return self
+
+    def copy(self):
+        inst = Scope(self)
+        inst.set_global = self.set_global
+        return inst
+
+
+class ListDictProxy(object):
+    def __init__(self, l):
+        self._l = l
+
+    def get(self, key):
+        return self._l[-1].get(key)
+
+
+class Markup(unicode_string):
+    def __html__(self):
+        return unicode_string(self)
+
+    def __repr__(self):
+        return "s'%s'" % self.s
diff --git a/lib/Chameleon-2.9.2/src/chameleon/zpt/__init__.py b/lib/Chameleon-2.9.2/src/chameleon/zpt/__init__.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/zpt/__init__.py
@@ -0,0 +1,1 @@
+#
diff --git a/lib/Chameleon-2.9.2/src/chameleon/zpt/loader.py b/lib/Chameleon-2.9.2/src/chameleon/zpt/loader.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/zpt/loader.py
@@ -0,0 +1,30 @@
+from chameleon.loader import TemplateLoader as BaseLoader
+from chameleon.zpt import template
+
+
+class TemplateLoader(BaseLoader):
+    formats = {
+        "xml": template.PageTemplateFile,
+        "text": template.PageTextTemplateFile,
+        }
+
+    default_format = "xml"
+
+    def __init__(self, *args, **kwargs):
+        formats = kwargs.pop('formats', None)
+        if formats is not None:
+            self.formats = formats
+
+        super(TemplateLoader, self).__init__(*args, **kwargs)
+
+    def load(self, filename, format=None):
+        """Load and return a template file.
+
+        The format parameter determines will parse the file. Valid
+        options are `xml` and `text`.
+        """
+
+        cls = self.formats[format or self.default_format]
+        return super(TemplateLoader, self).load(filename, cls)
+
+    __getitem__ = load
diff --git a/lib/Chameleon-2.9.2/src/chameleon/zpt/program.py b/lib/Chameleon-2.9.2/src/chameleon/zpt/program.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/zpt/program.py
@@ -0,0 +1,751 @@
+import re
+
+try:
+    import ast
+except ImportError:
+    from chameleon import ast24 as ast
+
+try:
+    str = unicode
+except NameError:
+    long = int
+
+from functools import partial
+from copy import copy
+
+from ..program import ElementProgram
+
+from ..namespaces import XML_NS
+from ..namespaces import XMLNS_NS
+from ..namespaces import I18N_NS as I18N
+from ..namespaces import TAL_NS as TAL
+from ..namespaces import METAL_NS as METAL
+from ..namespaces import META_NS as META
+
+from ..astutil import Static
+from ..astutil import parse
+from ..astutil import marker
+
+from .. import tal
+from .. import metal
+from .. import i18n
+from .. import nodes
+
+from ..exc import LanguageError
+from ..exc import ParseError
+from ..exc import CompilationError
+
+from ..utils import decode_htmlentities
+
+try:
+    str = unicode
+except NameError:
+    long = int
+
+
+missing = object()
+
+re_trim = re.compile(r'($\s+|\s+^)', re.MULTILINE)
+
+def skip(node):
+    return node
+
+
+def wrap(node, *wrappers):
+    for wrapper in reversed(wrappers):
+        node = wrapper(node)
+    return node
+
+
+def validate_attributes(attributes, namespace, whitelist):
+    for ns, name in attributes:
+        if ns == namespace and name not in whitelist:
+            raise CompilationError(
+                "Bad attribute for namespace '%s'" % ns, name
+                )
+
+
+class MacroProgram(ElementProgram):
+    """Visitor class that generates a program for the ZPT language."""
+
+    DEFAULT_NAMESPACES = {
+        'xmlns': XMLNS_NS,
+        'xml': XML_NS,
+        'tal': TAL,
+        'metal': METAL,
+        'i18n': I18N,
+        'meta': META,
+        }
+
+    DROP_NS = TAL, METAL, I18N, META
+
+    VARIABLE_BLACKLIST = "default", "repeat", "nothing", \
+                         "convert", "decode", "translate"
+
+    _interpolation_enabled = True
+    _whitespace = "\n"
+    _last = ""
+
+    # Macro name (always trivial for a macro program)
+    name = None
+
+    # This default marker value has the semantics that if an
+    # expression evaluates to that value, the expression default value
+    # is returned. For an attribute, if there is no default, this
+    # means that the attribute is dropped.
+    default_marker = None
+
+    # Escape mode (true value means XML-escape)
+    escape = True
+
+    # Attributes which should have boolean behavior (on true, the
+    # value takes the attribute name, on false, the attribute is
+    # dropped)
+    boolean_attributes = set()
+
+    # If provided, this should be a set of attributes for implicit
+    # translation. Any attribute whose name is included in the set
+    # will be translated even without explicit markup. Note that all
+    # values should be lowercase strings.
+    implicit_i18n_attributes = set()
+
+    # If set, text will be translated even without explicit markup.
+    implicit_i18n_translate = False
+
+    # If set, additional attribute whitespace will be stripped.
+    trim_attribute_space = False
+
+    def __init__(self, *args, **kwargs):
+        # Internal array for switch statements
+        self._switches = []
+
+        # Internal array for current use macro level
+        self._use_macro = []
+
+        # Internal array for current interpolation status
+        self._interpolation = [True]
+
+        # Internal dictionary of macro definitions
+        self._macros = {}
+
+        # Apply default values from **kwargs to self
+        self._pop_defaults(
+            kwargs,
+            'boolean_attributes',
+            'default_marker',
+            'escape',
+            'implicit_i18n_translate',
+            'implicit_i18n_attributes',
+            'trim_attribute_space',
+            )
+
+        super(MacroProgram, self).__init__(*args, **kwargs)
+
+    @property
+    def macros(self):
+        macros = list(self._macros.items())
+        macros.append((None, nodes.Sequence(self.body)))
+
+        return tuple(
+            nodes.Macro(name, [nodes.Context(node)])
+            for name, node in macros
+            )
+
+    def visit_default(self, node):
+        return nodes.Text(node)
+
+    def visit_element(self, start, end, children):
+        ns = start['ns_attrs']
+
+        for (prefix, attr), encoded in tuple(ns.items()):
+            if prefix == TAL:
+                ns[prefix, attr] = decode_htmlentities(encoded)
+
+        # Validate namespace attributes
+        validate_attributes(ns, TAL, tal.WHITELIST)
+        validate_attributes(ns, METAL, metal.WHITELIST)
+        validate_attributes(ns, I18N, i18n.WHITELIST)
+
+        # Check attributes for language errors
+        self._check_attributes(start['namespace'], ns)
+
+        # Remember whitespace for item repetition
+        if self._last is not None:
+            self._whitespace = "\n" + " " * len(self._last.rsplit('\n', 1)[-1])
+
+        # Set element-local whitespace
+        whitespace = self._whitespace
+
+        # Set up switch
+        try:
+            clause = ns[TAL, 'switch']
+        except KeyError:
+            switch = None
+        else:
+            switch = nodes.Value(clause)
+
+        self._switches.append(switch)
+
+        body = []
+
+        # Include macro
+        use_macro = ns.get((METAL, 'use-macro'))
+        extend_macro = ns.get((METAL, 'extend-macro'))
+        if use_macro or extend_macro:
+            slots = []
+            self._use_macro.append(slots)
+
+            if use_macro:
+                inner = nodes.UseExternalMacro(
+                    nodes.Value(use_macro), slots, False
+                    )
+            else:
+                inner = nodes.UseExternalMacro(
+                    nodes.Value(extend_macro), slots, True
+                    )
+        # -or- include tag
+        else:
+            content = nodes.Sequence(body)
+
+            # tal:content
+            try:
+                clause = ns[TAL, 'content']
+            except KeyError:
+                pass
+            else:
+                key, value = tal.parse_substitution(clause)
+                xlate = True if ns.get((I18N, 'translate')) == '' else False
+                content = self._make_content_node(value, content, key, xlate)
+
+                if end is None:
+                    # Make sure start-tag has opening suffix.
+                    start['suffix']  = ">"
+
+                    # Explicitly set end-tag.
+                    end = {
+                        'prefix': '</',
+                        'name': start['name'],
+                        'space': '',
+                        'suffix': '>'
+                        }
+
+            # i18n:translate
+            try:
+                clause = ns[I18N, 'translate']
+            except KeyError:
+                pass
+            else:
+                dynamic = ns.get((TAL, 'content')) or ns.get((TAL, 'replace'))
+
+                if not dynamic:
+                    content = nodes.Translate(clause, content)
+
+            # tal:attributes
+            try:
+                clause = ns[TAL, 'attributes']
+            except KeyError:
+                TAL_ATTRIBUTES = {}
+            else:
+                TAL_ATTRIBUTES = tal.parse_attributes(clause)
+
+            # i18n:attributes
+            try:
+                clause = ns[I18N, 'attributes']
+            except KeyError:
+                I18N_ATTRIBUTES = {}
+            else:
+                I18N_ATTRIBUTES = i18n.parse_attributes(clause)
+
+            # Prepare attributes from TAL language
+            prepared = tal.prepare_attributes(
+                start['attrs'], TAL_ATTRIBUTES,
+                I18N_ATTRIBUTES, ns, self.DROP_NS
+                )
+
+            # Create attribute nodes
+            STATIC_ATTRIBUTES = self._create_static_attributes(prepared)
+            ATTRIBUTES = self._create_attributes_nodes(
+                prepared, I18N_ATTRIBUTES
+                )
+
+            # Start- and end nodes
+            start_tag = nodes.Start(
+                start['name'],
+                self._maybe_trim(start['prefix']),
+                self._maybe_trim(start['suffix']),
+                ATTRIBUTES
+                )
+
+            end_tag = nodes.End(
+                end['name'],
+                end['space'],
+                self._maybe_trim(end['prefix']),
+                self._maybe_trim(end['suffix']),
+                ) if end is not None else None
+
+            # tal:omit-tag
+            try:
+                clause = ns[TAL, 'omit-tag']
+            except KeyError:
+                omit = False
+            else:
+                clause = clause.strip()
+
+                if clause == "":
+                    omit = True
+                else:
+                    expression = nodes.Negate(nodes.Value(clause))
+                    omit = expression
+
+                    # Wrap start- and end-tags in condition
+                    start_tag = nodes.Condition(expression, start_tag)
+
+                    if end_tag is not None:
+                        end_tag = nodes.Condition(expression, end_tag)
+
+            if omit is True or start['namespace'] in self.DROP_NS:
+                inner = content
+            else:
+                inner = nodes.Element(
+                    start_tag,
+                    end_tag,
+                    content,
+                    )
+
+                # Assign static attributes dictionary to "attrs" value
+                inner = nodes.Define(
+                    [nodes.Alias(["attrs"], STATIC_ATTRIBUTES)],
+                    inner,
+                    )
+
+                if omit is not False:
+                    inner = nodes.Cache([omit], inner)
+
+            # tal:replace
+            try:
+                clause = ns[TAL, 'replace']
+            except KeyError:
+                pass
+            else:
+                key, value = tal.parse_substitution(clause)
+                xlate = True if ns.get((I18N, 'translate')) == '' else False
+                inner = self._make_content_node(value, inner, key, xlate)
+
+        # metal:define-slot
+        try:
+            clause = ns[METAL, 'define-slot']
+        except KeyError:
+            DEFINE_SLOT = skip
+        else:
+            DEFINE_SLOT = partial(nodes.DefineSlot, clause)
+
+        # tal:define
+        try:
+            clause = ns[TAL, 'define']
+        except KeyError:
+            DEFINE = skip
+        else:
+            defines = tal.parse_defines(clause)
+            if defines is None:
+                raise ParseError("Invalid define syntax.", clause)
+
+            DEFINE = partial(
+                nodes.Define,
+                [nodes.Assignment(
+                    names, nodes.Value(expr), context == "local")
+                 for (context, names, expr) in defines],
+                )
+
+        # tal:case
+        try:
+            clause = ns[TAL, 'case']
+        except KeyError:
+            CASE = skip
+        else:
+            value = nodes.Value(clause)
+            for switch in reversed(self._switches):
+                if switch is not None:
+                    break
+            else:
+                raise LanguageError(
+                    "Must define switch on a parent element.", clause
+                    )
+
+            CASE = lambda node: nodes.Define(
+                [nodes.Assignment(["default"], switch, True)],
+                nodes.Condition(
+                    nodes.Equality(switch, value),
+                    node,
+                    )
+                )
+
+        # tal:repeat
+        try:
+            clause = ns[TAL, 'repeat']
+        except KeyError:
+            REPEAT = skip
+        else:
+            defines = tal.parse_defines(clause)
+            assert len(defines) == 1
+            context, names, expr = defines[0]
+
+            expression = nodes.Value(expr)
+
+            REPEAT = partial(
+                nodes.Repeat,
+                names,
+                expression,
+                context == "local",
+                whitespace
+                )
+
+        # tal:condition
+        try:
+            clause = ns[TAL, 'condition']
+        except KeyError:
+            CONDITION = skip
+        else:
+            expression = nodes.Value(clause)
+            CONDITION = partial(nodes.Condition, expression)
+
+        # tal:switch
+        if switch is None:
+            SWITCH = skip
+        else:
+            SWITCH = partial(nodes.Cache, [switch])
+
+        # i18n:domain
+        try:
+            clause = ns[I18N, 'domain']
+        except KeyError:
+            DOMAIN = skip
+        else:
+            DOMAIN = partial(nodes.Domain, clause)
+
+        # i18n:name
+        try:
+            clause = ns[I18N, 'name']
+        except KeyError:
+            NAME = skip
+        else:
+            if not clause.strip():
+                NAME = skip
+            else:
+                NAME = partial(nodes.Name, clause)
+
+        # The "slot" node next is the first node level that can serve
+        # as a macro slot
+        slot = wrap(
+            inner,
+            DEFINE_SLOT,
+            DEFINE,
+            CASE,
+            CONDITION,
+            REPEAT,
+            SWITCH,
+            DOMAIN,
+            )
+
+        # metal:fill-slot
+        try:
+            clause = ns[METAL, 'fill-slot']
+        except KeyError:
+            pass
+        else:
+            index = -(1 + int(bool(use_macro or extend_macro)))
+
+            try:
+                slots = self._use_macro[index]
+            except IndexError:
+                raise LanguageError(
+                    "Cannot use metal:fill-slot without metal:use-macro.",
+                    clause
+                    )
+
+            slots = self._use_macro[index]
+            slots.append(nodes.FillSlot(clause, slot))
+
+        # metal:define-macro
+        try:
+            clause = ns[METAL, 'define-macro']
+        except KeyError:
+            pass
+        else:
+            self._macros[clause] = slot
+            slot = nodes.UseInternalMacro(clause)
+
+        slot = wrap(
+            slot,
+            NAME
+            )
+
+        # tal:on-error
+        try:
+            clause = ns[TAL, 'on-error']
+        except KeyError:
+            ON_ERROR = skip
+        else:
+            key, value = tal.parse_substitution(clause)
+            translate = True if ns.get((I18N, 'translate')) == '' else False
+
+            fallback = self._make_content_node(value, None, key, translate)
+
+            if omit is False and start['namespace'] not in self.DROP_NS:
+                start_tag = copy(start_tag)
+
+                start_tag.attributes = filter(
+                    lambda attribute: isinstance(attribute, nodes.Attribute) and \
+                                      isinstance(attribute.expression, ast.Str),
+                    start_tag.attributes
+                    )
+
+                if end_tag is None:
+                    # Make sure start-tag has opening suffix. We don't
+                    # allow self-closing element here.
+                    start_tag.suffix  = ">"
+
+                    # Explicitly set end-tag.
+                    end_tag = nodes.End(start_tag.name, '', '</', '>',)
+
+                fallback = nodes.Element(
+                    start_tag,
+                    end_tag,
+                    fallback,
+                )
+
+            ON_ERROR = partial(nodes.OnError, fallback, 'error')
+
+        clause = ns.get((META, 'interpolation'))
+        if clause in ('false', 'off'):
+            INTERPOLATION = False
+        elif clause in ('true', 'on'):
+            INTERPOLATION = True
+        elif clause is None:
+            INTERPOLATION = self._interpolation[-1]
+        else:
+            raise LanguageError("Bad interpolation setting.", clause)
+
+        self._interpolation.append(INTERPOLATION)
+
+        # Visit content body
+        for child in children:
+            body.append(self.visit(*child))
+
+        self._switches.pop()
+        self._interpolation.pop()
+
+        if use_macro:
+            self._use_macro.pop()
+
+        return wrap(
+            slot,
+            ON_ERROR
+            )
+
+    def visit_start_tag(self, start):
+        return self.visit_element(start, None, [])
+
+    def visit_cdata(self, node):
+        if not self._interpolation[-1] or not '${' in node:
+            return nodes.Text(node)
+
+        expr = nodes.Substitution(node, ())
+        return nodes.Interpolation(expr, True, False)
+
+    def visit_comment(self, node):
+        if node.startswith('<!--!'):
+            return
+
+        if node.startswith('<!--?'):
+            return nodes.Text('<!--' + node.lstrip('<!-?'))
+
+        if not self._interpolation[-1] or not '${' in node:
+            return nodes.Text(node)
+
+        char_escape = ('&', '<', '>') if self.escape else ()
+        expression = nodes.Substitution(node[4:-3], char_escape)
+
+        return nodes.Sequence(
+            [nodes.Text(node[:4]),
+             nodes.Interpolation(expression, True, False),
+             nodes.Text(node[-3:])
+             ])
+
+    def visit_processing_instruction(self, node):
+        if node['name'] != 'python':
+            text = '<?' + node['name'] + node['text'] + '?>'
+            return self.visit_text(text)
+
+        return nodes.CodeBlock(node['text'])
+
+    def visit_text(self, node):
+        self._last = node
+
+        translation = self.implicit_i18n_translate
+
+        if self._interpolation[-1] and '${' in node:
+            char_escape = ('&', '<', '>') if self.escape else ()
+            expression = nodes.Substitution(node, char_escape)
+            return nodes.Interpolation(expression, True, translation)
+
+        if not translation:
+            return nodes.Text(node)
+
+        seq = []
+        while node:
+            m = re.search('\s+', node)
+            if m is not None:
+                s = m.start()
+                if s:
+                    t = node[:s]
+                    seq.append(nodes.Translate(t, nodes.Text(t)))
+
+                e = m.end()
+                whitespace = nodes.Text(node[s:e])
+                seq.append(whitespace)
+
+                if e < len(node):
+                    node = node[e:]
+                    continue
+
+            else:
+                seq.append(nodes.Translate(node, nodes.Text(node)))
+
+            break
+
+        return nodes.Sequence(seq)
+
+    def _pop_defaults(self, kwargs, *attributes):
+        for attribute in attributes:
+            default = getattr(self, attribute)
+            value = kwargs.pop(attribute, default)
+            setattr(self, attribute, value)
+
+    def _check_attributes(self, namespace, ns):
+        if namespace in self.DROP_NS and ns.get((TAL, 'attributes')):
+            raise LanguageError(
+                "Dynamic attributes not allowed on elements of "
+                "the namespace: %s." % namespace,
+                ns[TAL, 'attributes'],
+                )
+
+        script = ns.get((TAL, 'script'))
+        if script is not None:
+            raise LanguageError(
+                "The script attribute is unsupported.", script)
+
+        tal_content = ns.get((TAL, 'content'))
+        if tal_content and ns.get((TAL, 'replace')):
+            raise LanguageError(
+                "You cannot use tal:content and tal:replace at the same time.",
+                tal_content
+                )
+
+        if tal_content and ns.get((I18N, 'translate')):
+            raise LanguageError(
+                "You cannot use tal:content with non-trivial i18n:translate.",
+                tal_content
+                )
+
+    def _make_content_node(self, expression, default, key, translate):
+        value = nodes.Value(expression)
+        char_escape = ('&', '<', '>') if key == 'text' else ()
+        content = nodes.Content(value, char_escape, translate)
+
+        if default is not None:
+            content = nodes.Condition(
+                nodes.Identity(value, marker("default")),
+                default,
+                content,
+                )
+
+            # Cache expression to avoid duplicate evaluation
+            content = nodes.Cache([value], content)
+
+            # Define local marker "default"
+            content = nodes.Define(
+                [nodes.Alias(["default"], marker("default"))],
+                content
+                )
+
+        return content
+
+    def _create_attributes_nodes(self, prepared, I18N_ATTRIBUTES):
+        attributes = []
+
+        for name, text, quote, space, eq, expr in prepared:
+            implicit_i18n = name.lower() in self.implicit_i18n_attributes
+
+            char_escape = ('&', '<', '>', quote)
+
+            # Use a provided default text as the default marker
+            # (aliased to the name ``default``), otherwise use the
+            # program's default marker value.
+            if text is not None:
+                default_marker = ast.Str(s=text)
+            else:
+                default_marker = self.default_marker
+
+            msgid = I18N_ATTRIBUTES.get(name, missing)
+
+            # If (by heuristic) ``text`` contains one or more
+            # interpolation expressions, apply interpolation
+            # substitution to the text
+            if expr is None and text is not None and '${' in text:
+                expr = nodes.Substitution(text, char_escape, None)
+                translation = implicit_i18n and msgid is missing
+                value = nodes.Interpolation(expr, True, translation)
+                default_marker = self.default_marker
+
+            # If the expression is non-trivial, the attribute is
+            # dynamic (computed).
+            elif expr is not None:
+                if name in self.boolean_attributes:
+                    value = nodes.Boolean(expr, name)
+                else:
+                    if text is not None:
+                        default = default_marker
+                    else:
+                        default = None
+
+                    value = nodes.Substitution(expr, char_escape, default)
+
+            # Otherwise, it's a static attribute.
+            else:
+                value = ast.Str(s=text)
+                if msgid is missing and implicit_i18n:
+                    msgid = text
+
+            # If translation is required, wrap in a translation
+            # clause
+            if msgid is not missing:
+                value = nodes.Translate(msgid, value)
+
+            space = self._maybe_trim(space)
+            attribute = nodes.Attribute(name, value, quote, eq, space)
+
+            if not isinstance(value, ast.Str):
+                # Always define a ``default`` alias for non-static
+                # expressions.
+                attribute = nodes.Define(
+                    [nodes.Alias(["default"], default_marker)],
+                    attribute,
+                    )
+
+            attributes.append(attribute)
+
+        return attributes
+
+    def _create_static_attributes(self, prepared):
+        static_attrs = {}
+
+        for name, text, quote, space, eq, expr in prepared:
+            static_attrs[name] = text if text is not None else expr
+
+        return Static(parse(repr(static_attrs)).body)
+
+    def _maybe_trim(self, string):
+        if self.trim_attribute_space:
+            return re_trim.sub(" ", string)
+
+        return string
diff --git a/lib/Chameleon-2.9.2/src/chameleon/zpt/template.py b/lib/Chameleon-2.9.2/src/chameleon/zpt/template.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/chameleon/zpt/template.py
@@ -0,0 +1,409 @@
+try:
+    import ast
+except ImportError:
+    from chameleon import ast24 as ast
+
+from functools import partial
+from os.path import dirname
+
+from ..i18n import fast_translate
+from ..tales import PythonExpr
+from ..tales import StringExpr
+from ..tales import NotExpr
+from ..tales import ExistsExpr
+from ..tales import ImportExpr
+from ..tales import ProxyExpr
+from ..tales import StructureExpr
+from ..tales import ExpressionParser
+
+from ..tal import RepeatDict
+
+from ..template import BaseTemplate
+from ..template import BaseTemplateFile
+from ..compiler import ExpressionEngine
+from ..loader import TemplateLoader
+from ..astutil import Builtin
+from ..utils import decode_string
+from ..utils import string_type
+
+from .program import MacroProgram
+
+try:
+    bytes
+except NameError:
+    bytes = str
+
+
+class PageTemplate(BaseTemplate):
+    """Constructor for the page template language.
+
+    Takes a string input as the only positional argument::
+
+      template = PageTemplate("<div>Hello, ${name}.</div>")
+
+    Configuration (keyword arguments):
+
+      ``default_expression``
+
+        Set the default expression type. The default setting is
+        ``python``.
+
+      ``encoding``
+
+        The default text substitution value is a unicode string on
+        Python 2 or simply string on Python 3.
+
+        Pass an encoding to allow encoded byte string input
+        (e.g. UTF-8).
+
+      ``literal_false``
+
+        Attributes are not dropped for a value of ``False``. Instead,
+        the value is coerced to a string.
+
+        This setting exists to provide compatibility with the
+        reference implementation.
+
+      ``boolean_attributes``
+
+        Attributes included in this set are treated as booleans: if a
+        true value is provided, the attribute value is the attribute
+        name, e.g.::
+
+            boolean_attributes = {"selected"}
+
+        If we insert an attribute with the name "selected" and
+        provide a true value, the attribute will be rendered::
+
+            selected="selected"
+
+        If a false attribute is provided (including the empty string),
+        the attribute is dropped.
+
+        The special return value ``default`` drops or inserts the
+        attribute based on the value element attribute value.
+
+      ``translate``
+
+        Use this option to set a translation function.
+
+        Example::
+
+          def translate(msgid, domain=None, mapping=None, default=None, context=None):
+              ...
+              return translation
+
+        Note that if ``target_language`` is provided at render time,
+        the translation function must support this argument.
+
+      ``implicit_i18n_translate``
+
+        Enables implicit translation for text appearing inside
+        elements. Default setting is ``False``.
+
+        While implicit translation does work for text that includes
+        expression interpolation, each expression must be simply a
+        variable name (e.g. ``${foo}``); otherwise, the text will not
+        be marked for translation.
+
+      ``implicit_i18n_attributes``
+
+        Any attribute contained in this set will be marked for
+        implicit translation. Each entry must be a lowercase string.
+
+        Example::
+
+          implicit_i18n_attributes = set(['alt', 'title'])
+
+      ``strict``
+
+        Enabled by default. If disabled, expressions are only required
+        to be valid at evaluation time.
+
+        This setting exists to provide compatibility with the
+        reference implementation which compiles expressions at
+        evaluation time.
+
+      ``trim_attribute_space``
+
+        If set, additional attribute whitespace will be stripped.
+
+    Output is unicode on Python 2 and string on Python 3.
+    """
+
+    expression_types = {
+        'python': PythonExpr,
+        'string': StringExpr,
+        'not': NotExpr,
+        'exists': ExistsExpr,
+        'import': ImportExpr,
+        'structure': StructureExpr,
+        }
+
+    default_expression = 'python'
+
+    translate = staticmethod(fast_translate)
+
+    encoding = None
+
+    boolean_attributes = set()
+
+    literal_false = False
+
+    mode = "xml"
+
+    implicit_i18n_translate = False
+
+    implicit_i18n_attributes = set()
+
+    trim_attribute_space = False
+
+    def __init__(self, body, **config):
+        self.macros = Macros(self)
+        super(PageTemplate, self).__init__(body, **config)
+
+    def __getitem__(self, name):
+        return self.macros[name]
+
+    @property
+    def builtins(self):
+        return self._builtins()
+
+    @property
+    def engine(self):
+        if self.literal_false:
+            default_marker = ast.Str(s="__default__")
+        else:
+            default_marker = Builtin("False")
+
+        return partial(
+            ExpressionEngine,
+            self.expression_parser,
+            default_marker=default_marker,
+            )
+
+    @property
+    def expression_parser(self):
+        return ExpressionParser(self.expression_types, self.default_expression)
+
+    def parse(self, body):
+        if self.literal_false:
+            default_marker = ast.Str(s="__default__")
+        else:
+            default_marker = Builtin("False")
+
+        return MacroProgram(
+            body, self.mode, self.filename,
+            escape=True if self.mode == "xml" else False,
+            default_marker=default_marker,
+            boolean_attributes=self.boolean_attributes,
+            implicit_i18n_translate=self.implicit_i18n_translate,
+            implicit_i18n_attributes=self.implicit_i18n_attributes,
+            trim_attribute_space=self.trim_attribute_space,
+            )
+
+    def render(self, encoding=None, translate=None, **vars):
+        """Render template to string.
+
+        The ``encoding`` and ``translate`` arguments are documented in
+        the template class constructor. If passed to this method, they
+        are used instead of the class defaults.
+
+        Additional arguments:
+
+          ``target_language``
+
+            This argument will be partially applied to the translation
+            function.
+
+            An alternative is thus to simply provide a custom
+            translation function which includes this information or
+            relies on a different mechanism.
+
+        """
+
+        non_trivial_translate = translate is not None
+        translate = translate if non_trivial_translate else self.translate or \
+                    type(self).translate
+
+        # Curry language parameter if non-trivial
+        target_language = vars.get('target_language')
+        if target_language is not None:
+            translate = partial(translate, target_language=target_language)
+
+        encoding = encoding if encoding is not None else self.encoding
+        if encoding is not None:
+            txl = translate
+
+            def translate(msgid, **kwargs):
+                if isinstance(msgid, bytes):
+                    msgid = decode_string(msgid, encoding)
+                return txl(msgid, **kwargs)
+
+            def decode(inst):
+                return decode_string(inst, encoding, 'ignore')
+        else:
+            decode = decode_string
+
+        setdefault = vars.setdefault
+        setdefault("__translate", translate)
+        setdefault("__convert", translate)
+        setdefault("__decode", decode)
+
+        if non_trivial_translate:
+            vars['translate'] = translate
+
+        # Make sure we have a repeat dictionary
+        if 'repeat' not in vars: vars['repeat'] = RepeatDict({})
+
+        return super(PageTemplate, self).render(**vars)
+
+    def include(self, *args, **kwargs):
+        self.cook_check()
+        self._render(*args, **kwargs)
+
+    def _builtins(self):
+        return {
+            'template': self,
+            'macros': self.macros,
+            'nothing': None,
+            }
+
+
+class PageTemplateFile(PageTemplate, BaseTemplateFile):
+    """File-based constructor.
+
+    Takes a string input as the only positional argument::
+
+      template = PageTemplateFile(absolute_path)
+
+    Note that the file-based template class comes with the expression
+    type ``load`` which loads templates relative to the provided
+    filename.
+
+    Below are listed the configuration arguments specific to
+    file-based templates; see the string-based template class for
+    general options and documentation:
+
+    Configuration (keyword arguments):
+
+      ``loader_class``
+
+        The provided class will be used to create the template loader
+        object. The default implementation supports relative and
+        absolute path specs.
+
+        The class must accept keyword arguments ``search_path``
+        (sequence of paths to search for relative a path spec) and
+        ``default_extension`` (if provided, this should be added to
+        any path spec).
+
+      ``prepend_relative_search_path``
+
+        Inserts the path relative to the provided template file path
+        into the template search path.
+
+        The default setting is ``True``.
+
+      ``search_path``
+
+        If provided, this is used as the search path for the ``load:``
+        expression. It must be a string or an iterable yielding a
+        sequence of strings.
+
+    """
+
+    expression_types = PageTemplate.expression_types.copy()
+    expression_types['load'] = partial(ProxyExpr, '__loader')
+
+    prepend_relative_search_path = True
+
+    def __init__(self, filename, search_path=None, loader_class=TemplateLoader,
+                 **config):
+        super(PageTemplateFile, self).__init__(filename, **config)
+
+        if search_path is None:
+            search_path = []
+        else:
+            if isinstance(search_path, string_type):
+                search_path = [search_path]
+            else:
+                search_path = list(search_path)
+
+        # If the flag is set (this is the default), prepend the path
+        # relative to the template file to the search path
+        if self.prepend_relative_search_path:
+            path = dirname(self.filename)
+            search_path.insert(0, path)
+
+        loader = loader_class(search_path=search_path, **config)
+        template_class = type(self)
+
+        # Bind relative template loader instance to the same template
+        # class, providing the same keyword arguments.
+        self._loader = loader.bind(template_class)
+
+    def _builtins(self):
+        d = super(PageTemplateFile, self)._builtins()
+        d['__loader'] = self._loader
+        return d
+
+
+class PageTextTemplate(PageTemplate):
+    """Text-based template class.
+
+    Takes a non-XML input::
+
+      template = PageTextTemplate("Hello, ${name}.")
+
+    This is similar to the standard library class ``string.Template``,
+    but uses the expression engine to substitute variables.
+    """
+
+    mode = "text"
+
+
+class PageTextTemplateFile(PageTemplateFile):
+    """File-based constructor."""
+
+    mode = "text"
+
+    def render(self, **vars):
+        result = super(PageTextTemplateFile, self).render(**vars)
+        return result.encode(self.encoding or 'utf-8')
+
+
+class Macro(object):
+    __slots__ = "include",
+
+    def __init__(self, render):
+        self.include = render
+
+
+class Macros(object):
+    __slots__ = "template",
+
+    def __init__(self, template):
+        self.template = template
+
+    def __getitem__(self, name):
+        name = name.replace('-', '_')
+        self.template.cook_check()
+
+        try:
+            function = getattr(self.template, "_render_%s" % name)
+        except AttributeError:
+            raise KeyError(
+                "Macro does not exist: '%s'." % name)
+
+        return Macro(function)
+
+    @property
+    def names(self):
+        self.template.cook_check()
+
+        result = []
+        for name in self.template.__dict__:
+            if name.startswith('_render_'):
+                result.append(name[8:])
+        return result
diff --git a/lib/Chameleon-2.9.2/src/ordereddict.py b/lib/Chameleon-2.9.2/src/ordereddict.py
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/src/ordereddict.py
@@ -0,0 +1,127 @@
+# Copyright (c) 2009 Raymond Hettinger
+#
+# 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 the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+#     The above copyright notice and this permission notice shall be
+#     included in all copies or substantial portions of the Software.
+#
+#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#     OTHER DEALINGS IN THE SOFTWARE.
+
+from UserDict import DictMixin
+
+class OrderedDict(dict, DictMixin):
+
+    def __init__(self, *args, **kwds):
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__end
+        except AttributeError:
+            self.clear()
+        self.update(*args, **kwds)
+
+    def clear(self):
+        self.__end = end = []
+        end += [None, end, end]         # sentinel node for doubly linked list
+        self.__map = {}                 # key --> [key, prev, next]
+        dict.clear(self)
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            end = self.__end
+            curr = end[1]
+            curr[2] = end[1] = self.__map[key] = [key, curr, end]
+        dict.__setitem__(self, key, value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        key, prev, next = self.__map.pop(key)
+        prev[2] = next
+        next[1] = prev
+
+    def __iter__(self):
+        end = self.__end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.__end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def popitem(self, last=True):
+        if not self:
+            raise KeyError('dictionary is empty')
+        if last:
+            key = reversed(self).next()
+        else:
+            key = iter(self).next()
+        value = self.pop(key)
+        return key, value
+
+    def __reduce__(self):
+        items = [[k, self[k]] for k in self]
+        tmp = self.__map, self.__end
+        del self.__map, self.__end
+        inst_dict = vars(self).copy()
+        self.__map, self.__end = tmp
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def keys(self):
+        return list(self)
+
+    setdefault = DictMixin.setdefault
+    update = DictMixin.update
+    pop = DictMixin.pop
+    values = DictMixin.values
+    items = DictMixin.items
+    iterkeys = DictMixin.iterkeys
+    itervalues = DictMixin.itervalues
+    iteritems = DictMixin.iteritems
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, self.items())
+
+    def copy(self):
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedDict):
+            if len(self) != len(other):
+                return False
+            for p, q in  zip(self.items(), other.items()):
+                if p != q:
+                    return False
+            return True
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other
diff --git a/lib/Chameleon-2.9.2/tox.ini b/lib/Chameleon-2.9.2/tox.ini
new file mode 100644
--- /dev/null
+++ b/lib/Chameleon-2.9.2/tox.ini
@@ -0,0 +1,53 @@
+[tox]
+envlist = 
+    py25,py26,py27,py32,pypy,cover
+
+[testenv:py25]
+commands = 
+   python setup.py test -q
+deps = 
+    ordereddict
+    unittest2
+    distribute
+
+[testenv:py26]
+commands = 
+   python setup.py test -q
+deps = 
+    ordereddict
+    unittest2
+    distribute
+
+[testenv:py27]
+commands = 
+   python setup.py test -q
+deps = 
+    distribute
+
+[testenv:py32]
+commands = 
+   python setup.py test -q
+deps = 
+    distribute
+
+[testenv:pypy]
+commands = 
+   python setup.py test -q
+deps = 
+    ordereddict
+    unittest2
+    distribute
+
+[testenv:cover]
+basepython =
+    python2.6
+commands = 
+    python setup.py nosetests --with-xunit --with-xcoverage
+deps =
+    nose
+    coverage==3.4
+    nosexcover
+    ordereddict
+    unittest2
+    distribute
+
diff --git a/make_perf3.sh b/make_perf3.sh
--- a/make_perf3.sh
+++ b/make_perf3.sh
@@ -31,9 +31,12 @@
 ${CONVERT} perf.py
 
 # Libraries that are Python 3 compatible as-is.
-SAFE_LIBS_AS_IS="pathlib"
+SAFE_LIBS_AS_IS="Chameleon-2.9.2 pathlib"
 # Libraries that work with Python 3 after passing through 2to3.
 SAFE_LIBS_TO_TRANSLATE="2to3 mako-0.3.6 mako-0.7.2"
+# Libraries whose source is Python 3 only.
+SAFE_LIBS_PORTED=""
+
 mkdir lib
 for safe_lib in ${SAFE_LIBS_AS_IS}; do
   cp -a "${srcdir}/lib/${safe_lib}" lib/${safe_lib}
@@ -44,6 +47,10 @@
   ${CONVERT} lib/${safe_lib}
 done
 
+for safe_lib in ${SAFE_LIBS_PORTED}; do
+  cp -a "${srcdir}/lib3/${safe_lib}" lib/${safe_lib}
+done
+
 cp -a "${srcdir}/performance" performance
 
 # The 2to3 benchmark looks for sample data to run over behind the
diff --git a/perf.py b/perf.py
--- a/perf.py
+++ b/perf.py
@@ -1329,6 +1329,17 @@
     return SimpleBenchmark(MeasureBzrStartup, *args, **kwargs)
 
 
+def MeasureChameleon(python, options):
+    bm_path = Relative("performance/bm_chameleon.py", python, options)
+    lib_path = Relative("lib/Chameleon-2.9.2/src", python, options)
+    bm_env = {"PYTHONPATH": lib_path}
+    return MeasureGeneric(python, options, bm_path, bm_env, iteration_scaling=3)
+
+
+def BM_Chameleon(*args, **kwargs):
+    return SimpleBenchmark(MeasureChameleon, *args, **kwargs)
+
+
 DJANGO_DIR = Relative("lib/django")
 
 
@@ -2082,7 +2093,8 @@
                 "serialize": ["slowpickle", "slowunpickle",  # Not for Python 3
                               "fastpickle", "fastunpickle",
                               "json_dump_v2", "json_load"],
-                "apps": ["2to3", "html5lib", "rietveld", "spambayes"],
+                "apps": ["2to3", "chameleon", "html5lib", "rietveld",
+                         "spambayes"],
                 "calls": ["call_simple", "call_method", "call_method_slots",
                           "call_method_unknown"],
                 "math": ["float", "nbody", "pidigits"],
@@ -2090,7 +2102,7 @@
                 "logging": ["silent_logging", "simple_logging",
                             "formatted_logging"],
                 # Benchmarks natively 2.x- and 3.x-compatible
-                "2n3": ["calls", "chaos", "fannkuch", "fastpickle",
+                "2n3": ["calls", "chameleon", "chaos", "fannkuch", "fastpickle",
                         "fastunpickle", "go", "hexiom2", "json_dump_v2",
                         "json_load", "math", "logging", "meteor_contest",
                         "normal_startup", "nqueens", "pathlib", "raytrace",
diff --git a/performance/bm_chameleon.py b/performance/bm_chameleon.py
new file mode 100644
--- /dev/null
+++ b/performance/bm_chameleon.py
@@ -0,0 +1,40 @@
+
+from chameleon import PageTemplate
+
+import compat
+
+BIGTABLE_ZPT = """\
+<table xmlns="http://www.w3.org/1999/xhtml"
+xmlns:tal="http://xml.zope.org/namespaces/tal">
+<tr tal:repeat="row python: options['table']">
+<td tal:repeat="c python: row.values()">
+<span tal:define="d python: c + 1"
+tal:attributes="class python: 'column-' + %s(d)"
+tal:content="python: d" />
+</td>
+</tr>
+</table>""" % compat.unicode.__name__
+
+def main(n):
+    tmpl = PageTemplate(BIGTABLE_ZPT)
+    options = {'table': [dict(a=1, b=2, c=3, d=4, e=5, f=6, g=7, h=8, i=9, j=10)
+                         for x in range(1000)]}
+    import time
+    l = []
+    for k in range(n):
+        t0 = time.time()
+        tmpl(options=options)
+        l.append(time.time() - t0)
+    return l
+
+if __name__ == '__main__':
+    import util, optparse
+    parser = optparse.OptionParser(
+        usage="%prog [options]",
+        description="Test the performance of the Go benchmark")
+    util.add_standard_options_to(parser)
+    options, args = parser.parse_args()
+
+    util.run_benchmark(options, options.num_runs, main)
+
+

-- 
Repository URL: http://hg.python.org/benchmarks

From python-checkins at python.org  Tue Sep 25 17:04:14 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:04:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_use_modern_con?=
	=?utf-8?q?ditional_syntax?=
Message-ID: <3XR5Cf2zXhzQnT@mail.python.org>

http://hg.python.org/cpython/rev/48b738bc1045
changeset:   79169:48b738bc1045
branch:      3.2
parent:      79166:b738e42e664a
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:01:41 2012 -0400
summary:
  use modern conditional syntax

files:
  Lib/test/test_import.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -575,7 +575,7 @@
         self.assertTrue(os.path.exists('__pycache__'))
         self.assertTrue(os.path.exists(os.path.join(
             '__pycache__', '{}.{}.py{}'.format(
-            TESTFN, self.tag, __debug__ and 'c' or 'o'))))
+            TESTFN, self.tag, 'c' if __debug__ else 'o'))))
 
     @unittest.skipUnless(os.name == 'posix',
                          "test meaningful only on posix systems")

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:04:17 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:04:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4y?=
Message-ID: <3XR5Cj12DfzQlt@mail.python.org>

http://hg.python.org/cpython/rev/856c12dd1deb
changeset:   79170:856c12dd1deb
parent:      79168:e4e7cca4dc39
parent:      79169:48b738bc1045
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:03:27 2012 -0400
summary:
  merge 3.2

files:
  Lib/test/test_import.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -591,7 +591,7 @@
         self.assertTrue(os.path.exists('__pycache__'))
         self.assertTrue(os.path.exists(os.path.join(
             '__pycache__', '{}.{}.py{}'.format(
-            TESTFN, self.tag, __debug__ and 'c' or 'o'))))
+            TESTFN, self.tag, 'c' if __debug__ else 'o'))))
 
     @unittest.skipUnless(os.name == 'posix',
                          "test meaningful only on posix systems")

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:17:41 2012
From: python-checkins at python.org (stefan.krah)
Date: Tue, 25 Sep 2012 17:17:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Restore_the_benchmark_orde?=
 =?utf-8?q?r_to_avoid_waiting_for_decimal=2Epy_if_just_the?=
Message-ID: <3XR5W91QSGzPjZ@mail.python.org>

http://hg.python.org/cpython/rev/78061bb4f9c1
changeset:   79171:78061bb4f9c1
parent:      79168:e4e7cca4dc39
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Sep 25 17:07:55 2012 +0200
summary:
  Restore the benchmark order to avoid waiting for decimal.py if just the
prec=9 test is used.

files:
  Modules/_decimal/tests/bench.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -70,11 +70,12 @@
 print("#                   Calculating pi, 10000 iterations")
 print("# ======================================================================\n")
 
+to_benchmark = [pi_float, pi_decimal]
+if C is not None:
+    to_benchmark.insert(1, pi_cdecimal)
+
 for prec in [9, 19]:
     print("\nPrecision: %d decimal digits\n" % prec)
-    to_benchmark = [pi_float, pi_decimal]
-    if C is not None:
-        to_benchmark.append(pi_cdecimal)
     for func in to_benchmark:
         start = time.time()
         if C is not None:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:17:42 2012
From: python-checkins at python.org (stefan.krah)
Date: Tue, 25 Sep 2012 17:17:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2Uu?=
Message-ID: <3XR5WB6CLNzQZt@mail.python.org>

http://hg.python.org/cpython/rev/9b83fac9a0cb
changeset:   79172:9b83fac9a0cb
parent:      79171:78061bb4f9c1
parent:      79170:856c12dd1deb
user:        Stefan Krah <skrah at bytereef.org>
date:        Tue Sep 25 17:10:02 2012 +0200
summary:
  Merge.

files:
  Lib/test/test_import.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -591,7 +591,7 @@
         self.assertTrue(os.path.exists('__pycache__'))
         self.assertTrue(os.path.exists(os.path.join(
             '__pycache__', '{}.{}.py{}'.format(
-            TESTFN, self.tag, __debug__ and 'c' or 'o'))))
+            TESTFN, self.tag, 'c' if __debug__ else 'o'))))
 
     @unittest.skipUnless(os.name == 'posix',
                          "test meaningful only on posix systems")

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:23:17 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:23:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_don=27t_depend_on_=5F=5Fde?=
 =?utf-8?q?bug=5F=5F_because_it=27s_baked_in_at_freeze_time_=28issue_=2316?=
 =?utf-8?q?046=29?=
Message-ID: <3XR5dd1CFWzQpL@mail.python.org>

http://hg.python.org/cpython/rev/4de5e4ec3cff
changeset:   79173:4de5e4ec3cff
parent:      79170:856c12dd1deb
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:22:59 2012 -0400
summary:
  don't depend on __debug__ because it's baked in at freeze time (issue #16046)

files:
  Lib/importlib/_bootstrap.py |    17 +-
  Misc/NEWS                   |     2 +
  Python/importlib.h          |  8533 +++++++++++-----------
  3 files changed, 4282 insertions(+), 4270 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -411,25 +411,21 @@
 
 DEBUG_BYTECODE_SUFFIXES = ['.pyc']
 OPTIMIZED_BYTECODE_SUFFIXES = ['.pyo']
-if __debug__:
-    BYTECODE_SUFFIXES = DEBUG_BYTECODE_SUFFIXES
-else:
-    BYTECODE_SUFFIXES = OPTIMIZED_BYTECODE_SUFFIXES
 
 def cache_from_source(path, debug_override=None):
     """Given the path to a .py file, return the path to its .pyc/.pyo file.
 
     The .py file does not need to exist; this simply returns the path to the
     .pyc/.pyo file calculated as if the .py file were imported.  The extension
-    will be .pyc unless __debug__ is not defined, then it will be .pyo.
+    will be .pyc unless sys.flags.optimize is non-zero, then it will be .pyo.
 
     If debug_override is not None, then it must be a boolean and is taken as
-    the value of __debug__ instead.
+    the value of bool(sys.flags.optimize) instead.
 
     If sys.implementation.cache_tag is None then NotImplementedError is raised.
 
     """
-    debug = __debug__ if debug_override is None else debug_override
+    debug = not sys.flags.optimize if debug_override is None else debug_override
     if debug:
         suffixes = DEBUG_BYTECODE_SUFFIXES
     else:
@@ -1688,10 +1684,15 @@
     modules, those two modules must be explicitly passed in.
 
     """
-    global _imp, sys
+    global _imp, sys, BYTECODE_SUFFIXES
     _imp = _imp_module
     sys = sys_module
 
+    if sys.flags.optimize:
+        BYTECODE_SUFFIXES = OPTIMIZED_BYTECODE_SUFFIXES
+    else:
+        BYTECODE_SUFFIXES = DEBUG_BYTECODE_SUFFIXES
+
     for module in (_imp, sys):
         if not hasattr(module, '__loader__'):
             module.__loader__ = BuiltinImporter
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16046: Fix loading sourceless legacy pyos.
+
 - Issue #15379: Fix passing of non-BMP characters as integers for the charmap
   decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
 
diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:23:19 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:23:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XR5dg4JGdzQmp@mail.python.org>

http://hg.python.org/cpython/rev/8f793481adf5
changeset:   79174:8f793481adf5
parent:      79173:4de5e4ec3cff
parent:      79172:9b83fac9a0cb
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:23:09 2012 -0400
summary:
  merge heads

files:
  Modules/_decimal/tests/bench.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -70,11 +70,12 @@
 print("#                   Calculating pi, 10000 iterations")
 print("# ======================================================================\n")
 
+to_benchmark = [pi_float, pi_decimal]
+if C is not None:
+    to_benchmark.insert(1, pi_cdecimal)
+
 for prec in [9, 19]:
     print("\nPrecision: %d decimal digits\n" % prec)
-    to_benchmark = [pi_float, pi_decimal]
-    if C is not None:
-        to_benchmark.append(pi_cdecimal)
     for func in to_benchmark:
         start = time.time()
         if C is not None:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:54:16 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:54:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogZml4IHRlc3RfY29t?=
 =?utf-8?q?pileall_when_run_with_-O=5BO=5D?=
Message-ID: <3XR6KN4DX2zQqd@mail.python.org>

http://hg.python.org/cpython/rev/6bd658a63594
changeset:   79175:6bd658a63594
branch:      3.2
parent:      79169:48b738bc1045
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:42:35 2012 -0400
summary:
  fix test_compileall when run with -O[O]

files:
  Lib/test/test_compileall.py |  16 ++++++++++++----
  1 files changed, 12 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -134,15 +134,21 @@
 class CommandLineTests(unittest.TestCase):
     """Test compileall's CLI."""
 
+    def _get_run_args(self, args):
+        interp_args = ['-S']
+        if sys.flags.optimize:
+            interp_args.append({1 : '-O', 2 : '-OO'}[sys.flags.optimize])
+        return interp_args + ['-m', 'compileall'] + list(args)
+
     def assertRunOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_ok(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                         *self._get_run_args(args), **env_vars)
         self.assertEqual(b'', err)
         return out
 
     def assertRunNotOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_failure(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                        *self._get_run_args(args), **env_vars)
         return rc, out, err
 
     def assertCompiled(self, fn):
@@ -198,7 +204,9 @@
         self.assertRunOK('-b', '-q', self.pkgdir)
         # Verify the __pycache__ directory contents.
         self.assertFalse(os.path.exists(self.pkgdir_cachedir))
-        expected = sorted(['__init__.py', '__init__.pyc', 'bar.py', 'bar.pyc'])
+        opt = 'c' if __debug__ else 'o'
+        expected = sorted(['__init__.py', '__init__.py' + opt, 'bar.py',
+                           'bar.py' + opt])
         self.assertEqual(sorted(os.listdir(self.pkgdir)), expected)
 
     def test_multiple_runs(self):
@@ -326,7 +334,7 @@
         f2 = script_helper.make_script(self.pkgdir, 'f2', '')
         f3 = script_helper.make_script(self.pkgdir, 'f3', '')
         f4 = script_helper.make_script(self.pkgdir, 'f4', '')
-        p = script_helper.spawn_python('-m', 'compileall', '-i', '-')
+        p = script_helper.spawn_python(*(self._get_run_args(()) + ['-i', '-']))
         p.stdin.write((f3+os.linesep).encode('ascii'))
         script_helper.kill_python(p)
         self.assertNotCompiled(f1)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:54:18 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:54:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_switch_asserti?=
 =?utf-8?q?on_to_an_explicit_ValueError?=
Message-ID: <3XR6KQ22VvzQr3@mail.python.org>

http://hg.python.org/cpython/rev/fdd70fa50a6d
changeset:   79176:fdd70fa50a6d
branch:      3.2
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:48:50 2012 -0400
summary:
  switch assertion to an explicit ValueError

files:
  Lib/lib2to3/fixer_util.py |  4 ++--
  Lib/lib2to3/refactor.py   |  2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py
--- a/Lib/lib2to3/fixer_util.py
+++ b/Lib/lib2to3/fixer_util.py
@@ -274,9 +274,9 @@
     """Find the top level namespace."""
     # Scamper up to the top level namespace
     while node.type != syms.file_input:
-        assert node.parent, "Tree is insane! root found before "\
-                           "file_input node was found."
         node = node.parent
+        if not node:
+            raise ValueError("root found before file_input node was found.")
     return node
 
 def does_tree_import(package, name, node):
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -445,7 +445,7 @@
 
                         try:
                             find_root(node)
-                        except AssertionError:
+                        except ValueError:
                             # this node has been cut off from a
                             # previous transformation ; skip
                             continue

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:54:19 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:54:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4y?=
Message-ID: <3XR6KR6NBnzQZ1@mail.python.org>

http://hg.python.org/cpython/rev/78a6e9ecba0b
changeset:   79177:78a6e9ecba0b
parent:      79174:8f793481adf5
parent:      79176:fdd70fa50a6d
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:53:30 2012 -0400
summary:
  merge 3.2

files:
  Lib/lib2to3/fixer_util.py   |   4 ++--
  Lib/lib2to3/refactor.py     |   2 +-
  Lib/test/test_compileall.py |  16 ++++++++++++----
  3 files changed, 15 insertions(+), 7 deletions(-)


diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py
--- a/Lib/lib2to3/fixer_util.py
+++ b/Lib/lib2to3/fixer_util.py
@@ -274,9 +274,9 @@
     """Find the top level namespace."""
     # Scamper up to the top level namespace
     while node.type != syms.file_input:
-        assert node.parent, "Tree is insane! root found before "\
-                           "file_input node was found."
         node = node.parent
+        if not node:
+            raise ValueError("root found before file_input node was found.")
     return node
 
 def does_tree_import(package, name, node):
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -445,7 +445,7 @@
 
                         try:
                             find_root(node)
-                        except AssertionError:
+                        except ValueError:
                             # this node has been cut off from a
                             # previous transformation ; skip
                             continue
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -134,15 +134,21 @@
 class CommandLineTests(unittest.TestCase):
     """Test compileall's CLI."""
 
+    def _get_run_args(self, args):
+        interp_args = ['-S']
+        if sys.flags.optimize:
+            interp_args.append({1 : '-O', 2 : '-OO'}[sys.flags.optimize])
+        return interp_args + ['-m', 'compileall'] + list(args)
+
     def assertRunOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_ok(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                         *self._get_run_args(args), **env_vars)
         self.assertEqual(b'', err)
         return out
 
     def assertRunNotOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_failure(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                        *self._get_run_args(args), **env_vars)
         return rc, out, err
 
     def assertCompiled(self, fn):
@@ -198,7 +204,9 @@
         self.assertRunOK('-b', '-q', self.pkgdir)
         # Verify the __pycache__ directory contents.
         self.assertFalse(os.path.exists(self.pkgdir_cachedir))
-        expected = sorted(['__init__.py', '__init__.pyc', 'bar.py', 'bar.pyc'])
+        opt = 'c' if __debug__ else 'o'
+        expected = sorted(['__init__.py', '__init__.py' + opt, 'bar.py',
+                           'bar.py' + opt])
         self.assertEqual(sorted(os.listdir(self.pkgdir)), expected)
 
     def test_multiple_runs(self):
@@ -326,7 +334,7 @@
         f2 = script_helper.make_script(self.pkgdir, 'f2', '')
         f3 = script_helper.make_script(self.pkgdir, 'f3', '')
         f4 = script_helper.make_script(self.pkgdir, 'f4', '')
-        p = script_helper.spawn_python('-m', 'compileall', '-i', '-')
+        p = script_helper.spawn_python(*(self._get_run_args(()) + ['-i', '-']))
         p.stdin.write((f3+os.linesep).encode('ascii'))
         script_helper.kill_python(p)
         self.assertNotCompiled(f1)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 17:54:21 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 17:54:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_switch_asserti?=
 =?utf-8?q?on_to_an_explicit_ValueError?=
Message-ID: <3XR6KT3FzQzQpw@mail.python.org>

http://hg.python.org/cpython/rev/fd9ffd10f1c7
changeset:   79178:fd9ffd10f1c7
branch:      2.7
parent:      79165:b624059a8dac
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:48:50 2012 -0400
summary:
  switch assertion to an explicit ValueError

files:
  Lib/lib2to3/fixer_util.py |  4 ++--
  Lib/lib2to3/refactor.py   |  2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py
--- a/Lib/lib2to3/fixer_util.py
+++ b/Lib/lib2to3/fixer_util.py
@@ -274,9 +274,9 @@
     """Find the top level namespace."""
     # Scamper up to the top level namespace
     while node.type != syms.file_input:
-        assert node.parent, "Tree is insane! root found before "\
-                           "file_input node was found."
         node = node.parent
+        if not node:
+            raise ValueError("root found before file_input node was found.")
     return node
 
 def does_tree_import(package, name, node):
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -445,7 +445,7 @@
 
                         try:
                             find_root(node)
-                        except AssertionError:
+                        except ValueError:
                             # this node has been cut off from a
                             # previous transformation ; skip
                             continue

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 18:46:00 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Tue, 25 Sep 2012 18:46:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_raise_a_ValueError_instead?=
 =?utf-8?q?_of_an_AssertionError_when_pool_is_an_invalid_state?=
Message-ID: <3XR7T44GbnzQdM@mail.python.org>

http://hg.python.org/cpython/rev/d24b996d136e
changeset:   79179:d24b996d136e
parent:      79177:78a6e9ecba0b
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 12:45:42 2012 -0400
summary:
  raise a ValueError instead of an AssertionError when pool is an invalid state

files:
  Lib/multiprocessing/pool.py      |  15 ++++++++-------
  Lib/test/test_multiprocessing.py |   3 ++-
  2 files changed, 10 insertions(+), 8 deletions(-)


diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -225,7 +225,6 @@
         Apply `func` to each element in `iterable`, collecting the results
         in a list that is returned.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, mapstar, chunksize).get()
 
     def starmap(self, func, iterable, chunksize=None):
@@ -234,7 +233,6 @@
         be iterables as well and will be unpacked as arguments. Hence
         `func` and (a, b) becomes func(a, b).
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, starmapstar, chunksize).get()
 
     def starmap_async(self, func, iterable, chunksize=None, callback=None,
@@ -242,7 +240,6 @@
         '''
         Asynchronous version of `starmap()` method.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, starmapstar, chunksize,
                                callback, error_callback)
 
@@ -250,7 +247,8 @@
         '''
         Equivalent of `map()` -- can be MUCH slower than `Pool.map()`.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if chunksize == 1:
             result = IMapIterator(self._cache)
             self._taskqueue.put((((result._job, i, func, (x,), {})
@@ -268,7 +266,8 @@
         '''
         Like `imap()` method but ordering of results is arbitrary.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if chunksize == 1:
             result = IMapUnorderedIterator(self._cache)
             self._taskqueue.put((((result._job, i, func, (x,), {})
@@ -287,7 +286,8 @@
         '''
         Asynchronous version of `apply()` method.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         result = ApplyResult(self._cache, callback, error_callback)
         self._taskqueue.put(([(result._job, None, func, args, kwds)], None))
         return result
@@ -297,7 +297,6 @@
         '''
         Asynchronous version of `map()` method.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, mapstar, chunksize)
 
     def _map_async(self, func, iterable, mapper, chunksize=None, callback=None,
@@ -305,6 +304,8 @@
         '''
         Helper function to implement map, starmap and their async counterparts.
         '''
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if not hasattr(iterable, '__len__'):
             iterable = list(iterable)
 
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1727,7 +1727,8 @@
             with multiprocessing.Pool(2) as p:
                 r = p.map_async(sqr, L)
                 self.assertEqual(r.get(), expected)
-            self.assertRaises(AssertionError, p.map_async, sqr, L)
+            print(p._state)
+            self.assertRaises(ValueError, p.map_async, sqr, L)
 
 def raising():
     raise KeyError("key")

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:00:12 2012
From: python-checkins at python.org (giampaolo.rodola)
Date: Tue, 25 Sep 2012 21:00:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_fix_contextlib=2EExitStack?=
 =?utf-8?q?_typo_in_3=2E3=27s_whatsnew=2Erst?=
Message-ID: <3XRBRw3ZbxzQm8@mail.python.org>

http://hg.python.org/cpython/rev/2012e5e10147
changeset:   79180:2012e5e10147
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Tue Sep 25 12:00:04 2012 -0700
summary:
  fix contextlib.ExitStack typo in 3.3's whatsnew.rst

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1079,7 +1079,7 @@
 contextlib
 ----------
 
-:class:`~collections.ExitStack` now provides a solid foundation for
+:class:`~contextlib.ExitStack` now provides a solid foundation for
 programmatic manipulation of context managers and similar cleanup
 functionality. Unlike the previous ``contextlib.nested`` API (which was
 deprecated and removed), the new API is designed to work correctly

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:08:07 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Tue, 25 Sep 2012 21:08:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1MjIyOiB0ZXN0?=
 =?utf-8?q?=5Fmailbox=3A_End_message_template_in_a_newline?=
Message-ID: <3XRBd32ZGgzQlF@mail.python.org>

http://hg.python.org/cpython/rev/6451be0e374a
changeset:   79181:6451be0e374a
branch:      2.7
parent:      79178:fd9ffd10f1c7
user:        Petri Lehtinen <petri at digip.org>
date:        Tue Sep 25 21:48:51 2012 +0300
summary:
  #15222: test_mailbox: End message template in a newline

files:
  Lib/test/test_mailbox.py |  26 +++++++++++++-------------
  1 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -48,7 +48,7 @@
 class TestMailbox(TestBase):
 
     _factory = None     # Overridden by subclasses to reuse tests
-    _template = 'From: foo\n\n%s'
+    _template = 'From: foo\n\n%s\n'
 
     def setUp(self):
         self._path = test_support.TESTFN
@@ -137,7 +137,7 @@
         key0 = self._box.add(self._template % 0)
         msg = self._box.get(key0)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertIs(self._box.get('foo'), None)
         self.assertFalse(self._box.get('foo', False))
         self._box.close()
@@ -145,14 +145,14 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.fp.read(), '1')
+        self.assertEqual(msg.fp.read(), '1\n')
 
     def test_getitem(self):
         # Retrieve message using __getitem__()
         key0 = self._box.add(self._template % 0)
         msg = self._box[key0]
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertRaises(KeyError, lambda: self._box['foo'])
         self._box.discard(key0)
         self.assertRaises(KeyError, lambda: self._box[key0])
@@ -164,7 +164,7 @@
         msg0 = self._box.get_message(key0)
         self.assertIsInstance(msg0, mailbox.Message)
         self.assertEqual(msg0['from'], 'foo')
-        self.assertEqual(msg0.get_payload(), '0')
+        self.assertEqual(msg0.get_payload(), '0\n')
         self._check_sample(self._box.get_message(key1))
 
     def test_get_string(self):
@@ -333,15 +333,15 @@
         self.assertIn(key0, self._box)
         key1 = self._box.add(self._template % 1)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key0).get_payload(), '0')
+        self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
         self.assertNotIn(key0, self._box)
         self.assertIn(key1, self._box)
         key2 = self._box.add(self._template % 2)
         self.assertIn(key2, self._box)
-        self.assertEqual(self._box.pop(key2).get_payload(), '2')
+        self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
         self.assertNotIn(key2, self._box)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key1).get_payload(), '1')
+        self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
         self.assertNotIn(key1, self._box)
         self.assertEqual(len(self._box), 0)
 
@@ -530,7 +530,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), '')
-        self.assertEqual(msg_returned.get_payload(), '1')
+        self.assertEqual(msg_returned.get_payload(), '1\n')
         msg2 = mailbox.MaildirMessage(self._template % 2)
         msg2.set_info('2,S')
         self._box[key] = msg2
@@ -538,7 +538,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), 'S')
-        self.assertEqual(msg_returned.get_payload(), '3')
+        self.assertEqual(msg_returned.get_payload(), '3\n')
 
     def test_consistent_factory(self):
         # Add a message.
@@ -889,14 +889,14 @@
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
-        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_mbox_or_mmdf_message(self):
         # Add an mboxMessage or MMDFMessage
         for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
-            msg = class_('From foo at bar blah\nFrom: foo\n\n0')
+            msg = class_('From foo at bar blah\nFrom: foo\n\n0\n')
             key = self._box.add(msg)
 
     def test_open_close_open(self):

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:08:39 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Tue, 25 Sep 2012 21:08:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1MjIyOiBJbnNl?=
 =?utf-8?q?rt_blank_line_after_each_message_in_mbox_mailboxes?=
Message-ID: <3XRBdg0FlJzQqc@mail.python.org>

http://hg.python.org/cpython/rev/d903d4981e33
changeset:   79182:d903d4981e33
branch:      2.7
user:        Petri Lehtinen <petri at digip.org>
date:        Tue Sep 25 21:57:59 2012 +0300
summary:
  #15222: Insert blank line after each message in mbox mailboxes

files:
  Lib/mailbox.py           |  49 +++++++++++++++++++++++----
  Lib/test/test_mailbox.py |  23 +++++++++++++
  Misc/NEWS                |   2 +
  3 files changed, 66 insertions(+), 8 deletions(-)


diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -197,6 +197,9 @@
         """Flush and close the mailbox."""
         raise NotImplementedError('Method must be implemented by subclass')
 
+    # Whether each message must end in a newline
+    _append_newline = False
+
     def _dump_message(self, message, target, mangle_from_=False):
         # Most files are opened in binary mode to allow predictable seeking.
         # To get native line endings on disk, the user-friendly \n line endings
@@ -207,13 +210,21 @@
             gen = email.generator.Generator(buffer, mangle_from_, 0)
             gen.flatten(message)
             buffer.seek(0)
-            target.write(buffer.read().replace('\n', os.linesep))
+            data = buffer.read().replace('\n', os.linesep)
+            target.write(data)
+            if self._append_newline and not data.endswith(os.linesep):
+                # Make sure the message ends with a newline
+                target.write(os.linesep)
         elif isinstance(message, str):
             if mangle_from_:
                 message = message.replace('\nFrom ', '\n>From ')
             message = message.replace('\n', os.linesep)
             target.write(message)
+            if self._append_newline and not message.endswith(os.linesep):
+                # Make sure the message ends with a newline
+                target.write(os.linesep)
         elif hasattr(message, 'read'):
+            lastline = None
             while True:
                 line = message.readline()
                 if line == '':
@@ -222,6 +233,10 @@
                     line = '>From ' + line[5:]
                 line = line.replace('\n', os.linesep)
                 target.write(line)
+                lastline = line
+            if self._append_newline and lastline and not lastline.endswith(os.linesep):
+                # Make sure the message ends with a newline
+                target.write(os.linesep)
         else:
             raise TypeError('Invalid message type: %s' % type(message))
 
@@ -797,30 +812,48 @@
 
     _mangle_from_ = True
 
+    # All messages must end in a newline character, and
+    # _post_message_hooks outputs an empty line between messages.
+    _append_newline = True
+
     def __init__(self, path, factory=None, create=True):
         """Initialize an mbox mailbox."""
         self._message_factory = mboxMessage
         _mboxMMDF.__init__(self, path, factory, create)
 
-    def _pre_message_hook(self, f):
-        """Called before writing each message to file f."""
-        if f.tell() != 0:
-            f.write(os.linesep)
+    def _post_message_hook(self, f):
+        """Called after writing each message to file f."""
+        f.write(os.linesep)
 
     def _generate_toc(self):
         """Generate key-to-(start, stop) table of contents."""
         starts, stops = [], []
+        last_was_empty = False
         self._file.seek(0)
         while True:
             line_pos = self._file.tell()
             line = self._file.readline()
             if line.startswith('From '):
                 if len(stops) < len(starts):
+                    if last_was_empty:
+                        stops.append(line_pos - len(os.linesep))
+                    else:
+                        # The last line before the "From " line wasn't
+                        # blank, but we consider it a start of a
+                        # message anyway.
+                        stops.append(line_pos)
+                starts.append(line_pos)
+                last_was_empty = False
+            elif not line:
+                if last_was_empty:
                     stops.append(line_pos - len(os.linesep))
-                starts.append(line_pos)
-            elif line == '':
-                stops.append(line_pos)
+                else:
+                    stops.append(line_pos)
                 break
+            elif line == os.linesep:
+                last_was_empty = True
+            else:
+                last_was_empty = False
         self._toc = dict(enumerate(zip(starts, stops)))
         self._next_key = len(self._toc)
         self._file_length = self._file.tell()
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -1003,6 +1003,29 @@
             perms = st.st_mode
             self.assertFalse((perms & 0111)) # Execute bits should all be off.
 
+    def test_terminating_newline(self):
+        message = email.message.Message()
+        message['From'] = 'john at example.com'
+        message.set_payload('No newline at the end')
+        i = self._box.add(message)
+
+        # A newline should have been appended to the payload
+        message = self._box.get(i)
+        self.assertEqual(message.get_payload(), 'No newline at the end\n')
+
+    def test_message_separator(self):
+        # Check there's always a single blank line after each message
+        self._box.add('From: foo\n\n0')  # No newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+        self._box.add('From: foo\n\n0\n')  # Newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+
 class TestMMDF(_TestMboxMMDF, unittest.TestCase):
 
     _factory = lambda self, path, factory=None: mailbox.MMDF(path, factory)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,6 +107,8 @@
 Library
 -------
 
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
   Patch by Serhiy Storchaka.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:09:10 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Tue, 25 Sep 2012 21:09:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1MjIyOiB0ZXN0?=
 =?utf-8?q?=5Fmailbox=3A_End_message_template_in_a_newline?=
Message-ID: <3XRBfG5NRWzQqj@mail.python.org>

http://hg.python.org/cpython/rev/8adac3f03372
changeset:   79183:8adac3f03372
branch:      3.2
parent:      79176:fdd70fa50a6d
user:        Petri Lehtinen <petri at digip.org>
date:        Tue Sep 25 21:58:51 2012 +0300
summary:
  #15222: test_mailbox: End message template in a newline

files:
  Lib/test/test_mailbox.py |  30 ++++++++++++++--------------
  1 files changed, 15 insertions(+), 15 deletions(-)


diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -49,7 +49,7 @@
     maxDiff = None
 
     _factory = None     # Overridden by subclasses to reuse tests
-    _template = 'From: foo\n\n%s'
+    _template = 'From: foo\n\n%s\n'
 
     def setUp(self):
         self._path = support.TESTFN
@@ -228,7 +228,7 @@
         key0 = self._box.add(self._template % 0)
         msg = self._box.get(key0)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertIs(self._box.get('foo'), None)
         self.assertIs(self._box.get('foo', False), False)
         self._box.close()
@@ -236,14 +236,14 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '1')
+        self.assertEqual(msg.get_payload(), '1\n')
 
     def test_getitem(self):
         # Retrieve message using __getitem__()
         key0 = self._box.add(self._template % 0)
         msg = self._box[key0]
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertRaises(KeyError, lambda: self._box['foo'])
         self._box.discard(key0)
         self.assertRaises(KeyError, lambda: self._box[key0])
@@ -255,7 +255,7 @@
         msg0 = self._box.get_message(key0)
         self.assertIsInstance(msg0, mailbox.Message)
         self.assertEqual(msg0['from'], 'foo')
-        self.assertEqual(msg0.get_payload(), '0')
+        self.assertEqual(msg0.get_payload(), '0\n')
         self._check_sample(self._box.get_message(key1))
 
     def test_get_bytes(self):
@@ -428,15 +428,15 @@
         self.assertIn(key0, self._box)
         key1 = self._box.add(self._template % 1)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key0).get_payload(), '0')
+        self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
         self.assertNotIn(key0, self._box)
         self.assertIn(key1, self._box)
         key2 = self._box.add(self._template % 2)
         self.assertIn(key2, self._box)
-        self.assertEqual(self._box.pop(key2).get_payload(), '2')
+        self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
         self.assertNotIn(key2, self._box)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key1).get_payload(), '1')
+        self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
         self.assertNotIn(key1, self._box)
         self.assertEqual(len(self._box), 0)
 
@@ -631,7 +631,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), '')
-        self.assertEqual(msg_returned.get_payload(), '1')
+        self.assertEqual(msg_returned.get_payload(), '1\n')
         msg2 = mailbox.MaildirMessage(self._template % 2)
         msg2.set_info('2,S')
         self._box[key] = msg2
@@ -639,7 +639,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), 'S')
-        self.assertEqual(msg_returned.get_payload(), '3')
+        self.assertEqual(msg_returned.get_payload(), '3\n')
 
     def test_consistent_factory(self):
         # Add a message.
@@ -993,20 +993,20 @@
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
-        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_from_bytes(self):
         # Add a byte string starting with 'From ' to the mailbox
-        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_mbox_or_mmdf_message(self):
         # Add an mboxMessage or MMDFMessage
         for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
-            msg = class_('From foo at bar blah\nFrom: foo\n\n0')
+            msg = class_('From foo at bar blah\nFrom: foo\n\n0\n')
             key = self._box.add(msg)
 
     def test_open_close_open(self):

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:09:42 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Tue, 25 Sep 2012 21:09:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1MjIyOiBJbnNl?=
 =?utf-8?q?rt_blank_line_after_each_message_in_mbox_mailboxes?=
Message-ID: <3XRBft3rHKzQW4@mail.python.org>

http://hg.python.org/cpython/rev/f7615ee43318
changeset:   79184:f7615ee43318
branch:      3.2
user:        Petri Lehtinen <petri at digip.org>
date:        Tue Sep 25 22:00:32 2012 +0300
summary:
  #15222: Insert blank line after each message in mbox mailboxes

files:
  Lib/mailbox.py           |  46 +++++++++++++++++++++++----
  Lib/test/test_mailbox.py |  23 ++++++++++++++
  Misc/NEWS                |   2 +
  3 files changed, 64 insertions(+), 7 deletions(-)


diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -208,6 +208,9 @@
             raise ValueError("String input must be ASCII-only; "
                 "use bytes or a Message instead")
 
+    # Whether each message must end in a newline
+    _append_newline = False
+
     def _dump_message(self, message, target, mangle_from_=False):
         # This assumes the target file is open in binary mode.
         """Dump message contents to target file."""
@@ -219,6 +222,9 @@
             data = buffer.read()
             data = data.replace(b'\n', linesep)
             target.write(data)
+            if self._append_newline and not data.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif isinstance(message, (str, bytes, io.StringIO)):
             if isinstance(message, io.StringIO):
                 warnings.warn("Use of StringIO input is deprecated, "
@@ -230,11 +236,15 @@
                 message = message.replace(b'\nFrom ', b'\n>From ')
             message = message.replace(b'\n', linesep)
             target.write(message)
+            if self._append_newline and not message.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif hasattr(message, 'read'):
             if hasattr(message, 'buffer'):
                 warnings.warn("Use of text mode files is deprecated, "
                     "use a binary mode file instead", DeprecationWarning, 3)
                 message = message.buffer
+            lastline = None
             while True:
                 line = message.readline()
                 # Universal newline support.
@@ -248,6 +258,10 @@
                     line = b'>From ' + line[5:]
                 line = line.replace(b'\n', linesep)
                 target.write(line)
+                lastline = line
+            if self._append_newline and lastline and not lastline.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         else:
             raise TypeError('Invalid message type: %s' % type(message))
 
@@ -833,30 +847,48 @@
 
     _mangle_from_ = True
 
+    # All messages must end in a newline character, and
+    # _post_message_hooks outputs an empty line between messages.
+    _append_newline = True
+
     def __init__(self, path, factory=None, create=True):
         """Initialize an mbox mailbox."""
         self._message_factory = mboxMessage
         _mboxMMDF.__init__(self, path, factory, create)
 
-    def _pre_message_hook(self, f):
-        """Called before writing each message to file f."""
-        if f.tell() != 0:
-            f.write(linesep)
+    def _post_message_hook(self, f):
+        """Called after writing each message to file f."""
+        f.write(linesep)
 
     def _generate_toc(self):
         """Generate key-to-(start, stop) table of contents."""
         starts, stops = [], []
+        last_was_empty = False
         self._file.seek(0)
         while True:
             line_pos = self._file.tell()
             line = self._file.readline()
             if line.startswith(b'From '):
                 if len(stops) < len(starts):
+                    if last_was_empty:
+                        stops.append(line_pos - len(linesep))
+                    else:
+                        # The last line before the "From " line wasn't
+                        # blank, but we consider it a start of a
+                        # message anyway.
+                        stops.append(line_pos)
+                starts.append(line_pos)
+                last_was_empty = False
+            elif not line:
+                if last_was_empty:
                     stops.append(line_pos - len(linesep))
-                starts.append(line_pos)
-            elif not line:
-                stops.append(line_pos)
+                else:
+                    stops.append(line_pos)
                 break
+            elif line == linesep:
+                last_was_empty = True
+            else:
+                last_was_empty = False
         self._toc = dict(enumerate(zip(starts, stops)))
         self._next_key = len(self._toc)
         self._file_length = self._file.tell()
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -1113,6 +1113,29 @@
             perms = st.st_mode
             self.assertFalse((perms & 0o111)) # Execute bits should all be off.
 
+    def test_terminating_newline(self):
+        message = email.message.Message()
+        message['From'] = 'john at example.com'
+        message.set_payload('No newline at the end')
+        i = self._box.add(message)
+
+        # A newline should have been appended to the payload
+        message = self._box.get(i)
+        self.assertEqual(message.get_payload(), 'No newline at the end\n')
+
+    def test_message_separator(self):
+        # Check there's always a single blank line after each message
+        self._box.add('From: foo\n\n0')  # No newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+        self._box.add('From: foo\n\n0\n')  # Newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+
 class TestMMDF(_TestMboxMMDF, unittest.TestCase):
 
     _factory = lambda self, path, factory=None: mailbox.MMDF(path, factory)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,8 @@
 Library
 -------
 
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
   Patch by Serhiy Storchaka.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:10:14 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Tue, 25 Sep 2012 21:10:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?b?KTogIzE1MjIyOiBNZXJnZSAzLjI=?=
Message-ID: <3XRBgV2msTzQl5@mail.python.org>

http://hg.python.org/cpython/rev/4b626ccace1a
changeset:   79185:4b626ccace1a
parent:      79180:2012e5e10147
parent:      79184:f7615ee43318
user:        Petri Lehtinen <petri at digip.org>
date:        Tue Sep 25 22:03:35 2012 +0300
summary:
  #15222: Merge 3.2

files:
  Lib/mailbox.py           |  46 ++++++++++++++++++++---
  Lib/test/test_mailbox.py |  53 ++++++++++++++++++++-------
  Misc/NEWS                |   2 +
  3 files changed, 79 insertions(+), 22 deletions(-)


diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -208,6 +208,9 @@
             raise ValueError("String input must be ASCII-only; "
                 "use bytes or a Message instead")
 
+    # Whether each message must end in a newline
+    _append_newline = False
+
     def _dump_message(self, message, target, mangle_from_=False):
         # This assumes the target file is open in binary mode.
         """Dump message contents to target file."""
@@ -219,6 +222,9 @@
             data = buffer.read()
             data = data.replace(b'\n', linesep)
             target.write(data)
+            if self._append_newline and not data.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif isinstance(message, (str, bytes, io.StringIO)):
             if isinstance(message, io.StringIO):
                 warnings.warn("Use of StringIO input is deprecated, "
@@ -230,11 +236,15 @@
                 message = message.replace(b'\nFrom ', b'\n>From ')
             message = message.replace(b'\n', linesep)
             target.write(message)
+            if self._append_newline and not message.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif hasattr(message, 'read'):
             if hasattr(message, 'buffer'):
                 warnings.warn("Use of text mode files is deprecated, "
                     "use a binary mode file instead", DeprecationWarning, 3)
                 message = message.buffer
+            lastline = None
             while True:
                 line = message.readline()
                 # Universal newline support.
@@ -248,6 +258,10 @@
                     line = b'>From ' + line[5:]
                 line = line.replace(b'\n', linesep)
                 target.write(line)
+                lastline = line
+            if self._append_newline and lastline and not lastline.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         else:
             raise TypeError('Invalid message type: %s' % type(message))
 
@@ -833,30 +847,48 @@
 
     _mangle_from_ = True
 
+    # All messages must end in a newline character, and
+    # _post_message_hooks outputs an empty line between messages.
+    _append_newline = True
+
     def __init__(self, path, factory=None, create=True):
         """Initialize an mbox mailbox."""
         self._message_factory = mboxMessage
         _mboxMMDF.__init__(self, path, factory, create)
 
-    def _pre_message_hook(self, f):
-        """Called before writing each message to file f."""
-        if f.tell() != 0:
-            f.write(linesep)
+    def _post_message_hook(self, f):
+        """Called after writing each message to file f."""
+        f.write(linesep)
 
     def _generate_toc(self):
         """Generate key-to-(start, stop) table of contents."""
         starts, stops = [], []
+        last_was_empty = False
         self._file.seek(0)
         while True:
             line_pos = self._file.tell()
             line = self._file.readline()
             if line.startswith(b'From '):
                 if len(stops) < len(starts):
+                    if last_was_empty:
+                        stops.append(line_pos - len(linesep))
+                    else:
+                        # The last line before the "From " line wasn't
+                        # blank, but we consider it a start of a
+                        # message anyway.
+                        stops.append(line_pos)
+                starts.append(line_pos)
+                last_was_empty = False
+            elif not line:
+                if last_was_empty:
                     stops.append(line_pos - len(linesep))
-                starts.append(line_pos)
-            elif not line:
-                stops.append(line_pos)
+                else:
+                    stops.append(line_pos)
                 break
+            elif line == linesep:
+                last_was_empty = True
+            else:
+                last_was_empty = False
         self._toc = dict(enumerate(zip(starts, stops)))
         self._next_key = len(self._toc)
         self._file_length = self._file.tell()
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -53,7 +53,7 @@
     maxDiff = None
 
     _factory = None     # Overridden by subclasses to reuse tests
-    _template = 'From: foo\n\n%s'
+    _template = 'From: foo\n\n%s\n'
 
     def setUp(self):
         self._path = support.TESTFN
@@ -232,7 +232,7 @@
         key0 = self._box.add(self._template % 0)
         msg = self._box.get(key0)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertIs(self._box.get('foo'), None)
         self.assertIs(self._box.get('foo', False), False)
         self._box.close()
@@ -240,14 +240,14 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '1')
+        self.assertEqual(msg.get_payload(), '1\n')
 
     def test_getitem(self):
         # Retrieve message using __getitem__()
         key0 = self._box.add(self._template % 0)
         msg = self._box[key0]
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertRaises(KeyError, lambda: self._box['foo'])
         self._box.discard(key0)
         self.assertRaises(KeyError, lambda: self._box[key0])
@@ -259,7 +259,7 @@
         msg0 = self._box.get_message(key0)
         self.assertIsInstance(msg0, mailbox.Message)
         self.assertEqual(msg0['from'], 'foo')
-        self.assertEqual(msg0.get_payload(), '0')
+        self.assertEqual(msg0.get_payload(), '0\n')
         self._check_sample(self._box.get_message(key1))
 
     def test_get_bytes(self):
@@ -432,15 +432,15 @@
         self.assertIn(key0, self._box)
         key1 = self._box.add(self._template % 1)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key0).get_payload(), '0')
+        self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
         self.assertNotIn(key0, self._box)
         self.assertIn(key1, self._box)
         key2 = self._box.add(self._template % 2)
         self.assertIn(key2, self._box)
-        self.assertEqual(self._box.pop(key2).get_payload(), '2')
+        self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
         self.assertNotIn(key2, self._box)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key1).get_payload(), '1')
+        self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
         self.assertNotIn(key1, self._box)
         self.assertEqual(len(self._box), 0)
 
@@ -635,7 +635,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), '')
-        self.assertEqual(msg_returned.get_payload(), '1')
+        self.assertEqual(msg_returned.get_payload(), '1\n')
         msg2 = mailbox.MaildirMessage(self._template % 2)
         msg2.set_info('2,S')
         self._box[key] = msg2
@@ -643,7 +643,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), 'S')
-        self.assertEqual(msg_returned.get_payload(), '3')
+        self.assertEqual(msg_returned.get_payload(), '3\n')
 
     def test_consistent_factory(self):
         # Add a message.
@@ -996,20 +996,20 @@
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
-        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_from_bytes(self):
         # Add a byte string starting with 'From ' to the mailbox
-        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_mbox_or_mmdf_message(self):
         # Add an mboxMessage or MMDFMessage
         for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
-            msg = class_('From foo at bar blah\nFrom: foo\n\n0')
+            msg = class_('From foo at bar blah\nFrom: foo\n\n0\n')
             key = self._box.add(msg)
 
     def test_open_close_open(self):
@@ -1116,6 +1116,29 @@
             perms = st.st_mode
             self.assertFalse((perms & 0o111)) # Execute bits should all be off.
 
+    def test_terminating_newline(self):
+        message = email.message.Message()
+        message['From'] = 'john at example.com'
+        message.set_payload('No newline at the end')
+        i = self._box.add(message)
+
+        # A newline should have been appended to the payload
+        message = self._box.get(i)
+        self.assertEqual(message.get_payload(), 'No newline at the end\n')
+
+    def test_message_separator(self):
+        # Check there's always a single blank line after each message
+        self._box.add('From: foo\n\n0')  # No newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+        self._box.add('From: foo\n\n0\n')  # Newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+
 class TestMMDF(_TestMboxMMDF, unittest.TestCase):
 
     _factory = lambda self, path, factory=None: mailbox.MMDF(path, factory)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,8 @@
 Library
 -------
 
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
   Patch by Serhiy Storchaka.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:23:56 2012
From: python-checkins at python.org (brett.cannon)
Date: Tue, 25 Sep 2012 21:23:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Shift_a_deprecation_from_t?=
 =?utf-8?q?he_porting_section_to_the_deprecation_section=2E?=
Message-ID: <3XRBzJ0TLXzQmK@mail.python.org>

http://hg.python.org/cpython/rev/82b5c1f4d44d
changeset:   79186:82b5c1f4d44d
parent:      79179:d24b996d136e
user:        Brett Cannon <brett at python.org>
date:        Tue Sep 25 15:23:07 2012 -0400
summary:
  Shift a deprecation from the porting section to the deprecation section.

files:
  Doc/whatsnew/3.3.rst |  14 +++++++++-----
  1 files changed, 9 insertions(+), 5 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1827,6 +1827,15 @@
   * :class:`abc.abstractstaticmethod` has been deprecated, use
     :class:`staticmethod` with :func:`abc.abstractmethod` instead.
 
+* :mod:`imoprtlib` package:
+
+  * :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
+    :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
+    both the modification time and size of the source file the bytecode file was
+    compiled from.
+
+
+
 
 
 Deprecated functions and types of the C API
@@ -1958,11 +1967,6 @@
   :attr:`sys.path_importer_cache` where it repesents the use of implicit
   finders, but semantically it should not change anything.
 
-* :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
-  :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
-  both the modification time and size of the source file the bytecode file was
-  compiled from.
-
 * :class:`importlib.abc.Finder` no longer specifies a `find_module()` abstract
   method that must be implemented. If you were relying on subclasses to
   implement that method, make sure to check for the method's existence first.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:24:29 2012
From: python-checkins at python.org (brett.cannon)
Date: Tue, 25 Sep 2012 21:24:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3XRBzx0rtHzQmK@mail.python.org>

http://hg.python.org/cpython/rev/179283850b20
changeset:   79187:179283850b20
parent:      79186:82b5c1f4d44d
parent:      79185:4b626ccace1a
user:        Brett Cannon <brett at python.org>
date:        Tue Sep 25 15:23:49 2012 -0400
summary:
  merge

files:
  Doc/whatsnew/3.3.rst     |   2 +-
  Lib/mailbox.py           |  46 ++++++++++++++++++++---
  Lib/test/test_mailbox.py |  53 ++++++++++++++++++++-------
  Misc/NEWS                |   2 +
  4 files changed, 80 insertions(+), 23 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1079,7 +1079,7 @@
 contextlib
 ----------
 
-:class:`~collections.ExitStack` now provides a solid foundation for
+:class:`~contextlib.ExitStack` now provides a solid foundation for
 programmatic manipulation of context managers and similar cleanup
 functionality. Unlike the previous ``contextlib.nested`` API (which was
 deprecated and removed), the new API is designed to work correctly
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -208,6 +208,9 @@
             raise ValueError("String input must be ASCII-only; "
                 "use bytes or a Message instead")
 
+    # Whether each message must end in a newline
+    _append_newline = False
+
     def _dump_message(self, message, target, mangle_from_=False):
         # This assumes the target file is open in binary mode.
         """Dump message contents to target file."""
@@ -219,6 +222,9 @@
             data = buffer.read()
             data = data.replace(b'\n', linesep)
             target.write(data)
+            if self._append_newline and not data.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif isinstance(message, (str, bytes, io.StringIO)):
             if isinstance(message, io.StringIO):
                 warnings.warn("Use of StringIO input is deprecated, "
@@ -230,11 +236,15 @@
                 message = message.replace(b'\nFrom ', b'\n>From ')
             message = message.replace(b'\n', linesep)
             target.write(message)
+            if self._append_newline and not message.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif hasattr(message, 'read'):
             if hasattr(message, 'buffer'):
                 warnings.warn("Use of text mode files is deprecated, "
                     "use a binary mode file instead", DeprecationWarning, 3)
                 message = message.buffer
+            lastline = None
             while True:
                 line = message.readline()
                 # Universal newline support.
@@ -248,6 +258,10 @@
                     line = b'>From ' + line[5:]
                 line = line.replace(b'\n', linesep)
                 target.write(line)
+                lastline = line
+            if self._append_newline and lastline and not lastline.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         else:
             raise TypeError('Invalid message type: %s' % type(message))
 
@@ -833,30 +847,48 @@
 
     _mangle_from_ = True
 
+    # All messages must end in a newline character, and
+    # _post_message_hooks outputs an empty line between messages.
+    _append_newline = True
+
     def __init__(self, path, factory=None, create=True):
         """Initialize an mbox mailbox."""
         self._message_factory = mboxMessage
         _mboxMMDF.__init__(self, path, factory, create)
 
-    def _pre_message_hook(self, f):
-        """Called before writing each message to file f."""
-        if f.tell() != 0:
-            f.write(linesep)
+    def _post_message_hook(self, f):
+        """Called after writing each message to file f."""
+        f.write(linesep)
 
     def _generate_toc(self):
         """Generate key-to-(start, stop) table of contents."""
         starts, stops = [], []
+        last_was_empty = False
         self._file.seek(0)
         while True:
             line_pos = self._file.tell()
             line = self._file.readline()
             if line.startswith(b'From '):
                 if len(stops) < len(starts):
+                    if last_was_empty:
+                        stops.append(line_pos - len(linesep))
+                    else:
+                        # The last line before the "From " line wasn't
+                        # blank, but we consider it a start of a
+                        # message anyway.
+                        stops.append(line_pos)
+                starts.append(line_pos)
+                last_was_empty = False
+            elif not line:
+                if last_was_empty:
                     stops.append(line_pos - len(linesep))
-                starts.append(line_pos)
-            elif not line:
-                stops.append(line_pos)
+                else:
+                    stops.append(line_pos)
                 break
+            elif line == linesep:
+                last_was_empty = True
+            else:
+                last_was_empty = False
         self._toc = dict(enumerate(zip(starts, stops)))
         self._next_key = len(self._toc)
         self._file_length = self._file.tell()
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -53,7 +53,7 @@
     maxDiff = None
 
     _factory = None     # Overridden by subclasses to reuse tests
-    _template = 'From: foo\n\n%s'
+    _template = 'From: foo\n\n%s\n'
 
     def setUp(self):
         self._path = support.TESTFN
@@ -232,7 +232,7 @@
         key0 = self._box.add(self._template % 0)
         msg = self._box.get(key0)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertIs(self._box.get('foo'), None)
         self.assertIs(self._box.get('foo', False), False)
         self._box.close()
@@ -240,14 +240,14 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '1')
+        self.assertEqual(msg.get_payload(), '1\n')
 
     def test_getitem(self):
         # Retrieve message using __getitem__()
         key0 = self._box.add(self._template % 0)
         msg = self._box[key0]
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertRaises(KeyError, lambda: self._box['foo'])
         self._box.discard(key0)
         self.assertRaises(KeyError, lambda: self._box[key0])
@@ -259,7 +259,7 @@
         msg0 = self._box.get_message(key0)
         self.assertIsInstance(msg0, mailbox.Message)
         self.assertEqual(msg0['from'], 'foo')
-        self.assertEqual(msg0.get_payload(), '0')
+        self.assertEqual(msg0.get_payload(), '0\n')
         self._check_sample(self._box.get_message(key1))
 
     def test_get_bytes(self):
@@ -432,15 +432,15 @@
         self.assertIn(key0, self._box)
         key1 = self._box.add(self._template % 1)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key0).get_payload(), '0')
+        self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
         self.assertNotIn(key0, self._box)
         self.assertIn(key1, self._box)
         key2 = self._box.add(self._template % 2)
         self.assertIn(key2, self._box)
-        self.assertEqual(self._box.pop(key2).get_payload(), '2')
+        self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
         self.assertNotIn(key2, self._box)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key1).get_payload(), '1')
+        self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
         self.assertNotIn(key1, self._box)
         self.assertEqual(len(self._box), 0)
 
@@ -635,7 +635,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), '')
-        self.assertEqual(msg_returned.get_payload(), '1')
+        self.assertEqual(msg_returned.get_payload(), '1\n')
         msg2 = mailbox.MaildirMessage(self._template % 2)
         msg2.set_info('2,S')
         self._box[key] = msg2
@@ -643,7 +643,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), 'S')
-        self.assertEqual(msg_returned.get_payload(), '3')
+        self.assertEqual(msg_returned.get_payload(), '3\n')
 
     def test_consistent_factory(self):
         # Add a message.
@@ -996,20 +996,20 @@
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
-        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_from_bytes(self):
         # Add a byte string starting with 'From ' to the mailbox
-        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_mbox_or_mmdf_message(self):
         # Add an mboxMessage or MMDFMessage
         for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
-            msg = class_('From foo at bar blah\nFrom: foo\n\n0')
+            msg = class_('From foo at bar blah\nFrom: foo\n\n0\n')
             key = self._box.add(msg)
 
     def test_open_close_open(self):
@@ -1116,6 +1116,29 @@
             perms = st.st_mode
             self.assertFalse((perms & 0o111)) # Execute bits should all be off.
 
+    def test_terminating_newline(self):
+        message = email.message.Message()
+        message['From'] = 'john at example.com'
+        message.set_payload('No newline at the end')
+        i = self._box.add(message)
+
+        # A newline should have been appended to the payload
+        message = self._box.get(i)
+        self.assertEqual(message.get_payload(), 'No newline at the end\n')
+
+    def test_message_separator(self):
+        # Check there's always a single blank line after each message
+        self._box.add('From: foo\n\n0')  # No newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+        self._box.add('From: foo\n\n0\n')  # Newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+
 class TestMMDF(_TestMboxMMDF, unittest.TestCase):
 
     _factory = lambda self, path, factory=None: mailbox.MMDF(path, factory)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,8 @@
 Library
 -------
 
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
   Patch by Serhiy Storchaka.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:35:00 2012
From: python-checkins at python.org (giampaolo.rodola)
Date: Tue, 25 Sep 2012 21:35:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_mention_new_MLSD_support_f?=
 =?utf-8?q?or_ftplib_in_3=2E3_whatsnew?=
Message-ID: <3XRCD45DhNzQjx@mail.python.org>

http://hg.python.org/cpython/rev/39a98b3f4984
changeset:   79188:39a98b3f4984
parent:      79180:2012e5e10147
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Tue Sep 25 12:32:46 2012 -0700
summary:
  mention new MLSD support for ftplib in 3.3 whatsnew

files:
  Doc/whatsnew/3.3.rst |  19 ++++++++++++-------
  1 files changed, 12 insertions(+), 7 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1228,13 +1228,18 @@
 ftplib
 ------
 
-The :class:`~ftplib.FTP_TLS` class now provides a new
-:func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
-plaintext.  This can be useful to take advantage of firewalls that know how to
-handle NAT with non-secure FTP without opening fixed ports.
-
-(Contributed by Giampaolo Rodol? in :issue:`12139`)
-
+* The :class:`~ftplib.FTP_TLS` class now provides a new
+  :func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
+  plaintext.  This can be useful to take advantage of firewalls that know how to
+  handle NAT with non-secure FTP without opening fixed ports.
+
+  (Contributed by Giampaolo Rodol? in :issue:`12139`)
+
+* Added :meth:`ftplib.FTP.mlsd` method which provides a parsable directory
+  listing format and deprecates :meth:`ftplib.FTP.nlst` and
+  :meth:`ftplib.FTP.dir`.
+
+  (Contributed by Giampaolo Rodol? in :issue:`11072`)
 
 gc
 --

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Tue Sep 25 21:35:32 2012
From: python-checkins at python.org (giampaolo.rodola)
Date: Tue, 25 Sep 2012 21:35:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?b?KTogbWVyZ2UgMy4z?=
Message-ID: <3XRCDh5g1WzQjx@mail.python.org>

http://hg.python.org/cpython/rev/82f25e941be2
changeset:   79189:82f25e941be2
parent:      79188:39a98b3f4984
parent:      79187:179283850b20
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Tue Sep 25 12:34:54 2012 -0700
summary:
  merge 3.3

files:
  Doc/whatsnew/3.3.rst     |  14 ++++--
  Lib/mailbox.py           |  46 ++++++++++++++++++++---
  Lib/test/test_mailbox.py |  53 ++++++++++++++++++++-------
  Misc/NEWS                |   2 +
  4 files changed, 88 insertions(+), 27 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1832,6 +1832,15 @@
   * :class:`abc.abstractstaticmethod` has been deprecated, use
     :class:`staticmethod` with :func:`abc.abstractmethod` instead.
 
+* :mod:`imoprtlib` package:
+
+  * :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
+    :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
+    both the modification time and size of the source file the bytecode file was
+    compiled from.
+
+
+
 
 
 Deprecated functions and types of the C API
@@ -1963,11 +1972,6 @@
   :attr:`sys.path_importer_cache` where it repesents the use of implicit
   finders, but semantically it should not change anything.
 
-* :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
-  :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
-  both the modification time and size of the source file the bytecode file was
-  compiled from.
-
 * :class:`importlib.abc.Finder` no longer specifies a `find_module()` abstract
   method that must be implemented. If you were relying on subclasses to
   implement that method, make sure to check for the method's existence first.
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -208,6 +208,9 @@
             raise ValueError("String input must be ASCII-only; "
                 "use bytes or a Message instead")
 
+    # Whether each message must end in a newline
+    _append_newline = False
+
     def _dump_message(self, message, target, mangle_from_=False):
         # This assumes the target file is open in binary mode.
         """Dump message contents to target file."""
@@ -219,6 +222,9 @@
             data = buffer.read()
             data = data.replace(b'\n', linesep)
             target.write(data)
+            if self._append_newline and not data.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif isinstance(message, (str, bytes, io.StringIO)):
             if isinstance(message, io.StringIO):
                 warnings.warn("Use of StringIO input is deprecated, "
@@ -230,11 +236,15 @@
                 message = message.replace(b'\nFrom ', b'\n>From ')
             message = message.replace(b'\n', linesep)
             target.write(message)
+            if self._append_newline and not message.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif hasattr(message, 'read'):
             if hasattr(message, 'buffer'):
                 warnings.warn("Use of text mode files is deprecated, "
                     "use a binary mode file instead", DeprecationWarning, 3)
                 message = message.buffer
+            lastline = None
             while True:
                 line = message.readline()
                 # Universal newline support.
@@ -248,6 +258,10 @@
                     line = b'>From ' + line[5:]
                 line = line.replace(b'\n', linesep)
                 target.write(line)
+                lastline = line
+            if self._append_newline and lastline and not lastline.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         else:
             raise TypeError('Invalid message type: %s' % type(message))
 
@@ -833,30 +847,48 @@
 
     _mangle_from_ = True
 
+    # All messages must end in a newline character, and
+    # _post_message_hooks outputs an empty line between messages.
+    _append_newline = True
+
     def __init__(self, path, factory=None, create=True):
         """Initialize an mbox mailbox."""
         self._message_factory = mboxMessage
         _mboxMMDF.__init__(self, path, factory, create)
 
-    def _pre_message_hook(self, f):
-        """Called before writing each message to file f."""
-        if f.tell() != 0:
-            f.write(linesep)
+    def _post_message_hook(self, f):
+        """Called after writing each message to file f."""
+        f.write(linesep)
 
     def _generate_toc(self):
         """Generate key-to-(start, stop) table of contents."""
         starts, stops = [], []
+        last_was_empty = False
         self._file.seek(0)
         while True:
             line_pos = self._file.tell()
             line = self._file.readline()
             if line.startswith(b'From '):
                 if len(stops) < len(starts):
+                    if last_was_empty:
+                        stops.append(line_pos - len(linesep))
+                    else:
+                        # The last line before the "From " line wasn't
+                        # blank, but we consider it a start of a
+                        # message anyway.
+                        stops.append(line_pos)
+                starts.append(line_pos)
+                last_was_empty = False
+            elif not line:
+                if last_was_empty:
                     stops.append(line_pos - len(linesep))
-                starts.append(line_pos)
-            elif not line:
-                stops.append(line_pos)
+                else:
+                    stops.append(line_pos)
                 break
+            elif line == linesep:
+                last_was_empty = True
+            else:
+                last_was_empty = False
         self._toc = dict(enumerate(zip(starts, stops)))
         self._next_key = len(self._toc)
         self._file_length = self._file.tell()
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -53,7 +53,7 @@
     maxDiff = None
 
     _factory = None     # Overridden by subclasses to reuse tests
-    _template = 'From: foo\n\n%s'
+    _template = 'From: foo\n\n%s\n'
 
     def setUp(self):
         self._path = support.TESTFN
@@ -232,7 +232,7 @@
         key0 = self._box.add(self._template % 0)
         msg = self._box.get(key0)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertIs(self._box.get('foo'), None)
         self.assertIs(self._box.get('foo', False), False)
         self._box.close()
@@ -240,14 +240,14 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '1')
+        self.assertEqual(msg.get_payload(), '1\n')
 
     def test_getitem(self):
         # Retrieve message using __getitem__()
         key0 = self._box.add(self._template % 0)
         msg = self._box[key0]
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertRaises(KeyError, lambda: self._box['foo'])
         self._box.discard(key0)
         self.assertRaises(KeyError, lambda: self._box[key0])
@@ -259,7 +259,7 @@
         msg0 = self._box.get_message(key0)
         self.assertIsInstance(msg0, mailbox.Message)
         self.assertEqual(msg0['from'], 'foo')
-        self.assertEqual(msg0.get_payload(), '0')
+        self.assertEqual(msg0.get_payload(), '0\n')
         self._check_sample(self._box.get_message(key1))
 
     def test_get_bytes(self):
@@ -432,15 +432,15 @@
         self.assertIn(key0, self._box)
         key1 = self._box.add(self._template % 1)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key0).get_payload(), '0')
+        self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
         self.assertNotIn(key0, self._box)
         self.assertIn(key1, self._box)
         key2 = self._box.add(self._template % 2)
         self.assertIn(key2, self._box)
-        self.assertEqual(self._box.pop(key2).get_payload(), '2')
+        self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
         self.assertNotIn(key2, self._box)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key1).get_payload(), '1')
+        self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
         self.assertNotIn(key1, self._box)
         self.assertEqual(len(self._box), 0)
 
@@ -635,7 +635,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), '')
-        self.assertEqual(msg_returned.get_payload(), '1')
+        self.assertEqual(msg_returned.get_payload(), '1\n')
         msg2 = mailbox.MaildirMessage(self._template % 2)
         msg2.set_info('2,S')
         self._box[key] = msg2
@@ -643,7 +643,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), 'S')
-        self.assertEqual(msg_returned.get_payload(), '3')
+        self.assertEqual(msg_returned.get_payload(), '3\n')
 
     def test_consistent_factory(self):
         # Add a message.
@@ -996,20 +996,20 @@
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
-        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_from_bytes(self):
         # Add a byte string starting with 'From ' to the mailbox
-        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_mbox_or_mmdf_message(self):
         # Add an mboxMessage or MMDFMessage
         for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
-            msg = class_('From foo at bar blah\nFrom: foo\n\n0')
+            msg = class_('From foo at bar blah\nFrom: foo\n\n0\n')
             key = self._box.add(msg)
 
     def test_open_close_open(self):
@@ -1116,6 +1116,29 @@
             perms = st.st_mode
             self.assertFalse((perms & 0o111)) # Execute bits should all be off.
 
+    def test_terminating_newline(self):
+        message = email.message.Message()
+        message['From'] = 'john at example.com'
+        message.set_payload('No newline at the end')
+        i = self._box.add(message)
+
+        # A newline should have been appended to the payload
+        message = self._box.get(i)
+        self.assertEqual(message.get_payload(), 'No newline at the end\n')
+
+    def test_message_separator(self):
+        # Check there's always a single blank line after each message
+        self._box.add('From: foo\n\n0')  # No newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+        self._box.add('From: foo\n\n0\n')  # Newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+
 class TestMMDF(_TestMboxMMDF, unittest.TestCase):
 
     _factory = lambda self, path, factory=None: mailbox.MMDF(path, factory)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,8 @@
 Library
 -------
 
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
   Patch by Serhiy Storchaka.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 26 01:57:59 2012
From: python-checkins at python.org (raymond.hettinger)
Date: Wed, 26 Sep 2012 01:57:59 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Show_how_to_cl?=
	=?utf-8?q?ose_a_connection?=
Message-ID: <3XRK3W0tmXzQcS@mail.python.org>

http://hg.python.org/cpython/rev/1b8e66ea3f89
changeset:   79190:1b8e66ea3f89
branch:      2.7
parent:      79182:d903d4981e33
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Sep 25 19:57:50 2012 -0400
summary:
  Show how to close a connection

files:
  Doc/library/sqlite3.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -42,8 +42,9 @@
    # Save (commit) the changes
    conn.commit()
 
-   # We can also close the cursor if we are done with it
-   c.close()
+   # We can also close the connection if we are done with it.
+   # Just be sure any changes have been committed or they will be lost.
+   conn.close()
 
 The data you've saved is persistent and is available in subsequent sessions::
 

-- 
Repository URL: http://hg.python.org/cpython

From ncoghlan at gmail.com  Wed Sep 26 05:16:29 2012
From: ncoghlan at gmail.com (Nick Coghlan)
Date: Wed, 26 Sep 2012 13:16:29 +1000
Subject: [Python-checkins] cpython: don't depend on __debug__ because
 it's baked in at freeze time (issue #16046)
In-Reply-To: <3XR5dd1CFWzQpL@mail.python.org>
References: <3XR5dd1CFWzQpL@mail.python.org>
Message-ID: <CADiSq7fNXaZe9CtFSkEtCXN6+EbVY4p59SrAbB-peK-k86iFMg@mail.gmail.com>

On Wed, Sep 26, 2012 at 1:23 AM, benjamin.peterson
<python-checkins at python.org> wrote:
>      If debug_override is not None, then it must be a boolean and is taken as
> -    the value of __debug__ instead.
> +    the value of bool(sys.flags.optimize) instead.

s/bool(sys.flags.optimize)/"not sys.flags.optimize"/?

It may be better to just rephrase this sentence entirely to better
account for the fact that we're now checking the runtime
sys.flags.optimize value rather than the compile time __debug__ value.

Cheers,
Nick.

-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia

From solipsis at pitrou.net  Wed Sep 26 06:01:20 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Wed, 26 Sep 2012 06:01:20 +0200
Subject: [Python-checkins] Daily reference leaks (82f25e941be2): sum=2
Message-ID: <E1TGioK-0004wV-HX@ap.vmr.nerim.net>

results for 82f25e941be2 on branch "default"
--------------------------------------------

test_dbm leaked [0, 0, 2] references, sum=2


Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog8uAanZ', '-x']

From python-checkins at python.org  Wed Sep 26 06:25:19 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Wed, 26 Sep 2012 06:25:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_rephrase?=
Message-ID: <3XRQzz3R7pzPhg@mail.python.org>

http://hg.python.org/cpython/rev/9b0582477aad
changeset:   79191:9b0582477aad
parent:      79189:82f25e941be2
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Sep 26 00:25:10 2012 -0400
summary:
  rephrase

files:
  Lib/importlib/_bootstrap.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -419,8 +419,8 @@
     .pyc/.pyo file calculated as if the .py file were imported.  The extension
     will be .pyc unless sys.flags.optimize is non-zero, then it will be .pyo.
 
-    If debug_override is not None, then it must be a boolean and is taken as
-    the value of bool(sys.flags.optimize) instead.
+    If debug_override is not None, then it must be a boolean and is used in
+    place of sys.flags.optimize.
 
     If sys.implementation.cache_tag is None then NotImplementedError is raised.
 

-- 
Repository URL: http://hg.python.org/cpython

From benjamin at python.org  Wed Sep 26 06:25:26 2012
From: benjamin at python.org (Benjamin Peterson)
Date: Wed, 26 Sep 2012 00:25:26 -0400
Subject: [Python-checkins] [Python-Dev] cpython: don't depend on
 __debug__ because it's baked in at freeze time (issue #16046)
In-Reply-To: <CADiSq7fNXaZe9CtFSkEtCXN6+EbVY4p59SrAbB-peK-k86iFMg@mail.gmail.com>
References: <3XR5dd1CFWzQpL@mail.python.org>
	<CADiSq7fNXaZe9CtFSkEtCXN6+EbVY4p59SrAbB-peK-k86iFMg@mail.gmail.com>
Message-ID: <CAPZV6o8yY+=i5HGFKeenV9rFuCqvGzRUBG_KYNN9zRZxGS_b1g@mail.gmail.com>

2012/9/25 Nick Coghlan <ncoghlan at gmail.com>:
> On Wed, Sep 26, 2012 at 1:23 AM, benjamin.peterson
> <python-checkins at python.org> wrote:
>>      If debug_override is not None, then it must be a boolean and is taken as
>> -    the value of __debug__ instead.
>> +    the value of bool(sys.flags.optimize) instead.
>
> s/bool(sys.flags.optimize)/"not sys.flags.optimize"/?
>
> It may be better to just rephrase this sentence entirely to better
> account for the fact that we're now checking the runtime
> sys.flags.optimize value rather than the compile time __debug__ value.

Good point; I rephrased it.


-- 
Regards,
Benjamin

From python-checkins at python.org  Wed Sep 26 06:44:27 2012
From: python-checkins at python.org (petri.lehtinen)
Date: Wed, 26 Sep 2012 06:44:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1MjIyOiBGaXgg?=
 =?utf-8?q?a_test_failure_on_Windows?=
Message-ID: <3XRRQ31QL0zQhj@mail.python.org>

http://hg.python.org/cpython/rev/a87ab9b0c9e5
changeset:   79192:a87ab9b0c9e5
branch:      2.7
parent:      79190:1b8e66ea3f89
user:        Petri Lehtinen <petri at digip.org>
date:        Wed Sep 26 07:41:11 2012 +0300
summary:
  #15222: Fix a test failure on Windows

files:
  Lib/test/test_mailbox.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -145,7 +145,7 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.fp.read(), '1\n')
+        self.assertEqual(msg.fp.read(), '1' + os.linesep)
 
     def test_getitem(self):
         # Retrieve message using __getitem__()

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 26 13:12:42 2012
From: python-checkins at python.org (georg.brandl)
Date: Wed, 26 Sep 2012 13:12:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2316052=3A_fix_typ?=
 =?utf-8?q?o=2E_Patch_by_Lars_Buitinck=2E?=
Message-ID: <3XRc225T2yzQrl@mail.python.org>

http://hg.python.org/cpython/rev/6f456d9add40
changeset:   79193:6f456d9add40
parent:      79191:9b0582477aad
user:        Georg Brandl <georg at python.org>
date:        Wed Sep 26 13:11:48 2012 +0200
summary:
  Closes #16052: fix typo. Patch by Lars Buitinck.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1832,7 +1832,7 @@
   * :class:`abc.abstractstaticmethod` has been deprecated, use
     :class:`staticmethod` with :func:`abc.abstractmethod` instead.
 
-* :mod:`imoprtlib` package:
+* :mod:`importlib` package:
 
   * :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
     :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Wed Sep 26 16:43:45 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 26 Sep 2012 16:43:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_a_few_entries_to_whats?=
	=?utf-8?b?bmV3LzMuMy5yc3Qu?=
Message-ID: <3XRhjY5yt1zQv1@mail.python.org>

http://hg.python.org/cpython/rev/36f61661f71e
changeset:   79194:36f61661f71e
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Sep 26 17:43:23 2012 +0300
summary:
  Add a few entries to whatsnew/3.3.rst.

files:
  Doc/whatsnew/3.3.rst |  35 ++++++++++++++++++++++++++++++++
  1 files changed, 35 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1257,6 +1257,31 @@
 (Contributed by Nick Coghlan and Christian Heimes in issue:`15061`)
 
 
+html.entities
+-------------
+
+A new :data:`~html.entities.html5` dictionary that maps HTML5 named character
+references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``)
+has been added to the :mod:`html.entities` module.  The dictionary is now also
+used by :class:`~html.parser.HTMLParser`.
+
+(Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`)
+
+
+html.parser
+-----------
+
+:class:`~html.parser.HTMLParser` is now able to parse broken markup without
+raising errors, therefore the *strict* argument of the constructor and the
+:exc:`~html.parser.HTMLParseError` exception are now deprecated.
+The ability to parse broken markup is the result of a number of bug fixes that
+are also available on the latest bug fix releases of Python 2.7/3.2.
+
+(Contributed by Ezio Melotti in :issue:`15114`, and :issue:`14538`,
+:issue:`13993`, :issue:`13960`, :issue:`13358`, :issue:`1745761`,
+:issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`,
+:issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`)
+
 imaplib
 -------
 
@@ -1699,6 +1724,16 @@
 for PEP 3115 compliant dynamic type creation. (:issue:`14588`)
 
 
+unittest
+--------
+
+:meth:`.assertRaises`, :meth:`.assertRaisesRegex`, :meth:`.assertWarns`, and
+:meth:`.assertWarnsRegex` now accept a keyword argument *msg* when used as
+context managers.
+
+(Contributed by Ezio Melotti and Winston Ewert in :issue:`10775`)
+
+
 urllib
 ------
 

-- 
Repository URL: http://hg.python.org/cpython

From walter at livinglogic.de  Wed Sep 26 17:02:16 2012
From: walter at livinglogic.de (=?UTF-8?B?V2FsdGVyIETDtnJ3YWxk?=)
Date: Wed, 26 Sep 2012 17:02:16 +0200
Subject: [Python-checkins] cpython: Add a few entries to
	whatsnew/3.3.rst.
In-Reply-To: <3XRhjY5yt1zQv1@mail.python.org>
References: <3XRhjY5yt1zQv1@mail.python.org>
Message-ID: <506318F8.5010303@livinglogic.de>

On 26.09.12 16:43, ezio.melotti wrote:

> http://hg.python.org/cpython/rev/36f61661f71e
> changeset:   79194:36f61661f71e
> user:        Ezio Melotti <ezio.melotti at gmail.com>
> date:        Wed Sep 26 17:43:23 2012 +0300
> summary:
>    Add a few entries to whatsnew/3.3.rst.
> [...]
> +
> +A new :data:`~html.entities.html5` dictionary that maps HTML5 named character
> +references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``)
> +has been added to the :mod:`html.entities` module.  The dictionary is now also
> +used by :class:`~html.parser.HTMLParser`.

Is there a reason why the trailing ';' is included in the entity names?

Servus,
    Walter



From ezio.melotti at gmail.com  Wed Sep 26 18:30:41 2012
From: ezio.melotti at gmail.com (Ezio Melotti)
Date: Wed, 26 Sep 2012 19:30:41 +0300
Subject: [Python-checkins] [Python-Dev] cpython: Add a few entries to
	whatsnew/3.3.rst.
In-Reply-To: <506318F8.5010303@livinglogic.de>
References: <3XRhjY5yt1zQv1@mail.python.org> <506318F8.5010303@livinglogic.de>
Message-ID: <CACBhJdH41wwNUwLOgNrk5fQ6PSMGJ17x6U4gcewrDqnaWkib9Q@mail.gmail.com>

On Wed, Sep 26, 2012 at 6:02 PM, Walter D?rwald <walter at livinglogic.de> wrote:
> On 26.09.12 16:43, ezio.melotti wrote:
>
>> http://hg.python.org/cpython/rev/36f61661f71e
>> changeset:   79194:36f61661f71e
>> user:        Ezio Melotti <ezio.melotti at gmail.com>
>> date:        Wed Sep 26 17:43:23 2012 +0300
>> summary:
>>    Add a few entries to whatsnew/3.3.rst.
>> [...]
>>
>> +
>> +A new :data:`~html.entities.html5` dictionary that maps HTML5 named character
>> +references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``)
>> +has been added to the :mod:`html.entities` module.  The dictionary is now also
>> +used by :class:`~html.parser.HTMLParser`.
>
>
> Is there a reason why the trailing ';' is included in the entity names?
>

Yes, to quote <http://bugs.python.org/issue11113#msg163706>:

"""
The problem is that the standard allows some charref to end without a
';', but not all of them.

So both "&Eacuteric" and &Eacute;ric" will be parsed as "?ric", but
only "&alpha;centauri" will result in "?centauri" -- "&alphacentauri"
will be returned unchanged.
"""

To preserve this I included them both, in the same way they are listed
at <http://www.w3.org/TR/html5/named-character-references.html>.
This is also explained at
<http://docs.python.org/dev/library/html.entities.html#html.entities.html5>.

Best Regards,
Ezio Melotti

> Servus,
>    Walter

From python-checkins at python.org  Wed Sep 26 19:02:03 2012
From: python-checkins at python.org (ezio.melotti)
Date: Wed, 26 Sep 2012 19:02:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_=231087=3A_use_proper_skip?=
	=?utf-8?q?s_in_test=5Fos=2E?=
Message-ID: <3XRln762T0zPv3@mail.python.org>

http://hg.python.org/cpython/rev/c8cc94a0ba4c
changeset:   79195:c8cc94a0ba4c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Sep 26 20:01:34 2012 +0300
summary:
  #1087: use proper skips in test_os.

files:
  Lib/test/test_os.py |  26 +++++++++++++-------------
  1 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -514,23 +514,23 @@
         return os.environ
 
     # Bug 1110478
+    @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
     def test_update2(self):
         os.environ.clear()
-        if os.path.exists("/bin/sh"):
-            os.environ.update(HELLO="World")
-            with os.popen("/bin/sh -c 'echo $HELLO'") as popen:
-                value = popen.read().strip()
-                self.assertEqual(value, "World")
+        os.environ.update(HELLO="World")
+        with os.popen("/bin/sh -c 'echo $HELLO'") as popen:
+            value = popen.read().strip()
+            self.assertEqual(value, "World")
 
+    @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
     def test_os_popen_iter(self):
-        if os.path.exists("/bin/sh"):
-            with os.popen(
-                "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen:
-                it = iter(popen)
-                self.assertEqual(next(it), "line1\n")
-                self.assertEqual(next(it), "line2\n")
-                self.assertEqual(next(it), "line3\n")
-                self.assertRaises(StopIteration, next, it)
+        with os.popen(
+            "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen:
+            it = iter(popen)
+            self.assertEqual(next(it), "line1\n")
+            self.assertEqual(next(it), "line2\n")
+            self.assertEqual(next(it), "line3\n")
+            self.assertRaises(StopIteration, next, it)
 
     # Verify environ keys and values from the OS are of the
     # correct str type.

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Thu Sep 27 05:55:19 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Thu, 27 Sep 2012 05:55:19 +0200
Subject: [Python-checkins] Daily reference leaks (c8cc94a0ba4c): sum=0
Message-ID: <E1TH5C3-000689-PS@ap.vmr.nerim.net>

results for c8cc94a0ba4c on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogcRlhuG', '-x']

From python-checkins at python.org  Thu Sep 27 11:58:47 2012
From: python-checkins at python.org (nick.coghlan)
Date: Thu, 27 Sep 2012 11:58:47 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Mention_the_Unicode_versio?=
	=?utf-8?q?n_bump_in_What=27s_New?=
Message-ID: <3XSBLH53mLzR2K@mail.python.org>

http://hg.python.org/cpython/rev/62db840fd237
changeset:   79196:62db840fd237
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Thu Sep 27 19:58:31 2012 +1000
summary:
  Mention the Unicode version bump in What's New

files:
  Doc/whatsnew/3.3.rst |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -850,6 +850,8 @@
 
   (Contributed by Ezio Melotti in :issue:`12753`)
 
+* Unicode database updated to UCD version 6.1.0
+
 * Equality comparisons on :func:`range` objects now return a result reflecting
   the equality of the underlying sequences generated by those range objects.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 27 12:08:00 2012
From: python-checkins at python.org (nick.coghlan)
Date: Thu, 27 Sep 2012 12:08:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Tell_people_the_*new*_beha?=
 =?utf-8?q?viour=2C_not_just_the_old_behaviour?=
Message-ID: <3XSBXw1jjMzR11@mail.python.org>

http://hg.python.org/cpython/rev/82ba1f46def5
changeset:   79197:82ba1f46def5
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Thu Sep 27 20:07:45 2012 +1000
summary:
  Tell people the *new* behaviour, not just the old behaviour

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1121,7 +1121,7 @@
 --------
 
  * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances don't raise :exc:`TypeError`.
+   instances now return :const:`False` instead of raising :exc:`TypeError`.
  * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Thu Sep 27 20:39:18 2012
From: python-checkins at python.org (mark.dickinson)
Date: Thu, 27 Sep 2012 20:39:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316060=3A_Fix_a_do?=
 =?utf-8?q?uble_DECREF_in_int=28=29_implementation=2E__Thanks_Serhiy?=
Message-ID: <3XSPtt6yjDzR5W@mail.python.org>

http://hg.python.org/cpython/rev/690287f8ea95
changeset:   79198:690287f8ea95
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Sep 27 19:38:59 2012 +0100
summary:
  Issue #16060: Fix a double DECREF in int() implementation.  Thanks Serhiy Storchaka.

files:
  Lib/test/test_int.py |  12 ++++++++++++
  Misc/NEWS            |   3 +++
  Objects/abstract.c   |   7 +++----
  3 files changed, 18 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -305,6 +305,18 @@
                     self.fail("Failed to raise TypeError with %s" %
                               ((base, trunc_result_base),))
 
+                # Regression test for bugs.python.org/issue16060.
+                class BadInt(trunc_result_base):
+                    def __int__(self):
+                        return 42.0
+
+                class TruncReturnsBadInt(base):
+                    def __trunc__(self):
+                        return BadInt()
+
+                with self.assertRaises(TypeError):
+                    int(TruncReturnsBadInt())
+
     def test_error_message(self):
         testlist = ('\xbd', '123\xbd', '  123 456  ')
         for s in testlist:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #16060: Fix refcounting bug when __trunc__ returns an object
+  whose __int__ gives a non-integer.  Patch by Serhiy Storchaka.
+
 - Issue #16046: Fix loading sourceless legacy pyos.
 
 - Issue #15379: Fix passing of non-BMP characters as integers for the charmap
diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1228,11 +1228,10 @@
     nb = Py_TYPE(integral)->tp_as_number;
     if (nb->nb_int) {
         PyObject *as_int = nb->nb_int(integral);
-        Py_DECREF(integral);
-        if (!as_int)
-            return NULL;
-        if (PyLong_Check(as_int))
+        if (!as_int || PyLong_Check(as_int)) {
+            Py_DECREF(integral);
             return as_int;
+        }
         Py_DECREF(as_int);
     }
     PyErr_Format(PyExc_TypeError, error_format, Py_TYPE(integral)->tp_name);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 00:10:24 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Fri, 28 Sep 2012 00:10:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_renmae_test_method_to_avoi?=
	=?utf-8?q?d_conflict_=28=2316056=29?=
Message-ID: <3XSVZS6WFCzQxP@mail.python.org>

http://hg.python.org/cpython/rev/e99c0425da59
changeset:   79199:e99c0425da59
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Sep 27 18:10:17 2012 -0400
summary:
  renmae test method to avoid conflict (#16056)

files:
  Lib/test/test_types.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -791,7 +791,7 @@
         self.assertEqual(C.y, 1)
         self.assertEqual(C.z, 2)
 
-    def test_new_class_exec_body(self):
+    def test_new_class_metaclass_keywords(self):
         #Test that keywords are passed to the metaclass:
         def meta_func(name, bases, ns, **kw):
             return name, bases, ns, kw

-- 
Repository URL: http://hg.python.org/cpython

From solipsis at pitrou.net  Fri Sep 28 06:08:30 2012
From: solipsis at pitrou.net (solipsis at pitrou.net)
Date: Fri, 28 Sep 2012 06:08:30 +0200
Subject: [Python-checkins] Daily reference leaks (e99c0425da59): sum=0
Message-ID: <E1THRsM-00068R-Jr@ap.vmr.nerim.net>

results for e99c0425da59 on branch "default"
--------------------------------------------



Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogqIwA9a', '-x']

From python-checkins at python.org  Fri Sep 28 10:21:09 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri, 28 Sep 2012 10:21:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE2MDM2?=
 =?utf-8?q?=3A_Improve_documentation_of_built-in_int=28=29=27s_signature_a?=
 =?utf-8?q?nd_arguments=2E?=
Message-ID: <3XSm794b0zzNtM@mail.python.org>

http://hg.python.org/cpython/rev/9205277bc008
changeset:   79200:9205277bc008
branch:      3.2
parent:      79184:f7615ee43318
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Sep 28 00:10:44 2012 -0700
summary:
  Issue #16036: Improve documentation of built-in int()'s signature and arguments.

files:
  Doc/library/functions.rst |  19 ++++++++++++-------
  Misc/NEWS                 |   3 +++
  2 files changed, 15 insertions(+), 7 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -627,14 +627,19 @@
    to provide elaborate line editing and history features.
 
 
-.. function:: int([number | string[, base]])
+.. function:: int(x=0)
+              int(x, base=10)
 
-   Convert a number or string to an integer.  If no arguments are given, return
-   ``0``.  If a number is given, return ``number.__int__()``.  Conversion of
-   floating point numbers to integers truncates towards zero.  A string must be
-   a base-radix integer literal optionally preceded by '+' or '-' (with no space
-   in between) and optionally surrounded by whitespace.  A base-n literal
-   consists of the digits 0 to n-1, with 'a' to 'z' (or 'A' to 'Z') having
+   Convert a number or string *x* to an integer, or return ``0`` if no
+   arguments are given.  If *x* is a number, return :meth:`x.__int__()
+   <object.__int__>`.  For floating point numbers, this truncates towards zero.
+
+   If *x* is not a number or if *base* is given, then *x* must be a string,
+   :class:`bytes`, or :class:`bytearray` instance representing an :ref:`integer
+   literal <integers>` in radix *base*.  Optionally, the literal can be
+   preceded by ``+`` or ``-`` (with no space in between) and surrounded by
+   whitespace.  A base-n literal consists of the digits 0 to n-1, with ``a``
+   to ``z`` (or ``A`` to ``Z``) having
    values 10 to 35.  The default *base* is 10. The allowed values are 0 and 2-36.
    Base-2, -8, and -16 literals can be optionally prefixed with ``0b``/``0B``,
    ``0o``/``0O``, or ``0x``/``0X``, as with integer literals in code.  Base 0
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -591,6 +591,9 @@
 Documentation
 -------------
 
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
 - Issue #15935: Clarification of argparse docs, re: add_argument() type and
   default arguments.  Patch contributed by Chris Jerdonek.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 10:21:11 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri, 28 Sep 2012 10:21:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2316036=3A_Merge_update_from_3=2E2=2E?=
Message-ID: <3XSm7C2xCtzNtM@mail.python.org>

http://hg.python.org/cpython/rev/6ccb04c4cbae
changeset:   79201:6ccb04c4cbae
parent:      79199:e99c0425da59
parent:      79200:9205277bc008
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Sep 28 01:15:39 2012 -0700
summary:
  Issue #16036: Merge update from 3.2.

files:
  Doc/library/functions.rst |  19 ++++++++++++-------
  Misc/NEWS                 |   3 +++
  2 files changed, 15 insertions(+), 7 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -629,14 +629,19 @@
    to provide elaborate line editing and history features.
 
 
-.. function:: int([number | string[, base]])
+.. function:: int(x=0)
+              int(x, base=10)
 
-   Convert a number or string to an integer.  If no arguments are given, return
-   ``0``.  If a number is given, return ``number.__int__()``.  Conversion of
-   floating point numbers to integers truncates towards zero.  A string must be
-   a base-radix integer literal optionally preceded by '+' or '-' (with no space
-   in between) and optionally surrounded by whitespace.  A base-n literal
-   consists of the digits 0 to n-1, with 'a' to 'z' (or 'A' to 'Z') having
+   Convert a number or string *x* to an integer, or return ``0`` if no
+   arguments are given.  If *x* is a number, return :meth:`x.__int__()
+   <object.__int__>`.  For floating point numbers, this truncates towards zero.
+
+   If *x* is not a number or if *base* is given, then *x* must be a string,
+   :class:`bytes`, or :class:`bytearray` instance representing an :ref:`integer
+   literal <integers>` in radix *base*.  Optionally, the literal can be
+   preceded by ``+`` or ``-`` (with no space in between) and surrounded by
+   whitespace.  A base-n literal consists of the digits 0 to n-1, with ``a``
+   to ``z`` (or ``A`` to ``Z``) having
    values 10 to 35.  The default *base* is 10. The allowed values are 0 and 2-36.
    Base-2, -8, and -16 literals can be optionally prefixed with ``0b``/``0B``,
    ``0o``/``0O``, or ``0x``/``0X``, as with integer literals in code.  Base 0
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -106,6 +106,9 @@
 Documentation
 -------------
 
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
 - Issue #15935: Clarification of argparse docs, re: add_argument() type and
   default arguments.  Patch contributed by Chris Jerdonek.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 12:04:45 2012
From: python-checkins at python.org (georg.brandl)
Date: Fri, 28 Sep 2012 12:04:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?hooks=3A_add_irker_=28IRC_checkin_not?=
	=?utf-8?q?ifications=29_hook?=
Message-ID: <3XSpQj40fmzMjW@mail.python.org>

http://hg.python.org/hooks/rev/1969b6dfc63e
changeset:   84:1969b6dfc63e
user:        Georg Brandl <georg at python.org>
date:        Fri Sep 28 12:04:18 2012 +0200
summary:
  add irker (IRC checkin notifications) hook

files:
  hgirker.py |  88 ++++++++++++++++++++++++++++++++++++++++++
  1 files changed, 88 insertions(+), 0 deletions(-)


diff --git a/hgirker.py b/hgirker.py
new file mode 100644
--- /dev/null
+++ b/hgirker.py
@@ -0,0 +1,88 @@
+from mercurial.node import bin, short
+from mercurial.templatefilters import person
+from mercurial import cmdutil, patch, templater, util, mail
+
+import os
+import json
+import socket
+
+IRKER_HOST = 'localhost'
+IRKER_PORT = 6659
+
+DEFTEMPLATE = '''%(bold)s%(project)s:%(bold)s \
+%(green)s%(author)s%(reset)s \
+%(yellow)s%(branch)s%(reset)s \
+* %(bold)s%(rev)s%(bold)s \
+/ %(files)s%(bold)s:%(bold)s %(logmsg)s \
+%(brown)s%(url)s%(reset)s'''
+
+def getenv(ui, repo):
+    env = {
+        'bold': '\x02',
+        'green': '\x033',
+        'blue': '\x032',
+        'yellow': '\x037',
+        'brown': '\x035',
+        'reset': '\x0F'
+    }
+    env['repo'] = repo
+    env['project'] = ui.config('irker', 'project')
+    if env['project'] is None:
+        raise RuntimeError('missing irker.project config value')
+    env['baseurl'] = ui.config('web', 'baseurl')
+    env['template'] = ui.config('irker', 'template', DEFTEMPLATE)
+    env['channels'] = ui.config('irker', 'channels')
+    if env['channels'] is None:
+        raise RuntimeError('missing irker.channels config value')
+    return env
+
+def getfiles(env, ctx):
+    f = env['repo'].status(ctx.p1().node(), ctx.node())
+    elems = []
+    for path in f[0] + f[1] + f[2]:
+        elems.append(path)
+    pfx = os.path.commonprefix(elems)
+    if len(elems) > 1 and pfx:
+        return pfx + '(' + ' '.join(e[len(pfx):] for e in elems) + ')'
+    return ' '.join(elems)
+
+def generate(env, ctx):
+    n = ctx.node()
+    ns = short(n)
+    d = env.copy()
+    d['branch'] = ctx.branch()
+    d['author'] = person(ctx.user())
+    d['rev'] = '%d:%s' % (ctx.rev(), ns)
+    d['logmsg'] = ctx.description()
+    if env['baseurl']:
+        d['url'] = env['baseurl'].rstrip('/') + '/rev/%s' % ns
+    else:
+        d['url'] = ''
+    d['files'] = getfiles(env, ctx)
+    return json.dumps({
+        'to': env['channels'].split(','),
+        'privmsg': d['template'] % d,
+    })
+
+def hook(ui, repo, hooktype, node=None, url=None, **kwds):
+    def sendmsg(msg):
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        try:
+            sock.connect((IRKER_HOST, IRKER_PORT))
+            sock.sendall(msg + "\n")
+        finally:
+            sock.close()
+
+    env = getenv(ui, repo)
+
+    n = bin(node)
+    if hooktype == 'changegroup':
+        start = repo.changelog.rev(n)
+        end = len(repo.changelog)
+        for rev in xrange(start, end):
+            n = repo.changelog.node(rev)
+            ctx = repo.changectx(n)
+            sendmsg(generate(env, ctx))
+    else:
+        ctx = repo.changectx(n)
+        sendmsg(generate(env, ctx))

-- 
Repository URL: http://hg.python.org/hooks

From python-checkins at python.org  Fri Sep 28 12:17:03 2012
From: python-checkins at python.org (local-hg)
Date: Fri, 28 Sep 2012 12:17:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?hooks=3A_Use_gray_for_the_URL_instead?=
	=?utf-8?q?_of_brown=2E?=
Message-ID: <3XSphv3xmkzNsy@mail.python.org>

http://hg.python.org/hooks/rev/0c69c9dd04a1
changeset:   85:0c69c9dd04a1
user:        hg repo admin <python-dev at python.org>
date:        Fri Sep 28 10:17:01 2012 +0000
summary:
  Use gray for the URL instead of brown.

files:
  hgirker.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/hgirker.py b/hgirker.py
--- a/hgirker.py
+++ b/hgirker.py
@@ -14,7 +14,7 @@
 %(yellow)s%(branch)s%(reset)s \
 * %(bold)s%(rev)s%(bold)s \
 / %(files)s%(bold)s:%(bold)s %(logmsg)s \
-%(brown)s%(url)s%(reset)s'''
+%(gray)s%(url)s%(reset)s'''
 
 def getenv(ui, repo):
     env = {
@@ -23,6 +23,7 @@
         'blue': '\x032',
         'yellow': '\x037',
         'brown': '\x035',
+        'gray': '\x0314',
         'reset': '\x0F'
     }
     env['repo'] = repo

-- 
Repository URL: http://hg.python.org/hooks

From python-checkins at python.org  Fri Sep 28 13:55:11 2012
From: python-checkins at python.org (michael.foord)
Date: Fri, 28 Sep 2012 13:55:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Pass_on_parame?=
 =?utf-8?q?ters_in_unittest=2ETextTestResult=2E=5F=5Finit=5F=5F_super_call?=
Message-ID: <3XSrt73V8fzNxG@mail.python.org>

http://hg.python.org/cpython/rev/e2262fcbb366
changeset:   79202:e2262fcbb366
branch:      2.7
parent:      79192:a87ab9b0c9e5
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 12:54:56 2012 +0100
summary:
  Pass on parameters in unittest.TextTestResult.__init__ super call

files:
  Lib/unittest/runner.py           |   2 +-
  Lib/unittest/test/test_runner.py |  13 +++++++++++++
  Misc/NEWS                        |   2 ++
  3 files changed, 16 insertions(+), 1 deletions(-)


diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -34,7 +34,7 @@
     separator2 = '-' * 70
 
     def __init__(self, stream, descriptions, verbosity):
-        super(TextTestResult, self).__init__()
+        super(TextTestResult, self).__init__(stream, descriptions, verbosity)
         self.stream = stream
         self.showAll = verbosity > 1
         self.dots = verbosity == 1
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -149,6 +149,19 @@
         self.assertEqual(runner.resultclass, unittest.TextTestResult)
 
 
+    def test_multiple_inheritance(self):
+        class AResult(unittest.TestResult):
+            def __init__(self, stream, descriptions, verbosity):
+                super(AResult, self).__init__(stream, descriptions, verbosity)
+
+        class ATextResult(unittest.TextTestResult, AResult):
+            pass
+
+        # This used to raise an exception due to TextTestResult not passing
+        # on arguments in its __init__ super call
+        ATextResult(None, None, None)
+
+
     def testBufferAndFailfast(self):
         class Test(unittest.TestCase):
             def testFoo(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -107,6 +107,8 @@
 Library
 -------
 
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
 - Issue #15222: Insert blank line after each message in mbox mailboxes
 
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 14:24:02 2012
From: python-checkins at python.org (georg.brandl)
Date: Fri, 28 Sep 2012 14:24:02 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?hooks=3A_Always_use_two-digit_color_n?=
 =?utf-8?q?umbers_to_avoid_munging_part_of_the_message=2E?=
Message-ID: <3XSsWQ1yH2zP9S@mail.python.org>

http://hg.python.org/hooks/rev/dadd9884bf14
changeset:   86:dadd9884bf14
user:        Georg Brandl <georg at python.org>
date:        Fri Sep 28 14:23:56 2012 +0200
summary:
  Always use two-digit color numbers to avoid munging part of the message.

files:
  hgirker.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/hgirker.py b/hgirker.py
--- a/hgirker.py
+++ b/hgirker.py
@@ -19,10 +19,10 @@
 def getenv(ui, repo):
     env = {
         'bold': '\x02',
-        'green': '\x033',
-        'blue': '\x032',
-        'yellow': '\x037',
-        'brown': '\x035',
+        'green': '\x0303',
+        'blue': '\x0302',
+        'yellow': '\x0307',
+        'brown': '\x0305',
         'gray': '\x0314',
         'reset': '\x0F'
     }

-- 
Repository URL: http://hg.python.org/hooks

From python-checkins at python.org  Fri Sep 28 15:14:18 2012
From: python-checkins at python.org (michael.foord)
Date: Fri, 28 Sep 2012 15:14:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Closes_issue_?=
 =?utf-8?q?=2312376_=3A_Pass_on_parameters_in_unittest=2ETextTestResult=2E?=
 =?utf-8?b?X19pbml0X18=?=
Message-ID: <3XStdQ6sTgzN9V@mail.python.org>

http://hg.python.org/cpython/rev/0362d64c783a
changeset:   79203:0362d64c783a
branch:      3.2
parent:      79200:9205277bc008
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 14:14:03 2012 +0100
summary:
  Closes issue #12376 : Pass on parameters in unittest.TextTestResult.__init__ super call

files:
  Lib/unittest/runner.py           |   2 +-
  Lib/unittest/test/test_runner.py |  13 +++++++++++++
  Misc/NEWS                        |   2 ++
  3 files changed, 16 insertions(+), 1 deletions(-)


diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -35,7 +35,7 @@
     separator2 = '-' * 70
 
     def __init__(self, stream, descriptions, verbosity):
-        super(TextTestResult, self).__init__()
+        super(TextTestResult, self).__init__(stream, descriptions, verbosity)
         self.stream = stream
         self.showAll = verbosity > 1
         self.dots = verbosity == 1
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -149,6 +149,19 @@
         self.assertEqual(runner.resultclass, unittest.TextTestResult)
 
 
+    def test_multiple_inheritance(self):
+        class AResult(unittest.TestResult):
+            def __init__(self, stream, descriptions, verbosity):
+                super(AResult, self).__init__(stream, descriptions, verbosity)
+
+        class ATextResult(unittest.TextTestResult, AResult):
+            pass
+
+        # This used to raise an exception due to TextTestResult not passing
+        # on arguments in its __init__ super call
+        ATextResult(None, None, 1)
+
+
     def testBufferAndFailfast(self):
         class Test(unittest.TestCase):
             def testFoo(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,8 @@
 Library
 -------
 
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
 - Issue #15222: Insert blank line after each message in mbox mailboxes
 
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 15:20:50 2012
From: python-checkins at python.org (nick.coghlan)
Date: Fri, 28 Sep 2012 15:20:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Now_that_it=27s_possible?=
 =?utf-8?q?=2C_avoid_timing_attacks_in_the_crypt_module_examples=29?=
Message-ID: <3XStmy4qHjzQHq@mail.python.org>

http://hg.python.org/cpython/rev/1f6f7a97d277
changeset:   79204:1f6f7a97d277
parent:      79201:6ccb04c4cbae
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Fri Sep 28 18:50:38 2012 +0530
summary:
  Now that it's possible, avoid timing attacks in the crypt module examples)

files:
  Doc/library/crypt.rst  |  10 +++++++---
  Doc/library/crypto.rst |   1 +
  2 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -121,11 +121,14 @@
 Examples
 --------
 
-A simple example illustrating typical use::
+A simple example illustrating typical use (a constant-time comparison
+operation is needed to limit exposure to timing attacks.
+:func:`hmac.compare_digest` is suitable for this purpose)::
 
    import pwd
    import crypt
    import getpass
+   from hmac import compare_digest as compare_hash
 
    def login():
        username = input('Python login: ')
@@ -134,7 +137,7 @@
            if cryptedpasswd == 'x' or cryptedpasswd == '*':
                raise ValueError('no support for shadow passwords')
            cleartext = getpass.getpass()
-           return crypt.crypt(cleartext, cryptedpasswd) == cryptedpasswd
+           return compare_hash(crypt.crypt(cleartext, cryptedpasswd), cryptedpasswd)
        else:
            return True
 
@@ -142,7 +145,8 @@
 check it against the original::
 
    import crypt
+   from hmac import compare_digest as compare_hash
 
    hashed = crypt.crypt(plaintext)
-   if hashed != crypt.crypt(plaintext, hashed):
+   if not compare_hash(hashed, crypt.crypt(plaintext, hashed)):
       raise ValueError("hashed version doesn't validate against original")
diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst
--- a/Doc/library/crypto.rst
+++ b/Doc/library/crypto.rst
@@ -8,6 +8,7 @@
 
 The modules described in this chapter implement various algorithms of a
 cryptographic nature.  They are available at the discretion of the installation.
+On Unix systems, the :mod:`crypt` module may also be available.
 Here's an overview:
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 15:31:32 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Fri, 28 Sep 2012 15:31:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Update_documen?=
 =?utf-8?q?tation_for_string=2Ereplace=2E_Thanks_to_docs=40?=
Message-ID: <3XSv1J55RgzNkh@mail.python.org>

http://hg.python.org/cpython/rev/c34a177d1f38
changeset:   79205:c34a177d1f38
branch:      2.7
parent:      79202:e2262fcbb366
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Fri Sep 28 16:31:06 2012 +0300
summary:
  Update documentation for string.replace. Thanks to docs@

files:
  Doc/library/string.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -1029,9 +1029,9 @@
    reached.  Strings starting with a sign are handled correctly.
 
 
-.. function:: replace(str, old, new[, maxreplace])
+.. function:: replace(s, old, new[, maxreplace])
 
-   Return a copy of string *str* with all occurrences of substring *old* replaced
+   Return a copy of string *s* with all occurrences of substring *old* replaced
    by *new*.  If the optional argument *maxreplace* is given, the first
    *maxreplace* occurrences are replaced.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 15:32:38 2012
From: python-checkins at python.org (andrew.svetlov)
Date: Fri, 28 Sep 2012 15:32:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Update_docs_fo?=
	=?utf-8?q?r_string=2Ezfill?=
Message-ID: <3XSv2Z2VM1zP8b@mail.python.org>

http://hg.python.org/cpython/rev/2d359ef01dd5
changeset:   79206:2d359ef01dd5
branch:      2.7
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Fri Sep 28 16:32:27 2012 +0300
summary:
  Update docs for string.zfill

files:
  Doc/library/string.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -1025,8 +1025,9 @@
 
 .. function:: zfill(s, width)
 
-   Pad a numeric string on the left with zero digits until the given width is
-   reached.  Strings starting with a sign are handled correctly.
+   Pad a numeric string *s* on the left with zero digits until the
+   given *width* is reached.  Strings starting with a sign are handled
+   correctly.
 
 
 .. function:: replace(s, old, new[, maxreplace])

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 15:41:00 2012
From: python-checkins at python.org (michael.foord)
Date: Fri, 28 Sep 2012 15:41:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_urllib=2Eparse=2Eurlencode?=
	=?utf-8?q?_doc_updarte=2E?=
Message-ID: <3XSvDD0qzgzNpb@mail.python.org>

http://hg.python.org/cpython/rev/8590e9b05069
changeset:   79207:8590e9b05069
parent:      79204:1f6f7a97d277
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 14:40:44 2012 +0100
summary:
  urllib.parse.urlencode doc updarte.
Closes issue 15593

files:
  Doc/library/urllib.parse.rst |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -141,8 +141,9 @@
    percent-encoded sequences into Unicode characters, as accepted by the
    :meth:`bytes.decode` method.
 
-   Use the :func:`urllib.parse.urlencode` function to convert such
-   dictionaries into query strings.
+   Use the :func:`urllib.parse.urlencode` function (with the ``doseq``
+   parameter set to ``True``) to convert such dictionaries into query
+   strings.
 
 
    .. versionchanged:: 3.2

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 15:44:01 2012
From: python-checkins at python.org (ezio.melotti)
Date: Fri, 28 Sep 2012 15:44:01 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Fix_typo=2E?=
Message-ID: <3XSvHj61m2zNpb@mail.python.org>

http://hg.python.org/cpython/rev/cfa511af42b2
changeset:   79208:cfa511af42b2
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Sep 28 16:43:40 2012 +0300
summary:
  Fix typo.

files:
  Objects/setobject.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Objects/setobject.c b/Objects/setobject.c
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -831,10 +831,10 @@
     if (!list)
         return NULL;
 
-    /* copy the itertor state */
+    /* copy the iterator state */
     tmp = *si;
     Py_XINCREF(tmp.si_set);
-    
+
     /* iterate the temporary into a list */
     for(;;) {
         PyObject *element = setiter_iternext(&tmp);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:14:52 2012
From: python-checkins at python.org (michael.foord)
Date: Fri, 28 Sep 2012 16:14:52 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_issue_16064=2E_No_l?=
 =?utf-8?q?onger_hard_code_executable_name_in_unittest_help_output=2E?=
Message-ID: <3XSvzJ39VSzNsr@mail.python.org>

http://hg.python.org/cpython/rev/c76f1d78ff78
changeset:   79209:c76f1d78ff78
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 15:14:37 2012 +0100
summary:
  Closes issue 16064. No longer hard code executable name in unittest help output.

files:
  Lib/unittest/__main__.py |  9 ++++++++-
  Misc/NEWS                |  2 ++
  2 files changed, 10 insertions(+), 1 deletions(-)


diff --git a/Lib/unittest/__main__.py b/Lib/unittest/__main__.py
--- a/Lib/unittest/__main__.py
+++ b/Lib/unittest/__main__.py
@@ -2,7 +2,14 @@
 
 import sys
 if sys.argv[0].endswith("__main__.py"):
-    sys.argv[0] = "python -m unittest"
+    import os.path
+    # We change sys.argv[0] to make help message more useful
+    # use executable without path, unquoted
+    # (it's just a hint anyway)
+    # (if you have spaces in your executable you get what you deserve!)
+    executable = os.path.basename(sys.executable)
+    sys.argv[0] = executable + " -m unittest"
+    del os
 
 __unittest = True
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,8 @@
 Library
 -------
 
+- Issue #16064: unittest -m claims executable is "python", not "python3"
+
 - Issue #15222: Insert blank line after each message in mbox mailboxes
 
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:19:55 2012
From: python-checkins at python.org (michael.foord)
Date: Fri, 28 Sep 2012 16:19:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
	=?utf-8?q?=29=3A_Merge?=
Message-ID: <3XSw574D64zP8b@mail.python.org>

http://hg.python.org/cpython/rev/b21e28790c03
changeset:   79210:b21e28790c03
parent:      79209:c76f1d78ff78
parent:      79203:0362d64c783a
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 15:19:45 2012 +0100
summary:
  Merge

files:
  Lib/unittest/runner.py           |   2 +-
  Lib/unittest/test/test_runner.py |  13 +++++++++++++
  Misc/NEWS                        |   2 ++
  3 files changed, 16 insertions(+), 1 deletions(-)


diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -35,7 +35,7 @@
     separator2 = '-' * 70
 
     def __init__(self, stream, descriptions, verbosity):
-        super(TextTestResult, self).__init__()
+        super(TextTestResult, self).__init__(stream, descriptions, verbosity)
         self.stream = stream
         self.showAll = verbosity > 1
         self.dots = verbosity == 1
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -149,6 +149,19 @@
         self.assertEqual(runner.resultclass, unittest.TextTestResult)
 
 
+    def test_multiple_inheritance(self):
+        class AResult(unittest.TestResult):
+            def __init__(self, stream, descriptions, verbosity):
+                super(AResult, self).__init__(stream, descriptions, verbosity)
+
+        class ATextResult(unittest.TextTestResult, AResult):
+            pass
+
+        # This used to raise an exception due to TextTestResult not passing
+        # on arguments in its __init__ super call
+        ATextResult(None, None, 1)
+
+
     def testBufferAndFailfast(self):
         class Test(unittest.TestCase):
             def testFoo(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,8 @@
 
 - Issue #16064: unittest -m claims executable is "python", not "python3"
 
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
 - Issue #15222: Insert blank line after each message in mbox mailboxes
 
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:26:10 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri, 28 Sep 2012 16:26:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Close_issue_?=
 =?utf-8?q?=2316073=3A_fix_map=28=29_example_in_list_comprehension_documen?=
 =?utf-8?q?tation=2E?=
Message-ID: <3XSwDL5f9YzNt4@mail.python.org>

http://hg.python.org/cpython/rev/6c96878eb729
changeset:   79211:6c96878eb729
branch:      3.2
parent:      79203:0362d64c783a
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Sep 28 07:07:12 2012 -0700
summary:
  Close issue #16073: fix map() example in list comprehension documentation.

Thanks for the e-mail report to docs at .

files:
  Doc/tutorial/datastructures.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -181,7 +181,7 @@
 
    squares = [x**2 for x in range(10)]
 
-This is also equivalent to ``squares = map(lambda x: x**2, range(10))``,
+This is also equivalent to ``squares = list(map(lambda x: x**2, range(10)))``,
 but it's more concise and readable.
 
 A list comprehension consists of brackets containing an expression followed

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:26:12 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Fri, 28 Sep 2012 16:26:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Close_issue_=2316073=3A_merge_fix_from_3=2E2=2E?=
Message-ID: <3XSwDN1JjbzNsr@mail.python.org>

http://hg.python.org/cpython/rev/8a4a88b1e964
changeset:   79212:8a4a88b1e964
parent:      79210:b21e28790c03
parent:      79211:6c96878eb729
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Fri Sep 28 07:24:24 2012 -0700
summary:
  Close issue #16073: merge fix from 3.2.

files:
  Doc/tutorial/datastructures.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -186,7 +186,7 @@
 
    squares = [x**2 for x in range(10)]
 
-This is also equivalent to ``squares = map(lambda x: x**2, range(10))``,
+This is also equivalent to ``squares = list(map(lambda x: x**2, range(10)))``,
 but it's more concise and readable.
 
 A list comprehension consists of brackets containing an expression followed

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:29:13 2012
From: python-checkins at python.org (stefan.krah)
Date: Fri, 28 Sep 2012 16:29:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316080=3A_Use_run?=
 =?utf-8?q?=5Fwith=5Flocale=28=29_decorator_to_reset_the_locale_properly?=
 =?utf-8?q?=2E?=
Message-ID: <3XSwHs0X1DzNsr@mail.python.org>

http://hg.python.org/cpython/rev/3f5fedb17a78
changeset:   79213:3f5fedb17a78
parent:      79210:b21e28790c03
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Sep 28 16:18:54 2012 +0200
summary:
  Issue #16080: Use run_with_locale() decorator to reset the locale properly.

files:
  Lib/test/test_decimal.py |  10 +++-------
  1 files changed, 3 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -34,7 +34,8 @@
 import locale
 from test.support import (run_unittest, run_doctest, is_resource_enabled,
                           requires_IEEE_754)
-from test.support import check_warnings, import_fresh_module, TestFailed
+from test.support import (check_warnings, import_fresh_module, TestFailed,
+                          run_with_locale)
 import random
 import time
 import warnings
@@ -1136,18 +1137,13 @@
         self.assertEqual(get_fmt(Decimal('-1.5'), dotsep_wide, '020n'),
                          '-0\u00b4000\u00b4000\u00b4000\u00b4001\u00bf5')
 
+    @run_with_locale('LC_ALL', 'ps_AF')
     def test_wide_char_separator_decimal_point(self):
         # locale with wide char separator and decimal point
         Decimal = self.decimal.Decimal
 
-        try:
-            locale.setlocale(locale.LC_ALL, 'ps_AF')
-        except locale.Error:
-            return
-
         self.assertEqual(format(Decimal('100000000.123'), 'n'),
                          '100\u066c000\u066c000\u066b123')
-        locale.resetlocale()
 
 class CFormatTest(FormatTest):
     decimal = C

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:29:14 2012
From: python-checkins at python.org (stefan.krah)
Date: Fri, 28 Sep 2012 16:29:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2Uu?=
Message-ID: <3XSwHt2szlzNsr@mail.python.org>

http://hg.python.org/cpython/rev/f69dc59bfc53
changeset:   79214:f69dc59bfc53
parent:      79213:3f5fedb17a78
parent:      79212:8a4a88b1e964
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Sep 28 16:21:17 2012 +0200
summary:
  Merge.

files:
  Doc/tutorial/datastructures.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -186,7 +186,7 @@
 
    squares = [x**2 for x in range(10)]
 
-This is also equivalent to ``squares = map(lambda x: x**2, range(10))``,
+This is also equivalent to ``squares = list(map(lambda x: x**2, range(10)))``,
 but it's more concise and readable.
 
 A list comprehension consists of brackets containing an expression followed

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:35:40 2012
From: python-checkins at python.org (jesus.cea)
Date: Fri, 28 Sep 2012 16:35:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogQ2xvc2VzICMxNTk1?=
 =?utf-8?q?3=3A_Incorrect_some_fields_declaration_in_the_PyTypeObject?=
Message-ID: <3XSwRJ1QPRzNtD@mail.python.org>

http://hg.python.org/cpython/rev/08aa289a757c
changeset:   79215:08aa289a757c
branch:      2.7
parent:      79206:2d359ef01dd5
user:        Jesus Cea <jcea at jcea.es>
date:        Fri Sep 28 16:33:38 2012 +0200
summary:
  Closes #15953: Incorrect some fields declaration in the PyTypeObject documentation

files:
  Doc/extending/newtypes.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1360,9 +1360,9 @@
 bit does not indicate that the slot values are non-*NULL*. The flag may be set
 to indicate the presence of a slot, but a slot may still be unfilled.) ::
 
-   PyNumberMethods   tp_as_number;
-   PySequenceMethods tp_as_sequence;
-   PyMappingMethods  tp_as_mapping;
+   PyNumberMethods   *tp_as_number;
+   PySequenceMethods *tp_as_sequence;
+   PyMappingMethods  *tp_as_mapping;
 
 If you wish your object to be able to act like a number, a sequence, or a
 mapping object, then you place the address of a structure that implements the C

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:35:41 2012
From: python-checkins at python.org (jesus.cea)
Date: Fri, 28 Sep 2012 16:35:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogQ2xvc2VzICMxNTk1?=
 =?utf-8?q?3=3A_Incorrect_some_fields_declaration_in_the_PyTypeObject?=
Message-ID: <3XSwRK3lgTzNt4@mail.python.org>

http://hg.python.org/cpython/rev/c87ea480ddf3
changeset:   79216:c87ea480ddf3
branch:      3.2
parent:      79211:6c96878eb729
user:        Jesus Cea <jcea at jcea.es>
date:        Fri Sep 28 16:34:45 2012 +0200
summary:
  Closes #15953: Incorrect some fields declaration in the PyTypeObject documentation

files:
  Doc/extending/newtypes.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1299,9 +1299,9 @@
 bit does not indicate that the slot values are non-*NULL*. The flag may be set
 to indicate the presence of a slot, but a slot may still be unfilled.) ::
 
-   PyNumberMethods   tp_as_number;
-   PySequenceMethods tp_as_sequence;
-   PyMappingMethods  tp_as_mapping;
+   PyNumberMethods   *tp_as_number;
+   PySequenceMethods *tp_as_sequence;
+   PyMappingMethods  *tp_as_mapping;
 
 If you wish your object to be able to act like a number, a sequence, or a
 mapping object, then you place the address of a structure that implements the C

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 16:35:42 2012
From: python-checkins at python.org (jesus.cea)
Date: Fri, 28 Sep 2012 16:35:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_MERGE=3A_Closes_=2315953=3A_Incorrect_some_fields_declar?=
 =?utf-8?q?ation_in_the_PyTypeObject?=
Message-ID: <3XSwRL63c6zPv3@mail.python.org>

http://hg.python.org/cpython/rev/3bb53816f9c5
changeset:   79217:3bb53816f9c5
parent:      79214:f69dc59bfc53
parent:      79216:c87ea480ddf3
user:        Jesus Cea <jcea at jcea.es>
date:        Fri Sep 28 16:35:21 2012 +0200
summary:
  MERGE: Closes #15953: Incorrect some fields declaration in the PyTypeObject documentation

files:
  Doc/extending/newtypes.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1277,9 +1277,9 @@
 bit does not indicate that the slot values are non-*NULL*. The flag may be set
 to indicate the presence of a slot, but a slot may still be unfilled.) ::
 
-   PyNumberMethods   tp_as_number;
-   PySequenceMethods tp_as_sequence;
-   PyMappingMethods  tp_as_mapping;
+   PyNumberMethods   *tp_as_number;
+   PySequenceMethods *tp_as_sequence;
+   PyMappingMethods  *tp_as_mapping;
 
 If you wish your object to be able to act like a number, a sequence, or a
 mapping object, then you place the address of a structure that implements the C

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 17:10:18 2012
From: python-checkins at python.org (georg.brandl)
Date: Fri, 28 Sep 2012 17:10:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Move_NEWS_items_from_3=2E3?=
 =?utf-8?q?=2E0_to_that_section=2C_to_ease_merging_from_the_release?=
Message-ID: <3XSxCG1PYKzNsx@mail.python.org>

http://hg.python.org/cpython/rev/a2499d50da12
changeset:   79218:a2499d50da12
user:        Georg Brandl <georg at python.org>
date:        Fri Sep 28 17:10:11 2012 +0200
summary:
  Move NEWS items from 3.3.0 to that section, to ease merging from the release clone later.

files:
  Misc/NEWS |  105 +++++++++++++++++++++--------------------
  1 files changed, 54 insertions(+), 51 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,11 +10,6 @@
 Core and Builtins
 -----------------
 
-- Issue #16060: Fix refcounting bug when __trunc__ returns an object
-  whose __int__ gives a non-integer.  Patch by Serhiy Storchaka.
-
-- Issue #16046: Fix loading sourceless legacy pyos.
-
 - Issue #15379: Fix passing of non-BMP characters as integers for the charmap
   decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
 
@@ -85,55 +80,63 @@
 Extension Modules
 -----------------
 
+Tests
+-----
+
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
+Build
+-----
+
+- Issue #15819: Make sure we can build Python out-of-tree from a readonly
+  source directory.  (Somewhat related to Issue #9860.)
+
+Documentation
+-------------
+
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
+- Issue #11964: Document a change in v3.2 to the behavior of the indent
+  parameter of json encoding operations.
+
+Tools/Demos
+-----------
+
+
+What's New in Python 3.3.0?
+===========================
+
+*Release date: XX-Sep-2012*
+
+Core and Builtins
+-----------------
+
+- Issue #16046: Fix loading sourceless legacy pyos.
+
+- Issue #16060: Fix refcounting bug when __trunc__ returns an object
+  whose __int__ gives a non-integer.  Patch by Serhiy Storchaka.
+
+Library
+-------
+
+Extension Modules
+-----------------
+
 - Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
   method doesn't require an argument again.
 
-Tests
------
-
-- Issue #15304: Fix warning message when os.chdir() fails inside
-  test.support.temp_cwd().  Patch by Chris Jerdonek.
-
-
-- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
-  by Serhiy Storchaka.
-
-- Issue #15557: Added a test suite for the webbrowser module, thanks
-  to Anton Barkovsky.
-
-Build
------
-
-- Issue #15819: Make sure we can build Python out-of-tree from a readonly
-  source directory.  (Somewhat related to Issue #9860.)
-
-Documentation
--------------
-
-- Issue #16036: Improve documentation of built-in int()'s signature and
-  arguments.
-
-- Issue #15935: Clarification of argparse docs, re: add_argument() type and
-  default arguments.  Patch contributed by Chris Jerdonek.
-
-- Issue #11964: Document a change in v3.2 to the behavior of the indent
-  parameter of json encoding operations.
-
-Tools/Demos
------------
-
-
-What's New in Python 3.3.0?
-===========================
-
-*Release date: XX-Sep-2012*
-
-Core and Builtins
------------------
-
-Library
--------
-
 
 What's New in Python 3.3.0 Release Candidate 3?
 ===============================================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 17:16:37 2012
From: python-checkins at python.org (michael.foord)
Date: Fri, 28 Sep 2012 17:16:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_issue_15323=2E_Impr?=
 =?utf-8?q?ove_failure_message_of_Mock=2Eassert=5Fcalled=5Fonce=5Fwith?=
Message-ID: <3XSxLY262qzNpC@mail.python.org>

http://hg.python.org/cpython/rev/70d43fedb2d7
changeset:   79219:70d43fedb2d7
parent:      79217:3bb53816f9c5
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 16:15:22 2012 +0100
summary:
  Closes issue 15323. Improve failure message of Mock.assert_called_once_with

files:
  Doc/library/unittest.mock.rst          |  4 ++--
  Lib/unittest/mock.py                   |  4 ++--
  Lib/unittest/test/testmock/testmock.py |  7 +++++++
  Misc/NEWS                              |  2 ++
  4 files changed, 13 insertions(+), 4 deletions(-)


diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -276,7 +276,7 @@
             >>> mock.assert_called_once_with('foo', bar='baz')
             Traceback (most recent call last):
               ...
-            AssertionError: Expected to be called once. Called 2 times.
+            AssertionError: Expected 'mock' to be called once. Called 2 times.
 
 
     .. method:: assert_any_call(*args, **kwargs)
@@ -2020,7 +2020,7 @@
     >>> mock.assert_called_once_with(1, 2, 3)
     Traceback (most recent call last):
      ...
-    AssertionError: Expected to be called once. Called 2 times.
+    AssertionError: Expected 'mock' to be called once. Called 2 times.
 
 Because mocks auto-create attributes on demand, and allow you to call them
 with arbitrary arguments, if you misspell one of these assert methods then
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -731,8 +731,8 @@
         arguments."""
         self = _mock_self
         if not self.call_count == 1:
-            msg = ("Expected to be called once. Called %s times." %
-                   self.call_count)
+            msg = ("Expected '%s' to be called once. Called %s times." %
+                   (self._mock_name or 'mock', self.call_count))
             raise AssertionError(msg)
         return self.assert_called_with(*args, **kwargs)
 
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -463,6 +463,13 @@
                                 mock.assert_called_with)
 
 
+    def test_assert_called_once_with_message(self):
+        mock = Mock(name='geoffrey')
+        self.assertRaisesRegex(AssertionError,
+                     r"Expected 'geoffrey' to be called once\.",
+                     mock.assert_called_once_with)
+
+
     def test__name__(self):
         mock = Mock()
         self.assertRaises(AttributeError, lambda: mock.__name__)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,8 @@
 Library
 -------
 
+- Issue #15323: improve failure message of Mock.assert_called_once_with
+
 - Issue #16064: unittest -m claims executable is "python", not "python3"
 
 - Issue #12376: Pass on parameters in TextTestResult.__init__ super call

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 17:16:38 2012
From: python-checkins at python.org (michael.foord)
Date: Fri, 28 Sep 2012 17:16:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_Merge?=
Message-ID: <3XSxLZ566PzP0p@mail.python.org>

http://hg.python.org/cpython/rev/76cd21a04ca1
changeset:   79220:76cd21a04ca1
parent:      79219:70d43fedb2d7
parent:      79218:a2499d50da12
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 16:16:24 2012 +0100
summary:
  Merge

files:
  Misc/NEWS |  105 +++++++++++++++++++++--------------------
  1 files changed, 54 insertions(+), 51 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,11 +10,6 @@
 Core and Builtins
 -----------------
 
-- Issue #16060: Fix refcounting bug when __trunc__ returns an object
-  whose __int__ gives a non-integer.  Patch by Serhiy Storchaka.
-
-- Issue #16046: Fix loading sourceless legacy pyos.
-
 - Issue #15379: Fix passing of non-BMP characters as integers for the charmap
   decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
 
@@ -87,55 +82,63 @@
 Extension Modules
 -----------------
 
+Tests
+-----
+
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
+Build
+-----
+
+- Issue #15819: Make sure we can build Python out-of-tree from a readonly
+  source directory.  (Somewhat related to Issue #9860.)
+
+Documentation
+-------------
+
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
+- Issue #11964: Document a change in v3.2 to the behavior of the indent
+  parameter of json encoding operations.
+
+Tools/Demos
+-----------
+
+
+What's New in Python 3.3.0?
+===========================
+
+*Release date: XX-Sep-2012*
+
+Core and Builtins
+-----------------
+
+- Issue #16046: Fix loading sourceless legacy pyos.
+
+- Issue #16060: Fix refcounting bug when __trunc__ returns an object
+  whose __int__ gives a non-integer.  Patch by Serhiy Storchaka.
+
+Library
+-------
+
+Extension Modules
+-----------------
+
 - Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
   method doesn't require an argument again.
 
-Tests
------
-
-- Issue #15304: Fix warning message when os.chdir() fails inside
-  test.support.temp_cwd().  Patch by Chris Jerdonek.
-
-
-- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
-  by Serhiy Storchaka.
-
-- Issue #15557: Added a test suite for the webbrowser module, thanks
-  to Anton Barkovsky.
-
-Build
------
-
-- Issue #15819: Make sure we can build Python out-of-tree from a readonly
-  source directory.  (Somewhat related to Issue #9860.)
-
-Documentation
--------------
-
-- Issue #16036: Improve documentation of built-in int()'s signature and
-  arguments.
-
-- Issue #15935: Clarification of argparse docs, re: add_argument() type and
-  default arguments.  Patch contributed by Chris Jerdonek.
-
-- Issue #11964: Document a change in v3.2 to the behavior of the indent
-  parameter of json encoding operations.
-
-Tools/Demos
------------
-
-
-What's New in Python 3.3.0?
-===========================
-
-*Release date: XX-Sep-2012*
-
-Core and Builtins
------------------
-
-Library
--------
-
 
 What's New in Python 3.3.0 Release Candidate 3?
 ===============================================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 17:25:18 2012
From: python-checkins at python.org (stefan.krah)
Date: Fri, 28 Sep 2012 17:25:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Closes_=2316080=3A_The_dec?=
 =?utf-8?q?orator_ignores_failed_attempts_to_set_the_required?=
Message-ID: <3XSxXZ5h07zNvB@mail.python.org>

http://hg.python.org/cpython/rev/f1094697d7dc
changeset:   79221:f1094697d7dc
user:        Stefan Krah <skrah at bytereef.org>
date:        Fri Sep 28 17:17:11 2012 +0200
summary:
  Closes #16080: The decorator ignores failed attempts to set the required
locale, so an additional check is required.

files:
  Lib/test/test_decimal.py |  6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -1140,8 +1140,14 @@
     @run_with_locale('LC_ALL', 'ps_AF')
     def test_wide_char_separator_decimal_point(self):
         # locale with wide char separator and decimal point
+        import locale
         Decimal = self.decimal.Decimal
 
+        decimal_point = locale.localeconv()['decimal_point']
+        thousands_sep = locale.localeconv()['thousands_sep']
+        if decimal_point != '\u066b' or thousands_sep != '\u066c':
+            return
+
         self.assertEqual(format(Decimal('100000000.123'), 'n'),
                          '100\u066c000\u066c000\u066b123')
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 21:20:36 2012
From: python-checkins at python.org (r.david.murray)
Date: Fri, 28 Sep 2012 21:20:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MDcxOiBmaXgg?=
 =?utf-8?q?links_to_email=2Emessage=2EMessage_in_mailbox_docs=2E?=
Message-ID: <3XT2m46VhgzNkh@mail.python.org>

http://hg.python.org/cpython/rev/be94d100f846
changeset:   79222:be94d100f846
branch:      3.2
parent:      79216:c87ea480ddf3
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Sep 28 15:09:31 2012 -0400
summary:
  #16071: fix links to email.message.Message in mailbox docs.

files:
  Doc/library/mailbox.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -757,11 +757,12 @@
 
 .. class:: Message(message=None)
 
-   A subclass of the :mod:`email.Message` module's :class:`Message`. Subclasses of
-   :class:`mailbox.Message` add mailbox-format-specific state and behavior.
+   A subclass of the :mod:`email.message` module's
+   :class:`~email.message.Message`. Subclasses of :class:`mailbox.Message` add
+   mailbox-format-specific state and behavior.
 
    If *message* is omitted, the new instance is created in a default, empty state.
-   If *message* is an :class:`email.Message.Message` instance, its contents are
+   If *message* is an :class:`email.message.Message` instance, its contents are
    copied; furthermore, any format-specific information is converted insofar as
    possible if *message* is a :class:`Message` instance. If *message* is a string,
    a byte string,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 21:20:38 2012
From: python-checkins at python.org (r.david.murray)
Date: Fri, 28 Sep 2012 21:20:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2316071=3A_fix_links_to_email=2Emessage=2EMessage?=
 =?utf-8?q?_in_mailbox_docs=2E?=
Message-ID: <3XT2m61kCczNtV@mail.python.org>

http://hg.python.org/cpython/rev/2a14542371b7
changeset:   79223:2a14542371b7
parent:      79221:f1094697d7dc
parent:      79222:be94d100f846
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Sep 28 15:10:12 2012 -0400
summary:
  Merge #16071: fix links to email.message.Message in mailbox docs.

files:
  Doc/library/mailbox.rst |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -757,11 +757,12 @@
 
 .. class:: Message(message=None)
 
-   A subclass of the :mod:`email.Message` module's :class:`Message`. Subclasses of
-   :class:`mailbox.Message` add mailbox-format-specific state and behavior.
+   A subclass of the :mod:`email.message` module's
+   :class:`~email.message.Message`. Subclasses of :class:`mailbox.Message` add
+   mailbox-format-specific state and behavior.
 
    If *message* is omitted, the new instance is created in a default, empty state.
-   If *message* is an :class:`email.Message.Message` instance, its contents are
+   If *message* is an :class:`email.message.Message` instance, its contents are
    copied; furthermore, any format-specific information is converted insofar as
    possible if *message* is a :class:`Message` instance. If *message* is a string,
    a byte string,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 21:20:39 2012
From: python-checkins at python.org (r.david.murray)
Date: Fri, 28 Sep 2012 21:20:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MDcxOiBmaXgg?=
 =?utf-8?q?more_email=2Emessage_links_in_mailbox_docs=2E?=
Message-ID: <3XT2m73z9TzPBh@mail.python.org>

http://hg.python.org/cpython/rev/70af6b53b52a
changeset:   79224:70af6b53b52a
branch:      3.2
parent:      79222:be94d100f846
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Sep 28 15:19:16 2012 -0400
summary:
  #16071: fix more email.message links in mailbox docs.

files:
  Doc/library/mailbox.rst |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -10,9 +10,9 @@
 This module defines two classes, :class:`Mailbox` and :class:`Message`, for
 accessing and manipulating on-disk mailboxes and the messages they contain.
 :class:`Mailbox` offers a dictionary-like mapping from keys to messages.
-:class:`Message` extends the :mod:`email.Message` module's :class:`Message`
-class with format-specific state and behavior. Supported mailbox formats are
-Maildir, mbox, MH, Babyl, and MMDF.
+:class:`Message` extends the :mod:`email.message` module's
+:class:`~email.message.Message` class with format-specific state and behavior.
+Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
 
 
 .. seealso::
@@ -81,7 +81,7 @@
       it.
 
       Parameter *message* may be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, a byte string, or a
+      :class:`email.message.Message` instance, a string, a byte string, or a
       file-like object (which should be open in binary mode). If *message* is
       an instance of the
       appropriate format-specific :class:`Message` subclass (e.g., if it's an
@@ -112,7 +112,7 @@
       :exc:`KeyError` exception if no message already corresponds to *key*.
 
       As with :meth:`add`, parameter *message* may be a :class:`Message`
-      instance, an :class:`email.Message.Message` instance, a string, a byte
+      instance, an :class:`email.message.Message` instance, a string, a byte
       string, or a file-like object (which should be open in binary mode). If
       *message* is an
       instance of the appropriate format-specific :class:`Message` subclass
@@ -1268,7 +1268,7 @@
 
       Set the message's visible headers to be the same as the headers in
       *message*.  Parameter *visible* should be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, or a file-like object
+      :class:`email.message.Message` instance, a string, or a file-like object
       (which should be open in text mode).
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 21:20:40 2012
From: python-checkins at python.org (r.david.murray)
Date: Fri, 28 Sep 2012 21:20:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E2_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2316071=3A_fix_more_email=2Emessage_links_in_mail?=
 =?utf-8?q?box_docs=2E?=
Message-ID: <3XT2m86ClrzNwK@mail.python.org>

http://hg.python.org/cpython/rev/f3bd51cdd958
changeset:   79225:f3bd51cdd958
parent:      79223:2a14542371b7
parent:      79224:70af6b53b52a
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Sep 28 15:19:42 2012 -0400
summary:
  Merge #16071: fix more email.message links in mailbox docs.

files:
  Doc/library/mailbox.rst |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -10,9 +10,9 @@
 This module defines two classes, :class:`Mailbox` and :class:`Message`, for
 accessing and manipulating on-disk mailboxes and the messages they contain.
 :class:`Mailbox` offers a dictionary-like mapping from keys to messages.
-:class:`Message` extends the :mod:`email.Message` module's :class:`Message`
-class with format-specific state and behavior. Supported mailbox formats are
-Maildir, mbox, MH, Babyl, and MMDF.
+:class:`Message` extends the :mod:`email.message` module's
+:class:`~email.message.Message` class with format-specific state and behavior.
+Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
 
 
 .. seealso::
@@ -81,7 +81,7 @@
       it.
 
       Parameter *message* may be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, a byte string, or a
+      :class:`email.message.Message` instance, a string, a byte string, or a
       file-like object (which should be open in binary mode). If *message* is
       an instance of the
       appropriate format-specific :class:`Message` subclass (e.g., if it's an
@@ -112,7 +112,7 @@
       :exc:`KeyError` exception if no message already corresponds to *key*.
 
       As with :meth:`add`, parameter *message* may be a :class:`Message`
-      instance, an :class:`email.Message.Message` instance, a string, a byte
+      instance, an :class:`email.message.Message` instance, a string, a byte
       string, or a file-like object (which should be open in binary mode). If
       *message* is an
       instance of the appropriate format-specific :class:`Message` subclass
@@ -1268,7 +1268,7 @@
 
       Set the message's visible headers to be the same as the headers in
       *message*.  Parameter *visible* should be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, or a file-like object
+      :class:`email.message.Message` instance, a string, or a file-like object
       (which should be open in text mode).
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 21:21:46 2012
From: python-checkins at python.org (r.david.murray)
Date: Fri, 28 Sep 2012 21:21:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MDcxOiBmaXgg?=
 =?utf-8?q?email=2Emessage_links_in_the_mailbox_docs=2E?=
Message-ID: <3XT2nQ4tNLzNZP@mail.python.org>

http://hg.python.org/cpython/rev/aad3cec524f9
changeset:   79226:aad3cec524f9
branch:      2.7
parent:      79215:08aa289a757c
user:        R David Murray <rdmurray at bitdance.com>
date:        Fri Sep 28 15:21:32 2012 -0400
summary:
  #16071: fix email.message links in the mailbox docs.

files:
  Doc/library/mailbox.rst |  18 ++++++++++--------
  1 files changed, 10 insertions(+), 8 deletions(-)


diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -11,8 +11,9 @@
 This module defines two classes, :class:`Mailbox` and :class:`Message`, for
 accessing and manipulating on-disk mailboxes and the messages they contain.
 :class:`Mailbox` offers a dictionary-like mapping from keys to messages.
-:class:`Message` extends the :mod:`email.Message` module's :class:`Message`
-class with format-specific state and behavior. Supported mailbox formats are
+:class:`Message` extends the :mod:`email.message` module's
+:class:`~email.message.Message` class with format-specific state and behavior.
+Supported mailbox formats are
 Maildir, mbox, MH, Babyl, and MMDF.
 
 
@@ -83,7 +84,7 @@
       it.
 
       Parameter *message* may be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, or a file-like object
+      :class:`email.message.Message` instance, a string, or a file-like object
       (which should be open in text mode). If *message* is an instance of the
       appropriate format-specific :class:`Message` subclass (e.g., if it's an
       :class:`mboxMessage` instance and this is an :class:`mbox` instance), its
@@ -110,7 +111,7 @@
       :exc:`KeyError` exception if no message already corresponds to *key*.
 
       As with :meth:`add`, parameter *message* may be a :class:`Message`
-      instance, an :class:`email.Message.Message` instance, a string, or a
+      instance, an :class:`email.message.Message` instance, a string, or a
       file-like object (which should be open in text mode). If *message* is an
       instance of the appropriate format-specific :class:`Message` subclass
       (e.g., if it's an :class:`mboxMessage` instance and this is an
@@ -743,11 +744,12 @@
 
 .. class:: Message([message])
 
-   A subclass of the :mod:`email.Message` module's :class:`Message`. Subclasses of
-   :class:`mailbox.Message` add mailbox-format-specific state and behavior.
+   A subclass of the :mod:`email.message` module's
+   :class:`~email.message.Message`. Subclasses of :class:`mailbox.Message` add
+   mailbox-format-specific state and behavior.
 
    If *message* is omitted, the new instance is created in a default, empty state.
-   If *message* is an :class:`email.Message.Message` instance, its contents are
+   If *message* is an :class:`email.message.Message` instance, its contents are
    copied; furthermore, any format-specific information is converted insofar as
    possible if *message* is a :class:`Message` instance. If *message* is a string
    or a file, it should contain an :rfc:`2822`\ -compliant message, which is read
@@ -1251,7 +1253,7 @@
 
       Set the message's visible headers to be the same as the headers in
       *message*.  Parameter *visible* should be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, or a file-like object
+      :class:`email.message.Message` instance, a string, or a file-like object
       (which should be open in text mode).
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 21:49:01 2012
From: python-checkins at python.org (mark.dickinson)
Date: Fri, 28 Sep 2012 21:49:01 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWVzICMxNjAy?=
 =?utf-8?q?9=2C_=2316030=3A_Fix_pickling_and_repr_of_large_xranges=2E?=
Message-ID: <3XT3Ns2YjtzNtV@mail.python.org>

http://hg.python.org/cpython/rev/bff269ee7288
changeset:   79227:bff269ee7288
branch:      2.7
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Fri Sep 28 20:36:36 2012 +0100
summary:
  Issues #16029, #16030: Fix pickling and repr of large xranges.

files:
  Lib/test/test_xrange.py |  75 +++++++++++++++++++++++++++++
  Misc/NEWS               |   6 ++
  Objects/rangeobject.c   |  34 +++++++++++-
  3 files changed, 110 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_xrange.py b/Lib/test/test_xrange.py
--- a/Lib/test/test_xrange.py
+++ b/Lib/test/test_xrange.py
@@ -46,6 +46,28 @@
                 self.fail('{}: wrong element at position {};'
                           'expected {}, got {}'.format(test_id, i, y, x))
 
+    def assert_xranges_equivalent(self, x, y):
+        # Check that two xrange objects are equivalent, in the sense of the
+        # associated sequences being the same.  We want to use this for large
+        # xrange objects, so instead of converting to lists and comparing
+        # directly we do a number of indirect checks.
+        if len(x) != len(y):
+            self.fail('{} and {} have different '
+                      'lengths: {} and {} '.format(x, y, len(x), len(y)))
+        if len(x) >= 1:
+            if x[0] != y[0]:
+                self.fail('{} and {} have different initial '
+                          'elements: {} and {} '.format(x, y, x[0], y[0]))
+            if x[-1] != y[-1]:
+                self.fail('{} and {} have different final '
+                          'elements: {} and {} '.format(x, y, x[-1], y[-1]))
+        if len(x) >= 2:
+            x_step = x[1] - x[0]
+            y_step = y[1] - y[0]
+            if x_step != y_step:
+                self.fail('{} and {} have different step: '
+                          '{} and {} '.format(x, y, x_step, y_step))
+
     def test_xrange(self):
         self.assertEqual(list(xrange(3)), [0, 1, 2])
         self.assertEqual(list(xrange(1, 5)), [1, 2, 3, 4])
@@ -104,6 +126,59 @@
                 self.assertEqual(list(pickle.loads(pickle.dumps(r, proto))),
                                  list(r))
 
+        M = min(sys.maxint, sys.maxsize)
+        large_testcases = testcases + [
+            (0, M, 1),
+            (M, 0, -1),
+            (0, M, M - 1),
+            (M // 2, M, 1),
+            (0, -M, -1),
+            (0, -M, 1 - M),
+            (-M, M, 2),
+            (-M, M, 1024),
+            (-M, M, 10585),
+            (M, -M, -2),
+            (M, -M, -1024),
+            (M, -M, -10585),
+            ]
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            for t in large_testcases:
+                r = xrange(*t)
+                r_out = pickle.loads(pickle.dumps(r, proto))
+                self.assert_xranges_equivalent(r_out, r)
+
+    def test_repr(self):
+        # Check that repr of an xrange is a valid representation
+        # of that xrange.
+
+        # Valid xranges have at most min(sys.maxint, sys.maxsize) elements.
+        M = min(sys.maxint, sys.maxsize)
+
+        testcases = [
+            (13,),
+            (0, 11),
+            (-22, 10),
+            (20, 3, -1),
+            (13, 21, 3),
+            (-2, 2, 2),
+            (0, M, 1),
+            (M, 0, -1),
+            (0, M, M - 1),
+            (M // 2, M, 1),
+            (0, -M, -1),
+            (0, -M, 1 - M),
+            (-M, M, 2),
+            (-M, M, 1024),
+            (-M, M, 10585),
+            (M, -M, -2),
+            (M, -M, -1024),
+            (M, -M, -10585),
+            ]
+        for t in testcases:
+            r = xrange(*t)
+            r_out = eval(repr(r))
+            self.assert_xranges_equivalent(r, r_out)
+
     def test_range_iterators(self):
         # see issue 7298
         limits = [base + jiggle
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,12 @@
 Core and Builtins
 -----------------
 
+- Issue #16030: Fix overflow bug in computing the `repr` of an xrange object
+  with large start, step or length.
+
+- Issue #16029: Fix overflow bug occurring when pickling xranges with large
+  start, step or length.
+
 - Issue #16037: Limit httplib's _read_status() function to work around broken
   HTTP servers and reduce memory usage. It's actually a backport of a Python
   3.2 fix. Thanks to Adrien Kunysz.
diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c
--- a/Objects/rangeobject.c
+++ b/Objects/rangeobject.c
@@ -37,6 +37,30 @@
     return 0UL;
 }
 
+/* Return a stop value suitable for reconstructing the xrange from
+ * a (start, stop, step) triple.  Used in range_repr and range_reduce.
+ * Computes start + len * step, clipped to the range [LONG_MIN, LONG_MAX].
+ */
+static long
+get_stop_for_range(rangeobject *r)
+{
+    long last;
+
+    if (r->len == 0)
+        return r->start;
+
+    /* The tricky bit is avoiding overflow.  We first compute the last entry in
+       the xrange, start + (len - 1) * step, which is guaranteed to lie within
+       the range of a long, and then add step to it.  See the range_reverse
+       comments for an explanation of the casts below.
+    */
+    last = (long)(r->start + (unsigned long)(r->len - 1) * r->step);
+    if (r->step > 0)
+        return last > LONG_MAX - r->step ? LONG_MAX : last + r->step;
+    else
+        return last < LONG_MIN - r->step ? LONG_MIN : last + r->step;
+}
+
 static PyObject *
 range_new(PyTypeObject *type, PyObject *args, PyObject *kw)
 {
@@ -112,17 +136,17 @@
 
     if (r->start == 0 && r->step == 1)
         rtn = PyString_FromFormat("xrange(%ld)",
-                                  r->start + r->len * r->step);
+                                  get_stop_for_range(r));
 
     else if (r->step == 1)
         rtn = PyString_FromFormat("xrange(%ld, %ld)",
                                   r->start,
-                                  r->start + r->len * r->step);
+                                  get_stop_for_range(r));
 
     else
         rtn = PyString_FromFormat("xrange(%ld, %ld, %ld)",
                                   r->start,
-                                  r->start + r->len * r->step,
+                                  get_stop_for_range(r),
                                   r->step);
     return rtn;
 }
@@ -131,9 +155,9 @@
 static PyObject *
 range_reduce(rangeobject *r, PyObject *args)
 {
-    return Py_BuildValue("(O(iii))", Py_TYPE(r),
+    return Py_BuildValue("(O(lll))", Py_TYPE(r),
                          r->start,
-                         r->start + r->len * r->step,
+                         get_stop_for_range(r),
                          r->step);
 }
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Fri Sep 28 22:41:45 2012
From: python-checkins at python.org (brett.cannon)
Date: Fri, 28 Sep 2012 22:41:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_some_comments=2E?=
Message-ID: <3XT4Yj3Cl8zNpC@mail.python.org>

http://hg.python.org/cpython/rev/4a979326e6d6
changeset:   79228:4a979326e6d6
parent:      79225:f3bd51cdd958
user:        Brett Cannon <brett at python.org>
date:        Fri Sep 28 16:41:39 2012 -0400
summary:
  Add some comments.

files:
  Lib/importlib/_bootstrap.py |     4 +
  Python/importlib.h          |  6991 +++++++++++-----------
  2 files changed, 3499 insertions(+), 3496 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -1669,7 +1669,11 @@
         elif not name:
             return module
         else:
+            # Figure out where to slice the module's name up to the first dot
+            # in 'name'.
             cut_off = len(name) - len(name.partition('.')[0])
+            # Slice end needs to be positive to alleviate need to special-case
+            # when ``'.' not in name``.
             return sys.modules[module.__name__[:len(module.__name__)-cut_off]]
     else:
         return _handle_fromlist(module, fromlist, _gcd_import)
diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:18:09 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:18:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_configure=2Ein_is_now_configu?=
	=?utf-8?q?re=2Eac?=
Message-ID: <3XTLh14r5zzNpC@mail.python.org>

http://hg.python.org/peps/rev/268cef0537a1
changeset:   4522:268cef0537a1
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:17:57 2012 +0200
summary:
  configure.in is now configure.ac

files:
  pep-0101.txt |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -234,7 +234,7 @@
           ___ Doc/tutorial/stdlib.rst and Doc/tutorial/stdlib2.rst, which have
               each one reference to '[Pp]ython32'.
 
-          ___ Update the version number in configure.in and re-run autoconf.
+          ___ Update the version number in configure.ac and re-run autoconf.
 
           ___ Update the version numbers for the Windows builds in PC/ and
               PCbuild/, which have references to python32.

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sat Sep 29 09:27:41 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Port_=2316012_fix=3A_param?=
 =?utf-8?q?eter_parsing_regression_in_pyexpat_parser_UseForeignDTD=28=29?=
Message-ID: <3XTLv13CVDzPH2@mail.python.org>

http://hg.python.org/cpython/rev/b907f99272c5
changeset:   79229:b907f99272c5
parent:      79135:b356eab13d86
user:        Georg Brandl <georg at python.org>
date:        Mon Sep 24 13:41:52 2012 +0200
summary:
  Port #16012 fix: parameter parsing regression in pyexpat parser UseForeignDTD() method.

files:
  Misc/NEWS         |  9 ++++++++-
  Modules/pyexpat.c |  2 +-
  2 files changed, 9 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,12 @@
 Library
 -------
 
+Extension Modules
+-----------------
+
+- Issue #16012: Fix a regression in pyexpat. The parser's UseForeignDTD()
+  method doesn't require an argument again.
+
 
 What's New in Python 3.3.0 Release Candidate 3?
 ===============================================
@@ -22,7 +28,7 @@
 Core and Builtins
 -----------------
 
-- Issue #15900: Fixed reference leak in PyUnicode_TranslateCharmap().
+- Issue #15900: Fix reference leak in PyUnicode_TranslateCharmap().
 
 - Issue #15926: Fix crash after multiple reinitializations of the interpreter.
 
@@ -59,6 +65,7 @@
 
 - _decimal module: use only C 89 style comments.
 
+
 What's New in Python 3.3.0 Release Candidate 2?
 ===============================================
 
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1035,7 +1035,7 @@
 {
     int flag = 1;
     enum XML_Error rc;
-    if (!PyArg_ParseTuple(args, "p:UseForeignDTD", &flag))
+    if (!PyArg_ParseTuple(args, "|p:UseForeignDTD", &flag))
         return NULL;
     rc = XML_UseForeignDTD(self->itself, flag ? XML_TRUE : XML_FALSE);
     if (rc != XML_ERROR_NONE) {

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:42 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Close_=2316022=3A_What=27s?=
 =?utf-8?q?_New_in_Python_3=2E3_document_is_no_more_at_beta_stage?=
Message-ID: <3XTLv25g1qzPjZ@mail.python.org>

http://hg.python.org/cpython/rev/f6155d9111a2
changeset:   79230:f6155d9111a2
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Sep 24 23:19:17 2012 +0200
summary:
  Close #16022: What's New in Python 3.3 document is no more at beta stage

files:
  Doc/whatsnew/3.3.rst |  4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -48,10 +48,6 @@
 
 This article explains the new features in Python 3.3, compared to 3.2.
 
-.. note:: Beta users should be aware that this document is currently in
-   draft form. It will be updated substantially as Python 3.3 moves towards
-   release, so it's worth checking back even after reading earlier versions.
-
 
 Summary -- Release highlights
 =============================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:44 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:44 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_don=27t_depend_on_=5F=5Fde?=
 =?utf-8?q?bug=5F=5F_because_it=27s_baked_in_at_freeze_time_=28issue_=2316?=
 =?utf-8?q?046=29?=
Message-ID: <3XTLv41G2JzQPb@mail.python.org>

http://hg.python.org/cpython/rev/ff50579241cd
changeset:   79231:ff50579241cd
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Sep 25 11:22:59 2012 -0400
summary:
  don't depend on __debug__ because it's baked in at freeze time (issue #16046)

files:
  Lib/importlib/_bootstrap.py |    17 +-
  Misc/NEWS                   |     2 +
  Python/importlib.h          |  8533 +++++++++++-----------
  3 files changed, 4282 insertions(+), 4270 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -411,25 +411,21 @@
 
 DEBUG_BYTECODE_SUFFIXES = ['.pyc']
 OPTIMIZED_BYTECODE_SUFFIXES = ['.pyo']
-if __debug__:
-    BYTECODE_SUFFIXES = DEBUG_BYTECODE_SUFFIXES
-else:
-    BYTECODE_SUFFIXES = OPTIMIZED_BYTECODE_SUFFIXES
 
 def cache_from_source(path, debug_override=None):
     """Given the path to a .py file, return the path to its .pyc/.pyo file.
 
     The .py file does not need to exist; this simply returns the path to the
     .pyc/.pyo file calculated as if the .py file were imported.  The extension
-    will be .pyc unless __debug__ is not defined, then it will be .pyo.
+    will be .pyc unless sys.flags.optimize is non-zero, then it will be .pyo.
 
     If debug_override is not None, then it must be a boolean and is taken as
-    the value of __debug__ instead.
+    the value of bool(sys.flags.optimize) instead.
 
     If sys.implementation.cache_tag is None then NotImplementedError is raised.
 
     """
-    debug = __debug__ if debug_override is None else debug_override
+    debug = not sys.flags.optimize if debug_override is None else debug_override
     if debug:
         suffixes = DEBUG_BYTECODE_SUFFIXES
     else:
@@ -1688,10 +1684,15 @@
     modules, those two modules must be explicitly passed in.
 
     """
-    global _imp, sys
+    global _imp, sys, BYTECODE_SUFFIXES
     _imp = _imp_module
     sys = sys_module
 
+    if sys.flags.optimize:
+        BYTECODE_SUFFIXES = OPTIMIZED_BYTECODE_SUFFIXES
+    else:
+        BYTECODE_SUFFIXES = DEBUG_BYTECODE_SUFFIXES
+
     for module in (_imp, sys):
         if not hasattr(module, '__loader__'):
             module.__loader__ = BuiltinImporter
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16046: Fix loading sourceless legacy .pyo files.
+
 Library
 -------
 
diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:45 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Issue_=2316060=3A_Fix_a_do?=
 =?utf-8?q?uble_DECREF_in_int=28=29_implementation=2E__Thanks_Serhiy?=
Message-ID: <3XTLv53d6LzP0p@mail.python.org>

http://hg.python.org/cpython/rev/d23eb81bd482
changeset:   79232:d23eb81bd482
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Thu Sep 27 19:38:59 2012 +0100
summary:
  Issue #16060: Fix a double DECREF in int() implementation.  Thanks Serhiy Storchaka.

files:
  Misc/NEWS          |  3 +++
  Objects/abstract.c |  7 +++----
  2 files changed, 6 insertions(+), 4 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@
 
 - Issue #16046: Fix loading sourceless legacy .pyo files.
 
+- Issue #16060: Fix refcounting bug when __trunc__ returns an object
+  whose __int__ gives a non-integer.  Patch by Serhiy Storchaka.
+
 Library
 -------
 
diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1228,11 +1228,10 @@
     nb = Py_TYPE(integral)->tp_as_number;
     if (nb->nb_int) {
         PyObject *as_int = nb->nb_int(integral);
-        Py_DECREF(integral);
-        if (!as_int)
-            return NULL;
-        if (PyLong_Check(as_int))
+        if (!as_int || PyLong_Check(as_int)) {
+            Py_DECREF(integral);
             return as_int;
+        }
         Py_DECREF(as_int);
     }
     PyErr_Format(PyExc_TypeError, error_format, Py_TYPE(integral)->tp_name);

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:46 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_a_versionchanged_note_?=
	=?utf-8?q?for_=239374_changes=2E?=
Message-ID: <3XTLv65hnGzP8b@mail.python.org>

http://hg.python.org/cpython/rev/950320c70fb4
changeset:   79233:950320c70fb4
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 08:59:23 2012 +0200
summary:
  Add a versionchanged note for #9374 changes.

files:
  Doc/library/urllib.parse.rst |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -81,8 +81,7 @@
    this argument is the empty string.
 
    If the *allow_fragments* argument is false, fragment identifiers are not
-   allowed, even if the URL's addressing scheme normally does support them.  The
-   default value for this argument is :const:`True`.
+   allowed.  The default value for this argument is :const:`True`.
 
    The return value is actually an instance of a subclass of :class:`tuple`.  This
    class has the following additional read-only convenience attributes:
@@ -119,6 +118,11 @@
    .. versionchanged:: 3.2
       Added IPv6 URL parsing capabilities.
 
+   .. versionchanged:: 3.3
+      The fragment is now parsed for all URL schemes (unless *allow_fragment* is
+      false), in accordance with :rfc:`3986`.  Previously, a whitelist of
+      schemes that support fragments existed.
+
 
 .. function:: parse_qs(qs, keep_blank_values=False, strict_parsing=False, encoding='utf-8', errors='replace')
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:48 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:48 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Point_=22source=22_links_i?=
 =?utf-8?q?n_the_docs_to_the_3=2E3_versions_in_the_repo=2E?=
Message-ID: <3XTLv80sBFzQVm@mail.python.org>

http://hg.python.org/cpython/rev/0ad0b2f4cb6a
changeset:   79234:0ad0b2f4cb6a
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:03:54 2012 +0200
summary:
  Point "source" links in the docs to the 3.3 versions in the repo.

files:
  Doc/tools/sphinxext/pyspecific.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -10,7 +10,7 @@
 """
 
 ISSUE_URI = 'http://bugs.python.org/issue%s'
-SOURCE_URI = 'http://hg.python.org/cpython/file/default/%s'
+SOURCE_URI = 'http://hg.python.org/cpython/file/3.3/%s'
 
 from docutils import nodes, utils
 from sphinx.util.nodes import split_explicit_title

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:49 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:49 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Bump_version_to_3=2E3=2E0_?=
	=?utf-8?q?final=2E?=
Message-ID: <3XTLv93MPVzQWc@mail.python.org>

http://hg.python.org/cpython/rev/6028b209f07a
changeset:   79235:6028b209f07a
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:04:54 2012 +0200
summary:
  Bump version to 3.3.0 final.

files:
  Include/patchlevel.h      |  6 +++---
  Lib/distutils/__init__.py |  2 +-
  Lib/idlelib/idlever.py    |  2 +-
  Misc/NEWS                 |  5 +----
  Misc/RPM/python-3.3.spec  |  2 +-
  README                    |  4 ++--
  6 files changed, 9 insertions(+), 12 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION	3
 #define PY_MINOR_VERSION	3
 #define PY_MICRO_VERSION	0
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	3
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0rc3+"
+#define PY_VERSION      	"3.3.0"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0rc3"
+__version__ = "3.3.0"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.0rc3"
+IDLE_VERSION = "3.3.0"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5,7 +5,7 @@
 What's New in Python 3.3.0?
 ===========================
 
-*Release date: XX-Sep-2012*
+*Release date: 29-Sep-2012*
 
 Core and Builtins
 -----------------
@@ -15,9 +15,6 @@
 - Issue #16060: Fix refcounting bug when __trunc__ returns an object
   whose __int__ gives a non-integer.  Patch by Serhiy Storchaka.
 
-Library
--------
-
 Extension Modules
 -----------------
 
diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.3.spec
--- a/Misc/RPM/python-3.3.spec
+++ b/Misc/RPM/python-3.3.spec
@@ -39,7 +39,7 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0rc3
+%define version 3.3.0
 %define libvers 3.3
 #--end constants--
 %define release 1pydotorg
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.3.0 release candidate 3
-================================================
+This is Python version 3.3.0
+============================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 2012 Python Software Foundation.  All rights reserved.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:50 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Update_release_date_in_wha?=
	=?utf-8?q?tsnew_document=2E?=
Message-ID: <3XTLvB5WY3zNpC@mail.python.org>

http://hg.python.org/cpython/rev/de6b91d97113
changeset:   79236:de6b91d97113
tag:         v3.3.0
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:06:10 2012 +0200
summary:
  Update release date in whatsnew document.

files:
  Doc/whatsnew/3.3.rst |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -47,6 +47,7 @@
    when researching a change.
 
 This article explains the new features in Python 3.3, compared to 3.2.
+Python 3.3 was released on September 29, 2012.
 
 
 Summary -- Release highlights

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:52 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:52 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Added_tag_v3=2E3=2E0_for_c?=
	=?utf-8?q?hangeset_de6b91d97113?=
Message-ID: <3XTLvD0TB9zNwK@mail.python.org>

http://hg.python.org/cpython/rev/cb84dcb35114
changeset:   79237:cb84dcb35114
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:06:16 2012 +0200
summary:
  Added tag v3.3.0 for changeset de6b91d97113

files:
  .hgtags |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -108,3 +108,4 @@
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
+de6b91d9711329b32e6fd0a3495cc31ff5009625 v3.3.0

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:27:55 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:27:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_with_main_repo_default_branch=2E?=
Message-ID: <3XTLvH31GlzQVm@mail.python.org>

http://hg.python.org/cpython/rev/d4312199103e
changeset:   79238:d4312199103e
parent:      79237:cb84dcb35114
parent:      79228:4a979326e6d6
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:27:15 2012 +0200
summary:
  Merge with main repo default branch.

files:
  Doc/ACKS.txt                             |   239 -
  Doc/about.rst                            |     9 +-
  Doc/c-api/import.rst                     |     2 +-
  Doc/extending/newtypes.rst               |     6 +-
  Doc/faq/windows.rst                      |    10 +-
  Doc/howto/regex.rst                      |    26 +-
  Doc/howto/unicode.rst                    |    27 +-
  Doc/library/argparse.rst                 |    23 +-
  Doc/library/collections.rst              |     2 +-
  Doc/library/configparser.rst             |    19 +-
  Doc/library/crypt.rst                    |    10 +-
  Doc/library/crypto.rst                   |     1 +
  Doc/library/csv.rst                      |    28 +-
  Doc/library/curses.rst                   |    46 +-
  Doc/library/doctest.rst                  |    12 +-
  Doc/library/functions.rst                |    75 +-
  Doc/library/http.client.rst              |     8 +-
  Doc/library/inspect.rst                  |     4 +-
  Doc/library/itertools.rst                |     3 +-
  Doc/library/json.rst                     |    18 +-
  Doc/library/lzma.rst                     |    12 +-
  Doc/library/mailbox.rst                  |    19 +-
  Doc/library/multiprocessing.rst          |     5 +-
  Doc/library/nntplib.rst                  |     6 +-
  Doc/library/optparse.rst                 |    17 +-
  Doc/library/os.rst                       |     5 +-
  Doc/library/ossaudiodev.rst              |     3 +-
  Doc/library/pyexpat.rst                  |     2 +-
  Doc/library/random.rst                   |    11 +-
  Doc/library/site.rst                     |     2 +-
  Doc/library/smtpd.rst                    |    13 +-
  Doc/library/socket.rst                   |     3 +-
  Doc/library/stdtypes.rst                 |    11 +-
  Doc/library/subprocess.rst               |    14 +-
  Doc/library/syslog.rst                   |     3 +-
  Doc/library/textwrap.rst                 |    19 +-
  Doc/library/threading.rst                |     6 +-
  Doc/library/timeit.rst                   |    20 +-
  Doc/library/tkinter.tix.rst              |     2 +-
  Doc/library/types.rst                    |     2 +-
  Doc/library/unittest.mock.rst            |     4 +-
  Doc/library/unittest.rst                 |     2 +-
  Doc/library/urllib.parse.rst             |     5 +-
  Doc/license.rst                          |     6 +-
  Doc/reference/compound_stmts.rst         |    10 +-
  Doc/reference/datamodel.rst              |    26 +-
  Doc/tools/sphinxext/susp-ignored.csv     |     3 +-
  Doc/tutorial/datastructures.rst          |     2 +-
  Doc/tutorial/interpreter.rst             |     8 +-
  Doc/tutorial/introduction.rst            |     3 +-
  Doc/tutorial/stdlib.rst                  |     2 +-
  Doc/tutorial/stdlib2.rst                 |     8 +-
  Doc/whatsnew/3.3.rst                     |   118 +-
  Include/object.h                         |     2 +-
  Include/objimpl.h                        |     9 +-
  Include/pyfpe.h                          |     8 +-
  Include/pymacro.h                        |    14 +
  Lib/_pyio.py                             |     8 +
  Lib/argparse.py                          |    27 +-
  Lib/calendar.py                          |     6 +-
  Lib/doctest.py                           |     7 +-
  Lib/gzip.py                              |     4 +-
  Lib/http/cookiejar.py                    |     4 +-
  Lib/importlib/_bootstrap.py              |     8 +-
  Lib/lib2to3/fixer_util.py                |     4 +-
  Lib/lib2to3/refactor.py                  |     2 +-
  Lib/mailbox.py                           |    46 +-
  Lib/multiprocessing/pool.py              |    15 +-
  Lib/multiprocessing/util.py              |    42 +-
  Lib/socket.py                            |    15 +-
  Lib/test/sample_doctest_no_docstrings.py |    12 +
  Lib/test/sample_doctest_no_doctests.py   |    15 +
  Lib/test/string_tests.py                 |     3 +
  Lib/test/support.py                      |     2 +-
  Lib/test/test_argparse.py                |    81 +
  Lib/test/test_ast.py                     |     8 +
  Lib/test/test_calendar.py                |     6 +
  Lib/test/test_codecs.py                  |   116 +
  Lib/test/test_compileall.py              |    16 +-
  Lib/test/test_csv.py                     |     9 +
  Lib/test/test_decimal.py                 |    12 +-
  Lib/test/test_doctest.py                 |    25 +
  Lib/test/test_gdb.py                     |     5 +
  Lib/test/test_import.py                  |     2 +-
  Lib/test/test_importlib/test_locks.py    |    22 +-
  Lib/test/test_int.py                     |    12 +
  Lib/test/test_io.py                      |     5 +
  Lib/test/test_mailbox.py                 |    63 +-
  Lib/test/test_memoryio.py                |     7 +-
  Lib/test/test_mmap.py                    |     9 +
  Lib/test/test_multiprocessing.py         |     3 +-
  Lib/test/test_os.py                      |    26 +-
  Lib/test/test_pyexpat.py                 |    10 +
  Lib/test/test_socket.py                  |    11 +
  Lib/test/test_ssl.py                     |     8 +-
  Lib/test/test_startfile.py               |    15 +-
  Lib/test/test_super.py                   |    15 +
  Lib/test/test_support.py                 |     9 +
  Lib/test/test_textwrap.py                |    64 +-
  Lib/test/test_threaded_import.py         |     4 +-
  Lib/test/test_types.py                   |     2 +-
  Lib/test/test_webbrowser.py              |   192 +
  Lib/test/test_xml_etree.py               |    12 +
  Lib/test/test_zipimport_support.py       |    21 +-
  Lib/unittest/__main__.py                 |     9 +-
  Lib/unittest/mock.py                     |     4 +-
  Lib/unittest/runner.py                   |     2 +-
  Lib/unittest/test/test_runner.py         |    13 +
  Lib/unittest/test/testmock/testmock.py   |     7 +
  Lib/webbrowser.py                        |    15 +-
  Lib/xml/etree/ElementTree.py             |     2 +-
  Makefile.pre.in                          |    17 +-
  Misc/ACKS                                |   122 +-
  Misc/NEWS                                |   123 +-
  Modules/_csv.c                           |    11 +-
  Modules/_cursesmodule.c                  |     1 +
  Modules/_decimal/tests/bench.py          |    47 +-
  Modules/_elementtree.c                   |     2 +-
  Modules/_io/_iomodule.c                  |     2 +-
  Modules/_io/bytesio.c                    |    24 +-
  Modules/_io/iobase.c                     |     2 +-
  Modules/_io/stringio.c                   |    19 +-
  Modules/_io/textio.c                     |     2 +-
  Modules/_ssl.c                           |     2 +-
  Modules/_testbuffer.c                    |     7 +-
  Modules/mmapmodule.c                     |    11 +
  Modules/posixmodule.c                    |     9 +-
  Modules/selectmodule.c                   |     2 +-
  Modules/socketmodule.c                   |     3 +-
  Modules/zipimport.c                      |     8 +-
  Objects/classobject.c                    |     3 +-
  Objects/longobject.c                     |    10 +-
  Objects/memoryobject.c                   |    78 +-
  Objects/obmalloc.c                       |     7 +-
  Objects/setobject.c                      |     4 +-
  Objects/stringlib/codecs.h               |    14 +-
  Objects/stringlib/fastsearch.h           |     3 +-
  Objects/stringlib/find_max_char.h        |    11 +-
  Objects/tupleobject.c                    |     4 +-
  Objects/typeobject.c                     |    28 +-
  Objects/unicodeobject.c                  |    27 +-
  Parser/node.c                            |     2 +-
  Python/ast.c                             |   187 +-
  Python/formatter_unicode.c               |     2 +-
  Python/getargs.c                         |     1 +
  Python/importlib.h                       |  6991 ++++-----
  Python/pyarena.c                         |     8 +-
  Python/structmember.c                    |     6 +-
  Python/symtable.c                        |     8 +-
  setup.py                                 |     2 +
  150 files changed, 5467 insertions(+), 4378 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
deleted file mode 100644
--- a/Doc/ACKS.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-Contributors to the Python Documentation
-----------------------------------------
-
-This section lists people who have contributed in some way to the Python
-documentation.  It is probably not complete -- if you feel that you or
-anyone else should be on this list, please let us know (send email to
-docs at python.org), and we'll be glad to correct the problem.
-
-.. acks::
-
-   * Aahz
-   * Michael Abbott
-   * Steve Alexander
-   * Jim Ahlstrom
-   * Fred Allen
-   * A. Amoroso
-   * Pehr Anderson
-   * Oliver Andrich
-   * Heidi Annexstad
-   * Jes?s Cea Avi?n
-   * Manuel Balsera
-   * Daniel Barclay
-   * Chris Barker
-   * Don Bashford
-   * Anthony Baxter
-   * Alexander Belopolsky
-   * Bennett Benson
-   * Jonathan Black
-   * Robin Boerdijk
-   * Michal Bozon
-   * Aaron Brancotti
-   * Georg Brandl
-   * Keith Briggs
-   * Ian Bruntlett
-   * Lee Busby
-   * Arnaud Calmettes
-   * Lorenzo M. Catucci
-   * Carl Cerecke
-   * Mauro Cicognini
-   * Gilles Civario
-   * Mike Clarkson
-   * Steve Clift
-   * Dave Cole
-   * Matthew Cowles
-   * Jeremy Craven
-   * Andrew Dalke
-   * Ben Darnell
-   * L. Peter Deutsch
-   * Robert Donohue
-   * Fred L. Drake, Jr.
-   * Jacques Ducasse
-   * Josip Dzolonga
-   * Jeff Epler
-   * Michael Ernst
-   * Blame Andy Eskilsson
-   * Carey Evans
-   * Martijn Faassen
-   * Carl Feynman
-   * Dan Finnie
-   * Hern?n Mart?nez Foffani
-   * Michael Foord
-   * Stefan Franke
-   * Jim Fulton
-   * Peter Funk
-   * Ethan Furman
-   * Lele Gaifax
-   * Matthew Gallagher
-   * Gabriel Genellina
-   * Ben Gertzfield
-   * Nadim Ghaznavi
-   * Jonathan Giddy
-   * Matt Giuca
-   * Shelley Gooch
-   * Nathaniel Gray
-   * Grant Griffin
-   * Thomas Guettler
-   * Anders Hammarquist
-   * Mark Hammond
-   * Harald Hanche-Olsen
-   * Manus Hand
-   * Gerhard H?ring
-   * Travis B. Hartwell
-   * Tim Hatch
-   * Janko Hauser
-   * Ben Hayden
-   * Thomas Heller
-   * Bernhard Herzog
-   * Magnus L. Hetland
-   * Konrad Hinsen
-   * Stefan Hoffmeister
-   * Albert Hofkamp
-   * Gregor Hoffleit
-   * Steve Holden
-   * Thomas Holenstein
-   * Gerrit Holl
-   * Rob Hooft
-   * Brian Hooper
-   * Randall Hopper
-   * Michael Hudson
-   * Eric Huss
-   * Jeremy Hylton
-   * Roger Irwin
-   * Jack Jansen
-   * Philip H. Jensen
-   * Pedro Diaz Jimenez
-   * Kent Johnson
-   * Lucas de Jonge
-   * Andreas Jung
-   * Robert Kern
-   * Jim Kerr
-   * Jan Kim
-   * Kamil Kisiel
-   * Greg Kochanski
-   * Guido Kollerie
-   * Peter A. Koren
-   * Daniel Kozan
-   * Andrew M. Kuchling
-   * Dave Kuhlman
-   * Erno Kuusela
-   * Ross Lagerwall
-   * Thomas Lamb
-   * Detlef Lannert
-   * Piers Lauder
-   * Julia Lawall
-   * Glyph Lefkowitz
-   * Robert Lehmann
-   * Marc-Andr? Lemburg
-   * Ross Light
-   * Gediminas Liktaras
-   * Ulf A. Lindgren
-   * Everett Lipman
-   * Mirko Liss
-   * Martin von L?wis
-   * Fredrik Lundh
-   * Jeff MacDonald
-   * John Machin
-   * Andrew MacIntyre
-   * Vladimir Marangozov
-   * Vincent Marchetti
-   * Westley Mart?nez
-   * Laura Matson
-   * Daniel May
-   * Rebecca McCreary
-   * Doug Mennella
-   * Paolo Milani
-   * Skip Montanaro
-   * Paul Moore
-   * Ross Moore
-   * Sjoerd Mullender
-   * Dale Nagata
-   * Trent Nelson
-   * Michal Nowikowski
-   * Steffen Daode Nurpmeso
-   * Ng Pheng Siong
-   * Koray Oner
-   * Tomas Oppelstrup
-   * Denis S. Otkidach
-   * Zooko O'Whielacronx
-   * Shriphani Palakodety
-   * William Park
-   * Joonas Paalasmaa
-   * Harri Pasanen
-   * Bo Peng
-   * Tim Peters
-   * Benjamin Peterson
-   * Christopher Petrilli
-   * Justin D. Pettit
-   * Chris Phoenix
-   * Fran?ois Pinard
-   * Paul Prescod
-   * Eric S. Raymond
-   * Edward K. Ream
-   * Terry J. Reedy
-   * Sean Reifschneider
-   * Bernhard Reiter
-   * Armin Rigo
-   * Wes Rishel
-   * Armin Ronacher
-   * Jim Roskind
-   * Guido van Rossum
-   * Donald Wallace Rouse II
-   * Mark Russell
-   * Nick Russo
-   * Chris Ryland
-   * Constantina S.
-   * Hugh Sasse
-   * Bob Savage
-   * Scott Schram
-   * Neil Schemenauer
-   * Barry Scott
-   * Joakim Sernbrant
-   * Justin Sheehy
-   * Charlie Shepherd
-   * Yue Shuaijie
-   * SilentGhost
-   * Michael Simcich
-   * Ionel Simionescu
-   * Michael Sloan
-   * Gregory P. Smith
-   * Roy Smith
-   * Clay Spence
-   * Nicholas Spies
-   * Tage Stabell-Kulo
-   * Frank Stajano
-   * Anthony Starks
-   * Greg Stein
-   * Peter Stoehr
-   * Mark Summerfield
-   * Reuben Sumner
-   * Kalle Svensson
-   * Jim Tittsler
-   * David Turner
-   * Sandro Tosi
-   * Ville Vainio
-   * Nadeem Vawda
-   * Martijn Vries
-   * Charles G. Waldman
-   * Greg Ward
-   * Barry Warsaw
-   * Corran Webster
-   * Glyn Webster
-   * Bob Weiner
-   * Eddy Welbourne
-   * Jeff Wheeler
-   * Mats Wichmann
-   * Gerry Wiener
-   * Timothy Wild
-   * Paul Winkler
-   * Collin Winter
-   * Blake Winton
-   * Dan Wolfe
-   * Adam Woodbeck
-   * Steven Work
-   * Thomas Wouters
-   * Ka-Ping Yee
-   * Rory Yorke
-   * Moshe Zadka
-   * Milan Zamazal
-   * Cheng Zhang
diff --git a/Doc/about.rst b/Doc/about.rst
--- a/Doc/about.rst
+++ b/Doc/about.rst
@@ -29,8 +29,13 @@
 See :ref:`reporting-bugs` for information how to report bugs in this
 documentation, or Python itself.
 
-.. including the ACKS file here so that it can be maintained separately
-.. include:: ACKS.txt
+
+Contributors to the Python Documentation
+----------------------------------------
+
+Many people have contributed to the Python language, the Python standard
+library, and the Python documentation.  See :source:`Misc/ACKS` in the Python
+source distribution for a partial list of contributors.
 
 It is only with the input and contributions of the Python community
 that Python has such wonderful documentation -- Thank You!
diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
--- a/Doc/c-api/import.rst
+++ b/Doc/c-api/import.rst
@@ -76,7 +76,7 @@
    UTF-8 encoded string instead of a Unicode object.
 
    .. versionchanged:: 3.3
-         Negative values for **level** are no longer accepted.
+         Negative values for *level* are no longer accepted.
 
 .. c:function:: PyObject* PyImport_Import(PyObject *name)
 
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1277,9 +1277,9 @@
 bit does not indicate that the slot values are non-*NULL*. The flag may be set
 to indicate the presence of a slot, but a slot may still be unfilled.) ::
 
-   PyNumberMethods   tp_as_number;
-   PySequenceMethods tp_as_sequence;
-   PyMappingMethods  tp_as_mapping;
+   PyNumberMethods   *tp_as_number;
+   PySequenceMethods *tp_as_sequence;
+   PyMappingMethods  *tp_as_mapping;
 
 If you wish your object to be able to act like a number, a sequence, or a
 mapping object, then you place the address of a structure that implements the C
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -464,13 +464,13 @@
 Why does os.path.isdir() fail on NT shared directories?
 -------------------------------------------------------
 
-The solution appears to be always append the "\\" on the end of shared
-drives.
+In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
+end of the shared drive::
 
    >>> import os
-   >>> os.path.isdir( '\\\\rorschach\\public')
+   >>> os.path.isdir('\\\\rorschach\\public')
    0
-   >>> os.path.isdir( '\\\\rorschach\\public\\')
+   >>> os.path.isdir('\\\\rorschach\\public\\')
    1
 
 It helps to think of share points as being like drive letters.  Example::
@@ -480,7 +480,7 @@
    k:\media is a directory
    k:\media\ is not a directory
 
-The same rules apply if you substitute "k:" with "\\conky\foo"::
+The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
 
    \\conky\foo  is not a directory
    \\conky\foo\ is a directory
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -260,7 +260,7 @@
 
    >>> import re
    >>> p = re.compile('ab*')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 :func:`re.compile` also accepts an optional *flags* argument, used to enable
@@ -372,7 +372,7 @@
 
    >>> import re
    >>> p = re.compile('[a-z]+')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 Now, you can try matching various strings against the RE ``[a-z]+``.  An empty
@@ -390,7 +390,7 @@
 result in a variable for later use. ::
 
    >>> m = p.match('tempo')
-   >>> m
+   >>> m  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Now you can query the :class:`MatchObject` for information about the matching
@@ -429,7 +429,7 @@
 
    >>> print(p.match('::: message'))
    None
-   >>> m = p.search('::: message') ; print(m)
+   >>> m = p.search('::: message'); print(m)  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
    >>> m.group()
    'message'
@@ -458,7 +458,7 @@
 instances as an :term:`iterator`::
 
    >>> iterator = p.finditer('12 drummers drumming, 11 ... 10 ...')
-   >>> iterator
+   >>> iterator  #doctest: +ELLIPSIS
    <callable_iterator object at 0x...>
    >>> for match in iterator:
    ...     print(match.span())
@@ -480,7 +480,7 @@
 
    >>> print(re.match(r'From\s+', 'Fromage amk'))
    None
-   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')
+   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Under the hood, these functions simply create a pattern object for you
@@ -682,7 +682,7 @@
    For example, if you wish to match the word ``From`` only at the beginning of a
    line, the RE to use is ``^From``. ::
 
-      >>> print(re.search('^From', 'From Here to Eternity'))
+      >>> print(re.search('^From', 'From Here to Eternity'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('^From', 'Reciting From Memory'))
       None
@@ -694,11 +694,11 @@
    Matches at the end of a line, which is defined as either the end of the string,
    or any location followed by a newline character.     ::
 
-      >>> print(re.search('}$', '{block}'))
+      >>> print(re.search('}$', '{block}'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('}$', '{block} '))
       None
-      >>> print(re.search('}$', '{block}\n'))
+      >>> print(re.search('}$', '{block}\n'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    To match a literal ``'$'``, use ``\$`` or enclose it inside a character class,
@@ -723,7 +723,7 @@
    match when it's contained inside another word. ::
 
       >>> p = re.compile(r'\bclass\b')
-      >>> print(p.search('no class at all'))
+      >>> print(p.search('no class at all'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(p.search('the declassified algorithm'))
       None
@@ -741,7 +741,7 @@
       >>> p = re.compile('\bclass\b')
       >>> print(p.search('no class at all'))
       None
-      >>> print(p.search('\b' + 'class' + '\b')  )
+      >>> print(p.search('\b' + 'class' + '\b'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    Second, inside a character class, where there's no use for this assertion,
@@ -1182,9 +1182,9 @@
 In the following example, the replacement function translates  decimals into
 hexadecimal::
 
-   >>> def hexrepl( match ):
+   >>> def hexrepl(match):
    ...     "Return the hex string for a decimal number"
-   ...     value = int( match.group() )
+   ...     value = int(match.group())
    ...     return hex(value)
    ...
    >>> p = re.compile(r'\d+')
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -257,13 +257,13 @@
 'REPLACEMENT CHARACTER'), or 'ignore' (just leave the character out of the
 Unicode result).  The following examples show the differences::
 
-    >>> b'\x80abc'.decode("utf-8", "strict")
+    >>> b'\x80abc'.decode("utf-8", "strict")  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeDecodeError: 'utf8' codec can't decode byte 0x80 in position 0:
-                        unexpected code byte
+        ...
+    UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
+      invalid start byte
     >>> b'\x80abc'.decode("utf-8", "replace")
-    '?abc'
+    '\ufffdabc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 
@@ -301,11 +301,11 @@
     >>> u = chr(40960) + 'abcd' + chr(1972)
     >>> u.encode('utf-8')
     b'\xea\x80\x80abcd\xde\xb4'
-    >>> u.encode('ascii')
+    >>> u.encode('ascii')  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+        ...
     UnicodeEncodeError: 'ascii' codec can't encode character '\ua000' in
-                        position 0: ordinal not in range(128)
+      position 0: ordinal not in range(128)
     >>> u.encode('ascii', 'ignore')
     b'abcd'
     >>> u.encode('ascii', 'replace')
@@ -331,12 +331,11 @@
 not four::
 
     >>> s = "a\xac\u1234\u20ac\U00008000"
-              ^^^^ two-digit hex escape
-                   ^^^^^ four-digit Unicode escape
-                              ^^^^^^^^^^ eight-digit Unicode escape
-    >>> for c in s:  print(ord(c), end=" ")
-    ...
-    97 172 4660 8364 32768
+    ... #     ^^^^ two-digit hex escape
+    ... #         ^^^^^^ four-digit Unicode escape
+    ... #                     ^^^^^^^^^^ eight-digit Unicode escape
+    >>> [ord(c) for c in s]
+    [97, 172, 4660, 8364, 32768]
 
 Using escape sequences for code points greater than 127 is fine in small doses,
 but becomes an annoyance if you're using many accented characters, as you would
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -130,9 +130,12 @@
 ArgumentParser objects
 ----------------------
 
-.. class:: ArgumentParser([description], [epilog], [prog], [usage], [add_help], \
-                          [argument_default], [parents], [prefix_chars], \
-                          [conflict_handler], [formatter_class])
+.. class:: ArgumentParser(prog=None, usage=None, description=None, \
+                          epilog=None, parents=[], \
+                          formatter_class=argparse.HelpFormatter, \
+                          prefix_chars='-', fromfile_prefix_chars=None, \
+                          argument_default=None, conflict_handler='error', \
+                          add_help=True)
 
    Create a new :class:`ArgumentParser` object.  Each parameter has its own more
    detailed description below, but in short they are:
@@ -920,6 +923,17 @@
    >>> parser.parse_args(''.split())
    Namespace(foo=42)
 
+If the ``default`` value is a string, the parser parses the value as if it
+were a command-line argument.  In particular, the parser applies any type_
+conversion argument, if provided, before setting the attribute on the
+:class:`Namespace` return value.  Otherwise, the parser uses the value as is::
+
+   >>> parser = argparse.ArgumentParser()
+   >>> parser.add_argument('--length', default='10', type=int)
+   >>> parser.add_argument('--width', default=10.5, type=int)
+   >>> parser.parse_args()
+   Namespace(length=10, width=10.5)
+
 For positional arguments with nargs_ equal to ``?`` or ``*``, the ``default`` value
 is used when no command-line argument was present::
 
@@ -958,6 +972,9 @@
    >>> parser.parse_args('2 temp.txt'.split())
    Namespace(bar=<_io.TextIOWrapper name='temp.txt' encoding='UTF-8'>, foo=2)
 
+See the section on the default_ keyword argument for information on when the
+``type`` argument is applied to default arguments.
+
 To ease the use of various types of files, the argparse module provides the
 factory FileType which takes the ``mode=`` and ``bufsize=`` arguments of the
 :func:`open` function.  For example, ``FileType('w')`` can be used to create a
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -1012,7 +1012,7 @@
 to the end and the sort is not maintained.
 
 It is also straight-forward to create an ordered dictionary variant
-that the remembers the order the keys were *last* inserted.
+that remembers the order the keys were *last* inserted.
 If a new entry overwrites an existing entry, the
 original insertion position is changed and moved to the end::
 
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1007,7 +1007,7 @@
       .. versionadded:: 3.2
 
 
-   .. method:: get(section, option, raw=False, [vars, fallback])
+   .. method:: get(section, option, *, raw=False, vars=None[, fallback])
 
       Get an *option* value for the named *section*.  If *vars* is provided, it
       must be a dictionary.  The *option* is looked up in *vars* (if provided),
@@ -1025,21 +1025,21 @@
          (especially when using the mapping protocol).
 
 
-   .. method:: getint(section, option, raw=False, [vars, fallback])
+   .. method:: getint(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to an integer.  See :meth:`get` for explanation of *raw*, *vars* and
       *fallback*.
 
 
-   .. method:: getfloat(section, option, raw=False, [vars, fallback])
+   .. method:: getfloat(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a floating point number.  See :meth:`get` for explanation of *raw*,
       *vars* and *fallback*.
 
 
-   .. method:: getboolean(section, option, raw=False, [vars, fallback])
+   .. method:: getboolean(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a Boolean value.  Note that the accepted values for the option are
@@ -1051,7 +1051,8 @@
       *fallback*.
 
 
-   .. method:: items([section], raw=False, vars=None)
+   .. method:: items(raw=False, vars=None)
+               items(section, raw=False, vars=None)
 
       When *section* is not given, return a list of *section_name*,
       *section_proxy* pairs, including DEFAULTSECT.
@@ -1149,7 +1150,13 @@
 RawConfigParser Objects
 -----------------------
 
-.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configaparser.DEFAULTSECT, interpolation=None)
+.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, \
+                           allow_no_value=False, *, delimiters=('=', ':'), \
+                           comment_prefixes=('#', ';'), \
+                           inline_comment_prefixes=None, strict=True, \
+                           empty_lines_in_values=True, \
+                           default_section=configparser.DEFAULTSECT[, \
+                           interpolation])
 
    Legacy variant of the :class:`ConfigParser` with interpolation disabled
    by default and unsafe ``add_section`` and ``set`` methods.
diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -121,11 +121,14 @@
 Examples
 --------
 
-A simple example illustrating typical use::
+A simple example illustrating typical use (a constant-time comparison
+operation is needed to limit exposure to timing attacks.
+:func:`hmac.compare_digest` is suitable for this purpose)::
 
    import pwd
    import crypt
    import getpass
+   from hmac import compare_digest as compare_hash
 
    def login():
        username = input('Python login: ')
@@ -134,7 +137,7 @@
            if cryptedpasswd == 'x' or cryptedpasswd == '*':
                raise ValueError('no support for shadow passwords')
            cleartext = getpass.getpass()
-           return crypt.crypt(cleartext, cryptedpasswd) == cryptedpasswd
+           return compare_hash(crypt.crypt(cleartext, cryptedpasswd), cryptedpasswd)
        else:
            return True
 
@@ -142,7 +145,8 @@
 check it against the original::
 
    import crypt
+   from hmac import compare_digest as compare_hash
 
    hashed = crypt.crypt(plaintext)
-   if hashed != crypt.crypt(plaintext, hashed):
+   if not compare_hash(hashed, crypt.crypt(plaintext, hashed)):
       raise ValueError("hashed version doesn't validate against original")
diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst
--- a/Doc/library/crypto.rst
+++ b/Doc/library/crypto.rst
@@ -8,6 +8,7 @@
 
 The modules described in this chapter implement various algorithms of a
 cryptographic nature.  They are available at the discretion of the installation.
+On Unix systems, the :mod:`crypt` module may also be available.
 Here's an overview:
 
 
diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -71,9 +71,10 @@
    A short usage example::
 
       >>> import csv
-      >>> spamReader = csv.reader(open('eggs.csv', newline=''), delimiter=' ', quotechar='|')
-      >>> for row in spamReader:
-      ...     print(', '.join(row))
+      >>> with open('eggs.csv', newline='') as csvfile:
+      ...     spamreader = csv.reader(csvfile, delimiter=' ', quotechar='|')
+      ...     for row in spamreader:
+      ...         print(', '.join(row))
       Spam, Spam, Spam, Spam, Spam, Baked Beans
       Spam, Lovely Spam, Wonderful Spam
 
@@ -99,11 +100,12 @@
 
    A short usage example::
 
-      >>> import csv
-      >>> spamWriter = csv.writer(open('eggs.csv', 'w', newline=''), delimiter=' ',
-      ...                         quotechar='|', quoting=csv.QUOTE_MINIMAL)
-      >>> spamWriter.writerow(['Spam'] * 5 + ['Baked Beans'])
-      >>> spamWriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
+      import csv
+      with open('eggs.csv', 'w', newline='') as csvfile:
+          spamwriter = csv.writer(csvfile, delimiter=' ',
+                                  quotechar='|', quoting=csv.QUOTE_MINIMAL)
+          spamwriter.writerow(['Spam'] * 5 + ['Baked Beans'])
+          spamwriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
 
 
 .. function:: register_dialect(name[, dialect], **fmtparams)
@@ -221,11 +223,11 @@
 
 An example for :class:`Sniffer` use::
 
-   csvfile = open("example.csv")
-   dialect = csv.Sniffer().sniff(csvfile.read(1024))
-   csvfile.seek(0)
-   reader = csv.reader(csvfile, dialect)
-   # ... process CSV file contents here ...
+   with open('example.csv') as csvfile:
+       dialect = csv.Sniffer().sniff(csvfile.read(1024))
+       csvfile.seek(0)
+       reader = csv.reader(csvfile, dialect)
+       # ... process CSV file contents here ...
 
 
 The :mod:`csv` module defines the following constants:
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -377,7 +377,8 @@
    is to be displayed.
 
 
-.. function:: newwin([nlines, ncols,] begin_y, begin_x)
+.. function:: newwin(begin_y, begin_x)
+              newwin(nlines, ncols, begin_y, begin_x)
 
    Return a new window, whose left-upper corner is at  ``(begin_y, begin_x)``, and
    whose height/width is  *nlines*/*ncols*.
@@ -656,7 +657,8 @@
 the following methods and attributes:
 
 
-.. method:: window.addch([y, x,] ch[, attr])
+.. method:: window.addch(ch[, attr])
+            window.addch(y, x, ch[, attr])
 
    .. note::
 
@@ -670,13 +672,15 @@
    position and attributes are the current settings for the window object.
 
 
-.. method:: window.addnstr([y, x,] str, n[, attr])
+.. method:: window.addnstr(str, n[, attr])
+            window.addnstr(y, x, str, n[, attr])
 
    Paint at most *n* characters of the  string *str* at ``(y, x)`` with attributes
    *attr*, overwriting anything previously on the display.
 
 
-.. method:: window.addstr([y, x,] str[, attr])
+.. method:: window.addstr(str[, attr])
+            window.addstr(y, x, str[, attr])
 
    Paint the string *str* at ``(y, x)`` with attributes *attr*, overwriting
    anything previously on the display.
@@ -763,7 +767,10 @@
    *bs* are *horch*.  The default corner characters are always used by this function.
 
 
-.. method:: window.chgat([y, x, ] [num,] attr)
+.. method:: window.chgat(attr)
+            window.chgat(num, attr)
+            window.chgat(y, x, attr)
+            window.chgat(y, x, num, attr)
 
    Set the attributes of *num* characters at the current cursor position, or at
    position ``(y, x)`` if supplied. If no value of *num* is given or *num* = -1,
@@ -812,7 +819,8 @@
    Delete the line under the cursor. All following lines are moved up by one line.
 
 
-.. method:: window.derwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.derwin(begin_y, begin_x)
+            window.derwin(nlines, ncols, begin_y, begin_x)
 
    An abbreviation for "derive window", :meth:`derwin` is the same as calling
    :meth:`subwin`, except that *begin_y* and *begin_x* are relative to the origin
@@ -837,7 +845,7 @@
 .. attribute:: window.encoding
 
    Encoding used to encode method arguments (Unicode strings and characters).
-   The encoding attribute is inherited from by parent window when a subwindow
+   The encoding attribute is inherited from the parent window when a subwindow
    is created, for example with :meth:`window.subwin`. By default, the locale
    encoding is used (see :func:`locale.getpreferredencoding`).
 
@@ -906,7 +914,8 @@
    upper-left corner.
 
 
-.. method:: window.hline([y, x,] ch, n)
+.. method:: window.hline(ch, n)
+            window.hline(y, x, ch, n)
 
    Display a horizontal line starting at ``(y, x)`` with length *n* consisting of
    the character *ch*.
@@ -940,7 +949,8 @@
    the character proper, and upper bits are the attributes.
 
 
-.. method:: window.insch([y, x,] ch[, attr])
+.. method:: window.insch(ch[, attr])
+            window.insch(y, x, ch[, attr])
 
    Paint character *ch* at ``(y, x)`` with attributes *attr*, moving the line from
    position *x* right by one character.
@@ -961,7 +971,8 @@
    line.
 
 
-.. method:: window.insnstr([y, x,] str, n [, attr])
+.. method:: window.insnstr(str, n[, attr])
+            window.insnstr(y, x, str, n[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor, up to *n* characters.   If *n* is zero or
@@ -970,7 +981,8 @@
    The cursor position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.insstr([y, x, ] str [, attr])
+.. method:: window.insstr(str[, attr])
+            window.insstr(y, x, str[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor.  All characters to the right of the cursor are
@@ -978,7 +990,8 @@
    position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.instr([y, x] [, n])
+.. method:: window.instr([n])
+            window.instr(y, x[, n])
 
    Return a string of characters, extracted from the window starting at the
    current cursor position, or at *y*, *x* if specified. Attributes are stripped
@@ -1153,13 +1166,15 @@
    Turn on attribute *A_STANDOUT*.
 
 
-.. method:: window.subpad([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subpad(begin_y, begin_x)
+            window.subpad(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
 
 
-.. method:: window.subwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subwin(begin_y, begin_x)
+            window.subwin(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
@@ -1216,7 +1231,8 @@
    :meth:`refresh`.
 
 
-.. method:: window.vline([y, x,] ch, n)
+.. method:: window.vline(ch, n)
+            window.vline(y, x, ch, n)
 
    Display a vertical line starting at ``(y, x)`` with length *n* consisting of the
    character *ch*.
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -338,7 +338,7 @@
      Backslashes in a raw docstring: m\n
 
   Otherwise, the backslash will be interpreted as part of the string. For example,
-  the "\\" above would be interpreted as a newline character.  Alternatively, you
+  the ``\n`` above would be interpreted as a newline character.  Alternatively, you
   can double each backslash in the doctest version (and not use a raw string)::
 
      >>> def f(x):
@@ -1024,6 +1024,16 @@
 
    This function uses the same search technique as :func:`testmod`.
 
+   .. note::
+      Unlike :func:`testmod` and :class:`DocTestFinder`, this function raises
+      a :exc:`ValueError` if *module* contains no docstrings.  You can prevent
+      this error by passing a :class:`DocTestFinder` instance as the
+      *test_finder* argument with its *exclude_empty* keyword argument set
+      to ``False``::
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite(test_finder=finder)
+
 
 Under the covers, :func:`DocTestSuite` creates a :class:`unittest.TestSuite` out
 of :class:`doctest.DocTestCase` instances, and :class:`DocTestCase` is a
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -629,14 +629,19 @@
    to provide elaborate line editing and history features.
 
 
-.. function:: int([number | string[, base]])
+.. function:: int(x=0)
+              int(x, base=10)
 
-   Convert a number or string to an integer.  If no arguments are given, return
-   ``0``.  If a number is given, return ``number.__int__()``.  Conversion of
-   floating point numbers to integers truncates towards zero.  A string must be
-   a base-radix integer literal optionally preceded by '+' or '-' (with no space
-   in between) and optionally surrounded by whitespace.  A base-n literal
-   consists of the digits 0 to n-1, with 'a' to 'z' (or 'A' to 'Z') having
+   Convert a number or string *x* to an integer, or return ``0`` if no
+   arguments are given.  If *x* is a number, return :meth:`x.__int__()
+   <object.__int__>`.  For floating point numbers, this truncates towards zero.
+
+   If *x* is not a number or if *base* is given, then *x* must be a string,
+   :class:`bytes`, or :class:`bytearray` instance representing an :ref:`integer
+   literal <integers>` in radix *base*.  Optionally, the literal can be
+   preceded by ``+`` or ``-`` (with no space in between) and surrounded by
+   whitespace.  A base-n literal consists of the digits 0 to n-1, with ``a``
+   to ``z`` (or ``A`` to ``Z``) having
    values 10 to 35.  The default *base* is 10. The allowed values are 0 and 2-36.
    Base-2, -8, and -16 literals can be optionally prefixed with ``0b``/``0B``,
    ``0o``/``0O``, or ``0x``/``0X``, as with integer literals in code.  Base 0
@@ -725,11 +730,16 @@
    already arranged into argument tuples, see :func:`itertools.starmap`\.
 
 
-.. function:: max(iterable[, args...], *[, key])
+.. function:: max(iterable, *[, key])
+              max(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the largest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the largest of the arguments.
+   Return the largest item in an iterable or the largest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The largest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the largest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -748,11 +758,16 @@
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable[, args...], *[, key])
+.. function:: min(iterable, *[, key])
+              min(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the smallest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the smallest of the arguments.
+   Return the smallest item in an iterable or the smallest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The smallest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the smallest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -970,16 +985,16 @@
    must be of integer types, and *y* must be non-negative.
 
 
-.. function:: print([object, ...], *, sep=' ', end='\\n', file=sys.stdout, flush=False)
+.. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout, flush=False)
 
-   Print *object*\(s) to the stream *file*, separated by *sep* and followed by
+   Print *objects* to the stream *file*, separated by *sep* and followed by
    *end*.  *sep*, *end* and *file*, if present, must be given as keyword
    arguments.
 
    All non-keyword arguments are converted to strings like :func:`str` does and
    written to the stream, separated by *sep* and followed by *end*.  Both *sep*
    and *end* must be strings; they can also be ``None``, which means to use the
-   default values.  If no *object* is given, :func:`print` will just write
+   default values.  If no *objects* are given, :func:`print` will just write
    *end*.
 
    The *file* argument must be an object with a ``write(string)`` method; if it
@@ -1061,7 +1076,8 @@
 
 
 .. _func-range:
-.. function:: range([start,] stop[, step])
+.. function:: range(stop)
+              range(start, stop[, step])
    :noindex:
 
    Rather than being a function, :class:`range` is actually an immutable
@@ -1087,18 +1103,18 @@
    arguments starting at ``0``).
 
 
-.. function:: round(x[, n])
+.. function:: round(number[, ndigits])
 
-   Return the floating point value *x* rounded to *n* digits after the decimal
-   point.  If *n* is omitted, it defaults to zero.  Delegates to
-   ``x.__round__(n)``.
+   Return the floating point value *number* rounded to *ndigits* digits after
+   the decimal point.  If *ndigits* is omitted, it defaults to zero. Delegates
+   to ``number.__round__(ndigits)``.
 
    For the built-in types supporting :func:`round`, values are rounded to the
-   closest multiple of 10 to the power minus *n*; if two multiples are equally
-   close, rounding is done toward the even choice (so, for example, both
-   ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is ``2``).
-   The return value is an integer if called with one argument, otherwise of the
-   same type as *x*.
+   closest multiple of 10 to the power minus *ndigits*; if two multiples are
+   equally close, rounding is done toward the even choice (so, for example,
+   both ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is
+   ``2``).  The return value is an integer if called with one argument,
+   otherwise of the same type as *number*.
 
    .. note::
 
@@ -1126,7 +1142,8 @@
    ``x.foobar = 123``.
 
 
-.. function:: slice([start,] stop[, step])
+.. function:: slice(stop)
+              slice(start, stop[, step])
 
    .. index:: single: Numerical Python
 
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -27,7 +27,8 @@
 The module provides the following classes:
 
 
-.. class:: HTTPConnection(host, port=None[, strict[, timeout[, source_address]]])
+.. class:: HTTPConnection(host, port=None[, strict][, timeout], \
+                          source_address=None)
 
    An :class:`HTTPConnection` instance represents one transaction with an HTTP
    server.  It should be instantiated passing it a host and optional port
@@ -55,7 +56,10 @@
       are not supported anymore.
 
 
-.. class:: HTTPSConnection(host, port=None, key_file=None, cert_file=None[, strict[, timeout[, source_address]]], *, context=None, check_hostname=None)
+.. class:: HTTPSConnection(host, port=None, key_file=None, \
+                           cert_file=None[, strict][, timeout], \
+                           source_address=None, *, context=None, \
+                           check_hostname=None)
 
    A subclass of :class:`HTTPConnection` that uses SSL for communication with
    secure servers.  Default port is ``443``.  If *context* is specified, it
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -471,7 +471,7 @@
       Returns :class:`BoundArguments`, or raises a :exc:`TypeError` if the
       passed arguments do not match the signature.
 
-   .. method:: Signature.replace([parameters], *, [return_annotation])
+   .. method:: Signature.replace(*[, parameters][, return_annotation])
 
       Create a new Signature instance based on the instance replace was invoked
       on.  It is possible to pass different ``parameters`` and/or
@@ -565,7 +565,7 @@
          ...         print('Parameter:', param)
          Parameter: c
 
-   .. method:: Parameter.replace(*, [name], [kind], [default], [annotation])
+   .. method:: Parameter.replace(*[, name][, kind][, default][, annotation])
 
       Create a new Parameter instance based on the instance replaced was invoked
       on.  To override a :class:`Parameter` attribute, pass the corresponding
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -401,7 +401,8 @@
                   self.currkey = self.keyfunc(self.currvalue)
 
 
-.. function:: islice(iterable, [start,] stop [, step])
+.. function:: islice(iterable, stop)
+              islice(iterable, start, stop[, step])
 
    Make an iterator that returns selected elements from the iterable. If *start* is
    non-zero, then elements from the iterable are skipped until start is reached.
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -146,9 +146,12 @@
    object members will be pretty-printed with that indent level.  An indent level
    of 0, negative, or ``""`` will only insert newlines.  ``None`` (the default)
    selects the most compact representation. Using a positive integer indent
-   indents that many spaces per level.  If *indent* is a string (such at '\t'),
+   indents that many spaces per level.  If *indent* is a string (such as ``"\t"``),
    that string is used to indent each level.
 
+   .. versionchanged:: 3.2
+      Allow strings for *indent* in addition to integers.
+
    If *separators* is an ``(item_separator, dict_separator)`` tuple, then it
    will be used instead of the default ``(', ', ': ')`` separators.  ``(',',
    ':')`` is the most compact JSON representation.
@@ -371,10 +374,15 @@
    will be sorted by key; this is useful for regression tests to ensure that
    JSON serializations can be compared on a day-to-day basis.
 
-   If *indent* is a non-negative integer (it is ``None`` by default), then JSON
-   array elements and object members will be pretty-printed with that indent
-   level.  An indent level of 0 will only insert newlines.  ``None`` is the most
-   compact representation.
+   If *indent* is a non-negative integer or string, then JSON array elements and
+   object members will be pretty-printed with that indent level.  An indent level
+   of 0, negative, or ``""`` will only insert newlines.  ``None`` (the default)
+   selects the most compact representation. Using a positive integer indent
+   indents that many spaces per level.  If *indent* is a string (such as ``"\t"``),
+   that string is used to indent each level.
+
+   .. versionchanged:: 3.2
+      Allow strings for *indent* in addition to integers.
 
    If specified, *separators* should be an ``(item_separator, key_separator)``
    tuple.  The default is ``(', ', ': ')``.  To get the most compact JSON
diff --git a/Doc/library/lzma.rst b/Doc/library/lzma.rst
--- a/Doc/library/lzma.rst
+++ b/Doc/library/lzma.rst
@@ -335,15 +335,15 @@
 Reading in a compressed file::
 
    import lzma
-   with lzma.LZMAFile("file.xz") as f:
-      file_content = f.read()
+   with lzma.open("file.xz") as f:
+       file_content = f.read()
 
 Creating a compressed file::
 
    import lzma
    data = b"Insert Data Here"
-   with lzma.LZMAFile("file.xz", "w") as f:
-      f.write(data)
+   with lzma.open("file.xz", "w") as f:
+       f.write(data)
 
 Compressing data in memory::
 
@@ -367,7 +367,7 @@
    import lzma
    with open("file.xz", "wb") as f:
        f.write(b"This data will not be compressed\n")
-       with lzma.LZMAFile(f, "w") as lzf:
+       with lzma.open(f, "w") as lzf:
            lzf.write(b"This *will* be compressed\n")
        f.write(b"Not compressed\n")
 
@@ -378,5 +378,5 @@
        {"id": lzma.FILTER_DELTA, "dist": 5},
        {"id": lzma.FILTER_LZMA2, "preset": 7 | lzma.PRESET_EXTREME},
    ]
-   with lzma.LZMAFile("file.xz", "w", filters=my_filters) as f:
+   with lzma.open("file.xz", "w", filters=my_filters) as f:
        f.write(b"blah blah blah")
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -10,9 +10,9 @@
 This module defines two classes, :class:`Mailbox` and :class:`Message`, for
 accessing and manipulating on-disk mailboxes and the messages they contain.
 :class:`Mailbox` offers a dictionary-like mapping from keys to messages.
-:class:`Message` extends the :mod:`email.Message` module's :class:`Message`
-class with format-specific state and behavior. Supported mailbox formats are
-Maildir, mbox, MH, Babyl, and MMDF.
+:class:`Message` extends the :mod:`email.message` module's
+:class:`~email.message.Message` class with format-specific state and behavior.
+Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
 
 
 .. seealso::
@@ -81,7 +81,7 @@
       it.
 
       Parameter *message* may be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, a byte string, or a
+      :class:`email.message.Message` instance, a string, a byte string, or a
       file-like object (which should be open in binary mode). If *message* is
       an instance of the
       appropriate format-specific :class:`Message` subclass (e.g., if it's an
@@ -112,7 +112,7 @@
       :exc:`KeyError` exception if no message already corresponds to *key*.
 
       As with :meth:`add`, parameter *message* may be a :class:`Message`
-      instance, an :class:`email.Message.Message` instance, a string, a byte
+      instance, an :class:`email.message.Message` instance, a string, a byte
       string, or a file-like object (which should be open in binary mode). If
       *message* is an
       instance of the appropriate format-specific :class:`Message` subclass
@@ -757,11 +757,12 @@
 
 .. class:: Message(message=None)
 
-   A subclass of the :mod:`email.Message` module's :class:`Message`. Subclasses of
-   :class:`mailbox.Message` add mailbox-format-specific state and behavior.
+   A subclass of the :mod:`email.message` module's
+   :class:`~email.message.Message`. Subclasses of :class:`mailbox.Message` add
+   mailbox-format-specific state and behavior.
 
    If *message* is omitted, the new instance is created in a default, empty state.
-   If *message* is an :class:`email.Message.Message` instance, its contents are
+   If *message* is an :class:`email.message.Message` instance, its contents are
    copied; furthermore, any format-specific information is converted insofar as
    possible if *message* is a :class:`Message` instance. If *message* is a string,
    a byte string,
@@ -1267,7 +1268,7 @@
 
       Set the message's visible headers to be the same as the headers in
       *message*.  Parameter *visible* should be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, or a file-like object
+      :class:`email.message.Message` instance, a string, or a file-like object
       (which should be open in text mode).
 
 
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -295,7 +295,8 @@
 :class:`Process` and exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. class:: Process([group[, target[, name[, args[, kwargs]]]]], *, daemon=None)
+.. class:: Process(group=None, target=None, name=None, args=(), kwargs={}, \
+                   *, daemon=None)
 
    Process objects represent activity that is run in a separate process. The
    :class:`Process` class has equivalents of all the methods of
@@ -1147,7 +1148,7 @@
 
        n = Value('i', 7)
        x = Value(c_double, 1.0/3.0, lock=False)
-       s = Array('c', 'hello world', lock=lock)
+       s = Array('c', b'hello world', lock=lock)
        A = Array(Point, [(1.875,-6.25), (-5.75,2.0), (2.375,9.5)], lock=lock)
 
        p = Process(target=modify, args=(n, x, s, A))
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -487,10 +487,10 @@
 them have been superseded by newer commands in :rfc:`3977`.
 
 
-.. method:: NNTP.xhdr(header, string, *, file=None)
+.. method:: NNTP.xhdr(hdr, str, *, file=None)
 
-   Send an ``XHDR`` command.  The *header* argument is a header keyword, e.g.
-   ``'subject'``.  The *string* argument should have the form ``'first-last'``
+   Send an ``XHDR`` command.  The *hdr* argument is a header keyword, e.g.
+   ``'subject'``.  The *str* argument should have the form ``'first-last'``
    where *first* and *last* are the first and last article numbers to search.
    Return a pair ``(response, list)``, where *list* is a list of pairs ``(id,
    text)``, where *id* is an article number (as a string) and *text* is the text of
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -273,7 +273,8 @@
 strings as you like (including zero), as long as there is at least one option
 string overall.
 
-The option strings passed to :meth:`add_option` are effectively labels for the
+The option strings passed to :meth:`OptionParser.add_option` are effectively
+labels for the
 option defined by that call.  For brevity, we will frequently refer to
 *encountering an option* on the command line; in reality, :mod:`optparse`
 encounters *option strings* and looks up options from them.
@@ -892,7 +893,8 @@
 The canonical way to create an :class:`Option` instance is with the
 :meth:`add_option` method of :class:`OptionParser`.
 
-.. method:: OptionParser.add_option(opt_str[, ...], attr=value, ...)
+.. method:: OptionParser.add_option(option)
+            OptionParser.add_option(*opt_str, attr=value, ...)
 
    To define an option with only a short option string::
 
@@ -1165,6 +1167,17 @@
 
      options.tracks.append(int("4"))
 
+  The ``append`` action calls the ``append`` method on the current value of the
+  option.  This means that any default value specified must have an ``append``
+  method.  It also means that if the default value is non-empty, the default
+  elements will be present in the parsed value for the option, with any values
+  from the command line appended after those default values::
+
+     >>> parser.add_option("--files", action="append", default=['~/.mypkg/defaults'])
+     >>> opts, args = parser.parse_args(['--files', 'overrides.mypkg'])
+     >>> opts.files
+     ['~/.mypkg/defaults', 'overrides.mypkg']
+
 * ``"append_const"`` [required: :attr:`~Option.const`; relevant:
   :attr:`~Option.dest`]
 
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1855,9 +1855,8 @@
    :attr:`st_mtime`, :attr:`st_ctime`. More items may be added at the end by
    some implementations.
 
-   This function can support :ref:`specifying a file descriptor
-   <path_fd>`, :ref:`specifying a file descriptor <path_fd>` and :ref:`not
-   following symlinks <follow_symlinks>`.
+   This function can support :ref:`specifying a file descriptor <path_fd>` and
+   :ref:`not following symlinks <follow_symlinks>`.
 
    .. index:: module: stat
 
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -67,7 +67,8 @@
    ``ossaudiodev.error``.)
 
 
-.. function:: open([device, ]mode)
+.. function:: open(mode)
+              open(device, mode)
 
    Open an audio device and return an OSS audio device object.  This object
    supports many file-like methods, such as :meth:`read`, :meth:`write`, and
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -402,7 +402,7 @@
 .. method:: xmlparser.CommentHandler(data)
 
    Called for comments.  *data* is the text of the comment, excluding the leading
-   '``<!-``\ ``-``' and trailing '``-``\ ``->``'.
+   ``'<!-``\ ``-'`` and trailing ``'-``\ ``->'``.
 
 
 .. method:: xmlparser.StartCdataSectionHandler()
diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -52,20 +52,20 @@
 
 Bookkeeping functions:
 
-.. function:: seed([x], version=2)
+.. function:: seed(a=None, version=2)
 
    Initialize the random number generator.
 
-   If *x* is omitted or ``None``, the current system time is used.  If
+   If *a* is omitted or ``None``, the current system time is used.  If
    randomness sources are provided by the operating system, they are used
    instead of the system time (see the :func:`os.urandom` function for details
    on availability).
 
-   If *x* is an int, it is used directly.
+   If *a* is an int, it is used directly.
 
    With version 2 (the default), a :class:`str`, :class:`bytes`, or :class:`bytearray`
    object gets converted to an :class:`int` and all of its bits are used.  With version 1,
-   the :func:`hash` of *x* is used instead.
+   the :func:`hash` of *a* is used instead.
 
    .. versionchanged:: 3.2
       Moved to the version 2 scheme which uses all of the bits in a string seed.
@@ -93,7 +93,8 @@
 
 Functions for integers:
 
-.. function:: randrange([start,] stop[, step])
+.. function:: randrange(stop)
+              randrange(start, stop[, step])
 
    Return a randomly selected element from ``range(start, stop, step)``.  This is
    equivalent to ``choice(range(start, stop, step))``, but doesn't actually build a
diff --git a/Doc/library/site.rst b/Doc/library/site.rst
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -33,7 +33,7 @@
 For the head part, it uses ``sys.prefix`` and ``sys.exec_prefix``; empty heads
 are skipped.  For the tail part, it uses the empty string and then
 :file:`lib/site-packages` (on Windows) or
-:file:`lib/python|version|/site-packages` and then :file:`lib/site-python` (on
+:file:`lib/python{X.Y}/site-packages` and then :file:`lib/site-python` (on
 Unix and Macintosh).  For each of the distinct head-tail combinations, it sees
 if it refers to an existing directory, and if so, adds it to ``sys.path`` and
 also inspects the newly added path for configuration files.
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -111,12 +111,13 @@
    .. attribute:: addr
 
       Holds the address of the client, the second value returned by
-      socket.accept()
+      :func:`socket.accept <socket.socket.accept>`
 
    .. attribute:: received_lines
 
       Holds a list of the line strings (decoded using UTF-8) received from
-      the client. The lines have their "\\r\\n" line ending translated to "\\n".
+      the client. The lines have their ``"\r\n"`` line ending translated to
+      ``"\n"``.
 
    .. attribute:: smtp_state
 
@@ -141,12 +142,12 @@
    .. attribute:: received_data
 
       Holds a string containing all of the data sent by the client during the
-      DATA state, up to but not including the terminating "\r\n.\r\n".
+      DATA state, up to but not including the terminating ``"\r\n.\r\n"``.
 
    .. attribute:: fqdn
 
       Holds the fully-qualified domain name of the server as returned by
-      ``socket.getfqdn()``.
+      :func:`socket.getfqdn`.
 
    .. attribute:: peer
 
@@ -170,14 +171,14 @@
    MAIL     Accepts the "MAIL FROM:" syntax and stores the supplied address as
             :attr:`mailfrom`.  In extended command mode, accepts the
             :rfc:`1870` SIZE attribute and responds appropriately based on the
-            value of ``data_size_limit``.
+            value of *data_size_limit*.
    RCPT     Accepts the "RCPT TO:" syntax and stores the supplied addresses in
             the :attr:`rcpttos` list.
    RSET     Resets the :attr:`mailfrom`, :attr:`rcpttos`, and
             :attr:`received_data`, but not the greeting.
    DATA     Sets the internal state to :attr:`DATA` and stores remaining lines
             from the client in :attr:`received_data` until the terminator
-            "\r\n.\r\n" is received.
+            ``"\r\n.\r\n"`` is received.
    HELP     Returns minimal information on command syntax
    VRFY     Returns code 252 (the server doesn't know if the address is valid)
    EXPN     Reports that the command is not implemented.
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1005,7 +1005,8 @@
    much data, if any, was successfully sent.
 
 
-.. method:: socket.sendto(bytes[, flags], address)
+.. method:: socket.sendto(bytes, address)
+            socket.sendto(bytes, flags, address)
 
    Send data to the socket.  The socket should not be connected to a remote socket,
    since the destination socket is specified by *address*.  The optional *flags*
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1235,7 +1235,8 @@
 commonly used for looping a specific number of times in :keyword:`for`
 loops.
 
-.. class:: range([start, ]stop[, step])
+.. class:: range(stop)
+           range(start, stop[, step])
 
    The arguments to the range constructor must be integers (either built-in
    :class:`int` or any object that implements the ``__index__`` special
@@ -2687,13 +2688,19 @@
    .. attribute:: shape
 
       A tuple of integers the length of :attr:`ndim` giving the shape of the
-      memory as a N-dimensional array.
+      memory as an N-dimensional array.
+
+      .. versionchanged:: 3.3
+         An empty tuple instead of None when ndim = 0.
 
    .. attribute:: strides
 
       A tuple of integers the length of :attr:`ndim` giving the size in bytes to
       access each element for each dimension of the array.
 
+      .. versionchanged:: 3.3
+         An empty tuple instead of None when ndim = 0.
+
    .. attribute:: suboffsets
 
       Used internally for PIL-style arrays. The value is informational only.
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -307,10 +307,14 @@
       :meth:`Popen.communicate` method.
 
    If *shell* is ``True``, the specified command will be executed through
-   the shell. This can be useful if you are using Python primarily for the
+   the shell.  This can be useful if you are using Python primarily for the
    enhanced control flow it offers over most system shells and still want
-   access to other shell features such as filename wildcards, shell pipes and
-   environment variable expansion.
+   convenient access to other shell features such as shell pipes, filename
+   wildcards, environment variable expansion, and expansion of ``~`` to a
+   user's home directory.  However, note that Python itself offers
+   implementations of many shell-like features (in particular, :mod:`glob`,
+   :mod:`fnmatch`, :func:`os.walk`, :func:`os.path.expandvars`,
+   :func:`os.path.expanduser`, and :mod:`shutil`).
 
    .. versionchanged:: 3.3
       When *universal_newlines* is ``True``, the class uses the encoding
@@ -669,8 +673,8 @@
 
 .. warning::
 
-   Use :meth:`communicate` rather than :attr:`.stdin.write <stdin>`,
-   :attr:`.stdout.read <stdout>` or :attr:`.stderr.read <stderr>` to avoid
+   Use :meth:`~Popen.communicate` rather than :attr:`.stdin.write <Popen.stdin>`,
+   :attr:`.stdout.read <Popen.stdout>` or :attr:`.stderr.read <Popen.stderr>` to avoid
    deadlocks due to any of the other OS pipe buffers filling up and blocking the
    child process.
 
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -17,7 +17,8 @@
 The module defines the following functions:
 
 
-.. function:: syslog([priority,] message)
+.. function:: syslog(message)
+              syslog(priority, message)
 
    Send the string *message* to the system logger.  A trailing newline is added
    if necessary.  Each message is tagged with a priority composed of a
diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst
--- a/Doc/library/textwrap.rst
+++ b/Doc/library/textwrap.rst
@@ -25,6 +25,9 @@
    Optional keyword arguments correspond to the instance attributes of
    :class:`TextWrapper`, documented below.  *width* defaults to ``70``.
 
+   See the :meth:`TextWrapper.wrap` method for additional details on how
+   :func:`wrap` behaves.
+
 
 .. function:: fill(text, width=70, **kwargs)
 
@@ -167,15 +170,18 @@
 
    .. attribute:: drop_whitespace
 
-      (default: ``True``) If true, whitespace that, after wrapping, happens to
-      end up at the beginning or end of a line is dropped (leading whitespace in
-      the first line is always preserved, though).
+      (default: ``True``) If true, whitespace at the beginning and ending of
+      every line (after wrapping but before indenting) is dropped.
+      Whitespace at the beginning of the paragraph, however, is not dropped
+      if non-whitespace follows it.  If whitespace being dropped takes up an
+      entire line, the whole line is dropped.
 
 
    .. attribute:: initial_indent
 
       (default: ``''``) String that will be prepended to the first line of
-      wrapped output.  Counts towards the length of the first line.
+      wrapped output.  Counts towards the length of the first line.  The empty
+      string is not indented.
 
 
    .. attribute:: subsequent_indent
@@ -236,8 +242,9 @@
 
       Wraps the single paragraph in *text* (a string) so every line is at most
       :attr:`width` characters long.  All wrapping options are taken from
-      instance attributes of the :class:`TextWrapper` instance. Returns a list
-      of output lines, without final newlines.
+      instance attributes of the :class:`TextWrapper` instance.  Returns a list
+      of output lines, without final newlines.  If the wrapped output has no
+      content, the returned list is empty.
 
 
    .. method:: fill(text)
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -255,8 +255,8 @@
 since it is impossible to detect the termination of alien threads.
 
 
-.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={},
-                  verbose=None, *, daemon=None)
+.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}, *, \
+                  daemon=None)
 
    This constructor should always be called with keyword arguments.  Arguments
    are:
@@ -275,8 +275,6 @@
    *kwargs* is a dictionary of keyword arguments for the target invocation.
    Defaults to ``{}``.
 
-   *verbose* is a flag used for debugging messages.
-
    If not ``None``, *daemon* explicitly sets whether the thread is daemonic.
    If ``None`` (the default), the daemonic property is inherited from the
    current thread.
diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -31,13 +31,13 @@
    may also contain multiple statements separated by ``;`` or newlines, as long as
    they don't contain multi-line string literals.
 
-   To measure the execution time of the first statement, use the :meth:`timeit`
-   method.  The :meth:`repeat` method is a convenience to call :meth:`timeit`
+   To measure the execution time of the first statement, use the :meth:`Timer.timeit`
+   method.  The :meth:`repeat` method is a convenience to call :meth:`.timeit`
    multiple times and return a list of results.
 
    The *stmt* and *setup* parameters can also take objects that are callable
    without arguments. This will embed calls to them in a timer function that
-   will then be executed by :meth:`timeit`.  Note that the timing overhead is a
+   will then be executed by :meth:`.timeit`.  Note that the timing overhead is a
    little larger in this case because of the extra function calls.
 
 
@@ -60,12 +60,12 @@
 
 .. method:: Timer.repeat(repeat=3, number=1000000)
 
-   Call :meth:`timeit` a few times.
+   Call :meth:`.timeit` a few times.
 
-   This is a convenience function that calls the :meth:`timeit` repeatedly,
+   This is a convenience function that calls the :meth:`.timeit` repeatedly,
    returning a list of results.  The first argument specifies how many times to
-   call :meth:`timeit`.  The second argument specifies the *number* argument for
-   :func:`timeit`.
+   call :meth:`.timeit`.  The second argument specifies the *number* argument for
+   :meth:`.timeit`.
 
    .. note::
 
@@ -89,7 +89,7 @@
 
    .. note::
 
-      By default, :meth:`timeit` temporarily turns off :term:`garbage collection`
+      By default, :meth:`.timeit` temporarily turns off :term:`garbage collection`
       during the timing.  The advantage of this approach is that it makes
       independent timings more comparable.  This disadvantage is that GC may be
       an important component of the performance of the function being measured.
@@ -117,7 +117,7 @@
 .. function:: timeit(stmt='pass', setup='pass', timer=<default timer>, number=1000000)
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
-   function and run its :meth:`timeit` method with *number* executions.
+   function and run its :meth:`.timeit` method with *number* executions.
 
 
 Command Line Interface
@@ -243,7 +243,7 @@
    3.15 usec/pass
 
 To give the :mod:`timeit` module access to functions you define, you can pass a
-``setup`` parameter which contains an import statement::
+*setup* parameter which contains an import statement::
 
    def test():
        """Stupid test function"""
diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst
--- a/Doc/library/tkinter.tix.rst
+++ b/Doc/library/tkinter.tix.rst
@@ -504,7 +504,7 @@
       print(root.tix_configure())
 
 
-.. method:: tixCommand.tix_configure([cnf,] **kw)
+.. method:: tixCommand.tix_configure(cnf=None, **kw)
 
    Query or modify the configuration options of the Tix application context. If no
    option is specified, returns a dictionary all of the available options.  If
diff --git a/Doc/library/types.rst b/Doc/library/types.rst
--- a/Doc/library/types.rst
+++ b/Doc/library/types.rst
@@ -69,7 +69,7 @@
 the types that arise only incidentally during processing such as the
 ``listiterator`` type.
 
-Typical use is of these names is for :func:`isinstance` or
+Typical use of these names is for :func:`isinstance` or
 :func:`issubclass` checks.
 
 Standard names are defined for the following types:
diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -276,7 +276,7 @@
             >>> mock.assert_called_once_with('foo', bar='baz')
             Traceback (most recent call last):
               ...
-            AssertionError: Expected to be called once. Called 2 times.
+            AssertionError: Expected 'mock' to be called once. Called 2 times.
 
 
     .. method:: assert_any_call(*args, **kwargs)
@@ -2020,7 +2020,7 @@
     >>> mock.assert_called_once_with(1, 2, 3)
     Traceback (most recent call last):
      ...
-    AssertionError: Expected to be called once. Called 2 times.
+    AssertionError: Expected 'mock' to be called once. Called 2 times.
 
 Because mocks auto-create attributes on demand, and allow you to call them
 with arbitrary arguments, if you misspell one of these assert methods then
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1265,7 +1265,7 @@
    .. method:: assertListEqual(first, second, msg=None)
                assertTupleEqual(first, second, msg=None)
 
-      Tests that two lists or tuples are equal.  If not an error message is
+      Tests that two lists or tuples are equal.  If not, an error message is
       constructed that shows only the differences between the two.  An error
       is also raised if either of the parameters are of the wrong type.
       These methods are used by default when comparing lists or tuples with
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -145,8 +145,9 @@
    percent-encoded sequences into Unicode characters, as accepted by the
    :meth:`bytes.decode` method.
 
-   Use the :func:`urllib.parse.urlencode` function to convert such
-   dictionaries into query strings.
+   Use the :func:`urllib.parse.urlencode` function (with the ``doseq``
+   parameter set to ``True``) to convert such dictionaries into query
+   strings.
 
 
    .. versionchanged:: 3.2
diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -327,7 +327,7 @@
 ----------------
 
 The :mod:`_random` module includes code based on a download from
-http://www.math.keio.ac.jp/ matumoto/MT2002/emt19937ar.html. The following are
+http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html. The following are
 the verbatim comments from the original code::
 
    A C-program for MT19937, with initialization improved 2002/1/26.
@@ -368,8 +368,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: matumoto at math.keio.ac.jp
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
 
 
 Sockets
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -307,11 +307,11 @@
 :keyword:`try` clause is executed, including any :keyword:`except` and
 :keyword:`else` clauses.  If an exception occurs in any of the clauses and is
 not handled, the exception is temporarily saved. The :keyword:`finally` clause
-is executed.  If there is a saved exception or :keyword:`break` statement,
-it is re-raised at the end of the :keyword:`finally` clause. If the
-:keyword:`finally` clause raises another exception the saved exception
-is set as the context of the new exception; if the :keyword:`finally` clause
-executes a :keyword:`return` statement, the saved exception is discarded::
+is executed.  If there is a saved exception it is re-raised at the end of the
+:keyword:`finally` clause.  If the :keyword:`finally` clause raises another
+exception, the saved exception is set as the context of the new exception.
+If the :keyword:`finally` clause executes a :keyword:`return` or :keyword:`break`
+statement, the saved exception is discarded::
 
     def f():
         try:
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1271,22 +1271,22 @@
    and ``x.__hash__()`` returns an appropriate value such that ``x == y``
    implies both that ``x is y`` and ``hash(x) == hash(y)``.
 
-   Classes which inherit a :meth:`__hash__` method from a parent class but
-   change the meaning of :meth:`__eq__` such that the hash value returned is no
-   longer appropriate (e.g. by switching to a value-based concept of equality
-   instead of the default identity based equality) can explicitly flag
-   themselves as being unhashable by setting ``__hash__ = None`` in the class
-   definition. Doing so means that not only will instances of the class raise an
-   appropriate :exc:`TypeError` when a program attempts to retrieve their hash
-   value, but they will also be correctly identified as unhashable when checking
-   ``isinstance(obj, collections.Hashable)`` (unlike classes which define their
-   own :meth:`__hash__` to explicitly raise :exc:`TypeError`).
+   A class that overrides :meth:`__eq__` and does not define :meth:`__hash__`
+   will have its :meth:`__hash__` implicitly set to ``None``.  When the
+   :meth:`__hash__` method of a class is ``None``, instances of the class will
+   raise an appropriate :exc:`TypeError` when a program attempts to retrieve
+   their hash value, and will also be correctly identified as unhashable when
+   checking ``isinstance(obj, collections.Hashable``).
 
    If a class that overrides :meth:`__eq__` needs to retain the implementation
    of :meth:`__hash__` from a parent class, the interpreter must be told this
-   explicitly by setting ``__hash__ = <ParentClass>.__hash__``. Otherwise the
-   inheritance of :meth:`__hash__` will be blocked, just as if :attr:`__hash__`
-   had been explicitly set to :const:`None`.
+   explicitly by setting ``__hash__ = <ParentClass>.__hash__``.
+
+   If a class that does not override :meth:`__eq__` wishes to suppress hash
+   support, it should include ``__hash__ = None`` in the class definition.
+   A class which defines its own :meth:`__hash__` that explicitly raises
+   a :exc:`TypeError` would be incorrectly identified as hashable by
+   an ``isinstance(obj, collections.Hashable)`` call.
 
 
    .. note::
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -124,9 +124,8 @@
 library/functions,,:stop,"a[start:stop, i]"
 library/functions,,:stop,a[start:stop:step]
 library/hotshot,,:lineno,"ncalls  tottime  percall  cumtime  percall filename:lineno(function)"
-library/http.client,52,:port,host:port
+library/http.client,,:port,host:port
 library/http.cookies,,`,!#$%&'*+-.^_`|~:
-library/httplib,,:port,host:port
 library/imaplib,,:MM,"""DD-Mmm-YYYY HH:MM:SS"
 library/imaplib,,:SS,"""DD-Mmm-YYYY HH:MM:SS"
 library/inspect,,:int,">>> def foo(a, *, b:int, **kwargs):"
diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -186,7 +186,7 @@
 
    squares = [x**2 for x in range(10)]
 
-This is also equivalent to ``squares = map(lambda x: x**2, range(10))``,
+This is also equivalent to ``squares = list(map(lambda x: x**2, range(10)))``,
 but it's more concise and readable.
 
 A list comprehension consists of brackets containing an expression followed
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -12,7 +12,9 @@
 
 The Python interpreter is usually installed as :file:`/usr/local/bin/python3.3`
 on those machines where it is available; putting :file:`/usr/local/bin` in your
-Unix shell's search path makes it possible to start it by typing the command ::
+Unix shell's search path makes it possible to start it by typing the command:
+
+.. code-block:: text
 
    python3.3
 
@@ -94,8 +96,8 @@
 before printing the first prompt::
 
    $ python3.3
-   Python 3.3 (py3k, Sep 12 2007, 12:21:02)
-   [GCC 3.4.6 20060404 (Red Hat 3.4.6-8)] on linux2
+   Python 3.3 (default, Sep 24 2012, 09:25:04)
+   [GCC 4.6.3] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>>
 
diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -94,8 +94,7 @@
 Variables must be "defined" (assigned a value) before they can be used, or an
 error will occur::
 
-   >>> # try to access an undefined variable
-   ... n
+   >>> n  # try to access an undefined variable
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    NameError: name 'n' is not defined
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -148,7 +148,7 @@
 
 There are a number of modules for accessing the internet and processing internet
 protocols. Two of the simplest are :mod:`urllib.request` for retrieving data
-from urls and :mod:`smtplib` for sending mail::
+from URLs and :mod:`smtplib` for sending mail::
 
    >>> from urllib.request import urlopen
    >>> for line in urlopen('http://tycho.usno.navy.mil/cgi-bin/timer.pl'):
diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -95,7 +95,7 @@
    >>> d = dict(item='unladen swallow')
    >>> t.substitute(d)
    Traceback (most recent call last):
-     . . .
+     ...
    KeyError: 'owner'
    >>> t.safe_substitute(d)
    'Return the unladen swallow to $owner.'
@@ -220,7 +220,9 @@
    logging.error('Error occurred')
    logging.critical('Critical error -- shutting down')
 
-This produces the following output::
+This produces the following output:
+
+.. code-block:: none
 
    WARNING:root:Warning:config file server.conf not found
    ERROR:root:Error occurred
@@ -311,6 +313,8 @@
    >>> print("Handling", d.popleft())
    Handling task1
 
+::
+
    unsearched = deque([starting_node])
    def breadth_first_search(unsearched):
        node = unsearched.popleft()
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -66,6 +66,7 @@
 * :mod:`faulthandler` (helps debugging low-level crashes)
 * :mod:`ipaddress` (high-level objects representing IP addresses and masks)
 * :mod:`lzma` (compress data using the XZ / LZMA algorithm)
+* :mod:`unittest.mock` (replace parts of your system under test with mock objects)
 * :mod:`venv` (Python :ref:`virtual environments <pep-405>`, as in the
   popular ``virtualenv`` package)
 
@@ -560,6 +561,41 @@
 or amends calling signatures or arguments.
 
 
+PEP 421: Adding sys.implementation
+==================================
+
+:pep:`421` - Adding sys.implementation
+ PEP written and implemented by Eric Snow.
+
+A new attribute on the :mod:`sys` module exposes details specific to the
+implementation of the currently running interpreter.  The initial set of
+attributes on :attr:`sys.implementation` are ``name``, ``version``,
+``hexversion``, and ``cache_tag``.
+
+The intention of ``sys.implementation`` is to consolidate into one namespace
+the implementation-specific data used by the standard library.  This allows
+different Python implementations to share a single standard library code base
+much more easily.  In its initial state, ``sys.implementation`` holds only a
+small portion of the implementation-specific data.  Over time that ratio will
+shift in order to make the standard library more portable.
+
+One example of improved standard library portability is ``cache_tag``.  As of
+Python 3.3, ``sys.implementation.cache_tag`` is used by :mod:`importlib` to
+support :pep:`3147` compliance.  Any Python implementation that uses
+``importlib`` for its built-in import system may use ``cache_tag`` to control
+the caching behavior for modules.
+
+SimpleNamespace
+---------------
+
+The implementation of ``sys.implementation`` also introduces a new type to
+Python: :class:`types.SimpleNamespace`.  In contrast to a mapping-based
+namespace, like :class:`dict`, ``SimpleNamespace`` is attribute-based, like
+:class:`object`.  However, unlike ``object``, ``SimpleNamespace`` instances
+are writable.  This means that you can add, remove, and modify the namespace
+through normal attribute access.
+
+
 .. _importlib:
 
 Using importlib as the Implementation of Import
@@ -815,6 +851,8 @@
 
   (Contributed by Ezio Melotti in :issue:`12753`)
 
+* Unicode database updated to UCD version 6.1.0
+
 * Equality comparisons on :func:`range` objects now return a result reflecting
   the equality of the underlying sequences generated by those range objects.
 
@@ -885,7 +923,7 @@
 faulthandler
 ------------
 
-This new debug module contains functions to dump Python tracebacks explicitly,
+This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
 on a fault (a crash like a segmentation fault), after a timeout, or on a user
 signal. Call :func:`faulthandler.enable` to install fault handlers for the
 :const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
@@ -1044,7 +1082,7 @@
 contextlib
 ----------
 
-:class:`~collections.ExitStack` now provides a solid foundation for
+:class:`~contextlib.ExitStack` now provides a solid foundation for
 programmatic manipulation of context managers and similar cleanup
 functionality. Unlike the previous ``contextlib.nested`` API (which was
 deprecated and removed), the new API is designed to work correctly
@@ -1084,7 +1122,7 @@
 --------
 
  * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances don't raise :exc:`TypeError`.
+   instances now return :const:`False` instead of raising :exc:`TypeError`.
  * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
@@ -1193,13 +1231,18 @@
 ftplib
 ------
 
-The :class:`~ftplib.FTP_TLS` class now provides a new
-:func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
-plaintext.  This can be useful to take advantage of firewalls that know how to
-handle NAT with non-secure FTP without opening fixed ports.
-
-(Contributed by Giampaolo Rodol? in :issue:`12139`)
-
+* The :class:`~ftplib.FTP_TLS` class now provides a new
+  :func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
+  plaintext.  This can be useful to take advantage of firewalls that know how to
+  handle NAT with non-secure FTP without opening fixed ports.
+
+  (Contributed by Giampaolo Rodol? in :issue:`12139`)
+
+* Added :meth:`ftplib.FTP.mlsd` method which provides a parsable directory
+  listing format and deprecates :meth:`ftplib.FTP.nlst` and
+  :meth:`ftplib.FTP.dir`.
+
+  (Contributed by Giampaolo Rodol? in :issue:`11072`)
 
 gc
 --
@@ -1217,6 +1260,31 @@
 (Contributed by Nick Coghlan and Christian Heimes in issue:`15061`)
 
 
+html.entities
+-------------
+
+A new :data:`~html.entities.html5` dictionary that maps HTML5 named character
+references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``)
+has been added to the :mod:`html.entities` module.  The dictionary is now also
+used by :class:`~html.parser.HTMLParser`.
+
+(Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`)
+
+
+html.parser
+-----------
+
+:class:`~html.parser.HTMLParser` is now able to parse broken markup without
+raising errors, therefore the *strict* argument of the constructor and the
+:exc:`~html.parser.HTMLParseError` exception are now deprecated.
+The ability to parse broken markup is the result of a number of bug fixes that
+are also available on the latest bug fix releases of Python 2.7/3.2.
+
+(Contributed by Ezio Melotti in :issue:`15114`, and :issue:`14538`,
+:issue:`13993`, :issue:`13960`, :issue:`13358`, :issue:`1745761`,
+:issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`,
+:issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`)
+
 imaplib
 -------
 
@@ -1659,6 +1727,16 @@
 for PEP 3115 compliant dynamic type creation. (:issue:`14588`)
 
 
+unittest
+--------
+
+:meth:`.assertRaises`, :meth:`.assertRaisesRegex`, :meth:`.assertWarns`, and
+:meth:`.assertWarnsRegex` now accept a keyword argument *msg* when used as
+context managers.
+
+(Contributed by Ezio Melotti and Winston Ewert in :issue:`10775`)
+
+
 urllib
 ------
 
@@ -1792,6 +1870,15 @@
   * :class:`abc.abstractstaticmethod` has been deprecated, use
     :class:`staticmethod` with :func:`abc.abstractmethod` instead.
 
+* :mod:`importlib` package:
+
+  * :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
+    :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
+    both the modification time and size of the source file the bytecode file was
+    compiled from.
+
+
+
 
 
 Deprecated functions and types of the C API
@@ -1900,7 +1987,7 @@
   updated to use the full name of the module instead of just the tail of the
   name.
 
-* The **index** argument to :func:`__import__` now defaults to 0 instead of -1
+* The *index* argument to :func:`__import__` now defaults to 0 instead of -1
   and no longer support negative values. It was an oversight when :pep:`328` was
   implemented that the default value remained -1. If you need to continue to
   perform a relative import followed by an absolute import, then perform the
@@ -1923,11 +2010,6 @@
   :attr:`sys.path_importer_cache` where it repesents the use of implicit
   finders, but semantically it should not change anything.
 
-* :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
-  :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
-  both the modification time and size of the source file the bytecode file was
-  compiled from.
-
 * :class:`importlib.abc.Finder` no longer specifies a `find_module()` abstract
   method that must be implemented. If you were relying on subclasses to
   implement that method, make sure to check for the method's existence first.
@@ -1968,9 +2050,9 @@
 
 * :c:func:`PyImport_GetMagicNumber` now returns -1 upon failure.
 
-* As a negative value for the **level** argument to :func:`__import__` is no
+* As a negative value for the *level* argument to :func:`__import__` is no
   longer valid, the same now holds for :c:func:`PyImport_ImportModuleLevel`.
-  This also means that the value of **level** used by
+  This also means that the value of *level* used by
   :c:func:`PyImport_ImportModuleEx` is now 0 instead of -1.
 
 
diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -962,7 +962,7 @@
 */
 
 /* This is the old private API, invoked by the macros before 3.2.4.
-   Kept for binary compatibility of extensions. */
+   Kept for binary compatibility of extensions using the stable ABI. */
 PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
 PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
 PyAPI_DATA(int) _PyTrash_delete_nesting;
diff --git a/Include/objimpl.h b/Include/objimpl.h
--- a/Include/objimpl.h
+++ b/Include/objimpl.h
@@ -181,12 +181,9 @@
 #endif
 
 #define _PyObject_VAR_SIZE(typeobj, nitems)     \
-    (size_t)                                    \
-    ( ( (typeobj)->tp_basicsize +               \
-        (nitems)*(typeobj)->tp_itemsize +       \
-        (SIZEOF_VOID_P - 1)                     \
-      ) & ~(SIZEOF_VOID_P - 1)                  \
-    )
+    _Py_SIZE_ROUND_UP((typeobj)->tp_basicsize + \
+        (nitems)*(typeobj)->tp_itemsize,        \
+        SIZEOF_VOID_P)
 
 #define PyObject_NEW(type, typeobj) \
 ( (type *) PyObject_Init( \
diff --git a/Include/pyfpe.h b/Include/pyfpe.h
--- a/Include/pyfpe.h
+++ b/Include/pyfpe.h
@@ -4,8 +4,8 @@
 extern "C" {
 #endif
 /*
-     ---------------------------------------------------------------------  
-    /                       Copyright (c) 1996.                           \ 
+     ---------------------------------------------------------------------
+    /                       Copyright (c) 1996.                           \
    |          The Regents of the University of California.                 |
    |                        All rights reserved.                           |
    |                                                                       |
@@ -37,8 +37,8 @@
    |   opinions  of authors expressed herein do not necessarily state or   |
    |   reflect those of the United States Government or  the  University   |
    |   of  California,  and shall not be used for advertising or product   |
-    \  endorsement purposes.                                              / 
-     ---------------------------------------------------------------------  
+    \  endorsement purposes.                                              /
+     ---------------------------------------------------------------------
 */
 
 /*
diff --git a/Include/pymacro.h b/Include/pymacro.h
--- a/Include/pymacro.h
+++ b/Include/pymacro.h
@@ -52,4 +52,18 @@
 #define PyDoc_STR(str) ""
 #endif
 
+/* Below "a" is a power of 2. */
+/* Round down size "n" to be a multiple of "a". */
+#define _Py_SIZE_ROUND_DOWN(n, a) ((size_t)(n) & ~(size_t)((a) - 1))
+/* Round up size "n" to be a multiple of "a". */
+#define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \
+        (size_t)((a) - 1)) & ~(size_t)((a) - 1))
+/* Round pointer "p" down to the closest "a"-aligned address <= "p". */
+#define _Py_ALIGN_DOWN(p, a) ((void *)((Py_uintptr_t)(p) & ~(Py_uintptr_t)((a) - 1)))
+/* Round pointer "p" up to the closest "a"-aligned address >= "p". */
+#define _Py_ALIGN_UP(p, a) ((void *)(((Py_uintptr_t)(p) + \
+        (Py_uintptr_t)((a) - 1)) & ~(Py_uintptr_t)((a) - 1)))
+/* Check if pointer "p" is aligned to "a"-bytes boundary. */
+#define _Py_IS_ALIGNED(p, a) (!((Py_uintptr_t)(p) & (Py_uintptr_t)((a) - 1)))
+
 #endif /* Py_PYMACRO_H */
diff --git a/Lib/_pyio.py b/Lib/_pyio.py
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -895,12 +895,18 @@
         return pos
 
     def readable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def writable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
 
@@ -1562,6 +1568,8 @@
         return self._buffer
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return self._seekable
 
     def readable(self):
diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1725,10 +1725,7 @@
             if action.dest is not SUPPRESS:
                 if not hasattr(namespace, action.dest):
                     if action.default is not SUPPRESS:
-                        default = action.default
-                        if isinstance(action.default, str):
-                            default = self._get_value(action, default)
-                        setattr(namespace, action.dest, default)
+                        setattr(namespace, action.dest, action.default)
 
         # add any parser defaults that aren't present
         for dest in self._defaults:
@@ -1951,9 +1948,25 @@
         # if we didn't consume all the argument strings, there were extras
         extras.extend(arg_strings[stop_index:])
 
-        # make sure all required actions were present
-        required_actions = [_get_action_name(action) for action in self._actions
-                            if action.required and action not in seen_actions]
+        # make sure all required actions were present and also convert
+        # action defaults which were not given as arguments
+        required_actions = []
+        for action in self._actions:
+            if action not in seen_actions:
+                if action.required:
+                    required_actions.append(_get_action_name(action))
+                else:
+                    # Convert action default now instead of doing it before
+                    # parsing arguments to avoid calling convert functions
+                    # twice (which may fail) if the argument was given, but
+                    # only if it was defined already in the namespace
+                    if (action.default is not None and
+                        isinstance(action.default, str) and
+                        hasattr(namespace, action.dest) and
+                        action.default is getattr(namespace, action.dest)):
+                        setattr(namespace, action.dest,
+                                self._get_value(action, action.default))
+
         if required_actions:
             self.error(_('the following arguments are required: %s') %
                        ', '.join(required_actions))
diff --git a/Lib/calendar.py b/Lib/calendar.py
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -161,7 +161,11 @@
         oneday = datetime.timedelta(days=1)
         while True:
             yield date
-            date += oneday
+            try:
+                date += oneday
+            except OverflowError:
+                # Adding one day could fail after datetime.MAXYEAR
+                break
             if date.month != month and date.weekday() == self.firstweekday:
                 break
 
diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2334,7 +2334,12 @@
     elif not tests:
         # Why do we want to do this? Because it reveals a bug that might
         # otherwise be hidden.
-        raise ValueError(module, "has no tests")
+        # It is probably a bug that this exception is not also raised if the
+        # number of doctest examples in tests is zero (i.e. if no doctest
+        # examples were found).  However, we should probably not be raising
+        # an exception at all here, though it is too late to make this change
+        # for a maintenance release.  See also issue #14649.
+        raise ValueError(module, "has no docstrings")
 
     tests.sort()
     suite = unittest.TestSuite()
diff --git a/Lib/gzip.py b/Lib/gzip.py
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -670,9 +670,9 @@
             if not chunk:
                 break
             g.write(chunk)
-        if g is not sys.stdout:
+        if g is not sys.stdout.buffer:
             g.close()
-        if f is not sys.stdin:
+        if f is not sys.stdin.buffer:
             f.close()
 
 if __name__ == '__main__':
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1825,7 +1825,7 @@
 
 class LWPCookieJar(FileCookieJar):
     """
-    The LWPCookieJar saves a sequence of"Set-Cookie3" lines.
+    The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
     "Set-Cookie3" is the format used by the libwww-perl libary, not known
     to be compatible with any browser, but which is easy to read and
     doesn't lose information about RFC 2965 cookies.
@@ -1837,7 +1837,7 @@
     """
 
     def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
-        """Return cookies as a string of "\n"-separated "Set-Cookie3" headers.
+        """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
 
         ignore_discard and ignore_expires: see docstring for FileCookieJar.save
 
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -419,8 +419,8 @@
     .pyc/.pyo file calculated as if the .py file were imported.  The extension
     will be .pyc unless sys.flags.optimize is non-zero, then it will be .pyo.
 
-    If debug_override is not None, then it must be a boolean and is taken as
-    the value of bool(sys.flags.optimize) instead.
+    If debug_override is not None, then it must be a boolean and is used in
+    place of sys.flags.optimize.
 
     If sys.implementation.cache_tag is None then NotImplementedError is raised.
 
@@ -1669,7 +1669,11 @@
         elif not name:
             return module
         else:
+            # Figure out where to slice the module's name up to the first dot
+            # in 'name'.
             cut_off = len(name) - len(name.partition('.')[0])
+            # Slice end needs to be positive to alleviate need to special-case
+            # when ``'.' not in name``.
             return sys.modules[module.__name__[:len(module.__name__)-cut_off]]
     else:
         return _handle_fromlist(module, fromlist, _gcd_import)
diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py
--- a/Lib/lib2to3/fixer_util.py
+++ b/Lib/lib2to3/fixer_util.py
@@ -274,9 +274,9 @@
     """Find the top level namespace."""
     # Scamper up to the top level namespace
     while node.type != syms.file_input:
-        assert node.parent, "Tree is insane! root found before "\
-                           "file_input node was found."
         node = node.parent
+        if not node:
+            raise ValueError("root found before file_input node was found.")
     return node
 
 def does_tree_import(package, name, node):
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -445,7 +445,7 @@
 
                         try:
                             find_root(node)
-                        except AssertionError:
+                        except ValueError:
                             # this node has been cut off from a
                             # previous transformation ; skip
                             continue
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -208,6 +208,9 @@
             raise ValueError("String input must be ASCII-only; "
                 "use bytes or a Message instead")
 
+    # Whether each message must end in a newline
+    _append_newline = False
+
     def _dump_message(self, message, target, mangle_from_=False):
         # This assumes the target file is open in binary mode.
         """Dump message contents to target file."""
@@ -219,6 +222,9 @@
             data = buffer.read()
             data = data.replace(b'\n', linesep)
             target.write(data)
+            if self._append_newline and not data.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif isinstance(message, (str, bytes, io.StringIO)):
             if isinstance(message, io.StringIO):
                 warnings.warn("Use of StringIO input is deprecated, "
@@ -230,11 +236,15 @@
                 message = message.replace(b'\nFrom ', b'\n>From ')
             message = message.replace(b'\n', linesep)
             target.write(message)
+            if self._append_newline and not message.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif hasattr(message, 'read'):
             if hasattr(message, 'buffer'):
                 warnings.warn("Use of text mode files is deprecated, "
                     "use a binary mode file instead", DeprecationWarning, 3)
                 message = message.buffer
+            lastline = None
             while True:
                 line = message.readline()
                 # Universal newline support.
@@ -248,6 +258,10 @@
                     line = b'>From ' + line[5:]
                 line = line.replace(b'\n', linesep)
                 target.write(line)
+                lastline = line
+            if self._append_newline and lastline and not lastline.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         else:
             raise TypeError('Invalid message type: %s' % type(message))
 
@@ -833,30 +847,48 @@
 
     _mangle_from_ = True
 
+    # All messages must end in a newline character, and
+    # _post_message_hooks outputs an empty line between messages.
+    _append_newline = True
+
     def __init__(self, path, factory=None, create=True):
         """Initialize an mbox mailbox."""
         self._message_factory = mboxMessage
         _mboxMMDF.__init__(self, path, factory, create)
 
-    def _pre_message_hook(self, f):
-        """Called before writing each message to file f."""
-        if f.tell() != 0:
-            f.write(linesep)
+    def _post_message_hook(self, f):
+        """Called after writing each message to file f."""
+        f.write(linesep)
 
     def _generate_toc(self):
         """Generate key-to-(start, stop) table of contents."""
         starts, stops = [], []
+        last_was_empty = False
         self._file.seek(0)
         while True:
             line_pos = self._file.tell()
             line = self._file.readline()
             if line.startswith(b'From '):
                 if len(stops) < len(starts):
+                    if last_was_empty:
+                        stops.append(line_pos - len(linesep))
+                    else:
+                        # The last line before the "From " line wasn't
+                        # blank, but we consider it a start of a
+                        # message anyway.
+                        stops.append(line_pos)
+                starts.append(line_pos)
+                last_was_empty = False
+            elif not line:
+                if last_was_empty:
                     stops.append(line_pos - len(linesep))
-                starts.append(line_pos)
-            elif not line:
-                stops.append(line_pos)
+                else:
+                    stops.append(line_pos)
                 break
+            elif line == linesep:
+                last_was_empty = True
+            else:
+                last_was_empty = False
         self._toc = dict(enumerate(zip(starts, stops)))
         self._next_key = len(self._toc)
         self._file_length = self._file.tell()
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -225,7 +225,6 @@
         Apply `func` to each element in `iterable`, collecting the results
         in a list that is returned.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, mapstar, chunksize).get()
 
     def starmap(self, func, iterable, chunksize=None):
@@ -234,7 +233,6 @@
         be iterables as well and will be unpacked as arguments. Hence
         `func` and (a, b) becomes func(a, b).
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, starmapstar, chunksize).get()
 
     def starmap_async(self, func, iterable, chunksize=None, callback=None,
@@ -242,7 +240,6 @@
         '''
         Asynchronous version of `starmap()` method.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, starmapstar, chunksize,
                                callback, error_callback)
 
@@ -250,7 +247,8 @@
         '''
         Equivalent of `map()` -- can be MUCH slower than `Pool.map()`.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if chunksize == 1:
             result = IMapIterator(self._cache)
             self._taskqueue.put((((result._job, i, func, (x,), {})
@@ -268,7 +266,8 @@
         '''
         Like `imap()` method but ordering of results is arbitrary.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if chunksize == 1:
             result = IMapUnorderedIterator(self._cache)
             self._taskqueue.put((((result._job, i, func, (x,), {})
@@ -287,7 +286,8 @@
         '''
         Asynchronous version of `apply()` method.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         result = ApplyResult(self._cache, callback, error_callback)
         self._taskqueue.put(([(result._job, None, func, args, kwds)], None))
         return result
@@ -297,7 +297,6 @@
         '''
         Asynchronous version of `map()` method.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, mapstar, chunksize)
 
     def _map_async(self, func, iterable, mapper, chunksize=None, callback=None,
@@ -305,6 +304,8 @@
         '''
         Helper function to implement map, starmap and their async counterparts.
         '''
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if not hasattr(iterable, '__len__'):
             iterable = list(iterable)
 
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -235,6 +235,12 @@
     Finalizers with highest priority are called first; finalizers with
     the same priority will be called in reverse order of creation.
     '''
+    if _finalizer_registry is None:
+        # This function may be called after this module's globals are
+        # destroyed.  See the _exit_function function in this module for more
+        # notes.
+        return
+
     if minpriority is None:
         f = lambda p : p[0][0] is not None
     else:
@@ -266,7 +272,13 @@
 
 _exiting = False
 
-def _exit_function():
+def _exit_function(info=info, debug=debug, _run_finalizers=_run_finalizers,
+                   active_children=active_children,
+                   current_process=current_process):
+    # We hold on to references to functions in the arglist due to the
+    # situation described below, where this function is called after this
+    # module's globals are destroyed.
+
     global _exiting
 
     if not _exiting:
@@ -276,14 +288,28 @@
         debug('running all "atexit" finalizers with priority >= 0')
         _run_finalizers(0)
 
-        for p in active_children():
-            if p._daemonic:
-                info('calling terminate() for daemon %s', p.name)
-                p._popen.terminate()
+        if current_process() is not None:
+            # We check if the current process is None here because if
+            # it's None, any call to ``active_children()`` will throw
+            # an AttributeError (active_children winds up trying to
+            # get attributes from util._current_process).  One
+            # situation where this can happen is if someone has
+            # manipulated sys.modules, causing this module to be
+            # garbage collected.  The destructor for the module type
+            # then replaces all values in the module dict with None.
+            # For instance, after setuptools runs a test it replaces
+            # sys.modules with a copy created earlier.  See issues
+            # #9775 and #15881.  Also related: #4106, #9205, and
+            # #9207.
 
-        for p in active_children():
-            info('calling join() for process %s', p.name)
-            p.join()
+            for p in active_children():
+                if p._daemonic:
+                    info('calling terminate() for daemon %s', p.name)
+                    p._popen.terminate()
+
+            for p in active_children():
+                info('calling join() for process %s', p.name)
+                p.join()
 
         debug('running the remaining "atexit" finalizers')
         _run_finalizers()
diff --git a/Lib/socket.py b/Lib/socket.py
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -324,12 +324,23 @@
     def readable(self):
         """True if the SocketIO is open for reading.
         """
-        return self._reading and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._reading
 
     def writable(self):
         """True if the SocketIO is open for writing.
         """
-        return self._writing and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._writing
+
+    def seekable(self):
+        """True if the SocketIO is open for seeking.
+        """
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return super().seekable()
 
     def fileno(self):
         """Return the file descriptor of the underlying socket.
diff --git a/Lib/test/sample_doctest_no_docstrings.py b/Lib/test/sample_doctest_no_docstrings.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_docstrings.py
@@ -0,0 +1,12 @@
+# This is a sample module used for testing doctest.
+#
+# This module is for testing how doctest handles a module with no
+# docstrings.
+
+
+class Foo(object):
+
+    # A class with no docstring.
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/sample_doctest_no_doctests.py b/Lib/test/sample_doctest_no_doctests.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_doctests.py
@@ -0,0 +1,15 @@
+"""This is a sample module used for testing doctest.
+
+This module is for testing how doctest handles a module with docstrings
+but no doctest examples.
+
+"""
+
+
+class Foo(object):
+    """A docstring with no doctest examples.
+
+    """
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -1206,6 +1206,9 @@
         self.checkraises(ValueError, '%%%df' % (2**64), '__mod__', (3.2))
         self.checkraises(ValueError, '%%.%df' % (2**64), '__mod__', (3.2))
 
+        class X(object): pass
+        self.checkraises(TypeError, 'abc', '__mod__', X())
+
     def test_floatformatting(self):
         # float formatting
         for prec in range(100):
diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -680,7 +680,7 @@
     except OSError:
         if not quiet:
             raise
-        warnings.warn('tests may fail, unable to change the CWD to ' + name,
+        warnings.warn('tests may fail, unable to change the CWD to ' + path,
                       RuntimeWarning, stacklevel=3)
     try:
         yield os.getcwd()
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1463,6 +1463,22 @@
         ('readonly', NS(x=None, spam=RFile('readonly'))),
     ]
 
+class TestFileTypeDefaults(TempDirMixin, ParserTestCase):
+    """Test that a file is not created unless the default is needed"""
+    def setUp(self):
+        super(TestFileTypeDefaults, self).setUp()
+        file = open(os.path.join(self.temp_dir, 'good'), 'w')
+        file.write('good')
+        file.close()
+
+    argument_signatures = [
+        Sig('-c', type=argparse.FileType('r'), default='no-file.txt'),
+    ]
+    # should provoke no such file error
+    failures = ['']
+    # should not provoke error because default file is created
+    successes = [('-c good', NS(c=RFile('good')))]
+
 
 class TestFileTypeRB(TempDirMixin, ParserTestCase):
     """Test the FileType option/argument type for reading files"""
@@ -4559,6 +4575,71 @@
         self.assertNotIn(msg, 'optional_positional')
 
 
+# ================================================
+# Check that the type function is called only once
+# ================================================
+
+class TestTypeFunctionCallOnlyOnce(TestCase):
+
+    def test_type_function_call_only_once(self):
+        def spam(string_to_convert):
+            self.assertEqual(string_to_convert, 'spam!')
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='bar')
+        args = parser.parse_args('--foo spam!'.split())
+        self.assertEqual(NS(foo='foo_converted'), args)
+
+# ==================================================================
+# Check semantics regarding the default argument and type conversion
+# ==================================================================
+
+class TestTypeFunctionCalledOnDefault(TestCase):
+
+    def test_type_function_call_with_non_string_default(self):
+        def spam(int_to_convert):
+            self.assertEqual(int_to_convert, 0)
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default=0)
+        args = parser.parse_args([])
+        # foo should *not* be converted because its default is not a string.
+        self.assertEqual(NS(foo=0), args)
+
+    def test_type_function_call_with_string_default(self):
+        def spam(int_to_convert):
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='0')
+        args = parser.parse_args([])
+        # foo is converted because its default is a string.
+        self.assertEqual(NS(foo='foo_converted'), args)
+
+    def test_no_double_type_conversion_of_default(self):
+        def extend(str_to_convert):
+            return str_to_convert + '*'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', type=extend, default='*')
+        args = parser.parse_args([])
+        # The test argument will be two stars, one coming from the default
+        # value and one coming from the type conversion being called exactly
+        # once.
+        self.assertEqual(NS(test='**'), args)
+
+    def test_issue_15906(self):
+        # Issue #15906: When action='append', type=str, default=[] are
+        # providing, the dest value was the string representation "[]" when it
+        # should have been an empty list.
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', dest='test', type=str,
+                            default=[], action='append')
+        args = parser.parse_args([])
+        self.assertEqual(args.test, [])
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -407,6 +407,14 @@
         b = compile('foo(1 + 1)', '<unknown>', 'exec', ast.PyCF_ONLY_AST)
         self.assertEqual(ast.dump(a), ast.dump(b))
 
+    def test_parse_in_error(self):
+        try:
+            1/0
+        except Exception:
+            with self.assertRaises(SyntaxError) as e:
+                ast.literal_eval(r"'\U'")
+            self.assertIsNotNone(e.exception.__context__)
+
     def test_dump(self):
         node = ast.parse('spam(eggs, "and cheese")')
         self.assertEqual(ast.dump(node),
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -6,6 +6,7 @@
 import time
 import locale
 import sys
+import datetime
 
 result_2004_01_text = """
     January 2004
@@ -464,6 +465,11 @@
         new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
         self.assertEqual(old_october, new_october)
 
+    def test_itermonthdates(self):
+        # ensure itermonthdates doesn't overflow after datetime.MAXYEAR
+        # see #15421
+        list(calendar.Calendar().itermonthdates(datetime.MAXYEAR, 12))
+
 
 class MonthCalendarTestCase(unittest.TestCase):
     def setUp(self):
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1693,6 +1693,15 @@
         )
 
         self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict", "\U0010FFFFbc"),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict", "ab"
+        )
+
+        self.assertEqual(
             codecs.charmap_decode(b"\x00\x01\x02", "replace", "ab"),
             ("ab\ufffd", 3)
         )
@@ -1718,6 +1727,113 @@
             ("", len(allbytes))
         )
 
+    def test_decode_with_int2str_map(self):
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: 'c'}),
+            ("abc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'Aa', 1: 'Bb', 2: 'Cc'}),
+            ("AaBbCc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: '\U0010FFFF', 1: 'b', 2: 'c'}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: ''}),
+            ("ab", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: 'a', 1: 'b'}
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b'}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b'}),
+            ("ab", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab", 3)
+        )
+
+        allbytes = bytes(range(256))
+        self.assertEqual(
+            codecs.charmap_decode(allbytes, "ignore", {}),
+            ("", len(allbytes))
+        )
+
+    def test_decode_with_int2int_map(self):
+        a = ord('a')
+        b = ord('b')
+        c = ord('c')
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: a, 1: b, 2: c}),
+            ("abc", 3)
+        )
+
+        # Issue #15379
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 0x10FFFF, 1: b, 2: c}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: sys.maxunicode, 1: b, 2: c}),
+            (chr(sys.maxunicode) + "bc", 3)
+        )
+
+        self.assertRaises(TypeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: sys.maxunicode + 1, 1: b, 2: c}
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: a, 1: b},
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: a, 1: b}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: a, 1: b}),
+            ("ab", 3)
+        )
+
+
 class WithStmtTest(unittest.TestCase):
     def test_encodedfile(self):
         f = io.BytesIO(b"\xc3\xbc")
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -134,15 +134,21 @@
 class CommandLineTests(unittest.TestCase):
     """Test compileall's CLI."""
 
+    def _get_run_args(self, args):
+        interp_args = ['-S']
+        if sys.flags.optimize:
+            interp_args.append({1 : '-O', 2 : '-OO'}[sys.flags.optimize])
+        return interp_args + ['-m', 'compileall'] + list(args)
+
     def assertRunOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_ok(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                         *self._get_run_args(args), **env_vars)
         self.assertEqual(b'', err)
         return out
 
     def assertRunNotOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_failure(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                        *self._get_run_args(args), **env_vars)
         return rc, out, err
 
     def assertCompiled(self, fn):
@@ -198,7 +204,9 @@
         self.assertRunOK('-b', '-q', self.pkgdir)
         # Verify the __pycache__ directory contents.
         self.assertFalse(os.path.exists(self.pkgdir_cachedir))
-        expected = sorted(['__init__.py', '__init__.pyc', 'bar.py', 'bar.pyc'])
+        opt = 'c' if __debug__ else 'o'
+        expected = sorted(['__init__.py', '__init__.py' + opt, 'bar.py',
+                           'bar.py' + opt])
         self.assertEqual(sorted(os.listdir(self.pkgdir)), expected)
 
     def test_multiple_runs(self):
@@ -326,7 +334,7 @@
         f2 = script_helper.make_script(self.pkgdir, 'f2', '')
         f3 = script_helper.make_script(self.pkgdir, 'f3', '')
         f4 = script_helper.make_script(self.pkgdir, 'f4', '')
-        p = script_helper.spawn_python('-m', 'compileall', '-i', '-')
+        p = script_helper.spawn_python(*(self._get_run_args(()) + ['-i', '-']))
         p.stdin.write((f3+os.linesep).encode('ascii'))
         script_helper.kill_python(p)
         self.assertNotCompiled(f1)
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -225,6 +225,15 @@
         self.assertRaises(csv.Error, self._read_test, ['a,b\nc,d'], [])
         self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], [])
 
+    def test_read_eof(self):
+        self._read_test(['a,"'], [['a', '']])
+        self._read_test(['"a'], [['a']])
+        self._read_test(['^'], [['\n']], escapechar='^')
+        self.assertRaises(csv.Error, self._read_test, ['a,"'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test, ['"a'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test,
+                          ['^'], [], escapechar='^', strict=True)
+
     def test_read_escape(self):
         self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\')
         self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\')
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -34,7 +34,8 @@
 import locale
 from test.support import (run_unittest, run_doctest, is_resource_enabled,
                           requires_IEEE_754)
-from test.support import check_warnings, import_fresh_module, TestFailed
+from test.support import (check_warnings, import_fresh_module, TestFailed,
+                          run_with_locale)
 import random
 import time
 import warnings
@@ -1136,18 +1137,19 @@
         self.assertEqual(get_fmt(Decimal('-1.5'), dotsep_wide, '020n'),
                          '-0\u00b4000\u00b4000\u00b4000\u00b4001\u00bf5')
 
+    @run_with_locale('LC_ALL', 'ps_AF')
     def test_wide_char_separator_decimal_point(self):
         # locale with wide char separator and decimal point
+        import locale
         Decimal = self.decimal.Decimal
 
-        try:
-            locale.setlocale(locale.LC_ALL, 'ps_AF')
-        except locale.Error:
+        decimal_point = locale.localeconv()['decimal_point']
+        thousands_sep = locale.localeconv()['thousands_sep']
+        if decimal_point != '\u066b' or thousands_sep != '\u066c':
             return
 
         self.assertEqual(format(Decimal('100000000.123'), 'n'),
                          '100\u066c000\u066c000\u066b123')
-        locale.resetlocale()
 
 class CFormatTest(FormatTest):
     decimal = C
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -1986,6 +1986,31 @@
          >>> suite.run(unittest.TestResult())
          <unittest.result.TestResult run=9 errors=0 failures=4>
 
+       The module need not contain any doctest examples:
+
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_doctests')
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
+       However, if DocTestSuite finds no docstrings, it raises an error:
+
+         >>> try:
+         ...     doctest.DocTestSuite('test.sample_doctest_no_docstrings')
+         ... except ValueError as e:
+         ...     error = e
+
+         >>> print(error.args[1])
+         has no docstrings
+
+       You can prevent this error by passing a DocTestFinder instance with
+       the `exclude_empty` keyword argument set to False:
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_docstrings',
+         ...                              test_finder=finder)
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
        We can use the current module:
 
          >>> suite = test.sample_doctest.test_suite()
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -154,6 +154,11 @@
         err = err.replace("warning: Cannot initialize thread debugging"
                           " library: Debugger service failed\n",
                           '')
+        err = err.replace('warning: Could not load shared library symbols for '
+                          'linux-vdso.so.1.\n'
+                          'Do you need "set solib-search-path" or '
+                          '"set sysroot"?\n',
+                          '')
 
         # Ensure no unexpected error messages:
         self.assertEqual(err, '')
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -591,7 +591,7 @@
         self.assertTrue(os.path.exists('__pycache__'))
         self.assertTrue(os.path.exists(os.path.join(
             '__pycache__', '{}.{}.py{}'.format(
-            TESTFN, self.tag, __debug__ and 'c' or 'o'))))
+            TESTFN, self.tag, 'c' if __debug__ else 'o'))))
 
     @unittest.skipUnless(os.name == 'posix',
                          "test meaningful only on posix systems")
diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py
--- a/Lib/test/test_importlib/test_locks.py
+++ b/Lib/test/test_importlib/test_locks.py
@@ -1,4 +1,5 @@
 from importlib import _bootstrap
+import sys
 import time
 import unittest
 import weakref
@@ -41,6 +42,17 @@
 @unittest.skipUnless(threading, "threads needed for this test")
 class DeadlockAvoidanceTests(unittest.TestCase):
 
+    def setUp(self):
+        try:
+            self.old_switchinterval = sys.getswitchinterval()
+            sys.setswitchinterval(0.000001)
+        except AttributeError:
+            self.old_switchinterval = None
+
+    def tearDown(self):
+        if self.old_switchinterval is not None:
+            sys.setswitchinterval(self.old_switchinterval)
+
     def run_deadlock_avoidance_test(self, create_deadlock):
         NLOCKS = 10
         locks = [LockType(str(i)) for i in range(NLOCKS)]
@@ -75,10 +87,12 @@
 
     def test_deadlock(self):
         results = self.run_deadlock_avoidance_test(True)
-        # One of the threads detected a potential deadlock on its second
-        # acquire() call.
-        self.assertEqual(results.count((True, False)), 1)
-        self.assertEqual(results.count((True, True)), len(results) - 1)
+        # At least one of the threads detected a potential deadlock on its
+        # second acquire() call.  It may be several of them, because the
+        # deadlock avoidance mechanism is conservative.
+        nb_deadlocks = results.count((True, False))
+        self.assertGreaterEqual(nb_deadlocks, 1)
+        self.assertEqual(results.count((True, True)), len(results) - nb_deadlocks)
 
     def test_no_deadlock(self):
         results = self.run_deadlock_avoidance_test(False)
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -305,6 +305,18 @@
                     self.fail("Failed to raise TypeError with %s" %
                               ((base, trunc_result_base),))
 
+                # Regression test for bugs.python.org/issue16060.
+                class BadInt(trunc_result_base):
+                    def __int__(self):
+                        return 42.0
+
+                class TruncReturnsBadInt(base):
+                    def __trunc__(self):
+                        return BadInt()
+
+                with self.assertRaises(TypeError):
+                    int(TruncReturnsBadInt())
+
     def test_error_message(self):
         testlist = ('\xbd', '123\xbd', '  123 456  ')
         for s in testlist:
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2887,6 +2887,11 @@
         with self.open(support.TESTFN, 'rb') as f:
             self.assertEqual(b"spam", f.read())
 
+    def test_open_allargs(self):
+        # there used to be a buffer overflow in the parser for rawmode
+        self.assertRaises(ValueError, self.open, support.TESTFN, 'rwax+')
+
+
 class CMiscIOTest(MiscIOTest):
     io = io
 
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -53,7 +53,7 @@
     maxDiff = None
 
     _factory = None     # Overridden by subclasses to reuse tests
-    _template = 'From: foo\n\n%s'
+    _template = 'From: foo\n\n%s\n'
 
     def setUp(self):
         self._path = support.TESTFN
@@ -232,7 +232,7 @@
         key0 = self._box.add(self._template % 0)
         msg = self._box.get(key0)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertIs(self._box.get('foo'), None)
         self.assertIs(self._box.get('foo', False), False)
         self._box.close()
@@ -240,14 +240,14 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '1')
+        self.assertEqual(msg.get_payload(), '1\n')
 
     def test_getitem(self):
         # Retrieve message using __getitem__()
         key0 = self._box.add(self._template % 0)
         msg = self._box[key0]
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertRaises(KeyError, lambda: self._box['foo'])
         self._box.discard(key0)
         self.assertRaises(KeyError, lambda: self._box[key0])
@@ -259,7 +259,7 @@
         msg0 = self._box.get_message(key0)
         self.assertIsInstance(msg0, mailbox.Message)
         self.assertEqual(msg0['from'], 'foo')
-        self.assertEqual(msg0.get_payload(), '0')
+        self.assertEqual(msg0.get_payload(), '0\n')
         self._check_sample(self._box.get_message(key1))
 
     def test_get_bytes(self):
@@ -432,15 +432,15 @@
         self.assertIn(key0, self._box)
         key1 = self._box.add(self._template % 1)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key0).get_payload(), '0')
+        self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
         self.assertNotIn(key0, self._box)
         self.assertIn(key1, self._box)
         key2 = self._box.add(self._template % 2)
         self.assertIn(key2, self._box)
-        self.assertEqual(self._box.pop(key2).get_payload(), '2')
+        self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
         self.assertNotIn(key2, self._box)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key1).get_payload(), '1')
+        self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
         self.assertNotIn(key1, self._box)
         self.assertEqual(len(self._box), 0)
 
@@ -635,7 +635,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), '')
-        self.assertEqual(msg_returned.get_payload(), '1')
+        self.assertEqual(msg_returned.get_payload(), '1\n')
         msg2 = mailbox.MaildirMessage(self._template % 2)
         msg2.set_info('2,S')
         self._box[key] = msg2
@@ -643,7 +643,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), 'S')
-        self.assertEqual(msg_returned.get_payload(), '3')
+        self.assertEqual(msg_returned.get_payload(), '3\n')
 
     def test_consistent_factory(self):
         # Add a message.
@@ -763,13 +763,13 @@
             self.assertIsNot(match, None, "Invalid file name: '%s'" % tail)
             groups = match.groups()
             if previous_groups is not None:
-                self.assertTrue(int(groups[0] >= previous_groups[0]),
+                self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]),
                              "Non-monotonic seconds: '%s' before '%s'" %
                              (previous_groups[0], groups[0]))
-                self.assertTrue(int(groups[1] >= previous_groups[1]) or
-                             groups[0] != groups[1],
-                             "Non-monotonic milliseconds: '%s' before '%s'" %
-                             (previous_groups[1], groups[1]))
+                if int(groups[0]) == int(previous_groups[0]):
+                    self.assertGreaterEqual(int(groups[1]), int(previous_groups[1]),
+                                "Non-monotonic milliseconds: '%s' before '%s'" %
+                                (previous_groups[1], groups[1]))
                 self.assertEqual(int(groups[2]), pid,
                              "Process ID mismatch: '%s' should be '%s'" %
                              (groups[2], pid))
@@ -996,20 +996,20 @@
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
-        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_from_bytes(self):
         # Add a byte string starting with 'From ' to the mailbox
-        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_mbox_or_mmdf_message(self):
         # Add an mboxMessage or MMDFMessage
         for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
-            msg = class_('From foo at bar blah\nFrom: foo\n\n0')
+            msg = class_('From foo at bar blah\nFrom: foo\n\n0\n')
             key = self._box.add(msg)
 
     def test_open_close_open(self):
@@ -1116,6 +1116,29 @@
             perms = st.st_mode
             self.assertFalse((perms & 0o111)) # Execute bits should all be off.
 
+    def test_terminating_newline(self):
+        message = email.message.Message()
+        message['From'] = 'john at example.com'
+        message.set_payload('No newline at the end')
+        i = self._box.add(message)
+
+        # A newline should have been appended to the payload
+        message = self._box.get(i)
+        self.assertEqual(message.get_payload(), 'No newline at the end\n')
+
+    def test_message_separator(self):
+        # Check there's always a single blank line after each message
+        self._box.add('From: foo\n\n0')  # No newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+        self._box.add('From: foo\n\n0\n')  # Newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+
 class TestMMDF(_TestMboxMMDF, unittest.TestCase):
 
     _factory = lambda self, path, factory=None: mailbox.MMDF(path, factory)
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -318,9 +318,9 @@
         self.assertEqual(memio.isatty(), False)
         self.assertEqual(memio.closed, False)
         memio.close()
-        self.assertEqual(memio.writable(), True)
-        self.assertEqual(memio.readable(), True)
-        self.assertEqual(memio.seekable(), True)
+        self.assertRaises(ValueError, memio.writable)
+        self.assertRaises(ValueError, memio.readable)
+        self.assertRaises(ValueError, memio.seekable)
         self.assertRaises(ValueError, memio.isatty)
         self.assertEqual(memio.closed, True)
 
@@ -665,7 +665,6 @@
         check(io.BytesIO(b'a'), basesize + 1 + 1 )
         check(io.BytesIO(b'a' * 1000), basesize + 1000 + 1 )
 
-
 class CStringIOTest(PyStringIOTest):
     ioclass = io.StringIO
     UnsupportedOperation = io.UnsupportedOperation
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -488,6 +488,15 @@
         f.flush ()
         return mmap.mmap (f.fileno(), 0)
 
+    def test_empty_file (self):
+        f = open (TESTFN, 'w+b')
+        f.close()
+        with open(TESTFN, "rb") as f :
+            self.assertRaisesRegex(ValueError,
+                                   "cannot mmap an empty file",
+                                   mmap.mmap, f.fileno(), 0,
+                                   access=mmap.ACCESS_READ)
+
     def test_offset (self):
         f = open (TESTFN, 'w+b')
 
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1727,7 +1727,8 @@
             with multiprocessing.Pool(2) as p:
                 r = p.map_async(sqr, L)
                 self.assertEqual(r.get(), expected)
-            self.assertRaises(AssertionError, p.map_async, sqr, L)
+            print(p._state)
+            self.assertRaises(ValueError, p.map_async, sqr, L)
 
 def raising():
     raise KeyError("key")
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -514,23 +514,23 @@
         return os.environ
 
     # Bug 1110478
+    @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
     def test_update2(self):
         os.environ.clear()
-        if os.path.exists("/bin/sh"):
-            os.environ.update(HELLO="World")
-            with os.popen("/bin/sh -c 'echo $HELLO'") as popen:
-                value = popen.read().strip()
-                self.assertEqual(value, "World")
+        os.environ.update(HELLO="World")
+        with os.popen("/bin/sh -c 'echo $HELLO'") as popen:
+            value = popen.read().strip()
+            self.assertEqual(value, "World")
 
+    @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
     def test_os_popen_iter(self):
-        if os.path.exists("/bin/sh"):
-            with os.popen(
-                "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen:
-                it = iter(popen)
-                self.assertEqual(next(it), "line1\n")
-                self.assertEqual(next(it), "line2\n")
-                self.assertEqual(next(it), "line3\n")
-                self.assertRaises(StopIteration, next, it)
+        with os.popen(
+            "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen:
+            it = iter(popen)
+            self.assertEqual(next(it), "line1\n")
+            self.assertEqual(next(it), "line2\n")
+            self.assertEqual(next(it), "line3\n")
+            self.assertRaises(StopIteration, next, it)
 
     # Verify environ keys and values from the OS are of the
     # correct str type.
diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -641,6 +641,16 @@
         parser.Parse("<?xml version='1.0'?><element/>")
         self.assertEqual(handler_call_args, [(None, None)])
 
+        # test UseForeignDTD() is equal to UseForeignDTD(True)
+        handler_call_args[:] = []
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD()
+        parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_ALWAYS)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse("<?xml version='1.0'?><element/>")
+        self.assertEqual(handler_call_args, [(None, None)])
+
     def test_ignore_use_foreign_dtd(self):
         """
         If UseForeignDTD is passed True and a document with an external
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1245,6 +1245,17 @@
             fp.close()
             self.assertEqual(repr(fp), "<_io.BufferedReader name=-1>")
 
+    def test_unusable_closed_socketio(self):
+        with socket.socket() as sock:
+            fp = sock.makefile("rb", buffering=0)
+            self.assertTrue(fp.readable())
+            self.assertFalse(fp.writable())
+            self.assertFalse(fp.seekable())
+            fp.close()
+            self.assertRaises(ValueError, fp.readable)
+            self.assertRaises(ValueError, fp.writable)
+            self.assertRaises(ValueError, fp.seekable)
+
     def test_pickle(self):
         sock = socket.socket()
         with sock:
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -125,12 +125,8 @@
         else:
             self.assertRaises(ssl.SSLError, ssl.RAND_bytes, 16)
 
-        try:
-            ssl.RAND_egd(1)
-        except TypeError:
-            pass
-        else:
-            print("didn't raise TypeError")
+        self.assertRaises(TypeError, ssl.RAND_egd, 1)
+        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
         ssl.RAND_add("this is a random string", 75.0)
 
     def test_parse_cert(self):
diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -10,8 +10,8 @@
 import unittest
 from test import support
 import os
+import sys
 from os import path
-from time import sleep
 
 startfile = support.get_attribute(os, 'startfile')
 
@@ -21,13 +21,12 @@
         self.assertRaises(OSError, startfile, "nonexisting.vbs")
 
     def test_empty(self):
-        empty = path.join(path.dirname(__file__), "empty.vbs")
-        startfile(empty)
-        startfile(empty, "open")
-        # Give the child process some time to exit before we finish.
-        # Otherwise the cleanup code will not be able to delete the cwd,
-        # because it is still in use.
-        sleep(0.1)
+        # Switch to an existing, but safe, working directory to let the
+        # cleanup code do its thing without permission errors.
+        with support.temp_cwd(path=path.dirname(sys.executable)):
+            empty = path.join(path.dirname(__file__), "empty.vbs")
+            startfile(empty)
+            startfile(empty, "open")
 
 def test_main():
     support.run_unittest(TestCase)
diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
--- a/Lib/test/test_super.py
+++ b/Lib/test/test_super.py
@@ -115,6 +115,21 @@
                 return __class__
         self.assertIs(X.f(), X)
 
+    def test_obscure_super_errors(self):
+        def f():
+            super()
+        self.assertRaises(RuntimeError, f)
+        def f(x):
+            del x
+            super()
+        self.assertRaises(RuntimeError, f, None)
+        class X:
+            def f(x):
+                nonlocal __class__
+                del __class__
+                super()
+        self.assertRaises(RuntimeError, X().f)
+
 
 def test_main():
     support.run_unittest(TestSuper)
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -95,6 +95,15 @@
         self.assertFalse(os.path.exists(TESTFN))
         self.assertTrue(os.path.basename(os.getcwd()), here)
 
+    def test_temp_cwd__chdir_warning(self):
+        """Check the warning message when os.chdir() fails."""
+        path = TESTFN + '_does_not_exist'
+        with support.check_warnings() as recorder:
+            with support.temp_cwd(path=path, quiet=True):
+                pass
+            messages = [str(w.message) for w in recorder.warnings]
+        self.assertEqual(messages, ['tests may fail, unable to change the CWD to ' + path])
+
     def test_sortdict(self):
         self.assertEqual(support.sortdict({3:3, 2:2, 1:1}), "{1: 1, 2: 2, 3: 3}")
 
diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py
--- a/Lib/test/test_textwrap.py
+++ b/Lib/test/test_textwrap.py
@@ -22,7 +22,7 @@
             result = []
             for i in range(len(textin)):
                 result.append("  %d: %r" % (i, textin[i]))
-            result = '\n'.join(result)
+            result = "\n".join(result) if result else "  no lines"
         elif isinstance(textin, str):
             result = "  %s\n" % repr(textin)
         return result
@@ -66,6 +66,15 @@
                          "I'm glad to hear it!"])
         self.check_wrap(text, 80, [text])
 
+    def test_empty_string(self):
+        # Check that wrapping the empty string returns an empty list.
+        self.check_wrap("", 6, [])
+        self.check_wrap("", 6, [], drop_whitespace=False)
+
+    def test_empty_string_with_initial_indent(self):
+        # Check that the empty string is not indented.
+        self.check_wrap("", 6, [], initial_indent="++")
+        self.check_wrap("", 6, [], initial_indent="++", drop_whitespace=False)
 
     def test_whitespace(self):
         # Whitespace munging and end-of-sentence detection
@@ -331,7 +340,32 @@
                          ["blah", " ", "(ding", " ", "dong),",
                           " ", "wubba"])
 
-    def test_initial_whitespace(self):
+    def test_drop_whitespace_false(self):
+        # Check that drop_whitespace=False preserves whitespace.
+        # SF patch #1581073
+        text = " This is a    sentence with     much whitespace."
+        self.check_wrap(text, 10,
+                        [" This is a", "    ", "sentence ",
+                         "with     ", "much white", "space."],
+                        drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only(self):
+        # Check that drop_whitespace=False preserves a whitespace-only string.
+        self.check_wrap("   ", 6, ["   "], drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only_with_indent(self):
+        # Check that a whitespace-only string gets indented (when
+        # drop_whitespace is False).
+        self.check_wrap("   ", 6, ["     "], drop_whitespace=False,
+                        initial_indent="  ")
+
+    def test_drop_whitespace_whitespace_only(self):
+        # Check drop_whitespace on a whitespace-only string.
+        self.check_wrap("  ", 6, [])
+
+    def test_drop_whitespace_leading_whitespace(self):
+        # Check that drop_whitespace does not drop leading whitespace (if
+        # followed by non-whitespace).
         # SF bug #622849 reported inconsistent handling of leading
         # whitespace; let's test that a bit, shall we?
         text = " This is a sentence with leading whitespace."
@@ -340,13 +374,27 @@
         self.check_wrap(text, 30,
                         [" This is a sentence with", "leading whitespace."])
 
-    def test_no_drop_whitespace(self):
-        # SF patch #1581073
-        text = " This is a    sentence with     much whitespace."
-        self.check_wrap(text, 10,
-                        [" This is a", "    ", "sentence ",
-                         "with     ", "much white", "space."],
+    def test_drop_whitespace_whitespace_line(self):
+        # Check that drop_whitespace skips the whole line if a non-leading
+        # line consists only of whitespace.
+        text = "abcd    efgh"
+        # Include the result for drop_whitespace=False for comparison.
+        self.check_wrap(text, 6, ["abcd", "    ", "efgh"],
                         drop_whitespace=False)
+        self.check_wrap(text, 6, ["abcd", "efgh"])
+
+    def test_drop_whitespace_whitespace_only_with_indent(self):
+        # Check that initial_indent is not applied to a whitespace-only
+        # string.  This checks a special case of the fact that dropping
+        # whitespace occurs before indenting.
+        self.check_wrap("  ", 6, [], initial_indent="++")
+
+    def test_drop_whitespace_whitespace_indent(self):
+        # Check that drop_whitespace does not drop whitespace indents.
+        # This checks a special case of the fact that dropping whitespace
+        # occurs before indenting.
+        self.check_wrap("abcd efgh", 6, ["  abcd", "  efgh"],
+                        initial_indent="  ", subsequent_indent="  ")
 
     def test_split(self):
         # Ensure that the standard _split() method works as advertised
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -225,9 +225,11 @@
 @reap_threads
 def test_main():
     old_switchinterval = None
+    # Issue #15599: FreeBSD/KVM cannot handle gil_interval == 1.
+    new_switchinterval = 0.00001 if 'freebsd' in sys.platform else 0.00000001
     try:
         old_switchinterval = sys.getswitchinterval()
-        sys.setswitchinterval(0.00000001)
+        sys.setswitchinterval(new_switchinterval)
     except AttributeError:
         pass
     try:
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -791,7 +791,7 @@
         self.assertEqual(C.y, 1)
         self.assertEqual(C.z, 2)
 
-    def test_new_class_exec_body(self):
+    def test_new_class_metaclass_keywords(self):
         #Test that keywords are passed to the metaclass:
         def meta_func(name, bases, ns, **kw):
             return name, bases, ns, kw
diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/test_webbrowser.py
@@ -0,0 +1,192 @@
+import webbrowser
+import unittest
+import subprocess
+from unittest import mock
+from test import support
+
+
+URL = 'http://www.example.com'
+CMD_NAME = 'test'
+
+
+class PopenMock(mock.MagicMock):
+
+    def poll(self):
+        return 0
+
+    def wait(self, seconds=None):
+        return 0
+
+
+class CommandTestMixin:
+
+    def _test(self, meth, *, args=[URL], kw={}, options, arguments):
+        """Given a web browser instance method name along with arguments and
+        keywords for same (which defaults to the single argument URL), creates
+        a browser instance from the class pointed to by self.browser, calls the
+        indicated instance method with the indicated arguments, and compares
+        the resulting options and arguments passed to Popen by the browser
+        instance against the 'options' and 'args' lists.  Options are compared
+        in a position independent fashion, and the arguments are compared in
+        sequence order to whatever is left over after removing the options.
+
+        """
+        popen = PopenMock()
+        support.patch(self, subprocess, 'Popen', popen)
+        browser = self.browser_class(name=CMD_NAME)
+        getattr(browser, meth)(*args, **kw)
+        popen_args = subprocess.Popen.call_args[0][0]
+        self.assertEqual(popen_args[0], CMD_NAME)
+        popen_args.pop(0)
+        for option in options:
+            self.assertIn(option, popen_args)
+            popen_args.pop(popen_args.index(option))
+        self.assertEqual(popen_args, arguments)
+
+
+class GenericBrowserCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.GenericBrowser
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+
+class BackgroundBrowserCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.BackgroundBrowser
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+
+class ChromeCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Chrome
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['--new-window'],
+                   arguments=[URL])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=[],
+                   arguments=[URL])
+
+
+class MozillaCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Mozilla
+
+    def test_open(self):
+        self._test('open',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-noraise', '-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({},new-tab)'.format(URL)])
+
+
+class GaleonCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Galeon
+
+    def test_open(self):
+        self._test('open',
+                   options=['-n'],
+                   arguments=[URL])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-noraise', '-n'],
+                   arguments=[URL])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-w'],
+                   arguments=[URL])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-w'],
+                   arguments=[URL])
+
+
+class OperaCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Opera
+
+    def test_open(self):
+        self._test('open',
+                   options=['-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-remote', '-noraise'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new_tab',
+                   options=['-remote'],
+                   arguments=['openURL({},new-page)'.format(URL)])
+
+
+class ELinksCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Elinks
+
+    def test_open(self):
+        self._test('open', options=['-remote'],
+                           arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open',
+                   options=['-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-remote'],
+                   arguments=['openURL({},new-tab)'.format(URL)])
+
+
+if __name__=='__main__':
+    unittest.main()
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1809,6 +1809,18 @@
         mye = MyElement('joe')
         self.assertEqual(mye.newmethod(), 'joe')
 
+    def test_html_empty_elems_serialization(self):
+        # issue 15970
+        # from http://www.w3.org/TR/html401/index/elements.html
+        for element in ['AREA', 'BASE', 'BASEFONT', 'BR', 'COL', 'FRAME', 'HR',
+                        'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM']:
+            for elem in [element, element.lower()]:
+                expected = '<%s>' % elem
+                serialized = serialize(ET.XML('<%s />' % elem), method='html')
+                self.assertEqual(serialized, expected)
+                serialized = serialize(ET.XML('<%s></%s>' % (elem,elem)),
+                                       method='html')
+                self.assertEqual(serialized, expected)
 
 class ElementIterTest(unittest.TestCase):
     def _ilist(self, elem, tag=None):
diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py
--- a/Lib/test/test_zipimport_support.py
+++ b/Lib/test/test_zipimport_support.py
@@ -29,7 +29,8 @@
 #  test_cmd_line_script (covers the zipimport support in runpy)
 
 # Retrieve some helpers from other test cases
-from test import test_doctest, sample_doctest
+from test import (test_doctest, sample_doctest, sample_doctest_no_doctests,
+                  sample_doctest_no_docstrings)
 
 
 def _run_object_doctest(obj, module):
@@ -105,16 +106,26 @@
                                     "test_zipped_doctest")
         test_src = test_src.replace("test.sample_doctest",
                                     "sample_zipped_doctest")
-        sample_src = inspect.getsource(sample_doctest)
-        sample_src = sample_src.replace("test.test_doctest",
-                                        "test_zipped_doctest")
+        # The sample doctest files rewritten to include in the zipped version.
+        sample_sources = {}
+        for mod in [sample_doctest, sample_doctest_no_doctests,
+                    sample_doctest_no_docstrings]:
+            src = inspect.getsource(mod)
+            src = src.replace("test.test_doctest", "test_zipped_doctest")
+            # Rewrite the module name so that, for example,
+            # "test.sample_doctest" becomes "sample_zipped_doctest".
+            mod_name = mod.__name__.split(".")[-1]
+            mod_name = mod_name.replace("sample_", "sample_zipped_")
+            sample_sources[mod_name] = src
+
         with temp_dir() as d:
             script_name = make_script(d, 'test_zipped_doctest',
                                             test_src)
             zip_name, run_name = make_zip_script(d, 'test_zip',
                                                 script_name)
             z = zipfile.ZipFile(zip_name, 'a')
-            z.writestr("sample_zipped_doctest.py", sample_src)
+            for mod_name, src in sample_sources.items():
+                z.writestr(mod_name + ".py", src)
             z.close()
             if verbose:
                 zip_file = zipfile.ZipFile(zip_name, 'r')
diff --git a/Lib/unittest/__main__.py b/Lib/unittest/__main__.py
--- a/Lib/unittest/__main__.py
+++ b/Lib/unittest/__main__.py
@@ -2,7 +2,14 @@
 
 import sys
 if sys.argv[0].endswith("__main__.py"):
-    sys.argv[0] = "python -m unittest"
+    import os.path
+    # We change sys.argv[0] to make help message more useful
+    # use executable without path, unquoted
+    # (it's just a hint anyway)
+    # (if you have spaces in your executable you get what you deserve!)
+    executable = os.path.basename(sys.executable)
+    sys.argv[0] = executable + " -m unittest"
+    del os
 
 __unittest = True
 
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -731,8 +731,8 @@
         arguments."""
         self = _mock_self
         if not self.call_count == 1:
-            msg = ("Expected to be called once. Called %s times." %
-                   self.call_count)
+            msg = ("Expected '%s' to be called once. Called %s times." %
+                   (self._mock_name or 'mock', self.call_count))
             raise AssertionError(msg)
         return self.assert_called_with(*args, **kwargs)
 
diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -35,7 +35,7 @@
     separator2 = '-' * 70
 
     def __init__(self, stream, descriptions, verbosity):
-        super(TextTestResult, self).__init__()
+        super(TextTestResult, self).__init__(stream, descriptions, verbosity)
         self.stream = stream
         self.showAll = verbosity > 1
         self.dots = verbosity == 1
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -149,6 +149,19 @@
         self.assertEqual(runner.resultclass, unittest.TextTestResult)
 
 
+    def test_multiple_inheritance(self):
+        class AResult(unittest.TestResult):
+            def __init__(self, stream, descriptions, verbosity):
+                super(AResult, self).__init__(stream, descriptions, verbosity)
+
+        class ATextResult(unittest.TextTestResult, AResult):
+            pass
+
+        # This used to raise an exception due to TextTestResult not passing
+        # on arguments in its __init__ super call
+        ATextResult(None, None, 1)
+
+
     def testBufferAndFailfast(self):
         class Test(unittest.TestCase):
             def testFoo(self):
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -463,6 +463,13 @@
                                 mock.assert_called_with)
 
 
+    def test_assert_called_once_with_message(self):
+        mock = Mock(name='geoffrey')
+        self.assertRaisesRegex(AssertionError,
+                     r"Expected 'geoffrey' to be called once\.",
+                     mock.assert_called_once_with)
+
+
     def test__name__(self):
         mock = Mock()
         self.assertRaises(AttributeError, lambda: mock.__name__)
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -206,12 +206,18 @@
     """Parent class for all Unix browsers with remote functionality."""
 
     raise_opts = None
+    background = False
+    redirect_stdout = True
+    # In remote_args, %s will be replaced with the requested URL.  %action will
+    # be replaced depending on the value of 'new' passed to open.
+    # remote_action is used for new=0 (open).  If newwin is not None, it is
+    # used for new=1 (open_new).  If newtab is not None, it is used for
+    # new=3 (open_new_tab).  After both substitutions are made, any empty
+    # strings in the transformed remote_args list will be removed.
     remote_args = ['%action', '%s']
     remote_action = None
     remote_action_newwin = None
     remote_action_newtab = None
-    background = False
-    redirect_stdout = True
 
     def _invoke(self, args, remote, autoraise):
         raise_opt = []
@@ -224,7 +230,7 @@
         cmdline = [self.name] + raise_opt + args
 
         if remote or self.background:
-            inout = io.open(os.devnull, "r+")
+            inout = subprocess.DEVNULL
         else:
             # for TTY browsers, we need stdin/out
             inout = None
@@ -264,6 +270,7 @@
 
         args = [arg.replace("%s", url).replace("%action", action)
                 for arg in self.remote_args]
+        args = [arg for arg in args if arg]
         success = self._invoke(args, True, autoraise)
         if not success:
             # remote invocation failed, try straight way
@@ -347,7 +354,7 @@
         else:
             action = "openURL"
 
-        devnull = io.open(os.devnull, "r+")
+        devnull = subprocess.DEVNULL
         # if possible, put browser in separate process group, so
         # keyboard interrupts don't affect browser as well as Python
         setsid = getattr(os, 'setsid', None)
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -995,7 +995,7 @@
         write(_escape_cdata(elem.tail))
 
 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
-              "img", "input", "isindex", "link", "meta" "param")
+              "img", "input", "isindex", "link", "meta", "param")
 
 try:
     HTML_EMPTY = set(HTML_EMPTY)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -229,8 +229,8 @@
 
 ##########################################################################
 # Grammar
-GRAMMAR_H=	$(srcdir)/Include/graminit.h
-GRAMMAR_C=	$(srcdir)/Python/graminit.c
+GRAMMAR_H=	Include/graminit.h
+GRAMMAR_C=	Python/graminit.c
 GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
 
 
@@ -296,9 +296,9 @@
 
 ##########################################################################
 # AST
-AST_H_DIR=	$(srcdir)/Include
+AST_H_DIR=	Include
 AST_H=		$(AST_H_DIR)/Python-ast.h
-AST_C_DIR=	$(srcdir)/Python
+AST_C_DIR=	Python
 AST_C=		$(AST_C_DIR)/Python-ast.c
 AST_ASDL=	$(srcdir)/Parser/Python.asdl
 
@@ -474,8 +474,13 @@
 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
 
 # Build the shared modules
+# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+# -s, --silent or --quiet is always the first char.
 sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
-	case $$MAKEFLAGS in *s*) quiet=-q; esac; \
+	@case "$$MAKEFLAGS" in \
+	    s*) quiet="-q";; \
+	    *) quiet="";; \
+	esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 
@@ -660,9 +665,11 @@
 Parser/pgenmain.o:	$(srcdir)/Include/parsetok.h
 
 $(AST_H): $(AST_ASDL) $(ASDLGEN_FILES)
+	$(MKDIR_P) $(AST_H_DIR)
 	$(ASDLGEN) -h $(AST_H_DIR) $(AST_ASDL)
 
 $(AST_C): $(AST_H) $(AST_ASDL) $(ASDLGEN_FILES)
+	$(MKDIR_P) $(AST_C_DIR)
 	$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
 
 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -11,6 +11,8 @@
 PS: In the standard Python distribution, this file is encoded in UTF-8
 and the list is in rough alphabetical order by last names.
 
+Aahz
+Michael Abbott
 Rajiv Abraham
 David Abrahams
 Marc Abramowitz
@@ -22,26 +24,32 @@
 Nir Aides
 Yaniv Aknin
 Jyrki Alakuijala
+Steve Alexander
+Fred Allen
 Ray Allen
 Billy G. Allie
 Kevin Altis
 Joe Amenta
+A. Amoroso
 Mark Anacker
 Shashwat Anand
 Anders Andersen
 John Anderson
+Pehr Anderson
 Erik Anders?n
 Oliver Andrich
 Ross Andrus
 Juancarlo A?ez
 J?r?my Anger
 Jon Anglin
+Heidi Annexstad
 ?ric Araujo
 Alicia Arlen
 Jason Asbahr
 David Ascher
 Chris AtLee
 Aymeric Augustin
+Jes?s Cea Avi?n
 John Aycock
 Donovan Baarda
 Attila Babo
@@ -52,8 +60,10 @@
 Greg Ball
 Luigi Ballabio
 Jeff Balogh
+Manuel Balsera
 Matt Bandy
 Michael J. Barber
+Daniel Barclay
 Nicolas Bareil
 Chris Barker
 Anton Barkovsky
@@ -64,6 +74,7 @@
 Cesar Eduardo Barros
 Des Barry
 Ulf Bartelt
+Don Bashford
 Pior Bastida
 Nick Bastin
 Jeff Bauer
@@ -85,6 +96,7 @@
 Eli Bendersky
 Andrew Bennetts
 Andy Bensky
+Bennett Benson
 Ezra Berch
 Michel Van den Bergh
 Julian Berman
@@ -100,6 +112,7 @@
 Philippe Biondi
 Stuart Bishop
 Roy Bixler
+Jonathan Black
 Renaud Blanch
 Mike Bland
 Martin Bless
@@ -109,6 +122,7 @@
 Finn Bock
 Paul Boddie
 Matthew Boedicker
+Robin Boerdijk
 David Bolen
 Gawain Bolton
 Forest Bond
@@ -120,7 +134,9 @@
 Eric Bouck
 Thierry Bousch
 Sebastian Boving
+Michal Bozon
 Jeff Bradberry
+Aaron Brancotti
 Monty Brandenberg
 Georg Brandl
 Christopher Brannon
@@ -130,6 +146,7 @@
 Dave Brennan
 Tom Bridgman
 Anthony Briggs
+Keith Briggs
 Tobias Brink
 Richard Brodie
 Michael Broghton
@@ -140,6 +157,7 @@
 Oleg Broytmann
 Dave Brueck
 Francisco Mart?n Brugu?
+Ian Bruntlett
 Floris Bruynooghe
 Stan Bubrouski
 Erik de Bueger
@@ -167,6 +185,7 @@
 Charles Cazabon
 Per Cederqvist
 Matej Cepl
+Carl Cerecke
 Octavian Cerna
 Pascal Chambon
 John Chandler
@@ -186,8 +205,10 @@
 Anders Chrigstr?m
 Tom Christiansen
 Vadim Chugunov
+Mauro Cicognini
 David Cinege
 Craig Citro
+Gilles Civario
 Chris Clark
 Mike Clarkson
 Andrew Clegg
@@ -222,6 +243,7 @@
 Matthew Dixon Cowles
 Ryan Coyner
 Christopher A. Craig
+Jeremy Craven
 Laura Creighton
 Simon Cross
 Drew Csillag
@@ -249,6 +271,7 @@
 Konrad Delong
 Erik Demaine
 John Dennis
+L. Peter Deutsch
 Roger Dev
 Philippe Devalkeneer
 Raghuram Devarakonda
@@ -265,6 +288,7 @@
 Josip Djolonga
 Jaromir Dolecek
 Ismail Donmez
+Robert Donohue
 Marcos Donolo
 Dima Dorfman
 Yves Dorfsman
@@ -274,6 +298,7 @@
 Derk Drukker
 John DuBois
 Paul Dubois
+Jacques Ducasse
 Graham Dumpleton
 Quinn Dunkan
 Robin Dunn
@@ -282,6 +307,7 @@
 Andy Dustman
 Gary Duzan
 Eugene Dvurechenski
+Josip Dzolonga
 Maxim Dzumanenko
 Walter D?rwald
 Hans Eckardt
@@ -327,19 +353,23 @@
 Sebastian Fernandez
 Florian Festi
 John Feuerstein
+Carl Feynman
 Vincent Fiack
 Tomer Filiba
 Jeffrey Finkelstein
 Russell Finn
+Dan Finnie
 Nils Fischbeck
 Frederik Fix
 Matt Fleming
 Hern?n Mart?nez Foffani
+Arnaud Fontaine
 Michael Foord
 Amaury Forgeot d'Arc
 Doug Fort
 John Fouhy
 Andrew Francis
+Stefan Franke
 Martin Franklin
 Bruce Frederiksen
 Robin Friedrich
@@ -360,6 +390,7 @@
 Lele Gaifax
 Santiago Gala
 Yitzchak Gale
+Matthew Gallagher
 Quentin Gallet-Gilles
 Riccardo Attilio Galli
 Raymund Galvin
@@ -376,25 +407,31 @@
 Gabriel Genellina
 Christos Georgiou
 Ben Gertzfield
+Nadim Ghaznavi
 Dinu Gherman
 Jonathan Giddy
 Johannes Gijsbers
 Michael Gilfix
 Yannick Gingras
+Matt Giuca
 Michael Goderbauer
 Christoph Gohlke
 Tim Golden
 Guilherme Gon?alves
 Tiago Gon?alves
 Chris Gonnerman
+Shelley Gooch
 David Goodger
 Hans de Graaff
+Nathaniel Gray
 Eddy De Greef
+Grant Griffin
 Duncan Grisby
 Fabian Groffen
 Eric Groo
 Dag Gruneau
 Filip Gruszczy?ski
+Thomas Guettler
 Michael Guravage
 Lars Gust?bel
 Thomas G?ttler
@@ -410,7 +447,9 @@
 Jesse Hallio
 Jun Hamano
 Alexandre Hamelin
+Anders Hammarquist
 Mark Hammond
+Harald Hanche-Olsen
 Manus Hand
 Milton L. Hankins
 Stephen Hansen
@@ -420,8 +459,11 @@
 Jason Harper
 Brian Harring
 Jonathan Hartley
+Travis B. Hartwell
 Larry Hastings
+Tim Hatch
 Shane Hathaway
+Janko Hauser
 Rycharde Hawkes
 Ben Hayden
 Jochen Hayek
@@ -451,10 +493,13 @@
 Joerg-Cyril Hoehle
 Gregor Hoffleit
 Chris Hoffman
+Stefan Hoffmeister
 Albert Hofkamp
 Tomas Hoger
 Jonathan Hogg
+Steve Holden
 Akintayo Holder
+Thomas Holenstein
 Gerrit Holl
 Shane Holloway
 Rune Holm
@@ -494,6 +539,7 @@
 Tony Ingraldi
 John Interrante
 Bob Ippolito
+Roger Irwin
 Atsuo Ishimoto
 Adam Jackson
 Ben Jackson
@@ -511,12 +557,15 @@
 Julien Jehannet
 Drew Jenkins
 Flemming Kj?r Jensen
+Philip H. Jensen
 MunSic Jeong
 Chris Jerdonek
 Jim Jewett
+Pedro Diaz Jimenez
 Orjan Johansen
 Fredrik Johansson
 Gregory K. Johnson
+Kent Johnson
 Simon Johnston
 Matt Joiner
 Thomas Jollans
@@ -549,16 +598,19 @@
 Dan Kenigsberg
 Randall Kern
 Robert Kern
+Jim Kerr
 Magnus Kessler
 Lawrence Kesteloot
 Vivek Khera
 Mads Kiilerich
 Jason Killen
+Jan Kim
 Taek Joo Kim
 W. Trevor King
 Paul Kippes
 Steve Kirsch
 Sebastian Kirsche
+Kamil Kisiel
 Akira Kitada
 Ron Klatchko
 Reid Kleckner
@@ -574,11 +626,14 @@
 Greg Kochanski
 Damon Kohler
 Marko Kohtala
+Guido Kollerie
 Jacek Konieczny
 ???? ?????????
 Arkady Koplyarov
+Peter A. Koren
 Vlad Korolev
 Joseph Koshy
+Daniel Kozan
 Jerzy Kozera
 Maksim Kozyarchuk
 Stefan Krah
@@ -592,10 +647,13 @@
 Andrej Krpic
 Ivan Krsti?
 Andrew Kuchling
+Dave Kuhlman
 Jon Kuhn
 Vladimir Kushnir
+Erno Kuusela
 Ross Lagerwall
 Cameron Laird
+Thomas Lamb
 Jean-Baptiste "Jiba" Lamy
 Ronan Lamy
 Torsten Landschoff
@@ -619,6 +677,7 @@
 Thomas Lee
 Tennessee Leeuwenburg
 Luc Lefebvre
+Glyph Lefkowitz
 Vincent Legoll
 Kip Lehman
 Joerg Lehmann
@@ -626,7 +685,7 @@
 Petri Lehtinen
 Luke Kenneth Casson Leighton
 Tshepang Lekhonkhobe
-Marc-Andre Lemburg
+Marc-Andr? Lemburg
 John Lenton
 Christopher Tur Lesniewski-Laas
 Alain Leufroy
@@ -638,12 +697,16 @@
 Ross Light
 Shawn Ligocki
 Martin Ligr
+Gediminas Liktaras
 Grant Limberg
 Christopher Lindblad
+Ulf A. Lindgren
 Bj?rn Lindqvist
 Per Lindqvist
 Eric Lindvall
 Gregor Lingl
+Everett Lipman
+Mirko Liss
 Nick Lockwood
 Stephanie Lockwood
 Hugo Lopes Tavares
@@ -661,6 +724,8 @@
 Mikael Lyngvig
 Martin von L?wis
 Guillermo L?pez-Anglada
+Jeff MacDonald
+John Machin
 Andrew I MacIntyre
 Tim MacKenzie
 Nick Maclaren
@@ -671,20 +736,25 @@
 Ken Manheimer
 Vladimir Marangozov
 Colin Marc
+Vincent Marchetti
 David Marek
 Doug Marien
 Sven Marnach
 Alex Martelli
 Anthony Martin
 Owen Martin
+Westley Mart?nez
 S?bastien Martini
 Sidney San Mart?n
 Roger Masse
 Nick Mathewson
 Simon Mathieu
+Laura Matson
 Graham Matthews
 Dieter Maurer
+Daniel May
 Arnaud Mazin
+Rebecca McCreary
 Kirk McDonald
 Chris McDonough
 Greg McFarlane
@@ -699,6 +769,7 @@
 Bill van Melle
 Lucas Prado Melo
 Ezio Melotti
+Doug Mennella
 Brian Merrell
 Luke Mewburn
 Carl Meyer
@@ -711,6 +782,7 @@
 Stan Mihai
 Stefan Mihaila
 Aristotelis Mikropoulos
+Paolo Milani
 Chad Miller
 Damien Miller
 Jason V. Miller
@@ -727,9 +799,11 @@
 Skip Montanaro
 Peter Moody
 Paul Moore
+Ross Moore
 Derek Morr
 James A Morrison
 Derek McTavish Mounce
+Alessandro Moura
 Pablo Mouzo
 Mher Movsisyan
 Ruslan Mstoi
@@ -740,6 +814,7 @@
 Neil Muller
 Louis Munro
 R. David Murray
+Dale Nagata
 John Nagle
 Takahiro Nakayama
 Travers Naran
@@ -771,13 +846,16 @@
 John O'Connor
 Kevin O'Connor
 Tim O'Malley
+Zooko O'Whielacronx
 James Oakley
 Jon Oberheide
 Pascal Oberndoerfer
 Jeffrey Ollie
 Adam Olsen
 Grant Olson
+Koray Oner
 Piet van Oostrum
+Tomas Oppelstrup
 Jason Orendorff
 Douglas Orr
 Michele Orr?
@@ -787,6 +865,8 @@
 Michael Otteneder
 R. M. Oudkerk
 Russel Owen
+Joonas Paalasmaa
+Shriphani Palakodety
 Ondrej Palkovsky
 Mike Pall
 Todd R. Palmer
@@ -796,8 +876,10 @@
 Peter Parente
 Alexandre Parenteau
 Dan Parisien
+William Park
 Harri Pasanen
 Ga?l Pasgrimaud
+Bo Peng
 Joe Peterson
 Randy Pausch
 Samuele Pedroni
@@ -816,6 +898,7 @@
 Joe Peterson
 Chris Petrilli
 Bjorn Pettersen
+Justin D. Pettit
 Ronny Pfannschmidt
 Geoff Philbrick
 Gavrie Philipson
@@ -856,12 +939,12 @@
 Antti Rasinen
 Sridhar Ratnakumar
 Ysj Ray
-Eric Raymond
+Eric S. Raymond
 Edward K. Ream
 Chris Rebert
 Marc Recht
 John Redford
-Terry Reedy
+Terry J. Reedy
 Gareth Rees
 Steve Reeves
 Lennart Regebro
@@ -883,6 +966,7 @@
 Nicholas Riley
 Jean-Claude Rimbault
 Vlad Riscutia
+Wes Rishel
 Juan M. Bello Rivas
 Davide Rizzo
 Anthony Roach
@@ -903,6 +987,7 @@
 Erik Rose
 Jim Roskind
 Brian Rosner
+Guido van Rossum
 Just van Rossum
 Hugo van Rossum
 Saskia van Rossum
@@ -920,6 +1005,8 @@
 Mark Russell
 Rusty Russell
 Nick Russo
+Chris Ryland
+Constantina S.
 Patrick Sabin
 S?bastien Sabl?
 Suman Saha
@@ -932,6 +1019,8 @@
 Ilya Sandler
 Mark Sapiro
 Ty Sarna
+Hugh Sasse
+Bob Savage
 Ben Sayer
 sbt
 Marco Scataglini
@@ -947,6 +1036,7 @@
 Michael Schneider
 Peter Schneider-Kamp
 Arvin Schnell
+Scott Schram
 Robin Schreiber
 Chad J. Schroeder
 Sam Schulenburg
@@ -961,6 +1051,7 @@
 Fred Sells
 Jiwon Seo
 I?igo Serna
+Joakim Sernbrant
 Roger D. Serwy
 Jerry Seutter
 Denis Severson
@@ -968,6 +1059,8 @@
 Ha Shao
 Mark Shannon
 Richard Shapiro
+Justin Sheehy
+Charlie Shepherd
 Bruce Sherwood
 Alexander Shigin
 Pete Shinners
@@ -975,20 +1068,27 @@
 John W. Shipman
 Joel Shprentz
 Itamar Shtull-Trauring
+Yue Shuaijie
 Eric Siegerman
 Paul Sijben
+SilentGhost
 Tim Silk
+Michael Simcich
+Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
 Adam Simpkins
 Janne Sinkkonen
+Ng Pheng Siong
 George Sipe
 J. Sipprell
 Kragen Sitaker
+Michael Sloan
 Christopher Smith
 Eric V. Smith
 Gregory P. Smith
 Mark Smith
+Roy Smith
 Rafal Smotrzyk
 Eric Snow
 Dirk Soede
@@ -997,14 +1097,17 @@
 Edoardo Spadolini
 Clay Spence
 Stefan Sperling
+Nicholas Spies
 Per Spilling
 Joshua Spoerri
 Noah Spurrier
 Nathan Srebro
 RajGopal Srinivasan
+Tage Stabell-Kulo
 Quentin Stafford-Fraser
 Frank Stajano
 Joel Stanley
+Anthony Starks
 Oliver Steele
 Greg Stein
 Baruch Sterin
@@ -1024,6 +1127,7 @@
 Pal Subbiah
 Nathan Sullivan
 Mark Summerfield
+Reuben Sumner
 Hisao Suzuki
 Kalle Svensson
 Andrew Svetlov
@@ -1054,6 +1158,7 @@
 Oren Tirosh
 Jason Tishler
 Christian Tismer
+Jim Tittsler
 Frank J. Tobin
 Bennett Todd
 R Lindsay Todd
@@ -1070,6 +1175,7 @@
 Jason Trowbridge
 Anthony Tuininga
 Erno Tukia
+David Turner
 Stephen Turner
 Theodore Turocy
 Bill Tutt
@@ -1080,6 +1186,7 @@
 Daniel Urban
 Michael Urman
 Hector Urtubia
+Ville Vainio
 Andi Vajda
 Case Van Horsen
 Kyle VanderBeek
@@ -1101,6 +1208,7 @@
 Pauli Virtanen
 Frank Visser
 Johannes Vogel
+Martijn Vries
 Sjoerd de Vries
 Niki W. Waibel
 Wojtek Walczak
@@ -1118,8 +1226,10 @@
 Aaron Watters
 Henrik Weber
 Corran Webster
+Glyn Webster
 Stefan Wehr
 Zack Weinberg
+Bob Weiner
 Edward Welbourne
 Cliff Wells
 Rickard Westman
@@ -1132,14 +1242,17 @@
 Gerry Wiener
 Frank Wierzbicki
 Bryce "Zooko" Wilcox-O'Hearn
+Timothy Wild
 Jakub Wilk
 Gerald S. Williams
 Jason Williams
 John Williams
 Sue Williams
+Steven Willis
 Frank Willison
 Greg V. Wilson
 J Derek Wilson
+Paul Winkler
 Jody Winston
 Collin Winter
 Dik Winter
@@ -1155,6 +1268,7 @@
 Dan Wolfe
 Richard Wolff
 Adam Woodbeck
+Steven Work
 Gordon Worley
 Darren Worrall
 Thomas Wouters
@@ -1168,6 +1282,7 @@
 EungJun Yi
 Bob Yodlowski
 Danny Yoo
+Rory Yorke
 George Yoshida
 Masazumi Yoshikawa
 Arnaud Ysmal
@@ -1179,6 +1294,7 @@
 Siebren van der Zee
 Yuxiao Zeng
 Uwe Zessin
+Cheng Zhang
 Kai Zhu
 Tarek Ziad?
 Peter ?strand
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,121 @@
 Python News
 +++++++++++
 
+What's New in Python 3.3.1?
+===========================
+
+*Release date: XX-XX-XXXX*
+
+Core and Builtins
+-----------------
+
+- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
+  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
+
+- Issue #15144: Fix possible integer overflow when handling pointers as
+  integer values, by using Py_uintptr_t instead of size_t.  Patch by
+  Serhiy Storchaka.
+
+- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
+  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
+
+- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
+
+- Issue #15846: Fix SystemError which happened when using ast.parse in an
+  exception handler on code with syntax errors.
+
+- Issue #15801: Make sure mappings passed to '%' formatting are actually
+  subscriptable.
+
+Library
+-------
+
+- Issue #15323: improve failure message of Mock.assert_called_once_with
+
+- Issue #16064: unittest -m claims executable is "python", not "python3"
+
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
+- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
+  Patch by Serhiy Storchaka.
+
+- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
+  datetime.MAXYEAR.  Patch by C?dric Krier.
+
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
+- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
+  raise ValueError when the file-like object is closed.  Patch by Alessandro
+  Moura.
+
+- Issue #15876: Fix a refleak in the curses module: window.encoding.
+
+- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
+  by Chris McDonough.
+
+- Issue #15340: Fix importing the random module when /dev/urandom cannot
+  be opened.  This was a regression caused by the hash randomization patch.
+
+- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
+  and StringIO objects now raise ValueError when the object has been closed.
+  Patch by Alessandro Moura.
+
+- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
+  os.devnull explicitly and leaving it open.
+
+- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
+  Popen when %action substitutions produce empty strings.
+
+- Issue #12776,#11839: call argparse type function (specified by add_argument)
+  only once. Before, the type function was called twice in the case where the
+  default was specified and the argument was given as well.  This was
+  especially problematic for the FileType type, as a default file would always
+  be opened, even if a file argument was specified on the command line.
+
+- Issue #15906: Fix a regression in argparse caused by the preceding change,
+  when action='append', type='str' and default=[].
+
+Extension Modules
+-----------------
+
+Tests
+-----
+
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
+Build
+-----
+
+- Issue #15819: Make sure we can build Python out-of-tree from a readonly
+  source directory.  (Somewhat related to Issue #9860.)
+
+Documentation
+-------------
+
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
+- Issue #11964: Document a change in v3.2 to the behavior of the indent
+  parameter of json encoding operations.
+
+Tools/Demos
+-----------
+
+
 What's New in Python 3.3.0?
 ===========================
 
@@ -172,8 +287,6 @@
 
 - Issue #15544: Fix Decimal.__float__ to work with payload-carrying NaNs.
 
-- Issue #15776: Allow pyvenv to work in existing directory with --clean.
-
 - Issue #15249: BytesGenerator now correctly mangles From lines (when
   requested) even if the body contains undecodable bytes.
 
@@ -190,6 +303,9 @@
 
 - Issue #13579: string.Formatter now understands the 'a' conversion specifier.
 
+- Issue #15793: Stack corruption in ssl.RAND_egd().
+  Patch by Serhiy Storchaka.
+
 - Issue #15595: Fix subprocess.Popen(universal_newlines=True)
   for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek.
 
@@ -528,6 +644,9 @@
 Extension Modules
 -----------------
 
+- Issue #15676: Now "mmap" check for empty files before doing the
+  offset check.  Patch by Steven Willis.
+
 - Issue #6493: An issue in ctypes on Windows that caused structure bitfields
   of type ctypes.c_uint32 and width 32 to incorrectly be set has been fixed.
 
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -788,9 +788,14 @@
         lineobj = PyIter_Next(self->input_iter);
         if (lineobj == NULL) {
             /* End of input OR exception */
-            if (!PyErr_Occurred() && self->field_len != 0)
-                PyErr_Format(_csvstate_global->error_obj,
-                             "newline inside string");
+            if (!PyErr_Occurred() && (self->field_len != 0 ||
+                                      self->state == IN_QUOTED_FIELD)) {
+                if (self->dialect->strict)
+                    PyErr_SetString(_csvstate_global->error_obj,
+                                    "unexpected end of data");
+                else if (parse_save_field(self) >= 0)
+                    break;
+            }
             return NULL;
         }
         if (!PyUnicode_Check(lineobj)) {
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1938,6 +1938,7 @@
     if (ascii == NULL)
         return -1;
     encoding = strdup(PyBytes_AS_STRING(ascii));
+    Py_DECREF(ascii);
     if (encoding == NULL) {
         PyErr_NoMemory();
         return -1;
diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -10,7 +10,10 @@
 
 import time
 from math import log, ceil
-from test.support import import_fresh_module
+try:
+    from test.support import import_fresh_module
+except ImportError:
+    from test.test_support import import_fresh_module
 
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
@@ -67,11 +70,16 @@
 print("#                   Calculating pi, 10000 iterations")
 print("# ======================================================================\n")
 
+to_benchmark = [pi_float, pi_decimal]
+if C is not None:
+    to_benchmark.insert(1, pi_cdecimal)
+
 for prec in [9, 19]:
     print("\nPrecision: %d decimal digits\n" % prec)
-    for func in [pi_float, pi_cdecimal, pi_decimal]:
+    for func in to_benchmark:
         start = time.time()
-        C.getcontext().prec = prec
+        if C is not None:
+            C.getcontext().prec = prec
         P.getcontext().prec = prec
         for i in range(10000):
             x = func()
@@ -84,25 +92,27 @@
 print("#                               Factorial")
 print("# ======================================================================\n")
 
-c = C.getcontext()
-c.prec = C.MAX_PREC
-c.Emax = C.MAX_EMAX
-c.Emin = C.MIN_EMIN
+if C is not None:
+    c = C.getcontext()
+    c.prec = C.MAX_PREC
+    c.Emax = C.MAX_EMAX
+    c.Emin = C.MIN_EMIN
 
 for n in [100000, 1000000]:
 
     print("n = %d\n" % n)
 
-    # C version of decimal
-    start_calc = time.time()
-    x = factorial(C.Decimal(n), 0)
-    end_calc = time.time()
-    start_conv = time.time()
-    sx = str(x)
-    end_conv = time.time()
-    print("cdecimal:")
-    print("calculation time: %fs" % (end_calc-start_calc))
-    print("conversion time: %fs\n" % (end_conv-start_conv))
+    if C is not None:
+        # C version of decimal
+        start_calc = time.time()
+        x = factorial(C.Decimal(n), 0)
+        end_calc = time.time()
+        start_conv = time.time()
+        sx = str(x)
+        end_conv = time.time()
+        print("cdecimal:")
+        print("calculation time: %fs" % (end_calc-start_calc))
+        print("conversion time: %fs\n" % (end_conv-start_conv))
 
     # Python integers
     start_calc = time.time()
@@ -116,4 +126,5 @@
     print("calculation time: %fs" % (end_calc-start_calc))
     print("conversion time: %fs\n\n" % (end_conv-start_conv))
 
-    assert(sx == sy)
+    if C is not None:
+        assert(sx == sy)
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -98,7 +98,7 @@
    info. */
 #define JOIN_GET(p) ((Py_uintptr_t) (p) & 1)
 #define JOIN_SET(p, flag) ((void*) ((Py_uintptr_t) (JOIN_OBJ(p)) | (flag)))
-#define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~1))
+#define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~(Py_uintptr_t)1))
 
 /* glue functions (see the init function for details) */
 static PyObject* elementtree_parseerror_obj;
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -185,7 +185,7 @@
 "\n"
 "* On output, if newline is None, any '\\n' characters written are\n"
 "  translated to the system default line separator, os.linesep. If\n"
-"  newline is '' or '\n', no translation takes place. If newline is any\n"
+"  newline is '' or '\\n', no translation takes place. If newline is any\n"
 "  of the other legal values, any '\\n' characters written are translated\n"
 "  to the given string.\n"
 "\n"
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -121,7 +121,7 @@
 }
 
 /* Internal routine for writing a string of bytes to the buffer of a BytesIO
-   object. Returns the number of bytes wrote, or -1 on error. */
+   object. Returns the number of bytes written, or -1 on error. */
 static Py_ssize_t
 write_bytes(bytesio *self, const char *bytes, Py_ssize_t len)
 {
@@ -171,10 +171,20 @@
     }
 }
 
+PyDoc_STRVAR(readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 /* Generic getter for the writable, readable and seekable properties */
 static PyObject *
-return_true(bytesio *self)
+return_not_closed(bytesio *self)
 {
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -682,8 +692,10 @@
     }
     else {
         dict = PyDict_Copy(self->dict);
-        if (dict == NULL)
+        if (dict == NULL) {
+            Py_DECREF(initvalue);
             return NULL;
+        }
     }
 
     state = Py_BuildValue("(OnN)", initvalue, self->pos, dict);
@@ -867,9 +879,9 @@
 };
 
 static struct PyMethodDef bytesio_methods[] = {
-    {"readable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"seekable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"writable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
+    {"readable",   (PyCFunction)return_not_closed,  METH_NOARGS, readable_doc},
+    {"seekable",   (PyCFunction)return_not_closed,  METH_NOARGS, seekable_doc},
+    {"writable",   (PyCFunction)return_not_closed,  METH_NOARGS, writable_doc},
     {"close",      (PyCFunction)bytesio_close,      METH_NOARGS, close_doc},
     {"flush",      (PyCFunction)bytesio_flush,      METH_NOARGS, flush_doc},
     {"isatty",     (PyCFunction)bytesio_isatty,     METH_NOARGS, isatty_doc},
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -442,7 +442,7 @@
     "\n"
     "If limit is specified, at most limit bytes will be read.\n"
     "\n"
-    "The line terminator is always b'\n' for binary files; for text\n"
+    "The line terminator is always b'\\n' for binary files; for text\n"
     "files, the newlines argument to open can be used to select the line\n"
     "terminator(s) recognized.\n");
 
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -760,10 +760,21 @@
 }
 
 /* Properties and pseudo-properties */
+
+PyDoc_STRVAR(stringio_readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(stringio_writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(stringio_seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 static PyObject *
 stringio_seekable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -771,6 +782,7 @@
 stringio_readable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -778,6 +790,7 @@
 stringio_writable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -956,9 +969,9 @@
     {"seek",     (PyCFunction)stringio_seek,     METH_VARARGS, stringio_seek_doc},
     {"write",    (PyCFunction)stringio_write,    METH_O,       stringio_write_doc},
 
-    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS},
-    {"readable", (PyCFunction)stringio_readable, METH_NOARGS},
-    {"writable", (PyCFunction)stringio_writable, METH_NOARGS},
+    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS, stringio_seekable_doc},
+    {"readable", (PyCFunction)stringio_readable, METH_NOARGS, stringio_readable_doc},
+    {"writable", (PyCFunction)stringio_writable, METH_NOARGS, stringio_writable_doc},
 
     {"__getstate__", (PyCFunction)stringio_getstate, METH_NOARGS},
     {"__setstate__", (PyCFunction)stringio_setstate, METH_O},
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -648,7 +648,7 @@
     "\n"
     "* On output, if newline is None, any '\\n' characters written are\n"
     "  translated to the system default line separator, os.linesep. If\n"
-    "  newline is '' or '\n', no translation takes place. If newline is any\n"
+    "  newline is '' or '\\n', no translation takes place. If newline is any\n"
     "  of the other legal values, any '\\n' characters written are translated\n"
     "  to the given string.\n"
     "\n"
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2488,7 +2488,7 @@
     PyObject *path;
     int bytes;
 
-    if (!PyArg_ParseTuple(args, "O&|i:RAND_egd",
+    if (!PyArg_ParseTuple(args, "O&:RAND_egd",
                           PyUnicode_FSConverter, &path))
         return NULL;
 
diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
--- a/Modules/_testbuffer.c
+++ b/Modules/_testbuffer.c
@@ -16,6 +16,7 @@
 static const char *simple_fmt = "B";
 PyObject *simple_format = NULL;
 #define SIMPLE_FORMAT(fmt) (fmt == NULL || strcmp(fmt, "B") == 0)
+#define FIX_FORMAT(fmt) (fmt == NULL ? "B" : fmt)
 
 
 /**************************************************************************/
@@ -513,10 +514,8 @@
 cmp_structure(Py_buffer *dest, Py_buffer *src)
 {
     Py_ssize_t i;
-    int same_fmt = ((dest->format == NULL && src->format == NULL) || \
-                    (strcmp(dest->format, src->format) == 0));
-
-    if (!same_fmt ||
+
+    if (strcmp(FIX_FORMAT(dest->format), FIX_FORMAT(src->format)) != 0 ||
         dest->itemsize != src->itemsize ||
         dest->ndim != src->ndim)
         return -1;
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1163,6 +1163,11 @@
     if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
         if (map_size == 0) {
             off_t calc_size;
+            if (st.st_size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= st.st_size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");
@@ -1359,6 +1364,12 @@
             }
 
             size = (((PY_LONG_LONG) high) << 32) + low;
+            if (size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                Py_DECREF(m_obj);
+                return NULL;
+            }
             if (offset >= size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -414,7 +414,14 @@
 
 
 #ifdef AT_FDCWD
-#define DEFAULT_DIR_FD AT_FDCWD
+/*
+ * Why the (int) cast?  Solaris 10 defines AT_FDCWD as 0xffd19553 (-3041965);
+ * without the int cast, the value gets interpreted as uint (4291925331),
+ * which doesn't play nicely with all the initializer lines in this file that
+ * look like this:
+ *      int dir_fd = DEFAULT_DIR_FD;
+ */
+#define DEFAULT_DIR_FD (int)AT_FDCWD
 #else
 #define DEFAULT_DIR_FD (-100)
 #endif
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -239,7 +239,7 @@
 #else
         /* 64-bit OS X has struct timeval.tv_usec as an int (and thus still 4
            bytes as required), but no longer defined by a long. */
-        long tv_usec = tv.tv_usec;
+        long tv_usec;
         if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv_usec) == -1)
             return NULL;
         tv.tv_usec = tv_usec;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1674,7 +1674,8 @@
             if (len == 0) {
                 ifr.ifr_ifindex = 0;
             } else if (len < sizeof(ifr.ifr_name)) {
-                strcpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName));
+                strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
+                ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
                 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
                     s->errorhandler();
                     Py_DECREF(interfaceName);
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -236,12 +236,16 @@
         return NULL;
     }
 
-    if (!PyUnicode_AsUCS4(prefix, p, len, 0))
+    if (!PyUnicode_AsUCS4(prefix, p, len, 0)) {
+        PyMem_Free(buf);
         return NULL;
+    }
     p += PyUnicode_GET_LENGTH(prefix);
     len -= PyUnicode_GET_LENGTH(prefix);
-    if (!PyUnicode_AsUCS4(name, p, len, 1))
+    if (!PyUnicode_AsUCS4(name, p, len, 1)) {
+        PyMem_Free(buf);
         return NULL;
+    }
     for (; *p; p++) {
         if (*p == '.')
             *p = SEP;
diff --git a/Objects/classobject.c b/Objects/classobject.c
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -219,7 +219,7 @@
 {
     PyObject *self = a->im_self;
     PyObject *func = a->im_func;
-    PyObject *klass = (PyObject*)Py_TYPE(self);
+    PyObject *klass;
     PyObject *funcname = NULL ,*klassname = NULL, *result = NULL;
     char *defname = "?";
 
@@ -227,6 +227,7 @@
         PyErr_BadInternalCall();
         return NULL;
     }
+    klass = (PyObject*)Py_TYPE(self);
 
     funcname = _PyObject_GetAttrId(func, &PyId___name__);
     if (funcname == NULL) {
diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -30,7 +30,7 @@
 */
 static PyLongObject small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
 #ifdef COUNT_ALLOCS
-int quick_int_allocs, quick_neg_int_allocs;
+Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
 #endif
 
 static PyObject *
@@ -1628,8 +1628,10 @@
         strlen++;
     }
     if (writer) {
-        if (_PyUnicodeWriter_Prepare(writer, strlen, '9') == -1)
+        if (_PyUnicodeWriter_Prepare(writer, strlen, '9') == -1) {
+            Py_DECREF(scratch);
             return -1;
+        }
         kind = writer->kind;
         str = NULL;
     }
@@ -4283,8 +4285,8 @@
             string = PyByteArray_AS_STRING(x);
         else
             string = PyBytes_AS_STRING(x);
-        if (strlen(string) != (size_t)size) {
-            /* We only see this if there's a null byte in x,
+        if (strlen(string) != (size_t)size || !size) {
+            /* We only see this if there's a null byte in x or x is empty,
                x is a bytes or buffer, *and* a base is given. */
             PyErr_Format(PyExc_ValueError,
                          "invalid literal for int() with base %d: %R",
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2861,28 +2861,74 @@
     return PyBool_FromLong(MV_ANY_CONTIGUOUS(self->flags));
 }
 
+PyDoc_STRVAR(memory_obj_doc,
+             "The underlying object of the memoryview.");
+PyDoc_STRVAR(memory_nbytes_doc,
+             "The amount of space in bytes that the array would use in\n"
+             " a contiguous representation.");
+PyDoc_STRVAR(memory_readonly_doc,
+             "A bool indicating whether the memory is read only.");
+PyDoc_STRVAR(memory_itemsize_doc,
+             "The size in bytes of each element of the memoryview.");
+PyDoc_STRVAR(memory_format_doc,
+             "A string containing the format (in struct module style)\n"
+             " for each element in the view.");
+PyDoc_STRVAR(memory_ndim_doc,
+             "An integer indicating how many dimensions of a multi-dimensional\n"
+             " array the memory represents.");
+PyDoc_STRVAR(memory_shape_doc,
+             "A tuple of ndim integers giving the shape of the memory\n"
+             " as an N-dimensional array.");
+PyDoc_STRVAR(memory_strides_doc,
+             "A tuple of ndim integers giving the size in bytes to access\n"
+             " each element for each dimension of the array.");
+PyDoc_STRVAR(memory_suboffsets_doc,
+             "A tuple of integers used internally for PIL-style arrays.");
+PyDoc_STRVAR(memory_c_contiguous_doc,
+             "A bool indicating whether the memory is C contiguous.");
+PyDoc_STRVAR(memory_f_contiguous_doc,
+             "A bool indicating whether the memory is Fortran contiguous.");
+PyDoc_STRVAR(memory_contiguous_doc,
+             "A bool indicating whether the memory is contiguous.");
+
 static PyGetSetDef memory_getsetlist[] = {
-    {"obj",             (getter)memory_obj_get,        NULL, NULL},
-    {"nbytes",          (getter)memory_nbytes_get,     NULL, NULL},
-    {"readonly",        (getter)memory_readonly_get,   NULL, NULL},
-    {"itemsize",        (getter)memory_itemsize_get,   NULL, NULL},
-    {"format",          (getter)memory_format_get,     NULL, NULL},
-    {"ndim",            (getter)memory_ndim_get,       NULL, NULL},
-    {"shape",           (getter)memory_shape_get,      NULL, NULL},
-    {"strides",         (getter)memory_strides_get,    NULL, NULL},
-    {"suboffsets",      (getter)memory_suboffsets_get, NULL, NULL},
-    {"c_contiguous",    (getter)memory_c_contiguous,   NULL, NULL},
-    {"f_contiguous",    (getter)memory_f_contiguous,   NULL, NULL},
-    {"contiguous",      (getter)memory_contiguous,     NULL, NULL},
+    {"obj",             (getter)memory_obj_get,        NULL, memory_obj_doc},
+    {"nbytes",          (getter)memory_nbytes_get,     NULL, memory_nbytes_doc},
+    {"readonly",        (getter)memory_readonly_get,   NULL, memory_readonly_doc},
+    {"itemsize",        (getter)memory_itemsize_get,   NULL, memory_itemsize_doc},
+    {"format",          (getter)memory_format_get,     NULL, memory_format_doc},
+    {"ndim",            (getter)memory_ndim_get,       NULL, memory_ndim_doc},
+    {"shape",           (getter)memory_shape_get,      NULL, memory_shape_doc},
+    {"strides",         (getter)memory_strides_get,    NULL, memory_strides_doc},
+    {"suboffsets",      (getter)memory_suboffsets_get, NULL, memory_suboffsets_doc},
+    {"c_contiguous",    (getter)memory_c_contiguous,   NULL, memory_c_contiguous_doc},
+    {"f_contiguous",    (getter)memory_f_contiguous,   NULL, memory_f_contiguous_doc},
+    {"contiguous",      (getter)memory_contiguous,     NULL, memory_contiguous_doc},
     {NULL, NULL, NULL, NULL},
 };
 
+PyDoc_STRVAR(memory_release_doc,
+"M.release() -> None\n\
+\n\
+Release the underlying buffer exposed by the memoryview object.");
+PyDoc_STRVAR(memory_tobytes_doc,
+"M.tobytes() -> bytes\n\
+\n\
+Return the data in the buffer as a byte string.");
+PyDoc_STRVAR(memory_tolist_doc,
+"M.tolist() -> list\n\
+\n\
+Return the data in the buffer as a list of elements.");
+PyDoc_STRVAR(memory_cast_doc,
+"M.cast(format[, shape]) -> memoryview\n\
+\n\
+Cast a memoryview to a new format or shape.");
 
 static PyMethodDef memory_methods[] = {
-    {"release",     (PyCFunction)memory_release, METH_NOARGS, NULL},
-    {"tobytes",     (PyCFunction)memory_tobytes, METH_NOARGS, NULL},
-    {"tolist",      (PyCFunction)memory_tolist, METH_NOARGS, NULL},
-    {"cast",        (PyCFunction)memory_cast, METH_VARARGS|METH_KEYWORDS, NULL},
+    {"release",     (PyCFunction)memory_release, METH_NOARGS, memory_release_doc},
+    {"tobytes",     (PyCFunction)memory_tobytes, METH_NOARGS, memory_tobytes_doc},
+    {"tolist",      (PyCFunction)memory_tolist, METH_NOARGS, memory_tolist_doc},
+    {"cast",        (PyCFunction)memory_cast, METH_VARARGS|METH_KEYWORDS, memory_cast_doc},
     {"__enter__",   memory_enter, METH_NOARGS, NULL},
     {"__exit__",    memory_exit, METH_VARARGS, NULL},
     {NULL,          NULL}
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -138,7 +138,6 @@
  */
 #define ALIGNMENT               8               /* must be 2^N */
 #define ALIGNMENT_SHIFT         3
-#define ALIGNMENT_MASK          (ALIGNMENT - 1)
 
 /* Return the number of bytes in size class I, as a uint. */
 #define INDEX2SIZE(I) (((uint)(I) + 1) << ALIGNMENT_SHIFT)
@@ -314,14 +313,12 @@
     struct arena_object* prevarena;
 };
 
-#undef  ROUNDUP
-#define ROUNDUP(x)              (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
-#define POOL_OVERHEAD           ROUNDUP(sizeof(struct pool_header))
+#define POOL_OVERHEAD   _Py_SIZE_ROUND_UP(sizeof(struct pool_header), ALIGNMENT)
 
 #define DUMMY_SIZE_IDX          0xffff  /* size class of newly cached pools */
 
 /* Round pointer P down to the closest pool-aligned address <= P, as a poolp */
-#define POOL_ADDR(P) ((poolp)((uptr)(P) & ~(uptr)POOL_SIZE_MASK))
+#define POOL_ADDR(P) ((poolp)_Py_ALIGN_DOWN((P), POOL_SIZE))
 
 /* Return total number of blocks in pool of size index I, as a uint. */
 #define NUMBLOCKS(I) ((uint)(POOL_SIZE - POOL_OVERHEAD) / INDEX2SIZE(I))
diff --git a/Objects/setobject.c b/Objects/setobject.c
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -831,10 +831,10 @@
     if (!list)
         return NULL;
 
-    /* copy the itertor state */
+    /* copy the iterator state */
     tmp = *si;
     Py_XINCREF(tmp.si_set);
-    
+
     /* iterate the temporary into a list */
     for(;;) {
         PyObject *element = setiter_iternext(&tmp);
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -2,9 +2,6 @@
 
 #if STRINGLIB_IS_UNICODE
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -25,7 +22,7 @@
 {
     Py_UCS4 ch;
     const char *s = *inptr;
-    const char *aligned_end = (const char *) ((size_t) end & ~LONG_PTR_MASK);
+    const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
     STRINGLIB_CHAR *p = dest + *outpos;
 
     while (s < end) {
@@ -39,7 +36,7 @@
                First, check if we can do an aligned read, as most CPUs have
                a penalty for unaligned reads.
             */
-            if (!((size_t) s & LONG_PTR_MASK)) {
+            if (_Py_IS_ALIGNED(s, SIZEOF_LONG)) {
                 /* Help register allocation */
                 register const char *_s = s;
                 register STRINGLIB_CHAR *_p = p;
@@ -453,7 +450,7 @@
 {
     Py_UCS4 ch;
     const unsigned char *aligned_end =
-            (const unsigned char *) ((size_t) e & ~LONG_PTR_MASK);
+            (const unsigned char *) _Py_ALIGN_DOWN(e, SIZEOF_LONG);
     const unsigned char *q = *inptr;
     STRINGLIB_CHAR *p = dest + *outpos;
     /* Offsets from q for retrieving byte pairs in the right order. */
@@ -468,7 +465,7 @@
         Py_UCS4 ch2;
         /* First check for possible aligned read of a C 'long'. Unaligned
            reads are more expensive, better to defer to another iteration. */
-        if (!((size_t) q & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(q, SIZEOF_LONG)) {
             /* Fast path for runs of in-range non-surrogate chars. */
             register const unsigned char *_q = q;
             while (_q < aligned_end) {
@@ -565,7 +562,6 @@
 #undef FAST_CHAR_MASK
 #undef STRIPPED_MASK
 #undef SWAB
-#undef LONG_PTR_MASK
 
 
 Py_LOCAL_INLINE(void)
@@ -588,7 +584,7 @@
         _PyUnicode_CONVERT_BYTES(STRINGLIB_CHAR, unsigned short, in, end, out);
 # endif
     } else {
-        const STRINGLIB_CHAR *unrolled_end = in + (len & ~ (Py_ssize_t) 3);
+        const STRINGLIB_CHAR *unrolled_end = in + _Py_SIZE_ROUND_DOWN(len, 4);
         while (in < unrolled_end) {
             out[0] = SWAB2(in[0]);
             out[1] = SWAB2(in[1]);
diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h
--- a/Objects/stringlib/fastsearch.h
+++ b/Objects/stringlib/fastsearch.h
@@ -43,8 +43,7 @@
 
 #define DO_MEMCHR(memchr, s, needle, nchars) do { \
     candidate = memchr((const void *) (s), (needle), (nchars) * sizeof(STRINGLIB_CHAR)); \
-    found = (const STRINGLIB_CHAR *) \
-        ((Py_ssize_t) candidate & (~ ((Py_ssize_t) sizeof(STRINGLIB_CHAR) - 1))); \
+    found = (const STRINGLIB_CHAR *) _Py_ALIGN_DOWN(candidate, sizeof(STRINGLIB_CHAR)); \
     } while (0)
 
     if (mode == FAST_SEARCH) {
diff --git a/Objects/stringlib/find_max_char.h b/Objects/stringlib/find_max_char.h
--- a/Objects/stringlib/find_max_char.h
+++ b/Objects/stringlib/find_max_char.h
@@ -2,9 +2,6 @@
 
 #if STRINGLIB_IS_UNICODE
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -21,10 +18,11 @@
 STRINGLIB(find_max_char)(const STRINGLIB_CHAR *begin, const STRINGLIB_CHAR *end)
 {
     const unsigned char *p = (const unsigned char *) begin;
-    const unsigned char *aligned_end = (const unsigned char *) ((size_t) end & ~LONG_PTR_MASK);
+    const unsigned char *aligned_end =
+            (const unsigned char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
 
     while (p < end) {
-        if (!((size_t) p & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
             /* Help register allocation */
             register const unsigned char *_p = p;
             while (_p < aligned_end) {
@@ -43,7 +41,6 @@
     return 127;
 }
 
-#undef LONG_PTR_MASK
 #undef ASCII_CHAR_MASK
 
 #else /* STRINGLIB_SIZEOF_CHAR == 1 */
@@ -72,7 +69,7 @@
     register Py_UCS4 mask;
     Py_ssize_t n = end - begin;
     const STRINGLIB_CHAR *p = begin;
-    const STRINGLIB_CHAR *unrolled_end = begin + (n & ~ (Py_ssize_t) 3);
+    const STRINGLIB_CHAR *unrolled_end = begin + _Py_SIZE_ROUND_DOWN(n, 4);
     Py_UCS4 max_char;
 
     max_char = MAX_CHAR_ASCII;
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -210,8 +210,10 @@
 
     va_start(vargs, n);
     result = PyTuple_New(n);
-    if (result == NULL)
+    if (result == NULL) {
+        va_end(vargs);
         return NULL;
+    }
     items = ((PyTupleObject *)result)->ob_item;
     for (i = 0; i < n; i++) {
         o = va_arg(vargs, PyObject *);
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -691,8 +691,10 @@
         mod = NULL;
     }
     name = type_qualname(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
 
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<class '%U.%U'>", mod, name);
@@ -3128,8 +3130,10 @@
         mod = NULL;
     }
     name = type_qualname(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<%U.%U object at %p>", mod, name, self);
     else
@@ -5988,7 +5992,7 @@
         descr = _PyType_Lookup(type, p->name_strobj);
         if (descr == NULL) {
             if (ptr == (void**)&type->tp_iternext) {
-                specific = _PyObject_NextNotImplemented;
+                specific = (void *)_PyObject_NextNotImplemented;
             }
             continue;
         }
@@ -6035,7 +6039,7 @@
             /* We specifically allow __hash__ to be set to None
                to prevent inheritance of the default
                implementation from object.__hash__ */
-            specific = PyObject_HashNotImplemented;
+            specific = (void *)PyObject_HashNotImplemented;
         }
         else {
             use_generic = 1;
@@ -6250,7 +6254,7 @@
             continue;
         if (PyDict_GetItem(dict, p->name_strobj))
             continue;
-        if (*ptr == PyObject_HashNotImplemented) {
+        if (*ptr == (void *)PyObject_HashNotImplemented) {
             /* Classes may prevent the inheritance of the tp_hash
                slot by storing PyObject_HashNotImplemented in it. Make it
                visible as a None value for the __hash__ attribute. */
@@ -6502,18 +6506,18 @@
         PyCodeObject *co = f->f_code;
         Py_ssize_t i, n;
         if (co == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): no code object");
             return -1;
         }
         if (co->co_argcount == 0) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): no arguments");
             return -1;
         }
         obj = f->f_localsplus[0];
         if (obj == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): arg[0] deleted");
             return -1;
         }
@@ -6532,18 +6536,18 @@
                     PyTuple_GET_SIZE(co->co_cellvars) + i;
                 PyObject *cell = f->f_localsplus[index];
                 if (cell == NULL || !PyCell_Check(cell)) {
-                    PyErr_SetString(PyExc_SystemError,
+                    PyErr_SetString(PyExc_RuntimeError,
                       "super(): bad __class__ cell");
                     return -1;
                 }
                 type = (PyTypeObject *) PyCell_GET(cell);
                 if (type == NULL) {
-                    PyErr_SetString(PyExc_SystemError,
+                    PyErr_SetString(PyExc_RuntimeError,
                       "super(): empty __class__ cell");
                     return -1;
                 }
                 if (!PyType_Check(type)) {
-                    PyErr_Format(PyExc_SystemError,
+                    PyErr_Format(PyExc_RuntimeError,
                       "super(): __class__ is not a type (%s)",
                       Py_TYPE(type)->tp_name);
                     return -1;
@@ -6552,7 +6556,7 @@
             }
         }
         if (type == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): __class__ cell not found");
             return -1;
         }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -159,7 +159,7 @@
         const from_type *_end = (end);                  \
         Py_ssize_t n = (_end) - (_iter);                \
         const from_type *_unrolled_end =                \
-            _iter + (n & ~ (Py_ssize_t) 3);             \
+            _iter + _Py_SIZE_ROUND_DOWN(n, 4);          \
         while (_iter < (_unrolled_end)) {               \
             _to[0] = (to_type) _iter[0];                \
             _to[1] = (to_type) _iter[1];                \
@@ -4635,9 +4635,6 @@
 #include "stringlib/codecs.h"
 #include "stringlib/undef.h"
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -4652,11 +4649,11 @@
 ascii_decode(const char *start, const char *end, Py_UCS1 *dest)
 {
     const char *p = start;
-    const char *aligned_end = (const char *) ((size_t) end & ~LONG_PTR_MASK);
+    const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
 
 #if SIZEOF_LONG <= SIZEOF_VOID_P
-    assert(!((size_t) dest & LONG_PTR_MASK));
-    if (!((size_t) p & LONG_PTR_MASK)) {
+    assert(_Py_IS_ALIGNED(dest, SIZEOF_LONG));
+    if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
         /* Fast path, see in STRINGLIB(utf8_decode) for
            an explanation. */
         /* Help register allocation */
@@ -4682,7 +4679,7 @@
     while (p < end) {
         /* Fast path, see in STRINGLIB(utf8_decode) in stringlib/codecs.h
            for an explanation. */
-        if (!((size_t) p & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
             /* Help register allocation */
             register const char *_p = p;
             while (_p < aligned_end) {
@@ -5390,7 +5387,7 @@
         return NULL;
 
     /* output buffer is 2-bytes aligned */
-    assert(((Py_uintptr_t)PyBytes_AS_STRING(v) & 1) == 0);
+    assert(_Py_IS_ALIGNED(PyBytes_AS_STRING(v), 2));
     out = (unsigned short *)PyBytes_AS_STRING(v);
     if (byteorder == 0)
         *out++ = 0xFEFF;
@@ -7528,9 +7525,10 @@
             /* Apply mapping */
             if (PyLong_Check(x)) {
                 long value = PyLong_AS_LONG(x);
-                if (value < 0 || value > 65535) {
-                    PyErr_SetString(PyExc_TypeError,
-                                    "character mapping must be in range(65536)");
+                if (value < 0 || value > MAX_UNICODE) {
+                    PyErr_Format(PyExc_TypeError,
+                                 "character mapping must be in range(0x%lx)",
+                                 (unsigned long)MAX_UNICODE + 1);
                     Py_DECREF(x);
                     goto onError;
                 }
@@ -9145,7 +9143,7 @@
             /* We do not need to compare 0 and len(substring)-1 because
                the if statement above ensured already that they are equal
                when we end up here. */
-            // TODO: honor direction and do a forward or backwards search
+            /* TODO: honor direction and do a forward or backwards search */
             for (i = 1; i < end_sub; ++i) {
                 if (PyUnicode_READ(kind_self, data_self, offset + i) !=
                     PyUnicode_READ(kind_sub, data_sub, i))
@@ -13462,8 +13460,7 @@
         arglen = -1;
         argidx = -2;
     }
-    if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) &&
-        !PyUnicode_Check(args))
+    if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyUnicode_Check(args))
         dict = args;
 
     while (--fmtcnt >= 0) {
diff --git a/Parser/node.c b/Parser/node.c
--- a/Parser/node.c
+++ b/Parser/node.c
@@ -71,7 +71,7 @@
  * capacity.  The code is tricky to avoid that.
  */
 #define XXXROUNDUP(n) ((n) <= 1 ? (n) :                 \
-               (n) <= 128 ? (((n) + 3) & ~3) :          \
+               (n) <= 128 ? _Py_SIZE_ROUND_UP((n), 4) : \
                fancy_roundup(n))
 
 
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -545,9 +545,9 @@
 }
 
 static identifier
-new_identifier(const char* n, struct compiling *c)
+new_identifier(const char *n, struct compiling *c)
 {
-    PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
+    PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
     if (!id)
         return NULL;
     /* PyUnicode_DecodeUTF8 should always return a ready string. */
@@ -574,79 +574,43 @@
 
 #define NEW_IDENTIFIER(n) new_identifier(STR(n), c)
 
-/* This routine provides an invalid object for the syntax error.
-   The outermost routine must unpack this error and create the
-   proper object.  We do this so that we don't have to pass
-   the filename to everything function.
-
-   XXX Maybe we should just pass the filename...
-*/
-
 static int
-ast_error(const node *n, const char *errstr)
+ast_error(struct compiling *c, const node *n, const char *errmsg)
 {
-    PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
-    if (!u)
-        return 0;
-    PyErr_SetObject(PyExc_SyntaxError, u);
-    Py_DECREF(u);
-    return 0;
-}
-
-static void
-ast_error_finish(const char *filename)
-{
-    PyObject *type, *value, *tback, *errstr, *offset, *loc, *tmp;
+    PyObject *value, *errstr, *loc, *tmp;
     PyObject *filename_obj;
-    long lineno;
-
-    assert(PyErr_Occurred());
-    if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
-        return;
-
-    PyErr_Fetch(&type, &value, &tback);
-    errstr = PyTuple_GetItem(value, 0);
-    if (!errstr)
-        return;
-    Py_INCREF(errstr);
-    lineno = PyLong_AsLong(PyTuple_GetItem(value, 1));
-    if (lineno == -1) {
-        Py_DECREF(errstr);
-        return;
-    }
-    offset = PyTuple_GetItem(value, 2);
-    if (!offset) {
-        Py_DECREF(errstr);
-        return;
-    }
-    Py_DECREF(value);
-
-    loc = PyErr_ProgramText(filename, lineno);
+
+    loc = PyErr_ProgramText(c->c_filename, LINENO(n));
     if (!loc) {
         Py_INCREF(Py_None);
         loc = Py_None;
     }
-    if (filename != NULL)
-        filename_obj = PyUnicode_DecodeFSDefault(filename);
-    else {
+    if (c->c_filename) {
+        filename_obj = PyUnicode_DecodeFSDefault(c->c_filename);
+        if (!filename_obj) {
+            Py_DECREF(loc);
+            return 0;
+        }
+    } else {
         Py_INCREF(Py_None);
         filename_obj = Py_None;
     }
-    if (filename_obj != NULL)
-        tmp = Py_BuildValue("(NlOO)", filename_obj, lineno, offset, loc);
-    else
-        tmp = NULL;
-    Py_DECREF(loc);
-    if (!tmp) {
-        Py_DECREF(errstr);
-        return;
+    tmp = Py_BuildValue("(NiiN)", filename_obj, LINENO(n), n->n_col_offset, loc);
+    if (!tmp)
+        return 0;
+    errstr = PyUnicode_FromString(errmsg);
+    if (!errstr) {
+        Py_DECREF(tmp);
+        return 0;
     }
     value = PyTuple_Pack(2, errstr, tmp);
     Py_DECREF(errstr);
     Py_DECREF(tmp);
-    if (!value)
-        return;
-    PyErr_Restore(type, value, tback);
+    if (value) {
+        PyErr_SetObject(PyExc_SyntaxError, value);
+        Py_DECREF(value);
+    }
+    return 0;
 }
 
 /* num_stmts() returns number of contained statements.
@@ -724,11 +688,14 @@
     struct compiling c;
     mod_ty res = NULL;
 
+    c.c_arena = arena;
+    c.c_filename = filename;
+    c.c_normalize = c.c_normalize_args = NULL;
     if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
         c.c_encoding = "utf-8";
         if (TYPE(n) == encoding_decl) {
 #if 0
-            ast_error(n, "encoding declaration in Unicode string");
+            ast_error(c, n, "encoding declaration in Unicode string");
             goto out;
 #endif
             n = CHILD(n, 0);
@@ -740,9 +707,6 @@
         /* PEP 3120 */
         c.c_encoding = "utf-8";
     }
-    c.c_arena = arena;
-    c.c_filename = filename;
-    c.c_normalize = c.c_normalize_args = NULL;
 
     k = 0;
     switch (TYPE(n)) {
@@ -835,8 +799,6 @@
         PyTuple_SET_ITEM(c.c_normalize_args, 1, NULL);
         Py_DECREF(c.c_normalize_args);
     }
-    if (!res)
-        ast_error_finish(filename);
     return res;
 }
 
@@ -882,18 +844,18 @@
 };
 
 static int
-forbidden_name(identifier name, const node *n, int full_checks)
+forbidden_name(struct compiling *c, identifier name, const node *n, int full_checks)
 {
     assert(PyUnicode_Check(name));
     if (PyUnicode_CompareWithASCIIString(name, "__debug__") == 0) {
-        ast_error(n, "assignment to keyword");
+        ast_error(c, n, "assignment to keyword");
         return 1;
     }
     if (full_checks) {
         const char **p;
         for (p = FORBIDDEN; *p; p++) {
             if (PyUnicode_CompareWithASCIIString(name, *p) == 0) {
-                ast_error(n, "assignment to keyword");
+                ast_error(c, n, "assignment to keyword");
                 return 1;
             }
         }
@@ -929,7 +891,7 @@
     switch (e->kind) {
         case Attribute_kind:
             e->v.Attribute.ctx = ctx;
-            if (ctx == Store && forbidden_name(e->v.Attribute.attr, n, 1))
+            if (ctx == Store && forbidden_name(c, e->v.Attribute.attr, n, 1))
                 return 0;
             break;
         case Subscript_kind:
@@ -942,7 +904,7 @@
             break;
         case Name_kind:
             if (ctx == Store) {
-                if (forbidden_name(e->v.Name.id, n, 1))
+                if (forbidden_name(c, e->v.Name.id, n, 1))
                     return 0; /* forbidden_name() calls ast_error() */
             }
             e->v.Name.ctx = ctx;
@@ -1016,7 +978,7 @@
                       "can't %s %s",
                       ctx == Store ? "assign to" : "delete",
                       expr_name);
-        return ast_error(n, buf);
+        return ast_error(c, n, buf);
     }
 
     /* If the LHS is a list or tuple, we need to set the assignment
@@ -1164,7 +1126,7 @@
     name = NEW_IDENTIFIER(ch);
     if (!name)
         return NULL;
-    if (forbidden_name(name, ch, 0))
+    if (forbidden_name(c, name, ch, 0))
         return NULL;
 
     if (NCH(n) == 3 && TYPE(CHILD(n, 1)) == COLON) {
@@ -1194,7 +1156,7 @@
     int j = 0; /* index for kwdefaults and kwonlyargs */
 
     if (kwonlyargs == NULL) {
-        ast_error(CHILD(n, start), "named arguments must follow bare *");
+        ast_error(c, CHILD(n, start), "named arguments must follow bare *");
         return -1;
     }
     assert(kwdefaults != NULL);
@@ -1226,7 +1188,7 @@
                 argname = NEW_IDENTIFIER(ch);
                 if (!argname)
                     goto error;
-                if (forbidden_name(argname, ch, 0))
+                if (forbidden_name(c, argname, ch, 0))
                     goto error;
                 arg = arg(argname, annotation, c->c_arena);
                 if (!arg)
@@ -1237,7 +1199,7 @@
             case DOUBLESTAR:
                 return i;
             default:
-                ast_error(ch, "unexpected node");
+                ast_error(c, ch, "unexpected node");
                 goto error;
         }
     }
@@ -1329,7 +1291,7 @@
         return NULL;
 
     if (nposargs + nkwonlyargs > 255) {
-        ast_error(n, "more than 255 arguments");
+        ast_error(c, n, "more than 255 arguments");
         return NULL;
     }
 
@@ -1357,7 +1319,7 @@
                     found_default = 1;
                 }
                 else if (found_default) {
-                    ast_error(n,
+                    ast_error(c, n,
                              "non-default argument follows default argument");
                     return NULL;
                 }
@@ -1369,7 +1331,7 @@
                 break;
             case STAR:
                 if (i+1 >= NCH(n)) {
-                    ast_error(CHILD(n, i),
+                    ast_error(c, CHILD(n, i),
                         "named arguments must follow bare *");
                     return NULL;
                 }
@@ -1386,7 +1348,7 @@
                     vararg = NEW_IDENTIFIER(CHILD(ch, 0));
                     if (!vararg)
                         return NULL;
-                    if (forbidden_name(vararg, CHILD(ch, 0), 0))
+                    if (forbidden_name(c, vararg, CHILD(ch, 0), 0))
                         return NULL;
                     if (NCH(ch) > 1) {
                         /* there is an annotation on the vararg */
@@ -1417,7 +1379,7 @@
                     if (!kwargannotation)
                         return NULL;
                 }
-                if (forbidden_name(kwarg, CHILD(ch, 0), 0))
+                if (forbidden_name(c, kwarg, CHILD(ch, 0), 0))
                     return NULL;
                 i += 3;
                 break;
@@ -1536,7 +1498,7 @@
     name = NEW_IDENTIFIER(CHILD(n, name_i));
     if (!name)
         return NULL;
-    if (forbidden_name(name, CHILD(n, name_i), 0))
+    if (forbidden_name(c, name, CHILD(n, name_i), 0))
         return NULL;
     args = ast_for_arguments(c, CHILD(n, name_i + 1));
     if (!args)
@@ -1877,10 +1839,10 @@
                     char buf[128];
                     s = _PyUnicode_AsString(errstr);
                     PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
-                    ast_error(n, buf);
+                    ast_error(c, n, buf);
                     Py_DECREF(errstr);
                 } else {
-                    ast_error(n, "(unicode error) unknown error");
+                    ast_error(c, n, "(unicode error) unknown error");
                 }
                 Py_DECREF(type);
                 Py_DECREF(value);
@@ -2465,14 +2427,14 @@
         }
     }
     if (ngens > 1 || (ngens && (nargs || nkeywords))) {
-        ast_error(n, "Generator expression must be parenthesized "
+        ast_error(c, n, "Generator expression must be parenthesized "
                   "if not sole argument");
         return NULL;
     }
 
     if (nargs + nkeywords + ngens > 255) {
-      ast_error(n, "more than 255 arguments");
-      return NULL;
+        ast_error(c, n, "more than 255 arguments");
+        return NULL;
     }
 
     args = asdl_seq_new(nargs + ngens, c->c_arena);
@@ -2489,12 +2451,12 @@
             expr_ty e;
             if (NCH(ch) == 1) {
                 if (nkeywords) {
-                    ast_error(CHILD(ch, 0),
+                    ast_error(c, CHILD(ch, 0),
                               "non-keyword arg after keyword arg");
                     return NULL;
                 }
                 if (vararg) {
-                    ast_error(CHILD(ch, 0),
+                    ast_error(c, CHILD(ch, 0),
                               "only named arguments may follow *expression");
                     return NULL;
                 }
@@ -2524,19 +2486,19 @@
                  * then is very confusing.
                  */
                 if (e->kind == Lambda_kind) {
-                    ast_error(CHILD(ch, 0), "lambda cannot contain assignment");
+                    ast_error(c, CHILD(ch, 0), "lambda cannot contain assignment");
                     return NULL;
                 } else if (e->kind != Name_kind) {
-                    ast_error(CHILD(ch, 0), "keyword can't be an expression");
+                    ast_error(c, CHILD(ch, 0), "keyword can't be an expression");
                     return NULL;
-                } else if (forbidden_name(e->v.Name.id, ch, 1)) {
+                } else if (forbidden_name(c, e->v.Name.id, ch, 1)) {
                     return NULL;
                 }
                 key = e->v.Name.id;
                 for (k = 0; k < nkeywords; k++) {
                     tmp = ((keyword_ty)asdl_seq_GET(keywords, k))->arg;
                     if (!PyUnicode_Compare(tmp, key)) {
-                        ast_error(CHILD(ch, 0), "keyword argument repeated");
+                        ast_error(c, CHILD(ch, 0), "keyword argument repeated");
                         return NULL;
                     }
                 }
@@ -2629,7 +2591,7 @@
             case Subscript_kind:
                 break;
             default:
-                ast_error(ch, "illegal expression for augmented assignment");
+                ast_error(c, ch, "illegal expression for augmented assignment");
                 return NULL;
         }
 
@@ -2662,7 +2624,7 @@
             expr_ty e;
             node *ch = CHILD(n, i);
             if (TYPE(ch) == yield_expr) {
-                ast_error(ch, "assignment to yield expression not possible");
+                ast_error(c, ch, "assignment to yield expression not possible");
                 return NULL;
             }
             e = ast_for_testlist(c, ch);
@@ -2809,11 +2771,11 @@
                 str = NEW_IDENTIFIER(str_node);
                 if (!str)
                     return NULL;
-                if (store && forbidden_name(str, str_node, 0))
+                if (store && forbidden_name(c, str, str_node, 0))
                     return NULL;
             }
             else {
-                if (forbidden_name(name, name_node, 0))
+                if (forbidden_name(c, name, name_node, 0))
                     return NULL;
             }
             return alias(name, str, c->c_arena);
@@ -2832,7 +2794,7 @@
                 a->asname = NEW_IDENTIFIER(asname_node);
                 if (!a->asname)
                     return NULL;
-                if (forbidden_name(a->asname, asname_node, 0))
+                if (forbidden_name(c, a->asname, asname_node, 0))
                     return NULL;
                 return a;
             }
@@ -2843,7 +2805,7 @@
                 name = NEW_IDENTIFIER(name_node);
                 if (!name)
                     return NULL;
-                if (store && forbidden_name(name, name_node, 0))
+                if (store && forbidden_name(c, name, name_node, 0))
                     return NULL;
                 return alias(name, NULL, c->c_arena);
             }
@@ -2972,13 +2934,13 @@
             n = CHILD(n, idx);
             n_children = NCH(n);
             if (n_children % 2 == 0) {
-                ast_error(n, "trailing comma not allowed without"
+                ast_error(c, n, "trailing comma not allowed without"
                              " surrounding parentheses");
                 return NULL;
             }
             break;
         default:
-            ast_error(n, "Unexpected node-type in from-import");
+            ast_error(c, n, "Unexpected node-type in from-import");
             return NULL;
         }
 
@@ -3384,7 +3346,7 @@
         identifier e = NEW_IDENTIFIER(CHILD(exc, 3));
         if (!e)
             return NULL;
-        if (forbidden_name(e, CHILD(exc, 3), 0))
+        if (forbidden_name(c, e, CHILD(exc, 3), 0))
             return NULL;
         expression = ast_for_expr(c, CHILD(exc, 1));
         if (!expression)
@@ -3443,7 +3405,7 @@
         }
     }
     else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
-        ast_error(n, "malformed 'try' statement");
+        ast_error(c, n, "malformed 'try' statement");
         return NULL;
     }
 
@@ -3535,7 +3497,7 @@
         classname = NEW_IDENTIFIER(CHILD(n, 1));
         if (!classname)
             return NULL;
-        if (forbidden_name(classname, CHILD(n, 3), 0))
+        if (forbidden_name(c, classname, CHILD(n, 3), 0))
             return NULL;
         return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
                         LINENO(n), n->n_col_offset, c->c_arena);
@@ -3548,7 +3510,7 @@
         classname = NEW_IDENTIFIER(CHILD(n, 1));
         if (!classname)
             return NULL;
-        if (forbidden_name(classname, CHILD(n, 3), 0))
+        if (forbidden_name(c, classname, CHILD(n, 3), 0))
             return NULL;
         return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
                         LINENO(n), n->n_col_offset, c->c_arena);
@@ -3573,7 +3535,7 @@
     classname = NEW_IDENTIFIER(CHILD(n, 1));
     if (!classname)
         return NULL;
-    if (forbidden_name(classname, CHILD(n, 1), 0))
+    if (forbidden_name(c, classname, CHILD(n, 1), 0))
         return NULL;
 
     return ClassDef(classname, call->v.Call.args, call->v.Call.keywords,
@@ -3832,10 +3794,10 @@
     }
     if (*bytesmode) {
         /* Disallow non-ascii characters (but not escapes) */
-        const char *c;
-        for (c = s; *c; c++) {
-            if (Py_CHARMASK(*c) >= 0x80) {
-                ast_error(n, "bytes can only contain ASCII "
+        const char *ch;
+        for (ch = s; *ch; ch++) {
+            if (Py_CHARMASK(*ch) >= 0x80) {
+                ast_error(c, n, "bytes can only contain ASCII "
                           "literal characters.");
                 return NULL;
             }
@@ -3883,7 +3845,8 @@
             if (s == NULL)
                 goto onError;
             if (*bytesmode != subbm) {
-                ast_error(n, "cannot mix bytes and nonbytes literals");
+                ast_error(c, n, "cannot mix bytes and nonbytes literals");
+                Py_DECREF(s);
                 goto onError;
             }
             if (PyBytes_Check(v) && PyBytes_Check(s)) {
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -1099,7 +1099,7 @@
                          &locale, 0);
 
 done:
-    Py_DECREF(unicode_tmp);
+    Py_XDECREF(unicode_tmp);
     free_locale_info(&locale);
     return result;
 }
diff --git a/Python/getargs.c b/Python/getargs.c
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1742,6 +1742,7 @@
     assert(min >= 0);
     assert(min <= max);
     if (!PyTuple_Check(args)) {
+        va_end(vargs);
         PyErr_SetString(PyExc_SystemError,
             "PyArg_UnpackTuple() argument list is not a tuple");
         return 0;
diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]
diff --git a/Python/pyarena.c b/Python/pyarena.c
--- a/Python/pyarena.c
+++ b/Python/pyarena.c
@@ -12,8 +12,6 @@
 
 #define DEFAULT_BLOCK_SIZE 8192
 #define ALIGNMENT               8
-#define ALIGNMENT_MASK          (ALIGNMENT - 1)
-#define ROUNDUP(x)              (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
 
 typedef struct _block {
     /* Total number of bytes owned by this block available to pass out.
@@ -85,8 +83,8 @@
     b->ab_size = size;
     b->ab_mem = (void *)(b + 1);
     b->ab_next = NULL;
-    b->ab_offset = ROUNDUP((Py_uintptr_t)(b->ab_mem)) -
-      (Py_uintptr_t)(b->ab_mem);
+    b->ab_offset = (char *)_Py_ALIGN_UP(b->ab_mem, ALIGNMENT) -
+            (char *)(b->ab_mem);
     return b;
 }
 
@@ -104,7 +102,7 @@
 {
     void *p;
     assert(b);
-    size = ROUNDUP(size);
+    size = _Py_SIZE_ROUND_UP(size, ALIGNMENT);
     if (b->ab_offset + size > b->ab_size) {
         /* If we need to allocate more memory than will fit in
            the default block, allocate a one-off block that is
diff --git a/Python/structmember.c b/Python/structmember.c
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -254,12 +254,8 @@
         char *string;
         Py_ssize_t len;
 
-        if (!PyUnicode_Check(v)) {
-            PyErr_BadArgument();
-            return -1;
-        }
         string = _PyUnicode_AsStringAndSize(v, &len);
-        if (len != 1) {
+        if (string == NULL || len != 1) {
             PyErr_BadArgument();
             return -1;
         }
diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -24,16 +24,18 @@
         void *key, int lineno, int col_offset)
 {
     PySTEntryObject *ste = NULL;
-    PyObject *k;
+    PyObject *k = NULL;
 
     k = PyLong_FromVoidPtr(key);
     if (k == NULL)
         goto fail;
     ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
-    if (ste == NULL)
+    if (ste == NULL) {
+        Py_DECREF(k);
         goto fail;
+    }
     ste->ste_table = st;
-    ste->ste_id = k;
+    ste->ste_id = k; /* ste owns reference to k */
 
     ste->ste_name = name;
     Py_INCREF(name);
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1788,6 +1788,8 @@
                 mkpath(ffi_builddir)
                 config_args = [arg for arg in sysconfig.get_config_var("CONFIG_ARGS").split()
                                if (('--host=' in arg) or ('--build=' in arg))]
+                if not self.verbose:
+                    config_args.append("-q")
 
                 # Pass empty CFLAGS because we'll just append the resulting
                 # CFLAGS to Python's; -g or -O2 is to be avoided.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:28:53 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:28:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?release=3A_configure=2Ein_is_now_conf?=
	=?utf-8?q?igure=2Eac?=
Message-ID: <3XTLwP5Dr6zP53@mail.python.org>

http://hg.python.org/release/rev/919a629013cf
changeset:   62:919a629013cf
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:28:16 2012 +0200
summary:
  configure.in is now configure.ac

files:
  release.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/release.py b/release.py
--- a/release.py
+++ b/release.py
@@ -169,7 +169,7 @@
     if tag.patch == 0 and tag.level == "a" and tag.serial == 0:
         extra_work = True
         other_files += [
-            'configure.in',
+            'configure.ac',
             'Doc/tutorial/interpreter.rst',
             'Doc/tutorial/stdlib.rst',
             'Doc/tutorial/stdlib2.rst',
@@ -183,7 +183,7 @@
 
     print('Bumped revision')
     if extra_work:
-        print('configure.in has change; re-run autotools !')
+        print('configure.ac has change; re-run autotools!')
     print('Please commit and use --tag')
 
 

-- 
Repository URL: http://hg.python.org/release

From python-checkins at python.org  Sat Sep 29 09:34:42 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:34:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_RPM_spec_file_name_update_?=
	=?utf-8?q?for_3=2E4_branch=2E?=
Message-ID: <3XTM366HjlzNpC@mail.python.org>

http://hg.python.org/cpython/rev/e173eeda96d7
changeset:   79239:e173eeda96d7
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:29:44 2012 +0200
summary:
  RPM spec file name update for 3.4 branch.

files:
  Misc/RPM/python-3.3.spec |  0 
  1 files changed, 0 insertions(+), 0 deletions(-)


diff --git a/Misc/RPM/python-3.3.spec b/Misc/RPM/python-3.4.spec
rename from Misc/RPM/python-3.3.spec
rename to Misc/RPM/python-3.4.spec

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:34:45 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:34:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Bump_version_to_3=2E4=2E0_?=
	=?utf-8?q?alpha_0=2E?=
Message-ID: <3XTM391lQDzNwx@mail.python.org>

http://hg.python.org/cpython/rev/1085b0e475d8
changeset:   79240:1085b0e475d8
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:34:13 2012 +0200
summary:
  Bump version to 3.4.0 alpha 0.

files:
  Doc/license.rst              |     2 +
  Doc/tutorial/interpreter.rst |    14 +-
  Doc/tutorial/stdlib.rst      |     2 +-
  Doc/tutorial/stdlib2.rst     |     2 +-
  Include/patchlevel.h         |     6 +-
  LICENSE                      |     1 +
  Lib/distutils/__init__.py    |     2 +-
  Lib/idlelib/idlever.py       |     2 +-
  Misc/NEWS                    |   108 +-
  Misc/RPM/python-3.4.spec     |     4 +-
  PC/VC6/pythoncore.dsp        |     4 +-
  PC/VC6/readme.txt            |     4 +-
  PC/VS7.1/pythoncore.vcproj   |    24 +-
  PC/VS7.1/readme.txt          |     4 +-
  PC/VS8.0/build_ssl.bat       |     4 +-
  PC/VS8.0/kill_python.c       |     2 +-
  PC/VS8.0/pyproject.vsprops   |     2 +-
  PC/VS9.0/kill_python.c       |     2 +-
  PC/VS9.0/pyproject.vsprops   |     2 +-
  PC/example_nt/example.vcproj |     4 +-
  PC/os2emx/Makefile           |     2 +-
  PC/os2emx/README.os2emx      |     2 +-
  PC/os2emx/python33.def       |   250 +-
  PC/pyconfig.h                |     4 +-
  PC/python3.def               |  1394 +++++++++++-----------
  PC/python3.mak               |    10 +-
  PC/python33gen.py            |     8 +-
  PC/python33stub.def          |     2 +-
  PCbuild/build_ssl.bat        |     4 +-
  PCbuild/kill_python.c        |     2 +-
  PCbuild/pyproject.props      |     2 +-
  PCbuild/readme.txt           |     2 +-
  README                       |    16 +-
  configure                    |    20 +-
  configure.ac                 |     2 +-
  35 files changed, 909 insertions(+), 1006 deletions(-)


diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -122,6 +122,8 @@
 +----------------+--------------+------------+------------+-----------------+
 | 3.3.0          | 3.2          | 2012       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
+| 3.4.0          | 3.3.0        | 2014       | PSF        | yes             |
++----------------+--------------+------------+------------+-----------------+
 
 .. note::
 
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -10,13 +10,13 @@
 Invoking the Interpreter
 ========================
 
-The Python interpreter is usually installed as :file:`/usr/local/bin/python3.3`
+The Python interpreter is usually installed as :file:`/usr/local/bin/python3.4`
 on those machines where it is available; putting :file:`/usr/local/bin` in your
 Unix shell's search path makes it possible to start it by typing the command:
 
 .. code-block:: text
 
-   python3.3
+   python3.4
 
 to the shell. [#]_ Since the choice of the directory where the interpreter lives
 is an installation option, other places are possible; check with your local
@@ -24,11 +24,11 @@
 popular alternative location.)
 
 On Windows machines, the Python installation is usually placed in
-:file:`C:\\Python33`, though you can change this when you're running the
+:file:`C:\\Python34`, though you can change this when you're running the
 installer.  To add this directory to your path,  you can type the following
 command into the command prompt in a DOS box::
 
-   set path=%path%;C:\python33
+   set path=%path%;C:\python34
 
 Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on
 Windows) at the primary prompt causes the interpreter to exit with a zero exit
@@ -95,8 +95,8 @@
 prints a welcome message stating its version number and a copyright notice
 before printing the first prompt::
 
-   $ python3.3
-   Python 3.3 (default, Sep 24 2012, 09:25:04)
+   $ python3.4
+   Python 3.4 (default, Sep 24 2012, 09:25:04)
    [GCC 4.6.3] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>>
@@ -149,7 +149,7 @@
 On BSD'ish Unix systems, Python scripts can be made directly executable, like
 shell scripts, by putting the line ::
 
-   #! /usr/bin/env python3.3
+   #! /usr/bin/env python3.4
 
 (assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning
 of the script and giving the file an executable mode.  The ``#!`` must be the
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -15,7 +15,7 @@
 
    >>> import os
    >>> os.getcwd()      # Return the current working directory
-   'C:\\Python33'
+   'C:\\Python34'
    >>> os.chdir('/server/accesslogs')   # Change current working directory
    >>> os.system('mkdir today')   # Run the command mkdir in the system shell
    0
diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -275,7 +275,7 @@
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
        d['primary']                # entry was automatically removed
-     File "C:/python33/lib/weakref.py", line 46, in __getitem__
+     File "C:/python34/lib/weakref.py", line 46, in __getitem__
        o = self.data[key]()
    KeyError: 'primary'
 
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -17,13 +17,13 @@
 /* Version parsed out into numeric values */
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
-#define PY_MINOR_VERSION	3
+#define PY_MINOR_VERSION	4
 #define PY_MICRO_VERSION	0
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_ALPHA
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0"
+#define PY_VERSION      	"3.4.0a0"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -75,6 +75,7 @@
     3.2.2           3.2.1       2011        PSF         yes
     3.2.3           3.2.2       2012        PSF         yes
     3.3.0           3.2         2012        PSF         yes
+    3.4.0           3.3.0       2014        PSF         yes
 
 Footnotes:
 
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@
 # Updated automatically by the Python release process.
 #
 #--start constants--
-__version__ = "3.3.0"
+__version__ = "3.4.0a0"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1,1 +1,1 @@
-IDLE_VERSION = "3.3.0"
+IDLE_VERSION = "3.4.0a0"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,120 +2,20 @@
 Python News
 +++++++++++
 
-What's New in Python 3.3.1?
-===========================
-
-*Release date: XX-XX-XXXX*
+What's New in Python 3.4.0 Alpha 1?
+===================================
+
+*Relase date: XX-XXX-2014*
 
 Core and Builtins
 -----------------
 
-- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
-  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
-
-- Issue #15144: Fix possible integer overflow when handling pointers as
-  integer values, by using Py_uintptr_t instead of size_t.  Patch by
-  Serhiy Storchaka.
-
-- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
-  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
-
-- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
-
-- Issue #15846: Fix SystemError which happened when using ast.parse in an
-  exception handler on code with syntax errors.
-
-- Issue #15801: Make sure mappings passed to '%' formatting are actually
-  subscriptable.
-
 Library
 -------
 
-- Issue #15323: improve failure message of Mock.assert_called_once_with
-
-- Issue #16064: unittest -m claims executable is "python", not "python3"
-
-- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
-
-- Issue #15222: Insert blank line after each message in mbox mailboxes
-
-- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
-  Patch by Serhiy Storchaka.
-
-- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
-  datetime.MAXYEAR.  Patch by C?dric Krier.
-
-- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
-  elements 'meta' and 'param'.
-
-- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
-  raise ValueError when the file-like object is closed.  Patch by Alessandro
-  Moura.
-
-- Issue #15876: Fix a refleak in the curses module: window.encoding.
-
-- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
-  by Chris McDonough.
-
-- Issue #15340: Fix importing the random module when /dev/urandom cannot
-  be opened.  This was a regression caused by the hash randomization patch.
-
-- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
-  and StringIO objects now raise ValueError when the object has been closed.
-  Patch by Alessandro Moura.
-
-- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
-  os.devnull explicitly and leaving it open.
-
-- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
-  Popen when %action substitutions produce empty strings.
-
-- Issue #12776,#11839: call argparse type function (specified by add_argument)
-  only once. Before, the type function was called twice in the case where the
-  default was specified and the argument was given as well.  This was
-  especially problematic for the FileType type, as a default file would always
-  be opened, even if a file argument was specified on the command line.
-
-- Issue #15906: Fix a regression in argparse caused by the preceding change,
-  when action='append', type='str' and default=[].
-
 Extension Modules
 -----------------
 
-Tests
------
-
-- Issue #15304: Fix warning message when os.chdir() fails inside
-  test.support.temp_cwd().  Patch by Chris Jerdonek.
-
-
-- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
-  by Serhiy Storchaka.
-
-- Issue #15557: Added a test suite for the webbrowser module, thanks
-  to Anton Barkovsky.
-
-Build
------
-
-- Issue #15819: Make sure we can build Python out-of-tree from a readonly
-  source directory.  (Somewhat related to Issue #9860.)
-
-Documentation
--------------
-
-- Issue #16036: Improve documentation of built-in int()'s signature and
-  arguments.
-
-- Issue #15935: Clarification of argparse docs, re: add_argument() type and
-  default arguments.  Patch contributed by Chris Jerdonek.
-
-- Issue #11964: Document a change in v3.2 to the behavior of the indent
-  parameter of json encoding operations.
-
-Tools/Demos
------------
-
 
 What's New in Python 3.3.0?
 ===========================
diff --git a/Misc/RPM/python-3.4.spec b/Misc/RPM/python-3.4.spec
--- a/Misc/RPM/python-3.4.spec
+++ b/Misc/RPM/python-3.4.spec
@@ -39,8 +39,8 @@
 
 %define name python
 #--start constants--
-%define version 3.3.0
-%define libvers 3.3
+%define version 3.4.0a0
+%define libvers 3.4
 #--end constants--
 %define release 1pydotorg
 %define __prefix /usr
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -54,7 +54,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python33.dll"
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python34.dll"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
@@ -82,7 +82,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python33_d.dll" /pdbtype:sept
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python34_d.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -12,7 +12,7 @@
 The proper order to build subprojects:
 
 1) pythoncore (this builds the main Python DLL and library files,
-               python33.{dll, lib} in Release mode)
+               python34.{dll, lib} in Release mode)
 
 2) python (this builds the main Python executable,
            python.exe in Release mode)
@@ -23,7 +23,7 @@
    to the subsystems they implement; see SUBPROJECTS below)
 
 When using the Debug setting, the output files have a _d added to
-their name:  python33_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
+their name:  python34_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
 
 SUBPROJECTS
 -----------
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -39,15 +39,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python33.dll"
+				OutputFile="./python34.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python33.pdb"
+				ProgramDatabaseFile=".\./python34.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python33.lib"
+				ImportLibrary=".\./python34.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -99,15 +99,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python33_d.dll"
+				OutputFile="./python34_d.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python33_d.pdb"
+				ProgramDatabaseFile=".\./python34_d.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python33_d.lib"
+				ImportLibrary=".\./python34_d.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -166,15 +166,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python33.dll"
+				OutputFile="./python34.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="FALSE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python33.pdb"
+				ProgramDatabaseFile=".\./python34.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python33.lib"
+				ImportLibrary=".\./python34.lib"
 				TargetMachine="0"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -233,15 +233,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
 				AdditionalDependencies="getbuildinfo.o"
-				OutputFile="./python33.dll"
+				OutputFile="./python34.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\./python33.pdb"
+				ProgramDatabaseFile=".\./python34.pdb"
 				SubSystem="2"
 				BaseAddress="0x1e000000"
-				ImportLibrary=".\./python33.lib"
+				ImportLibrary=".\./python34.lib"
 				TargetMachine="0"/>
 			<Tool
 				Name="VCMIDLTool"/>
diff --git a/PC/VS7.1/readme.txt b/PC/VS7.1/readme.txt
--- a/PC/VS7.1/readme.txt
+++ b/PC/VS7.1/readme.txt
@@ -12,7 +12,7 @@
 The proper order to build subprojects:
 
 1) pythoncore (this builds the main Python DLL and library files,
-               python33.{dll, lib} in Release mode)
+               python34.{dll, lib} in Release mode)
               NOTE:  in previous releases, this subproject was
               named after the release number, e.g. python20.
 
@@ -26,7 +26,7 @@
    test slave; see SUBPROJECTS below)
 
 When using the Debug setting, the output files have a _d added to
-their name:  python33_d.dll, python_d.exe, parser_d.pyd, and so on.
+their name:  python34_d.dll, python_d.exe, parser_d.pyd, and so on.
 
 SUBPROJECTS
 -----------
diff --git a/PC/VS8.0/build_ssl.bat b/PC/VS8.0/build_ssl.bat
--- a/PC/VS8.0/build_ssl.bat
+++ b/PC/VS8.0/build_ssl.bat
@@ -2,10 +2,10 @@
 if not defined HOST_PYTHON (
   if %1 EQU Debug (
     set HOST_PYTHON=python_d.exe
-    if not exist python33_d.dll exit 1
+    if not exist python34_d.dll exit 1
   ) ELSE (
     set HOST_PYTHON=python.exe
-    if not exist python33.dll exit 1
+    if not exist python34.dll exit 1
   )
 )
 %HOST_PYTHON% build_ssl.py %1 %2 %3
diff --git a/PC/VS8.0/kill_python.c b/PC/VS8.0/kill_python.c
--- a/PC/VS8.0/kill_python.c
+++ b/PC/VS8.0/kill_python.c
@@ -106,7 +106,7 @@
         /*
          * XXX TODO: if we really wanted to be fancy, we could check the 
          * modules for all processes (not just the python[_d].exe ones)
-         * and see if any of our DLLs are loaded (i.e. python33[_d].dll),
+         * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
          * as that would also inhibit our ability to rebuild the solution.
          * Not worth loosing sleep over though; for now, a simple check 
          * for just the python executable should be sufficient.
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -38,7 +38,7 @@
 	/>
 	<UserMacro
 		Name="PyDllName"
-		Value="python33"
+		Value="python34"
 	/>
 	<UserMacro
 		Name="PythonExe"
diff --git a/PC/VS9.0/kill_python.c b/PC/VS9.0/kill_python.c
--- a/PC/VS9.0/kill_python.c
+++ b/PC/VS9.0/kill_python.c
@@ -106,7 +106,7 @@
         /*
          * XXX TODO: if we really wanted to be fancy, we could check the 
          * modules for all processes (not just the python[_d].exe ones)
-         * and see if any of our DLLs are loaded (i.e. python33[_d].dll),
+         * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
          * as that would also inhibit our ability to rebuild the solution.
          * Not worth loosing sleep over though; for now, a simple check 
          * for just the python executable should be sufficient.
diff --git a/PC/VS9.0/pyproject.vsprops b/PC/VS9.0/pyproject.vsprops
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@ -38,7 +38,7 @@
 	/>
 	<UserMacro
 		Name="PyDllName"
-		Value="python33"
+		Value="python34"
 	/>
 	<UserMacro
 		Name="PythonExe"
diff --git a/PC/example_nt/example.vcproj b/PC/example_nt/example.vcproj
--- a/PC/example_nt/example.vcproj
+++ b/PC/example_nt/example.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/export:initexample"
-				AdditionalDependencies="odbc32.lib odbccp32.lib python33.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib python34.lib"
 				OutputFile=".\Release/example.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -105,7 +105,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/export:initexample"
-				AdditionalDependencies="odbc32.lib odbccp32.lib python33_d.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib python34_d.lib"
 				OutputFile=".\Debug/example_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -237,7 +237,7 @@
 
 # Output file names
 PYTHON_VER=	2.6
-PYTHON_LIB=	python33
+PYTHON_LIB=	python34
 PYTHON.LIB=	$(PYTHON_LIB)_s$A
 PYTHON.IMPLIB=	$(PYTHON_LIB)$A
 ifeq ($(EXEOMF),yes)
diff --git a/PC/os2emx/README.os2emx b/PC/os2emx/README.os2emx
--- a/PC/os2emx/README.os2emx
+++ b/PC/os2emx/README.os2emx
@@ -305,7 +305,7 @@
    to be installed in a directory other than the PYTHONHOME directory, set 
    the value of the Makefile variable EXE_DIR to the appropriate directory.
 
-3. If you wish the Python core DLL (python33.dll) to be installed in a 
+3. If you wish the Python core DLL (python34.dll) to be installed in a 
    directory other than the directory in which the Python executables are 
    installed (by default, the PYTHONHOME directory), set the value of the 
    Makefile variable DLL_DIR to the appropriate directory.  This DLL must 
diff --git a/PC/os2emx/python33.def b/PC/os2emx/python34.def
rename from PC/os2emx/python33.def
rename to PC/os2emx/python34.def
--- a/PC/os2emx/python33.def
+++ b/PC/os2emx/python34.def
@@ -1,72 +1,72 @@
-LIBRARY python33 INITINSTANCE TERMINSTANCE 
+LIBRARY python34 INITINSTANCE TERMINSTANCE 
 DESCRIPTION "Python 2.6 Core DLL" 
 PROTMODE 
 DATA MULTIPLE NONSHARED 
 EXPORTS 
 
-; From python33_s.lib(config)
+; From python34_s.lib(config)
   "_PyImport_Inittab"
 
-; From python33_s.lib(dlfcn)
+; From python34_s.lib(dlfcn)
 ;  "dlopen"
 ;  "dlsym"
 ;  "dlclose"
 ;  "dlerror"
 
-; From python33_s.lib(getpathp)
+; From python34_s.lib(getpathp)
   "Py_GetProgramFullPath"
   "Py_GetPrefix"
   "Py_GetExecPrefix"
   "Py_GetPath"
 
-; From python33_s.lib(getbuildinfo)
+; From python34_s.lib(getbuildinfo)
   "Py_GetBuildInfo"
   "_Py_svnversion"
 
-; From python33_s.lib(main)
+; From python34_s.lib(main)
   "Py_Main"
   "Py_GetArgcArgv"
 
-; From python33_s.lib(acceler)
+; From python34_s.lib(acceler)
   "PyGrammar_AddAccelerators"
   "PyGrammar_RemoveAccelerators"
 
-; From python33_s.lib(grammar1)
+; From python34_s.lib(grammar1)
   "PyGrammar_FindDFA"
   "PyGrammar_LabelRepr"
 
-; From python33_s.lib(listnode)
+; From python34_s.lib(listnode)
   "PyNode_ListTree"
 
-; From python33_s.lib(node)
+; From python34_s.lib(node)
   "PyNode_New"
   "PyNode_AddChild"
   "PyNode_Free"
 
-; From python33_s.lib(parser)
+; From python34_s.lib(parser)
   "PyParser_AddToken"
   "PyParser_New"
   "PyParser_Delete"
 
-; From python33_s.lib(parsetok)
+; From python34_s.lib(parsetok)
   "PyParser_ParseString"
   "PyParser_ParseStringFlagsFilename"
   "PyParser_ParseFile"
   "PyParser_ParseFileFlags"
   "PyParser_ParseStringFlags"
 
-; From python33_s.lib(bitset)
+; From python34_s.lib(bitset)
   "_Py_newbitset"
   "_Py_delbitset"
   "_Py_addbit"
   "_Py_samebitset"
   "_Py_mergebitset"
 
-; From python33_s.lib(metagrammar)
+; From python34_s.lib(metagrammar)
   "_Py_meta_grammar"
   "Py_meta_grammar"
 
-; From python33_s.lib(tokenizer)
+; From python34_s.lib(tokenizer)
   "PyToken_OneChar"
   "PyToken_TwoChars"
   "PyToken_ThreeChars"
@@ -76,14 +76,14 @@
   "PyTokenizer_Get"
   "_PyParser_TokenNames"
 
-; From python33_s.lib(myreadline)
+; From python34_s.lib(myreadline)
   "_PyOS_ReadlineTState"
   "PyOS_ReadlineFunctionPointer"
   "PyOS_StdioReadline"
   "PyOS_Readline"
   "PyOS_InputHook"
 
-; From python33_s.lib(abstract)
+; From python34_s.lib(abstract)
   "_PyObject_LengthHint"
   "PyMapping_Size"
   "PyObject_CallMethod"
@@ -174,13 +174,13 @@
   "PyObject_IsInstance"
   "PyObject_IsSubclass"
 
-; From python33_s.lib(boolobject)
+; From python34_s.lib(boolobject)
   "PyBool_FromLong"
   "PyBool_Type"
   "_Py_ZeroStruct"
   "_Py_TrueStruct"
 
-; From python33_s.lib(bufferobject)
+; From python34_s.lib(bufferobject)
   "PyBuffer_FromObject"
   "PyBuffer_FromReadWriteObject"
   "PyBuffer_FromMemory"
@@ -188,13 +188,13 @@
   "PyBuffer_New"
   "PyBuffer_Type"
 
-; From python33_s.lib(cellobject)
+; From python34_s.lib(cellobject)
   "PyCell_New"
   "PyCell_Get"
   "PyCell_Set"
   "PyCell_Type"
 
-; From python33_s.lib(classobject)
+; From python34_s.lib(classobject)
   "PyClass_New"
   "PyClass_IsSubclass"
   "PyInstance_New"
@@ -209,7 +209,7 @@
   "PyInstance_Type"
   "PyMethod_Type"
 
-; From python33_s.lib(capsule)
+; From python34_s.lib(capsule)
   "PyCapsule_GetContext"
   "PyCapsule_GetDestructor"
   "PyCapsule_GetName"
@@ -222,7 +222,7 @@
   "PyCapsule_SetName"
   "PyCapsule_SetPointer"
 
-; From python33_s.lib(cobject)
+; From python34_s.lib(cobject)
   "PyCObject_FromVoidPtr"
   "PyCObject_FromVoidPtrAndDesc"
   "PyCObject_AsVoidPtr"
@@ -231,13 +231,13 @@
   "PyCObject_SetVoidPtr"
   "PyCObject_Type"
 
-; From python33_s.lib(codeobject)
+; From python34_s.lib(codeobject)
   "PyCode_New"
   "PyCode_Addr2Line"
   "PyCode_CheckLineNumber"
   "PyCode_Type"
 
-; From python33_s.lib(complexobject)
+; From python34_s.lib(complexobject)
   "_Py_c_pow"
   "_Py_c_sum"
   "_Py_c_diff"
@@ -251,7 +251,7 @@
   "PyComplex_AsCComplex"
   "PyComplex_Type"
 
-; From python33_s.lib(descrobject)
+; From python34_s.lib(descrobject)
   "PyWrapper_New"
   "PyDescr_NewMethod"
   "PyDescr_NewClassMethod"
@@ -262,7 +262,7 @@
   "PyWrapperDescr_Type"
   "PyProperty_Type"
 
-; From python33_s.lib(dictobject)
+; From python34_s.lib(dictobject)
   "PyDict_New"
   "PyDict_GetItem"
   "PyDict_SetItem"
@@ -286,11 +286,11 @@
   "PyDictIterValue_Type"
   "PyDictIterItem_Type"
 
-; From python33_s.lib(enumobject)
+; From python34_s.lib(enumobject)
   "PyEnum_Type"
   "PyReversed_Type"
 
-; From python33_s.lib(fileobject)
+; From python34_s.lib(fileobject)
   "PyFile_FromString"
   "Py_UniversalNewlineFread"
   "PyFile_GetLine"
@@ -306,7 +306,7 @@
   "PyFile_Name"
   "PyFile_Type"
 
-; From python33_s.lib(floatobject)
+; From python34_s.lib(floatobject)
   "PyFloat_FromString"
   "PyFloat_AsDouble"
   "PyFloat_Fini"
@@ -321,7 +321,7 @@
   "PyFloat_AsStringEx"
   "PyFloat_Type"
 
-; From python33_s.lib(frameobject)
+; From python34_s.lib(frameobject)
   "PyFrame_New"
   "PyFrame_FastToLocals"
   "PyFrame_LocalsToFast"
@@ -331,7 +331,7 @@
   "PyFrame_BlockPop"
   "PyFrame_Type"
 
-; From python33_s.lib(funcobject)
+; From python34_s.lib(funcobject)
   "PyFunction_New"
   "PyFunction_GetCode"
   "PyFunction_GetGlobals"
@@ -346,12 +346,12 @@
   "PyClassMethod_Type"
   "PyStaticMethod_Type"
 
-; From python33_s.lib(genobject)
+; From python34_s.lib(genobject)
   "PyGen_New"
   "PyGen_NeedsFinalizing"
   "PyGen_Type"
 
-; From python33_s.lib(intobject)
+; From python34_s.lib(intobject)
   "PyInt_AsLong"
   "PyInt_AsUnsignedLongMask"
   "PyInt_AsUnsignedLongLongMask"
@@ -366,13 +366,13 @@
   "_PyInt_Init"
   "PyInt_Type"
 
-; From python33_s.lib(iterobject)
+; From python34_s.lib(iterobject)
   "PySeqIter_New"
   "PyCallIter_New"
   "PySeqIter_Type"
   "PyCallIter_Type"
 
-; From python33_s.lib(listobject)
+; From python34_s.lib(listobject)
   "PyList_New"
   "PyList_Append"
   "PyList_Size"
@@ -390,7 +390,7 @@
   "PyListIter_Type"
   "PyListRevIter_Type"
 
-; From python33_s.lib(longobject)
+; From python34_s.lib(longobject)
   "PyLong_FromDouble"
   "PyLong_AsLong"
   "_PyLong_AsSsize_t"
@@ -420,7 +420,7 @@
   "PyLong_Type"
   "_PyLong_DigitValue"
 
-; From python33_s.lib(methodobject)
+; From python34_s.lib(methodobject)
   "PyCFunction_Call"
   "Py_FindMethodInChain"
   "PyCFunction_GetFunction"
@@ -432,7 +432,7 @@
   "PyCFunction_New"
   "PyCFunction_Type"
 
-; From python33_s.lib(moduleobject)
+; From python34_s.lib(moduleobject)
   "PyModule_New"
   "_PyModule_Clear"
   "PyModule_GetDict"
@@ -440,7 +440,7 @@
   "PyModule_GetFilename"
   "PyModule_Type"
 
-; From python33_s.lib(object)
+; From python34_s.lib(object)
   "Py_DivisionWarningFlag"
   "PyObject_Str"
   "PyObject_Repr"
@@ -493,15 +493,15 @@
   "_PyTrash_delete_nesting"
   "_PyTrash_delete_later"
 
-; From python33_s.lib(obmalloc)
+; From python34_s.lib(obmalloc)
   "PyObject_Malloc"
   "PyObject_Free"
   "PyObject_Realloc"
 
-; From python33_s.lib(rangeobject)
+; From python34_s.lib(rangeobject)
   "PyRange_Type"
 
-; From python33_s.lib(setobject)
+; From python34_s.lib(setobject)
   "PySet_Pop"
   "PySet_New"
   "PyFrozenSet_New"
@@ -516,7 +516,7 @@
   "PySet_Type"
   "PyFrozenSet_Type"
 
-; From python33_s.lib(sliceobject)
+; From python34_s.lib(sliceobject)
   "_PySlice_FromIndices"
   "PySlice_GetIndices"
   "PySlice_GetIndicesEx"
@@ -524,7 +524,7 @@
   "_Py_EllipsisObject"
   "PySlice_Type"
 
-; From python33_s.lib(stringobject)
+; From python34_s.lib(stringobject)
   "PyString_FromStringAndSize"
   "PyString_InternInPlace"
   "PyString_FromString"
@@ -555,12 +555,12 @@
   "PyString_Type"
   "PyBaseString_Type"
 
-; From python33_s.lib(structseq)
+; From python34_s.lib(structseq)
   "PyStructSequence_InitType"
   "PyStructSequence_New"
   "PyStructSequence_UnnamedField"
 
-; From python33_s.lib(tupleobject)
+; From python34_s.lib(tupleobject)
   "PyTuple_New"
   "PyTuple_Pack"
   "_PyTuple_Resize"
@@ -572,7 +572,7 @@
   "PyTuple_Type"
   "PyTupleIter_Type"
 
-; From python33_s.lib(typeobject)
+; From python34_s.lib(typeobject)
   "PyType_IsSubtype"
   "_PyType_Lookup"
   "PyType_Ready"
@@ -583,7 +583,7 @@
   "PyBaseObject_Type"
   "PySuper_Type"
 
-; From python33_s.lib(unicodeobject)
+; From python34_s.lib(unicodeobject)
   "PyUnicodeUCS2_Resize"
   "PyUnicodeUCS2_FromOrdinal"
   "PyUnicodeUCS2_FromObject"
@@ -649,7 +649,7 @@
   "PyUnicode_AsDecodedObject"
   "PyUnicode_Type"
 
-; From python33_s.lib(unicodectype)
+; From python34_s.lib(unicodectype)
   "_PyUnicode_TypeRecords"
   "_PyUnicodeUCS2_ToNumeric"
   "_PyUnicodeUCS2_IsLowercase"
@@ -667,7 +667,7 @@
   "_PyUnicodeUCS2_IsNumeric"
   "_PyUnicodeUCS2_IsAlpha"
 
-; From python33_s.lib(weakrefobject)
+; From python34_s.lib(weakrefobject)
   "PyWeakref_NewRef"
   "PyWeakref_NewProxy"
   "PyObject_ClearWeakRefs"
@@ -678,7 +678,7 @@
   "_PyWeakref_ProxyType"
   "_PyWeakref_CallableProxyType"
 
-; From python33_s.lib(Python-ast)
+; From python34_s.lib(Python-ast)
 ;  "init_ast"
   "Module"
   "Interactive"
@@ -737,18 +737,18 @@
   "alias"
   "PyAST_mod2obj"
 
-; From python33_s.lib(asdl)
+; From python34_s.lib(asdl)
   "asdl_seq_new"
   "asdl_int_seq_new"
 
-; From python33_s.lib(ast)
+; From python34_s.lib(ast)
   "PyAST_FromNode"
 
-; From python33_s.lib(bltinmodule)
+; From python34_s.lib(bltinmodule)
   "_PyBuiltin_Init"
   "Py_FileSystemDefaultEncoding"
 
-; From python33_s.lib(exceptions)
+; From python34_s.lib(exceptions)
   "PyUnicodeEncodeError_GetStart"
   "PyUnicodeDecodeError_GetStart"
   "PyUnicodeEncodeError_GetEnd"
@@ -824,7 +824,7 @@
   "PyExc_ImportWarning"
   "PyExc_MemoryErrorInst"
 
-; From python33_s.lib(ceval)
+; From python34_s.lib(ceval)
   "PyEval_EvalFrameEx"
   "PyEval_CallObjectWithKeywords"
   "PyEval_EvalCodeEx"
@@ -863,13 +863,13 @@
   "_Py_CheckInterval"
   "_Py_Ticker"
 
-; From python33_s.lib(compile)
+; From python34_s.lib(compile)
   "_Py_Mangle"
   "PyAST_Compile"
   "PyNode_Compile"
   "Py_OptimizeFlag"
 
-; From python33_s.lib(codecs)
+; From python34_s.lib(codecs)
   "_PyCodec_Lookup"
   "PyCodec_Encode"
   "PyCodec_Decode"
@@ -888,7 +888,7 @@
   "PyCodec_LookupError"
   "PyCodec_StrictErrors"
 
-; From python33_s.lib(errors)
+; From python34_s.lib(errors)
   "PyErr_SetNone"
   "PyErr_SetString"
   "PyErr_GivenExceptionMatches"
@@ -914,16 +914,16 @@
   "PyErr_Warn"
   "PyErr_WarnExplicit"
 
-; From python33_s.lib(frozen)
+; From python34_s.lib(frozen)
   "PyImport_FrozenModules"
 
-; From python33_s.lib(frozenmain)
+; From python34_s.lib(frozenmain)
   "Py_FrozenMain"
 
-; From python33_s.lib(future)
+; From python34_s.lib(future)
   "PyFuture_FromAST"
 
-; From python33_s.lib(getargs)
+; From python34_s.lib(getargs)
   "PyArg_Parse"
   "_PyArg_Parse_SizeT"
   "PyArg_ParseTuple"
@@ -937,22 +937,22 @@
   "_PyArg_VaParse_SizeT"
   "_PyArg_VaParseTupleAndKeywords_SizeT"
 
-; From python33_s.lib(getcompiler)
+; From python34_s.lib(getcompiler)
   "Py_GetCompiler"
 
-; From python33_s.lib(getcopyright)
+; From python34_s.lib(getcopyright)
   "Py_GetCopyright"
 
-; From python33_s.lib(getplatform)
+; From python34_s.lib(getplatform)
   "Py_GetPlatform"
 
-; From python33_s.lib(getversion)
+; From python34_s.lib(getversion)
   "Py_GetVersion"
 
-; From python33_s.lib(graminit)
+; From python34_s.lib(graminit)
   "_PyParser_Grammar"
 
-; From python33_s.lib(import)
+; From python34_s.lib(import)
   "_PyImport_Init"
   "_PyImportHooks_Init"
   "PyImport_ImportModule"
@@ -979,10 +979,10 @@
   "PyImport_Inittab"
   "_PyImport_Filetab"
 
-; From python33_s.lib(importdl)
+; From python34_s.lib(importdl)
   "_PyImport_LoadDynamicModule"
 
-; From python33_s.lib(marshal)
+; From python34_s.lib(marshal)
   "PyMarshal_ReadLongFromFile"
   "PyMarshal_WriteObjectToString"
   "PyMarshal_WriteLongToFile"
@@ -993,7 +993,7 @@
   "PyMarshal_ReadObjectFromString"
   "PyMarshal_Init"
 
-; From python33_s.lib(modsupport)
+; From python34_s.lib(modsupport)
   "Py_InitModule4"
   "Py_BuildValue"
   "_Py_BuildValue_SizeT"
@@ -1006,24 +1006,24 @@
   "PyModule_AddStringConstant"
   "_Py_PackageContext"
 
-; From python33_s.lib(mysnprintf)
+; From python34_s.lib(mysnprintf)
   "PyOS_snprintf"
   "PyOS_vsnprintf"
 
-; From python33_s.lib(mystrtoul)
+; From python34_s.lib(mystrtoul)
   "PyOS_strtoul"
   "PyOS_strtol"
 
-; From python33_s.lib(pyarena)
+; From python34_s.lib(pyarena)
   "PyArena_New"
   "PyArena_Free"
   "PyArena_Malloc"
   "PyArena_AddPyObject"
 
-; From python33_s.lib(pyfpe)
+; From python34_s.lib(pyfpe)
   "PyFPE_dummy"
 
-; From python33_s.lib(pystate)
+; From python34_s.lib(pystate)
   "PyInterpreterState_Clear"
   "PyThreadState_Clear"
   "_PyThread_CurrentFrames"
@@ -1048,7 +1048,7 @@
   "_PyThreadState_Current"
   "_PyThreadState_GetFrame"
 
-; From python33_s.lib(pythonrun)
+; From python34_s.lib(pythonrun)
   "Py_IgnoreEnvironmentFlag"
   "Py_DebugFlag"
   "Py_VerboseFlag"
@@ -1110,20 +1110,20 @@
   "Py_UnicodeFlag"
   "_Py_QnewFlag"
 
-; From python33_s.lib(structmember)
+; From python34_s.lib(structmember)
   "PyMember_Get"
   "PyMember_GetOne"
   "PyMember_SetOne"
   "PyMember_Set"
 
-; From python33_s.lib(symtable)
+; From python34_s.lib(symtable)
   "PySymtable_Build"
   "PySymtable_Free"
   "PyST_GetScope"
   "PySymtable_Lookup"
   "PySTEntry_Type"
 
-; From python33_s.lib(sysmodule)
+; From python34_s.lib(sysmodule)
   "_PySys_Init"
   "PySys_WriteStderr"
   "PySys_SetPath"
@@ -1137,22 +1137,22 @@
   "PySys_ResetWarnOptions"
   "PySys_AddWarnOption"
 
-; From python33_s.lib(traceback)
+; From python34_s.lib(traceback)
   "PyTraceBack_Here"
   "PyTraceBack_Print"
   "PyTraceBack_Type"
 
-; From python33_s.lib(getopt)
+; From python34_s.lib(getopt)
   "_PyOS_GetOpt"
   "_PyOS_opterr"
   "_PyOS_optind"
   "_PyOS_optarg"
 
-; From python33_s.lib(dynload_shlib)
+; From python34_s.lib(dynload_shlib)
   "_PyImport_DynLoadFiletab"
   "_PyImport_GetDynLoadFunc"
 
-; From python33_s.lib(thread)
+; From python34_s.lib(thread)
   "PyThread_delete_key_value"
   "PyThread_init_thread"
   "PyThread_start_new_thread"
@@ -1169,7 +1169,7 @@
   "PyThread_set_key_value"
   "PyThread_get_key_value"
 
-; From python33_s.lib(gcmodule)
+; From python34_s.lib(gcmodule)
 ;  "initgc"
   "_PyObject_GC_New"
   "_PyObject_GC_NewVar"
@@ -1185,7 +1185,7 @@
   "_PyObject_GC_Del"
   "_PyGC_generation0"
 
-; From python33_s.lib(signalmodule)
+; From python34_s.lib(signalmodule)
 ;  "initsignal"
   "PyErr_CheckSignals"
   "PyErr_SetInterrupt"
@@ -1194,121 +1194,121 @@
   "PyOS_InitInterrupts"
   "PyOS_AfterFork"
 
-; From python33_s.lib(posixmodule)
+; From python34_s.lib(posixmodule)
 ;  "initos2"
 
-; From python33_s.lib(_threadmodule)
+; From python34_s.lib(_threadmodule)
 ;  "init_thread"
 
-; From python33_s.lib(arraymodule)
+; From python34_s.lib(arraymodule)
 ;  "initarray"
 ;  "array_methods"
 
-; From python33_s.lib(binascii)
+; From python34_s.lib(binascii)
 ;  "initbinascii"
 
-; From python33_s.lib(cmathmodule)
+; From python34_s.lib(cmathmodule)
 ;  "initcmath"
 
-; From python33_s.lib(_codecsmodule)
+; From python34_s.lib(_codecsmodule)
 ;  "init_codecs"
 
-; From python33_s.lib(collectionsmodule)
+; From python34_s.lib(collectionsmodule)
 ;  "initcollections"
   "dequeiter_type"
   "dequereviter_type"
 
-; From python33_s.lib(cPickle)
+; From python34_s.lib(cPickle)
 ;  "initcPickle"
 ;  "fast_save_leave"
 
-; From python33_s.lib(_csv)
+; From python34_s.lib(_csv)
 ;  "init_csv"
 
-; From python33_s.lib(datetimemodule)
+; From python34_s.lib(datetimemodule)
 ;  "initdatetime"
 
-; From python33_s.lib(dlmodule)
+; From python34_s.lib(dlmodule)
 ;  "initdl"
 
-; From python33_s.lib(errnomodule)
+; From python34_s.lib(errnomodule)
 ;  "initerrno"
 
-; From python33_s.lib(fcntlmodule)
+; From python34_s.lib(fcntlmodule)
 ;  "initfcntl"
 
-; From python33_s.lib(_functoolsmodule)
+; From python34_s.lib(_functoolsmodule)
 ;  "init_functools"
 
-; From python33_s.lib(_heapqmodule)
+; From python34_s.lib(_heapqmodule)
 ;  "init_heapq"
 
-; From python33_s.lib(imageop)
+; From python34_s.lib(imageop)
 ;  "initimageop"
 
-; From python33_s.lib(itertoolsmodule)
+; From python34_s.lib(itertoolsmodule)
 ;  "inititertools"
 
-; From python33_s.lib(_localemodule)
+; From python34_s.lib(_localemodule)
 ;  "init_locale"
 
-; From python33_s.lib(mathmodule)
+; From python34_s.lib(mathmodule)
 ;  "initmath"
 
-; From python33_s.lib(md5)
+; From python34_s.lib(md5)
   "md5_finish"
   "md5_init"
   "md5_append"
 
-; From python33_s.lib(md5module)
+; From python34_s.lib(md5module)
 ;  "init_md5"
 
-; From python33_s.lib(operator)
+; From python34_s.lib(operator)
 ;  "initoperator"
 
-; From python33_s.lib(_randommodule)
+; From python34_s.lib(_randommodule)
 ;  "init_random"
 
-; From python33_s.lib(rgbimgmodule)
+; From python34_s.lib(rgbimgmodule)
 ;  "initrgbimg"
 
-; From python33_s.lib(shamodule)
+; From python34_s.lib(shamodule)
 ;  "init_sha"
 
-; From python33_s.lib(sha256module)
+; From python34_s.lib(sha256module)
 ;  "init_sha256"
 
-; From python33_s.lib(sha512module)
+; From python34_s.lib(sha512module)
 ;  "init_sha512"
 
-; From python33_s.lib(_sre)
+; From python34_s.lib(_sre)
 ;  "init_sre"
 
-; From python33_s.lib(stropmodule)
+; From python34_s.lib(stropmodule)
 ;  "initstrop"
 
-; From python33_s.lib(_struct)
+; From python34_s.lib(_struct)
 ;  "init_struct"
 
-; From python33_s.lib(symtablemodule)
+; From python34_s.lib(symtablemodule)
 ;  "init_symtable"
 
-; From python33_s.lib(termios)
+; From python34_s.lib(termios)
 ;  "inittermios"
 
-; From python33_s.lib(timemodule)
+; From python34_s.lib(timemodule)
 ;  "inittime"
   "_PyTime_DoubleToTimet"
 ;  "inittimezone"
 
-; From python33_s.lib(timingmodule)
+; From python34_s.lib(timingmodule)
 ;  "inittiming"
 
-; From python33_s.lib(_weakref)
+; From python34_s.lib(_weakref)
 ;  "init_weakref"
 
-; From python33_s.lib(xxsubtype)
+; From python34_s.lib(xxsubtype)
 ;  "initxxsubtype"
 
-; From python33_s.lib(zipimport)
+; From python34_s.lib(zipimport)
 ;  "initzipimport"
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -324,11 +324,11 @@
 			their Makefile (other compilers are generally
 			taken care of by distutils.) */
 #			if defined(_DEBUG)
-#				pragma comment(lib,"python33_d.lib")
+#				pragma comment(lib,"python34_d.lib")
 #			elif defined(Py_LIMITED_API)
 #				pragma comment(lib,"python3.lib")
 #			else
-#				pragma comment(lib,"python33.lib")
+#				pragma comment(lib,"python34.lib")
 #			endif /* _DEBUG */
 #		endif /* _MSC_VER */
 #	endif /* Py_BUILD_CORE */
diff --git a/PC/python3.def b/PC/python3.def
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -1,699 +1,699 @@
-; When changing this file, run python33gen.py
+; When changing this file, run python34gen.py
 LIBRARY	"python3"
 EXPORTS
-  PyArg_Parse=python33.PyArg_Parse
-  PyArg_ParseTuple=python33.PyArg_ParseTuple
-  PyArg_ParseTupleAndKeywords=python33.PyArg_ParseTupleAndKeywords
-  PyArg_UnpackTuple=python33.PyArg_UnpackTuple
-  PyArg_VaParse=python33.PyArg_VaParse
-  PyArg_VaParseTupleAndKeywords=python33.PyArg_VaParseTupleAndKeywords
-  PyArg_ValidateKeywordArguments=python33.PyArg_ValidateKeywordArguments
-  PyBaseObject_Type=python33.PyBaseObject_Type DATA
-  PyBool_FromLong=python33.PyBool_FromLong
-  PyBool_Type=python33.PyBool_Type DATA
-  PyByteArrayIter_Type=python33.PyByteArrayIter_Type DATA
-  PyByteArray_AsString=python33.PyByteArray_AsString
-  PyByteArray_Concat=python33.PyByteArray_Concat
-  PyByteArray_FromObject=python33.PyByteArray_FromObject
-  PyByteArray_FromStringAndSize=python33.PyByteArray_FromStringAndSize
-  PyByteArray_Resize=python33.PyByteArray_Resize
-  PyByteArray_Size=python33.PyByteArray_Size
-  PyByteArray_Type=python33.PyByteArray_Type DATA
-  PyBytesIter_Type=python33.PyBytesIter_Type DATA
-  PyBytes_AsString=python33.PyBytes_AsString
-  PyBytes_AsStringAndSize=python33.PyBytes_AsStringAndSize
-  PyBytes_Concat=python33.PyBytes_Concat
-  PyBytes_ConcatAndDel=python33.PyBytes_ConcatAndDel
-  PyBytes_DecodeEscape=python33.PyBytes_DecodeEscape
-  PyBytes_FromFormat=python33.PyBytes_FromFormat
-  PyBytes_FromFormatV=python33.PyBytes_FromFormatV
-  PyBytes_FromObject=python33.PyBytes_FromObject
-  PyBytes_FromString=python33.PyBytes_FromString
-  PyBytes_FromStringAndSize=python33.PyBytes_FromStringAndSize
-  PyBytes_Repr=python33.PyBytes_Repr
-  PyBytes_Size=python33.PyBytes_Size
-  PyBytes_Type=python33.PyBytes_Type DATA
-  PyCFunction_Call=python33.PyCFunction_Call
-  PyCFunction_ClearFreeList=python33.PyCFunction_ClearFreeList
-  PyCFunction_GetFlags=python33.PyCFunction_GetFlags
-  PyCFunction_GetFunction=python33.PyCFunction_GetFunction
-  PyCFunction_GetSelf=python33.PyCFunction_GetSelf
-  PyCFunction_NewEx=python33.PyCFunction_NewEx
-  PyCFunction_Type=python33.PyCFunction_Type DATA
-  PyCallIter_New=python33.PyCallIter_New
-  PyCallIter_Type=python33.PyCallIter_Type DATA
-  PyCallable_Check=python33.PyCallable_Check
-  PyCapsule_GetContext=python33.PyCapsule_GetContext
-  PyCapsule_GetDestructor=python33.PyCapsule_GetDestructor
-  PyCapsule_GetName=python33.PyCapsule_GetName
-  PyCapsule_GetPointer=python33.PyCapsule_GetPointer
-  PyCapsule_Import=python33.PyCapsule_Import
-  PyCapsule_IsValid=python33.PyCapsule_IsValid
-  PyCapsule_New=python33.PyCapsule_New
-  PyCapsule_SetContext=python33.PyCapsule_SetContext
-  PyCapsule_SetDestructor=python33.PyCapsule_SetDestructor
-  PyCapsule_SetName=python33.PyCapsule_SetName
-  PyCapsule_SetPointer=python33.PyCapsule_SetPointer
-  PyCapsule_Type=python33.PyCapsule_Type DATA
-  PyClassMethodDescr_Type=python33.PyClassMethodDescr_Type DATA
-  PyCodec_BackslashReplaceErrors=python33.PyCodec_BackslashReplaceErrors
-  PyCodec_Decode=python33.PyCodec_Decode
-  PyCodec_Decoder=python33.PyCodec_Decoder
-  PyCodec_Encode=python33.PyCodec_Encode
-  PyCodec_Encoder=python33.PyCodec_Encoder
-  PyCodec_IgnoreErrors=python33.PyCodec_IgnoreErrors
-  PyCodec_IncrementalDecoder=python33.PyCodec_IncrementalDecoder
-  PyCodec_IncrementalEncoder=python33.PyCodec_IncrementalEncoder
-  PyCodec_KnownEncoding=python33.PyCodec_KnownEncoding
-  PyCodec_LookupError=python33.PyCodec_LookupError
-  PyCodec_Register=python33.PyCodec_Register
-  PyCodec_RegisterError=python33.PyCodec_RegisterError
-  PyCodec_ReplaceErrors=python33.PyCodec_ReplaceErrors
-  PyCodec_StreamReader=python33.PyCodec_StreamReader
-  PyCodec_StreamWriter=python33.PyCodec_StreamWriter
-  PyCodec_StrictErrors=python33.PyCodec_StrictErrors
-  PyCodec_XMLCharRefReplaceErrors=python33.PyCodec_XMLCharRefReplaceErrors
-  PyComplex_FromDoubles=python33.PyComplex_FromDoubles
-  PyComplex_ImagAsDouble=python33.PyComplex_ImagAsDouble
-  PyComplex_RealAsDouble=python33.PyComplex_RealAsDouble
-  PyComplex_Type=python33.PyComplex_Type DATA
-  PyDescr_NewClassMethod=python33.PyDescr_NewClassMethod
-  PyDescr_NewGetSet=python33.PyDescr_NewGetSet
-  PyDescr_NewMember=python33.PyDescr_NewMember
-  PyDescr_NewMethod=python33.PyDescr_NewMethod
-  PyDictItems_Type=python33.PyDictItems_Type DATA
-  PyDictIterItem_Type=python33.PyDictIterItem_Type DATA
-  PyDictIterKey_Type=python33.PyDictIterKey_Type DATA
-  PyDictIterValue_Type=python33.PyDictIterValue_Type DATA
-  PyDictKeys_Type=python33.PyDictKeys_Type DATA
-  PyDictProxy_New=python33.PyDictProxy_New
-  PyDictProxy_Type=python33.PyDictProxy_Type DATA
-  PyDictValues_Type=python33.PyDictValues_Type DATA
-  PyDict_Clear=python33.PyDict_Clear
-  PyDict_Contains=python33.PyDict_Contains
-  PyDict_Copy=python33.PyDict_Copy
-  PyDict_DelItem=python33.PyDict_DelItem
-  PyDict_DelItemString=python33.PyDict_DelItemString
-  PyDict_GetItem=python33.PyDict_GetItem
-  PyDict_GetItemString=python33.PyDict_GetItemString
-  PyDict_GetItemWithError=python33.PyDict_GetItemWithError
-  PyDict_Items=python33.PyDict_Items
-  PyDict_Keys=python33.PyDict_Keys
-  PyDict_Merge=python33.PyDict_Merge
-  PyDict_MergeFromSeq2=python33.PyDict_MergeFromSeq2
-  PyDict_New=python33.PyDict_New
-  PyDict_Next=python33.PyDict_Next
-  PyDict_SetItem=python33.PyDict_SetItem
-  PyDict_SetItemString=python33.PyDict_SetItemString
-  PyDict_Size=python33.PyDict_Size
-  PyDict_Type=python33.PyDict_Type DATA
-  PyDict_Update=python33.PyDict_Update
-  PyDict_Values=python33.PyDict_Values
-  PyEllipsis_Type=python33.PyEllipsis_Type DATA
-  PyEnum_Type=python33.PyEnum_Type DATA
-  PyErr_BadArgument=python33.PyErr_BadArgument
-  PyErr_BadInternalCall=python33.PyErr_BadInternalCall
-  PyErr_CheckSignals=python33.PyErr_CheckSignals
-  PyErr_Clear=python33.PyErr_Clear
-  PyErr_Display=python33.PyErr_Display
-  PyErr_ExceptionMatches=python33.PyErr_ExceptionMatches
-  PyErr_Fetch=python33.PyErr_Fetch
-  PyErr_Format=python33.PyErr_Format
-  PyErr_GivenExceptionMatches=python33.PyErr_GivenExceptionMatches
-  PyErr_NewException=python33.PyErr_NewException
-  PyErr_NewExceptionWithDoc=python33.PyErr_NewExceptionWithDoc
-  PyErr_NoMemory=python33.PyErr_NoMemory
-  PyErr_NormalizeException=python33.PyErr_NormalizeException
-  PyErr_Occurred=python33.PyErr_Occurred
-  PyErr_Print=python33.PyErr_Print
-  PyErr_PrintEx=python33.PyErr_PrintEx
-  PyErr_ProgramText=python33.PyErr_ProgramText
-  PyErr_Restore=python33.PyErr_Restore
-  PyErr_SetFromErrno=python33.PyErr_SetFromErrno
-  PyErr_SetFromErrnoWithFilename=python33.PyErr_SetFromErrnoWithFilename
-  PyErr_SetFromErrnoWithFilenameObject=python33.PyErr_SetFromErrnoWithFilenameObject
-  PyErr_SetInterrupt=python33.PyErr_SetInterrupt
-  PyErr_SetNone=python33.PyErr_SetNone
-  PyErr_SetObject=python33.PyErr_SetObject
-  PyErr_SetString=python33.PyErr_SetString
-  PyErr_SyntaxLocation=python33.PyErr_SyntaxLocation
-  PyErr_WarnEx=python33.PyErr_WarnEx
-  PyErr_WarnExplicit=python33.PyErr_WarnExplicit
-  PyErr_WarnFormat=python33.PyErr_WarnFormat
-  PyErr_WriteUnraisable=python33.PyErr_WriteUnraisable
-  PyEval_AcquireLock=python33.PyEval_AcquireLock
-  PyEval_AcquireThread=python33.PyEval_AcquireThread
-  PyEval_CallFunction=python33.PyEval_CallFunction
-  PyEval_CallMethod=python33.PyEval_CallMethod
-  PyEval_CallObjectWithKeywords=python33.PyEval_CallObjectWithKeywords
-  PyEval_EvalCode=python33.PyEval_EvalCode
-  PyEval_EvalCodeEx=python33.PyEval_EvalCodeEx
-  PyEval_EvalFrame=python33.PyEval_EvalFrame
-  PyEval_EvalFrameEx=python33.PyEval_EvalFrameEx
-  PyEval_GetBuiltins=python33.PyEval_GetBuiltins
-  PyEval_GetCallStats=python33.PyEval_GetCallStats
-  PyEval_GetFrame=python33.PyEval_GetFrame
-  PyEval_GetFuncDesc=python33.PyEval_GetFuncDesc
-  PyEval_GetFuncName=python33.PyEval_GetFuncName
-  PyEval_GetGlobals=python33.PyEval_GetGlobals
-  PyEval_GetLocals=python33.PyEval_GetLocals
-  PyEval_InitThreads=python33.PyEval_InitThreads
-  PyEval_ReInitThreads=python33.PyEval_ReInitThreads
-  PyEval_ReleaseLock=python33.PyEval_ReleaseLock
-  PyEval_ReleaseThread=python33.PyEval_ReleaseThread
-  PyEval_RestoreThread=python33.PyEval_RestoreThread
-  PyEval_SaveThread=python33.PyEval_SaveThread
-  PyEval_ThreadsInitialized=python33.PyEval_ThreadsInitialized
-  PyExc_ArithmeticError=python33.PyExc_ArithmeticError DATA
-  PyExc_AssertionError=python33.PyExc_AssertionError DATA
-  PyExc_AttributeError=python33.PyExc_AttributeError DATA
-  PyExc_BaseException=python33.PyExc_BaseException DATA
-  PyExc_BufferError=python33.PyExc_BufferError DATA
-  PyExc_BytesWarning=python33.PyExc_BytesWarning DATA
-  PyExc_DeprecationWarning=python33.PyExc_DeprecationWarning DATA
-  PyExc_EOFError=python33.PyExc_EOFError DATA
-  PyExc_EnvironmentError=python33.PyExc_EnvironmentError DATA
-  PyExc_Exception=python33.PyExc_Exception DATA
-  PyExc_FloatingPointError=python33.PyExc_FloatingPointError DATA
-  PyExc_FutureWarning=python33.PyExc_FutureWarning DATA
-  PyExc_GeneratorExit=python33.PyExc_GeneratorExit DATA
-  PyExc_IOError=python33.PyExc_IOError DATA
-  PyExc_ImportError=python33.PyExc_ImportError DATA
-  PyExc_ImportWarning=python33.PyExc_ImportWarning DATA
-  PyExc_IndentationError=python33.PyExc_IndentationError DATA
-  PyExc_IndexError=python33.PyExc_IndexError DATA
-  PyExc_KeyError=python33.PyExc_KeyError DATA
-  PyExc_KeyboardInterrupt=python33.PyExc_KeyboardInterrupt DATA
-  PyExc_LookupError=python33.PyExc_LookupError DATA
-  PyExc_MemoryError=python33.PyExc_MemoryError DATA
-  PyExc_MemoryErrorInst=python33.PyExc_MemoryErrorInst DATA
-  PyExc_NameError=python33.PyExc_NameError DATA
-  PyExc_NotImplementedError=python33.PyExc_NotImplementedError DATA
-  PyExc_OSError=python33.PyExc_OSError DATA
-  PyExc_OverflowError=python33.PyExc_OverflowError DATA
-  PyExc_PendingDeprecationWarning=python33.PyExc_PendingDeprecationWarning DATA
-  PyExc_RecursionErrorInst=python33.PyExc_RecursionErrorInst DATA
-  PyExc_ReferenceError=python33.PyExc_ReferenceError DATA
-  PyExc_RuntimeError=python33.PyExc_RuntimeError DATA
-  PyExc_RuntimeWarning=python33.PyExc_RuntimeWarning DATA
-  PyExc_StopIteration=python33.PyExc_StopIteration DATA
-  PyExc_SyntaxError=python33.PyExc_SyntaxError DATA
-  PyExc_SyntaxWarning=python33.PyExc_SyntaxWarning DATA
-  PyExc_SystemError=python33.PyExc_SystemError DATA
-  PyExc_SystemExit=python33.PyExc_SystemExit DATA
-  PyExc_TabError=python33.PyExc_TabError DATA
-  PyExc_TypeError=python33.PyExc_TypeError DATA
-  PyExc_UnboundLocalError=python33.PyExc_UnboundLocalError DATA
-  PyExc_UnicodeDecodeError=python33.PyExc_UnicodeDecodeError DATA
-  PyExc_UnicodeEncodeError=python33.PyExc_UnicodeEncodeError DATA
-  PyExc_UnicodeError=python33.PyExc_UnicodeError DATA
-  PyExc_UnicodeTranslateError=python33.PyExc_UnicodeTranslateError DATA
-  PyExc_UnicodeWarning=python33.PyExc_UnicodeWarning DATA
-  PyExc_UserWarning=python33.PyExc_UserWarning DATA
-  PyExc_ValueError=python33.PyExc_ValueError DATA
-  PyExc_Warning=python33.PyExc_Warning DATA
-  PyExc_ZeroDivisionError=python33.PyExc_ZeroDivisionError DATA
-  PyException_GetCause=python33.PyException_GetCause
-  PyException_GetContext=python33.PyException_GetContext
-  PyException_GetTraceback=python33.PyException_GetTraceback
-  PyException_SetCause=python33.PyException_SetCause
-  PyException_SetContext=python33.PyException_SetContext
-  PyException_SetTraceback=python33.PyException_SetTraceback
-  PyFile_FromFd=python33.PyFile_FromFd
-  PyFile_GetLine=python33.PyFile_GetLine
-  PyFile_WriteObject=python33.PyFile_WriteObject
-  PyFile_WriteString=python33.PyFile_WriteString
-  PyFilter_Type=python33.PyFilter_Type DATA
-  PyFloat_AsDouble=python33.PyFloat_AsDouble
-  PyFloat_FromDouble=python33.PyFloat_FromDouble
-  PyFloat_FromString=python33.PyFloat_FromString
-  PyFloat_GetInfo=python33.PyFloat_GetInfo
-  PyFloat_GetMax=python33.PyFloat_GetMax
-  PyFloat_GetMin=python33.PyFloat_GetMin
-  PyFloat_Type=python33.PyFloat_Type DATA
-  PyFrozenSet_New=python33.PyFrozenSet_New
-  PyFrozenSet_Type=python33.PyFrozenSet_Type DATA
-  PyGC_Collect=python33.PyGC_Collect
-  PyGILState_Ensure=python33.PyGILState_Ensure
-  PyGILState_GetThisThreadState=python33.PyGILState_GetThisThreadState
-  PyGILState_Release=python33.PyGILState_Release
-  PyGetSetDescr_Type=python33.PyGetSetDescr_Type DATA
-  PyImport_AddModule=python33.PyImport_AddModule
-  PyImport_AppendInittab=python33.PyImport_AppendInittab
-  PyImport_Cleanup=python33.PyImport_Cleanup
-  PyImport_ExecCodeModule=python33.PyImport_ExecCodeModule
-  PyImport_ExecCodeModuleEx=python33.PyImport_ExecCodeModuleEx
-  PyImport_ExecCodeModuleWithPathnames=python33.PyImport_ExecCodeModuleWithPathnames
-  PyImport_GetImporter=python33.PyImport_GetImporter
-  PyImport_GetMagicNumber=python33.PyImport_GetMagicNumber
-  PyImport_GetMagicTag=python33.PyImport_GetMagicTag
-  PyImport_GetModuleDict=python33.PyImport_GetModuleDict
-  PyImport_Import=python33.PyImport_Import
-  PyImport_ImportFrozenModule=python33.PyImport_ImportFrozenModule
-  PyImport_ImportModule=python33.PyImport_ImportModule
-  PyImport_ImportModuleLevel=python33.PyImport_ImportModuleLevel
-  PyImport_ImportModuleNoBlock=python33.PyImport_ImportModuleNoBlock
-  PyImport_ReloadModule=python33.PyImport_ReloadModule
-  PyInterpreterState_Clear=python33.PyInterpreterState_Clear
-  PyInterpreterState_Delete=python33.PyInterpreterState_Delete
-  PyInterpreterState_New=python33.PyInterpreterState_New
-  PyIter_Next=python33.PyIter_Next
-  PyListIter_Type=python33.PyListIter_Type DATA
-  PyListRevIter_Type=python33.PyListRevIter_Type DATA
-  PyList_Append=python33.PyList_Append
-  PyList_AsTuple=python33.PyList_AsTuple
-  PyList_GetItem=python33.PyList_GetItem
-  PyList_GetSlice=python33.PyList_GetSlice
-  PyList_Insert=python33.PyList_Insert
-  PyList_New=python33.PyList_New
-  PyList_Reverse=python33.PyList_Reverse
-  PyList_SetItem=python33.PyList_SetItem
-  PyList_SetSlice=python33.PyList_SetSlice
-  PyList_Size=python33.PyList_Size
-  PyList_Sort=python33.PyList_Sort
-  PyList_Type=python33.PyList_Type DATA
-  PyLongRangeIter_Type=python33.PyLongRangeIter_Type DATA
-  PyLong_AsDouble=python33.PyLong_AsDouble
-  PyLong_AsLong=python33.PyLong_AsLong
-  PyLong_AsLongAndOverflow=python33.PyLong_AsLongAndOverflow
-  PyLong_AsLongLong=python33.PyLong_AsLongLong
-  PyLong_AsLongLongAndOverflow=python33.PyLong_AsLongLongAndOverflow
-  PyLong_AsSize_t=python33.PyLong_AsSize_t
-  PyLong_AsSsize_t=python33.PyLong_AsSsize_t
-  PyLong_AsUnsignedLong=python33.PyLong_AsUnsignedLong
-  PyLong_AsUnsignedLongLong=python33.PyLong_AsUnsignedLongLong
-  PyLong_AsUnsignedLongLongMask=python33.PyLong_AsUnsignedLongLongMask
-  PyLong_AsUnsignedLongMask=python33.PyLong_AsUnsignedLongMask
-  PyLong_AsVoidPtr=python33.PyLong_AsVoidPtr
-  PyLong_FromDouble=python33.PyLong_FromDouble
-  PyLong_FromLong=python33.PyLong_FromLong
-  PyLong_FromLongLong=python33.PyLong_FromLongLong
-  PyLong_FromSize_t=python33.PyLong_FromSize_t
-  PyLong_FromSsize_t=python33.PyLong_FromSsize_t
-  PyLong_FromString=python33.PyLong_FromString
-  PyLong_FromUnsignedLong=python33.PyLong_FromUnsignedLong
-  PyLong_FromUnsignedLongLong=python33.PyLong_FromUnsignedLongLong
-  PyLong_FromVoidPtr=python33.PyLong_FromVoidPtr
-  PyLong_GetInfo=python33.PyLong_GetInfo
-  PyLong_Type=python33.PyLong_Type DATA
-  PyMap_Type=python33.PyMap_Type DATA
-  PyMapping_Check=python33.PyMapping_Check
-  PyMapping_GetItemString=python33.PyMapping_GetItemString
-  PyMapping_HasKey=python33.PyMapping_HasKey
-  PyMapping_HasKeyString=python33.PyMapping_HasKeyString
-  PyMapping_Items=python33.PyMapping_Items
-  PyMapping_Keys=python33.PyMapping_Keys
-  PyMapping_Length=python33.PyMapping_Length
-  PyMapping_SetItemString=python33.PyMapping_SetItemString
-  PyMapping_Size=python33.PyMapping_Size
-  PyMapping_Values=python33.PyMapping_Values
-  PyMem_Free=python33.PyMem_Free
-  PyMem_Malloc=python33.PyMem_Malloc
-  PyMem_Realloc=python33.PyMem_Realloc
-  PyMemberDescr_Type=python33.PyMemberDescr_Type DATA
-  PyMemoryView_FromObject=python33.PyMemoryView_FromObject
-  PyMemoryView_GetContiguous=python33.PyMemoryView_GetContiguous
-  PyMemoryView_Type=python33.PyMemoryView_Type DATA
-  PyMethodDescr_Type=python33.PyMethodDescr_Type DATA
-  PyModule_AddIntConstant=python33.PyModule_AddIntConstant
-  PyModule_AddObject=python33.PyModule_AddObject
-  PyModule_AddStringConstant=python33.PyModule_AddStringConstant
-  PyModule_Create2=python33.PyModule_Create2
-  PyModule_GetDef=python33.PyModule_GetDef
-  PyModule_GetDict=python33.PyModule_GetDict
-  PyModule_GetFilename=python33.PyModule_GetFilename
-  PyModule_GetFilenameObject=python33.PyModule_GetFilenameObject
-  PyModule_GetName=python33.PyModule_GetName
-  PyModule_GetState=python33.PyModule_GetState
-  PyModule_New=python33.PyModule_New
-  PyModule_Type=python33.PyModule_Type DATA
-  PyNullImporter_Type=python33.PyNullImporter_Type DATA
-  PyNumber_Absolute=python33.PyNumber_Absolute
-  PyNumber_Add=python33.PyNumber_Add
-  PyNumber_And=python33.PyNumber_And
-  PyNumber_AsSsize_t=python33.PyNumber_AsSsize_t
-  PyNumber_Check=python33.PyNumber_Check
-  PyNumber_Divmod=python33.PyNumber_Divmod
-  PyNumber_Float=python33.PyNumber_Float
-  PyNumber_FloorDivide=python33.PyNumber_FloorDivide
-  PyNumber_InPlaceAdd=python33.PyNumber_InPlaceAdd
-  PyNumber_InPlaceAnd=python33.PyNumber_InPlaceAnd
-  PyNumber_InPlaceFloorDivide=python33.PyNumber_InPlaceFloorDivide
-  PyNumber_InPlaceLshift=python33.PyNumber_InPlaceLshift
-  PyNumber_InPlaceMultiply=python33.PyNumber_InPlaceMultiply
-  PyNumber_InPlaceOr=python33.PyNumber_InPlaceOr
-  PyNumber_InPlacePower=python33.PyNumber_InPlacePower
-  PyNumber_InPlaceRemainder=python33.PyNumber_InPlaceRemainder
-  PyNumber_InPlaceRshift=python33.PyNumber_InPlaceRshift
-  PyNumber_InPlaceSubtract=python33.PyNumber_InPlaceSubtract
-  PyNumber_InPlaceTrueDivide=python33.PyNumber_InPlaceTrueDivide
-  PyNumber_InPlaceXor=python33.PyNumber_InPlaceXor
-  PyNumber_Index=python33.PyNumber_Index
-  PyNumber_Invert=python33.PyNumber_Invert
-  PyNumber_Long=python33.PyNumber_Long
-  PyNumber_Lshift=python33.PyNumber_Lshift
-  PyNumber_Multiply=python33.PyNumber_Multiply
-  PyNumber_Negative=python33.PyNumber_Negative
-  PyNumber_Or=python33.PyNumber_Or
-  PyNumber_Positive=python33.PyNumber_Positive
-  PyNumber_Power=python33.PyNumber_Power
-  PyNumber_Remainder=python33.PyNumber_Remainder
-  PyNumber_Rshift=python33.PyNumber_Rshift
-  PyNumber_Subtract=python33.PyNumber_Subtract
-  PyNumber_ToBase=python33.PyNumber_ToBase
-  PyNumber_TrueDivide=python33.PyNumber_TrueDivide
-  PyNumber_Xor=python33.PyNumber_Xor
-  PyOS_AfterFork=python33.PyOS_AfterFork
-  PyOS_InitInterrupts=python33.PyOS_InitInterrupts
-  PyOS_InputHook=python33.PyOS_InputHook DATA
-  PyOS_InterruptOccurred=python33.PyOS_InterruptOccurred
-  PyOS_ReadlineFunctionPointer=python33.PyOS_ReadlineFunctionPointer DATA
-  PyOS_double_to_string=python33.PyOS_double_to_string
-  PyOS_getsig=python33.PyOS_getsig
-  PyOS_mystricmp=python33.PyOS_mystricmp
-  PyOS_mystrnicmp=python33.PyOS_mystrnicmp
-  PyOS_setsig=python33.PyOS_setsig
-  PyOS_snprintf=python33.PyOS_snprintf
-  PyOS_string_to_double=python33.PyOS_string_to_double
-  PyOS_strtol=python33.PyOS_strtol
-  PyOS_strtoul=python33.PyOS_strtoul
-  PyOS_vsnprintf=python33.PyOS_vsnprintf
-  PyObject_ASCII=python33.PyObject_ASCII
-  PyObject_AsCharBuffer=python33.PyObject_AsCharBuffer
-  PyObject_AsFileDescriptor=python33.PyObject_AsFileDescriptor
-  PyObject_AsReadBuffer=python33.PyObject_AsReadBuffer
-  PyObject_AsWriteBuffer=python33.PyObject_AsWriteBuffer
-  PyObject_Bytes=python33.PyObject_Bytes
-  PyObject_Call=python33.PyObject_Call
-  PyObject_CallFunction=python33.PyObject_CallFunction
-  PyObject_CallFunctionObjArgs=python33.PyObject_CallFunctionObjArgs
-  PyObject_CallMethod=python33.PyObject_CallMethod
-  PyObject_CallMethodObjArgs=python33.PyObject_CallMethodObjArgs
-  PyObject_CallObject=python33.PyObject_CallObject
-  PyObject_CheckReadBuffer=python33.PyObject_CheckReadBuffer
-  PyObject_ClearWeakRefs=python33.PyObject_ClearWeakRefs
-  PyObject_DelItem=python33.PyObject_DelItem
-  PyObject_DelItemString=python33.PyObject_DelItemString
-  PyObject_Dir=python33.PyObject_Dir
-  PyObject_Format=python33.PyObject_Format
-  PyObject_Free=python33.PyObject_Free
-  PyObject_GC_Del=python33.PyObject_GC_Del
-  PyObject_GC_Track=python33.PyObject_GC_Track
-  PyObject_GC_UnTrack=python33.PyObject_GC_UnTrack
-  PyObject_GenericGetAttr=python33.PyObject_GenericGetAttr
-  PyObject_GenericSetAttr=python33.PyObject_GenericSetAttr
-  PyObject_GetAttr=python33.PyObject_GetAttr
-  PyObject_GetAttrString=python33.PyObject_GetAttrString
-  PyObject_GetItem=python33.PyObject_GetItem
-  PyObject_GetIter=python33.PyObject_GetIter
-  PyObject_HasAttr=python33.PyObject_HasAttr
-  PyObject_HasAttrString=python33.PyObject_HasAttrString
-  PyObject_Hash=python33.PyObject_Hash
-  PyObject_HashNotImplemented=python33.PyObject_HashNotImplemented
-  PyObject_Init=python33.PyObject_Init
-  PyObject_InitVar=python33.PyObject_InitVar
-  PyObject_IsInstance=python33.PyObject_IsInstance
-  PyObject_IsSubclass=python33.PyObject_IsSubclass
-  PyObject_IsTrue=python33.PyObject_IsTrue
-  PyObject_Length=python33.PyObject_Length
-  PyObject_Malloc=python33.PyObject_Malloc
-  PyObject_Not=python33.PyObject_Not
-  PyObject_Realloc=python33.PyObject_Realloc
-  PyObject_Repr=python33.PyObject_Repr
-  PyObject_RichCompare=python33.PyObject_RichCompare
-  PyObject_RichCompareBool=python33.PyObject_RichCompareBool
-  PyObject_SelfIter=python33.PyObject_SelfIter
-  PyObject_SetAttr=python33.PyObject_SetAttr
-  PyObject_SetAttrString=python33.PyObject_SetAttrString
-  PyObject_SetItem=python33.PyObject_SetItem
-  PyObject_Size=python33.PyObject_Size
-  PyObject_Str=python33.PyObject_Str
-  PyObject_Type=python33.PyObject_Type DATA
-  PyParser_SimpleParseFileFlags=python33.PyParser_SimpleParseFileFlags
-  PyParser_SimpleParseStringFlags=python33.PyParser_SimpleParseStringFlags
-  PyProperty_Type=python33.PyProperty_Type DATA
-  PyRangeIter_Type=python33.PyRangeIter_Type DATA
-  PyRange_Type=python33.PyRange_Type DATA
-  PyReversed_Type=python33.PyReversed_Type DATA
-  PySeqIter_New=python33.PySeqIter_New
-  PySeqIter_Type=python33.PySeqIter_Type DATA
-  PySequence_Check=python33.PySequence_Check
-  PySequence_Concat=python33.PySequence_Concat
-  PySequence_Contains=python33.PySequence_Contains
-  PySequence_Count=python33.PySequence_Count
-  PySequence_DelItem=python33.PySequence_DelItem
-  PySequence_DelSlice=python33.PySequence_DelSlice
-  PySequence_Fast=python33.PySequence_Fast
-  PySequence_GetItem=python33.PySequence_GetItem
-  PySequence_GetSlice=python33.PySequence_GetSlice
-  PySequence_In=python33.PySequence_In
-  PySequence_InPlaceConcat=python33.PySequence_InPlaceConcat
-  PySequence_InPlaceRepeat=python33.PySequence_InPlaceRepeat
-  PySequence_Index=python33.PySequence_Index
-  PySequence_Length=python33.PySequence_Length
-  PySequence_List=python33.PySequence_List
-  PySequence_Repeat=python33.PySequence_Repeat
-  PySequence_SetItem=python33.PySequence_SetItem
-  PySequence_SetSlice=python33.PySequence_SetSlice
-  PySequence_Size=python33.PySequence_Size
-  PySequence_Tuple=python33.PySequence_Tuple
-  PySetIter_Type=python33.PySetIter_Type DATA
-  PySet_Add=python33.PySet_Add
-  PySet_Clear=python33.PySet_Clear
-  PySet_Contains=python33.PySet_Contains
-  PySet_Discard=python33.PySet_Discard
-  PySet_New=python33.PySet_New
-  PySet_Pop=python33.PySet_Pop
-  PySet_Size=python33.PySet_Size
-  PySet_Type=python33.PySet_Type DATA
-  PySlice_GetIndices=python33.PySlice_GetIndices
-  PySlice_GetIndicesEx=python33.PySlice_GetIndicesEx
-  PySlice_New=python33.PySlice_New
-  PySlice_Type=python33.PySlice_Type DATA
-  PySortWrapper_Type=python33.PySortWrapper_Type DATA
-  PyState_FindModule=python33.PyState_FindModule
-  PyState_AddModule=python33.PyState_AddModule
-  PyState_RemoveModule=python33.PyState_RemoveModule
-  PyStructSequence_GetItem=python33.PyStructSequence_GetItem
-  PyStructSequence_New=python33.PyStructSequence_New
-  PyStructSequence_NewType=python33.PyStructSequence_NewType
-  PyStructSequence_SetItem=python33.PyStructSequence_SetItem
-  PySuper_Type=python33.PySuper_Type DATA
-  PySys_AddWarnOption=python33.PySys_AddWarnOption
-  PySys_AddWarnOptionUnicode=python33.PySys_AddWarnOptionUnicode
-  PySys_FormatStderr=python33.PySys_FormatStderr
-  PySys_FormatStdout=python33.PySys_FormatStdout
-  PySys_GetObject=python33.PySys_GetObject
-  PySys_HasWarnOptions=python33.PySys_HasWarnOptions
-  PySys_ResetWarnOptions=python33.PySys_ResetWarnOptions
-  PySys_SetArgv=python33.PySys_SetArgv
-  PySys_SetArgvEx=python33.PySys_SetArgvEx
-  PySys_SetObject=python33.PySys_SetObject
-  PySys_SetPath=python33.PySys_SetPath
-  PySys_WriteStderr=python33.PySys_WriteStderr
-  PySys_WriteStdout=python33.PySys_WriteStdout
-  PyThreadState_Clear=python33.PyThreadState_Clear
-  PyThreadState_Delete=python33.PyThreadState_Delete
-  PyThreadState_DeleteCurrent=python33.PyThreadState_DeleteCurrent
-  PyThreadState_Get=python33.PyThreadState_Get
-  PyThreadState_GetDict=python33.PyThreadState_GetDict
-  PyThreadState_New=python33.PyThreadState_New
-  PyThreadState_SetAsyncExc=python33.PyThreadState_SetAsyncExc
-  PyThreadState_Swap=python33.PyThreadState_Swap
-  PyTraceBack_Here=python33.PyTraceBack_Here
-  PyTraceBack_Print=python33.PyTraceBack_Print
-  PyTraceBack_Type=python33.PyTraceBack_Type DATA
-  PyTupleIter_Type=python33.PyTupleIter_Type DATA
-  PyTuple_ClearFreeList=python33.PyTuple_ClearFreeList
-  PyTuple_GetItem=python33.PyTuple_GetItem
-  PyTuple_GetSlice=python33.PyTuple_GetSlice
-  PyTuple_New=python33.PyTuple_New
-  PyTuple_Pack=python33.PyTuple_Pack
-  PyTuple_SetItem=python33.PyTuple_SetItem
-  PyTuple_Size=python33.PyTuple_Size
-  PyTuple_Type=python33.PyTuple_Type DATA
-  PyType_ClearCache=python33.PyType_ClearCache
-  PyType_FromSpec=python33.PyType_FromSpec
-  PyType_FromSpecWithBases=python33.PyType_FromSpecWithBases
-  PyType_GenericAlloc=python33.PyType_GenericAlloc
-  PyType_GenericNew=python33.PyType_GenericNew
-  PyType_GetFlags=python33.PyType_GetFlags
-  PyType_IsSubtype=python33.PyType_IsSubtype
-  PyType_Modified=python33.PyType_Modified
-  PyType_Ready=python33.PyType_Ready
-  PyType_Type=python33.PyType_Type DATA
-  PyUnicodeDecodeError_Create=python33.PyUnicodeDecodeError_Create
-  PyUnicodeDecodeError_GetEncoding=python33.PyUnicodeDecodeError_GetEncoding
-  PyUnicodeDecodeError_GetEnd=python33.PyUnicodeDecodeError_GetEnd
-  PyUnicodeDecodeError_GetObject=python33.PyUnicodeDecodeError_GetObject
-  PyUnicodeDecodeError_GetReason=python33.PyUnicodeDecodeError_GetReason
-  PyUnicodeDecodeError_GetStart=python33.PyUnicodeDecodeError_GetStart
-  PyUnicodeDecodeError_SetEnd=python33.PyUnicodeDecodeError_SetEnd
-  PyUnicodeDecodeError_SetReason=python33.PyUnicodeDecodeError_SetReason
-  PyUnicodeDecodeError_SetStart=python33.PyUnicodeDecodeError_SetStart
-  PyUnicodeEncodeError_GetEncoding=python33.PyUnicodeEncodeError_GetEncoding
-  PyUnicodeEncodeError_GetEnd=python33.PyUnicodeEncodeError_GetEnd
-  PyUnicodeEncodeError_GetObject=python33.PyUnicodeEncodeError_GetObject
-  PyUnicodeEncodeError_GetReason=python33.PyUnicodeEncodeError_GetReason
-  PyUnicodeEncodeError_GetStart=python33.PyUnicodeEncodeError_GetStart
-  PyUnicodeEncodeError_SetEnd=python33.PyUnicodeEncodeError_SetEnd
-  PyUnicodeEncodeError_SetReason=python33.PyUnicodeEncodeError_SetReason
-  PyUnicodeEncodeError_SetStart=python33.PyUnicodeEncodeError_SetStart
-  PyUnicodeIter_Type=python33.PyUnicodeIter_Type DATA
-  PyUnicodeTranslateError_GetEnd=python33.PyUnicodeTranslateError_GetEnd
-  PyUnicodeTranslateError_GetObject=python33.PyUnicodeTranslateError_GetObject
-  PyUnicodeTranslateError_GetReason=python33.PyUnicodeTranslateError_GetReason
-  PyUnicodeTranslateError_GetStart=python33.PyUnicodeTranslateError_GetStart
-  PyUnicodeTranslateError_SetEnd=python33.PyUnicodeTranslateError_SetEnd
-  PyUnicodeTranslateError_SetReason=python33.PyUnicodeTranslateError_SetReason
-  PyUnicodeTranslateError_SetStart=python33.PyUnicodeTranslateError_SetStart
-  PyUnicode_Append=python33.PyUnicodeUCS2_Append
-  PyUnicode_AppendAndDel=python33.PyUnicodeUCS2_AppendAndDel
-  PyUnicode_AsASCIIString=python33.PyUnicodeUCS2_AsASCIIString
-  PyUnicode_AsCharmapString=python33.PyUnicodeUCS2_AsCharmapString
-  PyUnicode_AsDecodedObject=python33.PyUnicodeUCS2_AsDecodedObject
-  PyUnicode_AsDecodedUnicode=python33.PyUnicodeUCS2_AsDecodedUnicode
-  PyUnicode_AsEncodedObject=python33.PyUnicodeUCS2_AsEncodedObject
-  PyUnicode_AsEncodedString=python33.PyUnicodeUCS2_AsEncodedString
-  PyUnicode_AsEncodedUnicode=python33.PyUnicodeUCS2_AsEncodedUnicode
-  PyUnicode_AsLatin1String=python33.PyUnicodeUCS2_AsLatin1String
-  PyUnicode_AsRawUnicodeEscapeString=python33.PyUnicodeUCS2_AsRawUnicodeEscapeString
-  PyUnicode_AsUTF16String=python33.PyUnicodeUCS2_AsUTF16String
-  PyUnicode_AsUTF32String=python33.PyUnicodeUCS2_AsUTF32String
-  PyUnicode_AsUTF8String=python33.PyUnicodeUCS2_AsUTF8String
-  PyUnicode_AsUnicodeEscapeString=python33.PyUnicodeUCS2_AsUnicodeEscapeString
-  PyUnicode_AsWideChar=python33.PyUnicodeUCS2_AsWideChar
-  PyUnicode_ClearFreelist=python33.PyUnicodeUCS2_ClearFreelist
-  PyUnicode_Compare=python33.PyUnicodeUCS2_Compare
-  PyUnicode_Concat=python33.PyUnicodeUCS2_Concat
-  PyUnicode_Contains=python33.PyUnicodeUCS2_Contains
-  PyUnicode_Count=python33.PyUnicodeUCS2_Count
-  PyUnicode_Decode=python33.PyUnicodeUCS2_Decode
-  PyUnicode_DecodeASCII=python33.PyUnicodeUCS2_DecodeASCII
-  PyUnicode_DecodeCharmap=python33.PyUnicodeUCS2_DecodeCharmap
-  PyUnicode_DecodeFSDefault=python33.PyUnicodeUCS2_DecodeFSDefault
-  PyUnicode_DecodeFSDefaultAndSize=python33.PyUnicodeUCS2_DecodeFSDefaultAndSize
-  PyUnicode_DecodeLatin1=python33.PyUnicodeUCS2_DecodeLatin1
-  PyUnicode_DecodeRawUnicodeEscape=python33.PyUnicodeUCS2_DecodeRawUnicodeEscape
-  PyUnicode_DecodeUTF16=python33.PyUnicodeUCS2_DecodeUTF16
-  PyUnicode_DecodeUTF16Stateful=python33.PyUnicodeUCS2_DecodeUTF16Stateful
-  PyUnicode_DecodeUTF32=python33.PyUnicodeUCS2_DecodeUTF32
-  PyUnicode_DecodeUTF32Stateful=python33.PyUnicodeUCS2_DecodeUTF32Stateful
-  PyUnicode_DecodeUTF8=python33.PyUnicodeUCS2_DecodeUTF8
-  PyUnicode_DecodeUTF8Stateful=python33.PyUnicodeUCS2_DecodeUTF8Stateful
-  PyUnicode_DecodeUnicodeEscape=python33.PyUnicodeUCS2_DecodeUnicodeEscape
-  PyUnicode_FSConverter=python33.PyUnicodeUCS2_FSConverter
-  PyUnicode_FSDecoder=python33.PyUnicodeUCS2_FSDecoder
-  PyUnicode_Find=python33.PyUnicodeUCS2_Find
-  PyUnicode_Format=python33.PyUnicodeUCS2_Format
-  PyUnicode_FromEncodedObject=python33.PyUnicodeUCS2_FromEncodedObject
-  PyUnicode_FromFormat=python33.PyUnicodeUCS2_FromFormat
-  PyUnicode_FromFormatV=python33.PyUnicodeUCS2_FromFormatV
-  PyUnicode_FromObject=python33.PyUnicodeUCS2_FromObject
-  PyUnicode_FromOrdinal=python33.PyUnicodeUCS2_FromOrdinal
-  PyUnicode_FromString=python33.PyUnicodeUCS2_FromString
-  PyUnicode_FromStringAndSize=python33.PyUnicodeUCS2_FromStringAndSize
-  PyUnicode_FromWideChar=python33.PyUnicodeUCS2_FromWideChar
-  PyUnicode_GetDefaultEncoding=python33.PyUnicodeUCS2_GetDefaultEncoding
-  PyUnicode_GetSize=python33.PyUnicodeUCS2_GetSize
-  PyUnicode_IsIdentifier=python33.PyUnicodeUCS2_IsIdentifier
-  PyUnicode_Join=python33.PyUnicodeUCS2_Join
-  PyUnicode_Partition=python33.PyUnicodeUCS2_Partition
-  PyUnicode_RPartition=python33.PyUnicodeUCS2_RPartition
-  PyUnicode_RSplit=python33.PyUnicodeUCS2_RSplit
-  PyUnicode_Replace=python33.PyUnicodeUCS2_Replace
-  PyUnicode_Resize=python33.PyUnicodeUCS2_Resize
-  PyUnicode_RichCompare=python33.PyUnicodeUCS2_RichCompare
-  PyUnicode_SetDefaultEncoding=python33.PyUnicodeUCS2_SetDefaultEncoding
-  PyUnicode_Split=python33.PyUnicodeUCS2_Split
-  PyUnicode_Splitlines=python33.PyUnicodeUCS2_Splitlines
-  PyUnicode_Tailmatch=python33.PyUnicodeUCS2_Tailmatch
-  PyUnicode_Translate=python33.PyUnicodeUCS2_Translate
-  PyUnicode_BuildEncodingMap=python33.PyUnicode_BuildEncodingMap
-  PyUnicode_CompareWithASCIIString=python33.PyUnicode_CompareWithASCIIString
-  PyUnicode_DecodeUTF7=python33.PyUnicode_DecodeUTF7
-  PyUnicode_DecodeUTF7Stateful=python33.PyUnicode_DecodeUTF7Stateful
-  PyUnicode_EncodeFSDefault=python33.PyUnicode_EncodeFSDefault
-  PyUnicode_InternFromString=python33.PyUnicode_InternFromString
-  PyUnicode_InternImmortal=python33.PyUnicode_InternImmortal
-  PyUnicode_InternInPlace=python33.PyUnicode_InternInPlace
-  PyUnicode_Type=python33.PyUnicode_Type DATA
-  PyWeakref_GetObject=python33.PyWeakref_GetObject DATA
-  PyWeakref_NewProxy=python33.PyWeakref_NewProxy
-  PyWeakref_NewRef=python33.PyWeakref_NewRef
-  PyWrapperDescr_Type=python33.PyWrapperDescr_Type DATA
-  PyWrapper_New=python33.PyWrapper_New
-  PyZip_Type=python33.PyZip_Type DATA
-  Py_AddPendingCall=python33.Py_AddPendingCall
-  Py_AtExit=python33.Py_AtExit
-  Py_BuildValue=python33.Py_BuildValue
-  Py_CompileString=python33.Py_CompileString
-  Py_DecRef=python33.Py_DecRef
-  Py_EndInterpreter=python33.Py_EndInterpreter
-  Py_Exit=python33.Py_Exit
-  Py_FatalError=python33.Py_FatalError
-  Py_FileSystemDefaultEncoding=python33.Py_FileSystemDefaultEncoding DATA
-  Py_Finalize=python33.Py_Finalize
-  Py_GetBuildInfo=python33.Py_GetBuildInfo
-  Py_GetCompiler=python33.Py_GetCompiler
-  Py_GetCopyright=python33.Py_GetCopyright
-  Py_GetExecPrefix=python33.Py_GetExecPrefix
-  Py_GetPath=python33.Py_GetPath
-  Py_GetPlatform=python33.Py_GetPlatform
-  Py_GetPrefix=python33.Py_GetPrefix
-  Py_GetProgramFullPath=python33.Py_GetProgramFullPath
-  Py_GetProgramName=python33.Py_GetProgramName
-  Py_GetPythonHome=python33.Py_GetPythonHome
-  Py_GetRecursionLimit=python33.Py_GetRecursionLimit
-  Py_GetVersion=python33.Py_GetVersion
-  Py_HasFileSystemDefaultEncoding=python33.Py_HasFileSystemDefaultEncoding DATA
-  Py_IncRef=python33.Py_IncRef
-  Py_Initialize=python33.Py_Initialize
-  Py_InitializeEx=python33.Py_InitializeEx
-  Py_IsInitialized=python33.Py_IsInitialized
-  Py_Main=python33.Py_Main
-  Py_MakePendingCalls=python33.Py_MakePendingCalls
-  Py_NewInterpreter=python33.Py_NewInterpreter
-  Py_ReprEnter=python33.Py_ReprEnter
-  Py_ReprLeave=python33.Py_ReprLeave
-  Py_SetProgramName=python33.Py_SetProgramName
-  Py_SetPythonHome=python33.Py_SetPythonHome
-  Py_SetRecursionLimit=python33.Py_SetRecursionLimit
-  Py_SymtableString=python33.Py_SymtableString
-  Py_VaBuildValue=python33.Py_VaBuildValue
-  _PyErr_BadInternalCall=python33._PyErr_BadInternalCall
-  _PyObject_CallFunction_SizeT=python33._PyObject_CallFunction_SizeT
-  _PyObject_CallMethod_SizeT=python33._PyObject_CallMethod_SizeT
-  _PyObject_GC_Malloc=python33._PyObject_GC_Malloc
-  _PyObject_GC_New=python33._PyObject_GC_New
-  _PyObject_GC_NewVar=python33._PyObject_GC_NewVar
-  _PyObject_GC_Resize=python33._PyObject_GC_Resize
-  _PyObject_New=python33._PyObject_New
-  _PyObject_NewVar=python33._PyObject_NewVar
-  _PyState_AddModule=python33._PyState_AddModule
-  _PyThreadState_Init=python33._PyThreadState_Init
-  _PyThreadState_Prealloc=python33._PyThreadState_Prealloc
-  _PyTrash_delete_later=python33._PyTrash_delete_later DATA
-  _PyTrash_delete_nesting=python33._PyTrash_delete_nesting DATA
-  _PyTrash_deposit_object=python33._PyTrash_deposit_object
-  _PyTrash_destroy_chain=python33._PyTrash_destroy_chain
-  _PyWeakref_CallableProxyType=python33._PyWeakref_CallableProxyType DATA
-  _PyWeakref_ProxyType=python33._PyWeakref_ProxyType DATA
-  _PyWeakref_RefType=python33._PyWeakref_RefType DATA
-  _Py_BuildValue_SizeT=python33._Py_BuildValue_SizeT
-  _Py_CheckRecursionLimit=python33._Py_CheckRecursionLimit DATA
-  _Py_CheckRecursiveCall=python33._Py_CheckRecursiveCall
-  _Py_Dealloc=python33._Py_Dealloc
-  _Py_EllipsisObject=python33._Py_EllipsisObject DATA
-  _Py_FalseStruct=python33._Py_FalseStruct DATA
-  _Py_NoneStruct=python33._Py_NoneStruct DATA
-  _Py_NotImplementedStruct=python33._Py_NotImplementedStruct DATA
-  _Py_SwappedOp=python33._Py_SwappedOp DATA
-  _Py_TrueStruct=python33._Py_TrueStruct DATA
-  _Py_VaBuildValue_SizeT=python33._Py_VaBuildValue_SizeT
-  _PyArg_Parse_SizeT=python33._PyArg_Parse_SizeT
-  _PyArg_ParseTuple_SizeT=python33._PyArg_ParseTuple_SizeT
-  _PyArg_ParseTupleAndKeywords_SizeT=python33._PyArg_ParseTupleAndKeywords_SizeT
-  _PyArg_VaParse_SizeT=python33._PyArg_VaParse_SizeT
-  _PyArg_VaParseTupleAndKeywords_SizeT=python33._PyArg_VaParseTupleAndKeywords_SizeT
-  _Py_BuildValue_SizeT=python33._Py_BuildValue_SizeT
+  PyArg_Parse=python34.PyArg_Parse
+  PyArg_ParseTuple=python34.PyArg_ParseTuple
+  PyArg_ParseTupleAndKeywords=python34.PyArg_ParseTupleAndKeywords
+  PyArg_UnpackTuple=python34.PyArg_UnpackTuple
+  PyArg_VaParse=python34.PyArg_VaParse
+  PyArg_VaParseTupleAndKeywords=python34.PyArg_VaParseTupleAndKeywords
+  PyArg_ValidateKeywordArguments=python34.PyArg_ValidateKeywordArguments
+  PyBaseObject_Type=python34.PyBaseObject_Type DATA
+  PyBool_FromLong=python34.PyBool_FromLong
+  PyBool_Type=python34.PyBool_Type DATA
+  PyByteArrayIter_Type=python34.PyByteArrayIter_Type DATA
+  PyByteArray_AsString=python34.PyByteArray_AsString
+  PyByteArray_Concat=python34.PyByteArray_Concat
+  PyByteArray_FromObject=python34.PyByteArray_FromObject
+  PyByteArray_FromStringAndSize=python34.PyByteArray_FromStringAndSize
+  PyByteArray_Resize=python34.PyByteArray_Resize
+  PyByteArray_Size=python34.PyByteArray_Size
+  PyByteArray_Type=python34.PyByteArray_Type DATA
+  PyBytesIter_Type=python34.PyBytesIter_Type DATA
+  PyBytes_AsString=python34.PyBytes_AsString
+  PyBytes_AsStringAndSize=python34.PyBytes_AsStringAndSize
+  PyBytes_Concat=python34.PyBytes_Concat
+  PyBytes_ConcatAndDel=python34.PyBytes_ConcatAndDel
+  PyBytes_DecodeEscape=python34.PyBytes_DecodeEscape
+  PyBytes_FromFormat=python34.PyBytes_FromFormat
+  PyBytes_FromFormatV=python34.PyBytes_FromFormatV
+  PyBytes_FromObject=python34.PyBytes_FromObject
+  PyBytes_FromString=python34.PyBytes_FromString
+  PyBytes_FromStringAndSize=python34.PyBytes_FromStringAndSize
+  PyBytes_Repr=python34.PyBytes_Repr
+  PyBytes_Size=python34.PyBytes_Size
+  PyBytes_Type=python34.PyBytes_Type DATA
+  PyCFunction_Call=python34.PyCFunction_Call
+  PyCFunction_ClearFreeList=python34.PyCFunction_ClearFreeList
+  PyCFunction_GetFlags=python34.PyCFunction_GetFlags
+  PyCFunction_GetFunction=python34.PyCFunction_GetFunction
+  PyCFunction_GetSelf=python34.PyCFunction_GetSelf
+  PyCFunction_NewEx=python34.PyCFunction_NewEx
+  PyCFunction_Type=python34.PyCFunction_Type DATA
+  PyCallIter_New=python34.PyCallIter_New
+  PyCallIter_Type=python34.PyCallIter_Type DATA
+  PyCallable_Check=python34.PyCallable_Check
+  PyCapsule_GetContext=python34.PyCapsule_GetContext
+  PyCapsule_GetDestructor=python34.PyCapsule_GetDestructor
+  PyCapsule_GetName=python34.PyCapsule_GetName
+  PyCapsule_GetPointer=python34.PyCapsule_GetPointer
+  PyCapsule_Import=python34.PyCapsule_Import
+  PyCapsule_IsValid=python34.PyCapsule_IsValid
+  PyCapsule_New=python34.PyCapsule_New
+  PyCapsule_SetContext=python34.PyCapsule_SetContext
+  PyCapsule_SetDestructor=python34.PyCapsule_SetDestructor
+  PyCapsule_SetName=python34.PyCapsule_SetName
+  PyCapsule_SetPointer=python34.PyCapsule_SetPointer
+  PyCapsule_Type=python34.PyCapsule_Type DATA
+  PyClassMethodDescr_Type=python34.PyClassMethodDescr_Type DATA
+  PyCodec_BackslashReplaceErrors=python34.PyCodec_BackslashReplaceErrors
+  PyCodec_Decode=python34.PyCodec_Decode
+  PyCodec_Decoder=python34.PyCodec_Decoder
+  PyCodec_Encode=python34.PyCodec_Encode
+  PyCodec_Encoder=python34.PyCodec_Encoder
+  PyCodec_IgnoreErrors=python34.PyCodec_IgnoreErrors
+  PyCodec_IncrementalDecoder=python34.PyCodec_IncrementalDecoder
+  PyCodec_IncrementalEncoder=python34.PyCodec_IncrementalEncoder
+  PyCodec_KnownEncoding=python34.PyCodec_KnownEncoding
+  PyCodec_LookupError=python34.PyCodec_LookupError
+  PyCodec_Register=python34.PyCodec_Register
+  PyCodec_RegisterError=python34.PyCodec_RegisterError
+  PyCodec_ReplaceErrors=python34.PyCodec_ReplaceErrors
+  PyCodec_StreamReader=python34.PyCodec_StreamReader
+  PyCodec_StreamWriter=python34.PyCodec_StreamWriter
+  PyCodec_StrictErrors=python34.PyCodec_StrictErrors
+  PyCodec_XMLCharRefReplaceErrors=python34.PyCodec_XMLCharRefReplaceErrors
+  PyComplex_FromDoubles=python34.PyComplex_FromDoubles
+  PyComplex_ImagAsDouble=python34.PyComplex_ImagAsDouble
+  PyComplex_RealAsDouble=python34.PyComplex_RealAsDouble
+  PyComplex_Type=python34.PyComplex_Type DATA
+  PyDescr_NewClassMethod=python34.PyDescr_NewClassMethod
+  PyDescr_NewGetSet=python34.PyDescr_NewGetSet
+  PyDescr_NewMember=python34.PyDescr_NewMember
+  PyDescr_NewMethod=python34.PyDescr_NewMethod
+  PyDictItems_Type=python34.PyDictItems_Type DATA
+  PyDictIterItem_Type=python34.PyDictIterItem_Type DATA
+  PyDictIterKey_Type=python34.PyDictIterKey_Type DATA
+  PyDictIterValue_Type=python34.PyDictIterValue_Type DATA
+  PyDictKeys_Type=python34.PyDictKeys_Type DATA
+  PyDictProxy_New=python34.PyDictProxy_New
+  PyDictProxy_Type=python34.PyDictProxy_Type DATA
+  PyDictValues_Type=python34.PyDictValues_Type DATA
+  PyDict_Clear=python34.PyDict_Clear
+  PyDict_Contains=python34.PyDict_Contains
+  PyDict_Copy=python34.PyDict_Copy
+  PyDict_DelItem=python34.PyDict_DelItem
+  PyDict_DelItemString=python34.PyDict_DelItemString
+  PyDict_GetItem=python34.PyDict_GetItem
+  PyDict_GetItemString=python34.PyDict_GetItemString
+  PyDict_GetItemWithError=python34.PyDict_GetItemWithError
+  PyDict_Items=python34.PyDict_Items
+  PyDict_Keys=python34.PyDict_Keys
+  PyDict_Merge=python34.PyDict_Merge
+  PyDict_MergeFromSeq2=python34.PyDict_MergeFromSeq2
+  PyDict_New=python34.PyDict_New
+  PyDict_Next=python34.PyDict_Next
+  PyDict_SetItem=python34.PyDict_SetItem
+  PyDict_SetItemString=python34.PyDict_SetItemString
+  PyDict_Size=python34.PyDict_Size
+  PyDict_Type=python34.PyDict_Type DATA
+  PyDict_Update=python34.PyDict_Update
+  PyDict_Values=python34.PyDict_Values
+  PyEllipsis_Type=python34.PyEllipsis_Type DATA
+  PyEnum_Type=python34.PyEnum_Type DATA
+  PyErr_BadArgument=python34.PyErr_BadArgument
+  PyErr_BadInternalCall=python34.PyErr_BadInternalCall
+  PyErr_CheckSignals=python34.PyErr_CheckSignals
+  PyErr_Clear=python34.PyErr_Clear
+  PyErr_Display=python34.PyErr_Display
+  PyErr_ExceptionMatches=python34.PyErr_ExceptionMatches
+  PyErr_Fetch=python34.PyErr_Fetch
+  PyErr_Format=python34.PyErr_Format
+  PyErr_GivenExceptionMatches=python34.PyErr_GivenExceptionMatches
+  PyErr_NewException=python34.PyErr_NewException
+  PyErr_NewExceptionWithDoc=python34.PyErr_NewExceptionWithDoc
+  PyErr_NoMemory=python34.PyErr_NoMemory
+  PyErr_NormalizeException=python34.PyErr_NormalizeException
+  PyErr_Occurred=python34.PyErr_Occurred
+  PyErr_Print=python34.PyErr_Print
+  PyErr_PrintEx=python34.PyErr_PrintEx
+  PyErr_ProgramText=python34.PyErr_ProgramText
+  PyErr_Restore=python34.PyErr_Restore
+  PyErr_SetFromErrno=python34.PyErr_SetFromErrno
+  PyErr_SetFromErrnoWithFilename=python34.PyErr_SetFromErrnoWithFilename
+  PyErr_SetFromErrnoWithFilenameObject=python34.PyErr_SetFromErrnoWithFilenameObject
+  PyErr_SetInterrupt=python34.PyErr_SetInterrupt
+  PyErr_SetNone=python34.PyErr_SetNone
+  PyErr_SetObject=python34.PyErr_SetObject
+  PyErr_SetString=python34.PyErr_SetString
+  PyErr_SyntaxLocation=python34.PyErr_SyntaxLocation
+  PyErr_WarnEx=python34.PyErr_WarnEx
+  PyErr_WarnExplicit=python34.PyErr_WarnExplicit
+  PyErr_WarnFormat=python34.PyErr_WarnFormat
+  PyErr_WriteUnraisable=python34.PyErr_WriteUnraisable
+  PyEval_AcquireLock=python34.PyEval_AcquireLock
+  PyEval_AcquireThread=python34.PyEval_AcquireThread
+  PyEval_CallFunction=python34.PyEval_CallFunction
+  PyEval_CallMethod=python34.PyEval_CallMethod
+  PyEval_CallObjectWithKeywords=python34.PyEval_CallObjectWithKeywords
+  PyEval_EvalCode=python34.PyEval_EvalCode
+  PyEval_EvalCodeEx=python34.PyEval_EvalCodeEx
+  PyEval_EvalFrame=python34.PyEval_EvalFrame
+  PyEval_EvalFrameEx=python34.PyEval_EvalFrameEx
+  PyEval_GetBuiltins=python34.PyEval_GetBuiltins
+  PyEval_GetCallStats=python34.PyEval_GetCallStats
+  PyEval_GetFrame=python34.PyEval_GetFrame
+  PyEval_GetFuncDesc=python34.PyEval_GetFuncDesc
+  PyEval_GetFuncName=python34.PyEval_GetFuncName
+  PyEval_GetGlobals=python34.PyEval_GetGlobals
+  PyEval_GetLocals=python34.PyEval_GetLocals
+  PyEval_InitThreads=python34.PyEval_InitThreads
+  PyEval_ReInitThreads=python34.PyEval_ReInitThreads
+  PyEval_ReleaseLock=python34.PyEval_ReleaseLock
+  PyEval_ReleaseThread=python34.PyEval_ReleaseThread
+  PyEval_RestoreThread=python34.PyEval_RestoreThread
+  PyEval_SaveThread=python34.PyEval_SaveThread
+  PyEval_ThreadsInitialized=python34.PyEval_ThreadsInitialized
+  PyExc_ArithmeticError=python34.PyExc_ArithmeticError DATA
+  PyExc_AssertionError=python34.PyExc_AssertionError DATA
+  PyExc_AttributeError=python34.PyExc_AttributeError DATA
+  PyExc_BaseException=python34.PyExc_BaseException DATA
+  PyExc_BufferError=python34.PyExc_BufferError DATA
+  PyExc_BytesWarning=python34.PyExc_BytesWarning DATA
+  PyExc_DeprecationWarning=python34.PyExc_DeprecationWarning DATA
+  PyExc_EOFError=python34.PyExc_EOFError DATA
+  PyExc_EnvironmentError=python34.PyExc_EnvironmentError DATA
+  PyExc_Exception=python34.PyExc_Exception DATA
+  PyExc_FloatingPointError=python34.PyExc_FloatingPointError DATA
+  PyExc_FutureWarning=python34.PyExc_FutureWarning DATA
+  PyExc_GeneratorExit=python34.PyExc_GeneratorExit DATA
+  PyExc_IOError=python34.PyExc_IOError DATA
+  PyExc_ImportError=python34.PyExc_ImportError DATA
+  PyExc_ImportWarning=python34.PyExc_ImportWarning DATA
+  PyExc_IndentationError=python34.PyExc_IndentationError DATA
+  PyExc_IndexError=python34.PyExc_IndexError DATA
+  PyExc_KeyError=python34.PyExc_KeyError DATA
+  PyExc_KeyboardInterrupt=python34.PyExc_KeyboardInterrupt DATA
+  PyExc_LookupError=python34.PyExc_LookupError DATA
+  PyExc_MemoryError=python34.PyExc_MemoryError DATA
+  PyExc_MemoryErrorInst=python34.PyExc_MemoryErrorInst DATA
+  PyExc_NameError=python34.PyExc_NameError DATA
+  PyExc_NotImplementedError=python34.PyExc_NotImplementedError DATA
+  PyExc_OSError=python34.PyExc_OSError DATA
+  PyExc_OverflowError=python34.PyExc_OverflowError DATA
+  PyExc_PendingDeprecationWarning=python34.PyExc_PendingDeprecationWarning DATA
+  PyExc_RecursionErrorInst=python34.PyExc_RecursionErrorInst DATA
+  PyExc_ReferenceError=python34.PyExc_ReferenceError DATA
+  PyExc_RuntimeError=python34.PyExc_RuntimeError DATA
+  PyExc_RuntimeWarning=python34.PyExc_RuntimeWarning DATA
+  PyExc_StopIteration=python34.PyExc_StopIteration DATA
+  PyExc_SyntaxError=python34.PyExc_SyntaxError DATA
+  PyExc_SyntaxWarning=python34.PyExc_SyntaxWarning DATA
+  PyExc_SystemError=python34.PyExc_SystemError DATA
+  PyExc_SystemExit=python34.PyExc_SystemExit DATA
+  PyExc_TabError=python34.PyExc_TabError DATA
+  PyExc_TypeError=python34.PyExc_TypeError DATA
+  PyExc_UnboundLocalError=python34.PyExc_UnboundLocalError DATA
+  PyExc_UnicodeDecodeError=python34.PyExc_UnicodeDecodeError DATA
+  PyExc_UnicodeEncodeError=python34.PyExc_UnicodeEncodeError DATA
+  PyExc_UnicodeError=python34.PyExc_UnicodeError DATA
+  PyExc_UnicodeTranslateError=python34.PyExc_UnicodeTranslateError DATA
+  PyExc_UnicodeWarning=python34.PyExc_UnicodeWarning DATA
+  PyExc_UserWarning=python34.PyExc_UserWarning DATA
+  PyExc_ValueError=python34.PyExc_ValueError DATA
+  PyExc_Warning=python34.PyExc_Warning DATA
+  PyExc_ZeroDivisionError=python34.PyExc_ZeroDivisionError DATA
+  PyException_GetCause=python34.PyException_GetCause
+  PyException_GetContext=python34.PyException_GetContext
+  PyException_GetTraceback=python34.PyException_GetTraceback
+  PyException_SetCause=python34.PyException_SetCause
+  PyException_SetContext=python34.PyException_SetContext
+  PyException_SetTraceback=python34.PyException_SetTraceback
+  PyFile_FromFd=python34.PyFile_FromFd
+  PyFile_GetLine=python34.PyFile_GetLine
+  PyFile_WriteObject=python34.PyFile_WriteObject
+  PyFile_WriteString=python34.PyFile_WriteString
+  PyFilter_Type=python34.PyFilter_Type DATA
+  PyFloat_AsDouble=python34.PyFloat_AsDouble
+  PyFloat_FromDouble=python34.PyFloat_FromDouble
+  PyFloat_FromString=python34.PyFloat_FromString
+  PyFloat_GetInfo=python34.PyFloat_GetInfo
+  PyFloat_GetMax=python34.PyFloat_GetMax
+  PyFloat_GetMin=python34.PyFloat_GetMin
+  PyFloat_Type=python34.PyFloat_Type DATA
+  PyFrozenSet_New=python34.PyFrozenSet_New
+  PyFrozenSet_Type=python34.PyFrozenSet_Type DATA
+  PyGC_Collect=python34.PyGC_Collect
+  PyGILState_Ensure=python34.PyGILState_Ensure
+  PyGILState_GetThisThreadState=python34.PyGILState_GetThisThreadState
+  PyGILState_Release=python34.PyGILState_Release
+  PyGetSetDescr_Type=python34.PyGetSetDescr_Type DATA
+  PyImport_AddModule=python34.PyImport_AddModule
+  PyImport_AppendInittab=python34.PyImport_AppendInittab
+  PyImport_Cleanup=python34.PyImport_Cleanup
+  PyImport_ExecCodeModule=python34.PyImport_ExecCodeModule
+  PyImport_ExecCodeModuleEx=python34.PyImport_ExecCodeModuleEx
+  PyImport_ExecCodeModuleWithPathnames=python34.PyImport_ExecCodeModuleWithPathnames
+  PyImport_GetImporter=python34.PyImport_GetImporter
+  PyImport_GetMagicNumber=python34.PyImport_GetMagicNumber
+  PyImport_GetMagicTag=python34.PyImport_GetMagicTag
+  PyImport_GetModuleDict=python34.PyImport_GetModuleDict
+  PyImport_Import=python34.PyImport_Import
+  PyImport_ImportFrozenModule=python34.PyImport_ImportFrozenModule
+  PyImport_ImportModule=python34.PyImport_ImportModule
+  PyImport_ImportModuleLevel=python34.PyImport_ImportModuleLevel
+  PyImport_ImportModuleNoBlock=python34.PyImport_ImportModuleNoBlock
+  PyImport_ReloadModule=python34.PyImport_ReloadModule
+  PyInterpreterState_Clear=python34.PyInterpreterState_Clear
+  PyInterpreterState_Delete=python34.PyInterpreterState_Delete
+  PyInterpreterState_New=python34.PyInterpreterState_New
+  PyIter_Next=python34.PyIter_Next
+  PyListIter_Type=python34.PyListIter_Type DATA
+  PyListRevIter_Type=python34.PyListRevIter_Type DATA
+  PyList_Append=python34.PyList_Append
+  PyList_AsTuple=python34.PyList_AsTuple
+  PyList_GetItem=python34.PyList_GetItem
+  PyList_GetSlice=python34.PyList_GetSlice
+  PyList_Insert=python34.PyList_Insert
+  PyList_New=python34.PyList_New
+  PyList_Reverse=python34.PyList_Reverse
+  PyList_SetItem=python34.PyList_SetItem
+  PyList_SetSlice=python34.PyList_SetSlice
+  PyList_Size=python34.PyList_Size
+  PyList_Sort=python34.PyList_Sort
+  PyList_Type=python34.PyList_Type DATA
+  PyLongRangeIter_Type=python34.PyLongRangeIter_Type DATA
+  PyLong_AsDouble=python34.PyLong_AsDouble
+  PyLong_AsLong=python34.PyLong_AsLong
+  PyLong_AsLongAndOverflow=python34.PyLong_AsLongAndOverflow
+  PyLong_AsLongLong=python34.PyLong_AsLongLong
+  PyLong_AsLongLongAndOverflow=python34.PyLong_AsLongLongAndOverflow
+  PyLong_AsSize_t=python34.PyLong_AsSize_t
+  PyLong_AsSsize_t=python34.PyLong_AsSsize_t
+  PyLong_AsUnsignedLong=python34.PyLong_AsUnsignedLong
+  PyLong_AsUnsignedLongLong=python34.PyLong_AsUnsignedLongLong
+  PyLong_AsUnsignedLongLongMask=python34.PyLong_AsUnsignedLongLongMask
+  PyLong_AsUnsignedLongMask=python34.PyLong_AsUnsignedLongMask
+  PyLong_AsVoidPtr=python34.PyLong_AsVoidPtr
+  PyLong_FromDouble=python34.PyLong_FromDouble
+  PyLong_FromLong=python34.PyLong_FromLong
+  PyLong_FromLongLong=python34.PyLong_FromLongLong
+  PyLong_FromSize_t=python34.PyLong_FromSize_t
+  PyLong_FromSsize_t=python34.PyLong_FromSsize_t
+  PyLong_FromString=python34.PyLong_FromString
+  PyLong_FromUnsignedLong=python34.PyLong_FromUnsignedLong
+  PyLong_FromUnsignedLongLong=python34.PyLong_FromUnsignedLongLong
+  PyLong_FromVoidPtr=python34.PyLong_FromVoidPtr
+  PyLong_GetInfo=python34.PyLong_GetInfo
+  PyLong_Type=python34.PyLong_Type DATA
+  PyMap_Type=python34.PyMap_Type DATA
+  PyMapping_Check=python34.PyMapping_Check
+  PyMapping_GetItemString=python34.PyMapping_GetItemString
+  PyMapping_HasKey=python34.PyMapping_HasKey
+  PyMapping_HasKeyString=python34.PyMapping_HasKeyString
+  PyMapping_Items=python34.PyMapping_Items
+  PyMapping_Keys=python34.PyMapping_Keys
+  PyMapping_Length=python34.PyMapping_Length
+  PyMapping_SetItemString=python34.PyMapping_SetItemString
+  PyMapping_Size=python34.PyMapping_Size
+  PyMapping_Values=python34.PyMapping_Values
+  PyMem_Free=python34.PyMem_Free
+  PyMem_Malloc=python34.PyMem_Malloc
+  PyMem_Realloc=python34.PyMem_Realloc
+  PyMemberDescr_Type=python34.PyMemberDescr_Type DATA
+  PyMemoryView_FromObject=python34.PyMemoryView_FromObject
+  PyMemoryView_GetContiguous=python34.PyMemoryView_GetContiguous
+  PyMemoryView_Type=python34.PyMemoryView_Type DATA
+  PyMethodDescr_Type=python34.PyMethodDescr_Type DATA
+  PyModule_AddIntConstant=python34.PyModule_AddIntConstant
+  PyModule_AddObject=python34.PyModule_AddObject
+  PyModule_AddStringConstant=python34.PyModule_AddStringConstant
+  PyModule_Create2=python34.PyModule_Create2
+  PyModule_GetDef=python34.PyModule_GetDef
+  PyModule_GetDict=python34.PyModule_GetDict
+  PyModule_GetFilename=python34.PyModule_GetFilename
+  PyModule_GetFilenameObject=python34.PyModule_GetFilenameObject
+  PyModule_GetName=python34.PyModule_GetName
+  PyModule_GetState=python34.PyModule_GetState
+  PyModule_New=python34.PyModule_New
+  PyModule_Type=python34.PyModule_Type DATA
+  PyNullImporter_Type=python34.PyNullImporter_Type DATA
+  PyNumber_Absolute=python34.PyNumber_Absolute
+  PyNumber_Add=python34.PyNumber_Add
+  PyNumber_And=python34.PyNumber_And
+  PyNumber_AsSsize_t=python34.PyNumber_AsSsize_t
+  PyNumber_Check=python34.PyNumber_Check
+  PyNumber_Divmod=python34.PyNumber_Divmod
+  PyNumber_Float=python34.PyNumber_Float
+  PyNumber_FloorDivide=python34.PyNumber_FloorDivide
+  PyNumber_InPlaceAdd=python34.PyNumber_InPlaceAdd
+  PyNumber_InPlaceAnd=python34.PyNumber_InPlaceAnd
+  PyNumber_InPlaceFloorDivide=python34.PyNumber_InPlaceFloorDivide
+  PyNumber_InPlaceLshift=python34.PyNumber_InPlaceLshift
+  PyNumber_InPlaceMultiply=python34.PyNumber_InPlaceMultiply
+  PyNumber_InPlaceOr=python34.PyNumber_InPlaceOr
+  PyNumber_InPlacePower=python34.PyNumber_InPlacePower
+  PyNumber_InPlaceRemainder=python34.PyNumber_InPlaceRemainder
+  PyNumber_InPlaceRshift=python34.PyNumber_InPlaceRshift
+  PyNumber_InPlaceSubtract=python34.PyNumber_InPlaceSubtract
+  PyNumber_InPlaceTrueDivide=python34.PyNumber_InPlaceTrueDivide
+  PyNumber_InPlaceXor=python34.PyNumber_InPlaceXor
+  PyNumber_Index=python34.PyNumber_Index
+  PyNumber_Invert=python34.PyNumber_Invert
+  PyNumber_Long=python34.PyNumber_Long
+  PyNumber_Lshift=python34.PyNumber_Lshift
+  PyNumber_Multiply=python34.PyNumber_Multiply
+  PyNumber_Negative=python34.PyNumber_Negative
+  PyNumber_Or=python34.PyNumber_Or
+  PyNumber_Positive=python34.PyNumber_Positive
+  PyNumber_Power=python34.PyNumber_Power
+  PyNumber_Remainder=python34.PyNumber_Remainder
+  PyNumber_Rshift=python34.PyNumber_Rshift
+  PyNumber_Subtract=python34.PyNumber_Subtract
+  PyNumber_ToBase=python34.PyNumber_ToBase
+  PyNumber_TrueDivide=python34.PyNumber_TrueDivide
+  PyNumber_Xor=python34.PyNumber_Xor
+  PyOS_AfterFork=python34.PyOS_AfterFork
+  PyOS_InitInterrupts=python34.PyOS_InitInterrupts
+  PyOS_InputHook=python34.PyOS_InputHook DATA
+  PyOS_InterruptOccurred=python34.PyOS_InterruptOccurred
+  PyOS_ReadlineFunctionPointer=python34.PyOS_ReadlineFunctionPointer DATA
+  PyOS_double_to_string=python34.PyOS_double_to_string
+  PyOS_getsig=python34.PyOS_getsig
+  PyOS_mystricmp=python34.PyOS_mystricmp
+  PyOS_mystrnicmp=python34.PyOS_mystrnicmp
+  PyOS_setsig=python34.PyOS_setsig
+  PyOS_snprintf=python34.PyOS_snprintf
+  PyOS_string_to_double=python34.PyOS_string_to_double
+  PyOS_strtol=python34.PyOS_strtol
+  PyOS_strtoul=python34.PyOS_strtoul
+  PyOS_vsnprintf=python34.PyOS_vsnprintf
+  PyObject_ASCII=python34.PyObject_ASCII
+  PyObject_AsCharBuffer=python34.PyObject_AsCharBuffer
+  PyObject_AsFileDescriptor=python34.PyObject_AsFileDescriptor
+  PyObject_AsReadBuffer=python34.PyObject_AsReadBuffer
+  PyObject_AsWriteBuffer=python34.PyObject_AsWriteBuffer
+  PyObject_Bytes=python34.PyObject_Bytes
+  PyObject_Call=python34.PyObject_Call
+  PyObject_CallFunction=python34.PyObject_CallFunction
+  PyObject_CallFunctionObjArgs=python34.PyObject_CallFunctionObjArgs
+  PyObject_CallMethod=python34.PyObject_CallMethod
+  PyObject_CallMethodObjArgs=python34.PyObject_CallMethodObjArgs
+  PyObject_CallObject=python34.PyObject_CallObject
+  PyObject_CheckReadBuffer=python34.PyObject_CheckReadBuffer
+  PyObject_ClearWeakRefs=python34.PyObject_ClearWeakRefs
+  PyObject_DelItem=python34.PyObject_DelItem
+  PyObject_DelItemString=python34.PyObject_DelItemString
+  PyObject_Dir=python34.PyObject_Dir
+  PyObject_Format=python34.PyObject_Format
+  PyObject_Free=python34.PyObject_Free
+  PyObject_GC_Del=python34.PyObject_GC_Del
+  PyObject_GC_Track=python34.PyObject_GC_Track
+  PyObject_GC_UnTrack=python34.PyObject_GC_UnTrack
+  PyObject_GenericGetAttr=python34.PyObject_GenericGetAttr
+  PyObject_GenericSetAttr=python34.PyObject_GenericSetAttr
+  PyObject_GetAttr=python34.PyObject_GetAttr
+  PyObject_GetAttrString=python34.PyObject_GetAttrString
+  PyObject_GetItem=python34.PyObject_GetItem
+  PyObject_GetIter=python34.PyObject_GetIter
+  PyObject_HasAttr=python34.PyObject_HasAttr
+  PyObject_HasAttrString=python34.PyObject_HasAttrString
+  PyObject_Hash=python34.PyObject_Hash
+  PyObject_HashNotImplemented=python34.PyObject_HashNotImplemented
+  PyObject_Init=python34.PyObject_Init
+  PyObject_InitVar=python34.PyObject_InitVar
+  PyObject_IsInstance=python34.PyObject_IsInstance
+  PyObject_IsSubclass=python34.PyObject_IsSubclass
+  PyObject_IsTrue=python34.PyObject_IsTrue
+  PyObject_Length=python34.PyObject_Length
+  PyObject_Malloc=python34.PyObject_Malloc
+  PyObject_Not=python34.PyObject_Not
+  PyObject_Realloc=python34.PyObject_Realloc
+  PyObject_Repr=python34.PyObject_Repr
+  PyObject_RichCompare=python34.PyObject_RichCompare
+  PyObject_RichCompareBool=python34.PyObject_RichCompareBool
+  PyObject_SelfIter=python34.PyObject_SelfIter
+  PyObject_SetAttr=python34.PyObject_SetAttr
+  PyObject_SetAttrString=python34.PyObject_SetAttrString
+  PyObject_SetItem=python34.PyObject_SetItem
+  PyObject_Size=python34.PyObject_Size
+  PyObject_Str=python34.PyObject_Str
+  PyObject_Type=python34.PyObject_Type DATA
+  PyParser_SimpleParseFileFlags=python34.PyParser_SimpleParseFileFlags
+  PyParser_SimpleParseStringFlags=python34.PyParser_SimpleParseStringFlags
+  PyProperty_Type=python34.PyProperty_Type DATA
+  PyRangeIter_Type=python34.PyRangeIter_Type DATA
+  PyRange_Type=python34.PyRange_Type DATA
+  PyReversed_Type=python34.PyReversed_Type DATA
+  PySeqIter_New=python34.PySeqIter_New
+  PySeqIter_Type=python34.PySeqIter_Type DATA
+  PySequence_Check=python34.PySequence_Check
+  PySequence_Concat=python34.PySequence_Concat
+  PySequence_Contains=python34.PySequence_Contains
+  PySequence_Count=python34.PySequence_Count
+  PySequence_DelItem=python34.PySequence_DelItem
+  PySequence_DelSlice=python34.PySequence_DelSlice
+  PySequence_Fast=python34.PySequence_Fast
+  PySequence_GetItem=python34.PySequence_GetItem
+  PySequence_GetSlice=python34.PySequence_GetSlice
+  PySequence_In=python34.PySequence_In
+  PySequence_InPlaceConcat=python34.PySequence_InPlaceConcat
+  PySequence_InPlaceRepeat=python34.PySequence_InPlaceRepeat
+  PySequence_Index=python34.PySequence_Index
+  PySequence_Length=python34.PySequence_Length
+  PySequence_List=python34.PySequence_List
+  PySequence_Repeat=python34.PySequence_Repeat
+  PySequence_SetItem=python34.PySequence_SetItem
+  PySequence_SetSlice=python34.PySequence_SetSlice
+  PySequence_Size=python34.PySequence_Size
+  PySequence_Tuple=python34.PySequence_Tuple
+  PySetIter_Type=python34.PySetIter_Type DATA
+  PySet_Add=python34.PySet_Add
+  PySet_Clear=python34.PySet_Clear
+  PySet_Contains=python34.PySet_Contains
+  PySet_Discard=python34.PySet_Discard
+  PySet_New=python34.PySet_New
+  PySet_Pop=python34.PySet_Pop
+  PySet_Size=python34.PySet_Size
+  PySet_Type=python34.PySet_Type DATA
+  PySlice_GetIndices=python34.PySlice_GetIndices
+  PySlice_GetIndicesEx=python34.PySlice_GetIndicesEx
+  PySlice_New=python34.PySlice_New
+  PySlice_Type=python34.PySlice_Type DATA
+  PySortWrapper_Type=python34.PySortWrapper_Type DATA
+  PyState_FindModule=python34.PyState_FindModule
+  PyState_AddModule=python34.PyState_AddModule
+  PyState_RemoveModule=python34.PyState_RemoveModule
+  PyStructSequence_GetItem=python34.PyStructSequence_GetItem
+  PyStructSequence_New=python34.PyStructSequence_New
+  PyStructSequence_NewType=python34.PyStructSequence_NewType
+  PyStructSequence_SetItem=python34.PyStructSequence_SetItem
+  PySuper_Type=python34.PySuper_Type DATA
+  PySys_AddWarnOption=python34.PySys_AddWarnOption
+  PySys_AddWarnOptionUnicode=python34.PySys_AddWarnOptionUnicode
+  PySys_FormatStderr=python34.PySys_FormatStderr
+  PySys_FormatStdout=python34.PySys_FormatStdout
+  PySys_GetObject=python34.PySys_GetObject
+  PySys_HasWarnOptions=python34.PySys_HasWarnOptions
+  PySys_ResetWarnOptions=python34.PySys_ResetWarnOptions
+  PySys_SetArgv=python34.PySys_SetArgv
+  PySys_SetArgvEx=python34.PySys_SetArgvEx
+  PySys_SetObject=python34.PySys_SetObject
+  PySys_SetPath=python34.PySys_SetPath
+  PySys_WriteStderr=python34.PySys_WriteStderr
+  PySys_WriteStdout=python34.PySys_WriteStdout
+  PyThreadState_Clear=python34.PyThreadState_Clear
+  PyThreadState_Delete=python34.PyThreadState_Delete
+  PyThreadState_DeleteCurrent=python34.PyThreadState_DeleteCurrent
+  PyThreadState_Get=python34.PyThreadState_Get
+  PyThreadState_GetDict=python34.PyThreadState_GetDict
+  PyThreadState_New=python34.PyThreadState_New
+  PyThreadState_SetAsyncExc=python34.PyThreadState_SetAsyncExc
+  PyThreadState_Swap=python34.PyThreadState_Swap
+  PyTraceBack_Here=python34.PyTraceBack_Here
+  PyTraceBack_Print=python34.PyTraceBack_Print
+  PyTraceBack_Type=python34.PyTraceBack_Type DATA
+  PyTupleIter_Type=python34.PyTupleIter_Type DATA
+  PyTuple_ClearFreeList=python34.PyTuple_ClearFreeList
+  PyTuple_GetItem=python34.PyTuple_GetItem
+  PyTuple_GetSlice=python34.PyTuple_GetSlice
+  PyTuple_New=python34.PyTuple_New
+  PyTuple_Pack=python34.PyTuple_Pack
+  PyTuple_SetItem=python34.PyTuple_SetItem
+  PyTuple_Size=python34.PyTuple_Size
+  PyTuple_Type=python34.PyTuple_Type DATA
+  PyType_ClearCache=python34.PyType_ClearCache
+  PyType_FromSpec=python34.PyType_FromSpec
+  PyType_FromSpecWithBases=python34.PyType_FromSpecWithBases
+  PyType_GenericAlloc=python34.PyType_GenericAlloc
+  PyType_GenericNew=python34.PyType_GenericNew
+  PyType_GetFlags=python34.PyType_GetFlags
+  PyType_IsSubtype=python34.PyType_IsSubtype
+  PyType_Modified=python34.PyType_Modified
+  PyType_Ready=python34.PyType_Ready
+  PyType_Type=python34.PyType_Type DATA
+  PyUnicodeDecodeError_Create=python34.PyUnicodeDecodeError_Create
+  PyUnicodeDecodeError_GetEncoding=python34.PyUnicodeDecodeError_GetEncoding
+  PyUnicodeDecodeError_GetEnd=python34.PyUnicodeDecodeError_GetEnd
+  PyUnicodeDecodeError_GetObject=python34.PyUnicodeDecodeError_GetObject
+  PyUnicodeDecodeError_GetReason=python34.PyUnicodeDecodeError_GetReason
+  PyUnicodeDecodeError_GetStart=python34.PyUnicodeDecodeError_GetStart
+  PyUnicodeDecodeError_SetEnd=python34.PyUnicodeDecodeError_SetEnd
+  PyUnicodeDecodeError_SetReason=python34.PyUnicodeDecodeError_SetReason
+  PyUnicodeDecodeError_SetStart=python34.PyUnicodeDecodeError_SetStart
+  PyUnicodeEncodeError_GetEncoding=python34.PyUnicodeEncodeError_GetEncoding
+  PyUnicodeEncodeError_GetEnd=python34.PyUnicodeEncodeError_GetEnd
+  PyUnicodeEncodeError_GetObject=python34.PyUnicodeEncodeError_GetObject
+  PyUnicodeEncodeError_GetReason=python34.PyUnicodeEncodeError_GetReason
+  PyUnicodeEncodeError_GetStart=python34.PyUnicodeEncodeError_GetStart
+  PyUnicodeEncodeError_SetEnd=python34.PyUnicodeEncodeError_SetEnd
+  PyUnicodeEncodeError_SetReason=python34.PyUnicodeEncodeError_SetReason
+  PyUnicodeEncodeError_SetStart=python34.PyUnicodeEncodeError_SetStart
+  PyUnicodeIter_Type=python34.PyUnicodeIter_Type DATA
+  PyUnicodeTranslateError_GetEnd=python34.PyUnicodeTranslateError_GetEnd
+  PyUnicodeTranslateError_GetObject=python34.PyUnicodeTranslateError_GetObject
+  PyUnicodeTranslateError_GetReason=python34.PyUnicodeTranslateError_GetReason
+  PyUnicodeTranslateError_GetStart=python34.PyUnicodeTranslateError_GetStart
+  PyUnicodeTranslateError_SetEnd=python34.PyUnicodeTranslateError_SetEnd
+  PyUnicodeTranslateError_SetReason=python34.PyUnicodeTranslateError_SetReason
+  PyUnicodeTranslateError_SetStart=python34.PyUnicodeTranslateError_SetStart
+  PyUnicode_Append=python34.PyUnicodeUCS2_Append
+  PyUnicode_AppendAndDel=python34.PyUnicodeUCS2_AppendAndDel
+  PyUnicode_AsASCIIString=python34.PyUnicodeUCS2_AsASCIIString
+  PyUnicode_AsCharmapString=python34.PyUnicodeUCS2_AsCharmapString
+  PyUnicode_AsDecodedObject=python34.PyUnicodeUCS2_AsDecodedObject
+  PyUnicode_AsDecodedUnicode=python34.PyUnicodeUCS2_AsDecodedUnicode
+  PyUnicode_AsEncodedObject=python34.PyUnicodeUCS2_AsEncodedObject
+  PyUnicode_AsEncodedString=python34.PyUnicodeUCS2_AsEncodedString
+  PyUnicode_AsEncodedUnicode=python34.PyUnicodeUCS2_AsEncodedUnicode
+  PyUnicode_AsLatin1String=python34.PyUnicodeUCS2_AsLatin1String
+  PyUnicode_AsRawUnicodeEscapeString=python34.PyUnicodeUCS2_AsRawUnicodeEscapeString
+  PyUnicode_AsUTF16String=python34.PyUnicodeUCS2_AsUTF16String
+  PyUnicode_AsUTF32String=python34.PyUnicodeUCS2_AsUTF32String
+  PyUnicode_AsUTF8String=python34.PyUnicodeUCS2_AsUTF8String
+  PyUnicode_AsUnicodeEscapeString=python34.PyUnicodeUCS2_AsUnicodeEscapeString
+  PyUnicode_AsWideChar=python34.PyUnicodeUCS2_AsWideChar
+  PyUnicode_ClearFreelist=python34.PyUnicodeUCS2_ClearFreelist
+  PyUnicode_Compare=python34.PyUnicodeUCS2_Compare
+  PyUnicode_Concat=python34.PyUnicodeUCS2_Concat
+  PyUnicode_Contains=python34.PyUnicodeUCS2_Contains
+  PyUnicode_Count=python34.PyUnicodeUCS2_Count
+  PyUnicode_Decode=python34.PyUnicodeUCS2_Decode
+  PyUnicode_DecodeASCII=python34.PyUnicodeUCS2_DecodeASCII
+  PyUnicode_DecodeCharmap=python34.PyUnicodeUCS2_DecodeCharmap
+  PyUnicode_DecodeFSDefault=python34.PyUnicodeUCS2_DecodeFSDefault
+  PyUnicode_DecodeFSDefaultAndSize=python34.PyUnicodeUCS2_DecodeFSDefaultAndSize
+  PyUnicode_DecodeLatin1=python34.PyUnicodeUCS2_DecodeLatin1
+  PyUnicode_DecodeRawUnicodeEscape=python34.PyUnicodeUCS2_DecodeRawUnicodeEscape
+  PyUnicode_DecodeUTF16=python34.PyUnicodeUCS2_DecodeUTF16
+  PyUnicode_DecodeUTF16Stateful=python34.PyUnicodeUCS2_DecodeUTF16Stateful
+  PyUnicode_DecodeUTF32=python34.PyUnicodeUCS2_DecodeUTF32
+  PyUnicode_DecodeUTF32Stateful=python34.PyUnicodeUCS2_DecodeUTF32Stateful
+  PyUnicode_DecodeUTF8=python34.PyUnicodeUCS2_DecodeUTF8
+  PyUnicode_DecodeUTF8Stateful=python34.PyUnicodeUCS2_DecodeUTF8Stateful
+  PyUnicode_DecodeUnicodeEscape=python34.PyUnicodeUCS2_DecodeUnicodeEscape
+  PyUnicode_FSConverter=python34.PyUnicodeUCS2_FSConverter
+  PyUnicode_FSDecoder=python34.PyUnicodeUCS2_FSDecoder
+  PyUnicode_Find=python34.PyUnicodeUCS2_Find
+  PyUnicode_Format=python34.PyUnicodeUCS2_Format
+  PyUnicode_FromEncodedObject=python34.PyUnicodeUCS2_FromEncodedObject
+  PyUnicode_FromFormat=python34.PyUnicodeUCS2_FromFormat
+  PyUnicode_FromFormatV=python34.PyUnicodeUCS2_FromFormatV
+  PyUnicode_FromObject=python34.PyUnicodeUCS2_FromObject
+  PyUnicode_FromOrdinal=python34.PyUnicodeUCS2_FromOrdinal
+  PyUnicode_FromString=python34.PyUnicodeUCS2_FromString
+  PyUnicode_FromStringAndSize=python34.PyUnicodeUCS2_FromStringAndSize
+  PyUnicode_FromWideChar=python34.PyUnicodeUCS2_FromWideChar
+  PyUnicode_GetDefaultEncoding=python34.PyUnicodeUCS2_GetDefaultEncoding
+  PyUnicode_GetSize=python34.PyUnicodeUCS2_GetSize
+  PyUnicode_IsIdentifier=python34.PyUnicodeUCS2_IsIdentifier
+  PyUnicode_Join=python34.PyUnicodeUCS2_Join
+  PyUnicode_Partition=python34.PyUnicodeUCS2_Partition
+  PyUnicode_RPartition=python34.PyUnicodeUCS2_RPartition
+  PyUnicode_RSplit=python34.PyUnicodeUCS2_RSplit
+  PyUnicode_Replace=python34.PyUnicodeUCS2_Replace
+  PyUnicode_Resize=python34.PyUnicodeUCS2_Resize
+  PyUnicode_RichCompare=python34.PyUnicodeUCS2_RichCompare
+  PyUnicode_SetDefaultEncoding=python34.PyUnicodeUCS2_SetDefaultEncoding
+  PyUnicode_Split=python34.PyUnicodeUCS2_Split
+  PyUnicode_Splitlines=python34.PyUnicodeUCS2_Splitlines
+  PyUnicode_Tailmatch=python34.PyUnicodeUCS2_Tailmatch
+  PyUnicode_Translate=python34.PyUnicodeUCS2_Translate
+  PyUnicode_BuildEncodingMap=python34.PyUnicode_BuildEncodingMap
+  PyUnicode_CompareWithASCIIString=python34.PyUnicode_CompareWithASCIIString
+  PyUnicode_DecodeUTF7=python34.PyUnicode_DecodeUTF7
+  PyUnicode_DecodeUTF7Stateful=python34.PyUnicode_DecodeUTF7Stateful
+  PyUnicode_EncodeFSDefault=python34.PyUnicode_EncodeFSDefault
+  PyUnicode_InternFromString=python34.PyUnicode_InternFromString
+  PyUnicode_InternImmortal=python34.PyUnicode_InternImmortal
+  PyUnicode_InternInPlace=python34.PyUnicode_InternInPlace
+  PyUnicode_Type=python34.PyUnicode_Type DATA
+  PyWeakref_GetObject=python34.PyWeakref_GetObject DATA
+  PyWeakref_NewProxy=python34.PyWeakref_NewProxy
+  PyWeakref_NewRef=python34.PyWeakref_NewRef
+  PyWrapperDescr_Type=python34.PyWrapperDescr_Type DATA
+  PyWrapper_New=python34.PyWrapper_New
+  PyZip_Type=python34.PyZip_Type DATA
+  Py_AddPendingCall=python34.Py_AddPendingCall
+  Py_AtExit=python34.Py_AtExit
+  Py_BuildValue=python34.Py_BuildValue
+  Py_CompileString=python34.Py_CompileString
+  Py_DecRef=python34.Py_DecRef
+  Py_EndInterpreter=python34.Py_EndInterpreter
+  Py_Exit=python34.Py_Exit
+  Py_FatalError=python34.Py_FatalError
+  Py_FileSystemDefaultEncoding=python34.Py_FileSystemDefaultEncoding DATA
+  Py_Finalize=python34.Py_Finalize
+  Py_GetBuildInfo=python34.Py_GetBuildInfo
+  Py_GetCompiler=python34.Py_GetCompiler
+  Py_GetCopyright=python34.Py_GetCopyright
+  Py_GetExecPrefix=python34.Py_GetExecPrefix
+  Py_GetPath=python34.Py_GetPath
+  Py_GetPlatform=python34.Py_GetPlatform
+  Py_GetPrefix=python34.Py_GetPrefix
+  Py_GetProgramFullPath=python34.Py_GetProgramFullPath
+  Py_GetProgramName=python34.Py_GetProgramName
+  Py_GetPythonHome=python34.Py_GetPythonHome
+  Py_GetRecursionLimit=python34.Py_GetRecursionLimit
+  Py_GetVersion=python34.Py_GetVersion
+  Py_HasFileSystemDefaultEncoding=python34.Py_HasFileSystemDefaultEncoding DATA
+  Py_IncRef=python34.Py_IncRef
+  Py_Initialize=python34.Py_Initialize
+  Py_InitializeEx=python34.Py_InitializeEx
+  Py_IsInitialized=python34.Py_IsInitialized
+  Py_Main=python34.Py_Main
+  Py_MakePendingCalls=python34.Py_MakePendingCalls
+  Py_NewInterpreter=python34.Py_NewInterpreter
+  Py_ReprEnter=python34.Py_ReprEnter
+  Py_ReprLeave=python34.Py_ReprLeave
+  Py_SetProgramName=python34.Py_SetProgramName
+  Py_SetPythonHome=python34.Py_SetPythonHome
+  Py_SetRecursionLimit=python34.Py_SetRecursionLimit
+  Py_SymtableString=python34.Py_SymtableString
+  Py_VaBuildValue=python34.Py_VaBuildValue
+  _PyErr_BadInternalCall=python34._PyErr_BadInternalCall
+  _PyObject_CallFunction_SizeT=python34._PyObject_CallFunction_SizeT
+  _PyObject_CallMethod_SizeT=python34._PyObject_CallMethod_SizeT
+  _PyObject_GC_Malloc=python34._PyObject_GC_Malloc
+  _PyObject_GC_New=python34._PyObject_GC_New
+  _PyObject_GC_NewVar=python34._PyObject_GC_NewVar
+  _PyObject_GC_Resize=python34._PyObject_GC_Resize
+  _PyObject_New=python34._PyObject_New
+  _PyObject_NewVar=python34._PyObject_NewVar
+  _PyState_AddModule=python34._PyState_AddModule
+  _PyThreadState_Init=python34._PyThreadState_Init
+  _PyThreadState_Prealloc=python34._PyThreadState_Prealloc
+  _PyTrash_delete_later=python34._PyTrash_delete_later DATA
+  _PyTrash_delete_nesting=python34._PyTrash_delete_nesting DATA
+  _PyTrash_deposit_object=python34._PyTrash_deposit_object
+  _PyTrash_destroy_chain=python34._PyTrash_destroy_chain
+  _PyWeakref_CallableProxyType=python34._PyWeakref_CallableProxyType DATA
+  _PyWeakref_ProxyType=python34._PyWeakref_ProxyType DATA
+  _PyWeakref_RefType=python34._PyWeakref_RefType DATA
+  _Py_BuildValue_SizeT=python34._Py_BuildValue_SizeT
+  _Py_CheckRecursionLimit=python34._Py_CheckRecursionLimit DATA
+  _Py_CheckRecursiveCall=python34._Py_CheckRecursiveCall
+  _Py_Dealloc=python34._Py_Dealloc
+  _Py_EllipsisObject=python34._Py_EllipsisObject DATA
+  _Py_FalseStruct=python34._Py_FalseStruct DATA
+  _Py_NoneStruct=python34._Py_NoneStruct DATA
+  _Py_NotImplementedStruct=python34._Py_NotImplementedStruct DATA
+  _Py_SwappedOp=python34._Py_SwappedOp DATA
+  _Py_TrueStruct=python34._Py_TrueStruct DATA
+  _Py_VaBuildValue_SizeT=python34._Py_VaBuildValue_SizeT
+  _PyArg_Parse_SizeT=python34._PyArg_Parse_SizeT
+  _PyArg_ParseTuple_SizeT=python34._PyArg_ParseTuple_SizeT
+  _PyArg_ParseTupleAndKeywords_SizeT=python34._PyArg_ParseTupleAndKeywords_SizeT
+  _PyArg_VaParse_SizeT=python34._PyArg_VaParse_SizeT
+  _PyArg_VaParseTupleAndKeywords_SizeT=python34._PyArg_VaParseTupleAndKeywords_SizeT
+  _Py_BuildValue_SizeT=python34._Py_BuildValue_SizeT
diff --git a/PC/python3.mak b/PC/python3.mak
--- a/PC/python3.mak
+++ b/PC/python3.mak
@@ -1,10 +1,10 @@
-$(OutDir)python3.dll:	python3.def $(OutDir)python33stub.lib
-	cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python33stub.lib
+$(OutDir)python3.dll:	python3.def $(OutDir)python34stub.lib
+	cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python34stub.lib
 
-$(OutDir)python33stub.lib:	python33stub.def
-	lib /def:python33stub.def /out:$(OutDir)python33stub.lib /MACHINE:$(MACHINE)
+$(OutDir)python34stub.lib:	python34stub.def
+	lib /def:python34stub.def /out:$(OutDir)python34stub.lib /MACHINE:$(MACHINE)
 
 clean:
-	del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python33stub.lib $(OutDir)python3.exp $(OutDir)python33stub.exp
+	del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python34stub.lib $(OutDir)python3.exp $(OutDir)python34stub.exp
 
 rebuild: clean $(OutDir)python3.dll
diff --git a/PC/python33gen.py b/PC/python34gen.py
rename from PC/python33gen.py
rename to PC/python34gen.py
--- a/PC/python33gen.py
+++ b/PC/python34gen.py
@@ -1,9 +1,9 @@
-# Generate python33stub.def out of python3.def
+# Generate python34stub.def out of python3.def
 # The regular import library cannot be used,
 # since it doesn't provide the right symbols for
 # data forwarding
-out = open("python33stub.def", "w")
-out.write('LIBRARY "python33"\n')
+out = open("python34stub.def", "w")
+out.write('LIBRARY "python34"\n')
 out.write('EXPORTS\n')
 
 inp = open("python3.def")
@@ -14,7 +14,7 @@
 assert line.strip()=='EXPORTS'
 
 for line in inp:
-    # SYM1=python33.SYM2[ DATA]
+    # SYM1=python34.SYM2[ DATA]
     head, tail = line.split('.')
     if 'DATA' in tail:
         symbol, tail = tail.split(' ')
diff --git a/PC/python33stub.def b/PC/python34stub.def
rename from PC/python33stub.def
rename to PC/python34stub.def
--- a/PC/python33stub.def
+++ b/PC/python34stub.def
@@ -1,4 +1,4 @@
-LIBRARY "python33"
+LIBRARY "python34"
 EXPORTS
 PyArg_Parse
 PyArg_ParseTuple
diff --git a/PCbuild/build_ssl.bat b/PCbuild/build_ssl.bat
--- a/PCbuild/build_ssl.bat
+++ b/PCbuild/build_ssl.bat
@@ -2,10 +2,10 @@
 if not defined HOST_PYTHON (
   if %1 EQU Debug (
     set HOST_PYTHON=python_d.exe
-    if not exist python33_d.dll exit 1
+    if not exist python34_d.dll exit 1
   ) ELSE (
     set HOST_PYTHON=python.exe
-    if not exist python33.dll exit 1
+    if not exist python34.dll exit 1
   )
 )
 %HOST_PYTHON% build_ssl.py %1 %2 %3
diff --git a/PCbuild/kill_python.c b/PCbuild/kill_python.c
--- a/PCbuild/kill_python.c
+++ b/PCbuild/kill_python.c
@@ -106,7 +106,7 @@
         /*
          * XXX TODO: if we really wanted to be fancy, we could check the 
          * modules for all processes (not just the python[_d].exe ones)
-         * and see if any of our DLLs are loaded (i.e. python33[_d].dll),
+         * and see if any of our DLLs are loaded (i.e. python34[_d].dll),
          * as that would also inhibit our ability to rebuild the solution.
          * Not worth loosing sleep over though; for now, a simple check 
          * for just the python executable should be sufficient.
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -13,7 +13,7 @@
     <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros">
-    <PyDllName>python33$(PyDebugExt)</PyDllName>
+    <PyDllName>python34$(PyDebugExt)</PyDllName>
     <PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe>
     <KillPythonExe>$(OutDir)kill_python$(PyDebugExt).exe</KillPythonExe>
     <externalsDir>..\..</externalsDir>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -37,7 +37,7 @@
    running a Python core buildbot test slave; see SUBPROJECTS below)
 
 When using the Debug setting, the output files have a _d added to
-their name:  python33_d.dll, python_d.exe, parser_d.pyd, and so on. Both
+their name:  python34_d.dll, python_d.exe, parser_d.pyd, and so on. Both
 the build and rt batch files accept a -d option for debug builds.
 
 The 32bit builds end up in the solution folder PCbuild while the x64 builds
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-This is Python version 3.3.0
-============================
+This is Python version 3.4.0 prerelease
+=======================================
 
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
 2012 Python Software Foundation.  All rights reserved.
@@ -52,9 +52,9 @@
 ----------
 
 We try to have a comprehensive overview of the changes in the "What's New in
-Python 3.3" document, found at
+Python 3.4" document, found at
 
-    http://docs.python.org/3.3/whatsnew/3.3.html
+    http://docs.python.org/3.4/whatsnew/3.4.html
 
 For a more detailed change log, read Misc/NEWS (though this file, too, is
 incomplete, and also doesn't list anything merged in from the 2.7 release under
@@ -67,9 +67,9 @@
 Documentation
 -------------
 
-Documentation for Python 3.3 is online, updated daily:
+Documentation for Python 3.4 is online, updated daily:
 
-    http://docs.python.org/3.3/
+    http://docs.python.org/3.4/
 
 It can also be downloaded in many formats for faster access.  The documentation
 is downloadable in HTML, PDF, and reStructuredText formats; the latter version
@@ -87,7 +87,7 @@
 A source-to-source translation tool, "2to3", can take care of the mundane task
 of converting large amounts of source code.  It is not a complete solution but
 is complemented by the deprecation warnings in 2.6.  See
-http://docs.python.org/3.3/library/2to3.html for more information.
+http://docs.python.org/3.4/library/2to3.html for more information.
 
 
 Testing
@@ -125,7 +125,7 @@
 Install that version using "make install".  Install all other versions using
 "make altinstall".
 
-For example, if you want to install Python 2.6, 2.7 and 3.3 with 2.7 being the
+For example, if you want to install Python 2.6, 2.7 and 3.4 with 2.7 being the
 primary version, you would execute "make install" in your 2.7 build directory
 and "make altinstall" in the others.
 
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for python 3.3.
+# Generated by GNU Autoconf 2.68 for python 3.4.
 #
 # Report bugs to <http://bugs.python.org/>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='python'
 PACKAGE_TARNAME='python'
-PACKAGE_VERSION='3.3'
-PACKAGE_STRING='python 3.3'
+PACKAGE_VERSION='3.4'
+PACKAGE_STRING='python 3.4'
 PACKAGE_BUGREPORT='http://bugs.python.org/'
 PACKAGE_URL=''
 
@@ -1336,7 +1336,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures python 3.3 to adapt to many kinds of systems.
+\`configure' configures python 3.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1401,7 +1401,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of python 3.3:";;
+     short | recursive ) echo "Configuration of python 3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1539,7 +1539,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-python configure 3.3
+python configure 3.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2370,7 +2370,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by python $as_me 3.3, which was
+It was created by python $as_me 3.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2920,7 +2920,7 @@
 mv confdefs.h.new confdefs.h
 
 
-VERSION=3.3
+VERSION=3.4
 
 # Version number of Python's own shared library file.
 
@@ -15562,7 +15562,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by python $as_me 3.3, which was
+This file was extended by python $as_me 3.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15624,7 +15624,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-python config.status 3.3
+python config.status 3.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 dnl ***********************************************
 
 # Set VERSION so we only need to edit in one place (i.e., here)
-m4_define(PYTHON_VERSION, 3.3)
+m4_define(PYTHON_VERSION, 3.4)
 
 AC_PREREQ(2.65)
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:36:10 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:36:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Set_up_=22source=22_links_?=
 =?utf-8?q?to_point_to_default_branch=2E?=
Message-ID: <3XTM4p62QRzNpC@mail.python.org>

http://hg.python.org/cpython/rev/7aa546e4a892
changeset:   79241:7aa546e4a892
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:36:04 2012 +0200
summary:
  Set up "source" links to point to default branch.

files:
  Doc/tools/sphinxext/pyspecific.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -10,7 +10,7 @@
 """
 
 ISSUE_URI = 'http://bugs.python.org/issue%s'
-SOURCE_URI = 'http://hg.python.org/cpython/file/3.3/%s'
+SOURCE_URI = 'http://hg.python.org/cpython/file/default/%s'
 
 from docutils import nodes, utils
 from sphinx.util.nodes import split_explicit_title

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:58:29 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:58:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogRml4IHRlc3Rfc3lz?=
 =?utf-8?q?=2Etest=5Fimplementation_for_final_releases=2E?=
Message-ID: <3XTMZY5hh5zNtP@mail.python.org>

http://hg.python.org/cpython/rev/bd8afb90ebf2
changeset:   79242:bd8afb90ebf2
branch:      3.3
tag:         v3.3.0
parent:      79237:cb84dcb35114
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:44:17 2012 +0200
summary:
  Fix test_sys.test_implementation for final releases.

files:
  Lib/test/test_sys.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -585,7 +585,7 @@
     def test_implementation(self):
         # This test applies to all implementations equally.
 
-        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'release': 0xF}
+        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'final': 0xF}
 
         self.assertTrue(hasattr(sys.implementation, 'name'))
         self.assertTrue(hasattr(sys.implementation, 'version'))

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:58:31 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:58:31 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Re-tagging_3?=
 =?utf-8?q?=2E3=2E0_for_test=5Fsys_fix=2E?=
Message-ID: <3XTMZb1DMFzP0p@mail.python.org>

http://hg.python.org/cpython/rev/5f854a8a0e8f
changeset:   79243:5f854a8a0e8f
branch:      3.3
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:47:26 2012 +0200
summary:
  Re-tagging 3.3.0 for test_sys fix.

files:
  .hgtags |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -108,4 +108,4 @@
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
-de6b91d9711329b32e6fd0a3495cc31ff5009625 v3.3.0
+bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 09:58:32 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 09:58:32 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_merge_with_3=2E3?=
Message-ID: <3XTMZc3md5zPH2@mail.python.org>

http://hg.python.org/cpython/rev/1465cbbc8f64
changeset:   79244:1465cbbc8f64
parent:      79241:7aa546e4a892
parent:      79243:5f854a8a0e8f
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:51:42 2012 +0200
summary:
  merge with 3.3

files:
  .hgtags              |  2 +-
  Lib/test/test_sys.py |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -108,4 +108,4 @@
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
-de6b91d9711329b32e6fd0a3495cc31ff5009625 v3.3.0
+bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -585,7 +585,7 @@
     def test_implementation(self):
         # This test applies to all implementations equally.
 
-        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'release': 0xF}
+        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'final': 0xF}
 
         self.assertTrue(hasattr(sys.implementation, 'name'))
         self.assertTrue(hasattr(sys.implementation, 'version'))

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 13:10:38 2012
From: python-checkins at python.org (martin.v.loewis)
Date: Sat, 29 Sep 2012 13:10:38 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Ajdust_path_to?=
 =?utf-8?q?_launcher_for_non-PGO-builds?=
Message-ID: <3XTRrG5tzpzQCf@mail.python.org>

http://hg.python.org/cpython/rev/d5d2af9f11bf
changeset:   79245:d5d2af9f11bf
branch:      3.3
parent:      79243:5f854a8a0e8f
user:        Martin v. L?wis <martin at v.loewis.de>
date:        Sat Sep 29 13:08:41 2012 +0200
summary:
  Ajdust path to launcher for non-PGO-builds

files:
  Tools/msi/msi.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -977,6 +977,8 @@
     launchersrc = PCBUILD
     if launchersrc.lower() == 'pcbuild\\x64-pgo':
         launchersrc = 'PCBuild\\win32-pgo'
+    if launchersrc.lower() == 'pcbuild\\amd64':
+        launchersrc = 'PCBuild'
     launcher = os.path.join(srcdir, launchersrc, "py.exe")
     launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
     launcherdir.add_file(launcher,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 13:10:40 2012
From: python-checkins at python.org (martin.v.loewis)
Date: Sat, 29 Sep 2012 13:10:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Merge_with_3=2E3?=
Message-ID: <3XTRrJ11BpzNlk@mail.python.org>

http://hg.python.org/cpython/rev/ed358a8e5212
changeset:   79246:ed358a8e5212
parent:      79244:1465cbbc8f64
parent:      79245:d5d2af9f11bf
user:        Martin v. L?wis <martin at v.loewis.de>
date:        Sat Sep 29 13:10:09 2012 +0200
summary:
  Merge with 3.3

files:
  Tools/msi/msi.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -977,6 +977,8 @@
     launchersrc = PCBUILD
     if launchersrc.lower() == 'pcbuild\\x64-pgo':
         launchersrc = 'PCBuild\\win32-pgo'
+    if launchersrc.lower() == 'pcbuild\\amd64':
+        launchersrc = 'PCBuild'
     launcher = os.path.join(srcdir, launchersrc, "py.exe")
     launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
     launcherdir.add_file(launcher,

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 14:22:20 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 14:22:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Post-release_u?=
	=?utf-8?q?pdate=2E?=
Message-ID: <3XTTR02FffzNSK@mail.python.org>

http://hg.python.org/cpython/rev/7e83c8ccb1ba
changeset:   79247:7e83c8ccb1ba
branch:      3.3
parent:      79245:d5d2af9f11bf
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 14:21:25 2012 +0200
summary:
  Post-release update.

files:
  Include/patchlevel.h |   2 +-
  Misc/NEWS            |  12 ++++++++++++
  2 files changed, 13 insertions(+), 1 deletions(-)


diff --git a/Include/patchlevel.h b/Include/patchlevel.h
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,7 +23,7 @@
 #define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.3.0"
+#define PY_VERSION      	"3.3.0+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,18 @@
 Python News
 +++++++++++
 
+What's New in Python 3.3.1?
+===========================
+
+*Release date: XX-XXX-2012*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
 What's New in Python 3.3.0?
 ===========================
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 14:22:21 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 14:22:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_null-merge_from_3=2E3?=
Message-ID: <3XTTR14fjyzP53@mail.python.org>

http://hg.python.org/cpython/rev/d9386e1d0b59
changeset:   79248:d9386e1d0b59
parent:      79246:ed358a8e5212
parent:      79247:7e83c8ccb1ba
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 14:22:04 2012 +0200
summary:
  null-merge from 3.3

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 14:49:55 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 14:49:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_A_few_more_files_to_touch=2E?=
Message-ID: <3XTV2q6l2gzQcx@mail.python.org>

http://hg.python.org/peps/rev/9ff51c87f9d6
changeset:   4523:9ff51c87f9d6
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 14:49:38 2012 +0200
summary:
  A few more files to touch.

files:
  pep-0101.txt |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -241,6 +241,8 @@
 
               $ find PC/ PCbuild/ -type f | xargs sed -i 's/python32/python33/g'
               $ hg mv -f PC/os2emx/python32.def PC/os2emx/python33.def
+              $ hg mv -f PC/python32stub.def PC/python33stub.def
+              $ hg mv -f PC/python32gen.py PC/python33gen.py
 
           ___ Commit these changes to the default branch.
               

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sat Sep 29 14:49:57 2012
From: python-checkins at python.org (georg.brandl)
Date: Sat, 29 Sep 2012 14:49:57 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_The_schedule_is_now_in_the_pa?=
	=?utf-8?b?c3Qu?=
Message-ID: <3XTV2s1W8FzN6h@mail.python.org>

http://hg.python.org/peps/rev/d1e870b4ce17
changeset:   4524:d1e870b4ce17
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 14:49:49 2012 +0200
summary:
  The schedule is now in the past.

files:
  pep-0398.txt |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/pep-0398.txt b/pep-0398.txt
--- a/pep-0398.txt
+++ b/pep-0398.txt
@@ -32,7 +32,7 @@
 Release Schedule
 ================
 
-The current schedule is:
+The schedule was:
 
 - 3.3.0 alpha 1: March 3, 2012
 - 3.3.0 alpha 2: April 1, 2012
@@ -50,8 +50,8 @@
 
 .. don't forget to update final date above as well
 
-Every release day listed here is the prospective day of tagging the release;
-the actual availability of the release for download on python.org will depend
+Every release day listed here was the prospective day of tagging the release;
+the actual availability of the release for download on python.org depends
 on the schedules of the crew.
 
 

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sat Sep 29 15:50:08 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 15:50:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Document_the_a?=
 =?utf-8?q?ddition_of_=27quote=27_to_shlex_in_What=27s_New=2E?=
Message-ID: <3XTWNJ3VwVzQXM@mail.python.org>

http://hg.python.org/cpython/rev/1acfede62364
changeset:   79249:1acfede62364
branch:      3.3
parent:      79247:7e83c8ccb1ba
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 09:49:05 2012 -0400
summary:
  Document the addition of 'quote' to shlex in What's New.

files:
  Doc/whatsnew/3.3.rst |  10 +++++++++-
  1 files changed, 9 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1466,6 +1466,15 @@
   :issue:`13245`)
 
 
+shlex
+-----
+
+* The previously undocumented helper function ``quote`` from the
+  :mod:`pipes` modules has been moved to the :mod:`shlex` module and
+  documented.  :func:`~shlex.quote` properly escapes all characters in a string
+  that might be otherwise given special meaning by the shell.
+
+
 shutil
 ------
 
@@ -1497,7 +1506,6 @@
   in :issue:`4489`.)
 
 
-
 signal
 ------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 15:50:09 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 15:50:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Document_the_addition_of_=27quote=27_to_shlex_i?=
 =?utf-8?q?n_What=27s_New=2E?=
Message-ID: <3XTWNK6wt8zQZc@mail.python.org>

http://hg.python.org/cpython/rev/c0e945c34a47
changeset:   79250:c0e945c34a47
parent:      79248:d9386e1d0b59
parent:      79249:1acfede62364
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 09:49:32 2012 -0400
summary:
  Merge: Document the addition of 'quote' to shlex in What's New.

files:
  Doc/whatsnew/3.3.rst |  10 +++++++++-
  1 files changed, 9 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1534,6 +1534,15 @@
   :issue:`13245`)
 
 
+shlex
+-----
+
+* The previously undocumented helper function ``quote`` from the
+  :mod:`pipes` modules has been moved to the :mod:`shlex` module and
+  documented.  :func:`~shlex.quote` properly escapes all characters in a string
+  that might be otherwise given special meaning by the shell.
+
+
 shutil
 ------
 
@@ -1565,7 +1574,6 @@
   in :issue:`4489`.)
 
 
-
 signal
 ------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 16:54:07 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 16:54:07 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Remove_visible?=
	=?utf-8?q?_XXX_in_What=27s_New=2E?=
Message-ID: <3XTXp76XrHzNgQ@mail.python.org>

http://hg.python.org/cpython/rev/970ca39480f4
changeset:   79251:970ca39480f4
branch:      3.3
parent:      79249:1acfede62364
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 10:53:31 2012 -0400
summary:
  Remove visible XXX in What's New.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1089,7 +1089,7 @@
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
    older than 1000.
- * XXX The :meth:`datetime.datetime.astimezone` method can now be
+ * The :meth:`datetime.datetime.astimezone` method can now be
    called without arguments to convert datetime instance to the system
    timezone.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 16:54:09 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 16:54:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Remove_visible_XXX_in_What=27s_New=2E?=
Message-ID: <3XTXp921ZyzNkN@mail.python.org>

http://hg.python.org/cpython/rev/fe11f5f3f996
changeset:   79252:fe11f5f3f996
parent:      79250:c0e945c34a47
parent:      79251:970ca39480f4
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 10:53:55 2012 -0400
summary:
  Merge: Remove visible XXX in What's New.

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1127,7 +1127,7 @@
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
    older than 1000.
- * XXX The :meth:`datetime.datetime.astimezone` method can now be
+ * The :meth:`datetime.datetime.astimezone` method can now be
    called without arguments to convert datetime instance to the system
    timezone.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 17:43:36 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 17:43:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_smtpd_chan?=
 =?utf-8?q?ges_to_whatsnew=2C_and_integrate_=27other=27_section=2E?=
Message-ID: <3XTYvD0qtJzMtd@mail.python.org>

http://hg.python.org/cpython/rev/127abd16168a
changeset:   79253:127abd16168a
branch:      3.3
parent:      79251:970ca39480f4
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 11:42:36 2012 -0400
summary:
  Add smtpd changes to whatsnew, and integrate 'other' section.

Also made the smtplib markup consistent with the rest of the markup.

files:
  Doc/whatsnew/3.3.rst |  47 +++++++++++++++++++++----------
  1 files changed, 31 insertions(+), 16 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1528,14 +1528,27 @@
 * :func:`signal.signal` and :func:`signal.siginterrupt` raise an OSError,
   instead of a RuntimeError: OSError has an errno attribute.
 
+
+smtpd
+-----
+
+* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
+  (size extension).  Per the standard, these extensions are enabled if and only
+  if the client initiates the session with an ``EHLO`` command.
+
+  (Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
+  Jauhiainen.  Substantial additional work on the patch contributed by Michele
+  Orr? and Dan Boswell.  :issue:`8739`)
+
+
 smtplib
 -------
 
-The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
-method now accept an SSLContext parameter to control parameters of the secure
-channel.
-
-(Contributed by Kasun Herath in :issue:`8809`)
+* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+  method now accept an SSLContext parameter to control parameters of the secure
+  channel.
+
+  (Contributed by Kasun Herath in :issue:`8809`)
 
 
 socket
@@ -1996,14 +2009,16 @@
   (implemented in :issue:`14040`.)
 
 
-Other issues
-------------
-
-.. Issue #11591: When :program:`python` was started with :option:`-S`,
-   ``import site`` will not add site-specific paths to the module search
-   paths.  In previous versions, it did.  See changeset for doc changes in
-   various files.  Contributed by Carl Meyer with editions by ?ric Araujo.
-
-.. Issue #10998: the -Q command-line flag and related artifacts have been
-   removed.  Code checking sys.flags.division_warning will need updating.
-   Contributed by ?ric Araujo.
+Command Line Switch Changes
+---------------------------
+
+* The -Q command-line flag and related artifacts have been removed.  Code
+  checking sys.flags.division_warning will need updating.
+
+  (:issue:`10998`, contributed by ?ric Araujo.)
+
+* When :program:`python` is started with :option:`-S`, ``import site``
+  will no longer add site-specific paths to the module search paths.  In
+  previous versions, it did.
+
+  (:issue:`11591`, contributed by Carl Meyer with editions by ?ric Araujo.)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 17:43:37 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 17:43:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Add_smtpd_changes_to_whatsnew=2C_and_integrate_?=
 =?utf-8?q?=27other=27_section=2E?=
Message-ID: <3XTYvF44gXzMtd@mail.python.org>

http://hg.python.org/cpython/rev/f11649b21603
changeset:   79254:f11649b21603
parent:      79252:fe11f5f3f996
parent:      79253:127abd16168a
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 11:43:21 2012 -0400
summary:
  Merge: Add smtpd changes to whatsnew, and integrate 'other' section.

Also made the smtplib markup consistent with the rest of the markup.

files:
  Doc/whatsnew/3.3.rst |  47 +++++++++++++++++++++----------
  1 files changed, 31 insertions(+), 16 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1596,14 +1596,27 @@
 * :func:`signal.signal` and :func:`signal.siginterrupt` raise an OSError,
   instead of a RuntimeError: OSError has an errno attribute.
 
+
+smtpd
+-----
+
+* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
+  (size extension).  Per the standard, these extensions are enabled if and only
+  if the client initiates the session with an ``EHLO`` command.
+
+  (Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
+  Jauhiainen.  Substantial additional work on the patch contributed by Michele
+  Orr? and Dan Boswell.  :issue:`8739`)
+
+
 smtplib
 -------
 
-The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
-method now accept an SSLContext parameter to control parameters of the secure
-channel.
-
-(Contributed by Kasun Herath in :issue:`8809`)
+* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+  method now accept an SSLContext parameter to control parameters of the secure
+  channel.
+
+  (Contributed by Kasun Herath in :issue:`8809`)
 
 
 socket
@@ -2078,14 +2091,16 @@
   (implemented in :issue:`14040`.)
 
 
-Other issues
-------------
-
-.. Issue #11591: When :program:`python` was started with :option:`-S`,
-   ``import site`` will not add site-specific paths to the module search
-   paths.  In previous versions, it did.  See changeset for doc changes in
-   various files.  Contributed by Carl Meyer with editions by ?ric Araujo.
-
-.. Issue #10998: the -Q command-line flag and related artifacts have been
-   removed.  Code checking sys.flags.division_warning will need updating.
-   Contributed by ?ric Araujo.
+Command Line Switch Changes
+---------------------------
+
+* The -Q command-line flag and related artifacts have been removed.  Code
+  checking sys.flags.division_warning will need updating.
+
+  (:issue:`10998`, contributed by ?ric Araujo.)
+
+* When :program:`python` is started with :option:`-S`, ``import site``
+  will no longer add site-specific paths to the module search paths.  In
+  previous versions, it did.
+
+  (:issue:`11591`, contributed by Carl Meyer with editions by ?ric Araujo.)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 19:48:02 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sat, 29 Sep 2012 19:48:02 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_upgrade_to_UCD_6=2E2?=
Message-ID: <3XTcfp03jBzQSF@mail.python.org>

http://hg.python.org/cpython/rev/dfe991036531
changeset:   79255:dfe991036531
parent:      79248:d9386e1d0b59
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Sep 29 13:47:39 2012 -0400
summary:
  upgrade to UCD 6.2

files:
  Doc/library/unicodedata.rst      |      4 +-
  Lib/test/test_unicodedata.py     |      2 +-
  Misc/NEWS                        |      2 +
  Modules/unicodedata_db.h         |    846 +-
  Modules/unicodename_db.h         |  22531 ++++++++--------
  Objects/unicodetype_db.h         |     13 +-
  Tools/unicode/makeunicodedata.py |      2 +-
  7 files changed, 11705 insertions(+), 11695 deletions(-)


diff --git a/Doc/library/unicodedata.rst b/Doc/library/unicodedata.rst
--- a/Doc/library/unicodedata.rst
+++ b/Doc/library/unicodedata.rst
@@ -15,8 +15,8 @@
 
 This module provides access to the Unicode Character Database (UCD) which
 defines character properties for all Unicode characters. The data contained in
-this database is compiled from the `UCD version 6.1.0
-<http://www.unicode.org/Public/6.1.0/ucd>`_.
+this database is compiled from the `UCD version 6.2.0
+<http://www.unicode.org/Public/6.2.0/ucd>`_.
 
 The module uses the same names and symbols as defined by Unicode
 Standard Annex #44, `"Unicode Character Database"
diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py
--- a/Lib/test/test_unicodedata.py
+++ b/Lib/test/test_unicodedata.py
@@ -80,7 +80,7 @@
 class UnicodeFunctionsTest(UnicodeDatabaseTest):
 
     # update this, if the database changes
-    expectedchecksum = '17fe2f12b788e4fff5479b469c4404bb6ecf841f'
+    expectedchecksum = 'ebd64e81553c9cb37f424f5616254499fcd8849e'
     def test_function_checksum(self):
         data = []
         h = hashlib.sha1()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Upgrade Unicode data (UCD) to version 6.2.
+
 Library
 -------
 
diff --git a/Modules/unicodedata_db.h b/Modules/unicodedata_db.h
--- a/Modules/unicodedata_db.h
+++ b/Modules/unicodedata_db.h
@@ -1,6 +1,6 @@
 /* this file was generated by Tools/unicode/makeunicodedata.py 3.2 */
 
-#define UNIDATA_VERSION "6.1.0"
+#define UNIDATA_VERSION "6.2.0"
 /* a list of unique database records */
 const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = {
     {0, 0, 0, 0, 0, 0},
@@ -1444,41 +1444,40 @@
     171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 170, 170, 170, 170, 170, 171, 171, 171, 171, 171, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 171, 171, 171, 171, 171, 171, 
     171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 
-    171, 171, 171, 171, 171, 171, 171, 171, 48, 48, 48, 48, 48, 48, 48, 48, 
+    171, 171, 171, 171, 171, 171, 171, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 170, 170, 170, 170, 170, 170, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 48, 
-    48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 
+    48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 48, 48, 48, 
+    48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, 
-    48, 48, 48, 48, 48, 48, 48, 0, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 
+    48, 48, 48, 48, 48, 0, 48, 0, 48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 
-    48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 
+    48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 
-    81, 81, 81, 83, 83, 83, 83, 83, 83, 83, 83, 83, 148, 148, 148, 148, 148, 
-    148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 
-    148, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 81, 81, 
+    81, 83, 83, 83, 83, 83, 83, 83, 83, 83, 148, 148, 148, 148, 148, 148, 
+    148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 0, 
+    0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    84, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
@@ -1498,15 +1497,16 @@
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 172, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 163, 164, 0, 
-    0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 83, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 172, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 163, 164, 0, 0, 0, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 83, 83, 83, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 83, 83, 83, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 
     48, 48, 48, 135, 135, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, 
     142, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 
@@ -1645,15 +1645,15 @@
     211, 211, 212, 213, 214, 215, 210, 34, 34, 34, 34, 210, 210, 210, 210, 
     210, 211, 211, 212, 213, 214, 0, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 
     51, 51, 51, 0, 0, 0, 85, 85, 85, 85, 85, 85, 85, 85, 216, 217, 85, 85, 
-    23, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 81, 175, 175, 81, 81, 
-    81, 81, 175, 175, 175, 81, 81, 82, 82, 82, 82, 81, 82, 82, 82, 175, 175, 
-    81, 86, 81, 175, 175, 86, 86, 86, 86, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 218, 218, 49, 219, 26, 219, 218, 49, 26, 219, 35, 49, 49, 
-    49, 35, 35, 49, 49, 49, 46, 26, 49, 219, 26, 78, 49, 49, 49, 49, 49, 26, 
-    26, 218, 219, 219, 26, 49, 26, 220, 26, 49, 26, 183, 220, 49, 49, 221, 
-    35, 49, 49, 44, 49, 35, 156, 156, 156, 156, 35, 26, 218, 35, 35, 49, 49, 
-    222, 78, 78, 78, 78, 49, 35, 35, 35, 35, 26, 78, 26, 26, 47, 80, 223, 
+    23, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 81, 175, 175, 81, 
+    81, 81, 81, 175, 175, 175, 81, 81, 82, 82, 82, 82, 81, 82, 82, 82, 175, 
+    175, 81, 86, 81, 175, 175, 86, 86, 86, 86, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 218, 218, 49, 219, 26, 219, 218, 49, 26, 219, 35, 49, 
+    49, 49, 35, 35, 49, 49, 49, 46, 26, 49, 219, 26, 78, 49, 49, 49, 49, 49, 
+    26, 26, 218, 219, 219, 26, 49, 26, 220, 26, 49, 26, 183, 220, 49, 49, 
+    221, 35, 49, 49, 44, 49, 35, 156, 156, 156, 156, 35, 26, 218, 35, 35, 49, 
+    49, 222, 78, 78, 78, 78, 49, 35, 35, 35, 35, 26, 78, 26, 26, 47, 80, 223, 
     223, 223, 37, 37, 223, 223, 223, 223, 223, 223, 37, 37, 37, 37, 223, 224, 
     224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 225, 225, 225, 
     225, 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, 225, 225, 225, 
@@ -2072,12 +2072,11 @@
     257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 
     257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 
     257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 257, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 268, 268, 268, 268, 268, 
+    0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 268, 268, 268, 268, 268, 268, 
     268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 
     268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 
     268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 
@@ -2086,7 +2085,7 @@
     268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 
     268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 
     268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 
-    268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 269, 269, 269, 
+    268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
@@ -2095,7 +2094,7 @@
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
-    269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 270, 
+    269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
@@ -2106,36 +2105,36 @@
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
-    270, 170, 170, 270, 170, 270, 170, 170, 270, 270, 270, 270, 270, 270, 
-    270, 270, 270, 270, 170, 270, 170, 270, 170, 170, 270, 270, 170, 170, 
-    170, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
+    170, 170, 270, 170, 270, 170, 170, 270, 270, 270, 270, 270, 270, 270, 
+    270, 270, 270, 170, 270, 170, 270, 170, 170, 270, 270, 170, 170, 170, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
-    270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 0, 0, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
+    270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 0, 0, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
-    270, 270, 270, 270, 270, 270, 270, 270, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    35, 35, 35, 35, 35, 0, 0, 0, 0, 0, 271, 272, 271, 273, 273, 273, 273, 
-    273, 273, 273, 273, 273, 211, 271, 271, 271, 271, 271, 271, 271, 271, 
-    271, 271, 271, 271, 271, 0, 271, 271, 271, 271, 271, 0, 271, 0, 271, 271, 
-    0, 271, 271, 0, 271, 271, 271, 271, 271, 271, 271, 271, 271, 273, 130, 
+    270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
+    270, 270, 270, 270, 270, 270, 270, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 35, 35, 35, 35, 35, 35, 35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 
+    35, 35, 35, 35, 0, 0, 0, 0, 0, 271, 272, 271, 273, 273, 273, 273, 273, 
+    273, 273, 273, 273, 211, 271, 271, 271, 271, 271, 271, 271, 271, 271, 
+    271, 271, 271, 271, 0, 271, 271, 271, 271, 271, 0, 271, 0, 271, 271, 0, 
+    271, 271, 0, 271, 271, 271, 271, 271, 271, 271, 271, 271, 273, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 274, 
-    274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 
-    274, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 274, 274, 
+    274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
@@ -2152,325 +2151,318 @@
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 195, 275, 0, 0, 0, 0, 0, 0, 0, 0, 
+    130, 130, 130, 130, 130, 130, 195, 275, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 0, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 276, 26, 0, 0, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
+    71, 71, 71, 71, 277, 277, 277, 277, 277, 277, 277, 278, 279, 277, 0, 0, 
+    0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 277, 
+    280, 280, 281, 281, 278, 279, 278, 279, 278, 279, 278, 279, 278, 279, 
+    278, 279, 278, 279, 278, 279, 243, 243, 278, 279, 277, 277, 277, 277, 
+    281, 281, 281, 282, 277, 282, 0, 277, 282, 277, 277, 280, 283, 284, 283, 
+    284, 283, 284, 285, 277, 277, 286, 287, 288, 288, 289, 0, 277, 290, 285, 
+    277, 0, 0, 0, 0, 130, 130, 130, 117, 130, 0, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 0, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 276, 26, 0, 0, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
-    71, 71, 71, 71, 71, 71, 71, 277, 277, 277, 277, 277, 277, 277, 278, 279, 
-    277, 0, 0, 0, 0, 0, 0, 81, 81, 81, 81, 81, 81, 81, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 277, 280, 280, 281, 281, 278, 279, 278, 279, 278, 279, 278, 279, 
-    278, 279, 278, 279, 278, 279, 278, 279, 243, 243, 278, 279, 277, 277, 
-    277, 277, 281, 281, 281, 282, 277, 282, 0, 277, 282, 277, 277, 280, 283, 
-    284, 283, 284, 283, 284, 285, 277, 277, 286, 287, 288, 288, 289, 0, 277, 
-    290, 285, 277, 0, 0, 0, 0, 130, 130, 130, 117, 130, 0, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 0, 0, 187, 0, 291, 291, 292, 293, 292, 291, 
-    291, 294, 295, 291, 296, 297, 298, 297, 297, 299, 299, 299, 299, 299, 
-    299, 299, 299, 299, 299, 297, 291, 300, 301, 300, 291, 291, 302, 302, 
+    130, 130, 130, 130, 0, 0, 187, 0, 291, 291, 292, 293, 292, 291, 291, 294, 
+    295, 291, 296, 297, 298, 297, 297, 299, 299, 299, 299, 299, 299, 299, 
+    299, 299, 299, 297, 291, 300, 301, 300, 291, 291, 302, 302, 302, 302, 
     302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 
-    302, 302, 302, 302, 302, 302, 302, 302, 302, 302, 294, 291, 295, 303, 
-    304, 303, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 
+    302, 302, 302, 302, 302, 302, 302, 302, 294, 291, 295, 303, 304, 303, 
     305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 
-    294, 301, 295, 301, 294, 295, 306, 307, 308, 306, 306, 309, 309, 309, 
-    309, 309, 309, 309, 309, 309, 309, 310, 309, 309, 309, 309, 309, 309, 
+    305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 294, 301, 
+    295, 301, 294, 295, 306, 307, 308, 306, 306, 309, 309, 309, 309, 309, 
+    309, 309, 309, 309, 309, 310, 309, 309, 309, 309, 309, 309, 309, 309, 
     309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 
     309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 
-    309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 310, 310, 309, 
+    309, 309, 309, 309, 309, 309, 309, 309, 309, 310, 310, 309, 309, 309, 
     309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 
-    309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 
-    309, 309, 0, 0, 0, 309, 309, 309, 309, 309, 309, 0, 0, 309, 309, 309, 
-    309, 309, 309, 0, 0, 309, 309, 309, 309, 309, 309, 0, 0, 309, 309, 309, 
-    0, 0, 0, 293, 293, 301, 303, 311, 293, 293, 0, 312, 313, 313, 313, 313, 
-    312, 312, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 314, 314, 314, 26, 30, 0, 0, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 
+    309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, 0, 
+    0, 0, 309, 309, 309, 309, 309, 309, 0, 0, 309, 309, 309, 309, 309, 309, 
+    0, 0, 309, 309, 309, 309, 309, 309, 0, 0, 309, 309, 309, 0, 0, 0, 293, 
+    293, 301, 303, 311, 293, 293, 0, 312, 313, 313, 313, 313, 312, 312, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 314, 314, 314, 26, 30, 0, 0, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 0, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    0, 48, 48, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 83, 138, 83, 0, 0, 0, 0, 148, 148, 
+    48, 0, 0, 0, 0, 0, 83, 138, 83, 0, 0, 0, 0, 148, 148, 148, 148, 148, 148, 
     148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 
     148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 
-    148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 
-    148, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 315, 315, 315, 315, 
+    148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 0, 0, 0, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 315, 315, 315, 315, 315, 315, 315, 315, 315, 
     315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 
     315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 
     315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, 
-    315, 315, 315, 315, 315, 315, 315, 153, 153, 153, 153, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 153, 0, 0, 0, 0, 0, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 
+    315, 315, 153, 153, 153, 153, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 153, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 86, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 86, 0, 0, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 148, 148, 148, 148, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 173, 48, 48, 48, 48, 48, 48, 48, 48, 173, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 83, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 
-    0, 48, 48, 48, 48, 48, 48, 48, 48, 83, 173, 173, 173, 173, 173, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 
-    44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 
-    44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 
-    144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 
-    107, 107, 0, 0, 107, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 0, 107, 107, 0, 0, 0, 107, 0, 0, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 0, 104, 316, 316, 316, 316, 316, 316, 
-    316, 316, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    316, 316, 316, 316, 316, 316, 0, 0, 0, 138, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 0, 0, 0, 0, 0, 0, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 107, 135, 135, 135, 0, 135, 135, 0, 0, 0, 0, 0, 
-    135, 86, 135, 81, 107, 107, 107, 107, 0, 107, 107, 107, 0, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 81, 175, 
-    86, 0, 0, 0, 0, 142, 316, 316, 316, 316, 316, 316, 316, 316, 0, 0, 0, 0, 
-    0, 0, 0, 0, 104, 104, 104, 104, 104, 104, 104, 104, 104, 0, 0, 0, 0, 0, 
-    0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 316, 316, 104, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 0, 0, 0, 138, 138, 138, 138, 138, 138, 138, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 0, 0, 316, 316, 316, 316, 316, 316, 316, 316, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 0, 0, 0, 0, 0, 316, 316, 316, 316, 316, 316, 
-    316, 316, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
-    107, 107, 107, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 317, 317, 317, 317, 317, 
-    317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 
-    317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 0, 139, 135, 
-    139, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, 
-    142, 83, 83, 83, 83, 83, 83, 83, 0, 0, 0, 0, 153, 153, 153, 153, 153, 
-    153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 
-    153, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 135, 139, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 140, 48, 
-    140, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 140, 48, 48, 
-    48, 48, 139, 139, 139, 135, 135, 135, 135, 139, 139, 142, 141, 83, 83, 
-    188, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 
-    144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 81, 81, 81, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 149, 135, 135, 135, 135, 
-    139, 135, 150, 150, 135, 135, 135, 142, 142, 0, 144, 144, 144, 144, 144, 
-    144, 144, 144, 144, 144, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 135, 135, 139, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 
-    139, 135, 135, 135, 135, 135, 135, 135, 135, 135, 139, 174, 48, 48, 48, 
-    48, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 
-    144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 135, 139, 135, 139, 139, 135, 135, 135, 135, 135, 135, 
-    174, 145, 0, 0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 
-    144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 0, 148, 148, 148, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 173, 48, 
+    48, 48, 48, 48, 48, 48, 48, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 0, 83, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 
+    48, 83, 173, 173, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 
+    44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 
+    44, 44, 44, 44, 44, 44, 44, 44, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
+    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
+    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
-    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
-    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
-    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
-    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
-    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
-    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
-    173, 173, 173, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 83, 83, 
-    83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 107, 107, 107, 0, 0, 107, 0, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 0, 107, 107, 0, 0, 0, 107, 0, 0, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 0, 104, 316, 316, 316, 316, 316, 316, 316, 316, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 316, 316, 316, 316, 316, 
+    316, 0, 0, 0, 138, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 0, 0, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 
+    0, 0, 0, 0, 0, 107, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    107, 135, 135, 135, 0, 135, 135, 0, 0, 0, 0, 0, 135, 86, 135, 81, 107, 
+    107, 107, 107, 0, 107, 107, 107, 0, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 0, 0, 0, 0, 81, 175, 86, 0, 0, 0, 0, 142, 
+    316, 316, 316, 316, 316, 316, 316, 316, 0, 0, 0, 0, 0, 0, 0, 0, 104, 104, 
+    104, 104, 104, 104, 104, 104, 104, 0, 0, 0, 0, 0, 0, 0, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 316, 316, 
+    104, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 0, 0, 0, 
+    138, 138, 138, 138, 138, 138, 138, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 0, 0, 316, 316, 316, 316, 316, 316, 316, 316, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 0, 0, 0, 0, 0, 316, 316, 316, 316, 316, 316, 316, 316, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 
+    107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 
+    317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 
+    317, 317, 317, 317, 317, 317, 317, 0, 139, 135, 139, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 135, 135, 135, 135, 
+    135, 135, 135, 135, 135, 135, 135, 135, 135, 142, 83, 83, 83, 83, 83, 83, 
+    83, 0, 0, 0, 0, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, 
+    153, 153, 153, 153, 153, 153, 153, 153, 153, 144, 144, 144, 144, 144, 
+    144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    135, 135, 139, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 140, 48, 140, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 140, 48, 48, 48, 48, 139, 139, 139, 135, 
+    135, 135, 135, 139, 139, 142, 141, 83, 83, 188, 83, 83, 83, 83, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 
+    0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 0, 
+    0, 81, 81, 81, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 149, 135, 135, 135, 135, 139, 135, 150, 150, 135, 135, 
+    135, 142, 142, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 83, 
+    83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 135, 139, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 139, 139, 139, 135, 135, 135, 
+    135, 135, 135, 135, 135, 135, 139, 174, 48, 48, 48, 48, 83, 83, 83, 83, 
+    0, 0, 0, 0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 135, 
+    139, 135, 139, 139, 135, 135, 135, 135, 135, 135, 174, 145, 0, 0, 0, 0, 
+    0, 0, 0, 0, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
     48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
-    48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 
+    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
+    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
+    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
+    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
+    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
+    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 
+    173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 173, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 83, 83, 83, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 
+    48, 48, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 139, 139, 139, 139, 139, 
     139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 
     139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 
-    139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 
-    139, 139, 139, 139, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 
-    135, 135, 135, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 
-    170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 135, 135, 135, 135, 53, 53, 53, 
+    53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 80, 0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
     80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 80, 318, 318, 318, 318, 318, 318, 318, 319, 319, 
-    175, 175, 175, 80, 80, 80, 320, 319, 319, 319, 319, 319, 187, 187, 187, 
-    187, 187, 187, 187, 187, 86, 86, 86, 86, 86, 86, 86, 86, 80, 80, 81, 81, 
-    81, 81, 81, 86, 86, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 81, 
-    81, 81, 81, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 318, 318, 
-    318, 318, 318, 318, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    318, 318, 318, 318, 318, 318, 318, 319, 319, 175, 175, 175, 80, 80, 80, 
+    320, 319, 319, 319, 319, 319, 187, 187, 187, 187, 187, 187, 187, 187, 86, 
+    86, 86, 86, 86, 86, 86, 86, 80, 80, 81, 81, 81, 81, 81, 86, 86, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 81, 81, 81, 81, 80, 80, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 318, 318, 318, 318, 318, 318, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 81, 
-    81, 81, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 81, 81, 81, 26, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 148, 148, 
-    148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 
-    148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 49, 49, 49, 49, 49, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 148, 148, 148, 148, 148, 148, 148, 148, 148, 
+    148, 148, 148, 148, 148, 148, 148, 148, 148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 0, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 0, 
+    49, 49, 0, 0, 49, 0, 0, 49, 49, 0, 0, 49, 49, 49, 49, 0, 49, 49, 49, 49, 
+    49, 49, 49, 49, 35, 35, 35, 35, 0, 35, 0, 35, 35, 35, 35, 35, 35, 35, 0, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 
     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    35, 35, 35, 35, 35, 35, 35, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 
+    49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 0, 49, 49, 49, 49, 0, 0, 49, 
+    49, 49, 49, 49, 49, 49, 49, 0, 49, 49, 49, 49, 49, 49, 49, 0, 35, 35, 35, 
     35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 49, 0, 49, 49, 0, 0, 49, 0, 0, 49, 49, 0, 0, 49, 
-    49, 49, 49, 0, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 0, 35, 0, 
-    35, 35, 35, 35, 35, 35, 35, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 49, 49, 0, 49, 49, 49, 49, 0, 49, 49, 49, 49, 49, 0, 
+    49, 0, 0, 0, 49, 49, 49, 49, 49, 49, 49, 0, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
     35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
     49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
     35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 
-    49, 0, 49, 49, 49, 49, 0, 0, 49, 49, 49, 49, 49, 49, 49, 49, 0, 49, 49, 
-    49, 49, 49, 49, 49, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 0, 49, 
-    49, 49, 49, 0, 49, 49, 49, 49, 49, 0, 49, 0, 0, 0, 49, 49, 49, 49, 49, 
-    49, 49, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
     35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 
     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
     49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
     35, 35, 35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 
     35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 49, 49, 49, 49, 49, 49, 49, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 0, 0, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 49, 49, 49, 49, 49, 49, 49, 321, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 222, 
-    35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
-    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 321, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 222, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 0, 0, 49, 49, 49, 49, 49, 49, 49, 49, 
     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 321, 
     35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
     35, 35, 35, 35, 35, 35, 35, 222, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 
@@ -2480,157 +2472,163 @@
     49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
     49, 49, 49, 49, 49, 49, 49, 321, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
     35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 222, 35, 35, 
-    35, 35, 35, 35, 49, 35, 0, 0, 322, 322, 322, 322, 322, 322, 322, 322, 
+    35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 321, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 222, 35, 35, 35, 35, 35, 35, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 
+    49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 321, 35, 35, 
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
+    35, 35, 35, 35, 35, 222, 35, 35, 35, 35, 35, 35, 49, 35, 0, 0, 322, 322, 
     322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 
     322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 
     322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, 
-    130, 130, 130, 130, 0, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    322, 322, 322, 322, 322, 322, 130, 130, 130, 130, 0, 130, 130, 130, 130, 
     130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 0, 130, 130, 0, 130, 0, 0, 130, 0, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 0, 130, 130, 130, 130, 0, 130, 0, 130, 0, 
-    0, 0, 0, 0, 0, 130, 0, 0, 0, 0, 130, 0, 130, 0, 130, 0, 130, 130, 130, 0, 
-    130, 130, 0, 130, 0, 0, 130, 0, 130, 0, 130, 0, 130, 0, 130, 0, 130, 130, 
-    0, 130, 0, 0, 130, 130, 130, 130, 0, 130, 130, 130, 130, 130, 130, 130, 
-    0, 130, 130, 130, 130, 0, 130, 130, 130, 130, 0, 130, 0, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 0, 130, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 0, 0, 0, 0, 130, 
-    130, 130, 0, 130, 130, 130, 130, 130, 0, 130, 130, 130, 130, 130, 130, 
-    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 78, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 237, 237, 
-    237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 
-    237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 
-    323, 0, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 
-    237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 
-    237, 237, 237, 237, 237, 324, 324, 324, 324, 324, 324, 324, 324, 324, 
-    324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 
-    324, 324, 324, 218, 218, 0, 0, 0, 0, 324, 324, 324, 324, 324, 324, 324, 
-    324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 
-    324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 237, 324, 324, 
-    324, 324, 324, 324, 324, 324, 324, 324, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 80, 80, 80, 80, 80, 
-    80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
-    80, 80, 264, 264, 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 264, 264, 
-    264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 
-    264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 
-    264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 0, 0, 0, 
-    0, 0, 264, 264, 264, 264, 264, 264, 264, 264, 264, 0, 0, 0, 0, 0, 0, 0, 
-    264, 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 0, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 26, 0, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    0, 26, 26, 26, 26, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 
-    26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 130, 130, 0, 130, 0, 0, 
+    130, 0, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 130, 130, 
+    130, 130, 0, 130, 0, 130, 0, 0, 0, 0, 0, 0, 130, 0, 0, 0, 0, 130, 0, 130, 
+    0, 130, 0, 130, 130, 130, 0, 130, 130, 0, 130, 0, 0, 130, 0, 130, 0, 130, 
+    0, 130, 0, 130, 0, 130, 130, 0, 130, 0, 0, 130, 130, 130, 130, 0, 130, 
+    130, 130, 130, 130, 130, 130, 0, 130, 130, 130, 130, 0, 130, 130, 130, 
+    130, 0, 130, 0, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 0, 130, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 0, 0, 0, 0, 0, 130, 130, 130, 0, 130, 130, 130, 130, 130, 0, 
+    130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 
+    130, 130, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 78, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 34, 34, 34, 34, 
+    34, 34, 0, 0, 0, 0, 0, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 
+    237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 
+    237, 237, 237, 237, 237, 237, 323, 0, 237, 237, 237, 237, 237, 237, 237, 
+    237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 
+    237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, 324, 324, 324, 
+    324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 
+    324, 324, 324, 324, 324, 324, 324, 324, 324, 218, 218, 0, 0, 0, 0, 324, 
+    324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 
+    324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 
+    324, 324, 324, 237, 324, 324, 324, 324, 324, 324, 324, 324, 324, 324, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 
+    80, 80, 80, 80, 80, 80, 80, 80, 80, 264, 264, 264, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 
+    264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 
+    264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, 
+    264, 264, 264, 264, 0, 0, 0, 0, 0, 264, 264, 264, 264, 264, 264, 264, 
+    264, 264, 0, 0, 0, 0, 0, 0, 0, 264, 264, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 
+    26, 26, 26, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 
+    26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 0, 26, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 0, 26, 26, 26, 26, 0, 0, 0, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 0, 0, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 
-    0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
     26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
-    26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
+    170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
+    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
     170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 
-    170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 270, 270, 270, 270, 
+    170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
     270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 
-    270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 
+    270, 270, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 187, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 187, 187, 187, 187, 187, 187, 187, 
     187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 
     187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 
     187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 
     187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 
     187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 
     187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 187, 
-    187, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
+    187, 187, 187, 187, 187, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
     71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
     71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
     71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
@@ -2643,8 +2641,8 @@
     71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
     71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
     71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 
-    71, 71, 71, 71, 71, 71, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
+    71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
@@ -2652,8 +2650,8 @@
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
     269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
-    269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 0, 
-    0, 
+    269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, 
+    269, 269, 269, 269, 0, 0, 
 };
 
 /* decomposition data */
@@ -5863,7 +5861,7 @@
     0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 4, 0, 0, 37, 38, 39, 40, 
     41, 42, 1, 1, 0, 0, 0, 4, 36, 8, 6, 7, 37, 38, 39, 40, 41, 42, 1, 1, 0, 
     0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 9, 
     9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
diff --git a/Modules/unicodename_db.h b/Modules/unicodename_db.h
--- a/Modules/unicodename_db.h
+++ b/Modules/unicodename_db.h
@@ -65,9 +65,9 @@
     76, 85, 197, 83, 72, 65, 82, 65, 68, 193, 83, 73, 78, 72, 65, 76, 193, 
     75, 65, 128, 82, 85, 78, 73, 195, 83, 65, 85, 82, 65, 83, 72, 84, 82, 
     193, 84, 69, 84, 82, 65, 71, 82, 65, 205, 68, 69, 83, 69, 82, 69, 212, 
-    84, 73, 76, 68, 69, 128, 71, 85, 82, 77, 85, 75, 72, 201, 77, 65, 128, 
-    77, 65, 89, 69, 203, 77, 69, 69, 84, 69, 201, 78, 79, 84, 65, 84, 73, 79, 
-    206, 83, 89, 82, 73, 65, 195, 70, 73, 86, 69, 128, 80, 65, 128, 89, 65, 
+    83, 89, 82, 73, 65, 195, 84, 73, 76, 68, 69, 128, 71, 85, 82, 77, 85, 75, 
+    72, 201, 77, 65, 128, 77, 65, 89, 69, 203, 77, 69, 69, 84, 69, 201, 78, 
+    79, 84, 65, 84, 73, 79, 206, 70, 73, 86, 69, 128, 80, 65, 128, 89, 65, 
     128, 76, 73, 71, 72, 212, 83, 73, 88, 128, 69, 73, 71, 72, 84, 128, 76, 
     69, 80, 67, 72, 193, 78, 65, 128, 83, 69, 86, 69, 78, 128, 76, 79, 78, 
     199, 78, 73, 78, 69, 128, 84, 85, 82, 75, 73, 195, 72, 65, 77, 90, 193, 
@@ -525,79 +525,79 @@
     84, 85, 84, 84, 89, 128, 84, 85, 84, 69, 89, 65, 83, 65, 84, 128, 84, 85, 
     84, 128, 84, 85, 82, 88, 128, 84, 85, 82, 85, 128, 84, 85, 82, 84, 76, 
     69, 128, 84, 85, 82, 79, 50, 128, 84, 85, 82, 78, 83, 84, 73, 76, 69, 
-    128, 84, 85, 82, 78, 69, 196, 84, 85, 82, 206, 84, 85, 82, 66, 65, 78, 
-    128, 84, 85, 82, 128, 84, 85, 80, 128, 84, 85, 79, 88, 128, 84, 85, 79, 
-    84, 128, 84, 85, 79, 80, 128, 84, 85, 79, 128, 84, 85, 78, 78, 89, 128, 
-    84, 85, 77, 69, 84, 69, 83, 128, 84, 85, 77, 65, 69, 128, 84, 85, 77, 
-    128, 84, 85, 76, 73, 80, 128, 84, 85, 75, 87, 69, 78, 84, 73, 83, 128, 
-    84, 85, 75, 128, 84, 85, 71, 82, 73, 203, 84, 85, 71, 50, 128, 84, 85, 
-    71, 178, 84, 85, 65, 82, 69, 199, 84, 85, 65, 69, 80, 128, 84, 85, 65, 
-    69, 128, 84, 213, 84, 84, 85, 85, 128, 84, 84, 85, 68, 68, 65, 71, 128, 
-    84, 84, 85, 68, 68, 65, 65, 71, 128, 84, 84, 85, 128, 84, 84, 84, 72, 65, 
-    128, 84, 84, 84, 65, 128, 84, 84, 83, 85, 128, 84, 84, 83, 79, 128, 84, 
-    84, 83, 73, 128, 84, 84, 83, 69, 69, 128, 84, 84, 83, 69, 128, 84, 84, 
-    83, 65, 128, 84, 84, 79, 79, 128, 84, 84, 73, 73, 128, 84, 84, 73, 128, 
-    84, 84, 72, 87, 69, 128, 84, 84, 72, 85, 128, 84, 84, 72, 79, 79, 128, 
-    84, 84, 72, 79, 128, 84, 84, 72, 73, 128, 84, 84, 72, 69, 69, 128, 84, 
-    84, 72, 69, 128, 84, 84, 72, 65, 65, 128, 84, 84, 72, 128, 84, 84, 69, 
-    72, 69, 72, 128, 84, 84, 69, 72, 69, 200, 84, 84, 69, 72, 128, 84, 84, 
-    69, 200, 84, 84, 69, 69, 128, 84, 84, 65, 89, 65, 78, 78, 65, 128, 84, 
-    84, 65, 85, 128, 84, 84, 65, 73, 128, 84, 84, 65, 65, 128, 84, 84, 50, 
-    128, 84, 83, 87, 69, 128, 84, 83, 87, 65, 128, 84, 83, 86, 128, 84, 83, 
-    83, 69, 128, 84, 83, 83, 65, 128, 84, 83, 72, 85, 71, 83, 128, 84, 83, 
-    72, 79, 79, 75, 128, 84, 83, 72, 79, 79, 203, 84, 83, 72, 69, 83, 128, 
-    84, 83, 72, 69, 71, 128, 84, 83, 72, 69, 199, 84, 83, 72, 69, 128, 84, 
-    83, 72, 65, 128, 84, 83, 69, 82, 69, 128, 84, 83, 65, 68, 73, 128, 84, 
-    83, 65, 68, 201, 84, 83, 65, 65, 68, 73, 89, 128, 84, 83, 65, 65, 128, 
-    84, 83, 193, 84, 82, 89, 66, 76, 73, 79, 206, 84, 82, 85, 84, 72, 128, 
-    84, 82, 85, 78, 75, 128, 84, 82, 85, 78, 67, 65, 84, 69, 196, 84, 82, 85, 
-    77, 80, 69, 84, 128, 84, 82, 85, 69, 128, 84, 82, 85, 67, 75, 128, 84, 
-    82, 79, 80, 73, 67, 65, 204, 84, 82, 79, 80, 72, 89, 128, 84, 82, 79, 77, 
-    73, 75, 79, 83, 89, 78, 65, 71, 77, 65, 128, 84, 82, 79, 77, 73, 75, 79, 
-    80, 83, 73, 70, 73, 83, 84, 79, 78, 128, 84, 82, 79, 77, 73, 75, 79, 80, 
-    65, 82, 65, 75, 65, 76, 69, 83, 77, 65, 128, 84, 82, 79, 77, 73, 75, 79, 
-    78, 128, 84, 82, 79, 77, 73, 75, 79, 206, 84, 82, 79, 77, 73, 75, 79, 76, 
-    89, 71, 73, 83, 77, 65, 128, 84, 82, 79, 76, 76, 69, 89, 66, 85, 83, 128, 
-    84, 82, 79, 75, 85, 84, 65, 83, 84, 201, 84, 82, 79, 69, 90, 69, 78, 73, 
-    65, 206, 84, 82, 73, 85, 77, 80, 72, 128, 84, 82, 73, 84, 79, 211, 84, 
-    82, 73, 84, 73, 77, 79, 82, 73, 79, 78, 128, 84, 82, 73, 83, 73, 77, 79, 
-    85, 128, 84, 82, 73, 83, 69, 77, 69, 128, 84, 82, 73, 80, 79, 68, 128, 
-    84, 82, 73, 80, 76, 73, 128, 84, 82, 73, 80, 76, 197, 84, 82, 73, 79, 
-    206, 84, 82, 73, 73, 83, 65, 80, 128, 84, 82, 73, 71, 82, 65, 77, 77, 79, 
-    211, 84, 82, 73, 71, 82, 65, 205, 84, 82, 73, 71, 79, 82, 71, 79, 78, 
-    128, 84, 82, 73, 70, 79, 78, 73, 65, 83, 128, 84, 82, 73, 70, 79, 76, 73, 
-    65, 84, 197, 84, 82, 73, 68, 69, 78, 84, 128, 84, 82, 73, 68, 69, 78, 
-    212, 84, 82, 73, 67, 79, 76, 79, 78, 128, 84, 82, 73, 65, 78, 71, 85, 76, 
-    65, 210, 84, 82, 73, 65, 78, 71, 76, 69, 45, 82, 79, 85, 78, 196, 84, 82, 
-    73, 65, 78, 71, 76, 69, 45, 72, 69, 65, 68, 69, 196, 84, 82, 73, 65, 78, 
-    71, 76, 69, 128, 84, 82, 73, 65, 78, 71, 76, 197, 84, 82, 73, 65, 128, 
-    84, 82, 73, 128, 84, 82, 69, 83, 73, 76, 76, 79, 128, 84, 82, 69, 78, 68, 
-    128, 84, 82, 69, 78, 196, 84, 82, 69, 77, 79, 76, 79, 45, 51, 128, 84, 
-    82, 69, 77, 79, 76, 79, 45, 50, 128, 84, 82, 69, 77, 79, 76, 79, 45, 49, 
-    128, 84, 82, 69, 69, 128, 84, 82, 69, 197, 84, 82, 69, 65, 68, 73, 78, 
-    71, 128, 84, 82, 65, 89, 128, 84, 82, 65, 80, 69, 90, 73, 85, 77, 128, 
-    84, 82, 65, 78, 83, 86, 69, 82, 83, 65, 204, 84, 82, 65, 78, 83, 80, 79, 
-    83, 73, 84, 73, 79, 206, 84, 82, 65, 78, 83, 77, 73, 212, 84, 82, 65, 78, 
-    83, 77, 73, 83, 83, 73, 79, 78, 128, 84, 82, 65, 78, 83, 77, 73, 83, 83, 
-    73, 79, 206, 84, 82, 65, 77, 87, 65, 89, 128, 84, 82, 65, 77, 128, 84, 
-    82, 65, 205, 84, 82, 65, 73, 78, 128, 84, 82, 65, 73, 206, 84, 82, 65, 
-    73, 76, 73, 78, 199, 84, 82, 65, 70, 70, 73, 67, 128, 84, 82, 65, 70, 70, 
-    73, 195, 84, 82, 65, 68, 197, 84, 82, 65, 67, 84, 79, 82, 128, 84, 82, 
-    65, 67, 75, 128, 84, 82, 128, 84, 79, 88, 128, 84, 79, 87, 69, 82, 128, 
-    84, 79, 85, 82, 78, 79, 73, 211, 84, 79, 84, 65, 204, 84, 79, 84, 128, 
-    84, 79, 82, 84, 79, 73, 83, 197, 84, 79, 82, 67, 85, 76, 85, 83, 128, 84, 
-    79, 82, 67, 85, 76, 85, 211, 84, 79, 82, 67, 72, 128, 84, 79, 81, 128, 
-    84, 79, 80, 66, 65, 82, 128, 84, 79, 80, 45, 76, 73, 71, 72, 84, 69, 196, 
-    84, 79, 80, 128, 84, 79, 208, 84, 79, 79, 84, 72, 128, 84, 79, 79, 78, 
-    128, 84, 79, 78, 79, 83, 128, 84, 79, 78, 71, 85, 69, 128, 84, 79, 78, 
-    71, 85, 197, 84, 79, 78, 71, 128, 84, 79, 78, 69, 45, 56, 128, 84, 79, 
-    78, 69, 45, 55, 128, 84, 79, 78, 69, 45, 54, 128, 84, 79, 78, 69, 45, 53, 
-    128, 84, 79, 78, 69, 45, 52, 128, 84, 79, 78, 69, 45, 51, 128, 84, 79, 
-    78, 69, 45, 50, 128, 84, 79, 78, 69, 45, 49, 128, 84, 79, 78, 69, 128, 
-    84, 79, 78, 65, 204, 84, 79, 77, 80, 73, 128, 84, 79, 77, 65, 84, 79, 
-    128, 84, 79, 76, 79, 78, 71, 128, 84, 79, 75, 89, 207, 84, 79, 73, 76, 
-    69, 84, 128, 84, 79, 71, 69, 84, 72, 69, 82, 128, 84, 79, 68, 207, 84, 
-    79, 65, 78, 68, 65, 75, 72, 73, 65, 84, 128, 84, 79, 65, 128, 84, 78, 
+    128, 84, 85, 82, 78, 69, 196, 84, 85, 82, 206, 84, 85, 82, 75, 73, 83, 
+    200, 84, 85, 82, 66, 65, 78, 128, 84, 85, 82, 128, 84, 85, 80, 128, 84, 
+    85, 79, 88, 128, 84, 85, 79, 84, 128, 84, 85, 79, 80, 128, 84, 85, 79, 
+    128, 84, 85, 78, 78, 89, 128, 84, 85, 77, 69, 84, 69, 83, 128, 84, 85, 
+    77, 65, 69, 128, 84, 85, 77, 128, 84, 85, 76, 73, 80, 128, 84, 85, 75, 
+    87, 69, 78, 84, 73, 83, 128, 84, 85, 75, 128, 84, 85, 71, 82, 73, 203, 
+    84, 85, 71, 50, 128, 84, 85, 71, 178, 84, 85, 65, 82, 69, 199, 84, 85, 
+    65, 69, 80, 128, 84, 85, 65, 69, 128, 84, 213, 84, 84, 85, 85, 128, 84, 
+    84, 85, 68, 68, 65, 71, 128, 84, 84, 85, 68, 68, 65, 65, 71, 128, 84, 84, 
+    85, 128, 84, 84, 84, 72, 65, 128, 84, 84, 84, 65, 128, 84, 84, 83, 85, 
+    128, 84, 84, 83, 79, 128, 84, 84, 83, 73, 128, 84, 84, 83, 69, 69, 128, 
+    84, 84, 83, 69, 128, 84, 84, 83, 65, 128, 84, 84, 79, 79, 128, 84, 84, 
+    73, 73, 128, 84, 84, 73, 128, 84, 84, 72, 87, 69, 128, 84, 84, 72, 85, 
+    128, 84, 84, 72, 79, 79, 128, 84, 84, 72, 79, 128, 84, 84, 72, 73, 128, 
+    84, 84, 72, 69, 69, 128, 84, 84, 72, 69, 128, 84, 84, 72, 65, 65, 128, 
+    84, 84, 72, 128, 84, 84, 69, 72, 69, 72, 128, 84, 84, 69, 72, 69, 200, 
+    84, 84, 69, 72, 128, 84, 84, 69, 200, 84, 84, 69, 69, 128, 84, 84, 65, 
+    89, 65, 78, 78, 65, 128, 84, 84, 65, 85, 128, 84, 84, 65, 73, 128, 84, 
+    84, 65, 65, 128, 84, 84, 50, 128, 84, 83, 87, 69, 128, 84, 83, 87, 65, 
+    128, 84, 83, 86, 128, 84, 83, 83, 69, 128, 84, 83, 83, 65, 128, 84, 83, 
+    72, 85, 71, 83, 128, 84, 83, 72, 79, 79, 75, 128, 84, 83, 72, 79, 79, 
+    203, 84, 83, 72, 69, 83, 128, 84, 83, 72, 69, 71, 128, 84, 83, 72, 69, 
+    199, 84, 83, 72, 69, 128, 84, 83, 72, 65, 128, 84, 83, 69, 82, 69, 128, 
+    84, 83, 65, 68, 73, 128, 84, 83, 65, 68, 201, 84, 83, 65, 65, 68, 73, 89, 
+    128, 84, 83, 65, 65, 128, 84, 83, 193, 84, 82, 89, 66, 76, 73, 79, 206, 
+    84, 82, 85, 84, 72, 128, 84, 82, 85, 78, 75, 128, 84, 82, 85, 78, 67, 65, 
+    84, 69, 196, 84, 82, 85, 77, 80, 69, 84, 128, 84, 82, 85, 69, 128, 84, 
+    82, 85, 67, 75, 128, 84, 82, 79, 80, 73, 67, 65, 204, 84, 82, 79, 80, 72, 
+    89, 128, 84, 82, 79, 77, 73, 75, 79, 83, 89, 78, 65, 71, 77, 65, 128, 84, 
+    82, 79, 77, 73, 75, 79, 80, 83, 73, 70, 73, 83, 84, 79, 78, 128, 84, 82, 
+    79, 77, 73, 75, 79, 80, 65, 82, 65, 75, 65, 76, 69, 83, 77, 65, 128, 84, 
+    82, 79, 77, 73, 75, 79, 78, 128, 84, 82, 79, 77, 73, 75, 79, 206, 84, 82, 
+    79, 77, 73, 75, 79, 76, 89, 71, 73, 83, 77, 65, 128, 84, 82, 79, 76, 76, 
+    69, 89, 66, 85, 83, 128, 84, 82, 79, 75, 85, 84, 65, 83, 84, 201, 84, 82, 
+    79, 69, 90, 69, 78, 73, 65, 206, 84, 82, 73, 85, 77, 80, 72, 128, 84, 82, 
+    73, 84, 79, 211, 84, 82, 73, 84, 73, 77, 79, 82, 73, 79, 78, 128, 84, 82, 
+    73, 83, 73, 77, 79, 85, 128, 84, 82, 73, 83, 69, 77, 69, 128, 84, 82, 73, 
+    80, 79, 68, 128, 84, 82, 73, 80, 76, 73, 128, 84, 82, 73, 80, 76, 197, 
+    84, 82, 73, 79, 206, 84, 82, 73, 73, 83, 65, 80, 128, 84, 82, 73, 71, 82, 
+    65, 77, 77, 79, 211, 84, 82, 73, 71, 82, 65, 205, 84, 82, 73, 71, 79, 82, 
+    71, 79, 78, 128, 84, 82, 73, 70, 79, 78, 73, 65, 83, 128, 84, 82, 73, 70, 
+    79, 76, 73, 65, 84, 197, 84, 82, 73, 68, 69, 78, 84, 128, 84, 82, 73, 68, 
+    69, 78, 212, 84, 82, 73, 67, 79, 76, 79, 78, 128, 84, 82, 73, 65, 78, 71, 
+    85, 76, 65, 210, 84, 82, 73, 65, 78, 71, 76, 69, 45, 82, 79, 85, 78, 196, 
+    84, 82, 73, 65, 78, 71, 76, 69, 45, 72, 69, 65, 68, 69, 196, 84, 82, 73, 
+    65, 78, 71, 76, 69, 128, 84, 82, 73, 65, 78, 71, 76, 197, 84, 82, 73, 65, 
+    128, 84, 82, 73, 128, 84, 82, 69, 83, 73, 76, 76, 79, 128, 84, 82, 69, 
+    78, 68, 128, 84, 82, 69, 78, 196, 84, 82, 69, 77, 79, 76, 79, 45, 51, 
+    128, 84, 82, 69, 77, 79, 76, 79, 45, 50, 128, 84, 82, 69, 77, 79, 76, 79, 
+    45, 49, 128, 84, 82, 69, 69, 128, 84, 82, 69, 197, 84, 82, 69, 65, 68, 
+    73, 78, 71, 128, 84, 82, 65, 89, 128, 84, 82, 65, 80, 69, 90, 73, 85, 77, 
+    128, 84, 82, 65, 78, 83, 86, 69, 82, 83, 65, 204, 84, 82, 65, 78, 83, 80, 
+    79, 83, 73, 84, 73, 79, 206, 84, 82, 65, 78, 83, 77, 73, 212, 84, 82, 65, 
+    78, 83, 77, 73, 83, 83, 73, 79, 78, 128, 84, 82, 65, 78, 83, 77, 73, 83, 
+    83, 73, 79, 206, 84, 82, 65, 77, 87, 65, 89, 128, 84, 82, 65, 77, 128, 
+    84, 82, 65, 205, 84, 82, 65, 73, 78, 128, 84, 82, 65, 73, 206, 84, 82, 
+    65, 73, 76, 73, 78, 199, 84, 82, 65, 70, 70, 73, 67, 128, 84, 82, 65, 70, 
+    70, 73, 195, 84, 82, 65, 68, 197, 84, 82, 65, 67, 84, 79, 82, 128, 84, 
+    82, 65, 67, 75, 128, 84, 82, 128, 84, 79, 88, 128, 84, 79, 87, 69, 82, 
+    128, 84, 79, 85, 82, 78, 79, 73, 211, 84, 79, 84, 65, 204, 84, 79, 84, 
+    128, 84, 79, 82, 84, 79, 73, 83, 197, 84, 79, 82, 67, 85, 76, 85, 83, 
+    128, 84, 79, 82, 67, 85, 76, 85, 211, 84, 79, 82, 67, 72, 128, 84, 79, 
+    81, 128, 84, 79, 80, 66, 65, 82, 128, 84, 79, 80, 45, 76, 73, 71, 72, 84, 
+    69, 196, 84, 79, 80, 128, 84, 79, 208, 84, 79, 79, 84, 72, 128, 84, 79, 
+    79, 78, 128, 84, 79, 78, 79, 83, 128, 84, 79, 78, 71, 85, 69, 128, 84, 
+    79, 78, 71, 85, 197, 84, 79, 78, 71, 128, 84, 79, 78, 69, 45, 56, 128, 
+    84, 79, 78, 69, 45, 55, 128, 84, 79, 78, 69, 45, 54, 128, 84, 79, 78, 69, 
+    45, 53, 128, 84, 79, 78, 69, 45, 52, 128, 84, 79, 78, 69, 45, 51, 128, 
+    84, 79, 78, 69, 45, 50, 128, 84, 79, 78, 69, 45, 49, 128, 84, 79, 78, 69, 
+    128, 84, 79, 78, 65, 204, 84, 79, 77, 80, 73, 128, 84, 79, 77, 65, 84, 
+    79, 128, 84, 79, 76, 79, 78, 71, 128, 84, 79, 75, 89, 207, 84, 79, 73, 
+    76, 69, 84, 128, 84, 79, 71, 69, 84, 72, 69, 82, 128, 84, 79, 68, 207, 
+    84, 79, 65, 78, 68, 65, 75, 72, 73, 65, 84, 128, 84, 79, 65, 128, 84, 78, 
     128, 84, 76, 86, 128, 84, 76, 85, 128, 84, 76, 79, 128, 84, 76, 73, 128, 
     84, 76, 72, 89, 65, 128, 84, 76, 72, 87, 69, 128, 84, 76, 72, 85, 128, 
     84, 76, 72, 79, 79, 128, 84, 76, 72, 79, 128, 84, 76, 72, 73, 128, 84, 
@@ -4635,7 +4635,7 @@
     557, 850, 860, 867, 873, 879, 886, 894, 898, 749, 906, 915, 503, 923, 
     928, 934, 17, 943, 948, 951, 955, 959, 966, 969, 976, 980, 988, 992, 
     1000, 1004, 1007, 1014, 1021, 192, 1024, 1029, 1039, 1048, 1055, 1061, 
-    1069, 1072, 1077, 1083, 1091, 1097, 1102, 1105, 1108, 111, 1113, 1117, 
+    1067, 1075, 1078, 1083, 1089, 1097, 1102, 1105, 1108, 111, 1113, 1117, 
     1123, 1129, 1132, 1138, 1142, 1147, 1153, 1158, 1168, 1172, 1175, 1178, 
     1187, 1191, 1194, 1199, 1204, 1210, 1215, 1220, 1225, 1229, 1234, 1240, 
     1245, 1250, 1254, 1260, 1265, 1270, 1275, 1279, 1284, 1289, 1294, 1300, 
@@ -4755,7373 +4755,7374 @@
     8645, 8649, 8653, 8658, 8665, 8676, 8684, 8694, 8700, 8707, 8712, 8716, 
     8727, 8740, 8751, 8764, 8775, 8787, 8799, 8811, 8824, 8837, 8844, 8850, 
     8864, 8871, 8877, 8881, 8886, 8890, 8897, 8905, 8909, 8915, 8919, 8925, 
-    8935, 8939, 8944, 8949, 8956, 8962, 8972, 7909, 8978, 8982, 8989, 768, 
-    8993, 8997, 9002, 9007, 9012, 9016, 9022, 9030, 9036, 9040, 9046, 9056, 
-    9060, 9066, 9071, 9075, 9081, 9087, 2161, 9092, 9094, 9099, 9107, 9116, 
-    9120, 9126, 9131, 9136, 9141, 9146, 9152, 9157, 9162, 4006, 9167, 9172, 
-    9176, 9182, 9187, 9193, 9198, 9203, 9209, 9214, 9121, 9220, 9224, 9231, 
-    9237, 9242, 9246, 6183, 9251, 9260, 9265, 9270, 8218, 8225, 9275, 2853, 
-    9279, 9284, 9289, 9132, 9293, 9298, 9137, 9142, 9303, 9310, 9317, 9323, 
-    9329, 9335, 9340, 9345, 9350, 9147, 9153, 9356, 9362, 9367, 9375, 9158, 
-    9380, 990, 9383, 9391, 9397, 9403, 9412, 9420, 9425, 9431, 9439, 9446, 
-    9461, 9478, 9497, 9506, 9514, 9529, 9540, 9550, 9560, 9568, 9574, 9586, 
-    9595, 9603, 9610, 9617, 9623, 9628, 9636, 9646, 9653, 9663, 9673, 9683, 
-    9691, 9698, 9707, 9717, 9731, 9746, 9755, 9763, 9768, 9772, 9781, 9787, 
-    9792, 9802, 9812, 9822, 9827, 9831, 9840, 9845, 9855, 9866, 9879, 9887, 
-    9900, 9912, 9920, 9925, 9929, 9935, 9940, 9948, 9956, 9963, 9968, 9976, 
-    9982, 9985, 9989, 9995, 10003, 10008, 10012, 10020, 10029, 10037, 10043, 
-    10047, 10054, 10065, 10069, 10072, 10078, 9163, 10083, 10089, 10096, 
-    10102, 10107, 10114, 10121, 10128, 10135, 10142, 10149, 10156, 10163, 
-    10168, 9474, 10173, 10179, 10186, 10193, 10198, 10205, 10214, 10218, 
-    10230, 8256, 10234, 10237, 10241, 10245, 10249, 10253, 10259, 10265, 
-    10270, 10276, 10281, 10286, 10292, 10297, 10302, 8952, 10307, 10311, 
-    10315, 10319, 10324, 10329, 10337, 10343, 10347, 10351, 10358, 10363, 
-    10371, 10376, 10380, 10383, 10389, 10396, 10400, 10403, 10408, 10412, 
-    4045, 10418, 10427, 36, 10435, 10441, 10446, 8967, 10451, 10456, 10460, 
-    10463, 10478, 10497, 10509, 10522, 10535, 10548, 10562, 10575, 10590, 
-    10597, 9168, 10603, 10617, 10622, 10628, 10633, 10641, 10646, 8040, 
-    10651, 10654, 10661, 10666, 10670, 2858, 998, 10676, 10680, 10686, 10692, 
-    10697, 10703, 10708, 9177, 10714, 10720, 10725, 10730, 10738, 10744, 
-    10757, 10765, 10772, 9183, 10778, 10786, 10794, 10801, 10814, 10826, 
-    10836, 10844, 10851, 10858, 10867, 10876, 10884, 10891, 10896, 10902, 
-    9188, 10907, 10913, 9194, 10918, 10921, 10928, 10934, 10947, 8669, 10958, 
-    10964, 10973, 10981, 10988, 10994, 11000, 11005, 11009, 11014, 10470, 
-    11020, 9199, 11027, 11032, 11039, 11045, 11051, 11056, 11064, 11072, 
-    11079, 11083, 11097, 11107, 11112, 11116, 11127, 11133, 11138, 11143, 
-    9204, 9210, 11147, 11150, 11155, 11167, 11174, 11179, 11183, 11188, 
-    11192, 11199, 11205, 9215, 9122, 11212, 2863, 8, 11219, 11224, 11228, 
-    11234, 11242, 11252, 11257, 11262, 11269, 11276, 11280, 11291, 11301, 
-    11310, 11322, 11327, 11331, 11339, 11353, 11357, 11360, 11368, 11375, 
-    11383, 11387, 11398, 11402, 11409, 11414, 11418, 11424, 11429, 11433, 
-    11439, 11444, 11455, 11459, 11462, 11468, 11473, 11479, 11485, 11492, 
-    11503, 11513, 11523, 11532, 11539, 11548, 9225, 9232, 9238, 9243, 11554, 
-    11560, 9247, 11566, 11569, 11576, 11581, 11596, 11612, 11627, 11635, 
-    11641, 11646, 838, 420, 11651, 11659, 11666, 11672, 11677, 11682, 9252, 
-    11684, 11688, 11693, 11697, 11707, 11712, 11716, 11725, 11729, 11732, 
-    9261, 11739, 11742, 11750, 11757, 11765, 11769, 11776, 11785, 11788, 
-    11792, 11796, 11802, 11806, 11810, 11814, 11820, 11830, 11834, 11842, 
-    11846, 11853, 11857, 11862, 11866, 11873, 11879, 11887, 11893, 11898, 
-    11908, 11913, 11918, 11922, 11930, 3905, 11938, 11943, 9266, 11947, 
-    11951, 11954, 11962, 11969, 11973, 5991, 11977, 11982, 11986, 11997, 
-    12007, 12012, 12018, 12022, 12025, 12033, 12038, 12043, 12050, 12055, 
-    9271, 12060, 12064, 12071, 1722, 6145, 12076, 12081, 12086, 12091, 12097, 
-    12102, 12108, 12113, 12118, 12123, 12128, 12133, 12138, 12143, 12148, 
-    12153, 12158, 12163, 12168, 12173, 12178, 12183, 12188, 12194, 12199, 
-    12204, 12209, 12214, 12219, 12225, 12230, 12235, 12241, 12246, 12252, 
-    12257, 12263, 12268, 12273, 12278, 12283, 12289, 12294, 12299, 12304, 
-    737, 139, 12312, 12316, 12321, 12326, 12330, 12334, 12338, 12343, 12347, 
-    12352, 12356, 12359, 12363, 12367, 12373, 12378, 12388, 12394, 12402, 
-    12406, 12410, 12417, 12425, 12434, 12445, 12452, 12459, 12463, 12472, 
-    12481, 12489, 12498, 12507, 12516, 12525, 12535, 12545, 12555, 12565, 
-    12575, 12584, 12594, 12604, 12614, 12624, 12634, 12644, 12654, 12663, 
-    12673, 12683, 12693, 12703, 12713, 12723, 12732, 12742, 12752, 12762, 
-    12772, 12782, 12792, 12802, 12812, 12822, 12831, 12841, 12851, 12861, 
-    12871, 12881, 12891, 12901, 12911, 12921, 12931, 12940, 1256, 12946, 
-    12949, 12953, 12958, 12965, 12971, 12976, 12980, 12985, 12994, 13002, 
-    13007, 13011, 13015, 13021, 13026, 13032, 9280, 13037, 13042, 13051, 
-    9285, 13056, 13059, 13065, 13073, 9290, 13080, 13084, 13088, 13092, 
-    13102, 13108, 13114, 13119, 13128, 13136, 13143, 13150, 13155, 13162, 
-    13167, 13171, 13174, 13185, 13195, 13204, 13212, 13223, 13235, 13245, 
-    13250, 13254, 13259, 13264, 13268, 13274, 13282, 13289, 13300, 13305, 
-    13315, 13319, 13322, 13329, 13339, 13348, 13355, 13359, 13366, 13372, 
-    13377, 13382, 13386, 13395, 13400, 13406, 13410, 13415, 13419, 13428, 
-    13436, 13444, 13451, 13459, 13471, 13482, 13492, 13499, 13505, 13514, 
-    13525, 13534, 13546, 13558, 13570, 13580, 13589, 13598, 13606, 13613, 
-    13622, 13630, 13634, 13640, 13646, 13651, 7753, 13655, 13657, 13661, 
-    13666, 13672, 13681, 13685, 13693, 13700, 13709, 13718, 13727, 13736, 
-    13745, 13754, 13763, 13772, 13782, 13792, 13801, 13807, 13814, 13821, 
-    13827, 13841, 13848, 13856, 13865, 13871, 13880, 13889, 13900, 13910, 
-    13918, 13925, 13933, 13942, 13955, 13963, 13970, 13983, 13989, 13995, 
-    14005, 14014, 14023, 14028, 14032, 14038, 14044, 14051, 8966, 14056, 
-    14061, 14068, 14073, 12369, 14078, 14086, 14092, 14097, 14105, 14113, 
-    14120, 14128, 14134, 14142, 14150, 14156, 14161, 14167, 14174, 14180, 
-    14185, 14189, 14200, 14208, 14214, 14219, 14228, 14234, 14239, 14248, 
-    14262, 3853, 14266, 14271, 14276, 14282, 14287, 14292, 14296, 14301, 
-    14306, 14311, 7752, 14316, 14321, 14326, 14331, 14336, 14340, 14345, 
-    14350, 14355, 14360, 14366, 14372, 14377, 14381, 14386, 14391, 14396, 
-    9294, 14401, 14406, 14411, 14416, 14421, 14438, 14456, 14468, 14481, 
-    14498, 14514, 14531, 14541, 14560, 14571, 14582, 14593, 14604, 14616, 
-    14627, 14638, 14655, 14666, 14677, 14682, 9299, 14687, 14691, 2381, 
-    14695, 14698, 14704, 14712, 14720, 14725, 14733, 14741, 14748, 14753, 
-    14759, 14766, 14774, 14781, 14793, 14801, 14806, 11590, 14812, 14821, 
-    14830, 14838, 14845, 14851, 14859, 14866, 14872, 14879, 14885, 14894, 
-    14902, 14912, 14919, 14925, 14933, 14939, 14947, 14954, 14967, 14974, 
-    14983, 14992, 15001, 15009, 15019, 15026, 15031, 3560, 15038, 15043, 
-    1372, 15047, 14317, 15051, 15057, 15061, 15069, 15081, 15086, 15093, 
-    15099, 15104, 15111, 14322, 15115, 15119, 15123, 14327, 15127, 14332, 
-    15131, 15138, 15143, 15147, 15154, 15158, 15166, 15173, 15177, 15184, 
-    15201, 15210, 15214, 15217, 15225, 15231, 15236, 3638, 15240, 15242, 
-    15250, 15257, 15267, 15279, 15284, 15290, 15295, 15299, 15305, 15310, 
-    15316, 15319, 15326, 15334, 15341, 15347, 15353, 15358, 15365, 15371, 
-    15376, 15383, 15387, 15393, 15397, 15404, 15410, 15416, 15424, 15430, 
-    15435, 15441, 15449, 15457, 15463, 15469, 15474, 15481, 15486, 15490, 
-    15496, 15501, 15508, 15513, 15519, 15522, 15528, 15534, 15537, 15541, 
-    15553, 15559, 15564, 15571, 15577, 15583, 15594, 15604, 15613, 15621, 
-    15628, 15639, 15649, 15659, 15667, 15670, 14346, 15675, 15680, 14351, 
-    14486, 15688, 15701, 15716, 15727, 14503, 15745, 15758, 15771, 15782, 
-    10485, 15793, 15806, 15825, 15836, 15847, 15858, 2649, 15871, 15875, 
-    15883, 15898, 15913, 15924, 15931, 15937, 15945, 15949, 15955, 15958, 
-    15968, 15976, 15983, 15991, 16001, 16006, 16013, 16018, 16025, 16036, 
-    16046, 16052, 16057, 16062, 14356, 16066, 16072, 16078, 16083, 16088, 
-    16093, 16097, 14361, 14367, 16101, 14373, 16106, 16114, 16123, 16130, 
-    9143, 16134, 16136, 16141, 16146, 16152, 16157, 16162, 16167, 16172, 
-    16176, 16182, 16188, 16193, 16199, 16204, 16209, 16215, 16220, 16225, 
-    16230, 16235, 16241, 16246, 16251, 16257, 16263, 16268, 16273, 16280, 
-    16286, 16297, 16304, 16309, 16313, 16317, 16320, 16328, 16333, 16340, 
-    16347, 16353, 16358, 16363, 16370, 16380, 16385, 16392, 16398, 16408, 
-    16418, 16432, 16446, 16460, 16474, 16489, 16504, 16521, 16539, 16552, 
-    16558, 16563, 16568, 16572, 16577, 16585, 16591, 16596, 16601, 16605, 
-    16610, 16614, 16619, 16623, 16634, 16640, 16645, 16650, 16657, 16662, 
-    16666, 16671, 16676, 16682, 16689, 16695, 16700, 16704, 16710, 16715, 
-    16720, 16724, 16730, 16735, 16740, 16747, 16752, 13104, 16756, 16761, 
-    16765, 16770, 16776, 16782, 16789, 16799, 16807, 16814, 16819, 16823, 
-    16832, 16840, 16847, 16854, 16860, 16866, 16871, 16876, 16882, 16887, 
-    16893, 16898, 16904, 16910, 16917, 16923, 16928, 16933, 9341, 16942, 
-    16945, 16951, 16956, 16961, 16971, 16978, 16984, 16989, 16994, 17000, 
-    17005, 17011, 17016, 17022, 17028, 17033, 17041, 17048, 17053, 17058, 
-    17064, 17069, 17073, 17082, 17093, 17100, 17105, 17113, 17119, 17126, 
-    17132, 17137, 17141, 17147, 17152, 17157, 17162, 1440, 7777, 2877, 17166, 
-    17170, 17174, 17178, 17182, 17186, 17189, 17196, 17204, 14387, 17211, 
-    17221, 17229, 17236, 17244, 17254, 17263, 17276, 17281, 17286, 17294, 
-    17301, 13200, 13209, 17308, 17318, 17333, 17339, 17346, 17353, 17359, 
-    17367, 17377, 17387, 14392, 17396, 17402, 17408, 17416, 17424, 17429, 
-    17438, 17446, 17458, 17468, 17478, 17488, 17497, 17509, 17519, 17529, 
-    17540, 17545, 17557, 17569, 17581, 17593, 17605, 17617, 17629, 17641, 
-    17653, 17665, 17676, 17688, 17700, 17712, 17724, 17736, 17748, 17760, 
-    17772, 17784, 17796, 17807, 17819, 17831, 17843, 17855, 17867, 17879, 
-    17891, 17903, 17915, 17927, 17938, 17950, 17962, 17974, 17986, 17998, 
-    18010, 18022, 18034, 18046, 18058, 18069, 18081, 18093, 18105, 18117, 
-    18129, 18141, 18153, 18165, 18177, 18189, 18200, 18212, 18224, 18236, 
-    18248, 18260, 18272, 18284, 18296, 18308, 18320, 18331, 18343, 18355, 
-    18367, 18379, 18391, 18403, 18415, 18427, 18439, 18451, 18462, 18474, 
-    18486, 18498, 18510, 18523, 18536, 18549, 18562, 18575, 18588, 18601, 
-    18613, 18626, 18639, 18652, 18665, 18678, 18691, 18704, 18717, 18730, 
-    18743, 18755, 18768, 18781, 18794, 18807, 18820, 18833, 18846, 18859, 
-    18872, 18885, 18897, 18910, 18923, 18936, 18949, 18962, 18975, 18988, 
-    19001, 19014, 19027, 19039, 19052, 19065, 19078, 19091, 19104, 19117, 
-    19130, 19143, 19156, 19169, 19181, 19194, 19207, 19220, 19233, 19246, 
-    19259, 19272, 19285, 19298, 19311, 19323, 19334, 19347, 19360, 19373, 
-    19386, 19399, 19412, 19425, 19438, 19451, 19464, 19476, 19489, 19502, 
-    19515, 19528, 19541, 19554, 19567, 19580, 19593, 19606, 19618, 19631, 
-    19644, 19657, 19670, 19683, 19696, 19709, 19722, 19735, 19748, 19760, 
-    19773, 19786, 19799, 19812, 19825, 19838, 19851, 19864, 19877, 19890, 
-    19902, 19915, 19928, 19941, 19954, 19967, 19980, 19993, 20006, 20019, 
-    20032, 20044, 20057, 20070, 20083, 20096, 20109, 20122, 20135, 20148, 
-    20161, 20174, 20186, 20199, 20212, 20225, 20238, 20251, 20264, 20277, 
-    20290, 20303, 20316, 20328, 20341, 20354, 20367, 20380, 20393, 20406, 
-    20419, 20432, 20445, 20458, 20470, 20483, 20496, 20509, 20522, 20535, 
-    20548, 20561, 20574, 20587, 20600, 20612, 20625, 20638, 20651, 20664, 
-    20677, 20690, 20703, 20716, 20729, 20742, 20754, 20765, 20773, 20781, 
-    20788, 20794, 20798, 20804, 20810, 20818, 20824, 20829, 20833, 20842, 
-    9148, 20853, 20860, 20868, 20875, 20882, 10941, 20889, 20898, 20903, 
-    20908, 7805, 20915, 20920, 20923, 20928, 20936, 20943, 20950, 20957, 
-    20963, 20972, 20981, 20987, 20996, 21000, 21006, 21011, 21021, 21028, 
-    21034, 21042, 21048, 21055, 21065, 21074, 21078, 21085, 21089, 21094, 
-    21100, 21108, 21112, 21122, 14402, 21131, 21137, 21141, 21150, 14407, 
-    21156, 21163, 21174, 21182, 21191, 21199, 8931, 21207, 21212, 21218, 
-    21223, 21227, 21231, 21235, 9632, 21240, 21248, 21255, 21264, 21271, 
-    21278, 10871, 21285, 21291, 21295, 21301, 21308, 21314, 21322, 21328, 
-    21335, 21341, 21347, 21356, 21360, 21368, 21377, 21384, 21389, 21393, 
-    21404, 21409, 21414, 21419, 21432, 7995, 21436, 21442, 21450, 21454, 
-    21461, 21470, 21475, 14678, 21483, 21487, 21499, 21504, 21508, 21511, 
-    21517, 21523, 21528, 21532, 21535, 21546, 21551, 9376, 21558, 21563, 
-    9381, 21568, 21573, 21578, 21583, 21588, 21593, 21598, 21603, 21608, 
-    21613, 21618, 21623, 21629, 21634, 21639, 21644, 21649, 21654, 21659, 
-    21664, 21669, 21674, 21680, 21686, 21691, 21696, 21701, 21706, 21711, 
-    21716, 21721, 21726, 21731, 21737, 21742, 21747, 21752, 21758, 21764, 
-    21769, 21774, 21779, 21784, 21789, 21794, 21799, 21804, 21810, 21815, 
-    21820, 21825, 21830, 21836, 21841, 21846, 21850, 1368, 129, 21858, 21862, 
-    21866, 21870, 21875, 21879, 13110, 12469, 21883, 21888, 21892, 21897, 
-    21901, 21906, 21910, 21916, 21921, 21925, 21929, 21937, 21941, 21945, 
-    21950, 21955, 21959, 21965, 21970, 21974, 21979, 21984, 21988, 21995, 
-    22002, 22009, 22013, 22017, 22022, 22026, 22029, 22035, 22048, 22053, 
-    22062, 22067, 9421, 22072, 22075, 2712, 2717, 22079, 22085, 22091, 7209, 
-    22096, 22101, 22106, 22112, 22117, 13896, 22122, 22127, 22132, 22137, 
-    22143, 22148, 22153, 22159, 22164, 22168, 22173, 22178, 22183, 22188, 
-    22192, 22197, 22201, 22206, 22211, 22216, 22221, 22225, 22230, 22234, 
-    22239, 22244, 22249, 22254, 2886, 22169, 22258, 22266, 22273, 9726, 
-    22285, 22293, 22174, 22300, 22305, 22313, 22179, 22318, 22323, 22331, 
-    22336, 22184, 22341, 22346, 22350, 22356, 22364, 22367, 22374, 22378, 
-    22382, 22388, 22395, 22400, 8958, 1727, 1732, 22404, 22410, 22416, 22421, 
-    22425, 22429, 22433, 22437, 22441, 22445, 22449, 22452, 22458, 22465, 
-    22473, 22479, 22485, 22490, 22495, 22499, 13816, 13823, 22504, 22516, 
-    22519, 22526, 16349, 22533, 22541, 22552, 22561, 22574, 22584, 22598, 
-    22610, 22624, 22636, 22646, 22658, 22664, 22679, 22703, 22721, 22740, 
-    22753, 22767, 22785, 22801, 22818, 22836, 22847, 22866, 22883, 22903, 
-    22921, 22933, 22947, 22961, 22973, 22990, 23009, 23027, 23039, 23057, 
-    23076, 14546, 23089, 23109, 23121, 10516, 23133, 23138, 23143, 23148, 
-    23154, 23159, 23163, 23170, 2398, 23174, 23180, 23184, 23187, 23191, 
-    23199, 23205, 22202, 23209, 23218, 23229, 23235, 23241, 23250, 23258, 
-    23265, 23270, 23274, 23281, 23287, 23296, 23304, 23311, 23321, 23330, 
-    23340, 23345, 23354, 23363, 23374, 23385, 3963, 23395, 23399, 23409, 
-    23417, 23427, 23438, 23443, 23453, 23461, 23468, 23474, 23481, 23486, 
-    22212, 23490, 23499, 23503, 23506, 23511, 23518, 23527, 23535, 23543, 
-    23553, 23562, 23568, 23574, 22217, 22222, 23578, 23588, 23598, 23608, 
-    23616, 23623, 23633, 23641, 23649, 23655, 23663, 930, 23672, 14737, 542, 
-    23686, 23695, 23703, 23714, 23725, 23735, 23744, 23756, 23765, 23774, 
-    23780, 23789, 23798, 23808, 23816, 23824, 9353, 23830, 23833, 23837, 
-    23842, 23847, 9841, 22235, 22240, 23855, 23861, 23867, 23872, 23877, 
-    23881, 23889, 23895, 23901, 23905, 3525, 23913, 23918, 23923, 23927, 
-    23931, 9921, 23938, 23946, 23960, 23967, 23973, 9930, 9936, 23981, 23989, 
-    23996, 24001, 24006, 22245, 24012, 24023, 24027, 24032, 2601, 24037, 
-    24048, 24054, 24059, 24063, 24067, 24070, 24077, 24084, 24091, 24097, 
-    24101, 22250, 24106, 24110, 24114, 1037, 24119, 24124, 24129, 24134, 
-    24139, 24144, 24149, 24154, 24159, 24164, 24169, 24174, 24179, 24184, 
-    24190, 24195, 24200, 24205, 24210, 24215, 24220, 24226, 24231, 24236, 
-    24241, 24246, 24251, 24256, 24261, 24267, 24273, 24278, 24284, 24289, 
-    24294, 5, 24300, 24304, 24308, 24312, 24317, 24321, 24325, 24329, 24333, 
-    24338, 24342, 24347, 24351, 24354, 24358, 24363, 24367, 24372, 24376, 
-    24380, 24384, 24389, 24393, 24397, 24407, 24412, 24416, 24420, 24425, 
-    24430, 24439, 24444, 24449, 24453, 24457, 24470, 24482, 24491, 24500, 
-    24506, 24511, 24515, 24519, 24529, 24538, 24546, 24552, 24557, 24561, 
-    24568, 24578, 24587, 24595, 24603, 24610, 24618, 24627, 24636, 24644, 
-    24649, 24653, 24657, 24660, 24662, 24666, 24670, 24675, 24680, 24684, 
-    24688, 24691, 24695, 24698, 24702, 24705, 24708, 24712, 24718, 24722, 
-    24726, 24730, 24735, 24740, 24745, 24749, 24752, 24757, 24763, 24768, 
-    24774, 24779, 24783, 24787, 24791, 24796, 24800, 24805, 24809, 24813, 
-    24820, 24824, 24827, 24831, 24837, 24843, 24847, 24851, 24856, 24863, 
-    24869, 24873, 24882, 24886, 24890, 24893, 24899, 24904, 24910, 1489, 
-    1791, 24915, 24920, 24925, 24930, 24935, 24940, 24945, 2148, 2194, 24950, 
-    24953, 24957, 24961, 24966, 24970, 24974, 24977, 24982, 24987, 24991, 
-    24994, 24999, 25003, 25008, 25012, 14749, 25017, 25020, 25023, 25027, 
-    25032, 25036, 25049, 25053, 25056, 25064, 25073, 25080, 25085, 25091, 
-    25097, 25105, 25112, 25119, 25123, 25127, 25131, 25136, 25141, 25145, 
-    25153, 25158, 25170, 25181, 25186, 25190, 25194, 25200, 25205, 25210, 
-    25214, 25218, 25221, 25227, 7915, 2316, 25231, 25236, 25252, 9468, 25272, 
-    25281, 25297, 25301, 25304, 25310, 25320, 25326, 25335, 25350, 25362, 
-    25373, 25381, 25390, 25396, 25405, 25415, 25426, 25437, 25446, 25453, 
-    25462, 25470, 25477, 25485, 25492, 25499, 25512, 25519, 25525, 25530, 
-    25539, 25545, 25550, 25558, 25565, 23419, 25577, 25589, 25603, 25611, 
-    25618, 25630, 25639, 25648, 25656, 25664, 25672, 25679, 25688, 25696, 
-    25706, 25715, 25725, 25734, 25743, 25751, 25756, 25760, 25763, 25767, 
-    25771, 25775, 25779, 25783, 25789, 25795, 25803, 14794, 25810, 25815, 
-    25822, 25828, 25835, 14802, 25842, 25845, 25857, 25865, 25871, 25876, 
-    25880, 9871, 25891, 25901, 25910, 25917, 25921, 14807, 25924, 25931, 
-    25935, 25941, 25944, 25951, 25957, 25964, 25970, 25974, 25979, 25983, 
-    25992, 25999, 26005, 7956, 26012, 26020, 26027, 26033, 26038, 26044, 
-    26050, 26058, 26062, 26065, 26067, 25768, 26076, 26082, 26092, 26097, 
-    26104, 26110, 26115, 26120, 26125, 26129, 26134, 26141, 26150, 26154, 
-    26161, 26170, 26176, 26181, 26187, 26192, 26199, 26210, 26215, 26219, 
-    26229, 26235, 26239, 26244, 26254, 26263, 26267, 26274, 26282, 26289, 
-    26295, 26300, 26308, 26315, 26327, 26336, 26340, 13046, 26348, 26358, 
-    26362, 25060, 26373, 26378, 26382, 26389, 26396, 21961, 25693, 26401, 
-    26405, 26408, 22853, 26413, 26427, 26443, 26461, 26480, 26497, 26515, 
-    22872, 26532, 26552, 22889, 26564, 26576, 15732, 26588, 22909, 26602, 
-    26614, 10529, 26628, 26633, 26638, 26643, 26649, 26655, 26661, 26665, 
-    26672, 26677, 26687, 26693, 10176, 26699, 26701, 26706, 26714, 26718, 
-    26137, 26724, 26731, 11517, 11527, 26738, 26748, 26753, 26757, 26760, 
-    26766, 26774, 26786, 26796, 26812, 26825, 26839, 15750, 26853, 26860, 
-    26864, 26867, 26872, 26876, 26883, 26890, 26900, 26905, 26910, 26915, 
-    26923, 26931, 26940, 26945, 9565, 26949, 26952, 26955, 26960, 26967, 
-    26972, 26988, 26996, 27004, 9416, 27012, 27017, 27021, 27027, 27033, 
-    27036, 27042, 27054, 27062, 27069, 27075, 27082, 27093, 27107, 27120, 
-    27129, 27138, 27150, 27161, 27171, 27180, 27189, 27197, 27208, 7938, 
-    27215, 27221, 27226, 27232, 27239, 27249, 27259, 27268, 27274, 27281, 
-    27286, 27293, 27301, 27309, 27321, 6246, 27328, 27337, 27345, 27351, 
-    27357, 27362, 27366, 27369, 27375, 27382, 27387, 27392, 27396, 27408, 
-    27419, 27428, 27436, 14934, 27441, 27447, 27453, 11510, 8635, 27458, 
-    27462, 27465, 27468, 27474, 27482, 27490, 27494, 27498, 27503, 27506, 
-    27515, 27519, 27527, 27538, 27542, 27548, 27554, 27558, 27564, 27572, 
-    27594, 27618, 27625, 27632, 27638, 27646, 27652, 27657, 27668, 27686, 
-    27693, 27701, 27705, 27714, 27727, 27735, 27747, 27758, 27768, 27782, 
-    27791, 27799, 27811, 9485, 27822, 27833, 27845, 27855, 27864, 27869, 
-    27873, 27881, 27891, 27896, 27900, 27903, 27906, 27914, 27922, 27931, 
-    27941, 27950, 27956, 27970, 2663, 27992, 28003, 28012, 28022, 28034, 
-    28043, 28052, 28062, 28070, 28078, 28087, 28092, 28103, 28108, 28119, 
-    28123, 28133, 28142, 28150, 28160, 28170, 28178, 28187, 28194, 28202, 
-    28209, 28218, 28222, 28230, 28237, 28245, 28252, 28263, 28278, 28285, 
-    28291, 28301, 28310, 28316, 28320, 28327, 28331, 14018, 28337, 28341, 
-    28346, 28353, 28357, 28361, 28369, 28377, 28383, 28392, 28399, 28404, 
-    28409, 28419, 23488, 28423, 28426, 28431, 28436, 28441, 28446, 28451, 
-    28456, 28461, 28466, 28472, 28477, 28482, 28488, 1218, 704, 28493, 28502, 
-    2364, 28509, 28514, 28518, 28524, 1267, 546, 318, 28529, 28538, 28546, 
-    28555, 28563, 28574, 28583, 28591, 28595, 28598, 28606, 28614, 28619, 
-    14762, 28625, 28631, 28637, 5872, 28642, 28646, 28652, 28656, 28663, 
-    1455, 28669, 28676, 9572, 28680, 28690, 28698, 28704, 28713, 28721, 
-    28727, 28735, 28742, 11103, 28748, 28755, 28760, 28767, 1496, 2147, 
-    28773, 28779, 28786, 28797, 28808, 28816, 28823, 28833, 28842, 28850, 
-    28859, 28866, 28873, 28886, 28897, 1272, 28916, 28921, 28929, 3575, 
-    28933, 28938, 28942, 1459, 24689, 28952, 28956, 28961, 28965, 3493, 
-    28971, 28979, 28986, 28997, 29005, 29013, 3576, 279, 29018, 29026, 29034, 
-    29041, 29047, 29052, 2216, 29059, 29065, 25975, 26205, 29071, 106, 29075, 
-    29079, 29085, 615, 9321, 29090, 29097, 29103, 2327, 29107, 29111, 15174, 
-    29114, 29119, 29126, 29132, 29137, 29145, 29152, 29158, 22338, 29162, 
-    29166, 3646, 16612, 29170, 29175, 29178, 29186, 29194, 29199, 29202, 
-    29209, 29219, 29231, 29236, 29240, 29248, 29255, 29261, 29268, 29275, 
-    29278, 29282, 29286, 1463, 29296, 29298, 29303, 29309, 29315, 29320, 
-    29325, 29330, 29335, 29340, 29345, 29350, 29355, 29360, 29365, 29370, 
-    29375, 29380, 29385, 29391, 29397, 29403, 29409, 29414, 29419, 29424, 
-    29430, 29435, 29440, 29445, 29451, 29456, 29462, 29467, 29472, 29477, 
-    29482, 29488, 29493, 29499, 29504, 29509, 29514, 29519, 29525, 29530, 
-    29536, 29541, 29546, 29551, 29556, 29561, 29566, 29571, 29576, 29581, 
-    29587, 29593, 29599, 29604, 29609, 29614, 29619, 29625, 29631, 29637, 
-    29643, 29649, 29655, 29660, 29666, 29671, 29676, 29681, 29686, 29692, 
-    2443, 29697, 2450, 2457, 2754, 29702, 2463, 2473, 29708, 29712, 29717, 
-    29722, 29728, 29733, 29738, 29742, 29747, 29753, 29758, 29763, 29768, 
-    29774, 29779, 29783, 29787, 29792, 29797, 29802, 29807, 29812, 29818, 
-    29824, 29829, 29833, 29838, 29844, 29848, 29853, 29858, 29863, 29868, 
-    29872, 29875, 29880, 29885, 29890, 29895, 29900, 29906, 29912, 29917, 
-    29922, 29926, 29931, 29936, 29941, 29946, 29951, 29955, 29960, 29965, 
-    29970, 29974, 29978, 29982, 29987, 29995, 30000, 30006, 30012, 30018, 
-    30023, 30027, 30030, 30035, 30040, 30044, 30049, 30053, 30058, 30062, 
-    30065, 30070, 17289, 30075, 30080, 30085, 30093, 21267, 28673, 9019, 
-    30098, 30103, 30107, 30112, 30116, 30120, 30125, 30129, 30132, 30135, 
-    30139, 30144, 30148, 30156, 30160, 30163, 30168, 30172, 30176, 30181, 
-    30186, 30190, 30196, 30201, 30206, 30213, 30220, 30224, 30227, 30233, 
-    30242, 30249, 30257, 30264, 30268, 30273, 30277, 30281, 30287, 30293, 
-    30297, 30303, 30308, 30313, 30320, 30326, 30332, 30338, 30344, 30351, 
-    30357, 30363, 30369, 30375, 30381, 30387, 30393, 30400, 30406, 30413, 
-    30419, 30425, 30431, 30437, 30443, 30449, 30455, 30461, 30467, 11411, 
-    30473, 30478, 30483, 30486, 30494, 30499, 30508, 30514, 30519, 30524, 
-    30529, 30533, 30538, 30543, 30548, 30553, 30558, 30565, 30572, 30578, 
-    30584, 30589, 16290, 30596, 30602, 30609, 30615, 30621, 30626, 30634, 
-    30639, 16069, 30643, 30648, 30653, 30659, 30664, 30669, 30673, 30678, 
-    30683, 30689, 30694, 30699, 30703, 30708, 30713, 30717, 30722, 30727, 
-    30732, 30736, 30741, 30746, 30751, 30755, 30759, 15280, 30763, 30772, 
-    30778, 30784, 30793, 30801, 30810, 30818, 30823, 30827, 30834, 30840, 
-    30844, 30847, 30852, 30861, 30869, 30874, 1495, 30880, 30883, 30887, 
-    22411, 22417, 30893, 30897, 30908, 30919, 30930, 30942, 30949, 30956, 
-    30961, 30965, 5909, 755, 21266, 30973, 30978, 30982, 30987, 30991, 30997, 
-    31002, 31008, 31013, 31019, 31024, 31030, 31035, 31041, 31047, 31053, 
-    31058, 31014, 31020, 31062, 31067, 31073, 31078, 31084, 31089, 31095, 
-    31100, 31025, 10414, 31104, 31036, 31042, 31048, 2831, 3423, 31110, 
-    31113, 31119, 31125, 31131, 31138, 31144, 31150, 31156, 31162, 31168, 
-    31174, 31180, 31186, 31192, 31198, 31204, 31210, 31217, 31223, 31229, 
-    31235, 31241, 31247, 31250, 31255, 31258, 31265, 31273, 31278, 31283, 
-    31289, 31294, 31299, 31303, 31308, 31314, 31319, 31325, 31330, 31336, 
-    31341, 31347, 31353, 31357, 31362, 31367, 31372, 31377, 31381, 31386, 
-    31391, 31396, 31402, 31408, 31414, 31420, 31425, 31429, 31432, 31438, 
-    31444, 31453, 31461, 31468, 31473, 31477, 31481, 31486, 15133, 31491, 
-    31499, 31505, 3683, 1377, 31510, 31514, 8005, 31520, 31526, 31533, 8014, 
-    31537, 31543, 31550, 31556, 31565, 31573, 31585, 31589, 31596, 31602, 
-    31606, 31609, 31618, 31626, 31015, 31631, 31641, 31651, 31661, 31667, 
-    31672, 31682, 31687, 31700, 31714, 31725, 31737, 31749, 31763, 31776, 
-    31788, 31800, 14587, 31814, 31819, 31824, 31828, 31832, 31836, 1780, 
-    27159, 31840, 31845, 31063, 31850, 31853, 31858, 31863, 31868, 31874, 
-    31880, 10091, 31885, 31892, 15684, 31898, 31903, 31908, 31912, 31917, 
-    31922, 31068, 31927, 31932, 31937, 31943, 31074, 31948, 31951, 31958, 
-    31966, 31972, 31978, 31984, 31995, 32000, 32007, 32014, 32021, 32029, 
-    32038, 32047, 32053, 32059, 32067, 31079, 32072, 32078, 32084, 31085, 
-    32089, 32094, 32102, 32110, 32116, 32123, 32129, 32136, 32143, 32149, 
-    32157, 32167, 32174, 32179, 32185, 32190, 32195, 32202, 32211, 32219, 
-    32224, 32230, 32237, 32245, 32251, 32256, 32262, 32271, 27936, 32278, 
-    32282, 32287, 32296, 32301, 32306, 32311, 12398, 32319, 32324, 32329, 
-    32334, 32338, 32343, 32348, 32355, 32360, 32365, 32370, 31090, 21203, 
-    32376, 2519, 244, 32379, 32382, 32386, 32390, 32400, 32408, 32412, 32419, 
-    32426, 32430, 32433, 32439, 32447, 32455, 32459, 32463, 32466, 32473, 
-    32477, 32481, 32488, 32496, 31026, 32503, 32511, 10151, 660, 308, 32523, 
-    32528, 32533, 32539, 32544, 32549, 3704, 32554, 32557, 32562, 32567, 
-    32572, 32577, 32582, 32589, 22512, 32594, 32599, 32604, 32609, 32614, 
-    32620, 32625, 32631, 31261, 32637, 32642, 32648, 32654, 32664, 32669, 
-    32674, 32678, 32683, 32688, 32693, 32698, 32711, 32716, 22289, 16692, 
-    3710, 32720, 32725, 32730, 32736, 32741, 32746, 32750, 32755, 32760, 
-    32766, 32771, 32776, 1382, 32780, 32785, 32790, 32795, 32799, 32804, 
-    32809, 32814, 32820, 32826, 32831, 32835, 32839, 32844, 32849, 32854, 
-    32858, 32866, 32870, 32876, 32880, 32887, 16485, 31037, 32893, 32900, 
-    32908, 32915, 32921, 32934, 32946, 32952, 32956, 2773, 32960, 32964, 
-    32468, 32973, 32984, 32989, 32994, 32999, 33003, 33008, 22422, 33012, 
-    33016, 33021, 31043, 21287, 33025, 33030, 33036, 33041, 33045, 33049, 
-    33052, 33056, 33062, 33073, 33085, 31049, 33090, 33093, 33097, 347, 
-    33102, 33107, 33112, 33117, 33122, 33127, 33133, 33138, 33143, 33149, 
-    33154, 33160, 33165, 33171, 33176, 33181, 33186, 33191, 33196, 33201, 
-    33206, 33211, 33217, 33222, 33227, 33232, 33237, 33242, 33247, 33252, 
-    33258, 33264, 33269, 33274, 33279, 33284, 33289, 33294, 33299, 33304, 
-    33309, 33314, 33319, 33324, 33329, 33334, 33339, 33344, 33349, 33354, 
-    33360, 313, 26, 33365, 33369, 33373, 33381, 33385, 33389, 33392, 33395, 
-    33397, 33402, 33406, 33411, 33415, 33420, 33424, 33429, 33433, 33436, 
-    33438, 33442, 33447, 33451, 33462, 33465, 33467, 33471, 33483, 33492, 
-    33496, 33500, 33506, 33511, 33520, 33526, 33531, 33536, 33540, 33545, 
-    33552, 33557, 33563, 33568, 33572, 33579, 25701, 25711, 33583, 33588, 
-    33593, 33598, 33605, 33609, 33616, 8113, 33622, 33631, 33639, 33654, 
-    33668, 33676, 33687, 33696, 33701, 7227, 33711, 33716, 33721, 33725, 
-    33728, 33732, 33737, 33741, 33748, 33753, 33758, 8912, 33768, 33770, 
-    33773, 33777, 33783, 33787, 33792, 33797, 33803, 33808, 33814, 33819, 
-    33829, 33838, 33846, 33851, 33857, 33862, 33869, 33873, 33881, 33888, 
-    33901, 33909, 33913, 33923, 33928, 33932, 33940, 33948, 33952, 33961, 
-    33967, 33972, 33980, 33990, 33999, 34008, 34017, 34028, 34036, 34047, 
-    34056, 34063, 34069, 34074, 34085, 34090, 34094, 34097, 34101, 34109, 
-    34115, 34123, 34130, 34136, 34141, 34147, 2418, 34151, 34153, 34158, 
-    34163, 34168, 34171, 34173, 34177, 34180, 34187, 34191, 9884, 34195, 
-    34201, 34211, 34216, 34222, 34226, 34231, 34244, 26087, 34250, 34259, 
-    17462, 34266, 34275, 31647, 34283, 34288, 34292, 34300, 34307, 34312, 
-    34316, 34321, 34325, 34333, 34339, 34345, 34350, 34354, 34357, 34362, 
-    34375, 34391, 22979, 34408, 34420, 34437, 34449, 34463, 22996, 23015, 
-    34475, 34487, 2680, 34501, 34506, 34511, 34516, 34520, 34527, 34539, 
-    34545, 34548, 34559, 34570, 34575, 32064, 695, 34579, 34583, 34587, 
-    34590, 34595, 34600, 34606, 34611, 34616, 34622, 34628, 34633, 34637, 
-    34642, 34647, 34652, 34656, 34659, 34665, 34670, 34675, 34680, 34684, 
-    34689, 34695, 34703, 26320, 34708, 34713, 34720, 34726, 34732, 34737, 
-    34745, 22521, 34752, 34757, 34762, 34767, 34771, 34774, 34779, 34783, 
-    34787, 34794, 34800, 34806, 34812, 34819, 34824, 34830, 33943, 34834, 
-    34838, 34843, 34856, 34861, 34867, 34875, 34882, 34890, 34900, 34906, 
-    34912, 34918, 34922, 34931, 34939, 34946, 34951, 34956, 10437, 34961, 
-    34969, 34976, 34982, 34992, 34997, 35003, 35011, 3608, 35018, 35025, 
-    3614, 35029, 35034, 35045, 35052, 35058, 35067, 35071, 4015, 35074, 
-    35081, 35087, 35093, 35101, 35111, 29042, 35118, 35126, 35131, 35137, 
-    35142, 25947, 35148, 35155, 35161, 35170, 23660, 35177, 35182, 35186, 
-    35194, 35202, 9600, 5895, 35209, 35213, 35215, 35219, 35224, 35226, 
-    35232, 35237, 35242, 35249, 32585, 35255, 35260, 35264, 35269, 35273, 
-    35282, 35286, 35292, 35299, 35305, 35312, 35317, 35326, 35331, 35335, 
-    35340, 35347, 35355, 35363, 35368, 21343, 35372, 35375, 35379, 35383, 
-    35387, 35390, 35392, 35400, 35404, 35411, 35415, 35419, 35427, 35434, 
-    35444, 35448, 35452, 35460, 35468, 35474, 35479, 35488, 13350, 35494, 
-    35503, 35508, 35515, 35523, 35531, 35539, 35546, 35553, 35560, 35567, 
-    35574, 35579, 35585, 35602, 35610, 35620, 35628, 35635, 407, 35639, 
-    35645, 35649, 35654, 33692, 35660, 35663, 35667, 35675, 3619, 35683, 
-    35689, 35695, 35704, 35714, 35721, 35727, 3625, 3631, 35736, 35743, 
-    35751, 35756, 35760, 35767, 35775, 35782, 35788, 35797, 35807, 35813, 
-    35821, 35830, 35837, 35845, 35852, 22019, 35856, 35863, 35869, 35879, 
-    35888, 35899, 35903, 35913, 35919, 35926, 35934, 35943, 35952, 35962, 
-    35973, 35980, 35985, 35992, 3029, 36000, 36006, 36011, 36017, 36023, 
-    36028, 36041, 36054, 36067, 36074, 36080, 36088, 36096, 36101, 36105, 
-    1469, 36109, 36114, 36119, 36124, 36129, 36135, 36140, 36145, 36150, 
-    36155, 36160, 36165, 36170, 36176, 36182, 36187, 36192, 36198, 36203, 
-    36208, 36213, 36219, 36224, 36229, 36234, 36239, 36245, 36250, 36255, 
-    36261, 36266, 36271, 36276, 36281, 36286, 36292, 36297, 36303, 36308, 
-    36314, 36319, 36324, 36329, 36335, 36341, 36347, 36353, 36359, 36365, 
-    36371, 36377, 36382, 36387, 36393, 36398, 36403, 36408, 36413, 36418, 
-    36423, 36428, 36434, 36439, 36444, 36450, 36456, 101, 36461, 36463, 
-    36467, 36471, 36475, 36480, 36484, 9521, 36488, 36494, 1741, 6280, 36500, 
-    36503, 36508, 36512, 36517, 36521, 36525, 36530, 10238, 36534, 36538, 
-    36542, 36546, 15372, 36551, 36555, 36560, 36565, 36570, 36574, 36581, 
-    26111, 36587, 36590, 36594, 36599, 36605, 36609, 36617, 36623, 36628, 
-    36632, 36638, 36642, 36646, 3462, 3467, 29234, 36649, 36653, 36657, 
-    36661, 36669, 36676, 36680, 36687, 36692, 317, 36697, 36701, 36707, 
-    36719, 36725, 36731, 36735, 36741, 36750, 36754, 36758, 36763, 36769, 
-    36774, 36778, 36783, 36787, 36791, 36798, 36804, 36809, 36824, 36839, 
-    36854, 36870, 36888, 10188, 36902, 36909, 36913, 36916, 36925, 36930, 
-    36934, 36942, 33894, 36950, 36954, 36964, 36975, 29204, 36988, 36992, 
-    37001, 37009, 9778, 14900, 37013, 22434, 37016, 30152, 37021, 9777, 
-    37026, 37032, 37037, 37043, 37048, 37054, 37059, 37065, 37070, 37076, 
-    37082, 37088, 37093, 37049, 37055, 37060, 37066, 37071, 37077, 37083, 
-    8126, 3874, 37097, 37105, 37109, 37112, 37116, 37121, 37126, 37132, 
-    37138, 37143, 37147, 25959, 37151, 37155, 37161, 37165, 9042, 37174, 
-    37181, 37185, 11868, 37192, 37198, 37203, 37210, 37217, 37224, 28550, 
-    8049, 37231, 37238, 37245, 37251, 37256, 37263, 37274, 37280, 37285, 
-    37290, 37295, 37302, 37050, 37306, 37316, 37327, 37333, 37338, 37343, 
-    37348, 37353, 37358, 37362, 37366, 37372, 37380, 2319, 865, 10254, 10266, 
-    10271, 10277, 37389, 10282, 10287, 10293, 37394, 37404, 37408, 10298, 
-    37413, 16890, 37416, 37421, 37425, 37430, 37435, 37442, 37449, 37453, 
-    37456, 37464, 10201, 37471, 37474, 37480, 37490, 5929, 37499, 37503, 
-    37511, 37515, 37525, 37531, 37542, 37548, 37554, 37559, 37565, 37571, 
-    37577, 37582, 37585, 37592, 37598, 37603, 37610, 37617, 37621, 37631, 
-    37644, 37653, 37662, 37673, 37686, 37697, 37706, 37717, 37722, 37731, 
-    37736, 10303, 37742, 37749, 37757, 37762, 37766, 37773, 37780, 3829, 16, 
-    37784, 37789, 16744, 37793, 37796, 37799, 28056, 37803, 28559, 37811, 
-    37815, 37819, 37822, 37828, 37072, 37834, 37842, 37848, 37855, 28039, 
-    37859, 28233, 37863, 37872, 37878, 37884, 37889, 37893, 37899, 37903, 
-    37911, 37919, 26177, 37925, 37932, 37938, 37943, 37948, 37952, 37958, 
-    37963, 37969, 4056, 791, 37976, 37980, 37983, 15262, 37995, 35826, 38006, 
-    38009, 38016, 38020, 38026, 38030, 38036, 38041, 38047, 38052, 38057, 
-    38061, 38065, 38070, 38075, 38085, 38091, 38104, 38110, 38116, 38123, 
-    38128, 38134, 38139, 16630, 1472, 1019, 31193, 31199, 38144, 31205, 
-    31218, 31224, 31230, 38150, 31236, 31242, 38156, 38162, 22, 38170, 38177, 
-    38181, 38185, 38193, 31953, 38197, 38201, 38208, 38213, 38217, 38222, 
-    38228, 38233, 38239, 38244, 38248, 38252, 38256, 38261, 38265, 38270, 
-    38274, 38281, 38286, 38290, 38295, 38299, 38304, 38308, 38313, 38319, 
-    15482, 15487, 38324, 38328, 38331, 38335, 21170, 38340, 38344, 38350, 
-    38357, 38362, 38372, 38377, 38385, 38389, 38392, 31968, 38396, 4109, 
-    38401, 38406, 38410, 38415, 38419, 38424, 13368, 38435, 38439, 38442, 
-    38447, 38451, 38455, 38458, 38462, 8145, 13384, 38465, 38468, 38474, 
-    38479, 38485, 38490, 38496, 38501, 38507, 38512, 38518, 38524, 38530, 
-    38535, 38539, 38543, 38552, 38568, 38584, 38594, 27946, 38601, 38605, 
-    38610, 38615, 38619, 38623, 35947, 38629, 38634, 38638, 38645, 38650, 
-    38654, 38658, 26979, 38664, 21438, 38669, 38676, 38684, 38690, 38697, 
-    38705, 38711, 38715, 38721, 38729, 38733, 38742, 9502, 38750, 38754, 
-    38762, 38769, 38774, 38779, 38783, 38786, 38790, 38793, 38797, 38804, 
-    38809, 38815, 26398, 31256, 38819, 38826, 38832, 38838, 38843, 38846, 
-    38848, 38855, 38862, 38868, 38872, 38875, 38879, 38883, 38887, 38892, 
-    38896, 38900, 38903, 38907, 38921, 23045, 38940, 38953, 38966, 38979, 
-    23063, 38994, 10490, 39009, 39015, 39019, 39023, 39030, 39035, 39039, 
-    39046, 39052, 39057, 39063, 39073, 39085, 39096, 39101, 39108, 39112, 
-    39116, 39119, 15878, 3677, 39127, 15509, 39140, 39147, 39151, 39155, 
-    39160, 39165, 39171, 39175, 39179, 39182, 7742, 15520, 39187, 39191, 
-    39197, 39206, 39211, 39218, 35803, 39224, 39229, 39233, 39238, 39245, 
-    39249, 39252, 39256, 39261, 14552, 39268, 39275, 1066, 39279, 39284, 
-    39289, 39295, 39300, 39305, 39309, 39319, 39324, 39330, 39335, 39341, 
-    39346, 39352, 39362, 39367, 39372, 39376, 7229, 7241, 39381, 39384, 
-    39391, 39397, 34059, 34066, 39406, 39410, 32016, 39418, 39429, 39437, 
-    35995, 39444, 39449, 39454, 39465, 39472, 39483, 32040, 21444, 39491, 
-    735, 39496, 39502, 28030, 39508, 39513, 39523, 39532, 39539, 39545, 
-    39549, 39552, 39559, 39565, 39572, 39578, 39588, 39596, 39602, 39608, 
-    39613, 39617, 39624, 39630, 39637, 38888, 535, 13805, 39643, 39648, 
-    39651, 39657, 39665, 1396, 39670, 39674, 39679, 39686, 39692, 39696, 
-    39700, 39705, 39714, 39721, 39731, 39737, 28074, 39754, 39763, 39771, 
-    39777, 39782, 39789, 39795, 39803, 39812, 39820, 39824, 39829, 39837, 
-    32049, 39843, 39862, 15811, 39876, 39892, 39906, 39912, 39917, 39922, 
-    39927, 39933, 32055, 39938, 39945, 39950, 39954, 345, 2936, 39961, 39966, 
-    39971, 27305, 39792, 39975, 39980, 39988, 39992, 39995, 40001, 40007, 
-    40011, 28129, 40014, 40019, 40023, 40026, 40031, 40035, 40040, 40045, 
-    40049, 40054, 40058, 40062, 21166, 21177, 40066, 40071, 40077, 26936, 
-    40082, 40086, 21253, 16059, 40089, 40094, 40099, 40104, 40109, 40114, 
-    40119, 40124, 447, 43, 31274, 31279, 31284, 31290, 31295, 31300, 40129, 
-    31304, 40133, 40137, 40141, 31309, 31315, 40155, 31326, 31331, 40163, 
-    40168, 31337, 40173, 40178, 40183, 40188, 40194, 40200, 40206, 31354, 
-    40219, 40225, 31358, 40229, 31363, 40234, 31368, 31373, 40237, 40242, 
-    40246, 30923, 40252, 13592, 40259, 40264, 31378, 40268, 40273, 40278, 
-    40283, 40287, 40292, 40297, 40303, 40308, 40313, 40319, 40325, 40330, 
-    40334, 40339, 40344, 40349, 40353, 40358, 40363, 40368, 40374, 40380, 
-    40386, 40391, 40395, 40400, 40404, 31382, 31387, 31392, 40408, 40412, 
-    40416, 31397, 31403, 31409, 31421, 40428, 25996, 40432, 40436, 40441, 
-    40446, 40451, 40456, 40460, 40464, 40474, 40479, 40484, 40488, 40492, 
-    40495, 40503, 31469, 40508, 1479, 40514, 40522, 40531, 40535, 40539, 
-    40547, 40553, 40561, 40577, 40581, 40585, 40590, 40605, 31506, 1749, 
-    12048, 40609, 1378, 40621, 40622, 40630, 40637, 40642, 40649, 40654, 
-    9372, 1114, 10325, 40661, 40666, 40669, 40672, 40681, 1286, 40686, 39036, 
-    40693, 40698, 22486, 2557, 40702, 10734, 40712, 40718, 2337, 2347, 40727, 
-    40736, 40746, 40757, 3293, 34212, 10377, 3807, 16668, 1291, 40762, 40770, 
-    40777, 40782, 40786, 40790, 23858, 10404, 40798, 40807, 40816, 40824, 
-    40831, 40842, 40847, 40860, 40873, 40885, 40897, 40909, 40922, 40933, 
-    40944, 40954, 40962, 40970, 40982, 40994, 41005, 41014, 41022, 41029, 
-    41041, 41048, 41057, 41064, 41077, 41082, 41092, 41097, 41103, 41108, 
-    37182, 41112, 41119, 41123, 41130, 41138, 2518, 41145, 41156, 41166, 
-    41175, 41183, 41193, 41201, 41211, 41220, 41225, 41231, 41237, 3709, 
-    41248, 41258, 41267, 41276, 41286, 41294, 41303, 41308, 41313, 41318, 
-    1705, 37, 41326, 41334, 41345, 41356, 16343, 41366, 41370, 41377, 41383, 
-    41388, 41392, 41403, 41413, 41422, 41433, 16717, 16722, 41438, 41447, 
-    41452, 41462, 41467, 41475, 41483, 41490, 41496, 7078, 228, 41500, 41506, 
-    41511, 41514, 2117, 39152, 41522, 41526, 41529, 1512, 41535, 13967, 1296, 
-    41540, 41553, 41567, 2643, 41585, 41597, 41609, 2657, 2674, 41623, 41636, 
-    2689, 41650, 41662, 2704, 41676, 1302, 1308, 1314, 10652, 41681, 41686, 
-    41691, 41695, 41710, 41725, 41740, 41755, 41770, 41785, 41800, 41815, 
-    41830, 41845, 41860, 41875, 41890, 41905, 41920, 41935, 41950, 41965, 
-    41980, 41995, 42010, 42025, 42040, 42055, 42070, 42085, 42100, 42115, 
-    42130, 42145, 42160, 42175, 42190, 42205, 42220, 42235, 42250, 42265, 
-    42280, 42295, 42310, 42325, 42340, 42355, 42370, 42385, 42400, 42415, 
-    42430, 42445, 42460, 42475, 42490, 42505, 42520, 42535, 42550, 42565, 
-    42580, 42595, 42610, 42625, 42640, 42655, 42670, 42685, 42700, 42715, 
-    42730, 42745, 42760, 42775, 42790, 42805, 42820, 42835, 42850, 42865, 
-    42880, 42895, 42910, 42925, 42940, 42955, 42970, 42985, 43000, 43015, 
-    43030, 43045, 43060, 43075, 43090, 43105, 43120, 43135, 43150, 43165, 
-    43180, 43195, 43210, 43225, 43240, 43255, 43270, 43285, 43300, 43315, 
-    43330, 43345, 43360, 43375, 43390, 43405, 43420, 43435, 43450, 43465, 
-    43480, 43495, 43510, 43525, 43540, 43555, 43570, 43585, 43600, 43615, 
-    43630, 43645, 43660, 43675, 43690, 43705, 43720, 43735, 43750, 43765, 
-    43780, 43795, 43810, 43825, 43840, 43855, 43870, 43885, 43900, 43915, 
-    43930, 43945, 43960, 43975, 43990, 44005, 44020, 44035, 44050, 44065, 
-    44080, 44095, 44110, 44125, 44140, 44155, 44170, 44185, 44200, 44215, 
-    44230, 44245, 44260, 44275, 44290, 44305, 44320, 44335, 44350, 44365, 
-    44380, 44395, 44410, 44425, 44440, 44455, 44470, 44485, 44500, 44515, 
-    44530, 44545, 44560, 44575, 44590, 44605, 44620, 44635, 44650, 44665, 
-    44680, 44695, 44710, 44725, 44740, 44755, 44770, 44785, 44800, 44815, 
-    44830, 44845, 44860, 44875, 44890, 44905, 44920, 44935, 44950, 44965, 
-    44980, 44995, 45010, 45025, 45040, 45055, 45070, 45085, 45100, 45115, 
-    45130, 45145, 45160, 45175, 45190, 45205, 45220, 45235, 45250, 45265, 
-    45280, 45295, 45310, 45325, 45340, 45355, 45370, 45385, 45400, 45415, 
-    45430, 45445, 45460, 45475, 45490, 45505, 45520, 45535, 45550, 45565, 
-    45580, 45595, 45610, 45625, 45640, 45655, 45670, 45685, 45700, 45715, 
-    45730, 45745, 45760, 45775, 45790, 45805, 45820, 45835, 45850, 45865, 
-    45880, 45895, 45910, 45925, 45940, 45955, 45970, 45985, 46000, 46015, 
-    46030, 46045, 46060, 46075, 46090, 46105, 46120, 46135, 46150, 46165, 
-    46180, 46195, 46210, 46225, 46240, 46255, 46270, 46285, 46300, 46315, 
-    46330, 46345, 46360, 46375, 46390, 46405, 46420, 46435, 46450, 46465, 
-    46480, 46495, 46510, 46525, 46540, 46555, 46570, 46585, 46600, 46615, 
-    46630, 46645, 46660, 46675, 46690, 46705, 46720, 46735, 46750, 46765, 
-    46780, 46795, 46810, 46825, 46840, 46855, 46870, 46885, 46900, 46915, 
-    46930, 46945, 46960, 46975, 46990, 47005, 47020, 47035, 47050, 47065, 
-    47080, 47095, 47110, 47125, 47140, 47155, 47170, 47185, 47200, 47215, 
-    47230, 47245, 47260, 47275, 47290, 47305, 47320, 47335, 47350, 47365, 
-    47380, 47395, 47410, 47425, 47440, 47455, 47470, 47485, 47500, 47515, 
-    47530, 47545, 47560, 47575, 47590, 47605, 47620, 47635, 47650, 47665, 
-    47680, 47695, 47710, 47725, 47740, 47755, 47770, 47785, 47800, 47815, 
-    47830, 47845, 47860, 47875, 47890, 47905, 47920, 47935, 47950, 47965, 
-    47980, 47995, 48010, 48025, 48040, 48055, 48070, 48085, 48100, 48115, 
-    48130, 48145, 48160, 48175, 48190, 48205, 48220, 48235, 48250, 48265, 
-    48280, 48295, 48310, 48325, 48340, 48355, 48370, 48385, 48400, 48415, 
-    48430, 48445, 48460, 48475, 48490, 48505, 48520, 48535, 48550, 48565, 
-    48580, 48595, 48610, 48625, 48640, 48655, 48670, 48685, 48700, 48715, 
-    48730, 48745, 48760, 48775, 48790, 48805, 48820, 48835, 48850, 48865, 
-    48880, 48895, 48910, 48925, 48940, 48955, 48970, 48985, 49000, 49015, 
-    49030, 49045, 49060, 49075, 49090, 49105, 49120, 49135, 49150, 49165, 
-    49180, 49195, 49210, 49225, 49240, 49255, 49270, 49285, 49300, 49315, 
-    49330, 49345, 49360, 49375, 49390, 49405, 49420, 49435, 49450, 49465, 
-    49480, 49495, 49511, 49527, 49543, 49559, 49575, 49591, 49607, 49623, 
-    49639, 49655, 49671, 49687, 49703, 49719, 49735, 49751, 49767, 49783, 
-    49799, 49815, 49831, 49847, 49863, 49879, 49895, 49911, 49927, 49943, 
-    49959, 49975, 49991, 50007, 50023, 50039, 50055, 50071, 50087, 50103, 
-    50119, 50135, 50151, 50167, 50183, 50199, 50215, 50231, 50247, 50263, 
-    50279, 50295, 50311, 50327, 50343, 50359, 50375, 50391, 50407, 50423, 
-    50439, 50455, 50471, 50487, 50503, 50519, 50535, 50551, 50567, 50583, 
-    50599, 50615, 50631, 50647, 50663, 50679, 50695, 50711, 50727, 50743, 
-    50759, 50775, 50791, 50807, 50823, 50839, 50855, 50871, 50887, 50903, 
-    50919, 50935, 50951, 50967, 50983, 50999, 51015, 51031, 51047, 51063, 
-    51079, 51095, 51111, 51127, 51143, 51159, 51175, 51191, 51207, 51223, 
-    51239, 51255, 51271, 51287, 51303, 51319, 51335, 51351, 51367, 51383, 
-    51399, 51415, 51431, 51447, 51463, 51479, 51495, 51511, 51527, 51543, 
-    51559, 51575, 51591, 51607, 51623, 51639, 51655, 51671, 51687, 51703, 
-    51719, 51735, 51751, 51767, 51783, 51799, 51815, 51831, 51847, 51863, 
-    51879, 51895, 51911, 51927, 51943, 51959, 51975, 51991, 52007, 52023, 
-    52039, 52055, 52071, 52087, 52103, 52119, 52135, 52151, 52167, 52183, 
-    52199, 52215, 52231, 52247, 52263, 52279, 52295, 52311, 52327, 52343, 
-    52359, 52375, 52391, 52407, 52423, 52439, 52455, 52471, 52487, 52503, 
-    52519, 52535, 52551, 52567, 52583, 52599, 52615, 52631, 52647, 52663, 
-    52679, 52695, 52711, 52727, 52743, 52759, 52775, 52791, 52807, 52823, 
-    52839, 52855, 52871, 52887, 52903, 52919, 52935, 52951, 52967, 52983, 
-    52999, 53015, 53031, 53047, 53063, 53079, 53095, 53111, 53127, 53143, 
-    53159, 53175, 53191, 53207, 53223, 53239, 53255, 53271, 53287, 53303, 
-    53319, 53335, 53351, 53367, 53383, 53399, 53415, 53431, 53447, 53463, 
-    53479, 53495, 53511, 53527, 53543, 53559, 53575, 53591, 53607, 53623, 
-    53639, 53655, 53671, 53687, 53703, 53719, 53735, 53751, 53767, 53783, 
-    53799, 53815, 53831, 53847, 53863, 53879, 53895, 53911, 53927, 53943, 
-    53959, 53975, 53991, 54007, 54023, 54039, 54055, 54071, 54087, 54103, 
-    54119, 54135, 54151, 54167, 54183, 54199, 54215, 54231, 54247, 54263, 
-    54279, 54295, 54311, 54327, 54343, 54359, 54375, 54391, 54407, 54423, 
-    54439, 54455, 54471, 54487, 54503, 54519, 54535, 54551, 54567, 54583, 
-    54599, 54615, 54631, 54647, 54663, 54679, 54695, 54711, 54727, 54743, 
-    54759, 54775, 54791, 54807, 54823, 54839, 54855, 54871, 54887, 54903, 
-    54919, 54935, 54951, 54967, 54983, 54999, 55015, 55031, 55047, 55063, 
-    55079, 55095, 55111, 55127, 55143, 55159, 55175, 55191, 55207, 55223, 
-    55239, 55255, 55271, 55287, 55303, 55319, 55335, 55351, 55367, 55383, 
-    55399, 55415, 55431, 55447, 55463, 55479, 55495, 55511, 55527, 55543, 
-    55559, 55575, 55591, 55607, 55623, 55639, 55655, 55671, 55687, 55703, 
-    55719, 55735, 55751, 55767, 55783, 55799, 55815, 55831, 55847, 55863, 
-    55879, 55895, 55911, 55927, 55943, 55959, 55975, 55991, 56007, 56023, 
-    56039, 56055, 56071, 56087, 56103, 56119, 56135, 56151, 56167, 56183, 
-    56199, 56215, 56231, 56247, 56263, 56279, 56295, 56311, 56327, 56343, 
-    56359, 56375, 56391, 56407, 56423, 56439, 56455, 56471, 56487, 56503, 
-    56519, 56535, 56551, 56567, 56583, 56599, 56615, 56631, 56647, 56663, 
-    56679, 56695, 56711, 56727, 56743, 56759, 56775, 56791, 56807, 56823, 
-    56839, 56855, 56871, 56887, 56903, 56919, 56935, 56951, 56967, 56983, 
-    56999, 57015, 57031, 57047, 57063, 57079, 57095, 57111, 57127, 57143, 
-    57159, 57175, 57191, 57207, 57223, 57239, 57255, 57271, 57287, 57303, 
-    57319, 57335, 57351, 57367, 57383, 57399, 57415, 57431, 57447, 57463, 
-    57479, 57495, 57511, 57527, 57543, 57559, 57575, 57591, 57607, 57623, 
-    57639, 57655, 57671, 57687, 57703, 57719, 57735, 57751, 57767, 57783, 
-    57799, 57815, 57831, 57847, 57863, 57879, 57895, 57911, 57927, 57943, 
-    57959, 57975, 57991, 58007, 58023, 58039, 58055, 58071, 58087, 58103, 
-    58119, 58135, 58151, 58167, 58182, 16749, 58191, 58197, 58203, 58213, 
-    58221, 14881, 15432, 9953, 58234, 1520, 58242, 3761, 27415, 7183, 58248, 
-    58253, 58258, 58263, 58268, 58274, 58279, 58285, 58290, 58296, 58301, 
-    58306, 58311, 58316, 58322, 58327, 58332, 58337, 58342, 58347, 58352, 
-    58357, 58363, 58368, 58374, 58381, 2561, 58386, 58392, 8526, 58396, 
-    58401, 58408, 58416, 40, 58420, 58426, 58431, 58436, 58440, 58445, 58449, 
-    58453, 10677, 58457, 58467, 58480, 58491, 58504, 58511, 58517, 58522, 
-    58528, 58534, 58540, 58545, 58550, 58555, 58560, 58564, 58569, 58574, 
-    58579, 58585, 58591, 58597, 58602, 58606, 58611, 58616, 58620, 58625, 
-    58630, 58635, 58639, 10693, 10704, 10709, 1563, 58643, 1568, 58649, 
-    16226, 58652, 58658, 1599, 58664, 1605, 1611, 10739, 58669, 58677, 58684, 
-    58688, 58694, 58699, 30952, 58704, 58711, 58716, 58720, 58724, 1616, 
-    16318, 58733, 58737, 16329, 1120, 58741, 58748, 58753, 58757, 16354, 
-    1620, 37321, 58760, 58765, 58775, 58784, 58789, 58793, 58799, 1625, 
-    39230, 58804, 58813, 58819, 58824, 10897, 10903, 58830, 58842, 58859, 
-    58876, 58893, 58910, 58927, 58944, 58961, 58978, 58995, 59012, 59029, 
-    59046, 59063, 59080, 59097, 59114, 59131, 59148, 59165, 59182, 59199, 
-    59216, 59233, 59250, 59267, 59284, 59301, 59318, 59335, 59352, 59369, 
-    59386, 59403, 59420, 59437, 59454, 59471, 59488, 59505, 59522, 59539, 
-    59556, 59573, 59590, 59607, 59624, 59641, 59658, 59675, 59686, 59691, 
-    1630, 59695, 59701, 59706, 59711, 9319, 1635, 59717, 59726, 27710, 59731, 
-    59742, 59752, 59757, 59764, 59770, 59775, 59780, 16606, 59784, 10914, 
-    1640, 10919, 59790, 59795, 59801, 59806, 59811, 59816, 59821, 59826, 
-    59831, 59836, 59842, 59848, 59854, 59859, 59863, 59868, 59873, 59877, 
-    59882, 59887, 59892, 59896, 59901, 59907, 59912, 59917, 59921, 59926, 
-    59931, 59937, 59942, 59947, 59953, 59959, 59964, 59968, 59973, 59978, 
-    59983, 59987, 59992, 59997, 60002, 60008, 60014, 60019, 60023, 60027, 
-    60032, 60037, 60042, 29108, 60046, 60051, 60056, 60062, 60067, 60072, 
-    60076, 60081, 60086, 60092, 60097, 60102, 60108, 60114, 60119, 60123, 
-    60128, 60133, 60137, 60142, 60147, 60152, 60158, 60164, 60169, 60173, 
-    60178, 60183, 60187, 60192, 60197, 60202, 60206, 60209, 31614, 60214, 
-    60222, 16672, 3663, 11010, 60228, 60238, 60253, 11015, 60264, 60269, 
-    60280, 60292, 60304, 60316, 2695, 60328, 60333, 60345, 60349, 60355, 
-    60361, 60366, 1652, 1067, 60375, 60380, 39280, 60384, 60388, 60393, 
-    60397, 16757, 60402, 60405, 60413, 60421, 1656, 11040, 11046, 1661, 
-    60429, 60436, 60441, 60450, 60460, 60467, 60472, 60477, 1666, 60484, 
-    60489, 16872, 60493, 60498, 60505, 60511, 60515, 60526, 60536, 16894, 
-    9227, 9234, 1671, 60543, 60549, 60557, 60564, 60570, 60577, 60589, 60595, 
-    60600, 60612, 60623, 60632, 60642, 3740, 30788, 30797, 16934, 1676, 1680, 
-    60650, 60661, 60666, 1683, 60674, 60679, 16985, 60691, 60697, 60702, 
-    60710, 1688, 60715, 60720, 60728, 60736, 60743, 60752, 60760, 60769, 
-    1693, 60773, 1698, 60778, 60785, 17059, 60793, 60799, 60804, 60812, 
-    60819, 60827, 22557, 60832, 11175, 60841, 60847, 60854, 60861, 60867, 
-    60877, 60883, 60888, 60899, 60904, 60912, 11184, 11189, 60920, 60926, 
-    60934, 3805, 17101, 39368, 60939, 60945, 60950, 60958, 60965, 12029, 
-    60970, 60976, 1709, 60981, 60984, 1127, 60990, 60995, 61000, 61006, 
-    61011, 61016, 61021, 61026, 61031, 61036, 1718, 9, 61042, 61046, 61051, 
-    61055, 61059, 61063, 31854, 61068, 61073, 61078, 61082, 61085, 61089, 
-    61093, 61098, 61102, 61107, 61111, 34591, 34596, 34601, 61114, 61121, 
-    61127, 39089, 61137, 34607, 32112, 31869, 31875, 34623, 31881, 61142, 
-    61147, 32145, 61151, 61154, 61158, 61165, 61168, 61173, 61177, 61181, 
-    61184, 61194, 61206, 61213, 61219, 61226, 33548, 61229, 8543, 877, 61232, 
-    61236, 61241, 3690, 61245, 61248, 13625, 61255, 61262, 61275, 61283, 
-    61292, 61301, 61306, 61316, 61329, 61341, 61348, 61353, 61362, 61375, 
-    36035, 61393, 61398, 61405, 61411, 652, 61416, 61424, 61431, 27254, 627, 
-    61437, 61443, 61453, 61459, 61464, 31899, 6003, 31913, 61468, 61478, 
-    61483, 61493, 61508, 61514, 61520, 31923, 61525, 31069, 61529, 61534, 
-    61539, 61543, 61548, 16937, 61555, 61560, 61564, 6044, 31949, 61568, 
-    61574, 312, 61584, 61591, 61598, 61603, 61612, 58769, 61618, 61626, 
-    61630, 61634, 61638, 61642, 61647, 61651, 61657, 61665, 61670, 61675, 
-    61679, 61684, 61688, 61692, 61698, 61704, 61709, 61713, 32073, 61718, 
-    32079, 32085, 61723, 61729, 61736, 61741, 61745, 31086, 16599, 61748, 
-    61752, 61757, 61764, 61770, 61774, 61779, 38799, 61785, 61789, 61793, 
-    61798, 61804, 61810, 61822, 61831, 61841, 61847, 61854, 61859, 61864, 
-    61868, 61871, 61877, 61884, 61889, 61894, 61901, 61908, 61914, 61919, 
-    61924, 61932, 32090, 2423, 61937, 61942, 61948, 61953, 61959, 61964, 
-    61969, 61974, 61980, 32111, 61985, 61991, 61997, 62003, 32175, 62008, 
-    62013, 62018, 32186, 62023, 62028, 62033, 62039, 62045, 32191, 62050, 
-    62055, 62060, 32246, 32252, 62065, 62070, 32257, 62075, 27937, 32279, 
-    32283, 62080, 62056, 62084, 62092, 62098, 62106, 62113, 62119, 62129, 
-    62135, 62142, 10624, 32297, 62148, 62161, 62170, 62176, 62185, 62191, 
-    23495, 62198, 62205, 62215, 32247, 62218, 62225, 62230, 62234, 62238, 
-    62243, 6120, 62247, 62252, 62257, 34685, 34690, 62261, 34704, 62266, 
-    34709, 62271, 62277, 34721, 34727, 34733, 62282, 62288, 22522, 62299, 
-    62302, 62314, 62322, 32320, 62326, 62335, 62345, 62354, 32330, 62359, 
-    62366, 62375, 62381, 62389, 62396, 6095, 4397, 62401, 32258, 62407, 
-    62410, 62416, 62423, 62428, 62433, 23405, 62437, 62443, 62449, 62454, 
-    62459, 62463, 62469, 62475, 33458, 863, 35698, 36619, 36625, 32366, 
-    62480, 62484, 62488, 62491, 62504, 62510, 62514, 62517, 62522, 33761, 
-    62526, 31091, 21274, 62532, 6024, 6032, 9068, 62535, 62540, 62545, 62550, 
-    62555, 62560, 62565, 62570, 62575, 62580, 62586, 62591, 62596, 62602, 
-    62607, 62612, 62617, 62622, 62627, 62632, 62638, 62643, 62649, 62654, 
-    62659, 62664, 62669, 62674, 62679, 62684, 62689, 62694, 62699, 62705, 
-    62710, 62715, 62720, 62725, 62730, 62735, 62741, 62746, 62751, 62756, 
-    62761, 62766, 62771, 62776, 62781, 62786, 62792, 62797, 62802, 62807, 
-    62812, 62818, 62824, 62829, 62835, 62840, 62845, 62850, 62855, 62860, 
-    1513, 245, 62865, 62869, 62873, 62877, 25116, 62881, 62885, 62890, 62894, 
-    62899, 62903, 62908, 62913, 62918, 62922, 62926, 62931, 62935, 13362, 
-    62940, 62944, 62951, 62961, 15193, 62970, 62979, 62983, 62988, 62993, 
-    62997, 24907, 3019, 63001, 17350, 63007, 63016, 63024, 63030, 63042, 
-    63054, 63058, 63063, 63067, 63073, 63079, 63084, 63094, 63104, 63110, 
-    63115, 63119, 63124, 63130, 63139, 63148, 63156, 15547, 63160, 63169, 
-    63177, 63189, 63200, 63211, 63220, 63224, 63233, 63243, 63251, 63257, 
-    63262, 63268, 63273, 98, 30900, 63284, 26249, 26259, 63290, 63297, 63303, 
-    63307, 63317, 63328, 63336, 63345, 63350, 63355, 63359, 17304, 63367, 
-    63371, 63377, 63387, 63394, 63400, 34784, 63406, 63408, 63411, 63415, 
-    63425, 63431, 63438, 13308, 63445, 63451, 63460, 63469, 63475, 63481, 
-    63487, 63492, 63499, 63506, 63512, 63525, 63534, 63543, 63548, 63552, 
-    63558, 63565, 63572, 63579, 63586, 63593, 63598, 63602, 63606, 63609, 
-    63619, 63623, 63635, 63644, 63648, 63653, 63657, 63663, 63668, 63675, 
-    63684, 63692, 63700, 63705, 63709, 63714, 63719, 63729, 63737, 63742, 
-    63746, 63750, 63756, 63768, 63776, 63786, 63793, 63799, 63804, 63808, 
-    63812, 63816, 63825, 63834, 63843, 63849, 63855, 63861, 63866, 63873, 
-    63879, 63887, 63894, 12456, 63900, 63906, 63910, 14231, 63914, 63919, 
-    63929, 63938, 63944, 63950, 63958, 63965, 63969, 63973, 63979, 63987, 
-    63994, 64000, 64011, 64015, 64019, 64023, 64026, 64032, 64037, 64041, 
-    64045, 64054, 64062, 64069, 64075, 64082, 24029, 38841, 64087, 64095, 
-    64099, 64103, 64106, 64114, 64121, 64127, 64136, 64144, 64150, 64155, 
-    64159, 64164, 64168, 64172, 64177, 64186, 64190, 64197, 64204, 64210, 
-    64218, 64224, 64235, 64243, 64249, 22652, 64258, 64265, 64272, 64279, 
-    64286, 64293, 41870, 13146, 64300, 64307, 64312, 34820, 6217, 64318, 
-    64323, 64328, 64334, 64340, 64346, 64351, 64356, 64361, 64366, 64372, 
-    64377, 64383, 64388, 64394, 64399, 64404, 64409, 64414, 64419, 64424, 
-    64429, 64435, 64440, 64446, 64451, 64456, 64461, 64466, 64471, 64476, 
-    64482, 64487, 64492, 64497, 64502, 64507, 64512, 64517, 64522, 64527, 
-    64532, 64538, 64543, 64548, 64553, 64558, 64563, 64568, 64573, 64578, 
-    64584, 64589, 64594, 64599, 64604, 64609, 64614, 64619, 64624, 64629, 
-    64634, 64639, 64644, 64650, 1834, 224, 37417, 64655, 64658, 64663, 64667, 
-    64670, 64675, 63696, 64686, 64696, 64703, 64719, 64728, 64738, 64748, 
-    64756, 64770, 64778, 64782, 64785, 64792, 64798, 64809, 64821, 64832, 
-    64841, 64848, 1297, 23294, 64858, 2590, 64862, 64871, 1133, 17277, 38054, 
-    64879, 64887, 64901, 64914, 64918, 64923, 64928, 64933, 64939, 64945, 
-    64950, 8535, 64955, 64959, 64967, 11041, 64972, 64978, 64987, 1721, 
-    11053, 736, 64991, 65000, 65010, 27013, 65019, 65025, 16849, 65031, 
-    65035, 3964, 11384, 65041, 65048, 60656, 65052, 65056, 3988, 189, 14146, 
-    65062, 65074, 65078, 65084, 27730, 65088, 11372, 2730, 4, 65093, 65103, 
-    65109, 65120, 65127, 65133, 65139, 65147, 65154, 65160, 65170, 65180, 
-    65190, 23482, 1309, 65199, 65203, 65207, 65213, 65217, 2753, 2759, 8532, 
-    2264, 65221, 65225, 65234, 65242, 65253, 65261, 65269, 65275, 65280, 
-    65291, 65302, 65310, 65316, 9687, 65321, 65329, 65333, 65337, 65341, 
-    65353, 28115, 65360, 65370, 65376, 65382, 9789, 65392, 65403, 65413, 
-    65422, 65426, 65433, 1135, 1170, 65443, 65448, 65456, 65464, 65475, 
-    65482, 65496, 14075, 393, 65506, 65510, 65518, 65527, 65535, 65541, 
-    65555, 65562, 65568, 65577, 65584, 65594, 65602, 3812, 156, 65610, 65621, 
-    65625, 65637, 27928, 161, 65643, 65648, 65652, 65659, 65665, 65673, 
-    65680, 8818, 65687, 65696, 65704, 3878, 65717, 8199, 65721, 2798, 450, 
-    65726, 65739, 65744, 1833, 668, 65748, 3895, 65756, 65762, 65766, 931, 
-    65776, 65785, 65790, 14915, 14922, 45232, 65794, 3822, 13034, 65802, 
-    65809, 23538, 65813, 65820, 65826, 65831, 65836, 14935, 372, 65841, 
-    65853, 65859, 65867, 2810, 1753, 65875, 65877, 65882, 65887, 65892, 
-    65898, 65903, 65908, 65913, 65918, 65923, 65928, 65934, 65939, 65944, 
-    65949, 65954, 65959, 65964, 65969, 65974, 65980, 65985, 65990, 65995, 
-    66001, 66006, 66012, 66017, 66022, 66027, 66032, 66037, 66042, 66047, 
-    66053, 66058, 66064, 66069, 66074, 66079, 66084, 66089, 66094, 66099, 
-    66104, 66110, 66115, 66120, 66125, 66129, 66133, 66138, 66142, 66147, 
-    66152, 66158, 66163, 66167, 66172, 66176, 66179, 66181, 66185, 66188, 
-    66193, 66197, 66201, 66205, 66209, 66218, 66222, 32524, 66225, 32529, 
-    66232, 66237, 32534, 66246, 66255, 32540, 66260, 32545, 66269, 66274, 
-    11571, 66278, 66283, 66288, 32550, 66292, 40196, 66296, 66299, 66303, 
-    8211, 66309, 66314, 66318, 3705, 32555, 66321, 66325, 66328, 66333, 
-    66337, 66343, 66351, 66364, 66373, 66379, 66384, 66390, 66394, 66400, 
-    66408, 66413, 66417, 66424, 66430, 66438, 66447, 66455, 32558, 66462, 
-    66472, 66481, 66494, 66499, 66504, 66513, 66519, 66526, 66537, 66549, 
-    66556, 66565, 66574, 66583, 66590, 66596, 66603, 66611, 66618, 66626, 
-    66635, 66643, 66650, 66658, 66667, 66675, 66684, 66694, 66703, 66711, 
-    66718, 66726, 66735, 66743, 66752, 66762, 66771, 66779, 66788, 66798, 
-    66807, 66817, 66828, 66838, 66847, 66855, 66862, 66870, 66879, 66887, 
-    66896, 66906, 66915, 66923, 66932, 66942, 66951, 66961, 66972, 66982, 
-    66991, 66999, 67008, 67018, 67027, 67037, 67048, 67058, 67067, 67077, 
-    67088, 67098, 67109, 67121, 67132, 67142, 67151, 67159, 67166, 67174, 
-    67183, 67191, 67200, 67210, 67219, 67227, 67236, 67246, 67255, 67265, 
-    67276, 67286, 67295, 67303, 67312, 67322, 67331, 67341, 67352, 67362, 
-    67371, 67381, 67392, 67402, 67413, 67425, 67436, 67446, 67455, 67463, 
-    67472, 67482, 67491, 67501, 67512, 67522, 67531, 67541, 67552, 67562, 
-    67573, 67585, 67596, 67606, 67615, 67625, 67636, 67646, 67657, 67669, 
-    67680, 67690, 67701, 67713, 67724, 67736, 67749, 67761, 67772, 67782, 
-    67791, 67799, 67806, 67814, 67823, 67831, 67840, 67850, 67859, 67867, 
-    67876, 67886, 67895, 67905, 67916, 67926, 67935, 67943, 67952, 67962, 
-    67971, 67981, 67992, 68002, 68011, 68021, 68032, 68042, 68053, 68065, 
-    68076, 68086, 68095, 68103, 68112, 68122, 68131, 68141, 68152, 68162, 
-    68171, 68181, 68192, 68202, 68213, 68225, 68236, 68246, 68255, 68265, 
-    68276, 68286, 68297, 68309, 68320, 68330, 68341, 68353, 68364, 68376, 
-    68389, 68401, 68412, 68422, 68431, 68439, 68448, 68458, 68467, 68477, 
-    68488, 68498, 68507, 68517, 68528, 68538, 68549, 68561, 68572, 68582, 
-    68591, 68601, 68612, 68622, 68633, 68645, 68656, 68666, 68677, 68689, 
-    68700, 68712, 68725, 68737, 68748, 68758, 68767, 68777, 68788, 68798, 
-    68809, 68821, 68832, 68842, 68853, 68865, 68876, 68888, 68901, 68913, 
-    68924, 68934, 68945, 68957, 68968, 68980, 68993, 69005, 69016, 69028, 
-    69041, 69053, 69066, 69080, 69093, 69105, 69116, 69126, 69135, 69143, 
-    69150, 69155, 8058, 69162, 32568, 69167, 69172, 32573, 69178, 20916, 
-    32578, 69183, 69189, 69197, 69203, 69209, 69216, 69223, 69228, 69232, 
-    69235, 69239, 69248, 69254, 69266, 69277, 69281, 3081, 8033, 69286, 
-    69289, 69291, 69295, 69299, 69303, 69309, 69314, 25927, 69319, 69323, 
-    69326, 69331, 69335, 69342, 69348, 69352, 6170, 69356, 32595, 69361, 
-    69368, 69377, 69385, 69396, 69404, 69412, 69419, 69426, 69432, 69443, 
-    32600, 69448, 69459, 69471, 69479, 69490, 69499, 69510, 69515, 69523, 
-    2556, 69528, 34270, 69541, 69545, 69557, 69565, 69570, 69578, 17472, 
-    69589, 69595, 69602, 69610, 69616, 32610, 69621, 3914, 58217, 69628, 
-    69631, 69639, 69652, 69665, 69678, 69691, 69698, 69709, 69718, 41687, 
-    41692, 69723, 69727, 69735, 69742, 69751, 69759, 69765, 69774, 69782, 
-    69790, 69794, 69803, 69812, 69822, 69835, 69848, 69858, 32615, 69864, 
-    69871, 69877, 32621, 69882, 69885, 69889, 69897, 69906, 41425, 69914, 
-    69923, 69931, 69938, 69946, 69956, 69965, 69974, 69983, 69991, 70002, 
-    70012, 9359, 21554, 70021, 70026, 70031, 70035, 70039, 70044, 70050, 
-    70055, 70060, 70066, 70071, 70076, 21519, 70081, 70088, 70096, 70104, 
-    70109, 70116, 70123, 70128, 70132, 70136, 70144, 70152, 32638, 70158, 
-    70164, 70176, 70182, 70186, 70193, 70198, 70209, 70219, 70229, 70241, 
-    70247, 70257, 70267, 32665, 70276, 70285, 70291, 70303, 70314, 70321, 
-    70326, 70330, 70338, 70344, 70349, 70354, 70361, 70369, 70381, 70391, 
-    70400, 70409, 70416, 34132, 23834, 70422, 70427, 70431, 70435, 70440, 
-    70446, 70457, 70470, 70475, 70482, 32670, 70487, 70499, 70508, 70518, 
-    70529, 70542, 70549, 70558, 70567, 70575, 70580, 70586, 1058, 70591, 
-    70596, 70601, 70606, 70612, 70617, 70622, 70628, 70634, 70639, 70643, 
-    70648, 70653, 70658, 58729, 70663, 70668, 70673, 70678, 70684, 70690, 
-    70695, 70699, 70704, 70709, 70714, 70720, 70725, 70731, 70736, 70741, 
-    70746, 70751, 70755, 70761, 70766, 70775, 70780, 70785, 70790, 70795, 
-    70799, 70806, 70812, 17122, 17129, 70817, 70821, 70825, 70829, 70833, 
-    45487, 70837, 70767, 70839, 70849, 32679, 70852, 70861, 70867, 6143, 
-    32684, 70871, 70877, 70882, 70888, 70893, 70897, 70904, 70909, 70919, 
-    70928, 70932, 70938, 70944, 70950, 70954, 70962, 70969, 70977, 70985, 
-    32689, 70992, 70995, 71002, 71008, 71013, 71017, 71023, 71030, 71035, 
-    71039, 71048, 71056, 71062, 71067, 32694, 71074, 71081, 71087, 71092, 
-    71098, 71105, 71111, 21281, 27438, 71117, 71122, 71128, 71140, 70800, 
-    70807, 21457, 71150, 71155, 71162, 71168, 71175, 71181, 71192, 71197, 
-    9103, 71205, 71208, 71214, 71218, 71222, 71225, 71231, 32443, 6194, 964, 
-    13412, 71238, 71244, 71250, 71256, 71262, 71268, 71274, 71280, 71286, 
-    71291, 71296, 71301, 71306, 71311, 71316, 71321, 71326, 71331, 71336, 
-    71341, 71346, 71351, 71357, 71362, 71367, 71373, 71378, 71383, 71389, 
-    71395, 71401, 71407, 71413, 71419, 71425, 71431, 71437, 71442, 71447, 
-    71453, 71458, 71463, 71469, 71474, 71479, 71484, 71489, 71494, 71499, 
-    71504, 71509, 71514, 71519, 71524, 71529, 71535, 71540, 71545, 71550, 
-    71556, 71561, 71566, 71571, 71576, 71582, 71587, 71592, 71597, 71602, 
-    71607, 71612, 71617, 71622, 71627, 71632, 71637, 71642, 71647, 71652, 
-    71657, 71662, 71667, 71672, 71677, 71683, 71688, 71693, 71698, 71703, 
-    71708, 71713, 71718, 1864, 142, 71723, 71727, 71731, 71736, 71744, 71748, 
-    71755, 71763, 71767, 71780, 71788, 71792, 71795, 71800, 71804, 71809, 
-    71813, 71821, 71825, 20924, 71830, 71834, 60930, 71838, 71841, 71849, 
-    71857, 71865, 71870, 71877, 71883, 71889, 71894, 71901, 71906, 71914, 
-    64906, 71921, 71926, 71931, 71935, 11638, 71939, 71944, 71949, 71953, 
-    71956, 71962, 71966, 71976, 71985, 71988, 71992, 71999, 72012, 72018, 
-    72026, 72037, 72048, 72059, 72070, 72079, 72085, 72094, 72102, 72112, 
-    72125, 72132, 72143, 72149, 72154, 72159, 72165, 72171, 72181, 72190, 
-    70489, 72198, 72204, 72212, 72218, 72226, 72229, 72233, 72237, 72240, 
-    72246, 72252, 72260, 72272, 72284, 72291, 72295, 72306, 72314, 72321, 
-    72333, 72341, 72349, 72356, 72362, 72372, 72381, 72386, 72396, 72405, 
-    40751, 72412, 72416, 72421, 72429, 72436, 72442, 72446, 72456, 72467, 
-    72475, 72482, 72494, 72506, 72515, 69531, 72522, 72533, 72547, 72555, 
-    72565, 72572, 72580, 72592, 72601, 72609, 72619, 72630, 72642, 72651, 
-    72661, 72668, 72677, 72692, 72700, 72710, 72719, 72727, 72740, 72755, 
-    72759, 72768, 72780, 72791, 72802, 72813, 72823, 72834, 72842, 72848, 
-    72858, 72866, 72872, 29007, 72877, 72883, 72888, 72895, 9701, 17492, 
-    72901, 72910, 72915, 72919, 72926, 72932, 72937, 72942, 72950, 72958, 
-    72962, 72965, 72968, 72970, 72977, 72983, 72994, 72999, 73003, 73010, 
-    73016, 73021, 73029, 65405, 65415, 73035, 73042, 73052, 10611, 73059, 
-    73064, 29203, 73073, 73078, 73085, 73095, 73103, 73111, 73120, 73126, 
-    73132, 73139, 73146, 73151, 73155, 73163, 73168, 73173, 73181, 73188, 
-    73193, 73199, 73202, 73206, 73215, 71775, 73224, 73228, 73234, 73245, 
-    73255, 17501, 73266, 73274, 17513, 73281, 73285, 73294, 27324, 73301, 
-    73305, 73310, 73327, 73339, 10569, 73351, 73356, 73361, 73366, 20997, 
-    73370, 73375, 73380, 73386, 73391, 5846, 21001, 73396, 73401, 73407, 
-    73414, 73419, 73424, 73430, 73436, 73442, 73447, 73453, 73457, 73471, 
-    73479, 73487, 73493, 73498, 73505, 73515, 73524, 73529, 73534, 73542, 
-    73547, 73553, 73558, 73567, 59786, 73572, 73575, 73593, 73612, 73625, 
-    73639, 73655, 73662, 73669, 73675, 73682, 73687, 73693, 73699, 73707, 
-    73713, 73718, 73723, 73739, 10582, 73753, 73760, 73768, 73774, 73778, 
-    73781, 73786, 73791, 73798, 73803, 73812, 73817, 73823, 73832, 73841, 
-    73846, 73850, 73858, 73867, 11667, 73876, 73884, 73889, 73895, 11678, 
-    73900, 73903, 73908, 73918, 73927, 73932, 73938, 73943, 73951, 73958, 
-    73969, 73979, 73984, 64834, 73989, 73995, 74000, 74007, 74016, 74024, 
-    74030, 74036, 74043, 74049, 74053, 16947, 3055, 74058, 74062, 74066, 
-    74072, 74081, 74087, 74094, 74098, 74119, 74141, 74157, 74174, 74193, 
-    74202, 74212, 74219, 74226, 27211, 74232, 74236, 74244, 74256, 74262, 
-    74270, 74274, 74282, 74289, 74293, 74299, 74305, 74310, 3563, 41887, 
-    74316, 74320, 74324, 74328, 74333, 74338, 74343, 74349, 74355, 74361, 
-    74368, 74374, 74381, 74387, 74393, 74398, 74404, 74409, 74413, 74418, 
-    74422, 74427, 41902, 74431, 74436, 74444, 74448, 74453, 74460, 74469, 
-    74475, 74479, 74486, 74490, 74493, 74500, 74509, 74514, 74518, 74526, 
-    74535, 74539, 74547, 74553, 74558, 74563, 74569, 74575, 74580, 74584, 
-    74590, 74595, 74599, 74603, 74606, 74611, 74619, 74629, 74634, 39387, 
-    74642, 74654, 74658, 74664, 74676, 74687, 74694, 74700, 74707, 74719, 
-    74726, 74732, 21075, 74736, 74742, 74749, 74755, 74761, 74766, 74771, 
-    74776, 74785, 7033, 74790, 16413, 74796, 74800, 74804, 74808, 74816, 
-    74825, 74829, 74836, 74845, 74858, 74864, 74423, 30067, 74869, 74871, 
-    74876, 74881, 74886, 74891, 74896, 74901, 74906, 74911, 74916, 74921, 
-    74926, 74931, 74936, 74941, 74947, 74952, 74957, 74962, 74967, 74972, 
-    74977, 74982, 74987, 74993, 74999, 75005, 75010, 75015, 75027, 75032, 
-    1870, 49, 75037, 75042, 32721, 75046, 32726, 32731, 32737, 32742, 75050, 
-    32747, 22070, 75072, 75076, 75080, 75085, 75089, 32751, 75093, 75101, 
-    32756, 75108, 75111, 75116, 75120, 9536, 75129, 32761, 21932, 75132, 
-    75136, 1428, 75141, 32772, 75144, 75149, 25720, 25730, 35233, 75154, 
-    75159, 75164, 75169, 75175, 75180, 75189, 75194, 75201, 75207, 75212, 
-    75217, 75222, 75232, 75241, 75246, 75254, 75258, 75266, 32586, 37288, 
-    75273, 75279, 75284, 75289, 12009, 75294, 75300, 75305, 75312, 75318, 
-    75323, 75331, 75341, 75351, 75357, 75362, 75368, 17523, 75375, 36048, 
-    75388, 75393, 75399, 30968, 75412, 75418, 75422, 75431, 75438, 75444, 
-    75452, 75461, 75468, 75474, 75477, 75481, 25861, 75485, 75492, 75498, 
-    75506, 75511, 23977, 75517, 75520, 75528, 75536, 75550, 75557, 75563, 
-    75570, 75576, 32786, 75580, 75587, 75595, 75603, 75609, 32791, 75617, 
-    75623, 75628, 75638, 75644, 75653, 30805, 34691, 75661, 75666, 75671, 
-    75675, 75680, 75684, 75692, 14907, 39400, 75697, 75702, 32796, 62232, 
-    75706, 75711, 75715, 75724, 75732, 75738, 75743, 75749, 75756, 75762, 
-    75767, 75772, 75781, 75793, 75808, 33058, 75814, 16532, 32800, 75818, 
-    75825, 24087, 75831, 75838, 75847, 75854, 75863, 75869, 75874, 75882, 
-    75888, 32810, 75893, 75902, 74682, 75911, 75918, 75924, 75930, 75940, 
-    75948, 75955, 75959, 32815, 75962, 32821, 32827, 75967, 75975, 75983, 
-    75993, 76002, 76010, 76017, 76027, 32832, 76031, 76033, 76037, 76042, 
-    76046, 76050, 76056, 76061, 76065, 76076, 76081, 76086, 3060, 76090, 
-    76097, 76101, 76110, 76118, 76125, 76130, 76135, 62278, 76139, 76142, 
-    76148, 76156, 76162, 76166, 76171, 76178, 76183, 76189, 34722, 76194, 
-    76197, 76202, 76206, 76211, 76216, 76220, 76228, 76232, 25739, 25748, 
-    76238, 76244, 76250, 76255, 76259, 76262, 76272, 76281, 76286, 76292, 
-    76299, 76305, 76309, 76317, 76322, 34728, 76326, 76334, 76340, 76347, 
-    76352, 76356, 76361, 58403, 34734, 76367, 76372, 76376, 76381, 76386, 
-    76391, 76395, 76400, 76405, 76411, 76416, 76421, 76427, 76433, 76438, 
-    76442, 76447, 76452, 76457, 76461, 24086, 76466, 76471, 76477, 76483, 
-    76489, 76494, 76498, 76503, 76508, 76513, 76517, 76522, 76527, 76532, 
-    76537, 76541, 32840, 76549, 76553, 76561, 76569, 76580, 76585, 76589, 
-    22384, 76594, 76600, 76610, 76617, 76622, 76631, 76636, 76640, 76645, 
-    76653, 76661, 76668, 65068, 76674, 76682, 76689, 76700, 76706, 76710, 
-    76716, 32850, 76719, 76726, 76734, 76739, 39591, 76743, 76748, 76755, 
-    76760, 8985, 76764, 76772, 76779, 76786, 76792, 76806, 63340, 76814, 
-    76820, 76824, 76827, 76835, 76842, 76847, 76860, 76867, 76871, 76878, 
-    76883, 60823, 76888, 76891, 76898, 76904, 76908, 76916, 76925, 76935, 
-    76945, 76954, 76962, 76973, 76978, 76982, 76987, 76991, 35364, 76999, 
-    21344, 35373, 77004, 77009, 77014, 77019, 77024, 77029, 77034, 77038, 
-    77043, 77048, 77053, 77058, 77063, 77068, 77072, 77077, 77082, 77086, 
-    77090, 77094, 77098, 77103, 77108, 77112, 77117, 77121, 77125, 77130, 
-    77135, 77140, 77145, 77149, 77154, 77159, 77163, 77168, 77173, 77178, 
-    77183, 77188, 77193, 77198, 77203, 77208, 77213, 77218, 77223, 77228, 
-    77233, 77238, 77243, 77248, 77253, 77258, 77263, 77267, 77272, 77277, 
-    77282, 77287, 77292, 77297, 77302, 77307, 77312, 77317, 77322, 77326, 
-    77331, 77335, 77340, 77345, 77350, 77355, 77360, 77365, 77370, 77375, 
-    77380, 77384, 77388, 77393, 77398, 77402, 77407, 77412, 77416, 77421, 
-    77426, 77431, 77436, 77440, 77445, 77450, 77454, 77459, 77463, 77467, 
-    77471, 77475, 77480, 77484, 77488, 77492, 77496, 77500, 77504, 77508, 
-    77512, 77516, 77521, 77526, 77531, 77536, 77541, 77546, 77551, 77556, 
-    77561, 77566, 77570, 77574, 77578, 77582, 77586, 77590, 77595, 77599, 
-    77604, 77608, 77613, 77618, 77622, 77626, 77631, 77635, 77639, 77643, 
-    77647, 77651, 77655, 77659, 77663, 77667, 77671, 77675, 77679, 77683, 
-    77687, 77692, 77697, 77701, 77705, 77709, 77713, 77717, 77721, 77726, 
-    77730, 77734, 77738, 77742, 77746, 77750, 77755, 77759, 77764, 77768, 
-    77772, 77776, 77780, 77784, 77788, 77792, 77796, 77800, 77804, 77808, 
-    77813, 77817, 77821, 77825, 77829, 77833, 77837, 77841, 77845, 77849, 
-    77853, 77857, 77862, 77866, 77870, 77875, 77880, 77884, 77888, 77892, 
-    77896, 77900, 77904, 77908, 77912, 77917, 77921, 77926, 77930, 77935, 
-    77939, 77944, 77948, 77954, 77959, 77963, 77968, 77972, 77977, 77981, 
-    77986, 77990, 77995, 1521, 77999, 2824, 1759, 1764, 78003, 78007, 2828, 
-    78011, 1397, 78016, 1342, 78020, 2840, 78024, 78031, 78038, 78052, 2844, 
-    7131, 78061, 78069, 78076, 78087, 78096, 78103, 78115, 78128, 78141, 
-    78152, 78157, 78164, 78176, 78180, 2848, 11740, 78190, 78195, 78204, 
-    78214, 2852, 78219, 78223, 78228, 78235, 78241, 78249, 78261, 1347, 
-    13035, 78271, 78275, 78281, 78295, 78307, 78319, 78329, 78338, 78347, 
-    78356, 78364, 78375, 78383, 4051, 78393, 78404, 78413, 78419, 78434, 
-    78441, 78447, 35489, 78452, 2876, 13039, 78456, 78463, 8930, 78472, 2881, 
-    32336, 78478, 60572, 78485, 78491, 78502, 78508, 78515, 78521, 78529, 
-    78536, 78542, 78552, 78561, 78572, 78579, 78585, 78595, 78603, 78609, 
-    78624, 78630, 78635, 78642, 78645, 78651, 78658, 78664, 78672, 78681, 
-    78689, 78695, 78704, 41427, 78718, 78723, 78729, 14744, 78734, 78747, 
-    78756, 78764, 78771, 78775, 78779, 78782, 78789, 78796, 78804, 78812, 
-    78821, 78829, 14671, 78837, 78842, 78846, 78858, 78865, 78874, 748, 
-    78884, 78893, 78904, 2897, 78908, 78912, 78918, 78931, 78943, 78953, 
-    78962, 78974, 26352, 78985, 78993, 79002, 79013, 79024, 79034, 79044, 
-    79053, 79061, 11305, 79068, 79072, 79075, 79080, 79085, 79089, 79095, 
-    1352, 11811, 79102, 79113, 79122, 79130, 79139, 79147, 79163, 79174, 
-    79183, 79191, 79203, 79214, 79230, 79240, 79261, 79274, 79282, 79289, 
-    14855, 79302, 79307, 79313, 5908, 79319, 79322, 79329, 79339, 8176, 
-    79346, 79351, 79356, 79361, 79369, 79378, 79386, 9749, 9758, 79391, 
-    79402, 79407, 79413, 2913, 2918, 79419, 10872, 79425, 79432, 79439, 
-    79452, 2251, 68, 79457, 79462, 79472, 79478, 79487, 79495, 79505, 79509, 
-    79514, 79518, 79530, 2941, 79538, 79546, 79551, 79562, 79573, 79582, 
-    79587, 79593, 79598, 79608, 79618, 79623, 79629, 79634, 79643, 21397, 
-    79647, 4128, 20, 79652, 79661, 79668, 79675, 79681, 79687, 864, 79692, 
-    79697, 60900, 79702, 79707, 79713, 79719, 79727, 79732, 79739, 79745, 
-    79750, 38001, 41321, 79756, 2945, 32, 79766, 79779, 79784, 79792, 79797, 
-    79803, 2967, 28289, 79808, 79816, 79823, 79828, 58645, 61903, 79837, 
-    79841, 1704, 1813, 79846, 79851, 79858, 1817, 247, 79865, 79871, 2989, 
-    79876, 79881, 79888, 1821, 79893, 79899, 79904, 79916, 6119, 79926, 1828, 
-    79932, 79937, 79944, 79951, 79966, 79973, 79984, 79992, 2618, 79996, 
-    80008, 80013, 80017, 80023, 28114, 2256, 80027, 80038, 80042, 80046, 
-    80052, 80056, 80065, 80069, 80080, 80084, 2302, 32165, 80088, 80098, 
-    3080, 9364, 80106, 80111, 80115, 80124, 80131, 80137, 3050, 17139, 80141, 
-    80154, 80172, 80177, 80185, 80193, 80203, 9978, 13147, 80215, 80228, 
-    80235, 80242, 80258, 80265, 80271, 1095, 80278, 80285, 80295, 80304, 
-    80316, 42291, 80324, 3064, 12023, 80327, 80335, 80339, 78231, 3068, 
-    80343, 21178, 12039, 3756, 80347, 3074, 80351, 80361, 80367, 80373, 
-    80379, 80385, 80391, 80397, 80403, 80409, 80415, 80421, 80427, 80433, 
-    80439, 80445, 80451, 80457, 80463, 80469, 80475, 80481, 80487, 80493, 
-    80499, 80505, 80511, 80518, 80525, 80531, 80537, 80543, 80549, 80555, 
-    80561, 1357, 16049, 12061, 80567, 80572, 80577, 80582, 80587, 80592, 
-    80597, 80602, 80607, 80612, 80617, 80622, 80627, 80632, 80637, 80642, 
-    80647, 80652, 80657, 80662, 80667, 80672, 80677, 80682, 80687, 80692, 
-    80698, 80703, 80708, 80714, 80719, 80725, 80730, 80735, 80741, 80746, 
-    80751, 80756, 80761, 80766, 80771, 80776, 80781, 80362, 80368, 80374, 
-    80380, 80386, 80392, 80398, 80404, 80410, 80416, 80422, 80428, 80434, 
-    80440, 80446, 80787, 80452, 80458, 80464, 80793, 80470, 80476, 80482, 
-    80488, 80494, 80500, 80506, 80526, 80799, 80805, 80532, 80811, 80538, 
-    80544, 80550, 80556, 80562, 3091, 3096, 80817, 80822, 80825, 80831, 
-    80837, 80844, 80849, 80854, 2307, 
+    8935, 8939, 8944, 8949, 8956, 8962, 8972, 7909, 8978, 8982, 8989, 8996, 
+    768, 9000, 9004, 9009, 9014, 9019, 9023, 9029, 9037, 9043, 9047, 9053, 
+    9063, 9067, 9073, 9078, 9082, 9088, 9094, 2161, 9099, 9101, 9106, 9114, 
+    9123, 9127, 9133, 9138, 9143, 9148, 9153, 9159, 9164, 9169, 4006, 9174, 
+    9179, 9183, 9189, 9194, 9200, 9205, 9210, 9216, 9221, 9128, 9227, 9231, 
+    9238, 9244, 9249, 9253, 6183, 9258, 9267, 9272, 9277, 8218, 8225, 9282, 
+    2853, 9286, 9291, 9296, 9139, 9300, 9305, 9144, 9149, 9310, 9317, 9324, 
+    9330, 9336, 9342, 9347, 9352, 9357, 9154, 9160, 9363, 9369, 9374, 9382, 
+    9165, 9387, 990, 9390, 9398, 9404, 9410, 9419, 9427, 9432, 9438, 9446, 
+    9453, 9468, 9485, 9504, 9513, 9521, 9536, 9547, 9557, 9567, 9575, 9581, 
+    9593, 9602, 9610, 9617, 9624, 9630, 9635, 9643, 9653, 9660, 9670, 9680, 
+    9690, 9698, 9705, 9714, 9724, 9738, 9753, 9762, 9770, 9775, 9779, 9788, 
+    9794, 9799, 9809, 9819, 9829, 9834, 9838, 9847, 9852, 9862, 9873, 9886, 
+    9894, 9907, 9919, 9927, 9932, 9936, 9942, 9947, 9955, 9963, 9970, 9975, 
+    9983, 9989, 9992, 9996, 10002, 10010, 10015, 10019, 10027, 10036, 10044, 
+    10050, 10054, 10061, 10072, 10076, 10079, 10085, 9170, 10090, 10096, 
+    10103, 10109, 10114, 10121, 10128, 10135, 10142, 10149, 10156, 10163, 
+    10170, 10175, 9481, 10180, 10186, 10193, 10200, 10205, 10212, 10221, 
+    10225, 10237, 8256, 10241, 10244, 10248, 10252, 10256, 10260, 10266, 
+    10272, 10277, 10283, 10288, 10293, 10299, 10304, 10309, 8952, 10314, 
+    10318, 10322, 10326, 10331, 10336, 10344, 10350, 10354, 10358, 10365, 
+    10370, 10378, 10383, 10387, 10390, 10396, 10403, 10407, 10410, 10415, 
+    10419, 4045, 10425, 10434, 36, 10442, 10448, 10453, 8967, 10458, 10463, 
+    10467, 10470, 10485, 10504, 10516, 10529, 10542, 10555, 10569, 10582, 
+    10597, 10604, 9175, 10610, 10624, 10629, 10635, 10640, 10648, 10653, 
+    8040, 10658, 10661, 10668, 10673, 10677, 2858, 998, 10683, 10687, 10693, 
+    10699, 10704, 10710, 10715, 9184, 10721, 10727, 10732, 10737, 10745, 
+    10751, 10764, 10772, 10779, 9190, 10785, 10793, 10801, 10808, 10821, 
+    10833, 10843, 10851, 10858, 10865, 10874, 10883, 10891, 10898, 10903, 
+    10909, 9195, 10914, 10920, 9201, 10925, 10928, 10935, 10941, 10954, 8669, 
+    10965, 10971, 10980, 10988, 10995, 11001, 11007, 11012, 11016, 11021, 
+    10477, 11027, 9206, 11034, 11039, 11046, 11052, 11058, 11063, 11071, 
+    11079, 11086, 11090, 11104, 11114, 11119, 11123, 11134, 11140, 11145, 
+    11150, 9211, 9217, 11154, 11157, 11162, 11174, 11181, 11186, 11190, 
+    11195, 11199, 11206, 11212, 9222, 9129, 11219, 2863, 8, 11226, 11231, 
+    11235, 11241, 11249, 11259, 11264, 11269, 11276, 11283, 11287, 11298, 
+    11308, 11317, 11329, 11334, 11338, 11346, 11360, 11364, 11367, 11375, 
+    11382, 11390, 11394, 11405, 11409, 11416, 11421, 11425, 11431, 11436, 
+    11440, 11446, 11451, 11462, 11466, 11469, 11475, 11480, 11486, 11492, 
+    11499, 11510, 11520, 11530, 11539, 11546, 11555, 9232, 9239, 9245, 9250, 
+    11561, 11567, 9254, 11573, 11576, 11583, 11588, 11603, 11619, 11634, 
+    11642, 11648, 11653, 838, 420, 11658, 11666, 11673, 11679, 11684, 11689, 
+    9259, 11691, 11695, 11700, 11704, 11714, 11719, 11723, 11732, 11736, 
+    11739, 9268, 11746, 11749, 11757, 11764, 11772, 11776, 11783, 11792, 
+    11795, 11799, 11803, 11809, 11813, 11817, 11821, 11827, 11837, 11841, 
+    11849, 11853, 11860, 11864, 11869, 11873, 11880, 11886, 11894, 11900, 
+    11905, 11915, 11920, 11925, 11929, 11937, 3905, 11945, 11950, 9273, 
+    11954, 11958, 11961, 11969, 11976, 11980, 5991, 11984, 11989, 11993, 
+    12004, 12014, 12019, 12025, 12029, 12032, 12040, 12045, 12050, 12057, 
+    12062, 9278, 12067, 12071, 12078, 1722, 6145, 12083, 12088, 12093, 12098, 
+    12104, 12109, 12115, 12120, 12125, 12130, 12135, 12140, 12145, 12150, 
+    12155, 12160, 12165, 12170, 12175, 12180, 12185, 12190, 12195, 12201, 
+    12206, 12211, 12216, 12221, 12226, 12232, 12237, 12242, 12248, 12253, 
+    12259, 12264, 12270, 12275, 12280, 12285, 12290, 12296, 12301, 12306, 
+    12311, 737, 139, 12319, 12323, 12328, 12333, 12337, 12341, 12345, 12350, 
+    12354, 12359, 12363, 12366, 12370, 12374, 12380, 12385, 12395, 12401, 
+    12409, 12413, 12417, 12424, 12432, 12441, 12452, 12459, 12466, 12470, 
+    12479, 12488, 12496, 12505, 12514, 12523, 12532, 12542, 12552, 12562, 
+    12572, 12582, 12591, 12601, 12611, 12621, 12631, 12641, 12651, 12661, 
+    12670, 12680, 12690, 12700, 12710, 12720, 12730, 12739, 12749, 12759, 
+    12769, 12779, 12789, 12799, 12809, 12819, 12829, 12838, 12848, 12858, 
+    12868, 12878, 12888, 12898, 12908, 12918, 12928, 12938, 12947, 1256, 
+    12953, 12956, 12960, 12965, 12972, 12978, 12983, 12987, 12992, 13001, 
+    13009, 13014, 13018, 13022, 13028, 13033, 13039, 9287, 13044, 13049, 
+    13058, 9292, 13063, 13066, 13072, 13080, 9297, 13087, 13091, 13095, 
+    13099, 13109, 13115, 13121, 13126, 13135, 13143, 13150, 13157, 13162, 
+    13169, 13174, 13178, 13181, 13192, 13202, 13211, 13219, 13230, 13242, 
+    13252, 13257, 13261, 13266, 13271, 13275, 13281, 13289, 13296, 13307, 
+    13312, 13322, 13326, 13329, 13336, 13346, 13355, 13362, 13366, 13373, 
+    13379, 13384, 13389, 13393, 13402, 13407, 13413, 13417, 13422, 13426, 
+    13435, 13443, 13451, 13458, 13466, 13478, 13489, 13499, 13506, 13512, 
+    13521, 13532, 13541, 13553, 13565, 13577, 13587, 13596, 13605, 13613, 
+    13620, 13629, 13637, 13641, 13647, 13653, 13658, 7753, 13662, 13664, 
+    13668, 13673, 13679, 13688, 13692, 13700, 13707, 13716, 13725, 13734, 
+    13743, 13752, 13761, 13770, 13779, 13789, 13799, 13808, 13814, 13821, 
+    13828, 13834, 13848, 13855, 13863, 13872, 13878, 13887, 13896, 13907, 
+    13917, 13925, 13932, 13940, 13949, 13962, 13970, 13977, 13990, 13996, 
+    14002, 14012, 14021, 14030, 14035, 14039, 14045, 14051, 14058, 8966, 
+    14063, 14068, 14075, 14080, 12376, 14085, 14093, 14099, 14104, 14112, 
+    14120, 14127, 14135, 14141, 14149, 14157, 14163, 14168, 14174, 14181, 
+    14187, 14192, 14196, 14207, 14215, 14221, 14226, 14235, 14241, 14246, 
+    14255, 14269, 3853, 14273, 14278, 14283, 14289, 14294, 14299, 14303, 
+    14308, 14313, 14318, 7752, 14323, 14328, 14333, 14338, 14343, 14347, 
+    14352, 14357, 14362, 14367, 14373, 14379, 14384, 14388, 14393, 14398, 
+    14403, 9301, 14408, 14413, 14418, 14423, 14428, 14445, 14463, 14475, 
+    14488, 14505, 14521, 14538, 14548, 14567, 14578, 14589, 14600, 14611, 
+    14623, 14634, 14645, 14662, 14673, 14684, 14689, 9306, 14694, 14698, 
+    2381, 14702, 14705, 14711, 14719, 14727, 14732, 14740, 14748, 14755, 
+    14760, 14766, 14773, 14781, 14788, 14800, 14808, 14813, 11597, 14819, 
+    14828, 14837, 14845, 14852, 14858, 14866, 14873, 14879, 14886, 14892, 
+    14901, 14909, 14919, 14926, 14932, 14940, 14946, 14954, 14961, 14974, 
+    14981, 14990, 14999, 15008, 15016, 15026, 15033, 15038, 3560, 15045, 
+    15050, 1372, 15054, 14324, 15058, 15064, 15068, 15076, 15088, 15093, 
+    15100, 15106, 15111, 15118, 14329, 15122, 15126, 15130, 14334, 15134, 
+    14339, 15138, 15145, 15150, 15154, 15161, 15165, 15173, 15180, 15184, 
+    15191, 15208, 15217, 15221, 15224, 15232, 15238, 15243, 3638, 15247, 
+    15249, 15257, 15264, 15274, 15286, 15291, 15297, 15302, 15306, 15312, 
+    15317, 15323, 15326, 15333, 15341, 15348, 15354, 15360, 15365, 15372, 
+    15378, 15383, 15390, 15394, 15400, 15404, 15411, 15417, 15423, 15431, 
+    15437, 15442, 15448, 15456, 15464, 15470, 15476, 15481, 15488, 15493, 
+    15497, 15503, 15508, 15515, 15520, 15526, 15529, 15535, 15541, 15544, 
+    15548, 15560, 15566, 15571, 15578, 15584, 15590, 15601, 15611, 15620, 
+    15628, 15635, 15646, 15656, 15666, 15674, 15677, 14353, 15682, 15687, 
+    14358, 14493, 15695, 15708, 15723, 15734, 14510, 15752, 15765, 15778, 
+    15789, 10492, 15800, 15813, 15832, 15843, 15854, 15865, 2649, 15878, 
+    15882, 15890, 15905, 15920, 15931, 15938, 15944, 15952, 15956, 15962, 
+    15965, 15975, 15983, 15990, 15998, 16008, 16013, 16020, 16025, 16032, 
+    16043, 16053, 16059, 16064, 16069, 14363, 16073, 16079, 16085, 16090, 
+    16095, 16100, 16104, 14368, 14374, 16108, 14380, 16113, 16121, 16130, 
+    16137, 9150, 16141, 16143, 16148, 16153, 16159, 16164, 16169, 16174, 
+    16179, 16183, 16189, 16195, 16200, 16206, 16211, 16216, 16222, 16227, 
+    16232, 16237, 16242, 16248, 16253, 16258, 16264, 16270, 16275, 16280, 
+    16287, 16293, 16304, 16311, 16316, 16320, 16324, 16327, 16335, 16340, 
+    16347, 16354, 16360, 16365, 16370, 16377, 16387, 16392, 16399, 16405, 
+    16415, 16425, 16439, 16453, 16467, 16481, 16496, 16511, 16528, 16546, 
+    16559, 16565, 16570, 16575, 16579, 16584, 16592, 16598, 16603, 16608, 
+    16612, 16617, 16621, 16626, 16630, 16641, 16647, 16652, 16657, 16664, 
+    16669, 16673, 16678, 16683, 16689, 16696, 16702, 16707, 16711, 16717, 
+    16722, 16727, 16731, 16737, 16742, 16747, 16754, 16759, 13111, 16763, 
+    16768, 16772, 16777, 16783, 16789, 16796, 16806, 16814, 16821, 16826, 
+    16830, 16839, 16847, 16854, 16861, 16867, 16873, 16878, 16883, 16889, 
+    16894, 16900, 16905, 16911, 16917, 16924, 16930, 16935, 16940, 9348, 
+    16949, 16952, 16958, 16963, 16968, 16978, 16985, 16991, 16996, 17001, 
+    17007, 17012, 17018, 17023, 17029, 17035, 17040, 17048, 17055, 17060, 
+    17065, 17071, 17076, 17080, 17089, 17100, 17107, 17112, 17120, 17126, 
+    17133, 17139, 17144, 17148, 17154, 17159, 17164, 17169, 1440, 7777, 2877, 
+    17173, 17177, 17181, 17185, 17189, 17193, 17196, 17203, 17211, 14394, 
+    17218, 17228, 17236, 17243, 17251, 17261, 17270, 17283, 17288, 17293, 
+    17301, 17308, 13207, 13216, 17315, 17325, 17340, 17346, 17353, 17360, 
+    17366, 17374, 17384, 17394, 14399, 17403, 17409, 17415, 17423, 17431, 
+    17436, 17445, 17453, 17465, 17475, 17485, 17495, 17504, 17516, 17526, 
+    17536, 17547, 17552, 17564, 17576, 17588, 17600, 17612, 17624, 17636, 
+    17648, 17660, 17672, 17683, 17695, 17707, 17719, 17731, 17743, 17755, 
+    17767, 17779, 17791, 17803, 17814, 17826, 17838, 17850, 17862, 17874, 
+    17886, 17898, 17910, 17922, 17934, 17945, 17957, 17969, 17981, 17993, 
+    18005, 18017, 18029, 18041, 18053, 18065, 18076, 18088, 18100, 18112, 
+    18124, 18136, 18148, 18160, 18172, 18184, 18196, 18207, 18219, 18231, 
+    18243, 18255, 18267, 18279, 18291, 18303, 18315, 18327, 18338, 18350, 
+    18362, 18374, 18386, 18398, 18410, 18422, 18434, 18446, 18458, 18469, 
+    18481, 18493, 18505, 18517, 18530, 18543, 18556, 18569, 18582, 18595, 
+    18608, 18620, 18633, 18646, 18659, 18672, 18685, 18698, 18711, 18724, 
+    18737, 18750, 18762, 18775, 18788, 18801, 18814, 18827, 18840, 18853, 
+    18866, 18879, 18892, 18904, 18917, 18930, 18943, 18956, 18969, 18982, 
+    18995, 19008, 19021, 19034, 19046, 19059, 19072, 19085, 19098, 19111, 
+    19124, 19137, 19150, 19163, 19176, 19188, 19201, 19214, 19227, 19240, 
+    19253, 19266, 19279, 19292, 19305, 19318, 19330, 19341, 19354, 19367, 
+    19380, 19393, 19406, 19419, 19432, 19445, 19458, 19471, 19483, 19496, 
+    19509, 19522, 19535, 19548, 19561, 19574, 19587, 19600, 19613, 19625, 
+    19638, 19651, 19664, 19677, 19690, 19703, 19716, 19729, 19742, 19755, 
+    19767, 19780, 19793, 19806, 19819, 19832, 19845, 19858, 19871, 19884, 
+    19897, 19909, 19922, 19935, 19948, 19961, 19974, 19987, 20000, 20013, 
+    20026, 20039, 20051, 20064, 20077, 20090, 20103, 20116, 20129, 20142, 
+    20155, 20168, 20181, 20193, 20206, 20219, 20232, 20245, 20258, 20271, 
+    20284, 20297, 20310, 20323, 20335, 20348, 20361, 20374, 20387, 20400, 
+    20413, 20426, 20439, 20452, 20465, 20477, 20490, 20503, 20516, 20529, 
+    20542, 20555, 20568, 20581, 20594, 20607, 20619, 20632, 20645, 20658, 
+    20671, 20684, 20697, 20710, 20723, 20736, 20749, 20761, 20772, 20780, 
+    20788, 20795, 20801, 20805, 20811, 20817, 20825, 20831, 20836, 20840, 
+    20849, 9155, 20860, 20867, 20875, 20882, 20889, 10948, 20896, 20905, 
+    20910, 20915, 7805, 20922, 20927, 20930, 20935, 20943, 20950, 20957, 
+    20964, 20970, 20979, 20988, 20994, 21003, 21007, 21013, 21018, 21028, 
+    21035, 21041, 21049, 21055, 21062, 21072, 21081, 21085, 21092, 21096, 
+    21101, 21107, 21115, 21119, 21129, 14409, 21138, 21144, 21148, 21157, 
+    14414, 21163, 21170, 21181, 21189, 21198, 21206, 8931, 21214, 21219, 
+    21225, 21230, 21234, 21238, 21242, 9639, 21247, 21255, 21262, 21271, 
+    21278, 21285, 10878, 21292, 21298, 21302, 21308, 21315, 21321, 21329, 
+    21335, 21342, 21348, 21354, 21363, 21367, 21375, 21384, 21391, 21396, 
+    21400, 21411, 21416, 21421, 21426, 21439, 7995, 21443, 21449, 21457, 
+    21461, 21468, 21477, 21482, 14685, 21490, 21494, 21506, 21511, 21515, 
+    21518, 21524, 21530, 21535, 21539, 21542, 21553, 21558, 9383, 21565, 
+    21570, 9388, 21575, 21580, 21585, 21590, 21595, 21600, 21605, 21610, 
+    21615, 21620, 21625, 21630, 21636, 21641, 21646, 21651, 21656, 21661, 
+    21666, 21671, 21676, 21681, 21687, 21693, 21698, 21703, 21708, 21713, 
+    21718, 21723, 21728, 21733, 21738, 21744, 21749, 21754, 21759, 21765, 
+    21771, 21776, 21781, 21786, 21791, 21796, 21801, 21806, 21811, 21817, 
+    21822, 21827, 21832, 21837, 21843, 21848, 21853, 21857, 1368, 129, 21865, 
+    21869, 21873, 21877, 21882, 21886, 13117, 12476, 21890, 21895, 21899, 
+    21904, 21908, 21913, 21917, 21923, 21928, 21932, 21936, 21944, 21948, 
+    21952, 21957, 21962, 21966, 21972, 21977, 21981, 21986, 21991, 21995, 
+    22002, 22009, 22016, 22020, 22024, 22029, 22033, 22036, 22042, 22055, 
+    22060, 22069, 22074, 9428, 22079, 22082, 2712, 2717, 22086, 22092, 22098, 
+    7209, 22103, 22108, 22113, 22119, 22124, 13903, 22129, 22134, 22139, 
+    22144, 22150, 22155, 22160, 22166, 22171, 22175, 22180, 22185, 22190, 
+    22195, 22199, 22204, 22208, 22213, 22218, 22223, 22228, 22232, 22237, 
+    22241, 22246, 22251, 22256, 22261, 2886, 22176, 22265, 22273, 22280, 
+    9733, 22292, 22300, 22181, 22307, 22312, 22320, 22186, 22325, 22330, 
+    22338, 22343, 22191, 22348, 22353, 22357, 22363, 22371, 22374, 22381, 
+    22385, 22389, 22395, 22402, 22407, 8958, 1727, 1732, 22411, 22417, 22423, 
+    22428, 22432, 22436, 22440, 22444, 22448, 22452, 22456, 22459, 22465, 
+    22472, 22480, 22486, 22492, 22497, 22502, 22506, 13823, 13830, 22511, 
+    22523, 22526, 22533, 16356, 22540, 22548, 22559, 22568, 22581, 22591, 
+    22605, 22617, 22631, 22643, 22653, 22665, 22671, 22686, 22710, 22728, 
+    22747, 22760, 22774, 22792, 22808, 22825, 22843, 22854, 22873, 22890, 
+    22910, 22928, 22940, 22954, 22968, 22980, 22997, 23016, 23034, 23046, 
+    23064, 23083, 14553, 23096, 23116, 23128, 10523, 23140, 23145, 23150, 
+    23155, 23161, 23166, 23170, 23177, 2398, 23181, 23187, 23191, 23194, 
+    23198, 23206, 23212, 22209, 23216, 23225, 23236, 23242, 23248, 23257, 
+    23265, 23272, 23277, 23281, 23288, 23294, 23303, 23311, 23318, 23328, 
+    23337, 23347, 23352, 23361, 23370, 23381, 23392, 3963, 23402, 23406, 
+    23416, 23424, 23434, 23445, 23450, 23460, 23468, 23475, 23481, 23488, 
+    23493, 22219, 23497, 23506, 23510, 23513, 23518, 23525, 23534, 23542, 
+    23550, 23560, 23569, 23575, 23581, 22224, 22229, 23585, 23595, 23605, 
+    23615, 23623, 23630, 23640, 23648, 23656, 23662, 23670, 930, 23679, 
+    14744, 542, 23693, 23702, 23710, 23721, 23732, 23742, 23751, 23763, 
+    23772, 23781, 23787, 23796, 23805, 23815, 23823, 23831, 9360, 23837, 
+    23840, 23844, 23849, 23854, 9848, 22242, 22247, 23862, 23868, 23874, 
+    23879, 23884, 23888, 23896, 23902, 23908, 23912, 3525, 23920, 23925, 
+    23930, 23934, 23938, 9928, 23945, 23953, 23967, 23974, 23980, 9937, 9943, 
+    23988, 23996, 24003, 24008, 24013, 22252, 24019, 24030, 24034, 24039, 
+    2601, 24044, 24055, 24061, 24066, 24070, 24074, 24077, 24084, 24091, 
+    24098, 24104, 24108, 22257, 24113, 24117, 24121, 1037, 24126, 24131, 
+    24136, 24141, 24146, 24151, 24156, 24161, 24166, 24171, 24176, 24181, 
+    24186, 24191, 24197, 24202, 24207, 24212, 24217, 24222, 24227, 24233, 
+    24238, 24243, 24248, 24253, 24258, 24263, 24268, 24274, 24280, 24285, 
+    24291, 24296, 24301, 5, 24307, 24311, 24315, 24319, 24324, 24328, 24332, 
+    24336, 24340, 24345, 24349, 24354, 24358, 24361, 24365, 24370, 24374, 
+    24379, 24383, 24387, 24391, 24396, 24400, 24404, 24414, 24419, 24423, 
+    24427, 24432, 24437, 24446, 24451, 24456, 24460, 24464, 24477, 24489, 
+    24498, 24507, 24513, 24518, 24522, 24526, 24536, 24545, 24553, 24559, 
+    24564, 24568, 24575, 24585, 24594, 24602, 24610, 24617, 24625, 24634, 
+    24643, 24651, 24656, 24660, 24664, 24667, 24669, 24673, 24677, 24682, 
+    24687, 24691, 24695, 24698, 24702, 24705, 24709, 24712, 24715, 24719, 
+    24725, 24729, 24733, 24737, 24742, 24747, 24752, 24756, 24759, 24764, 
+    24770, 24775, 24781, 24786, 24790, 24794, 24798, 24803, 24807, 24812, 
+    24816, 24820, 24827, 24831, 24834, 24838, 24844, 24850, 24854, 24858, 
+    24863, 24870, 24876, 24880, 24889, 24893, 24897, 24900, 24906, 24911, 
+    24917, 1489, 1791, 24922, 24927, 24932, 24937, 24942, 24947, 24952, 2148, 
+    2194, 24957, 24960, 24964, 24968, 24973, 24977, 24981, 24984, 24989, 
+    24994, 24998, 25001, 25006, 25010, 25015, 25019, 14756, 25024, 25027, 
+    25030, 25034, 25039, 25043, 25056, 25060, 25063, 25071, 25080, 25087, 
+    25092, 25098, 25104, 25112, 25119, 25126, 25130, 25134, 25138, 25143, 
+    25148, 25152, 25160, 25165, 25177, 25188, 25193, 25197, 25201, 25207, 
+    25212, 25217, 25221, 25225, 25228, 25234, 7915, 2316, 25238, 25243, 
+    25259, 9475, 25279, 25288, 25304, 25308, 25311, 25317, 25327, 25333, 
+    25342, 25357, 25369, 25380, 25388, 25397, 25403, 25412, 25422, 25433, 
+    25444, 25453, 25460, 25469, 25477, 25484, 25492, 25499, 25506, 25519, 
+    25526, 25532, 25537, 25546, 25552, 25557, 25565, 25572, 23426, 25584, 
+    25596, 25610, 25618, 25625, 25637, 25646, 25655, 25663, 25671, 25679, 
+    25686, 25695, 25703, 25713, 25722, 25732, 25741, 25750, 25758, 25763, 
+    25767, 25770, 25774, 25778, 25782, 25786, 25790, 25796, 25802, 25810, 
+    14801, 25817, 25822, 25829, 25835, 25842, 14809, 25849, 25852, 25864, 
+    25872, 25878, 25883, 25887, 9878, 25898, 25908, 25917, 25924, 25928, 
+    14814, 25931, 25938, 25942, 25948, 25951, 25958, 25964, 25971, 25977, 
+    25981, 25986, 25990, 25999, 26006, 26012, 7956, 26019, 26027, 26034, 
+    26040, 26045, 26051, 26057, 26065, 26069, 26072, 26074, 25775, 26083, 
+    26089, 26099, 26104, 26111, 26117, 26122, 26127, 26132, 26136, 26141, 
+    26148, 26157, 26161, 26168, 26177, 26183, 26188, 26194, 26199, 26206, 
+    26217, 26222, 26226, 26236, 26242, 26246, 26251, 26261, 26270, 26274, 
+    26281, 26289, 26296, 26302, 26307, 26315, 26322, 26334, 26343, 26347, 
+    13053, 26355, 26365, 26369, 25067, 26380, 26385, 26389, 26396, 26403, 
+    21968, 25700, 26408, 26412, 26415, 22860, 26420, 26434, 26450, 26468, 
+    26487, 26504, 26522, 22879, 26539, 26559, 22896, 26571, 26583, 15739, 
+    26595, 22916, 26609, 26621, 10536, 26635, 26640, 26645, 26650, 26656, 
+    26662, 26668, 26672, 26679, 26684, 26694, 26700, 10183, 26706, 26708, 
+    26713, 26721, 26725, 26144, 26731, 26738, 11524, 11534, 26745, 26755, 
+    26760, 26764, 26767, 26773, 26781, 26793, 26803, 26819, 26832, 26846, 
+    15757, 26860, 26867, 26871, 26874, 26879, 26883, 26890, 26897, 26907, 
+    26912, 26917, 26922, 26930, 26938, 26947, 26952, 9572, 26956, 26959, 
+    26962, 26967, 26974, 26979, 26995, 27003, 27011, 9423, 27019, 27024, 
+    27028, 27034, 27040, 27043, 27049, 27061, 27069, 27076, 27082, 27089, 
+    27100, 27114, 27127, 27136, 27145, 27157, 27168, 27178, 27187, 27196, 
+    27204, 27215, 7938, 27222, 27228, 27233, 27239, 27246, 27256, 27266, 
+    27275, 27281, 27288, 27293, 27300, 27308, 27316, 27328, 6246, 27335, 
+    27344, 27352, 27358, 27364, 27369, 27373, 27376, 27382, 27389, 27394, 
+    27399, 27403, 27415, 27426, 27435, 27443, 14941, 27448, 27454, 27460, 
+    11517, 8635, 27465, 27469, 27472, 27475, 27481, 27489, 27497, 27501, 
+    27505, 27510, 27513, 27522, 27526, 27534, 27545, 27549, 27555, 27561, 
+    27565, 27571, 27579, 27601, 27625, 27632, 27639, 27645, 27653, 27659, 
+    27664, 27675, 27693, 27700, 27708, 27712, 27721, 27734, 27742, 27754, 
+    27765, 27775, 27789, 27798, 27806, 27818, 9492, 27829, 27840, 27852, 
+    27862, 27871, 27876, 27880, 27888, 27898, 27903, 27907, 27910, 27913, 
+    27921, 27929, 27938, 27948, 27957, 27963, 27977, 2663, 27999, 28010, 
+    28019, 28029, 28041, 28050, 28059, 28069, 28077, 28085, 28094, 28099, 
+    28110, 28115, 28126, 28130, 28140, 28149, 28157, 28167, 28177, 28185, 
+    28194, 28201, 28209, 28216, 28225, 28229, 28237, 28244, 28252, 28259, 
+    28270, 28285, 28292, 28298, 28308, 28317, 28323, 28327, 28334, 28338, 
+    14025, 28344, 28348, 28353, 28360, 28364, 28368, 28376, 28384, 28390, 
+    28399, 28406, 28411, 28416, 28426, 23495, 28430, 28433, 28438, 28443, 
+    28448, 28453, 28458, 28463, 28468, 28473, 28479, 28484, 28489, 28495, 
+    1218, 704, 28500, 28509, 2364, 28516, 28521, 28525, 28531, 1267, 546, 
+    318, 28536, 28545, 28553, 28562, 28570, 28581, 28590, 28598, 28602, 
+    28605, 28613, 28621, 28626, 14769, 28632, 28638, 28644, 5872, 28649, 
+    28653, 28659, 28663, 28670, 1455, 28676, 28683, 9579, 28687, 28697, 
+    28705, 28711, 28720, 28728, 28734, 28742, 28749, 11110, 28755, 28762, 
+    28767, 28774, 1496, 2147, 28780, 28786, 28793, 28804, 28815, 28823, 
+    28830, 28840, 28849, 28857, 28866, 28873, 28880, 28893, 28904, 1272, 
+    28923, 28928, 28936, 3575, 28940, 28945, 28949, 1459, 24696, 28959, 
+    28963, 28968, 28972, 3493, 28978, 28986, 28993, 29004, 29012, 29020, 
+    3576, 279, 29025, 29033, 29041, 29048, 29054, 29059, 2216, 29066, 29072, 
+    25982, 26212, 29078, 106, 29082, 29086, 29092, 615, 9328, 29097, 29104, 
+    29110, 2327, 29114, 29118, 15181, 29121, 29126, 29133, 29139, 29144, 
+    29152, 29159, 29165, 22345, 29169, 29173, 3646, 16619, 29177, 29182, 
+    29185, 29193, 29201, 29206, 29209, 29216, 29226, 29238, 29243, 29247, 
+    29255, 29262, 29268, 29275, 29282, 29285, 29289, 29293, 1463, 29303, 
+    29305, 29310, 29316, 29322, 29327, 29332, 29337, 29342, 29347, 29352, 
+    29357, 29362, 29367, 29372, 29377, 29382, 29387, 29392, 29398, 29404, 
+    29410, 29416, 29421, 29426, 29431, 29437, 29442, 29447, 29452, 29458, 
+    29463, 29469, 29474, 29479, 29484, 29489, 29495, 29500, 29506, 29511, 
+    29516, 29521, 29526, 29532, 29537, 29543, 29548, 29553, 29558, 29563, 
+    29568, 29573, 29578, 29583, 29588, 29594, 29600, 29606, 29611, 29616, 
+    29621, 29626, 29632, 29638, 29644, 29650, 29656, 29662, 29667, 29673, 
+    29678, 29683, 29688, 29693, 29699, 2443, 29704, 2450, 2457, 2754, 29709, 
+    2463, 2473, 29715, 29719, 29724, 29729, 29735, 29740, 29745, 29749, 
+    29754, 29760, 29765, 29770, 29775, 29781, 29786, 29790, 29794, 29799, 
+    29804, 29809, 29814, 29819, 29825, 29831, 29836, 29840, 29845, 29851, 
+    29855, 29860, 29865, 29870, 29875, 29879, 29882, 29887, 29892, 29897, 
+    29902, 29907, 29913, 29919, 29924, 29929, 29933, 29938, 29943, 29948, 
+    29953, 29958, 29962, 29967, 29972, 29977, 29981, 29985, 29989, 29994, 
+    30002, 30007, 30013, 30019, 30025, 30030, 30034, 30037, 30042, 30047, 
+    30051, 30056, 30060, 30065, 30069, 30072, 30077, 17296, 30082, 30087, 
+    30092, 30100, 21274, 28680, 9026, 30105, 30110, 30114, 30119, 30123, 
+    30127, 30132, 30136, 30139, 30142, 30146, 30151, 30155, 30163, 30167, 
+    30170, 30175, 30179, 30183, 30188, 30193, 30197, 30203, 30208, 30213, 
+    30220, 30227, 30231, 30234, 30240, 30249, 30256, 30264, 30271, 30275, 
+    30280, 30284, 30288, 30294, 30300, 30304, 30310, 30315, 30320, 30327, 
+    30333, 30339, 30345, 30351, 30358, 30364, 30370, 30376, 30382, 30388, 
+    30394, 30400, 30407, 30413, 30420, 30426, 30432, 30438, 30444, 30450, 
+    30456, 30462, 30468, 30474, 11418, 30480, 30485, 30490, 30493, 30501, 
+    30506, 30515, 30521, 30526, 30531, 30536, 30540, 30545, 30550, 30555, 
+    30560, 30565, 30572, 30579, 30585, 30591, 30596, 16297, 30603, 30609, 
+    30616, 30622, 30628, 30633, 30641, 30646, 16076, 30650, 30655, 30660, 
+    30666, 30671, 30676, 30680, 30685, 30690, 30696, 30701, 30706, 30710, 
+    30715, 30720, 30724, 30729, 30734, 30739, 30743, 30748, 30753, 30758, 
+    30762, 30766, 15287, 30770, 30779, 30785, 30791, 30800, 30808, 30817, 
+    30825, 30830, 30834, 30841, 30847, 30851, 30854, 30859, 30868, 30876, 
+    30881, 1495, 30887, 30890, 30894, 22418, 22424, 30900, 30904, 30915, 
+    30926, 30937, 30949, 30956, 30963, 30968, 30972, 5909, 755, 21273, 30980, 
+    30985, 30989, 30994, 30998, 31004, 31009, 31015, 31020, 31026, 31031, 
+    31037, 31042, 31048, 31054, 31060, 31065, 31021, 31027, 31069, 31074, 
+    31080, 31085, 31091, 31096, 31102, 31107, 31032, 10421, 31111, 31043, 
+    31049, 31055, 2831, 3423, 31117, 31120, 31126, 31132, 31138, 31145, 
+    31151, 31157, 31163, 31169, 31175, 31181, 31187, 31193, 31199, 31205, 
+    31211, 31217, 31224, 31230, 31236, 31242, 31248, 31254, 31257, 31262, 
+    31265, 31272, 31280, 31285, 31290, 31296, 31301, 31306, 31310, 31315, 
+    31321, 31326, 31332, 31337, 31343, 31348, 31354, 31360, 31364, 31369, 
+    31374, 31379, 31384, 31388, 31393, 31398, 31403, 31409, 31415, 31421, 
+    31427, 31432, 31436, 31439, 31445, 31451, 31460, 31468, 31475, 31480, 
+    31484, 31488, 31493, 15140, 31498, 31506, 31512, 3683, 1377, 31517, 
+    31521, 8005, 31527, 31533, 31540, 8014, 31544, 31550, 31557, 31563, 
+    31572, 31580, 31592, 31596, 31603, 31609, 31613, 31616, 31625, 31633, 
+    31022, 31638, 31648, 31658, 31668, 31674, 31679, 31689, 31694, 31707, 
+    31721, 31732, 31744, 31756, 31770, 31783, 31795, 31807, 14594, 31821, 
+    31826, 31831, 31835, 31839, 31843, 1780, 27166, 31847, 31852, 31070, 
+    31857, 31860, 31865, 31870, 31875, 31881, 31887, 10098, 31892, 31899, 
+    15691, 31905, 31910, 31915, 31919, 31924, 31929, 31075, 31934, 31939, 
+    31944, 31950, 31081, 31955, 31958, 31965, 31973, 31979, 31985, 31991, 
+    32002, 32007, 32014, 32021, 32028, 32036, 32045, 32054, 32060, 32066, 
+    32074, 31086, 32079, 32085, 32091, 31092, 32096, 32101, 32109, 32117, 
+    32123, 32130, 32136, 32143, 32150, 32156, 32164, 32174, 32181, 32186, 
+    32192, 32197, 32202, 32209, 32218, 32226, 32231, 32237, 32244, 32252, 
+    32258, 32263, 32269, 32278, 27943, 32285, 32289, 32294, 32303, 32308, 
+    32313, 32318, 12405, 32326, 32331, 32336, 32341, 32345, 32350, 32355, 
+    32362, 32367, 32372, 32377, 31097, 21210, 32383, 2519, 244, 32386, 32389, 
+    32393, 32397, 32407, 32415, 32419, 32426, 32433, 32437, 32440, 32446, 
+    32454, 32462, 32466, 32470, 32473, 32480, 32484, 32488, 32495, 32503, 
+    31033, 32510, 32518, 10158, 660, 308, 32530, 32535, 32540, 32546, 32551, 
+    32556, 3704, 32561, 32564, 32569, 32574, 32579, 32584, 32589, 32596, 
+    22519, 32601, 32606, 32611, 32616, 32621, 32627, 32632, 32638, 31268, 
+    32644, 32649, 32655, 32661, 32671, 32676, 32681, 32685, 32690, 32695, 
+    32700, 32705, 32718, 32723, 22296, 16699, 3710, 32727, 32732, 32737, 
+    32743, 32748, 32753, 32757, 32762, 32767, 32773, 32778, 32783, 1382, 
+    32787, 32792, 32797, 32802, 32806, 32811, 32816, 32821, 32827, 32833, 
+    32838, 32842, 32846, 32851, 32856, 32861, 32865, 32873, 32877, 32883, 
+    32887, 32894, 16492, 31044, 32900, 32907, 32915, 32922, 32928, 32941, 
+    32953, 32959, 32963, 2773, 32967, 32971, 32475, 32980, 32991, 32996, 
+    33001, 33006, 33010, 33015, 22429, 33019, 33023, 33028, 31050, 21294, 
+    33032, 33037, 33043, 33048, 33052, 33056, 33059, 33063, 33069, 33080, 
+    33092, 31056, 33097, 33100, 33104, 347, 33109, 33114, 33119, 33124, 
+    33129, 33134, 33140, 33145, 33150, 33156, 33161, 33167, 33172, 33178, 
+    33183, 33188, 33193, 33198, 33203, 33208, 33213, 33218, 33224, 33229, 
+    33234, 33239, 33244, 33249, 33254, 33259, 33265, 33271, 33276, 33281, 
+    33286, 33291, 33296, 33301, 33306, 33311, 33316, 33321, 33326, 33331, 
+    33336, 33341, 33346, 33351, 33356, 33361, 33367, 313, 26, 33372, 33376, 
+    33380, 33388, 33392, 33396, 33399, 33402, 33404, 33409, 33413, 33418, 
+    33422, 33427, 33431, 33436, 33440, 33443, 33445, 33449, 33454, 33458, 
+    33469, 33472, 33474, 33478, 33490, 33499, 33503, 33507, 33513, 33518, 
+    33527, 33533, 33538, 33543, 33547, 33552, 33559, 33564, 33570, 33575, 
+    33579, 33586, 25708, 25718, 33590, 33595, 33600, 33605, 33612, 33616, 
+    33623, 8113, 33629, 33638, 33646, 33661, 33675, 33683, 33694, 33703, 
+    33708, 7227, 33718, 33723, 33728, 33732, 33735, 33739, 33744, 33748, 
+    33755, 33760, 33765, 8912, 33775, 33777, 33780, 33784, 33790, 33794, 
+    33799, 33804, 33810, 33815, 33821, 33826, 33836, 33845, 33853, 33858, 
+    33864, 33869, 33876, 33880, 33888, 33895, 33908, 33916, 33920, 33930, 
+    33935, 33939, 33947, 33955, 33959, 33968, 33974, 33979, 33987, 33997, 
+    34006, 34015, 34024, 34035, 34043, 34054, 34063, 34070, 34076, 34081, 
+    34092, 34097, 34101, 34104, 34108, 34116, 34122, 34130, 34137, 34143, 
+    34148, 34154, 2418, 34158, 34160, 34165, 34170, 34175, 34178, 34180, 
+    34184, 34187, 34194, 34198, 9891, 34202, 34208, 34218, 34223, 34229, 
+    34233, 34238, 34251, 26094, 34257, 34266, 17469, 34273, 34282, 31654, 
+    34290, 34295, 34299, 34307, 34314, 34319, 34323, 34328, 34332, 34340, 
+    34346, 34352, 34357, 34361, 34364, 34369, 34382, 34398, 22986, 34415, 
+    34427, 34444, 34456, 34470, 23003, 23022, 34482, 34494, 2680, 34508, 
+    34513, 34518, 34523, 34527, 34534, 34546, 34552, 34555, 34566, 34577, 
+    34582, 32071, 695, 34586, 34590, 34594, 34597, 34602, 34607, 34613, 
+    34618, 34623, 34629, 34635, 34640, 34644, 34649, 34654, 34659, 34663, 
+    34666, 34672, 34677, 34682, 34687, 34691, 34696, 34702, 34710, 26327, 
+    34715, 34720, 34727, 34733, 34739, 34744, 34752, 22528, 34759, 34764, 
+    34769, 34774, 34778, 34781, 34786, 34790, 34794, 34801, 34807, 34813, 
+    34819, 34826, 34831, 34837, 33950, 34841, 34845, 34850, 34863, 34868, 
+    34874, 34882, 34889, 34897, 34907, 34913, 34919, 34925, 34929, 34938, 
+    34946, 34953, 34958, 34963, 10444, 34968, 34976, 34983, 34989, 34999, 
+    35004, 35010, 35018, 3608, 35025, 35032, 3614, 35036, 35041, 35052, 
+    35059, 35065, 35074, 35078, 4015, 35081, 35088, 35094, 35100, 35108, 
+    35118, 29049, 35125, 35133, 35138, 35144, 35149, 25954, 35155, 35162, 
+    35168, 35177, 23667, 35184, 35189, 35193, 35201, 35209, 9607, 5895, 
+    35216, 35220, 35222, 35226, 35231, 35233, 35239, 35244, 35249, 35256, 
+    32592, 35262, 35267, 35271, 35276, 35280, 35289, 35293, 35299, 35306, 
+    35312, 35319, 35324, 35333, 35338, 35342, 35347, 35354, 35362, 35370, 
+    35375, 21350, 35379, 35382, 35386, 35390, 35394, 35397, 35399, 35407, 
+    35411, 35418, 35422, 35426, 35434, 35441, 35451, 35455, 35459, 35467, 
+    35475, 35481, 35486, 35495, 13357, 35501, 35510, 35515, 35522, 35530, 
+    35538, 35546, 35553, 35560, 35567, 35574, 35581, 35586, 35592, 35609, 
+    35617, 35627, 35635, 35642, 407, 35646, 35652, 35656, 35661, 33699, 
+    35667, 35670, 35674, 35682, 3619, 35690, 35696, 35702, 35711, 35721, 
+    35728, 35734, 3625, 3631, 35743, 35750, 35758, 35763, 35767, 35774, 
+    35782, 35789, 35795, 35804, 35814, 35820, 35828, 35837, 35844, 35852, 
+    35859, 22026, 35863, 35870, 35876, 35886, 35895, 35906, 35910, 35920, 
+    35926, 35933, 35941, 35950, 35959, 35969, 35980, 35987, 35992, 35999, 
+    3029, 36007, 36013, 36018, 36024, 36030, 36035, 36048, 36061, 36074, 
+    36081, 36087, 36095, 36103, 36108, 36112, 1469, 36116, 36121, 36126, 
+    36131, 36136, 36142, 36147, 36152, 36157, 36162, 36167, 36172, 36177, 
+    36183, 36189, 36194, 36199, 36205, 36210, 36215, 36220, 36226, 36231, 
+    36236, 36241, 36246, 36252, 36257, 36262, 36268, 36273, 36278, 36283, 
+    36288, 36293, 36299, 36304, 36310, 36315, 36321, 36326, 36331, 36336, 
+    36342, 36348, 36354, 36360, 36366, 36372, 36378, 36384, 36389, 36394, 
+    36400, 36405, 36410, 36415, 36420, 36425, 36430, 36435, 36441, 36446, 
+    36451, 36457, 36463, 101, 36468, 36470, 36474, 36478, 36482, 36487, 
+    36491, 9528, 36495, 36501, 1741, 6280, 36507, 36510, 36515, 36519, 36524, 
+    36528, 36532, 36537, 10245, 36541, 36545, 36549, 36553, 15379, 36558, 
+    36562, 36567, 36572, 36577, 36581, 36588, 26118, 36594, 36597, 36601, 
+    36606, 36612, 36616, 36624, 36630, 36635, 36639, 36645, 36649, 36653, 
+    3462, 3467, 29241, 36656, 36660, 36664, 36668, 36676, 36683, 36687, 
+    36694, 36699, 317, 36704, 36708, 36714, 36726, 36732, 36738, 36742, 
+    36748, 36757, 36761, 36765, 36770, 36776, 36781, 36785, 36790, 36794, 
+    36798, 36805, 36811, 36816, 36831, 36846, 36861, 36877, 36895, 10195, 
+    36909, 36916, 36920, 36923, 36932, 36937, 36941, 36949, 33901, 36957, 
+    36961, 36971, 36982, 29211, 36995, 36999, 37008, 37016, 9785, 14907, 
+    37020, 22441, 37023, 30159, 37028, 9784, 37033, 37039, 37044, 37050, 
+    37055, 37061, 37066, 37072, 37077, 37083, 37089, 37095, 37100, 37056, 
+    37062, 37067, 37073, 37078, 37084, 37090, 8126, 3874, 37104, 37112, 
+    37116, 37119, 37123, 37128, 37133, 37139, 37145, 37150, 37154, 25966, 
+    37158, 37162, 37168, 37172, 9049, 37181, 37188, 37192, 11875, 37199, 
+    37205, 37210, 37217, 37224, 37231, 28557, 8049, 37238, 37245, 37252, 
+    37258, 37263, 37270, 37281, 37287, 37292, 37297, 37302, 37309, 37057, 
+    37313, 37323, 37334, 37340, 37345, 37350, 37355, 37360, 37365, 37369, 
+    37373, 37379, 37387, 2319, 865, 10261, 10273, 10278, 10284, 37396, 10289, 
+    10294, 10300, 37401, 37411, 37415, 10305, 37420, 16897, 37423, 37428, 
+    37432, 37437, 37442, 37449, 37456, 37460, 37463, 37471, 10208, 37478, 
+    37481, 37487, 37497, 5929, 37506, 37510, 37518, 37522, 37532, 37538, 
+    37549, 37555, 37561, 37566, 37572, 37578, 37584, 37589, 37592, 37599, 
+    37605, 37610, 37617, 37624, 37628, 37638, 37651, 37660, 37669, 37680, 
+    37693, 37704, 37713, 37724, 37729, 37738, 37743, 10310, 37749, 37756, 
+    37764, 37769, 37773, 37780, 37787, 3829, 16, 37791, 37796, 16751, 37800, 
+    37803, 37806, 28063, 37810, 28566, 37818, 37822, 37826, 37829, 37835, 
+    37079, 37841, 37849, 37855, 37862, 28046, 37866, 28240, 37870, 37879, 
+    37885, 37891, 37896, 37900, 37906, 37910, 37918, 37926, 26184, 37932, 
+    37939, 37945, 37950, 37955, 37959, 37965, 37970, 37976, 4056, 791, 37983, 
+    37987, 37990, 15269, 38002, 35833, 38013, 38016, 38023, 38027, 38033, 
+    38037, 38043, 38048, 38054, 38059, 38064, 38068, 38072, 38077, 38082, 
+    38092, 38098, 38111, 38117, 38123, 38130, 38135, 38141, 38146, 16637, 
+    1472, 1019, 31200, 31206, 38151, 31212, 31225, 31231, 31237, 38157, 
+    31243, 31249, 38163, 38169, 22, 38177, 38184, 38188, 38192, 38200, 31960, 
+    38204, 38208, 38215, 38220, 38224, 38229, 38235, 38240, 38246, 38251, 
+    38255, 38259, 38263, 38268, 38272, 38277, 38281, 38288, 38293, 38297, 
+    38302, 38306, 38311, 38315, 38320, 38326, 15489, 15494, 38331, 38335, 
+    38338, 38342, 21177, 38347, 38351, 38357, 38364, 38369, 38379, 38384, 
+    38392, 38396, 38399, 31975, 38403, 4109, 38408, 38413, 38417, 38422, 
+    38426, 38431, 13375, 38442, 38446, 38449, 38454, 38458, 38462, 38465, 
+    38469, 8145, 13391, 38472, 38475, 38481, 38486, 38492, 38497, 38503, 
+    38508, 38514, 38519, 38525, 38531, 38537, 38542, 38546, 38550, 38559, 
+    38575, 38591, 38601, 27953, 38608, 38612, 38617, 38622, 38626, 38630, 
+    35954, 38636, 38641, 38645, 38652, 38657, 38661, 38665, 26986, 38671, 
+    21445, 38676, 38683, 38691, 38697, 38704, 38712, 38718, 38722, 38728, 
+    38736, 38740, 38749, 9509, 38757, 38761, 38769, 38776, 38781, 38786, 
+    38790, 38793, 38797, 38800, 38804, 38811, 38816, 38822, 26405, 31263, 
+    38826, 38833, 38839, 38845, 38850, 38853, 38855, 38862, 38869, 38875, 
+    38879, 38882, 38886, 38890, 38894, 38899, 38903, 38907, 38910, 38914, 
+    38928, 23052, 38947, 38960, 38973, 38986, 23070, 39001, 10497, 39016, 
+    39022, 39026, 39030, 39037, 39042, 39046, 39053, 39059, 39064, 39070, 
+    39080, 39092, 39103, 39108, 39115, 39119, 39123, 39126, 15885, 3677, 
+    39134, 15516, 39147, 39154, 39158, 39162, 39167, 39172, 39178, 39182, 
+    39186, 39189, 7742, 15527, 39194, 39198, 39204, 39213, 39218, 39225, 
+    35810, 39231, 39236, 39240, 39245, 39252, 39256, 39259, 39263, 39268, 
+    14559, 39275, 39282, 1072, 39286, 39291, 39296, 39302, 39307, 39312, 
+    39316, 39326, 39331, 39337, 39342, 39348, 39353, 39359, 39369, 39374, 
+    39379, 39383, 7229, 7241, 39388, 39391, 39398, 39404, 34066, 34073, 
+    39413, 39417, 32023, 39425, 39436, 39444, 36002, 39451, 39456, 39461, 
+    39472, 39479, 39490, 32047, 21451, 39498, 735, 39503, 39509, 28037, 
+    39515, 39520, 39530, 39539, 39546, 39552, 39556, 39559, 39566, 39572, 
+    39579, 39585, 39595, 39603, 39609, 39615, 39620, 39624, 39631, 39637, 
+    39644, 38895, 535, 13812, 39650, 39655, 39658, 39664, 39672, 1396, 39677, 
+    39681, 39686, 39693, 39699, 39703, 39707, 39712, 39721, 39728, 39738, 
+    39744, 28081, 39761, 39770, 39778, 39784, 39789, 39796, 39802, 39810, 
+    39819, 39827, 39831, 39836, 39844, 32056, 39850, 39869, 15818, 39883, 
+    39899, 39913, 39919, 39924, 39929, 39934, 39940, 32062, 39945, 39952, 
+    39957, 39961, 345, 2936, 39968, 39973, 39978, 27312, 39799, 39982, 39987, 
+    39995, 39999, 40002, 40008, 40014, 40018, 28136, 40021, 40026, 40030, 
+    40033, 40038, 40042, 40047, 40052, 40056, 40061, 40065, 40069, 21173, 
+    21184, 40073, 40078, 40084, 26943, 40089, 40093, 21260, 16066, 40096, 
+    40101, 40106, 40111, 40116, 40121, 40126, 40131, 447, 43, 31281, 31286, 
+    31291, 31297, 31302, 31307, 40136, 31311, 40140, 40144, 40148, 31316, 
+    31322, 40162, 31333, 31338, 40170, 40175, 31344, 40180, 40185, 40190, 
+    40195, 40201, 40207, 40213, 31361, 40226, 40232, 31365, 40236, 31370, 
+    40241, 31375, 31380, 40244, 40249, 40253, 30930, 40259, 13599, 40266, 
+    40271, 31385, 40275, 40280, 40285, 40290, 40294, 40299, 40304, 40310, 
+    40315, 40320, 40326, 40332, 40337, 40341, 40346, 40351, 40356, 40360, 
+    40365, 40370, 40375, 40381, 40387, 40393, 40398, 40402, 40407, 40411, 
+    31389, 31394, 31399, 40415, 40419, 40423, 31404, 31410, 31416, 31428, 
+    40435, 26003, 40439, 40443, 40448, 40453, 40458, 40463, 40467, 40471, 
+    40481, 40486, 40491, 40495, 40499, 40502, 40510, 31476, 40515, 1479, 
+    40521, 40529, 40538, 40542, 40546, 40554, 40560, 40568, 40584, 40588, 
+    40592, 40597, 40612, 31513, 1749, 12055, 40616, 1378, 40628, 40629, 
+    40637, 40644, 40649, 40656, 40661, 9379, 1114, 10332, 40668, 40673, 
+    40676, 40679, 40688, 1286, 40693, 39043, 40700, 40705, 22493, 2557, 
+    40709, 10741, 40719, 40725, 2337, 2347, 40734, 40743, 40753, 40764, 3293, 
+    34219, 10384, 3807, 16675, 1291, 40769, 40777, 40784, 40789, 40793, 
+    40797, 23865, 10411, 40805, 40814, 40823, 40831, 40838, 40849, 40854, 
+    40867, 40880, 40892, 40904, 40916, 40929, 40940, 40951, 40961, 40969, 
+    40977, 40989, 41001, 41012, 41021, 41029, 41036, 41048, 41055, 41064, 
+    41071, 41084, 41089, 41099, 41104, 41110, 41115, 37189, 41119, 41126, 
+    41130, 41137, 41145, 2518, 41152, 41163, 41173, 41182, 41190, 41200, 
+    41208, 41218, 41227, 41232, 41238, 41244, 3709, 41255, 41265, 41274, 
+    41283, 41293, 41301, 41310, 41315, 41320, 41325, 1705, 37, 41333, 41341, 
+    41352, 41363, 16350, 41373, 41377, 41384, 41390, 41395, 41399, 41410, 
+    41420, 41429, 41440, 16724, 16729, 41445, 41454, 41459, 41469, 41474, 
+    41482, 41490, 41497, 41503, 7078, 228, 41507, 41513, 41518, 41521, 2117, 
+    39159, 41529, 41533, 41536, 1512, 41542, 13974, 1296, 41547, 41560, 
+    41574, 2643, 41592, 41604, 41616, 2657, 2674, 41630, 41643, 2689, 41657, 
+    41669, 2704, 41683, 1302, 1308, 1314, 10659, 41688, 41693, 41698, 41702, 
+    41717, 41732, 41747, 41762, 41777, 41792, 41807, 41822, 41837, 41852, 
+    41867, 41882, 41897, 41912, 41927, 41942, 41957, 41972, 41987, 42002, 
+    42017, 42032, 42047, 42062, 42077, 42092, 42107, 42122, 42137, 42152, 
+    42167, 42182, 42197, 42212, 42227, 42242, 42257, 42272, 42287, 42302, 
+    42317, 42332, 42347, 42362, 42377, 42392, 42407, 42422, 42437, 42452, 
+    42467, 42482, 42497, 42512, 42527, 42542, 42557, 42572, 42587, 42602, 
+    42617, 42632, 42647, 42662, 42677, 42692, 42707, 42722, 42737, 42752, 
+    42767, 42782, 42797, 42812, 42827, 42842, 42857, 42872, 42887, 42902, 
+    42917, 42932, 42947, 42962, 42977, 42992, 43007, 43022, 43037, 43052, 
+    43067, 43082, 43097, 43112, 43127, 43142, 43157, 43172, 43187, 43202, 
+    43217, 43232, 43247, 43262, 43277, 43292, 43307, 43322, 43337, 43352, 
+    43367, 43382, 43397, 43412, 43427, 43442, 43457, 43472, 43487, 43502, 
+    43517, 43532, 43547, 43562, 43577, 43592, 43607, 43622, 43637, 43652, 
+    43667, 43682, 43697, 43712, 43727, 43742, 43757, 43772, 43787, 43802, 
+    43817, 43832, 43847, 43862, 43877, 43892, 43907, 43922, 43937, 43952, 
+    43967, 43982, 43997, 44012, 44027, 44042, 44057, 44072, 44087, 44102, 
+    44117, 44132, 44147, 44162, 44177, 44192, 44207, 44222, 44237, 44252, 
+    44267, 44282, 44297, 44312, 44327, 44342, 44357, 44372, 44387, 44402, 
+    44417, 44432, 44447, 44462, 44477, 44492, 44507, 44522, 44537, 44552, 
+    44567, 44582, 44597, 44612, 44627, 44642, 44657, 44672, 44687, 44702, 
+    44717, 44732, 44747, 44762, 44777, 44792, 44807, 44822, 44837, 44852, 
+    44867, 44882, 44897, 44912, 44927, 44942, 44957, 44972, 44987, 45002, 
+    45017, 45032, 45047, 45062, 45077, 45092, 45107, 45122, 45137, 45152, 
+    45167, 45182, 45197, 45212, 45227, 45242, 45257, 45272, 45287, 45302, 
+    45317, 45332, 45347, 45362, 45377, 45392, 45407, 45422, 45437, 45452, 
+    45467, 45482, 45497, 45512, 45527, 45542, 45557, 45572, 45587, 45602, 
+    45617, 45632, 45647, 45662, 45677, 45692, 45707, 45722, 45737, 45752, 
+    45767, 45782, 45797, 45812, 45827, 45842, 45857, 45872, 45887, 45902, 
+    45917, 45932, 45947, 45962, 45977, 45992, 46007, 46022, 46037, 46052, 
+    46067, 46082, 46097, 46112, 46127, 46142, 46157, 46172, 46187, 46202, 
+    46217, 46232, 46247, 46262, 46277, 46292, 46307, 46322, 46337, 46352, 
+    46367, 46382, 46397, 46412, 46427, 46442, 46457, 46472, 46487, 46502, 
+    46517, 46532, 46547, 46562, 46577, 46592, 46607, 46622, 46637, 46652, 
+    46667, 46682, 46697, 46712, 46727, 46742, 46757, 46772, 46787, 46802, 
+    46817, 46832, 46847, 46862, 46877, 46892, 46907, 46922, 46937, 46952, 
+    46967, 46982, 46997, 47012, 47027, 47042, 47057, 47072, 47087, 47102, 
+    47117, 47132, 47147, 47162, 47177, 47192, 47207, 47222, 47237, 47252, 
+    47267, 47282, 47297, 47312, 47327, 47342, 47357, 47372, 47387, 47402, 
+    47417, 47432, 47447, 47462, 47477, 47492, 47507, 47522, 47537, 47552, 
+    47567, 47582, 47597, 47612, 47627, 47642, 47657, 47672, 47687, 47702, 
+    47717, 47732, 47747, 47762, 47777, 47792, 47807, 47822, 47837, 47852, 
+    47867, 47882, 47897, 47912, 47927, 47942, 47957, 47972, 47987, 48002, 
+    48017, 48032, 48047, 48062, 48077, 48092, 48107, 48122, 48137, 48152, 
+    48167, 48182, 48197, 48212, 48227, 48242, 48257, 48272, 48287, 48302, 
+    48317, 48332, 48347, 48362, 48377, 48392, 48407, 48422, 48437, 48452, 
+    48467, 48482, 48497, 48512, 48527, 48542, 48557, 48572, 48587, 48602, 
+    48617, 48632, 48647, 48662, 48677, 48692, 48707, 48722, 48737, 48752, 
+    48767, 48782, 48797, 48812, 48827, 48842, 48857, 48872, 48887, 48902, 
+    48917, 48932, 48947, 48962, 48977, 48992, 49007, 49022, 49037, 49052, 
+    49067, 49082, 49097, 49112, 49127, 49142, 49157, 49172, 49187, 49202, 
+    49217, 49232, 49247, 49262, 49277, 49292, 49307, 49322, 49337, 49352, 
+    49367, 49382, 49397, 49412, 49427, 49442, 49457, 49472, 49487, 49502, 
+    49518, 49534, 49550, 49566, 49582, 49598, 49614, 49630, 49646, 49662, 
+    49678, 49694, 49710, 49726, 49742, 49758, 49774, 49790, 49806, 49822, 
+    49838, 49854, 49870, 49886, 49902, 49918, 49934, 49950, 49966, 49982, 
+    49998, 50014, 50030, 50046, 50062, 50078, 50094, 50110, 50126, 50142, 
+    50158, 50174, 50190, 50206, 50222, 50238, 50254, 50270, 50286, 50302, 
+    50318, 50334, 50350, 50366, 50382, 50398, 50414, 50430, 50446, 50462, 
+    50478, 50494, 50510, 50526, 50542, 50558, 50574, 50590, 50606, 50622, 
+    50638, 50654, 50670, 50686, 50702, 50718, 50734, 50750, 50766, 50782, 
+    50798, 50814, 50830, 50846, 50862, 50878, 50894, 50910, 50926, 50942, 
+    50958, 50974, 50990, 51006, 51022, 51038, 51054, 51070, 51086, 51102, 
+    51118, 51134, 51150, 51166, 51182, 51198, 51214, 51230, 51246, 51262, 
+    51278, 51294, 51310, 51326, 51342, 51358, 51374, 51390, 51406, 51422, 
+    51438, 51454, 51470, 51486, 51502, 51518, 51534, 51550, 51566, 51582, 
+    51598, 51614, 51630, 51646, 51662, 51678, 51694, 51710, 51726, 51742, 
+    51758, 51774, 51790, 51806, 51822, 51838, 51854, 51870, 51886, 51902, 
+    51918, 51934, 51950, 51966, 51982, 51998, 52014, 52030, 52046, 52062, 
+    52078, 52094, 52110, 52126, 52142, 52158, 52174, 52190, 52206, 52222, 
+    52238, 52254, 52270, 52286, 52302, 52318, 52334, 52350, 52366, 52382, 
+    52398, 52414, 52430, 52446, 52462, 52478, 52494, 52510, 52526, 52542, 
+    52558, 52574, 52590, 52606, 52622, 52638, 52654, 52670, 52686, 52702, 
+    52718, 52734, 52750, 52766, 52782, 52798, 52814, 52830, 52846, 52862, 
+    52878, 52894, 52910, 52926, 52942, 52958, 52974, 52990, 53006, 53022, 
+    53038, 53054, 53070, 53086, 53102, 53118, 53134, 53150, 53166, 53182, 
+    53198, 53214, 53230, 53246, 53262, 53278, 53294, 53310, 53326, 53342, 
+    53358, 53374, 53390, 53406, 53422, 53438, 53454, 53470, 53486, 53502, 
+    53518, 53534, 53550, 53566, 53582, 53598, 53614, 53630, 53646, 53662, 
+    53678, 53694, 53710, 53726, 53742, 53758, 53774, 53790, 53806, 53822, 
+    53838, 53854, 53870, 53886, 53902, 53918, 53934, 53950, 53966, 53982, 
+    53998, 54014, 54030, 54046, 54062, 54078, 54094, 54110, 54126, 54142, 
+    54158, 54174, 54190, 54206, 54222, 54238, 54254, 54270, 54286, 54302, 
+    54318, 54334, 54350, 54366, 54382, 54398, 54414, 54430, 54446, 54462, 
+    54478, 54494, 54510, 54526, 54542, 54558, 54574, 54590, 54606, 54622, 
+    54638, 54654, 54670, 54686, 54702, 54718, 54734, 54750, 54766, 54782, 
+    54798, 54814, 54830, 54846, 54862, 54878, 54894, 54910, 54926, 54942, 
+    54958, 54974, 54990, 55006, 55022, 55038, 55054, 55070, 55086, 55102, 
+    55118, 55134, 55150, 55166, 55182, 55198, 55214, 55230, 55246, 55262, 
+    55278, 55294, 55310, 55326, 55342, 55358, 55374, 55390, 55406, 55422, 
+    55438, 55454, 55470, 55486, 55502, 55518, 55534, 55550, 55566, 55582, 
+    55598, 55614, 55630, 55646, 55662, 55678, 55694, 55710, 55726, 55742, 
+    55758, 55774, 55790, 55806, 55822, 55838, 55854, 55870, 55886, 55902, 
+    55918, 55934, 55950, 55966, 55982, 55998, 56014, 56030, 56046, 56062, 
+    56078, 56094, 56110, 56126, 56142, 56158, 56174, 56190, 56206, 56222, 
+    56238, 56254, 56270, 56286, 56302, 56318, 56334, 56350, 56366, 56382, 
+    56398, 56414, 56430, 56446, 56462, 56478, 56494, 56510, 56526, 56542, 
+    56558, 56574, 56590, 56606, 56622, 56638, 56654, 56670, 56686, 56702, 
+    56718, 56734, 56750, 56766, 56782, 56798, 56814, 56830, 56846, 56862, 
+    56878, 56894, 56910, 56926, 56942, 56958, 56974, 56990, 57006, 57022, 
+    57038, 57054, 57070, 57086, 57102, 57118, 57134, 57150, 57166, 57182, 
+    57198, 57214, 57230, 57246, 57262, 57278, 57294, 57310, 57326, 57342, 
+    57358, 57374, 57390, 57406, 57422, 57438, 57454, 57470, 57486, 57502, 
+    57518, 57534, 57550, 57566, 57582, 57598, 57614, 57630, 57646, 57662, 
+    57678, 57694, 57710, 57726, 57742, 57758, 57774, 57790, 57806, 57822, 
+    57838, 57854, 57870, 57886, 57902, 57918, 57934, 57950, 57966, 57982, 
+    57998, 58014, 58030, 58046, 58062, 58078, 58094, 58110, 58126, 58142, 
+    58158, 58174, 58189, 16756, 58198, 58204, 58210, 58220, 58228, 14888, 
+    15439, 9960, 58241, 1520, 58249, 3761, 27422, 7183, 58255, 58260, 58265, 
+    58270, 58275, 58281, 58286, 58292, 58297, 58303, 58308, 58313, 58318, 
+    58323, 58329, 58334, 58339, 58344, 58349, 58354, 58359, 58364, 58370, 
+    58375, 58381, 58388, 2561, 58393, 58399, 8526, 58403, 58408, 58415, 
+    58423, 40, 58427, 58433, 58438, 58443, 58447, 58452, 58456, 58460, 10684, 
+    58464, 58474, 58487, 58498, 58511, 58518, 58524, 58529, 58535, 58541, 
+    58547, 58552, 58557, 58562, 58567, 58571, 58576, 58581, 58586, 58592, 
+    58598, 58604, 58609, 58613, 58618, 58623, 58627, 58632, 58637, 58642, 
+    58646, 10700, 10711, 10716, 1563, 58650, 1568, 58656, 16233, 58659, 
+    58665, 1599, 58671, 1605, 1611, 10746, 58676, 58684, 58691, 58695, 58701, 
+    58706, 30959, 58711, 58718, 58723, 58727, 58731, 1616, 16325, 58740, 
+    58744, 16336, 1120, 58748, 58755, 58760, 58764, 16361, 1620, 37328, 
+    58767, 58772, 58782, 58791, 58796, 58800, 58806, 1625, 39237, 58811, 
+    58820, 58826, 58831, 10904, 10910, 58837, 58849, 58866, 58883, 58900, 
+    58917, 58934, 58951, 58968, 58985, 59002, 59019, 59036, 59053, 59070, 
+    59087, 59104, 59121, 59138, 59155, 59172, 59189, 59206, 59223, 59240, 
+    59257, 59274, 59291, 59308, 59325, 59342, 59359, 59376, 59393, 59410, 
+    59427, 59444, 59461, 59478, 59495, 59512, 59529, 59546, 59563, 59580, 
+    59597, 59614, 59631, 59648, 59665, 59682, 59693, 59698, 1630, 59702, 
+    59708, 59713, 59718, 9326, 1635, 59724, 59733, 27717, 59738, 59749, 
+    59759, 59764, 59771, 59777, 59782, 59787, 16613, 59791, 10921, 1640, 
+    10926, 59797, 59802, 59808, 59813, 59818, 59823, 59828, 59833, 59838, 
+    59843, 59849, 59855, 59861, 59866, 59870, 59875, 59880, 59884, 59889, 
+    59894, 59899, 59903, 59908, 59914, 59919, 59924, 59928, 59933, 59938, 
+    59944, 59949, 59954, 59960, 59966, 59971, 59975, 59980, 59985, 59990, 
+    59994, 59999, 60004, 60009, 60015, 60021, 60026, 60030, 60034, 60039, 
+    60044, 60049, 29115, 60053, 60058, 60063, 60069, 60074, 60079, 60083, 
+    60088, 60093, 60099, 60104, 60109, 60115, 60121, 60126, 60130, 60135, 
+    60140, 60144, 60149, 60154, 60159, 60165, 60171, 60176, 60180, 60185, 
+    60190, 60194, 60199, 60204, 60209, 60213, 60216, 31621, 60221, 60229, 
+    16679, 3663, 11017, 60235, 60245, 60260, 11022, 60271, 60276, 60287, 
+    60299, 60311, 60323, 2695, 60335, 60340, 60352, 60356, 60362, 60368, 
+    60373, 1652, 1073, 60382, 60387, 39287, 60391, 60395, 60400, 60404, 
+    16764, 60409, 60412, 60420, 60428, 1656, 11047, 11053, 1661, 60436, 
+    60443, 60448, 60457, 60467, 60474, 60479, 60484, 1666, 60491, 60496, 
+    16879, 60500, 60505, 60512, 60518, 60522, 60533, 60543, 16901, 9234, 
+    9241, 1671, 60550, 60556, 60564, 60571, 60577, 60584, 60596, 60602, 
+    60607, 60619, 60630, 60639, 60649, 3740, 30795, 30804, 16941, 1676, 1680, 
+    60657, 60668, 60673, 1683, 60681, 60686, 16992, 60698, 60704, 60709, 
+    60717, 1688, 60722, 60727, 60735, 60743, 60750, 60759, 60767, 60776, 
+    1693, 60780, 1698, 60785, 60792, 17066, 60800, 60806, 60811, 60819, 
+    60826, 60834, 22564, 60839, 11182, 60848, 60854, 60861, 60868, 60874, 
+    60884, 60890, 60895, 60906, 60911, 60919, 11191, 11196, 60927, 60933, 
+    60941, 3805, 17108, 39375, 60946, 60952, 60957, 60965, 60972, 12036, 
+    60977, 60983, 1709, 60988, 60991, 1127, 60997, 61002, 61007, 61013, 
+    61018, 61023, 61028, 61033, 61038, 61043, 1718, 9, 61049, 61053, 61058, 
+    61062, 61066, 61070, 31861, 61075, 61080, 61085, 61089, 61092, 61096, 
+    61100, 61105, 61109, 61114, 61118, 34598, 34603, 34608, 61121, 61128, 
+    61134, 39096, 61144, 34614, 32119, 31876, 31882, 34630, 31888, 61149, 
+    61154, 32152, 61158, 61161, 61165, 61172, 61175, 61180, 61184, 61188, 
+    61191, 61201, 61213, 61220, 61226, 61233, 33555, 61236, 8543, 877, 61239, 
+    61243, 61248, 3690, 61252, 61255, 13632, 61262, 61269, 61282, 61290, 
+    61299, 61308, 61313, 61323, 61336, 61348, 61355, 61360, 61369, 61382, 
+    36042, 61400, 61405, 61412, 61418, 652, 61423, 61431, 61438, 27261, 627, 
+    61444, 61450, 61460, 61466, 61471, 31906, 6003, 31920, 61475, 61485, 
+    61490, 61500, 61515, 61521, 61527, 31930, 61532, 31076, 61536, 61541, 
+    61546, 61550, 61555, 16944, 61562, 61567, 61571, 6044, 31956, 61575, 
+    61581, 312, 61591, 61598, 61605, 61610, 61619, 58776, 61625, 61633, 
+    61637, 61641, 61645, 61649, 61654, 61658, 61664, 61672, 61677, 61682, 
+    61686, 61691, 61695, 61699, 61705, 61711, 61716, 61720, 32080, 61725, 
+    32086, 32092, 61730, 61736, 61743, 61748, 61752, 31093, 16606, 61755, 
+    61759, 61764, 61771, 61777, 61781, 61786, 38806, 61792, 61796, 61800, 
+    61805, 61811, 61817, 61829, 61838, 61848, 61854, 61861, 61866, 61871, 
+    61875, 61878, 61884, 61891, 61896, 61901, 61908, 61915, 61921, 61926, 
+    61931, 61939, 32097, 2423, 61944, 61949, 61955, 61960, 61966, 61971, 
+    61976, 61981, 61987, 32118, 61992, 61998, 62004, 62010, 32182, 62015, 
+    62020, 62025, 32193, 62030, 62035, 62040, 62046, 62052, 32198, 62057, 
+    62062, 62067, 32253, 32259, 62072, 62077, 32264, 62082, 27944, 32286, 
+    32290, 62087, 62063, 62091, 62099, 62105, 62113, 62120, 62126, 62136, 
+    62142, 62149, 10631, 32304, 62155, 62168, 62177, 62183, 62192, 62198, 
+    23502, 62205, 62212, 62222, 32254, 62225, 62232, 62237, 62241, 62245, 
+    62250, 6120, 62254, 62259, 62264, 34692, 34697, 62268, 34711, 62273, 
+    34716, 62278, 62284, 34728, 34734, 34740, 62289, 62295, 22529, 62306, 
+    62309, 62321, 62329, 32327, 62333, 62342, 62352, 62361, 32337, 62366, 
+    62373, 62382, 62388, 62396, 62403, 6095, 4397, 62408, 32265, 62414, 
+    62417, 62423, 62430, 62435, 62440, 23412, 62444, 62450, 62456, 62461, 
+    62466, 62470, 62476, 62482, 33465, 863, 35705, 36626, 36632, 32373, 
+    62487, 62491, 62495, 62498, 62511, 62517, 62521, 62524, 62529, 33768, 
+    62533, 31098, 21281, 62539, 6024, 6032, 9075, 62542, 62547, 62552, 62557, 
+    62562, 62567, 62572, 62577, 62582, 62587, 62593, 62598, 62603, 62609, 
+    62614, 62619, 62624, 62629, 62634, 62639, 62645, 62650, 62656, 62661, 
+    62666, 62671, 62676, 62681, 62686, 62691, 62696, 62701, 62706, 62712, 
+    62717, 62722, 62727, 62732, 62737, 62742, 62748, 62753, 62758, 62763, 
+    62768, 62773, 62778, 62783, 62788, 62793, 62799, 62804, 62809, 62814, 
+    62819, 62825, 62831, 62836, 62842, 62847, 62852, 62857, 62862, 62867, 
+    1513, 245, 62872, 62876, 62880, 62884, 25123, 62888, 62892, 62897, 62901, 
+    62906, 62910, 62915, 62920, 62925, 62929, 62933, 62938, 62942, 13369, 
+    62947, 62951, 62958, 62968, 15200, 62977, 62986, 62990, 62995, 63000, 
+    63004, 24914, 3019, 63008, 17357, 63014, 63023, 63031, 63037, 63049, 
+    63061, 63065, 63070, 63074, 63080, 63086, 63091, 63101, 63111, 63117, 
+    63122, 63126, 63131, 63137, 63146, 63155, 63163, 15554, 63167, 63176, 
+    63184, 63196, 63207, 63218, 63227, 63231, 63240, 63250, 63258, 63264, 
+    63269, 63275, 63280, 98, 30907, 63291, 26256, 26266, 63297, 63304, 63310, 
+    63314, 63324, 63335, 63343, 63352, 63357, 63362, 63366, 17311, 63374, 
+    63378, 63384, 63394, 63401, 63407, 34791, 63413, 63415, 63418, 63422, 
+    63432, 63438, 63445, 13315, 63452, 63458, 63467, 63476, 63482, 63488, 
+    63494, 63499, 63506, 63513, 63519, 63532, 63541, 63550, 63555, 63559, 
+    63565, 63572, 63579, 63586, 63593, 63600, 63605, 63609, 63613, 63616, 
+    63626, 63630, 63642, 63651, 63655, 63660, 63664, 63670, 63675, 63682, 
+    63691, 63699, 63707, 63712, 63716, 63721, 63726, 63736, 63744, 63749, 
+    63753, 63757, 63763, 63775, 63783, 63793, 63800, 63806, 63811, 63815, 
+    63819, 63823, 63832, 63841, 63850, 63856, 63862, 63868, 63873, 63880, 
+    63886, 63894, 63901, 12463, 63907, 63913, 63917, 14238, 63921, 63926, 
+    63936, 63945, 63951, 63957, 63965, 63972, 63976, 63980, 63986, 63994, 
+    64001, 64007, 64018, 64022, 64026, 64030, 64033, 64039, 64044, 64048, 
+    64052, 64061, 64069, 64076, 64082, 64089, 24036, 38848, 64094, 64102, 
+    64106, 64110, 64113, 64121, 64128, 64134, 64143, 64151, 64157, 64162, 
+    64166, 64171, 64175, 64179, 64184, 64193, 64197, 64204, 64211, 64217, 
+    64225, 64231, 64242, 64250, 64256, 22659, 64265, 64272, 64279, 64286, 
+    64293, 64300, 41877, 13153, 64307, 64314, 64319, 34827, 6217, 64325, 
+    64330, 64335, 64341, 64347, 64353, 64358, 64363, 64368, 64373, 64379, 
+    64384, 64390, 64395, 64401, 64406, 64411, 64416, 64421, 64426, 64431, 
+    64436, 64442, 64447, 64453, 64458, 64463, 64468, 64473, 64478, 64483, 
+    64489, 64494, 64499, 64504, 64509, 64514, 64519, 64524, 64529, 64534, 
+    64539, 64545, 64550, 64555, 64560, 64565, 64570, 64575, 64580, 64585, 
+    64591, 64596, 64601, 64606, 64611, 64616, 64621, 64626, 64631, 64636, 
+    64641, 64646, 64651, 64657, 1834, 224, 37424, 64662, 64665, 64670, 64674, 
+    64677, 64682, 63703, 64693, 64703, 64710, 64726, 64735, 64745, 64755, 
+    64763, 64777, 64785, 64789, 64792, 64799, 64805, 64816, 64828, 64839, 
+    64848, 64855, 1297, 23301, 64865, 2590, 64869, 64878, 1133, 17284, 38061, 
+    64886, 64894, 64908, 64921, 64925, 64930, 64935, 64940, 64946, 64952, 
+    64957, 8535, 64962, 64966, 64974, 11048, 64979, 64985, 64994, 1721, 
+    11060, 736, 64998, 65007, 65017, 27020, 65026, 65032, 16856, 65038, 
+    65042, 3964, 11391, 65048, 65055, 60663, 65059, 65063, 3988, 189, 14153, 
+    65069, 65081, 65085, 65091, 27737, 65095, 11379, 2730, 4, 65100, 65110, 
+    65116, 65127, 65134, 65140, 65146, 65154, 65161, 65167, 65177, 65187, 
+    65197, 23489, 1309, 65206, 65210, 65214, 65220, 65224, 2753, 2759, 8532, 
+    2264, 65228, 65232, 65241, 65249, 65260, 65268, 65276, 65282, 65287, 
+    65298, 65309, 65317, 65323, 9694, 65328, 65336, 65340, 65344, 65348, 
+    65360, 28122, 65367, 65377, 65383, 65389, 9796, 65399, 65410, 65420, 
+    65429, 65433, 65440, 1135, 1170, 65450, 65455, 65463, 65471, 65482, 
+    65489, 65503, 14082, 393, 65513, 65517, 65525, 65534, 65542, 65548, 
+    65562, 65569, 65575, 65584, 65591, 65601, 65609, 3812, 156, 65617, 65628, 
+    65632, 65644, 27935, 161, 65650, 65655, 65659, 65666, 65672, 65680, 
+    65687, 8818, 65694, 65703, 65711, 3878, 65724, 8199, 65728, 2798, 450, 
+    65733, 65746, 65751, 1833, 668, 65755, 3895, 65763, 65769, 65773, 931, 
+    65783, 65792, 65797, 14922, 14929, 45239, 65801, 3822, 13041, 65809, 
+    65816, 23545, 65820, 65827, 65833, 65838, 65843, 14942, 372, 65848, 
+    65860, 65866, 65874, 2810, 1753, 65882, 65884, 65889, 65894, 65899, 
+    65905, 65910, 65915, 65920, 65925, 65930, 65935, 65941, 65946, 65951, 
+    65956, 65961, 65966, 65971, 65976, 65981, 65987, 65992, 65997, 66002, 
+    66008, 66013, 66019, 66024, 66029, 66034, 66039, 66044, 66049, 66054, 
+    66060, 66065, 66071, 66076, 66081, 66086, 66091, 66096, 66101, 66106, 
+    66111, 66117, 66122, 66127, 66132, 66136, 66140, 66145, 66149, 66154, 
+    66159, 66165, 66170, 66174, 66179, 66183, 66186, 66188, 66192, 66195, 
+    66200, 66204, 66208, 66212, 66216, 66225, 66229, 32531, 66232, 32536, 
+    66239, 66244, 32541, 66253, 66262, 32547, 66267, 32552, 66276, 66281, 
+    11578, 66285, 66290, 66295, 32557, 66299, 40203, 66303, 66306, 66310, 
+    8211, 66316, 66321, 66325, 3705, 32562, 66328, 66332, 66335, 66340, 
+    66344, 66350, 66358, 66371, 66380, 66386, 66391, 66397, 66401, 66407, 
+    66415, 66420, 66424, 66431, 66437, 66445, 66454, 66462, 32565, 66469, 
+    66479, 66488, 66501, 66506, 66511, 66520, 66526, 66533, 66544, 66556, 
+    66563, 66572, 66581, 66590, 66597, 66603, 66610, 66618, 66625, 66633, 
+    66642, 66650, 66657, 66665, 66674, 66682, 66691, 66701, 66710, 66718, 
+    66725, 66733, 66742, 66750, 66759, 66769, 66778, 66786, 66795, 66805, 
+    66814, 66824, 66835, 66845, 66854, 66862, 66869, 66877, 66886, 66894, 
+    66903, 66913, 66922, 66930, 66939, 66949, 66958, 66968, 66979, 66989, 
+    66998, 67006, 67015, 67025, 67034, 67044, 67055, 67065, 67074, 67084, 
+    67095, 67105, 67116, 67128, 67139, 67149, 67158, 67166, 67173, 67181, 
+    67190, 67198, 67207, 67217, 67226, 67234, 67243, 67253, 67262, 67272, 
+    67283, 67293, 67302, 67310, 67319, 67329, 67338, 67348, 67359, 67369, 
+    67378, 67388, 67399, 67409, 67420, 67432, 67443, 67453, 67462, 67470, 
+    67479, 67489, 67498, 67508, 67519, 67529, 67538, 67548, 67559, 67569, 
+    67580, 67592, 67603, 67613, 67622, 67632, 67643, 67653, 67664, 67676, 
+    67687, 67697, 67708, 67720, 67731, 67743, 67756, 67768, 67779, 67789, 
+    67798, 67806, 67813, 67821, 67830, 67838, 67847, 67857, 67866, 67874, 
+    67883, 67893, 67902, 67912, 67923, 67933, 67942, 67950, 67959, 67969, 
+    67978, 67988, 67999, 68009, 68018, 68028, 68039, 68049, 68060, 68072, 
+    68083, 68093, 68102, 68110, 68119, 68129, 68138, 68148, 68159, 68169, 
+    68178, 68188, 68199, 68209, 68220, 68232, 68243, 68253, 68262, 68272, 
+    68283, 68293, 68304, 68316, 68327, 68337, 68348, 68360, 68371, 68383, 
+    68396, 68408, 68419, 68429, 68438, 68446, 68455, 68465, 68474, 68484, 
+    68495, 68505, 68514, 68524, 68535, 68545, 68556, 68568, 68579, 68589, 
+    68598, 68608, 68619, 68629, 68640, 68652, 68663, 68673, 68684, 68696, 
+    68707, 68719, 68732, 68744, 68755, 68765, 68774, 68784, 68795, 68805, 
+    68816, 68828, 68839, 68849, 68860, 68872, 68883, 68895, 68908, 68920, 
+    68931, 68941, 68952, 68964, 68975, 68987, 69000, 69012, 69023, 69035, 
+    69048, 69060, 69073, 69087, 69100, 69112, 69123, 69133, 69142, 69150, 
+    69157, 69162, 8058, 69169, 32575, 69174, 69179, 32580, 69185, 20923, 
+    32585, 69190, 69196, 69204, 69210, 69216, 69223, 69230, 69235, 69239, 
+    69242, 69246, 69255, 69261, 69273, 69284, 69288, 3081, 8033, 69293, 
+    69296, 69298, 69302, 69306, 69310, 69316, 69321, 25934, 69326, 69330, 
+    69333, 69338, 69342, 69349, 69355, 69359, 6170, 69363, 32602, 69368, 
+    69375, 69384, 69392, 69403, 69411, 69419, 69426, 69433, 69439, 69450, 
+    32607, 69455, 69466, 69478, 69486, 69497, 69506, 69517, 69522, 69530, 
+    2556, 69535, 34277, 69548, 69552, 69564, 69572, 69577, 69585, 17479, 
+    69596, 69602, 69609, 69617, 69623, 32617, 69628, 3914, 58224, 69635, 
+    69638, 69646, 69659, 69672, 69685, 69698, 69705, 69716, 69725, 41694, 
+    41699, 69730, 69734, 69742, 69749, 69758, 69766, 69772, 69781, 69789, 
+    69797, 69801, 69810, 69819, 69829, 69842, 69855, 69865, 32622, 69871, 
+    69878, 69884, 32628, 69889, 69892, 69896, 69904, 69913, 41432, 69921, 
+    69930, 69938, 69945, 69953, 69963, 69972, 69981, 69990, 69998, 70009, 
+    70019, 9366, 21561, 70028, 70033, 70038, 70042, 70046, 70051, 70057, 
+    70062, 70067, 70073, 70078, 70083, 21526, 70088, 70095, 70103, 70111, 
+    70116, 70123, 70130, 70135, 70139, 70143, 70151, 70159, 32645, 70165, 
+    70171, 70183, 70189, 70193, 70200, 70205, 70216, 70226, 70236, 70248, 
+    70254, 70264, 70274, 32672, 70283, 70292, 70298, 70310, 70321, 70328, 
+    70333, 70337, 70345, 70351, 70356, 70361, 70368, 70376, 70388, 70398, 
+    70407, 70416, 70423, 34139, 23841, 70429, 70434, 70438, 70442, 70447, 
+    70453, 70464, 70477, 70482, 70489, 32677, 70494, 70506, 70515, 70525, 
+    70536, 70549, 70556, 70565, 70574, 70582, 70587, 70593, 1064, 70598, 
+    70603, 70608, 70613, 70619, 70624, 70629, 70635, 70641, 70646, 70650, 
+    70655, 70660, 70665, 58736, 70670, 70675, 70680, 70685, 70691, 70697, 
+    70702, 70706, 70711, 70716, 70721, 70727, 70732, 70738, 70743, 70748, 
+    70753, 70758, 70762, 70768, 70773, 70782, 70787, 70792, 70797, 70802, 
+    70806, 70813, 70819, 17129, 17136, 70824, 70828, 70832, 70836, 70840, 
+    45494, 70844, 70774, 70846, 70856, 32686, 70859, 70868, 70874, 6143, 
+    32691, 70878, 70884, 70889, 70895, 70900, 70904, 70911, 70916, 70926, 
+    70935, 70939, 70945, 70951, 70957, 70961, 70969, 70976, 70984, 70992, 
+    32696, 70999, 71002, 71009, 71015, 71020, 71024, 71030, 71037, 71042, 
+    71046, 71055, 71063, 71069, 71074, 32701, 71081, 71088, 71094, 71099, 
+    71105, 71112, 71118, 21288, 27445, 71124, 71129, 71135, 71147, 70807, 
+    70814, 21464, 71157, 71162, 71169, 71175, 71182, 71188, 71199, 71204, 
+    9110, 71212, 71215, 71221, 71225, 71229, 71232, 71238, 32450, 6194, 964, 
+    13419, 71245, 71251, 71257, 71263, 71269, 71275, 71281, 71287, 71293, 
+    71298, 71303, 71308, 71313, 71318, 71323, 71328, 71333, 71338, 71343, 
+    71348, 71353, 71358, 71364, 71369, 71374, 71380, 71385, 71390, 71396, 
+    71402, 71408, 71414, 71420, 71426, 71432, 71438, 71444, 71449, 71454, 
+    71460, 71465, 71470, 71476, 71481, 71486, 71491, 71496, 71501, 71506, 
+    71511, 71516, 71521, 71526, 71531, 71536, 71542, 71547, 71552, 71557, 
+    71563, 71568, 71573, 71578, 71583, 71589, 71594, 71599, 71604, 71609, 
+    71614, 71619, 71624, 71629, 71634, 71639, 71644, 71649, 71654, 71659, 
+    71664, 71669, 71674, 71679, 71684, 71690, 71695, 71700, 71705, 71710, 
+    71715, 71720, 71725, 1864, 142, 71730, 71734, 71738, 71743, 71751, 71755, 
+    71762, 71770, 71774, 71787, 71795, 71799, 71802, 71807, 71811, 71816, 
+    71820, 71828, 71832, 20931, 71837, 71841, 60937, 71845, 71848, 71856, 
+    71864, 71872, 71877, 71884, 71890, 71896, 71901, 71908, 71913, 71921, 
+    64913, 71928, 71933, 71938, 71942, 11645, 71946, 71951, 71956, 71960, 
+    71963, 71969, 71973, 71983, 71992, 71995, 71999, 72006, 72019, 72025, 
+    72033, 72044, 72055, 72066, 72077, 72086, 72092, 72101, 72109, 72119, 
+    72132, 72139, 72150, 72156, 72161, 72166, 72172, 72178, 72188, 72197, 
+    70496, 72205, 72211, 72219, 72225, 72233, 72236, 72240, 72244, 72247, 
+    72253, 72259, 72267, 72279, 72291, 72298, 72302, 72313, 72321, 72328, 
+    72340, 72348, 72356, 72363, 72369, 72379, 72388, 72393, 72403, 72412, 
+    40758, 72419, 72423, 72428, 72436, 72443, 72449, 72453, 72463, 72474, 
+    72482, 72489, 72501, 72513, 72522, 69538, 72529, 72540, 72554, 72562, 
+    72572, 72579, 72587, 72599, 72608, 72616, 72626, 72637, 72649, 72658, 
+    72668, 72675, 72684, 72699, 72707, 72717, 72726, 72734, 72747, 72762, 
+    72766, 72775, 72787, 72798, 72809, 72820, 72830, 72841, 72849, 72855, 
+    72865, 72873, 72879, 29014, 72884, 72890, 72895, 72902, 9708, 17499, 
+    72908, 72917, 72922, 72926, 72933, 72939, 72944, 72949, 72957, 72965, 
+    72969, 72972, 72975, 72977, 72984, 72990, 73001, 73006, 73010, 73017, 
+    73023, 73028, 73036, 65412, 65422, 73042, 73049, 73059, 10618, 73066, 
+    73071, 29210, 73080, 73085, 73092, 73102, 73110, 73118, 73127, 73133, 
+    73139, 73146, 73153, 73158, 73162, 73170, 73175, 73180, 73188, 73195, 
+    73200, 73206, 73209, 73213, 73222, 71782, 73231, 73235, 73241, 73252, 
+    73262, 17508, 73273, 73281, 17520, 73288, 73292, 73301, 27331, 73308, 
+    73312, 73317, 73334, 73346, 10576, 73358, 73363, 73368, 73373, 21004, 
+    73377, 73382, 73387, 73393, 73398, 5846, 21008, 73403, 73408, 73414, 
+    73421, 73426, 73431, 73437, 73443, 73449, 73454, 73460, 73464, 73478, 
+    73486, 73494, 73500, 73505, 73512, 73522, 73531, 73536, 73541, 73549, 
+    73554, 73560, 73565, 73574, 59793, 73579, 73582, 73600, 73619, 73632, 
+    73646, 73662, 73669, 73676, 73682, 73689, 73694, 73700, 73706, 73714, 
+    73720, 73725, 73730, 73746, 10589, 73760, 73767, 73775, 73781, 73785, 
+    73788, 73793, 73798, 73805, 73810, 73819, 73824, 73830, 73839, 73848, 
+    73853, 73857, 73865, 73874, 11674, 73883, 73891, 73896, 73902, 11685, 
+    73907, 73910, 73915, 73925, 73934, 73939, 73945, 73950, 73958, 73965, 
+    73976, 73986, 73991, 64841, 73996, 74002, 74007, 74014, 74023, 74031, 
+    74037, 74043, 74050, 74056, 74060, 16954, 3055, 74065, 74069, 74073, 
+    74079, 74088, 74094, 74101, 74105, 74126, 74148, 74164, 74181, 74200, 
+    74209, 74219, 74226, 74233, 27218, 74239, 74243, 74251, 74263, 74269, 
+    74277, 74281, 74289, 74296, 74300, 74306, 74312, 74317, 3563, 41894, 
+    74323, 74327, 74331, 74335, 74340, 74345, 74350, 74356, 74362, 74368, 
+    74375, 74381, 74388, 74394, 74400, 74405, 74411, 74416, 74420, 74425, 
+    74429, 74434, 41909, 74438, 74443, 74451, 74455, 74460, 74467, 74476, 
+    74482, 74486, 74493, 74497, 74500, 74507, 74516, 74521, 74525, 74533, 
+    74542, 74546, 74554, 74560, 74565, 74570, 74576, 74582, 74587, 74591, 
+    74597, 74602, 74606, 74610, 74613, 74618, 74626, 74636, 74641, 39394, 
+    74649, 74661, 74665, 74671, 74683, 74694, 74701, 74707, 74714, 74726, 
+    74733, 74739, 21082, 74743, 74749, 74756, 74762, 74768, 74773, 74778, 
+    74783, 74792, 7033, 74797, 16420, 74803, 74807, 74811, 74815, 74823, 
+    74832, 74836, 74843, 74852, 74865, 74871, 74430, 30074, 74876, 74878, 
+    74883, 74888, 74893, 74898, 74903, 74908, 74913, 74918, 74923, 74928, 
+    74933, 74938, 74943, 74948, 74954, 74959, 74964, 74969, 74974, 74979, 
+    74984, 74989, 74994, 75000, 75006, 75012, 75017, 75022, 75034, 75039, 
+    1870, 49, 75044, 75049, 32728, 75053, 32733, 32738, 32744, 32749, 75057, 
+    32754, 22077, 75079, 75083, 75087, 75092, 75096, 32758, 75100, 75108, 
+    32763, 75115, 75118, 75123, 75127, 9543, 75136, 32768, 21939, 75139, 
+    75143, 1428, 75148, 32779, 75151, 75156, 25727, 25737, 35240, 75161, 
+    75166, 75171, 75176, 75182, 75187, 75196, 75201, 75208, 75214, 75219, 
+    75224, 75229, 75239, 75248, 75253, 75261, 75265, 75273, 32593, 37295, 
+    75280, 75286, 75291, 75296, 12016, 75301, 75307, 75312, 75319, 75325, 
+    75330, 75338, 75348, 75358, 75364, 75369, 75375, 17530, 75382, 36055, 
+    75395, 75400, 75406, 30975, 75419, 75425, 75429, 75438, 75445, 75451, 
+    75459, 75468, 75475, 75481, 75484, 75488, 25868, 75492, 75499, 75505, 
+    75513, 75518, 23984, 75524, 75527, 75535, 75543, 75557, 75564, 75570, 
+    75577, 75583, 32793, 75587, 75594, 75602, 75610, 75616, 32798, 75624, 
+    75630, 75635, 75645, 75651, 75660, 30812, 34698, 75668, 75673, 75678, 
+    75682, 75687, 75691, 75699, 14914, 39407, 75704, 75709, 32803, 62239, 
+    75713, 75718, 75722, 75731, 75739, 75745, 75750, 75756, 75763, 75769, 
+    75774, 75779, 75788, 75800, 75815, 33065, 75821, 16539, 32807, 75825, 
+    75832, 24094, 75838, 75845, 75854, 75861, 75870, 75876, 75881, 75889, 
+    75895, 32817, 75900, 75909, 74689, 75918, 75925, 75931, 75937, 75947, 
+    75955, 75962, 75966, 32822, 75969, 32828, 32834, 75974, 75982, 75990, 
+    76000, 76009, 76017, 76024, 76034, 32839, 76038, 76040, 76044, 76049, 
+    76053, 76057, 76063, 76068, 76072, 76083, 76088, 76093, 3060, 76097, 
+    76104, 76108, 76117, 76125, 76132, 76137, 76142, 62285, 76146, 76149, 
+    76155, 76163, 76169, 76173, 76178, 76185, 76190, 76196, 34729, 76201, 
+    76204, 76209, 76213, 76218, 76223, 76227, 76235, 76239, 25746, 25755, 
+    76245, 76251, 76257, 76262, 76266, 76269, 76279, 76288, 76293, 76299, 
+    76306, 76312, 76316, 76324, 76329, 34735, 76333, 76341, 76347, 76354, 
+    76359, 76363, 76368, 58410, 34741, 76374, 76379, 76383, 76388, 76393, 
+    76398, 76402, 76407, 76412, 76418, 76423, 76428, 76434, 76440, 76445, 
+    76449, 76454, 76459, 76464, 76468, 24093, 76473, 76478, 76484, 76490, 
+    76496, 76501, 76505, 76510, 76515, 76520, 76524, 76529, 76534, 76539, 
+    76544, 76548, 32847, 76556, 76560, 76568, 76576, 76587, 76592, 76596, 
+    22391, 76601, 76607, 76617, 76624, 76629, 76638, 76643, 76647, 76652, 
+    76660, 76668, 76675, 65075, 76681, 76689, 76696, 76707, 76713, 76717, 
+    76723, 32857, 76726, 76733, 76741, 76746, 39598, 76750, 76755, 76762, 
+    76767, 8992, 76771, 76779, 76786, 76793, 76799, 76813, 63347, 76821, 
+    76827, 76831, 76834, 76842, 76849, 76854, 76867, 76874, 76878, 76885, 
+    76890, 60830, 76895, 76898, 76905, 76911, 76915, 76923, 76932, 76942, 
+    76952, 76961, 76969, 76980, 76985, 76989, 76994, 76998, 35371, 77006, 
+    21351, 35380, 77011, 77016, 77021, 77026, 77031, 77036, 77041, 77045, 
+    77050, 77055, 77060, 77065, 77070, 77075, 77079, 77084, 77089, 77093, 
+    77097, 77101, 77105, 77110, 77115, 77119, 77124, 77128, 77132, 77137, 
+    77142, 77147, 77152, 77156, 77161, 77166, 77170, 77175, 77180, 77185, 
+    77190, 77195, 77200, 77205, 77210, 77215, 77220, 77225, 77230, 77235, 
+    77240, 77245, 77250, 77255, 77260, 77265, 77270, 77274, 77279, 77284, 
+    77289, 77294, 77299, 77304, 77309, 77314, 77319, 77324, 77329, 77333, 
+    77338, 77342, 77347, 77352, 77357, 77362, 77367, 77372, 77377, 77382, 
+    77387, 77391, 77395, 77400, 77405, 77409, 77414, 77419, 77423, 77428, 
+    77433, 77438, 77443, 77447, 77452, 77457, 77461, 77466, 77470, 77474, 
+    77478, 77482, 77487, 77491, 77495, 77499, 77503, 77507, 77511, 77515, 
+    77519, 77523, 77528, 77533, 77538, 77543, 77548, 77553, 77558, 77563, 
+    77568, 77573, 77577, 77581, 77585, 77589, 77593, 77597, 77602, 77606, 
+    77611, 77615, 77620, 77625, 77629, 77633, 77638, 77642, 77646, 77650, 
+    77654, 77658, 77662, 77666, 77670, 77674, 77678, 77682, 77686, 77690, 
+    77694, 77699, 77704, 77708, 77712, 77716, 77720, 77724, 77728, 77733, 
+    77737, 77741, 77745, 77749, 77753, 77757, 77762, 77766, 77771, 77775, 
+    77779, 77783, 77787, 77791, 77795, 77799, 77803, 77807, 77811, 77815, 
+    77820, 77824, 77828, 77832, 77836, 77840, 77844, 77848, 77852, 77856, 
+    77860, 77864, 77869, 77873, 77877, 77882, 77887, 77891, 77895, 77899, 
+    77903, 77907, 77911, 77915, 77919, 77924, 77928, 77933, 77937, 77942, 
+    77946, 77951, 77955, 77961, 77966, 77970, 77975, 77979, 77984, 77988, 
+    77993, 77997, 78002, 1521, 78006, 2824, 1759, 1764, 78010, 78014, 2828, 
+    78018, 1397, 78023, 1342, 78027, 2840, 78031, 78038, 78045, 78059, 2844, 
+    7131, 78068, 78076, 78083, 78094, 78103, 78110, 78122, 78135, 78148, 
+    78159, 78164, 78171, 78183, 78187, 2848, 11747, 78197, 78202, 78211, 
+    78221, 2852, 78226, 78230, 78235, 78242, 78248, 78256, 78268, 1347, 
+    13042, 78278, 78282, 78288, 78302, 78314, 78326, 78336, 78345, 78354, 
+    78363, 78371, 78382, 78390, 4051, 78400, 78411, 78420, 78426, 78441, 
+    78448, 78454, 35496, 78459, 2876, 13046, 78463, 78470, 8930, 78479, 2881, 
+    32343, 78485, 60579, 78492, 78498, 78509, 78515, 78522, 78528, 78536, 
+    78543, 78549, 78559, 78568, 78579, 78586, 78592, 78602, 78610, 78616, 
+    78631, 78637, 78642, 78649, 78652, 78658, 78665, 78671, 78679, 78688, 
+    78696, 78702, 78711, 41434, 78725, 78730, 78736, 14751, 78741, 78754, 
+    78763, 78771, 78778, 78782, 78786, 78789, 78796, 78803, 78811, 78819, 
+    78828, 78836, 14678, 78844, 78849, 78853, 78865, 78872, 78881, 748, 
+    78891, 78900, 78911, 2897, 78915, 78919, 78925, 78938, 78950, 78960, 
+    78969, 78981, 26359, 78992, 79000, 79009, 79020, 79031, 79041, 79051, 
+    79060, 79068, 11312, 79075, 79079, 79082, 79087, 79092, 79096, 79102, 
+    1352, 11818, 79109, 79120, 79129, 79137, 79146, 79154, 79170, 79181, 
+    79190, 79198, 79210, 79221, 79237, 79247, 79268, 79281, 79289, 79296, 
+    14862, 79309, 79314, 79320, 5908, 79326, 79329, 79336, 79346, 8176, 
+    79353, 79358, 79363, 79368, 79376, 79385, 79393, 9756, 9765, 79398, 
+    79409, 79414, 79420, 2913, 2918, 79426, 10879, 79432, 79439, 79446, 
+    79459, 2251, 68, 79464, 79469, 79479, 79485, 79494, 79502, 79512, 79516, 
+    79521, 79525, 79537, 2941, 79545, 79553, 79558, 79569, 79580, 79589, 
+    79594, 79600, 79605, 79615, 79625, 79630, 79636, 79641, 79650, 21404, 
+    79654, 4128, 20, 79659, 79668, 79675, 79682, 79688, 79694, 864, 79699, 
+    79704, 60907, 79709, 79714, 79720, 79726, 79734, 79739, 79746, 79752, 
+    79757, 38008, 41328, 79763, 2945, 32, 79773, 79786, 79791, 79799, 79804, 
+    79810, 2967, 28296, 79815, 79823, 79830, 79835, 58652, 61910, 79844, 
+    79848, 1704, 1813, 79853, 79858, 79865, 1817, 247, 79872, 79878, 2989, 
+    79883, 79888, 79895, 1821, 79900, 79906, 79911, 79923, 6119, 79933, 1828, 
+    79939, 79944, 79951, 79958, 79973, 79980, 79991, 79999, 2618, 80003, 
+    80015, 80020, 80024, 80030, 28121, 2256, 80034, 80045, 80049, 80053, 
+    80059, 80063, 80072, 80076, 80087, 80091, 2302, 32172, 80095, 80105, 
+    3080, 9371, 80113, 80118, 80122, 80131, 80138, 80144, 3050, 17146, 80148, 
+    80161, 80179, 80184, 80192, 80200, 80210, 9985, 13154, 80222, 80235, 
+    80242, 80249, 80265, 80272, 80278, 1059, 80285, 80292, 80302, 80311, 
+    80323, 42298, 80331, 3064, 12030, 80334, 80342, 80346, 78238, 3068, 
+    80350, 21185, 12046, 3756, 80354, 3074, 80358, 80368, 80374, 80380, 
+    80386, 80392, 80398, 80404, 80410, 80416, 80422, 80428, 80434, 80440, 
+    80446, 80452, 80458, 80464, 80470, 80476, 80482, 80488, 80494, 80500, 
+    80506, 80512, 80518, 80525, 80532, 80538, 80544, 80550, 80556, 80562, 
+    80568, 1357, 16056, 12068, 80574, 80579, 80584, 80589, 80594, 80599, 
+    80604, 80609, 80614, 80619, 80624, 80629, 80634, 80639, 80644, 80649, 
+    80654, 80659, 80664, 80669, 80674, 80679, 80684, 80689, 80694, 80699, 
+    80705, 80710, 80715, 80721, 80726, 80732, 80737, 80742, 80748, 80753, 
+    80758, 80763, 80768, 80773, 80778, 80783, 80788, 80369, 80375, 80381, 
+    80387, 80393, 80399, 80405, 80411, 80417, 80423, 80429, 80435, 80441, 
+    80447, 80453, 80794, 80459, 80465, 80471, 80800, 80477, 80483, 80489, 
+    80495, 80501, 80507, 80513, 80533, 80806, 80812, 80539, 80818, 80545, 
+    80551, 80557, 80563, 80569, 3091, 3096, 80824, 80829, 80832, 80838, 
+    80844, 80851, 80856, 80861, 2307, 
 };
 
 /* code->name phrasebook */
 #define phrasebook_shift 7
 #define phrasebook_short 209
 static unsigned char phrasebook[] = {
-    0, 219, 18, 245, 31, 78, 223, 254, 78, 54, 50, 247, 132, 50, 225, 182, 
-    50, 254, 126, 254, 57, 43, 226, 3, 44, 226, 3, 253, 216, 96, 50, 249, 
-    219, 240, 167, 243, 229, 218, 129, 219, 46, 21, 210, 86, 21, 110, 21, 
+    0, 219, 19, 245, 32, 78, 223, 255, 78, 54, 50, 247, 133, 50, 225, 183, 
+    50, 254, 127, 254, 58, 43, 226, 4, 44, 226, 4, 253, 217, 96, 50, 249, 
+    220, 240, 168, 243, 230, 218, 130, 219, 47, 21, 210, 86, 21, 110, 21, 
     105, 21, 158, 21, 161, 21, 189, 21, 194, 21, 198, 21, 195, 21, 200, 249, 
-    226, 220, 150, 233, 15, 50, 245, 98, 50, 242, 130, 50, 224, 13, 78, 249, 
-    217, 253, 206, 7, 6, 1, 61, 7, 6, 1, 253, 158, 7, 6, 1, 251, 66, 7, 6, 1, 
-    249, 60, 7, 6, 1, 75, 7, 6, 1, 245, 6, 7, 6, 1, 243, 202, 7, 6, 1, 242, 
-    60, 7, 6, 1, 73, 7, 6, 1, 235, 144, 7, 6, 1, 235, 23, 7, 6, 1, 156, 7, 6, 
-    1, 193, 7, 6, 1, 230, 25, 7, 6, 1, 76, 7, 6, 1, 226, 105, 7, 6, 1, 224, 
-    96, 7, 6, 1, 153, 7, 6, 1, 222, 91, 7, 6, 1, 217, 152, 7, 6, 1, 70, 7, 6, 
+    227, 220, 151, 233, 16, 50, 245, 99, 50, 242, 131, 50, 224, 14, 78, 249, 
+    218, 253, 207, 7, 6, 1, 61, 7, 6, 1, 253, 159, 7, 6, 1, 251, 67, 7, 6, 1, 
+    249, 61, 7, 6, 1, 75, 7, 6, 1, 245, 7, 7, 6, 1, 243, 203, 7, 6, 1, 242, 
+    61, 7, 6, 1, 73, 7, 6, 1, 235, 145, 7, 6, 1, 235, 24, 7, 6, 1, 156, 7, 6, 
+    1, 193, 7, 6, 1, 230, 26, 7, 6, 1, 76, 7, 6, 1, 226, 106, 7, 6, 1, 224, 
+    97, 7, 6, 1, 153, 7, 6, 1, 222, 92, 7, 6, 1, 217, 153, 7, 6, 1, 70, 7, 6, 
     1, 214, 105, 7, 6, 1, 212, 98, 7, 6, 1, 211, 178, 7, 6, 1, 211, 117, 7, 
-    6, 1, 210, 159, 43, 42, 127, 223, 50, 219, 46, 44, 42, 127, 250, 31, 255, 
-    14, 121, 232, 213, 242, 137, 255, 14, 7, 4, 1, 61, 7, 4, 1, 253, 158, 7, 
-    4, 1, 251, 66, 7, 4, 1, 249, 60, 7, 4, 1, 75, 7, 4, 1, 245, 6, 7, 4, 1, 
-    243, 202, 7, 4, 1, 242, 60, 7, 4, 1, 73, 7, 4, 1, 235, 144, 7, 4, 1, 235, 
-    23, 7, 4, 1, 156, 7, 4, 1, 193, 7, 4, 1, 230, 25, 7, 4, 1, 76, 7, 4, 1, 
-    226, 105, 7, 4, 1, 224, 96, 7, 4, 1, 153, 7, 4, 1, 222, 91, 7, 4, 1, 217, 
-    152, 7, 4, 1, 70, 7, 4, 1, 214, 105, 7, 4, 1, 212, 98, 7, 4, 1, 211, 178, 
-    7, 4, 1, 211, 117, 7, 4, 1, 210, 159, 43, 249, 99, 127, 67, 232, 213, 44, 
-    249, 99, 127, 182, 228, 73, 219, 18, 235, 193, 245, 31, 78, 250, 176, 50, 
-    224, 228, 50, 249, 98, 50, 211, 40, 50, 251, 135, 130, 221, 173, 50, 248, 
-    1, 249, 163, 50, 244, 136, 226, 154, 235, 238, 233, 42, 52, 254, 110, 
-    223, 254, 78, 228, 52, 50, 219, 52, 240, 168, 223, 102, 50, 231, 232, 
-    248, 71, 50, 225, 21, 50, 218, 23, 105, 218, 23, 158, 255, 3, 255, 14, 
-    230, 228, 50, 225, 68, 50, 230, 224, 247, 120, 250, 183, 218, 23, 110, 
-    231, 148, 226, 154, 235, 238, 222, 247, 52, 254, 110, 223, 254, 78, 212, 
-    114, 244, 2, 123, 224, 21, 212, 114, 244, 2, 123, 242, 27, 212, 114, 244, 
-    2, 134, 224, 19, 235, 193, 224, 13, 78, 7, 6, 1, 115, 2, 242, 136, 7, 6, 
-    1, 115, 2, 142, 7, 6, 1, 115, 2, 250, 30, 7, 6, 1, 115, 2, 182, 7, 6, 1, 
-    115, 2, 248, 1, 7, 6, 1, 115, 2, 222, 234, 48, 7, 6, 1, 254, 243, 7, 6, 
-    1, 251, 67, 2, 250, 183, 7, 6, 1, 160, 2, 242, 136, 7, 6, 1, 160, 2, 142, 
-    7, 6, 1, 160, 2, 250, 30, 7, 6, 1, 160, 2, 248, 1, 7, 6, 1, 240, 154, 2, 
-    242, 136, 7, 6, 1, 240, 154, 2, 142, 7, 6, 1, 240, 154, 2, 250, 30, 7, 6, 
-    1, 240, 154, 2, 248, 1, 7, 6, 1, 245, 59, 7, 6, 1, 230, 26, 2, 182, 7, 6, 
-    1, 144, 2, 242, 136, 7, 6, 1, 144, 2, 142, 7, 6, 1, 144, 2, 250, 30, 7, 
-    6, 1, 144, 2, 182, 7, 6, 1, 144, 2, 248, 1, 230, 84, 50, 7, 6, 1, 144, 2, 
-    91, 7, 6, 1, 104, 2, 242, 136, 7, 6, 1, 104, 2, 142, 7, 6, 1, 104, 2, 
-    250, 30, 7, 6, 1, 104, 2, 248, 1, 7, 6, 1, 211, 118, 2, 142, 7, 6, 1, 
-    216, 151, 7, 4, 1, 220, 76, 222, 91, 7, 4, 1, 115, 2, 242, 136, 7, 4, 1, 
-    115, 2, 142, 7, 4, 1, 115, 2, 250, 30, 7, 4, 1, 115, 2, 182, 7, 4, 1, 
-    115, 2, 248, 1, 7, 4, 1, 115, 2, 222, 234, 48, 7, 4, 1, 254, 243, 7, 4, 
-    1, 251, 67, 2, 250, 183, 7, 4, 1, 160, 2, 242, 136, 7, 4, 1, 160, 2, 142, 
-    7, 4, 1, 160, 2, 250, 30, 7, 4, 1, 160, 2, 248, 1, 7, 4, 1, 240, 154, 2, 
-    242, 136, 7, 4, 1, 240, 154, 2, 142, 7, 4, 1, 240, 154, 2, 250, 30, 7, 4, 
-    1, 240, 154, 2, 248, 1, 7, 4, 1, 245, 59, 7, 4, 1, 230, 26, 2, 182, 7, 4, 
-    1, 144, 2, 242, 136, 7, 4, 1, 144, 2, 142, 7, 4, 1, 144, 2, 250, 30, 7, 
-    4, 1, 144, 2, 182, 7, 4, 1, 144, 2, 248, 1, 247, 169, 50, 7, 4, 1, 144, 
-    2, 91, 7, 4, 1, 104, 2, 242, 136, 7, 4, 1, 104, 2, 142, 7, 4, 1, 104, 2, 
-    250, 30, 7, 4, 1, 104, 2, 248, 1, 7, 4, 1, 211, 118, 2, 142, 7, 4, 1, 
-    216, 151, 7, 4, 1, 211, 118, 2, 248, 1, 7, 6, 1, 115, 2, 231, 232, 7, 4, 
-    1, 115, 2, 231, 232, 7, 6, 1, 115, 2, 251, 146, 7, 4, 1, 115, 2, 251, 
-    146, 7, 6, 1, 115, 2, 226, 224, 7, 4, 1, 115, 2, 226, 224, 7, 6, 1, 251, 
-    67, 2, 142, 7, 4, 1, 251, 67, 2, 142, 7, 6, 1, 251, 67, 2, 250, 30, 7, 4, 
-    1, 251, 67, 2, 250, 30, 7, 6, 1, 251, 67, 2, 59, 48, 7, 4, 1, 251, 67, 2, 
-    59, 48, 7, 6, 1, 251, 67, 2, 250, 234, 7, 4, 1, 251, 67, 2, 250, 234, 7, 
-    6, 1, 249, 61, 2, 250, 234, 7, 4, 1, 249, 61, 2, 250, 234, 7, 6, 1, 249, 
-    61, 2, 91, 7, 4, 1, 249, 61, 2, 91, 7, 6, 1, 160, 2, 231, 232, 7, 4, 1, 
-    160, 2, 231, 232, 7, 6, 1, 160, 2, 251, 146, 7, 4, 1, 160, 2, 251, 146, 
-    7, 6, 1, 160, 2, 59, 48, 7, 4, 1, 160, 2, 59, 48, 7, 6, 1, 160, 2, 226, 
-    224, 7, 4, 1, 160, 2, 226, 224, 7, 6, 1, 160, 2, 250, 234, 7, 4, 1, 160, 
-    2, 250, 234, 7, 6, 1, 243, 203, 2, 250, 30, 7, 4, 1, 243, 203, 2, 250, 
-    30, 7, 6, 1, 243, 203, 2, 251, 146, 7, 4, 1, 243, 203, 2, 251, 146, 7, 6, 
-    1, 243, 203, 2, 59, 48, 7, 4, 1, 243, 203, 2, 59, 48, 7, 6, 1, 243, 203, 
-    2, 250, 183, 7, 4, 1, 243, 203, 2, 250, 183, 7, 6, 1, 242, 61, 2, 250, 
-    30, 7, 4, 1, 242, 61, 2, 250, 30, 7, 6, 1, 242, 61, 2, 91, 7, 4, 1, 242, 
-    61, 2, 91, 7, 6, 1, 240, 154, 2, 182, 7, 4, 1, 240, 154, 2, 182, 7, 6, 1, 
-    240, 154, 2, 231, 232, 7, 4, 1, 240, 154, 2, 231, 232, 7, 6, 1, 240, 154, 
-    2, 251, 146, 7, 4, 1, 240, 154, 2, 251, 146, 7, 6, 1, 240, 154, 2, 226, 
-    224, 7, 4, 1, 240, 154, 2, 226, 224, 7, 6, 1, 240, 154, 2, 59, 48, 7, 4, 
-    1, 247, 119, 73, 7, 6, 27, 236, 31, 7, 4, 27, 236, 31, 7, 6, 1, 235, 145, 
-    2, 250, 30, 7, 4, 1, 235, 145, 2, 250, 30, 7, 6, 1, 235, 24, 2, 250, 183, 
-    7, 4, 1, 235, 24, 2, 250, 183, 7, 4, 1, 233, 239, 7, 6, 1, 233, 149, 2, 
-    142, 7, 4, 1, 233, 149, 2, 142, 7, 6, 1, 233, 149, 2, 250, 183, 7, 4, 1, 
-    233, 149, 2, 250, 183, 7, 6, 1, 233, 149, 2, 250, 234, 7, 4, 1, 233, 149, 
-    2, 250, 234, 7, 6, 1, 233, 149, 2, 230, 224, 247, 120, 7, 4, 1, 233, 149, 
-    2, 230, 224, 247, 120, 7, 6, 1, 233, 149, 2, 91, 7, 4, 1, 233, 149, 2, 
-    91, 7, 6, 1, 230, 26, 2, 142, 7, 4, 1, 230, 26, 2, 142, 7, 6, 1, 230, 26, 
-    2, 250, 183, 7, 4, 1, 230, 26, 2, 250, 183, 7, 6, 1, 230, 26, 2, 250, 
-    234, 7, 4, 1, 230, 26, 2, 250, 234, 7, 4, 1, 230, 26, 224, 204, 251, 78, 
-    254, 57, 7, 6, 1, 245, 138, 7, 4, 1, 245, 138, 7, 6, 1, 144, 2, 231, 232, 
-    7, 4, 1, 144, 2, 231, 232, 7, 6, 1, 144, 2, 251, 146, 7, 4, 1, 144, 2, 
-    251, 146, 7, 6, 1, 144, 2, 52, 142, 7, 4, 1, 144, 2, 52, 142, 7, 6, 27, 
-    226, 234, 7, 4, 27, 226, 234, 7, 6, 1, 223, 224, 2, 142, 7, 4, 1, 223, 
-    224, 2, 142, 7, 6, 1, 223, 224, 2, 250, 183, 7, 4, 1, 223, 224, 2, 250, 
-    183, 7, 6, 1, 223, 224, 2, 250, 234, 7, 4, 1, 223, 224, 2, 250, 234, 7, 
-    6, 1, 222, 92, 2, 142, 7, 4, 1, 222, 92, 2, 142, 7, 6, 1, 222, 92, 2, 
-    250, 30, 7, 4, 1, 222, 92, 2, 250, 30, 7, 6, 1, 222, 92, 2, 250, 183, 7, 
-    4, 1, 222, 92, 2, 250, 183, 7, 6, 1, 222, 92, 2, 250, 234, 7, 4, 1, 222, 
-    92, 2, 250, 234, 7, 6, 1, 217, 153, 2, 250, 183, 7, 4, 1, 217, 153, 2, 
-    250, 183, 7, 6, 1, 217, 153, 2, 250, 234, 7, 4, 1, 217, 153, 2, 250, 234, 
-    7, 6, 1, 217, 153, 2, 91, 7, 4, 1, 217, 153, 2, 91, 7, 6, 1, 104, 2, 182, 
-    7, 4, 1, 104, 2, 182, 7, 6, 1, 104, 2, 231, 232, 7, 4, 1, 104, 2, 231, 
-    232, 7, 6, 1, 104, 2, 251, 146, 7, 4, 1, 104, 2, 251, 146, 7, 6, 1, 104, 
-    2, 222, 234, 48, 7, 4, 1, 104, 2, 222, 234, 48, 7, 6, 1, 104, 2, 52, 142, 
-    7, 4, 1, 104, 2, 52, 142, 7, 6, 1, 104, 2, 226, 224, 7, 4, 1, 104, 2, 
-    226, 224, 7, 6, 1, 212, 99, 2, 250, 30, 7, 4, 1, 212, 99, 2, 250, 30, 7, 
-    6, 1, 211, 118, 2, 250, 30, 7, 4, 1, 211, 118, 2, 250, 30, 7, 6, 1, 211, 
-    118, 2, 248, 1, 7, 6, 1, 210, 160, 2, 142, 7, 4, 1, 210, 160, 2, 142, 7, 
-    6, 1, 210, 160, 2, 59, 48, 7, 4, 1, 210, 160, 2, 59, 48, 7, 6, 1, 210, 
-    160, 2, 250, 234, 7, 4, 1, 210, 160, 2, 250, 234, 7, 4, 1, 199, 222, 91, 
-    7, 4, 1, 57, 2, 91, 7, 6, 1, 57, 2, 103, 7, 6, 1, 57, 2, 216, 11, 7, 4, 
-    1, 57, 2, 216, 11, 7, 6, 1, 138, 194, 7, 4, 1, 138, 194, 7, 6, 1, 204, 
-    76, 7, 6, 1, 251, 67, 2, 103, 7, 4, 1, 251, 67, 2, 103, 7, 6, 1, 254, 
-    219, 249, 60, 7, 6, 1, 249, 61, 2, 103, 7, 6, 1, 249, 61, 2, 216, 11, 7, 
-    4, 1, 249, 61, 2, 216, 11, 7, 4, 1, 215, 94, 248, 54, 7, 6, 1, 223, 49, 
-    75, 7, 6, 1, 221, 195, 7, 6, 1, 204, 75, 7, 6, 1, 245, 7, 2, 103, 7, 4, 
-    1, 245, 7, 2, 103, 7, 6, 1, 243, 203, 2, 103, 7, 6, 1, 243, 107, 7, 4, 1, 
-    240, 201, 7, 6, 1, 235, 185, 7, 6, 1, 240, 154, 2, 91, 7, 6, 1, 235, 24, 
-    2, 103, 7, 4, 1, 235, 24, 2, 103, 7, 4, 1, 233, 149, 2, 130, 7, 4, 1, 
-    233, 100, 2, 91, 7, 6, 1, 215, 94, 193, 7, 6, 1, 230, 26, 2, 43, 103, 7, 
-    4, 1, 230, 26, 2, 199, 44, 233, 36, 7, 6, 1, 144, 2, 230, 224, 182, 7, 6, 
-    1, 144, 2, 240, 248, 7, 4, 1, 144, 2, 240, 248, 7, 6, 1, 226, 219, 7, 4, 
-    1, 226, 219, 7, 6, 1, 226, 106, 2, 103, 7, 4, 1, 226, 106, 2, 103, 7, 1, 
-    210, 214, 7, 6, 1, 138, 105, 7, 4, 1, 138, 105, 7, 6, 1, 245, 75, 7, 1, 
-    223, 49, 245, 76, 232, 123, 7, 4, 1, 217, 153, 2, 226, 66, 103, 7, 6, 1, 
-    217, 153, 2, 103, 7, 4, 1, 217, 153, 2, 103, 7, 6, 1, 217, 153, 2, 223, 
-    55, 103, 7, 6, 1, 104, 2, 240, 248, 7, 4, 1, 104, 2, 240, 248, 7, 6, 1, 
-    214, 157, 7, 6, 1, 214, 106, 2, 103, 7, 6, 1, 211, 118, 2, 103, 7, 4, 1, 
-    211, 118, 2, 103, 7, 6, 1, 210, 160, 2, 91, 7, 4, 1, 210, 160, 2, 91, 7, 
-    6, 1, 245, 8, 7, 6, 1, 245, 9, 223, 48, 7, 4, 1, 245, 9, 223, 48, 7, 4, 
-    1, 245, 9, 2, 217, 77, 7, 1, 113, 2, 91, 7, 6, 1, 138, 189, 7, 4, 1, 138, 
-    189, 7, 1, 235, 193, 242, 180, 218, 130, 2, 91, 7, 1, 211, 181, 7, 1, 
-    248, 47, 250, 11, 7, 1, 233, 77, 250, 11, 7, 1, 254, 137, 250, 11, 7, 1, 
-    223, 55, 250, 11, 7, 6, 1, 246, 40, 2, 250, 234, 7, 6, 1, 249, 61, 2, 4, 
-    1, 210, 160, 2, 250, 234, 7, 4, 1, 246, 40, 2, 250, 234, 7, 6, 1, 232, 
-    188, 7, 6, 1, 233, 149, 2, 4, 1, 235, 144, 7, 4, 1, 232, 188, 7, 6, 1, 
-    228, 186, 7, 6, 1, 230, 26, 2, 4, 1, 235, 144, 7, 4, 1, 228, 186, 7, 6, 
-    1, 115, 2, 250, 234, 7, 4, 1, 115, 2, 250, 234, 7, 6, 1, 240, 154, 2, 
-    250, 234, 7, 4, 1, 240, 154, 2, 250, 234, 7, 6, 1, 144, 2, 250, 234, 7, 
-    4, 1, 144, 2, 250, 234, 7, 6, 1, 104, 2, 250, 234, 7, 4, 1, 104, 2, 250, 
-    234, 7, 6, 1, 104, 2, 248, 2, 22, 231, 232, 7, 4, 1, 104, 2, 248, 2, 22, 
-    231, 232, 7, 6, 1, 104, 2, 248, 2, 22, 142, 7, 4, 1, 104, 2, 248, 2, 22, 
-    142, 7, 6, 1, 104, 2, 248, 2, 22, 250, 234, 7, 4, 1, 104, 2, 248, 2, 22, 
-    250, 234, 7, 6, 1, 104, 2, 248, 2, 22, 242, 136, 7, 4, 1, 104, 2, 248, 2, 
-    22, 242, 136, 7, 4, 1, 215, 94, 75, 7, 6, 1, 115, 2, 248, 2, 22, 231, 
-    232, 7, 4, 1, 115, 2, 248, 2, 22, 231, 232, 7, 6, 1, 115, 2, 59, 77, 22, 
-    231, 232, 7, 4, 1, 115, 2, 59, 77, 22, 231, 232, 7, 6, 1, 254, 244, 2, 
-    231, 232, 7, 4, 1, 254, 244, 2, 231, 232, 7, 6, 1, 243, 203, 2, 91, 7, 4, 
-    1, 243, 203, 2, 91, 7, 6, 1, 243, 203, 2, 250, 234, 7, 4, 1, 243, 203, 2, 
-    250, 234, 7, 6, 1, 235, 24, 2, 250, 234, 7, 4, 1, 235, 24, 2, 250, 234, 
-    7, 6, 1, 144, 2, 226, 224, 7, 4, 1, 144, 2, 226, 224, 7, 6, 1, 144, 2, 
-    226, 225, 22, 231, 232, 7, 4, 1, 144, 2, 226, 225, 22, 231, 232, 7, 6, 1, 
-    245, 9, 2, 250, 234, 7, 4, 1, 245, 9, 2, 250, 234, 7, 4, 1, 235, 145, 2, 
-    250, 234, 7, 6, 1, 246, 39, 7, 6, 1, 249, 61, 2, 4, 1, 210, 159, 7, 4, 1, 
-    246, 39, 7, 6, 1, 243, 203, 2, 142, 7, 4, 1, 243, 203, 2, 142, 7, 6, 1, 
-    240, 199, 7, 6, 1, 211, 181, 7, 6, 1, 230, 26, 2, 242, 136, 7, 4, 1, 230, 
-    26, 2, 242, 136, 7, 6, 1, 115, 2, 222, 234, 77, 22, 142, 7, 4, 1, 115, 2, 
-    222, 234, 77, 22, 142, 7, 6, 1, 254, 244, 2, 142, 7, 4, 1, 254, 244, 2, 
-    142, 7, 6, 1, 144, 2, 218, 103, 22, 142, 7, 4, 1, 144, 2, 218, 103, 22, 
-    142, 7, 6, 1, 115, 2, 52, 242, 136, 7, 4, 1, 115, 2, 52, 242, 136, 7, 6, 
-    1, 115, 2, 235, 193, 251, 146, 7, 4, 1, 115, 2, 235, 193, 251, 146, 7, 6, 
-    1, 160, 2, 52, 242, 136, 7, 4, 1, 160, 2, 52, 242, 136, 7, 6, 1, 160, 2, 
-    235, 193, 251, 146, 7, 4, 1, 160, 2, 235, 193, 251, 146, 7, 6, 1, 240, 
-    154, 2, 52, 242, 136, 7, 4, 1, 240, 154, 2, 52, 242, 136, 7, 6, 1, 240, 
-    154, 2, 235, 193, 251, 146, 7, 4, 1, 240, 154, 2, 235, 193, 251, 146, 7, 
-    6, 1, 144, 2, 52, 242, 136, 7, 4, 1, 144, 2, 52, 242, 136, 7, 6, 1, 144, 
-    2, 235, 193, 251, 146, 7, 4, 1, 144, 2, 235, 193, 251, 146, 7, 6, 1, 223, 
-    224, 2, 52, 242, 136, 7, 4, 1, 223, 224, 2, 52, 242, 136, 7, 6, 1, 223, 
-    224, 2, 235, 193, 251, 146, 7, 4, 1, 223, 224, 2, 235, 193, 251, 146, 7, 
-    6, 1, 104, 2, 52, 242, 136, 7, 4, 1, 104, 2, 52, 242, 136, 7, 6, 1, 104, 
-    2, 235, 193, 251, 146, 7, 4, 1, 104, 2, 235, 193, 251, 146, 7, 6, 1, 222, 
-    92, 2, 249, 220, 51, 7, 4, 1, 222, 92, 2, 249, 220, 51, 7, 6, 1, 217, 
-    153, 2, 249, 220, 51, 7, 4, 1, 217, 153, 2, 249, 220, 51, 7, 6, 1, 210, 
-    231, 7, 4, 1, 210, 231, 7, 6, 1, 242, 61, 2, 250, 234, 7, 4, 1, 242, 61, 
-    2, 250, 234, 7, 6, 1, 230, 26, 2, 199, 44, 233, 36, 7, 4, 1, 249, 61, 2, 
-    249, 100, 7, 6, 1, 226, 134, 7, 4, 1, 226, 134, 7, 6, 1, 210, 160, 2, 
-    103, 7, 4, 1, 210, 160, 2, 103, 7, 6, 1, 115, 2, 59, 48, 7, 4, 1, 115, 2, 
-    59, 48, 7, 6, 1, 160, 2, 250, 183, 7, 4, 1, 160, 2, 250, 183, 7, 6, 1, 
-    144, 2, 248, 2, 22, 231, 232, 7, 4, 1, 144, 2, 248, 2, 22, 231, 232, 7, 
-    6, 1, 144, 2, 216, 89, 22, 231, 232, 7, 4, 1, 144, 2, 216, 89, 22, 231, 
-    232, 7, 6, 1, 144, 2, 59, 48, 7, 4, 1, 144, 2, 59, 48, 7, 6, 1, 144, 2, 
-    59, 77, 22, 231, 232, 7, 4, 1, 144, 2, 59, 77, 22, 231, 232, 7, 6, 1, 
-    211, 118, 2, 231, 232, 7, 4, 1, 211, 118, 2, 231, 232, 7, 4, 1, 233, 149, 
-    2, 249, 100, 7, 4, 1, 230, 26, 2, 249, 100, 7, 4, 1, 217, 153, 2, 249, 
-    100, 7, 4, 1, 247, 119, 235, 144, 7, 4, 1, 248, 143, 247, 220, 7, 4, 1, 
-    224, 31, 247, 220, 7, 6, 1, 115, 2, 91, 7, 6, 1, 251, 67, 2, 91, 7, 4, 1, 
-    251, 67, 2, 91, 7, 6, 1, 233, 149, 2, 130, 7, 6, 1, 217, 153, 2, 247, 
-    255, 91, 7, 4, 1, 222, 92, 2, 217, 250, 217, 77, 7, 4, 1, 210, 160, 2, 
-    217, 250, 217, 77, 7, 6, 1, 242, 180, 218, 129, 7, 4, 1, 242, 180, 218, 
-    129, 7, 6, 1, 57, 2, 91, 7, 6, 1, 104, 130, 7, 6, 1, 215, 94, 214, 105, 
-    7, 6, 1, 160, 2, 91, 7, 4, 1, 160, 2, 91, 7, 6, 1, 235, 145, 2, 91, 7, 4, 
-    1, 235, 145, 2, 91, 7, 6, 1, 4, 224, 97, 2, 241, 52, 217, 77, 7, 4, 1, 
-    224, 97, 2, 241, 52, 217, 77, 7, 6, 1, 223, 224, 2, 91, 7, 4, 1, 223, 
-    224, 2, 91, 7, 6, 1, 211, 118, 2, 91, 7, 4, 1, 211, 118, 2, 91, 7, 4, 1, 
-    215, 94, 61, 7, 4, 1, 254, 143, 7, 4, 1, 215, 94, 254, 143, 7, 4, 1, 57, 
-    2, 103, 7, 4, 1, 204, 76, 7, 4, 1, 251, 67, 2, 249, 100, 7, 4, 1, 249, 
-    61, 2, 217, 77, 7, 4, 1, 249, 61, 2, 103, 7, 4, 1, 223, 49, 75, 7, 4, 1, 
-    221, 195, 7, 4, 1, 221, 196, 2, 103, 7, 4, 1, 204, 75, 7, 4, 1, 223, 49, 
-    204, 75, 7, 4, 1, 223, 49, 204, 160, 2, 103, 7, 4, 1, 250, 0, 223, 49, 
-    204, 75, 7, 4, 1, 247, 119, 235, 145, 2, 91, 7, 4, 1, 243, 203, 2, 103, 
-    7, 4, 1, 119, 243, 202, 7, 1, 4, 6, 243, 202, 7, 4, 1, 243, 107, 7, 4, 1, 
-    223, 151, 240, 248, 7, 4, 1, 215, 94, 242, 60, 7, 4, 1, 242, 61, 2, 103, 
-    7, 4, 1, 241, 208, 2, 103, 7, 4, 1, 240, 154, 2, 91, 7, 4, 1, 235, 185, 
-    7, 1, 4, 6, 73, 7, 4, 1, 233, 149, 2, 230, 224, 182, 7, 4, 1, 233, 149, 
-    2, 252, 41, 7, 4, 1, 233, 149, 2, 223, 55, 103, 7, 4, 1, 233, 1, 7, 4, 1, 
-    215, 94, 193, 7, 4, 1, 215, 94, 232, 50, 2, 199, 233, 36, 7, 4, 1, 232, 
-    50, 2, 103, 7, 4, 1, 230, 26, 2, 43, 103, 7, 4, 1, 230, 26, 2, 223, 55, 
-    103, 7, 1, 4, 6, 230, 25, 7, 4, 1, 252, 134, 76, 7, 1, 4, 6, 226, 234, 7, 
-    4, 1, 250, 0, 226, 201, 7, 4, 1, 225, 133, 7, 4, 1, 215, 94, 153, 7, 4, 
-    1, 215, 94, 223, 224, 2, 199, 233, 36, 7, 4, 1, 215, 94, 223, 224, 2, 
-    103, 7, 4, 1, 223, 224, 2, 199, 233, 36, 7, 4, 1, 223, 224, 2, 217, 77, 
-    7, 4, 1, 223, 224, 2, 244, 87, 7, 4, 1, 223, 49, 223, 224, 2, 244, 87, 7, 
-    1, 4, 6, 153, 7, 1, 4, 6, 235, 193, 153, 7, 4, 1, 222, 92, 2, 103, 7, 4, 
-    1, 245, 75, 7, 4, 1, 247, 119, 235, 145, 2, 218, 103, 22, 103, 7, 4, 1, 
-    218, 231, 223, 49, 245, 75, 7, 4, 1, 245, 76, 2, 249, 100, 7, 4, 1, 215, 
-    94, 217, 152, 7, 4, 1, 217, 153, 2, 223, 55, 103, 7, 4, 1, 104, 130, 7, 
-    4, 1, 214, 157, 7, 4, 1, 214, 106, 2, 103, 7, 4, 1, 215, 94, 214, 105, 7, 
-    4, 1, 215, 94, 212, 98, 7, 4, 1, 215, 94, 211, 117, 7, 1, 4, 6, 211, 117, 
-    7, 4, 1, 210, 160, 2, 223, 55, 103, 7, 4, 1, 210, 160, 2, 249, 100, 7, 4, 
-    1, 245, 8, 7, 4, 1, 245, 9, 2, 249, 100, 7, 1, 242, 180, 218, 129, 7, 1, 
-    225, 139, 213, 135, 243, 249, 7, 1, 235, 193, 242, 180, 218, 129, 7, 1, 
-    218, 110, 251, 66, 7, 1, 251, 246, 250, 11, 7, 1, 4, 6, 253, 158, 7, 4, 
-    1, 250, 0, 204, 75, 7, 1, 4, 6, 243, 203, 2, 103, 7, 1, 4, 6, 242, 60, 7, 
-    4, 1, 235, 145, 2, 249, 127, 7, 4, 1, 215, 94, 235, 23, 7, 1, 4, 6, 156, 
-    7, 4, 1, 224, 97, 2, 103, 7, 1, 242, 180, 218, 130, 2, 91, 7, 1, 223, 49, 
-    242, 180, 218, 130, 2, 91, 7, 4, 1, 246, 40, 247, 220, 7, 4, 1, 248, 26, 
-    247, 220, 7, 4, 1, 246, 40, 247, 221, 2, 249, 100, 7, 4, 1, 215, 185, 
-    247, 220, 7, 4, 1, 216, 235, 247, 220, 7, 4, 1, 217, 29, 247, 221, 2, 
-    249, 100, 7, 4, 1, 244, 134, 247, 220, 7, 4, 1, 232, 100, 247, 220, 7, 4, 
-    1, 232, 51, 247, 220, 7, 1, 251, 246, 225, 181, 7, 1, 251, 254, 225, 181, 
-    7, 4, 1, 215, 94, 242, 61, 2, 244, 87, 7, 4, 1, 215, 94, 242, 61, 2, 244, 
-    88, 22, 217, 77, 58, 1, 4, 242, 60, 58, 1, 4, 242, 61, 2, 103, 58, 1, 4, 
-    235, 144, 58, 1, 4, 153, 58, 1, 4, 215, 94, 153, 58, 1, 4, 215, 94, 223, 
-    224, 2, 103, 58, 1, 4, 6, 235, 193, 153, 58, 1, 4, 212, 98, 58, 1, 4, 
-    211, 117, 58, 1, 224, 190, 58, 1, 52, 224, 190, 58, 1, 215, 94, 249, 219, 
-    58, 1, 254, 57, 58, 1, 223, 49, 249, 219, 58, 1, 44, 163, 222, 233, 58, 
-    1, 43, 163, 222, 233, 58, 1, 242, 180, 218, 129, 58, 1, 223, 49, 242, 
-    180, 218, 129, 58, 1, 43, 253, 249, 58, 1, 44, 253, 249, 58, 1, 120, 253, 
-    249, 58, 1, 124, 253, 249, 58, 1, 250, 31, 255, 14, 250, 234, 58, 1, 67, 
-    232, 213, 58, 1, 231, 232, 58, 1, 255, 3, 255, 14, 58, 1, 242, 137, 255, 
-    14, 58, 1, 121, 67, 232, 213, 58, 1, 121, 231, 232, 58, 1, 121, 242, 137, 
-    255, 14, 58, 1, 121, 255, 3, 255, 14, 58, 1, 215, 222, 249, 226, 58, 1, 
-    163, 215, 222, 249, 226, 58, 1, 250, 173, 44, 163, 222, 233, 58, 1, 250, 
-    173, 43, 163, 222, 233, 58, 1, 120, 217, 87, 58, 1, 124, 217, 87, 58, 1, 
-    96, 50, 58, 1, 230, 182, 50, 251, 146, 59, 48, 222, 234, 48, 226, 224, 4, 
-    182, 52, 255, 3, 255, 14, 58, 1, 223, 36, 103, 58, 1, 249, 131, 255, 14, 
-    58, 1, 4, 243, 107, 58, 1, 4, 156, 58, 1, 4, 222, 91, 58, 1, 4, 211, 178, 
-    58, 1, 4, 223, 49, 242, 180, 218, 129, 58, 1, 245, 20, 138, 130, 58, 1, 
-    125, 138, 130, 58, 1, 230, 225, 138, 130, 58, 1, 121, 138, 130, 58, 1, 
-    245, 19, 138, 130, 58, 1, 210, 254, 248, 44, 138, 78, 58, 1, 211, 70, 
-    248, 44, 138, 78, 58, 1, 213, 133, 58, 1, 214, 186, 58, 1, 52, 254, 57, 
-    58, 1, 121, 124, 253, 249, 58, 1, 121, 120, 253, 249, 58, 1, 121, 43, 
-    253, 249, 58, 1, 121, 44, 253, 249, 58, 1, 121, 222, 233, 58, 1, 230, 
-    224, 242, 137, 255, 14, 58, 1, 230, 224, 52, 242, 137, 255, 14, 58, 1, 
-    230, 224, 52, 255, 3, 255, 14, 58, 1, 121, 182, 58, 1, 223, 157, 249, 
-    226, 58, 1, 252, 58, 125, 216, 30, 58, 1, 245, 143, 125, 216, 30, 58, 1, 
-    252, 58, 121, 216, 30, 58, 1, 245, 143, 121, 216, 30, 58, 1, 220, 54, 58, 
-    1, 204, 220, 54, 58, 1, 121, 43, 74, 38, 242, 137, 255, 14, 38, 255, 3, 
-    255, 14, 38, 250, 31, 255, 14, 38, 182, 38, 231, 232, 38, 226, 119, 38, 
-    251, 146, 38, 59, 48, 38, 248, 1, 38, 241, 52, 48, 38, 222, 234, 48, 38, 
-    52, 255, 3, 255, 14, 38, 250, 234, 38, 67, 232, 214, 48, 38, 52, 67, 232, 
-    214, 48, 38, 52, 242, 137, 255, 14, 38, 250, 255, 38, 235, 193, 251, 146, 
-    38, 215, 94, 249, 220, 48, 38, 249, 220, 48, 38, 223, 49, 249, 220, 48, 
-    38, 249, 220, 77, 222, 251, 38, 242, 137, 255, 15, 51, 38, 255, 3, 255, 
-    15, 51, 38, 43, 217, 88, 51, 38, 44, 217, 88, 51, 38, 43, 254, 110, 48, 
-    38, 240, 248, 38, 43, 163, 222, 234, 51, 38, 120, 217, 88, 51, 38, 124, 
-    217, 88, 51, 38, 96, 5, 51, 38, 230, 182, 5, 51, 38, 226, 64, 241, 52, 
-    51, 38, 223, 55, 241, 52, 51, 38, 59, 51, 38, 248, 2, 51, 38, 222, 234, 
-    51, 38, 249, 220, 51, 38, 250, 183, 38, 226, 224, 38, 67, 232, 214, 51, 
-    38, 251, 140, 51, 38, 235, 193, 52, 254, 24, 51, 38, 250, 235, 51, 38, 
-    250, 31, 255, 15, 51, 38, 251, 147, 51, 38, 235, 193, 251, 147, 51, 38, 
-    216, 89, 51, 38, 231, 233, 51, 38, 121, 232, 213, 38, 52, 121, 232, 213, 
-    38, 216, 89, 226, 120, 38, 219, 251, 218, 103, 226, 120, 38, 199, 218, 
-    103, 226, 120, 38, 219, 251, 219, 47, 226, 120, 38, 199, 219, 47, 226, 
-    120, 38, 44, 163, 222, 234, 51, 38, 235, 193, 251, 140, 51, 38, 42, 51, 
-    38, 221, 180, 51, 38, 211, 179, 48, 38, 67, 182, 38, 52, 226, 119, 38, 
-    242, 137, 138, 78, 38, 255, 3, 138, 78, 38, 26, 225, 175, 38, 26, 234, 2, 
-    38, 26, 247, 252, 216, 18, 38, 26, 210, 219, 38, 251, 140, 48, 38, 245, 
-    98, 5, 51, 38, 52, 67, 232, 214, 51, 38, 43, 254, 110, 51, 38, 228, 52, 
-    216, 89, 48, 38, 241, 58, 48, 38, 254, 148, 128, 216, 42, 48, 38, 43, 44, 
-    80, 51, 38, 214, 153, 80, 51, 38, 242, 142, 235, 63, 38, 44, 253, 250, 
-    48, 38, 43, 163, 222, 234, 48, 38, 244, 131, 38, 211, 179, 51, 38, 43, 
-    253, 250, 51, 38, 44, 253, 250, 51, 38, 44, 253, 250, 22, 120, 253, 250, 
-    51, 38, 44, 163, 222, 234, 48, 38, 59, 77, 222, 251, 38, 253, 217, 51, 
-    38, 52, 222, 234, 51, 38, 210, 35, 48, 38, 52, 251, 147, 51, 38, 52, 251, 
-    146, 38, 52, 231, 232, 38, 52, 231, 233, 51, 38, 52, 182, 38, 52, 235, 
-    193, 251, 146, 38, 52, 97, 80, 51, 38, 7, 4, 1, 61, 38, 7, 4, 1, 75, 38, 
-    7, 4, 1, 73, 38, 7, 4, 1, 76, 38, 7, 4, 1, 70, 38, 7, 4, 1, 251, 66, 38, 
-    7, 4, 1, 249, 60, 38, 7, 4, 1, 242, 60, 38, 7, 4, 1, 193, 38, 7, 4, 1, 
-    153, 38, 7, 4, 1, 217, 152, 38, 7, 4, 1, 214, 105, 38, 7, 4, 1, 211, 178, 
-    26, 6, 1, 241, 196, 26, 4, 1, 241, 196, 26, 6, 1, 254, 23, 221, 246, 26, 
-    4, 1, 254, 23, 221, 246, 26, 227, 198, 50, 26, 232, 108, 227, 198, 50, 
-    26, 6, 1, 226, 51, 247, 227, 26, 4, 1, 226, 51, 247, 227, 26, 210, 219, 
-    26, 4, 223, 49, 232, 83, 219, 178, 87, 26, 4, 246, 118, 232, 83, 219, 
-    178, 87, 26, 4, 223, 49, 246, 118, 232, 83, 219, 178, 87, 26, 224, 13, 
-    78, 26, 216, 18, 26, 247, 252, 216, 18, 26, 6, 1, 254, 144, 2, 216, 18, 
-    26, 254, 97, 217, 2, 26, 6, 1, 245, 101, 2, 216, 18, 26, 6, 1, 245, 64, 
-    2, 216, 18, 26, 6, 1, 235, 186, 2, 216, 18, 26, 6, 1, 226, 200, 2, 216, 
-    18, 26, 6, 1, 214, 158, 2, 216, 18, 26, 6, 1, 226, 202, 2, 216, 18, 26, 
-    4, 1, 235, 186, 2, 247, 252, 22, 216, 18, 26, 6, 1, 254, 143, 26, 6, 1, 
-    252, 26, 26, 6, 1, 243, 107, 26, 6, 1, 248, 54, 26, 6, 1, 245, 100, 26, 
-    6, 1, 210, 85, 26, 6, 1, 245, 63, 26, 6, 1, 216, 179, 26, 6, 1, 235, 185, 
-    26, 6, 1, 234, 222, 26, 6, 1, 233, 98, 26, 6, 1, 230, 102, 26, 6, 1, 227, 
-    237, 26, 6, 1, 211, 157, 26, 6, 1, 226, 199, 26, 6, 1, 225, 108, 26, 6, 
-    1, 223, 37, 26, 6, 1, 219, 177, 26, 6, 1, 217, 41, 26, 6, 1, 214, 157, 
-    26, 6, 1, 225, 133, 26, 6, 1, 250, 110, 26, 6, 1, 224, 161, 26, 6, 1, 
-    226, 201, 26, 6, 1, 235, 186, 2, 247, 251, 26, 6, 1, 214, 158, 2, 247, 
-    251, 26, 4, 1, 254, 144, 2, 216, 18, 26, 4, 1, 245, 101, 2, 216, 18, 26, 
-    4, 1, 245, 64, 2, 216, 18, 26, 4, 1, 235, 186, 2, 216, 18, 26, 4, 1, 214, 
-    158, 2, 247, 252, 22, 216, 18, 26, 4, 1, 254, 143, 26, 4, 1, 252, 26, 26, 
-    4, 1, 243, 107, 26, 4, 1, 248, 54, 26, 4, 1, 245, 100, 26, 4, 1, 210, 85, 
-    26, 4, 1, 245, 63, 26, 4, 1, 216, 179, 26, 4, 1, 235, 185, 26, 4, 1, 234, 
-    222, 26, 4, 1, 233, 98, 26, 4, 1, 230, 102, 26, 4, 1, 227, 237, 26, 4, 1, 
-    211, 157, 26, 4, 1, 226, 199, 26, 4, 1, 225, 108, 26, 4, 1, 223, 37, 26, 
-    4, 1, 40, 219, 177, 26, 4, 1, 219, 177, 26, 4, 1, 217, 41, 26, 4, 1, 214, 
-    157, 26, 4, 1, 225, 133, 26, 4, 1, 250, 110, 26, 4, 1, 224, 161, 26, 4, 
-    1, 226, 201, 26, 4, 1, 235, 186, 2, 247, 251, 26, 4, 1, 214, 158, 2, 247, 
-    251, 26, 4, 1, 226, 200, 2, 216, 18, 26, 4, 1, 214, 158, 2, 216, 18, 26, 
-    4, 1, 226, 202, 2, 216, 18, 26, 6, 234, 247, 87, 26, 252, 27, 87, 26, 
-    216, 180, 87, 26, 214, 158, 2, 241, 52, 87, 26, 214, 158, 2, 255, 3, 22, 
-    241, 52, 87, 26, 214, 158, 2, 248, 2, 22, 241, 52, 87, 26, 225, 134, 87, 
-    26, 225, 109, 87, 26, 234, 247, 87, 26, 1, 254, 23, 234, 6, 26, 4, 1, 
-    254, 23, 234, 6, 26, 1, 218, 137, 26, 4, 1, 218, 137, 26, 1, 247, 227, 
-    26, 4, 1, 247, 227, 26, 1, 234, 6, 26, 4, 1, 234, 6, 26, 1, 221, 246, 26, 
-    4, 1, 221, 246, 81, 6, 1, 220, 55, 81, 4, 1, 220, 55, 81, 6, 1, 244, 140, 
-    81, 4, 1, 244, 140, 81, 6, 1, 234, 117, 81, 4, 1, 234, 117, 81, 6, 1, 
-    241, 45, 81, 4, 1, 241, 45, 81, 6, 1, 243, 102, 81, 4, 1, 243, 102, 81, 
-    6, 1, 220, 22, 81, 4, 1, 220, 22, 81, 6, 1, 248, 69, 81, 4, 1, 248, 69, 
-    26, 234, 223, 87, 26, 223, 38, 87, 26, 232, 83, 219, 178, 87, 26, 1, 210, 
-    224, 26, 6, 216, 180, 87, 26, 232, 83, 245, 101, 87, 26, 223, 49, 232, 
-    83, 245, 101, 87, 26, 6, 1, 220, 7, 26, 4, 1, 220, 7, 26, 6, 232, 83, 
-    219, 178, 87, 26, 6, 1, 221, 243, 26, 4, 1, 221, 243, 26, 223, 38, 2, 
-    218, 103, 87, 26, 6, 223, 49, 232, 83, 219, 178, 87, 26, 6, 246, 118, 
-    232, 83, 219, 178, 87, 26, 6, 223, 49, 246, 118, 232, 83, 219, 178, 87, 
-    33, 6, 1, 236, 61, 2, 242, 136, 33, 6, 1, 235, 189, 33, 6, 1, 247, 162, 
-    33, 6, 1, 242, 187, 33, 6, 1, 214, 202, 236, 60, 33, 6, 1, 246, 36, 33, 
-    6, 1, 251, 76, 73, 33, 6, 1, 211, 8, 33, 6, 1, 235, 126, 33, 6, 1, 232, 
-    187, 33, 6, 1, 228, 178, 33, 6, 1, 215, 174, 33, 6, 1, 234, 48, 33, 6, 1, 
-    240, 154, 2, 242, 136, 33, 6, 1, 219, 251, 70, 33, 6, 1, 246, 32, 33, 6, 
-    1, 61, 33, 6, 1, 252, 75, 33, 6, 1, 213, 255, 33, 6, 1, 242, 236, 33, 6, 
-    1, 248, 90, 33, 6, 1, 236, 60, 33, 6, 1, 210, 74, 33, 6, 1, 210, 94, 33, 
-    6, 1, 73, 33, 6, 1, 219, 251, 73, 33, 6, 1, 176, 33, 6, 1, 245, 174, 33, 
-    6, 1, 245, 159, 33, 6, 1, 245, 150, 33, 6, 1, 76, 33, 6, 1, 225, 221, 33, 
-    6, 1, 245, 92, 33, 6, 1, 245, 82, 33, 6, 1, 217, 22, 33, 6, 1, 70, 33, 6, 
-    1, 245, 202, 33, 6, 1, 162, 33, 6, 1, 215, 178, 33, 6, 1, 250, 131, 33, 
-    6, 1, 220, 102, 33, 6, 1, 220, 65, 33, 6, 1, 242, 3, 50, 33, 6, 1, 211, 
-    27, 33, 6, 1, 219, 52, 50, 33, 6, 1, 75, 33, 6, 1, 210, 212, 33, 6, 1, 
-    191, 33, 4, 1, 61, 33, 4, 1, 252, 75, 33, 4, 1, 213, 255, 33, 4, 1, 242, 
-    236, 33, 4, 1, 248, 90, 33, 4, 1, 236, 60, 33, 4, 1, 210, 74, 33, 4, 1, 
-    210, 94, 33, 4, 1, 73, 33, 4, 1, 219, 251, 73, 33, 4, 1, 176, 33, 4, 1, 
-    245, 174, 33, 4, 1, 245, 159, 33, 4, 1, 245, 150, 33, 4, 1, 76, 33, 4, 1, 
-    225, 221, 33, 4, 1, 245, 92, 33, 4, 1, 245, 82, 33, 4, 1, 217, 22, 33, 4, 
-    1, 70, 33, 4, 1, 245, 202, 33, 4, 1, 162, 33, 4, 1, 215, 178, 33, 4, 1, 
-    250, 131, 33, 4, 1, 220, 102, 33, 4, 1, 220, 65, 33, 4, 1, 242, 3, 50, 
-    33, 4, 1, 211, 27, 33, 4, 1, 219, 52, 50, 33, 4, 1, 75, 33, 4, 1, 210, 
-    212, 33, 4, 1, 191, 33, 4, 1, 236, 61, 2, 242, 136, 33, 4, 1, 235, 189, 
-    33, 4, 1, 247, 162, 33, 4, 1, 242, 187, 33, 4, 1, 214, 202, 236, 60, 33, 
-    4, 1, 246, 36, 33, 4, 1, 251, 76, 73, 33, 4, 1, 211, 8, 33, 4, 1, 235, 
-    126, 33, 4, 1, 232, 187, 33, 4, 1, 228, 178, 33, 4, 1, 215, 174, 33, 4, 
-    1, 234, 48, 33, 4, 1, 240, 154, 2, 242, 136, 33, 4, 1, 219, 251, 70, 33, 
-    4, 1, 246, 32, 33, 6, 1, 226, 201, 33, 4, 1, 226, 201, 33, 6, 1, 211, 59, 
-    33, 4, 1, 211, 59, 33, 6, 1, 235, 183, 75, 33, 4, 1, 235, 183, 75, 33, 6, 
-    1, 232, 192, 210, 183, 33, 4, 1, 232, 192, 210, 183, 33, 6, 1, 235, 183, 
-    232, 192, 210, 183, 33, 4, 1, 235, 183, 232, 192, 210, 183, 33, 6, 1, 
-    251, 249, 210, 183, 33, 4, 1, 251, 249, 210, 183, 33, 6, 1, 235, 183, 
-    251, 249, 210, 183, 33, 4, 1, 235, 183, 251, 249, 210, 183, 33, 6, 1, 
-    233, 233, 33, 4, 1, 233, 233, 33, 6, 1, 224, 161, 33, 4, 1, 224, 161, 33, 
-    6, 1, 244, 82, 33, 4, 1, 244, 82, 33, 6, 1, 235, 146, 33, 4, 1, 235, 146, 
-    33, 6, 1, 235, 147, 2, 52, 242, 137, 255, 14, 33, 4, 1, 235, 147, 2, 52, 
-    242, 137, 255, 14, 33, 6, 1, 214, 205, 33, 4, 1, 214, 205, 33, 6, 1, 222, 
-    185, 226, 201, 33, 4, 1, 222, 185, 226, 201, 33, 6, 1, 226, 202, 2, 216, 
-    65, 33, 4, 1, 226, 202, 2, 216, 65, 33, 6, 1, 226, 140, 33, 4, 1, 226, 
-    140, 33, 6, 1, 234, 6, 33, 4, 1, 234, 6, 33, 216, 146, 50, 38, 33, 216, 
-    65, 38, 33, 226, 65, 38, 33, 248, 154, 225, 18, 38, 33, 224, 155, 225, 
-    18, 38, 33, 225, 3, 38, 33, 240, 211, 216, 146, 50, 38, 33, 230, 191, 50, 
-    33, 6, 1, 219, 251, 240, 154, 2, 217, 77, 33, 4, 1, 219, 251, 240, 154, 
-    2, 217, 77, 33, 6, 1, 220, 146, 50, 33, 4, 1, 220, 146, 50, 33, 6, 1, 
-    245, 93, 2, 216, 114, 33, 4, 1, 245, 93, 2, 216, 114, 33, 6, 1, 242, 237, 
-    2, 214, 156, 33, 4, 1, 242, 237, 2, 214, 156, 33, 6, 1, 242, 237, 2, 91, 
-    33, 4, 1, 242, 237, 2, 91, 33, 6, 1, 242, 237, 2, 230, 224, 103, 33, 4, 
-    1, 242, 237, 2, 230, 224, 103, 33, 6, 1, 210, 75, 2, 248, 39, 33, 4, 1, 
-    210, 75, 2, 248, 39, 33, 6, 1, 210, 95, 2, 248, 39, 33, 4, 1, 210, 95, 2, 
-    248, 39, 33, 6, 1, 235, 13, 2, 248, 39, 33, 4, 1, 235, 13, 2, 248, 39, 
-    33, 6, 1, 235, 13, 2, 67, 91, 33, 4, 1, 235, 13, 2, 67, 91, 33, 6, 1, 
-    235, 13, 2, 91, 33, 4, 1, 235, 13, 2, 91, 33, 6, 1, 252, 124, 176, 33, 4, 
-    1, 252, 124, 176, 33, 6, 1, 245, 151, 2, 248, 39, 33, 4, 1, 245, 151, 2, 
-    248, 39, 33, 6, 27, 245, 151, 242, 236, 33, 4, 27, 245, 151, 242, 236, 
-    33, 6, 1, 225, 222, 2, 230, 224, 103, 33, 4, 1, 225, 222, 2, 230, 224, 
-    103, 33, 6, 1, 255, 20, 162, 33, 4, 1, 255, 20, 162, 33, 6, 1, 245, 83, 
-    2, 248, 39, 33, 4, 1, 245, 83, 2, 248, 39, 33, 6, 1, 217, 23, 2, 248, 39, 
-    33, 4, 1, 217, 23, 2, 248, 39, 33, 6, 1, 218, 121, 70, 33, 4, 1, 218, 
-    121, 70, 33, 6, 1, 218, 121, 104, 2, 91, 33, 4, 1, 218, 121, 104, 2, 91, 
-    33, 6, 1, 242, 49, 2, 248, 39, 33, 4, 1, 242, 49, 2, 248, 39, 33, 6, 27, 
-    217, 23, 215, 178, 33, 4, 27, 217, 23, 215, 178, 33, 6, 1, 250, 132, 2, 
-    248, 39, 33, 4, 1, 250, 132, 2, 248, 39, 33, 6, 1, 250, 132, 2, 67, 91, 
-    33, 4, 1, 250, 132, 2, 67, 91, 33, 6, 1, 220, 33, 33, 4, 1, 220, 33, 33, 
-    6, 1, 255, 20, 250, 131, 33, 4, 1, 255, 20, 250, 131, 33, 6, 1, 255, 20, 
-    250, 132, 2, 248, 39, 33, 4, 1, 255, 20, 250, 132, 2, 248, 39, 33, 1, 
-    226, 58, 33, 6, 1, 210, 75, 2, 251, 146, 33, 4, 1, 210, 75, 2, 251, 146, 
-    33, 6, 1, 235, 13, 2, 103, 33, 4, 1, 235, 13, 2, 103, 33, 6, 1, 245, 175, 
-    2, 217, 77, 33, 4, 1, 245, 175, 2, 217, 77, 33, 6, 1, 245, 151, 2, 103, 
-    33, 4, 1, 245, 151, 2, 103, 33, 6, 1, 245, 151, 2, 217, 77, 33, 4, 1, 
-    245, 151, 2, 217, 77, 33, 6, 1, 234, 127, 250, 131, 33, 4, 1, 234, 127, 
-    250, 131, 33, 6, 1, 245, 160, 2, 217, 77, 33, 4, 1, 245, 160, 2, 217, 77, 
-    33, 4, 1, 226, 58, 33, 6, 1, 115, 2, 251, 146, 33, 4, 1, 115, 2, 251, 
-    146, 33, 6, 1, 115, 2, 248, 1, 33, 4, 1, 115, 2, 248, 1, 33, 6, 27, 115, 
-    236, 60, 33, 4, 27, 115, 236, 60, 33, 6, 1, 236, 61, 2, 251, 146, 33, 4, 
-    1, 236, 61, 2, 251, 146, 33, 6, 1, 221, 195, 33, 4, 1, 221, 195, 33, 6, 
-    1, 221, 196, 2, 248, 1, 33, 4, 1, 221, 196, 2, 248, 1, 33, 6, 1, 210, 75, 
-    2, 248, 1, 33, 4, 1, 210, 75, 2, 248, 1, 33, 6, 1, 210, 95, 2, 248, 1, 
-    33, 4, 1, 210, 95, 2, 248, 1, 33, 6, 1, 255, 20, 246, 36, 33, 4, 1, 255, 
-    20, 246, 36, 33, 6, 1, 240, 154, 2, 231, 232, 33, 4, 1, 240, 154, 2, 231, 
-    232, 33, 6, 1, 240, 154, 2, 248, 1, 33, 4, 1, 240, 154, 2, 248, 1, 33, 6, 
-    1, 144, 2, 248, 1, 33, 4, 1, 144, 2, 248, 1, 33, 6, 1, 252, 134, 76, 33, 
-    4, 1, 252, 134, 76, 33, 6, 1, 252, 134, 144, 2, 248, 1, 33, 4, 1, 252, 
-    134, 144, 2, 248, 1, 33, 6, 1, 160, 2, 248, 1, 33, 4, 1, 160, 2, 248, 1, 
-    33, 6, 1, 104, 2, 231, 232, 33, 4, 1, 104, 2, 231, 232, 33, 6, 1, 104, 2, 
-    248, 1, 33, 4, 1, 104, 2, 248, 1, 33, 6, 1, 104, 2, 52, 142, 33, 4, 1, 
-    104, 2, 52, 142, 33, 6, 1, 250, 132, 2, 248, 1, 33, 4, 1, 250, 132, 2, 
-    248, 1, 33, 6, 1, 242, 237, 2, 248, 39, 33, 4, 1, 242, 237, 2, 248, 39, 
-    33, 6, 1, 211, 28, 2, 248, 1, 33, 4, 1, 211, 28, 2, 248, 1, 33, 6, 1, 
-    242, 237, 2, 218, 103, 22, 103, 33, 4, 1, 242, 237, 2, 218, 103, 22, 103, 
-    33, 6, 1, 242, 49, 2, 103, 33, 4, 1, 242, 49, 2, 103, 33, 6, 1, 242, 49, 
-    2, 91, 33, 4, 1, 242, 49, 2, 91, 33, 6, 1, 234, 14, 248, 90, 33, 4, 1, 
-    234, 14, 248, 90, 33, 6, 1, 234, 14, 247, 162, 33, 4, 1, 234, 14, 247, 
-    162, 33, 6, 1, 234, 14, 210, 27, 33, 4, 1, 234, 14, 210, 27, 33, 6, 1, 
-    234, 14, 246, 30, 33, 4, 1, 234, 14, 246, 30, 33, 6, 1, 234, 14, 232, 
-    187, 33, 4, 1, 234, 14, 232, 187, 33, 6, 1, 234, 14, 228, 178, 33, 4, 1, 
-    234, 14, 228, 178, 33, 6, 1, 234, 14, 219, 109, 33, 4, 1, 234, 14, 219, 
-    109, 33, 6, 1, 234, 14, 216, 60, 33, 4, 1, 234, 14, 216, 60, 33, 6, 1, 
-    223, 49, 210, 94, 33, 4, 1, 223, 49, 210, 94, 33, 6, 1, 245, 175, 2, 103, 
-    33, 4, 1, 245, 175, 2, 103, 33, 6, 1, 232, 254, 33, 4, 1, 232, 254, 33, 
-    6, 1, 223, 39, 33, 4, 1, 223, 39, 33, 6, 1, 211, 92, 33, 4, 1, 211, 92, 
-    33, 6, 1, 224, 88, 33, 4, 1, 224, 88, 33, 6, 1, 212, 22, 33, 4, 1, 212, 
-    22, 33, 6, 1, 254, 166, 176, 33, 4, 1, 254, 166, 176, 33, 6, 1, 245, 175, 
-    2, 230, 224, 103, 33, 4, 1, 245, 175, 2, 230, 224, 103, 33, 6, 1, 245, 
-    151, 2, 230, 224, 103, 33, 4, 1, 245, 151, 2, 230, 224, 103, 33, 6, 1, 
-    225, 222, 2, 248, 39, 33, 4, 1, 225, 222, 2, 248, 39, 33, 6, 1, 220, 34, 
-    2, 248, 39, 33, 4, 1, 220, 34, 2, 248, 39, 150, 6, 1, 253, 164, 150, 6, 
-    1, 252, 39, 150, 6, 1, 242, 203, 150, 6, 1, 248, 221, 150, 6, 1, 245, 
-    213, 150, 6, 1, 210, 116, 150, 6, 1, 245, 197, 150, 6, 1, 245, 65, 150, 
-    6, 1, 111, 150, 6, 1, 210, 74, 150, 6, 1, 235, 227, 150, 6, 1, 232, 190, 
-    150, 6, 1, 211, 160, 150, 6, 1, 251, 33, 150, 6, 1, 234, 165, 150, 6, 1, 
-    241, 68, 150, 6, 1, 235, 141, 150, 6, 1, 242, 246, 150, 6, 1, 250, 126, 
-    150, 6, 1, 231, 58, 150, 6, 1, 211, 8, 150, 6, 1, 228, 39, 150, 6, 1, 
-    220, 102, 150, 6, 1, 213, 138, 150, 6, 1, 250, 157, 150, 6, 1, 225, 205, 
-    150, 6, 1, 235, 110, 150, 6, 1, 205, 150, 6, 1, 221, 161, 150, 6, 1, 213, 
-    179, 150, 6, 1, 216, 62, 150, 6, 1, 223, 95, 150, 6, 1, 249, 238, 150, 6, 
-    1, 210, 249, 150, 6, 1, 225, 46, 150, 6, 1, 234, 176, 150, 6, 1, 226, 
-    222, 150, 6, 1, 244, 142, 150, 58, 1, 43, 163, 222, 233, 150, 254, 57, 
-    150, 245, 154, 78, 150, 245, 31, 78, 150, 249, 219, 150, 224, 13, 78, 
-    150, 255, 21, 78, 150, 4, 1, 253, 164, 150, 4, 1, 252, 39, 150, 4, 1, 
-    242, 203, 150, 4, 1, 248, 221, 150, 4, 1, 245, 213, 150, 4, 1, 210, 116, 
-    150, 4, 1, 245, 197, 150, 4, 1, 245, 65, 150, 4, 1, 111, 150, 4, 1, 210, 
-    74, 150, 4, 1, 235, 227, 150, 4, 1, 232, 190, 150, 4, 1, 211, 160, 150, 
-    4, 1, 251, 33, 150, 4, 1, 234, 165, 150, 4, 1, 241, 68, 150, 4, 1, 235, 
-    141, 150, 4, 1, 242, 246, 150, 4, 1, 250, 126, 150, 4, 1, 231, 58, 150, 
-    4, 1, 211, 8, 150, 4, 1, 228, 39, 150, 4, 1, 220, 102, 150, 4, 1, 213, 
-    138, 150, 4, 1, 250, 157, 150, 4, 1, 225, 205, 150, 4, 1, 235, 110, 150, 
-    4, 1, 205, 150, 4, 1, 221, 161, 150, 4, 1, 213, 179, 150, 4, 1, 216, 62, 
-    150, 4, 1, 223, 95, 150, 4, 1, 249, 238, 150, 4, 1, 210, 249, 150, 4, 1, 
-    225, 46, 150, 4, 1, 234, 176, 150, 4, 1, 226, 222, 150, 4, 1, 244, 142, 
-    150, 4, 27, 245, 214, 210, 249, 150, 243, 229, 218, 129, 150, 240, 168, 
-    150, 246, 95, 50, 94, 255, 15, 245, 57, 94, 255, 15, 221, 162, 94, 255, 
-    15, 220, 88, 94, 255, 15, 210, 104, 224, 71, 94, 255, 15, 210, 104, 243, 
-    125, 94, 255, 15, 216, 75, 94, 255, 15, 223, 47, 94, 255, 15, 210, 103, 
-    94, 255, 15, 225, 245, 94, 255, 15, 211, 20, 94, 255, 15, 216, 214, 94, 
-    255, 15, 243, 41, 94, 255, 15, 243, 42, 230, 69, 94, 255, 15, 243, 39, 
-    94, 255, 15, 224, 72, 226, 16, 94, 255, 15, 216, 253, 243, 56, 94, 255, 
-    15, 225, 226, 94, 255, 15, 253, 200, 242, 41, 94, 255, 15, 230, 79, 94, 
-    255, 15, 231, 208, 94, 255, 15, 231, 49, 94, 255, 15, 231, 50, 234, 177, 
-    94, 255, 15, 248, 163, 94, 255, 15, 224, 83, 94, 255, 15, 216, 253, 224, 
-    67, 94, 255, 15, 211, 30, 252, 40, 210, 230, 94, 255, 15, 226, 207, 94, 
-    255, 15, 236, 19, 94, 255, 15, 248, 70, 94, 255, 15, 210, 33, 94, 164, 
-    231, 143, 250, 35, 94, 225, 11, 220, 36, 94, 225, 11, 241, 250, 221, 162, 
-    94, 225, 11, 241, 250, 225, 239, 94, 225, 11, 241, 250, 224, 76, 94, 225, 
-    11, 241, 158, 94, 225, 11, 215, 176, 94, 225, 11, 221, 162, 94, 225, 11, 
-    225, 239, 94, 225, 11, 224, 76, 94, 225, 11, 241, 61, 94, 225, 11, 241, 
-    62, 241, 252, 31, 214, 3, 94, 225, 11, 224, 17, 94, 225, 11, 248, 208, 
-    177, 231, 171, 94, 225, 11, 231, 38, 94, 224, 141, 231, 168, 94, 225, 11, 
-    223, 169, 94, 224, 141, 225, 247, 94, 225, 11, 220, 21, 247, 120, 94, 
-    225, 11, 219, 159, 247, 120, 94, 224, 141, 219, 53, 225, 241, 94, 164, 
-    214, 160, 247, 120, 94, 164, 232, 108, 247, 120, 94, 224, 141, 227, 195, 
-    242, 40, 94, 225, 11, 224, 77, 224, 71, 94, 1, 254, 170, 94, 1, 252, 28, 
-    94, 1, 242, 201, 94, 1, 248, 189, 94, 1, 241, 238, 94, 1, 214, 3, 94, 1, 
-    210, 97, 94, 1, 241, 197, 94, 1, 216, 230, 94, 1, 210, 233, 94, 1, 40, 
-    234, 250, 94, 1, 234, 250, 94, 1, 233, 94, 94, 1, 40, 231, 65, 94, 1, 
-    231, 65, 94, 1, 40, 227, 194, 94, 1, 227, 194, 94, 1, 221, 249, 94, 1, 
-    253, 162, 94, 1, 40, 225, 221, 94, 1, 225, 221, 94, 1, 40, 215, 179, 94, 
-    1, 215, 179, 94, 1, 224, 39, 94, 1, 223, 67, 94, 1, 220, 20, 94, 1, 217, 
-    38, 94, 27, 211, 6, 52, 214, 3, 94, 27, 211, 6, 214, 4, 210, 233, 94, 27, 
-    211, 6, 52, 210, 233, 94, 224, 141, 243, 41, 94, 224, 141, 243, 39, 10, 
-    54, 50, 10, 5, 221, 242, 10, 244, 30, 231, 154, 10, 5, 222, 23, 10, 5, 
-    221, 245, 254, 37, 249, 109, 222, 193, 254, 37, 244, 4, 222, 193, 10, 
-    223, 134, 254, 37, 225, 183, 230, 193, 50, 254, 37, 225, 183, 216, 248, 
-    216, 148, 50, 254, 221, 50, 10, 249, 219, 10, 248, 150, 220, 137, 10, 
-    225, 13, 213, 241, 50, 10, 5, 230, 174, 10, 5, 222, 3, 254, 172, 212, 45, 
-    10, 5, 254, 172, 253, 221, 10, 5, 223, 167, 254, 171, 10, 5, 223, 175, 
-    254, 152, 254, 104, 10, 5, 217, 70, 10, 4, 125, 217, 80, 10, 4, 125, 27, 
-    112, 2, 233, 103, 2, 211, 43, 10, 4, 125, 210, 108, 10, 4, 244, 165, 10, 
-    4, 248, 184, 10, 4, 234, 205, 10, 220, 150, 10, 215, 211, 59, 224, 141, 
-    78, 10, 224, 13, 78, 10, 1, 234, 209, 211, 43, 10, 1, 242, 19, 10, 1, 
-    112, 2, 231, 228, 48, 10, 1, 112, 2, 202, 48, 10, 1, 212, 31, 2, 202, 48, 
-    10, 1, 112, 2, 202, 51, 10, 1, 79, 2, 202, 48, 10, 1, 254, 170, 10, 1, 
-    252, 54, 10, 1, 217, 8, 231, 164, 10, 1, 217, 7, 10, 1, 216, 192, 10, 1, 
-    235, 123, 10, 1, 242, 37, 10, 1, 234, 129, 10, 1, 248, 195, 10, 1, 216, 
-    202, 10, 1, 223, 95, 10, 1, 210, 108, 10, 1, 221, 166, 10, 1, 220, 59, 
-    10, 1, 222, 26, 10, 1, 248, 216, 10, 1, 217, 80, 10, 1, 210, 111, 10, 1, 
-    254, 196, 10, 1, 242, 244, 10, 1, 234, 175, 2, 113, 170, 48, 10, 1, 234, 
-    175, 2, 134, 170, 51, 10, 1, 244, 168, 79, 2, 235, 193, 214, 105, 10, 1, 
-    244, 168, 79, 2, 113, 170, 48, 10, 1, 244, 168, 79, 2, 134, 170, 48, 10, 
-    217, 43, 10, 1, 244, 142, 10, 1, 224, 81, 10, 1, 234, 250, 10, 1, 233, 
-    102, 10, 1, 231, 78, 10, 1, 228, 62, 10, 1, 241, 218, 10, 1, 212, 30, 10, 
-    1, 112, 231, 192, 10, 1, 211, 43, 10, 244, 163, 10, 248, 182, 10, 234, 
-    203, 10, 244, 165, 10, 248, 184, 10, 234, 205, 10, 220, 93, 10, 218, 45, 
-    10, 231, 226, 48, 10, 202, 48, 10, 202, 51, 10, 218, 65, 254, 170, 10, 
-    235, 193, 248, 184, 10, 164, 228, 63, 242, 218, 10, 209, 255, 10, 25, 5, 
-    4, 214, 106, 48, 10, 25, 5, 235, 193, 4, 214, 106, 48, 10, 25, 5, 59, 51, 
-    10, 223, 49, 248, 184, 10, 244, 166, 2, 113, 247, 118, 10, 212, 32, 202, 
-    51, 254, 37, 21, 210, 86, 254, 37, 21, 110, 254, 37, 21, 105, 254, 37, 
-    21, 158, 254, 37, 21, 161, 254, 37, 21, 189, 254, 37, 21, 194, 254, 37, 
-    21, 198, 254, 37, 21, 195, 254, 37, 21, 200, 10, 225, 182, 50, 10, 248, 
-    83, 220, 137, 10, 216, 146, 220, 137, 10, 244, 81, 225, 9, 218, 156, 10, 
-    1, 247, 119, 252, 54, 10, 1, 247, 119, 224, 81, 10, 1, 218, 23, 254, 170, 
-    10, 1, 112, 212, 46, 10, 1, 112, 2, 212, 32, 202, 48, 10, 1, 112, 2, 212, 
-    32, 202, 51, 10, 1, 125, 242, 19, 10, 1, 125, 202, 254, 170, 10, 1, 125, 
-    202, 212, 30, 10, 1, 104, 2, 202, 48, 10, 1, 125, 202, 211, 43, 10, 1, 
-    215, 148, 10, 1, 215, 146, 10, 1, 252, 64, 10, 1, 217, 8, 2, 222, 233, 
-    10, 1, 217, 8, 2, 134, 170, 77, 246, 103, 10, 1, 225, 205, 10, 1, 217, 5, 
-    10, 1, 252, 52, 10, 1, 122, 2, 202, 48, 10, 1, 122, 2, 113, 170, 67, 48, 
-    10, 1, 227, 153, 10, 1, 246, 43, 10, 1, 122, 2, 134, 170, 48, 10, 1, 217, 
-    26, 10, 1, 217, 24, 10, 1, 248, 130, 10, 1, 248, 196, 2, 222, 233, 10, 1, 
-    248, 196, 2, 59, 51, 10, 1, 248, 196, 2, 59, 252, 43, 22, 4, 217, 80, 10, 
-    1, 248, 201, 10, 1, 248, 132, 10, 1, 246, 70, 10, 1, 248, 196, 2, 134, 
-    170, 77, 246, 103, 10, 1, 248, 196, 2, 244, 11, 170, 48, 10, 1, 222, 171, 
-    10, 1, 223, 96, 2, 4, 214, 105, 10, 1, 223, 96, 2, 222, 233, 10, 1, 223, 
-    96, 2, 59, 51, 10, 1, 223, 96, 2, 4, 214, 106, 51, 10, 1, 223, 96, 2, 59, 
-    252, 43, 22, 59, 48, 10, 1, 223, 96, 2, 113, 170, 48, 10, 1, 235, 120, 
-    10, 1, 223, 96, 2, 244, 11, 170, 48, 10, 1, 221, 167, 2, 59, 252, 43, 22, 
-    59, 48, 10, 1, 221, 167, 2, 134, 170, 51, 10, 1, 221, 167, 2, 134, 170, 
-    252, 43, 22, 134, 170, 48, 10, 1, 222, 27, 2, 113, 170, 51, 10, 1, 222, 
-    27, 2, 134, 170, 48, 10, 1, 217, 81, 2, 134, 170, 48, 10, 1, 254, 197, 2, 
-    134, 170, 48, 10, 1, 247, 119, 244, 142, 10, 1, 244, 143, 2, 59, 230, 
-    109, 51, 10, 1, 244, 143, 2, 59, 51, 10, 1, 213, 248, 10, 1, 244, 143, 2, 
-    134, 170, 51, 10, 1, 225, 203, 10, 1, 224, 82, 2, 59, 48, 10, 1, 224, 82, 
-    2, 134, 170, 48, 10, 1, 234, 174, 10, 1, 217, 250, 234, 250, 10, 1, 234, 
-    251, 2, 222, 233, 10, 1, 234, 251, 2, 59, 48, 10, 1, 229, 79, 10, 1, 234, 
-    251, 2, 134, 170, 51, 10, 1, 243, 122, 10, 1, 243, 123, 2, 222, 233, 10, 
-    1, 229, 2, 10, 1, 243, 123, 2, 113, 170, 51, 10, 1, 242, 101, 10, 1, 243, 
-    123, 2, 134, 170, 48, 10, 1, 233, 103, 2, 4, 214, 105, 10, 1, 233, 103, 
-    2, 59, 48, 10, 1, 233, 103, 2, 134, 170, 48, 10, 1, 233, 103, 2, 134, 
-    170, 51, 10, 1, 228, 63, 2, 59, 51, 10, 1, 228, 63, 242, 218, 10, 1, 222, 
-    214, 10, 1, 228, 63, 2, 222, 233, 10, 1, 228, 63, 2, 134, 170, 48, 10, 1, 
-    241, 219, 247, 141, 10, 1, 217, 27, 2, 59, 48, 10, 1, 241, 219, 2, 79, 
-    48, 10, 1, 241, 219, 242, 171, 10, 1, 241, 219, 242, 172, 2, 202, 48, 10, 
-    1, 217, 8, 231, 165, 242, 171, 10, 1, 212, 31, 2, 222, 233, 10, 1, 234, 
-    73, 226, 234, 10, 1, 226, 234, 10, 1, 70, 10, 1, 210, 212, 10, 1, 234, 
-    73, 210, 212, 10, 1, 212, 31, 2, 113, 170, 48, 10, 1, 213, 255, 10, 1, 
-    244, 168, 211, 43, 10, 1, 79, 2, 217, 77, 10, 1, 79, 2, 4, 214, 105, 10, 
-    1, 212, 31, 2, 59, 48, 10, 1, 75, 10, 1, 79, 2, 134, 170, 51, 10, 1, 79, 
-    252, 132, 10, 1, 79, 252, 133, 2, 202, 48, 10, 243, 229, 218, 129, 10, 1, 
-    254, 243, 10, 4, 125, 27, 222, 27, 2, 233, 103, 2, 112, 231, 192, 10, 4, 
-    125, 27, 224, 82, 2, 233, 103, 2, 112, 231, 192, 10, 4, 125, 66, 65, 17, 
-    10, 4, 125, 233, 103, 254, 170, 10, 4, 125, 235, 123, 10, 4, 125, 134, 
-    247, 118, 10, 4, 125, 221, 166, 10, 245, 143, 64, 253, 166, 10, 218, 152, 
-    64, 222, 138, 245, 175, 241, 155, 10, 4, 125, 222, 183, 210, 86, 10, 4, 
-    125, 214, 159, 223, 115, 210, 86, 10, 4, 125, 247, 119, 241, 236, 64, 
-    234, 129, 10, 4, 125, 66, 53, 17, 10, 4, 121, 221, 166, 10, 4, 125, 231, 
-    227, 10, 4, 212, 30, 10, 4, 211, 43, 10, 4, 125, 211, 43, 10, 4, 125, 
-    228, 62, 10, 225, 41, 64, 222, 13, 10, 245, 152, 250, 175, 121, 218, 129, 
-    10, 245, 152, 250, 175, 125, 218, 129, 10, 222, 183, 125, 218, 130, 2, 
-    244, 104, 250, 174, 10, 4, 121, 231, 78, 10, 1, 248, 196, 2, 235, 193, 
-    214, 105, 10, 1, 223, 96, 2, 235, 193, 214, 105, 245, 22, 254, 37, 21, 
-    210, 86, 245, 22, 254, 37, 21, 110, 245, 22, 254, 37, 21, 105, 245, 22, 
-    254, 37, 21, 158, 245, 22, 254, 37, 21, 161, 245, 22, 254, 37, 21, 189, 
-    245, 22, 254, 37, 21, 194, 245, 22, 254, 37, 21, 198, 245, 22, 254, 37, 
-    21, 195, 245, 22, 254, 37, 21, 200, 10, 1, 220, 60, 2, 59, 51, 10, 1, 
-    248, 217, 2, 59, 51, 10, 1, 242, 245, 2, 59, 51, 10, 5, 219, 158, 254, 
-    126, 10, 5, 219, 158, 224, 235, 231, 58, 10, 1, 241, 219, 2, 235, 193, 
-    214, 105, 188, 245, 143, 64, 226, 14, 188, 218, 19, 243, 229, 218, 129, 
-    188, 218, 67, 243, 229, 218, 129, 188, 218, 19, 249, 226, 188, 218, 67, 
-    249, 226, 188, 203, 249, 226, 188, 249, 227, 219, 106, 233, 46, 188, 249, 
-    227, 219, 106, 222, 251, 188, 218, 19, 249, 227, 219, 106, 233, 46, 188, 
-    218, 67, 249, 227, 219, 106, 222, 251, 188, 249, 180, 188, 242, 1, 226, 
-    250, 188, 242, 1, 231, 36, 188, 242, 1, 253, 218, 188, 255, 21, 78, 188, 
-    1, 254, 174, 188, 1, 218, 23, 254, 174, 188, 1, 252, 25, 188, 1, 243, 
-    113, 188, 1, 243, 114, 243, 91, 188, 1, 248, 192, 188, 1, 247, 119, 248, 
-    193, 222, 229, 188, 1, 241, 238, 188, 1, 212, 30, 188, 1, 210, 108, 188, 
-    1, 241, 195, 188, 1, 216, 226, 188, 1, 216, 227, 243, 91, 188, 1, 210, 
-    199, 188, 1, 210, 200, 241, 238, 188, 1, 234, 225, 188, 1, 233, 101, 188, 
-    1, 230, 190, 188, 1, 227, 194, 188, 1, 220, 143, 188, 1, 40, 220, 143, 
-    188, 1, 75, 188, 1, 225, 221, 188, 1, 223, 49, 225, 221, 188, 1, 222, 24, 
-    188, 1, 224, 75, 188, 1, 222, 229, 188, 1, 220, 20, 188, 1, 217, 36, 188, 
-    1, 225, 169, 252, 12, 188, 1, 225, 169, 242, 242, 188, 1, 225, 169, 248, 
-    20, 188, 224, 151, 48, 188, 224, 151, 51, 188, 224, 151, 246, 117, 188, 
-    210, 17, 48, 188, 210, 17, 51, 188, 210, 17, 246, 117, 188, 223, 131, 48, 
-    188, 223, 131, 51, 188, 246, 118, 210, 24, 241, 44, 188, 246, 118, 210, 
-    24, 254, 105, 188, 241, 241, 48, 188, 241, 241, 51, 188, 241, 240, 246, 
-    117, 188, 245, 79, 48, 188, 245, 79, 51, 188, 222, 107, 188, 244, 136, 
-    247, 120, 188, 223, 248, 188, 222, 134, 188, 113, 67, 170, 48, 188, 113, 
-    67, 170, 51, 188, 134, 170, 48, 188, 134, 170, 51, 188, 226, 248, 232, 
-    214, 48, 188, 226, 248, 232, 214, 51, 188, 230, 56, 188, 252, 131, 188, 
-    1, 219, 49, 210, 80, 188, 1, 219, 49, 234, 122, 188, 1, 219, 49, 244, 
-    154, 10, 1, 252, 55, 2, 134, 170, 240, 250, 51, 10, 1, 252, 55, 2, 59, 
-    252, 43, 22, 134, 170, 48, 10, 1, 252, 55, 2, 134, 170, 225, 7, 214, 153, 
-    51, 10, 1, 252, 55, 2, 134, 170, 225, 7, 214, 153, 252, 43, 22, 113, 170, 
-    48, 10, 1, 252, 55, 2, 113, 170, 252, 43, 22, 59, 48, 10, 1, 252, 55, 2, 
-    235, 193, 4, 214, 106, 51, 10, 1, 252, 55, 2, 4, 214, 105, 10, 1, 122, 2, 
-    113, 170, 48, 10, 1, 122, 2, 134, 170, 225, 7, 214, 153, 51, 10, 1, 248, 
-    196, 2, 113, 170, 213, 189, 252, 43, 22, 4, 217, 80, 10, 1, 248, 196, 2, 
-    235, 193, 4, 214, 106, 51, 10, 1, 223, 96, 2, 91, 10, 1, 221, 167, 2, 
-    244, 11, 170, 48, 10, 1, 254, 197, 2, 113, 170, 48, 10, 1, 254, 197, 2, 
-    134, 170, 225, 7, 246, 104, 48, 10, 1, 254, 197, 2, 113, 170, 213, 189, 
-    48, 10, 1, 244, 143, 2, 113, 170, 51, 10, 1, 244, 143, 2, 134, 170, 225, 
-    7, 214, 153, 51, 10, 1, 234, 175, 2, 59, 48, 10, 1, 234, 175, 2, 134, 
-    170, 48, 10, 1, 234, 175, 2, 134, 170, 225, 7, 214, 153, 51, 10, 1, 66, 
-    2, 59, 48, 10, 1, 66, 2, 59, 51, 10, 1, 228, 63, 2, 113, 170, 51, 10, 1, 
-    228, 63, 2, 4, 217, 80, 10, 1, 228, 63, 2, 4, 214, 105, 10, 1, 233, 103, 
-    2, 130, 10, 1, 223, 96, 2, 113, 170, 213, 189, 48, 10, 1, 223, 96, 2, 
-    202, 48, 10, 1, 221, 167, 2, 113, 170, 213, 189, 48, 10, 1, 122, 2, 4, 
-    10, 1, 217, 81, 51, 10, 1, 122, 2, 4, 10, 1, 217, 81, 22, 113, 247, 118, 
-    10, 1, 221, 167, 2, 4, 10, 1, 217, 81, 22, 113, 247, 118, 10, 1, 223, 96, 
-    2, 4, 10, 1, 217, 81, 22, 113, 247, 118, 10, 1, 122, 2, 4, 10, 1, 217, 
-    81, 48, 10, 1, 112, 2, 245, 22, 254, 37, 21, 113, 48, 10, 1, 112, 2, 245, 
-    22, 254, 37, 21, 134, 48, 10, 1, 244, 168, 79, 2, 245, 22, 254, 37, 21, 
-    113, 48, 10, 1, 244, 168, 79, 2, 245, 22, 254, 37, 21, 134, 48, 10, 1, 
-    244, 168, 79, 2, 245, 22, 254, 37, 21, 244, 11, 51, 10, 1, 212, 31, 2, 
-    245, 22, 254, 37, 21, 113, 48, 10, 1, 212, 31, 2, 245, 22, 254, 37, 21, 
-    134, 48, 10, 1, 79, 252, 133, 2, 245, 22, 254, 37, 21, 113, 48, 10, 1, 
-    79, 252, 133, 2, 245, 22, 254, 37, 21, 134, 48, 10, 1, 122, 2, 245, 22, 
-    254, 37, 21, 244, 11, 51, 10, 1, 221, 167, 2, 245, 22, 254, 37, 21, 244, 
-    11, 48, 10, 1, 221, 167, 2, 235, 193, 214, 105, 10, 1, 234, 251, 2, 113, 
-    170, 48, 216, 205, 1, 242, 46, 216, 205, 1, 220, 68, 216, 205, 1, 228, 
-    61, 216, 205, 1, 223, 184, 216, 205, 1, 252, 189, 216, 205, 1, 232, 251, 
-    216, 205, 1, 235, 8, 216, 205, 1, 254, 159, 216, 205, 1, 214, 25, 216, 
-    205, 1, 231, 77, 216, 205, 1, 244, 194, 216, 205, 1, 248, 23, 216, 205, 
-    1, 216, 207, 216, 205, 1, 233, 131, 216, 205, 1, 243, 131, 216, 205, 1, 
-    242, 177, 216, 205, 1, 221, 165, 216, 205, 1, 248, 148, 216, 205, 1, 210, 
-    100, 216, 205, 1, 217, 37, 216, 205, 1, 211, 103, 216, 205, 1, 225, 233, 
-    216, 205, 1, 235, 128, 216, 205, 1, 250, 134, 216, 205, 1, 215, 155, 216, 
-    205, 1, 241, 188, 216, 205, 1, 234, 131, 216, 205, 1, 216, 206, 216, 205, 
-    1, 210, 115, 216, 205, 1, 220, 58, 216, 205, 1, 222, 30, 216, 205, 1, 
-    248, 219, 216, 205, 1, 111, 216, 205, 1, 210, 23, 216, 205, 1, 254, 193, 
-    216, 205, 1, 242, 243, 216, 205, 1, 224, 85, 216, 205, 1, 212, 63, 216, 
-    205, 255, 22, 216, 205, 255, 38, 216, 205, 240, 114, 216, 205, 245, 208, 
-    216, 205, 214, 222, 216, 205, 226, 182, 216, 205, 245, 216, 216, 205, 
-    245, 16, 216, 205, 226, 247, 216, 205, 226, 255, 216, 205, 218, 45, 216, 
-    205, 1, 229, 225, 228, 137, 21, 210, 86, 228, 137, 21, 110, 228, 137, 21, 
-    105, 228, 137, 21, 158, 228, 137, 21, 161, 228, 137, 21, 189, 228, 137, 
-    21, 194, 228, 137, 21, 198, 228, 137, 21, 195, 228, 137, 21, 200, 228, 
-    137, 1, 61, 228, 137, 1, 245, 209, 228, 137, 1, 73, 228, 137, 1, 75, 228, 
-    137, 1, 70, 228, 137, 1, 226, 183, 228, 137, 1, 76, 228, 137, 1, 248, 
-    209, 228, 137, 1, 230, 25, 228, 137, 1, 252, 191, 228, 137, 1, 190, 228, 
-    137, 1, 217, 105, 228, 137, 1, 235, 141, 228, 137, 1, 250, 157, 228, 137, 
-    1, 248, 221, 228, 137, 1, 205, 228, 137, 1, 222, 179, 228, 137, 1, 206, 
-    228, 137, 1, 243, 79, 228, 137, 1, 244, 196, 228, 137, 1, 176, 228, 137, 
-    1, 233, 135, 228, 137, 1, 229, 229, 211, 223, 228, 137, 1, 184, 228, 137, 
-    1, 227, 165, 228, 137, 1, 197, 228, 137, 1, 162, 228, 137, 1, 212, 65, 
-    228, 137, 1, 191, 228, 137, 1, 227, 166, 211, 223, 228, 137, 1, 235, 61, 
-    235, 141, 228, 137, 1, 235, 61, 250, 157, 228, 137, 1, 235, 61, 205, 228, 
-    137, 38, 219, 251, 125, 216, 30, 228, 137, 38, 219, 251, 121, 216, 30, 
-    228, 137, 38, 219, 251, 222, 228, 216, 30, 228, 137, 38, 199, 248, 38, 
-    216, 30, 228, 137, 38, 199, 125, 216, 30, 228, 137, 38, 199, 121, 216, 
-    30, 228, 137, 38, 199, 222, 228, 216, 30, 228, 137, 38, 229, 193, 78, 
-    228, 137, 38, 52, 59, 48, 228, 137, 125, 138, 254, 57, 228, 137, 121, 
-    138, 254, 57, 228, 137, 16, 226, 184, 248, 50, 228, 137, 16, 243, 78, 
-    228, 137, 249, 219, 228, 137, 245, 31, 78, 228, 137, 233, 108, 221, 252, 
-    1, 254, 176, 221, 252, 1, 251, 228, 221, 252, 1, 243, 112, 221, 252, 1, 
-    248, 194, 221, 252, 1, 235, 152, 221, 252, 1, 252, 189, 221, 252, 1, 210, 
-    89, 221, 252, 1, 235, 160, 221, 252, 1, 216, 67, 221, 252, 1, 210, 182, 
-    221, 252, 1, 235, 9, 221, 252, 1, 233, 128, 221, 252, 1, 230, 190, 221, 
-    252, 1, 227, 194, 221, 252, 1, 219, 156, 221, 252, 1, 235, 255, 221, 252, 
-    1, 244, 121, 221, 252, 1, 215, 181, 221, 252, 1, 224, 10, 221, 252, 1, 
-    222, 229, 221, 252, 1, 220, 85, 221, 252, 1, 217, 100, 221, 252, 164, 
-    235, 255, 221, 252, 164, 235, 254, 221, 252, 164, 226, 243, 221, 252, 
-    164, 248, 207, 221, 252, 58, 1, 245, 105, 210, 182, 221, 252, 164, 245, 
-    105, 210, 182, 221, 252, 25, 5, 199, 75, 221, 252, 25, 5, 75, 221, 252, 
-    25, 5, 226, 118, 255, 73, 221, 252, 25, 5, 199, 255, 73, 221, 252, 25, 5, 
-    255, 73, 221, 252, 25, 5, 226, 118, 61, 221, 252, 25, 5, 199, 61, 221, 
-    252, 25, 5, 61, 221, 252, 58, 1, 219, 251, 61, 221, 252, 25, 5, 219, 251, 
-    61, 221, 252, 25, 5, 199, 70, 221, 252, 25, 5, 70, 221, 252, 58, 1, 73, 
-    221, 252, 25, 5, 199, 73, 221, 252, 25, 5, 73, 221, 252, 25, 5, 76, 221, 
-    252, 25, 5, 218, 45, 221, 252, 164, 229, 92, 221, 252, 224, 141, 229, 92, 
-    221, 252, 224, 141, 254, 218, 221, 252, 224, 141, 254, 114, 221, 252, 
-    224, 141, 252, 114, 221, 252, 224, 141, 253, 201, 221, 252, 224, 141, 
-    220, 8, 221, 252, 255, 21, 78, 221, 252, 224, 141, 231, 68, 224, 45, 221, 
-    252, 224, 141, 210, 31, 221, 252, 224, 141, 224, 45, 221, 252, 224, 141, 
-    210, 114, 221, 252, 224, 141, 215, 90, 221, 252, 224, 141, 254, 9, 221, 
-    252, 224, 141, 219, 53, 231, 145, 221, 252, 224, 141, 254, 100, 231, 182, 
-    1, 242, 24, 231, 182, 1, 255, 25, 231, 182, 1, 254, 216, 231, 182, 1, 
-    254, 255, 231, 182, 1, 254, 209, 231, 182, 1, 214, 124, 231, 182, 1, 253, 
-    160, 231, 182, 1, 235, 160, 231, 182, 1, 253, 198, 231, 182, 1, 254, 181, 
-    231, 182, 1, 254, 186, 231, 182, 1, 254, 178, 231, 182, 1, 254, 136, 231, 
-    182, 1, 254, 123, 231, 182, 1, 253, 237, 231, 182, 1, 235, 255, 231, 182, 
-    1, 254, 72, 231, 182, 1, 253, 208, 231, 182, 1, 254, 45, 231, 182, 1, 
-    254, 41, 231, 182, 1, 253, 231, 231, 182, 1, 253, 206, 231, 182, 1, 246, 
-    55, 231, 182, 1, 235, 2, 231, 182, 1, 254, 196, 231, 182, 254, 222, 78, 
-    231, 182, 213, 136, 78, 231, 182, 243, 53, 78, 231, 182, 224, 140, 10, 1, 
-    252, 55, 2, 4, 214, 106, 51, 10, 1, 151, 2, 113, 170, 48, 10, 1, 217, 81, 
-    2, 113, 170, 48, 10, 1, 244, 143, 2, 59, 252, 43, 22, 134, 170, 48, 10, 
-    1, 224, 82, 2, 59, 51, 10, 1, 233, 103, 2, 52, 130, 10, 1, 66, 2, 134, 
-    170, 48, 10, 1, 79, 2, 113, 170, 252, 43, 22, 202, 48, 10, 1, 79, 2, 113, 
-    170, 252, 43, 22, 59, 48, 10, 1, 223, 96, 2, 232, 123, 10, 1, 212, 31, 2, 
-    59, 211, 231, 10, 1, 222, 201, 211, 43, 10, 249, 99, 244, 165, 10, 249, 
-    99, 248, 184, 10, 249, 99, 234, 205, 10, 249, 99, 244, 163, 10, 249, 99, 
-    248, 182, 10, 249, 99, 234, 203, 10, 138, 123, 59, 48, 10, 138, 113, 170, 
-    48, 10, 138, 232, 124, 48, 10, 138, 123, 59, 51, 10, 138, 113, 170, 51, 
-    10, 138, 232, 124, 51, 10, 204, 244, 163, 10, 204, 248, 182, 10, 204, 
-    234, 203, 10, 4, 125, 212, 30, 10, 244, 166, 2, 222, 233, 10, 244, 166, 
-    2, 59, 48, 10, 234, 206, 2, 59, 51, 10, 43, 253, 250, 48, 10, 44, 253, 
-    250, 48, 10, 43, 253, 250, 51, 10, 44, 253, 250, 51, 10, 52, 44, 253, 
-    250, 48, 10, 52, 44, 253, 250, 77, 2, 247, 120, 10, 44, 253, 250, 77, 2, 
-    247, 120, 10, 248, 185, 2, 247, 120, 84, 5, 235, 193, 250, 255, 84, 5, 
-    250, 255, 84, 5, 254, 75, 84, 5, 213, 147, 84, 1, 219, 251, 61, 84, 1, 
-    61, 84, 1, 255, 73, 84, 1, 73, 84, 1, 236, 33, 84, 1, 70, 84, 1, 214, 
-    118, 84, 1, 149, 153, 84, 1, 149, 156, 84, 1, 251, 2, 75, 84, 1, 219, 
-    251, 75, 84, 1, 75, 84, 1, 254, 201, 84, 1, 251, 2, 76, 84, 1, 219, 251, 
-    76, 84, 1, 76, 84, 1, 253, 192, 84, 1, 176, 84, 1, 234, 132, 84, 1, 243, 
-    135, 84, 1, 242, 249, 84, 1, 229, 77, 84, 1, 251, 33, 84, 1, 250, 157, 
-    84, 1, 235, 141, 84, 1, 235, 114, 84, 1, 227, 165, 84, 1, 215, 156, 84, 
-    1, 215, 144, 84, 1, 248, 135, 84, 1, 248, 119, 84, 1, 228, 110, 84, 1, 
-    217, 105, 84, 1, 216, 208, 84, 1, 248, 221, 84, 1, 248, 25, 84, 1, 197, 
-    84, 1, 228, 92, 84, 1, 190, 84, 1, 225, 147, 84, 1, 252, 191, 84, 1, 252, 
-    18, 84, 1, 184, 84, 1, 191, 84, 1, 205, 84, 1, 222, 179, 84, 1, 233, 135, 
-    84, 1, 232, 184, 84, 1, 232, 175, 84, 1, 214, 27, 84, 1, 220, 102, 84, 1, 
-    218, 223, 84, 1, 206, 84, 1, 162, 84, 25, 5, 226, 234, 84, 25, 5, 226, 
-    181, 84, 5, 227, 205, 84, 5, 253, 175, 84, 25, 5, 255, 73, 84, 25, 5, 73, 
-    84, 25, 5, 236, 33, 84, 25, 5, 70, 84, 25, 5, 214, 118, 84, 25, 5, 149, 
-    153, 84, 25, 5, 149, 222, 180, 84, 25, 5, 251, 2, 75, 84, 25, 5, 219, 
-    251, 75, 84, 25, 5, 75, 84, 25, 5, 254, 201, 84, 25, 5, 251, 2, 76, 84, 
-    25, 5, 219, 251, 76, 84, 25, 5, 76, 84, 25, 5, 253, 192, 84, 5, 213, 152, 
-    84, 25, 5, 224, 185, 75, 84, 25, 5, 253, 171, 84, 226, 204, 84, 218, 111, 
-    5, 214, 216, 84, 218, 111, 5, 254, 77, 84, 242, 137, 255, 14, 84, 255, 3, 
-    255, 14, 84, 25, 5, 251, 2, 199, 75, 84, 25, 5, 214, 214, 84, 25, 5, 214, 
-    117, 84, 1, 224, 88, 84, 1, 234, 115, 84, 1, 242, 226, 84, 1, 210, 116, 
-    84, 1, 248, 124, 84, 1, 223, 39, 84, 1, 244, 196, 84, 1, 210, 168, 84, 1, 
-    149, 222, 180, 84, 1, 149, 232, 185, 84, 25, 5, 149, 156, 84, 25, 5, 149, 
-    232, 185, 84, 248, 178, 84, 52, 248, 178, 84, 21, 210, 86, 84, 21, 110, 
-    84, 21, 105, 84, 21, 158, 84, 21, 161, 84, 21, 189, 84, 21, 194, 84, 21, 
-    198, 84, 21, 195, 84, 21, 200, 84, 255, 21, 50, 84, 5, 125, 219, 17, 247, 
-    120, 84, 1, 251, 2, 61, 84, 1, 226, 234, 84, 1, 226, 181, 84, 1, 253, 
-    171, 84, 1, 214, 214, 84, 1, 214, 117, 84, 1, 210, 82, 84, 1, 114, 191, 
-    84, 1, 243, 29, 84, 1, 235, 96, 84, 1, 242, 180, 218, 129, 84, 1, 248, 
-    125, 84, 1, 252, 111, 146, 5, 250, 255, 146, 5, 254, 75, 146, 5, 213, 
-    147, 146, 1, 61, 146, 1, 255, 73, 146, 1, 73, 146, 1, 236, 33, 146, 1, 
-    70, 146, 1, 214, 118, 146, 1, 149, 153, 146, 1, 149, 156, 146, 1, 75, 
-    146, 1, 254, 201, 146, 1, 76, 146, 1, 253, 192, 146, 1, 176, 146, 1, 234, 
-    132, 146, 1, 243, 135, 146, 1, 242, 249, 146, 1, 229, 77, 146, 1, 251, 
-    33, 146, 1, 250, 157, 146, 1, 235, 141, 146, 1, 235, 114, 146, 1, 227, 
-    165, 146, 1, 215, 156, 146, 1, 215, 144, 146, 1, 248, 135, 146, 1, 248, 
-    119, 146, 1, 228, 110, 146, 1, 217, 105, 146, 1, 216, 208, 146, 1, 248, 
-    221, 146, 1, 248, 25, 146, 1, 197, 146, 1, 190, 146, 1, 225, 147, 146, 1, 
-    252, 191, 146, 1, 252, 18, 146, 1, 184, 146, 1, 191, 146, 1, 205, 146, 1, 
-    233, 135, 146, 1, 220, 102, 146, 1, 218, 223, 146, 1, 206, 146, 1, 162, 
-    146, 5, 227, 205, 146, 5, 253, 175, 146, 25, 5, 255, 73, 146, 25, 5, 73, 
-    146, 25, 5, 236, 33, 146, 25, 5, 70, 146, 25, 5, 214, 118, 146, 25, 5, 
-    149, 153, 146, 25, 5, 149, 222, 180, 146, 25, 5, 75, 146, 25, 5, 254, 
-    201, 146, 25, 5, 76, 146, 25, 5, 253, 192, 146, 5, 213, 152, 146, 1, 234, 
-    124, 217, 105, 146, 253, 193, 233, 23, 78, 146, 1, 222, 179, 146, 1, 223, 
-    39, 146, 1, 210, 168, 146, 1, 149, 222, 180, 146, 1, 149, 232, 185, 146, 
-    25, 5, 149, 156, 146, 25, 5, 149, 232, 185, 146, 21, 210, 86, 146, 21, 
-    110, 146, 21, 105, 146, 21, 158, 146, 21, 161, 146, 21, 189, 146, 21, 
-    194, 146, 21, 198, 146, 21, 195, 146, 21, 200, 146, 1, 223, 188, 2, 230, 
-    224, 247, 254, 146, 1, 223, 188, 2, 232, 108, 247, 254, 146, 222, 118, 
-    78, 146, 222, 118, 50, 146, 249, 98, 227, 197, 110, 146, 249, 98, 227, 
-    197, 105, 146, 249, 98, 227, 197, 158, 146, 249, 98, 227, 197, 161, 146, 
-    249, 98, 227, 197, 123, 233, 16, 216, 201, 216, 196, 248, 48, 146, 249, 
-    98, 248, 49, 219, 119, 146, 235, 161, 146, 243, 103, 78, 183, 5, 254, 
-    254, 251, 243, 183, 5, 251, 243, 183, 5, 213, 147, 183, 1, 61, 183, 1, 
-    255, 73, 183, 1, 73, 183, 1, 236, 33, 183, 1, 70, 183, 1, 214, 118, 183, 
-    1, 245, 209, 183, 1, 254, 201, 183, 1, 226, 183, 183, 1, 253, 192, 183, 
-    1, 176, 183, 1, 234, 132, 183, 1, 243, 135, 183, 1, 242, 249, 183, 1, 
-    229, 77, 183, 1, 251, 33, 183, 1, 250, 157, 183, 1, 235, 141, 183, 1, 
-    235, 114, 183, 1, 227, 165, 183, 1, 215, 156, 183, 1, 215, 144, 183, 1, 
-    248, 135, 183, 1, 248, 119, 183, 1, 228, 110, 183, 1, 217, 105, 183, 1, 
-    216, 208, 183, 1, 248, 221, 183, 1, 248, 25, 183, 1, 197, 183, 1, 190, 
-    183, 1, 225, 147, 183, 1, 252, 191, 183, 1, 252, 18, 183, 1, 184, 183, 1, 
-    191, 183, 1, 205, 183, 1, 233, 135, 183, 1, 232, 184, 183, 1, 214, 27, 
-    183, 1, 220, 102, 183, 1, 206, 183, 1, 162, 183, 5, 227, 205, 183, 25, 5, 
-    255, 73, 183, 25, 5, 73, 183, 25, 5, 236, 33, 183, 25, 5, 70, 183, 25, 5, 
-    214, 118, 183, 25, 5, 245, 209, 183, 25, 5, 254, 201, 183, 25, 5, 226, 
-    183, 183, 25, 5, 253, 192, 183, 5, 213, 152, 183, 5, 214, 218, 183, 1, 
-    234, 115, 183, 1, 242, 226, 183, 1, 210, 116, 183, 1, 222, 179, 183, 1, 
-    244, 196, 183, 21, 210, 86, 183, 21, 110, 183, 21, 105, 183, 21, 158, 
-    183, 21, 161, 183, 21, 189, 183, 21, 194, 183, 21, 198, 183, 21, 195, 
-    183, 21, 200, 183, 216, 74, 183, 254, 253, 183, 235, 178, 183, 214, 146, 
-    183, 245, 181, 226, 188, 183, 5, 211, 78, 171, 5, 250, 255, 171, 5, 254, 
-    75, 171, 5, 213, 147, 171, 1, 61, 171, 1, 255, 73, 171, 1, 73, 171, 1, 
-    236, 33, 171, 1, 70, 171, 1, 214, 118, 171, 1, 149, 153, 171, 1, 149, 
-    156, 171, 25, 251, 2, 75, 171, 1, 75, 171, 1, 254, 201, 171, 25, 251, 2, 
-    76, 171, 1, 76, 171, 1, 253, 192, 171, 1, 176, 171, 1, 234, 132, 171, 1, 
-    243, 135, 171, 1, 242, 249, 171, 1, 229, 77, 171, 1, 251, 33, 171, 1, 
-    250, 157, 171, 1, 235, 141, 171, 1, 235, 114, 171, 1, 227, 165, 171, 1, 
-    215, 156, 171, 1, 215, 144, 171, 1, 248, 135, 171, 1, 248, 119, 171, 1, 
-    228, 110, 171, 1, 217, 105, 171, 1, 216, 208, 171, 1, 248, 221, 171, 1, 
-    248, 25, 171, 1, 197, 171, 1, 190, 171, 1, 225, 147, 171, 1, 252, 191, 
-    171, 1, 252, 18, 171, 1, 184, 171, 1, 191, 171, 1, 205, 171, 1, 233, 135, 
-    171, 1, 232, 184, 171, 1, 214, 27, 171, 1, 220, 102, 171, 1, 218, 223, 
-    171, 1, 206, 171, 1, 162, 171, 5, 227, 205, 171, 5, 253, 175, 171, 25, 5, 
-    255, 73, 171, 25, 5, 73, 171, 25, 5, 236, 33, 171, 25, 5, 70, 171, 25, 5, 
-    214, 118, 171, 25, 5, 149, 153, 171, 25, 5, 149, 222, 180, 171, 25, 5, 
-    251, 2, 75, 171, 25, 5, 75, 171, 25, 5, 254, 201, 171, 25, 5, 251, 2, 76, 
-    171, 25, 5, 76, 171, 25, 5, 253, 192, 171, 5, 213, 152, 171, 226, 204, 
-    171, 1, 149, 222, 180, 171, 1, 149, 232, 185, 171, 25, 5, 149, 156, 171, 
-    25, 5, 149, 232, 185, 171, 21, 210, 86, 171, 21, 110, 171, 21, 105, 171, 
+    6, 1, 210, 159, 43, 42, 127, 223, 51, 219, 47, 44, 42, 127, 250, 32, 255, 
+    15, 121, 232, 214, 242, 138, 255, 15, 7, 4, 1, 61, 7, 4, 1, 253, 159, 7, 
+    4, 1, 251, 67, 7, 4, 1, 249, 61, 7, 4, 1, 75, 7, 4, 1, 245, 7, 7, 4, 1, 
+    243, 203, 7, 4, 1, 242, 61, 7, 4, 1, 73, 7, 4, 1, 235, 145, 7, 4, 1, 235, 
+    24, 7, 4, 1, 156, 7, 4, 1, 193, 7, 4, 1, 230, 26, 7, 4, 1, 76, 7, 4, 1, 
+    226, 106, 7, 4, 1, 224, 97, 7, 4, 1, 153, 7, 4, 1, 222, 92, 7, 4, 1, 217, 
+    153, 7, 4, 1, 70, 7, 4, 1, 214, 105, 7, 4, 1, 212, 98, 7, 4, 1, 211, 178, 
+    7, 4, 1, 211, 117, 7, 4, 1, 210, 159, 43, 249, 100, 127, 67, 232, 214, 
+    44, 249, 100, 127, 183, 228, 74, 219, 19, 235, 194, 245, 32, 78, 250, 
+    177, 50, 224, 229, 50, 249, 99, 50, 211, 40, 50, 251, 136, 130, 221, 174, 
+    50, 248, 2, 249, 164, 50, 244, 137, 226, 155, 235, 239, 233, 43, 52, 254, 
+    111, 223, 255, 78, 228, 53, 50, 219, 53, 240, 169, 223, 103, 50, 231, 
+    233, 248, 72, 50, 225, 22, 50, 218, 24, 105, 218, 24, 158, 255, 4, 255, 
+    15, 230, 229, 50, 225, 69, 50, 230, 225, 247, 121, 250, 184, 218, 24, 
+    110, 231, 149, 226, 155, 235, 239, 222, 248, 52, 254, 111, 223, 255, 78, 
+    212, 114, 244, 3, 123, 224, 22, 212, 114, 244, 3, 123, 242, 28, 212, 114, 
+    244, 3, 134, 224, 20, 235, 194, 224, 14, 78, 7, 6, 1, 115, 2, 242, 137, 
+    7, 6, 1, 115, 2, 142, 7, 6, 1, 115, 2, 250, 31, 7, 6, 1, 115, 2, 183, 7, 
+    6, 1, 115, 2, 248, 2, 7, 6, 1, 115, 2, 222, 235, 48, 7, 6, 1, 254, 244, 
+    7, 6, 1, 251, 68, 2, 250, 184, 7, 6, 1, 160, 2, 242, 137, 7, 6, 1, 160, 
+    2, 142, 7, 6, 1, 160, 2, 250, 31, 7, 6, 1, 160, 2, 248, 2, 7, 6, 1, 240, 
+    155, 2, 242, 137, 7, 6, 1, 240, 155, 2, 142, 7, 6, 1, 240, 155, 2, 250, 
+    31, 7, 6, 1, 240, 155, 2, 248, 2, 7, 6, 1, 245, 60, 7, 6, 1, 230, 27, 2, 
+    183, 7, 6, 1, 144, 2, 242, 137, 7, 6, 1, 144, 2, 142, 7, 6, 1, 144, 2, 
+    250, 31, 7, 6, 1, 144, 2, 183, 7, 6, 1, 144, 2, 248, 2, 230, 85, 50, 7, 
+    6, 1, 144, 2, 91, 7, 6, 1, 104, 2, 242, 137, 7, 6, 1, 104, 2, 142, 7, 6, 
+    1, 104, 2, 250, 31, 7, 6, 1, 104, 2, 248, 2, 7, 6, 1, 211, 118, 2, 142, 
+    7, 6, 1, 216, 152, 7, 4, 1, 220, 77, 222, 92, 7, 4, 1, 115, 2, 242, 137, 
+    7, 4, 1, 115, 2, 142, 7, 4, 1, 115, 2, 250, 31, 7, 4, 1, 115, 2, 183, 7, 
+    4, 1, 115, 2, 248, 2, 7, 4, 1, 115, 2, 222, 235, 48, 7, 4, 1, 254, 244, 
+    7, 4, 1, 251, 68, 2, 250, 184, 7, 4, 1, 160, 2, 242, 137, 7, 4, 1, 160, 
+    2, 142, 7, 4, 1, 160, 2, 250, 31, 7, 4, 1, 160, 2, 248, 2, 7, 4, 1, 240, 
+    155, 2, 242, 137, 7, 4, 1, 240, 155, 2, 142, 7, 4, 1, 240, 155, 2, 250, 
+    31, 7, 4, 1, 240, 155, 2, 248, 2, 7, 4, 1, 245, 60, 7, 4, 1, 230, 27, 2, 
+    183, 7, 4, 1, 144, 2, 242, 137, 7, 4, 1, 144, 2, 142, 7, 4, 1, 144, 2, 
+    250, 31, 7, 4, 1, 144, 2, 183, 7, 4, 1, 144, 2, 248, 2, 247, 170, 50, 7, 
+    4, 1, 144, 2, 91, 7, 4, 1, 104, 2, 242, 137, 7, 4, 1, 104, 2, 142, 7, 4, 
+    1, 104, 2, 250, 31, 7, 4, 1, 104, 2, 248, 2, 7, 4, 1, 211, 118, 2, 142, 
+    7, 4, 1, 216, 152, 7, 4, 1, 211, 118, 2, 248, 2, 7, 6, 1, 115, 2, 231, 
+    233, 7, 4, 1, 115, 2, 231, 233, 7, 6, 1, 115, 2, 251, 147, 7, 4, 1, 115, 
+    2, 251, 147, 7, 6, 1, 115, 2, 226, 225, 7, 4, 1, 115, 2, 226, 225, 7, 6, 
+    1, 251, 68, 2, 142, 7, 4, 1, 251, 68, 2, 142, 7, 6, 1, 251, 68, 2, 250, 
+    31, 7, 4, 1, 251, 68, 2, 250, 31, 7, 6, 1, 251, 68, 2, 59, 48, 7, 4, 1, 
+    251, 68, 2, 59, 48, 7, 6, 1, 251, 68, 2, 250, 235, 7, 4, 1, 251, 68, 2, 
+    250, 235, 7, 6, 1, 249, 62, 2, 250, 235, 7, 4, 1, 249, 62, 2, 250, 235, 
+    7, 6, 1, 249, 62, 2, 91, 7, 4, 1, 249, 62, 2, 91, 7, 6, 1, 160, 2, 231, 
+    233, 7, 4, 1, 160, 2, 231, 233, 7, 6, 1, 160, 2, 251, 147, 7, 4, 1, 160, 
+    2, 251, 147, 7, 6, 1, 160, 2, 59, 48, 7, 4, 1, 160, 2, 59, 48, 7, 6, 1, 
+    160, 2, 226, 225, 7, 4, 1, 160, 2, 226, 225, 7, 6, 1, 160, 2, 250, 235, 
+    7, 4, 1, 160, 2, 250, 235, 7, 6, 1, 243, 204, 2, 250, 31, 7, 4, 1, 243, 
+    204, 2, 250, 31, 7, 6, 1, 243, 204, 2, 251, 147, 7, 4, 1, 243, 204, 2, 
+    251, 147, 7, 6, 1, 243, 204, 2, 59, 48, 7, 4, 1, 243, 204, 2, 59, 48, 7, 
+    6, 1, 243, 204, 2, 250, 184, 7, 4, 1, 243, 204, 2, 250, 184, 7, 6, 1, 
+    242, 62, 2, 250, 31, 7, 4, 1, 242, 62, 2, 250, 31, 7, 6, 1, 242, 62, 2, 
+    91, 7, 4, 1, 242, 62, 2, 91, 7, 6, 1, 240, 155, 2, 183, 7, 4, 1, 240, 
+    155, 2, 183, 7, 6, 1, 240, 155, 2, 231, 233, 7, 4, 1, 240, 155, 2, 231, 
+    233, 7, 6, 1, 240, 155, 2, 251, 147, 7, 4, 1, 240, 155, 2, 251, 147, 7, 
+    6, 1, 240, 155, 2, 226, 225, 7, 4, 1, 240, 155, 2, 226, 225, 7, 6, 1, 
+    240, 155, 2, 59, 48, 7, 4, 1, 247, 120, 73, 7, 6, 27, 236, 32, 7, 4, 27, 
+    236, 32, 7, 6, 1, 235, 146, 2, 250, 31, 7, 4, 1, 235, 146, 2, 250, 31, 7, 
+    6, 1, 235, 25, 2, 250, 184, 7, 4, 1, 235, 25, 2, 250, 184, 7, 4, 1, 233, 
+    240, 7, 6, 1, 233, 150, 2, 142, 7, 4, 1, 233, 150, 2, 142, 7, 6, 1, 233, 
+    150, 2, 250, 184, 7, 4, 1, 233, 150, 2, 250, 184, 7, 6, 1, 233, 150, 2, 
+    250, 235, 7, 4, 1, 233, 150, 2, 250, 235, 7, 6, 1, 233, 150, 2, 230, 225, 
+    247, 121, 7, 4, 1, 233, 150, 2, 230, 225, 247, 121, 7, 6, 1, 233, 150, 2, 
+    91, 7, 4, 1, 233, 150, 2, 91, 7, 6, 1, 230, 27, 2, 142, 7, 4, 1, 230, 27, 
+    2, 142, 7, 6, 1, 230, 27, 2, 250, 184, 7, 4, 1, 230, 27, 2, 250, 184, 7, 
+    6, 1, 230, 27, 2, 250, 235, 7, 4, 1, 230, 27, 2, 250, 235, 7, 4, 1, 230, 
+    27, 224, 205, 251, 79, 254, 58, 7, 6, 1, 245, 139, 7, 4, 1, 245, 139, 7, 
+    6, 1, 144, 2, 231, 233, 7, 4, 1, 144, 2, 231, 233, 7, 6, 1, 144, 2, 251, 
+    147, 7, 4, 1, 144, 2, 251, 147, 7, 6, 1, 144, 2, 52, 142, 7, 4, 1, 144, 
+    2, 52, 142, 7, 6, 27, 226, 235, 7, 4, 27, 226, 235, 7, 6, 1, 223, 225, 2, 
+    142, 7, 4, 1, 223, 225, 2, 142, 7, 6, 1, 223, 225, 2, 250, 184, 7, 4, 1, 
+    223, 225, 2, 250, 184, 7, 6, 1, 223, 225, 2, 250, 235, 7, 4, 1, 223, 225, 
+    2, 250, 235, 7, 6, 1, 222, 93, 2, 142, 7, 4, 1, 222, 93, 2, 142, 7, 6, 1, 
+    222, 93, 2, 250, 31, 7, 4, 1, 222, 93, 2, 250, 31, 7, 6, 1, 222, 93, 2, 
+    250, 184, 7, 4, 1, 222, 93, 2, 250, 184, 7, 6, 1, 222, 93, 2, 250, 235, 
+    7, 4, 1, 222, 93, 2, 250, 235, 7, 6, 1, 217, 154, 2, 250, 184, 7, 4, 1, 
+    217, 154, 2, 250, 184, 7, 6, 1, 217, 154, 2, 250, 235, 7, 4, 1, 217, 154, 
+    2, 250, 235, 7, 6, 1, 217, 154, 2, 91, 7, 4, 1, 217, 154, 2, 91, 7, 6, 1, 
+    104, 2, 183, 7, 4, 1, 104, 2, 183, 7, 6, 1, 104, 2, 231, 233, 7, 4, 1, 
+    104, 2, 231, 233, 7, 6, 1, 104, 2, 251, 147, 7, 4, 1, 104, 2, 251, 147, 
+    7, 6, 1, 104, 2, 222, 235, 48, 7, 4, 1, 104, 2, 222, 235, 48, 7, 6, 1, 
+    104, 2, 52, 142, 7, 4, 1, 104, 2, 52, 142, 7, 6, 1, 104, 2, 226, 225, 7, 
+    4, 1, 104, 2, 226, 225, 7, 6, 1, 212, 99, 2, 250, 31, 7, 4, 1, 212, 99, 
+    2, 250, 31, 7, 6, 1, 211, 118, 2, 250, 31, 7, 4, 1, 211, 118, 2, 250, 31, 
+    7, 6, 1, 211, 118, 2, 248, 2, 7, 6, 1, 210, 160, 2, 142, 7, 4, 1, 210, 
+    160, 2, 142, 7, 6, 1, 210, 160, 2, 59, 48, 7, 4, 1, 210, 160, 2, 59, 48, 
+    7, 6, 1, 210, 160, 2, 250, 235, 7, 4, 1, 210, 160, 2, 250, 235, 7, 4, 1, 
+    199, 222, 92, 7, 4, 1, 57, 2, 91, 7, 6, 1, 57, 2, 103, 7, 6, 1, 57, 2, 
+    216, 12, 7, 4, 1, 57, 2, 216, 12, 7, 6, 1, 138, 194, 7, 4, 1, 138, 194, 
+    7, 6, 1, 204, 76, 7, 6, 1, 251, 68, 2, 103, 7, 4, 1, 251, 68, 2, 103, 7, 
+    6, 1, 254, 220, 249, 61, 7, 6, 1, 249, 62, 2, 103, 7, 6, 1, 249, 62, 2, 
+    216, 12, 7, 4, 1, 249, 62, 2, 216, 12, 7, 4, 1, 215, 94, 248, 55, 7, 6, 
+    1, 223, 50, 75, 7, 6, 1, 221, 196, 7, 6, 1, 204, 75, 7, 6, 1, 245, 8, 2, 
+    103, 7, 4, 1, 245, 8, 2, 103, 7, 6, 1, 243, 204, 2, 103, 7, 6, 1, 243, 
+    108, 7, 4, 1, 240, 202, 7, 6, 1, 235, 186, 7, 6, 1, 240, 155, 2, 91, 7, 
+    6, 1, 235, 25, 2, 103, 7, 4, 1, 235, 25, 2, 103, 7, 4, 1, 233, 150, 2, 
+    130, 7, 4, 1, 233, 101, 2, 91, 7, 6, 1, 215, 94, 193, 7, 6, 1, 230, 27, 
+    2, 43, 103, 7, 4, 1, 230, 27, 2, 199, 44, 233, 37, 7, 6, 1, 144, 2, 230, 
+    225, 183, 7, 6, 1, 144, 2, 240, 249, 7, 4, 1, 144, 2, 240, 249, 7, 6, 1, 
+    226, 220, 7, 4, 1, 226, 220, 7, 6, 1, 226, 107, 2, 103, 7, 4, 1, 226, 
+    107, 2, 103, 7, 1, 210, 214, 7, 6, 1, 138, 105, 7, 4, 1, 138, 105, 7, 6, 
+    1, 245, 76, 7, 1, 223, 50, 245, 77, 232, 124, 7, 4, 1, 217, 154, 2, 226, 
+    67, 103, 7, 6, 1, 217, 154, 2, 103, 7, 4, 1, 217, 154, 2, 103, 7, 6, 1, 
+    217, 154, 2, 223, 56, 103, 7, 6, 1, 104, 2, 240, 249, 7, 4, 1, 104, 2, 
+    240, 249, 7, 6, 1, 214, 157, 7, 6, 1, 214, 106, 2, 103, 7, 6, 1, 211, 
+    118, 2, 103, 7, 4, 1, 211, 118, 2, 103, 7, 6, 1, 210, 160, 2, 91, 7, 4, 
+    1, 210, 160, 2, 91, 7, 6, 1, 245, 9, 7, 6, 1, 245, 10, 223, 49, 7, 4, 1, 
+    245, 10, 223, 49, 7, 4, 1, 245, 10, 2, 217, 78, 7, 1, 113, 2, 91, 7, 6, 
+    1, 138, 189, 7, 4, 1, 138, 189, 7, 1, 235, 194, 242, 181, 218, 131, 2, 
+    91, 7, 1, 211, 181, 7, 1, 248, 48, 250, 12, 7, 1, 233, 78, 250, 12, 7, 1, 
+    254, 138, 250, 12, 7, 1, 223, 56, 250, 12, 7, 6, 1, 246, 41, 2, 250, 235, 
+    7, 6, 1, 249, 62, 2, 4, 1, 210, 160, 2, 250, 235, 7, 4, 1, 246, 41, 2, 
+    250, 235, 7, 6, 1, 232, 189, 7, 6, 1, 233, 150, 2, 4, 1, 235, 145, 7, 4, 
+    1, 232, 189, 7, 6, 1, 228, 187, 7, 6, 1, 230, 27, 2, 4, 1, 235, 145, 7, 
+    4, 1, 228, 187, 7, 6, 1, 115, 2, 250, 235, 7, 4, 1, 115, 2, 250, 235, 7, 
+    6, 1, 240, 155, 2, 250, 235, 7, 4, 1, 240, 155, 2, 250, 235, 7, 6, 1, 
+    144, 2, 250, 235, 7, 4, 1, 144, 2, 250, 235, 7, 6, 1, 104, 2, 250, 235, 
+    7, 4, 1, 104, 2, 250, 235, 7, 6, 1, 104, 2, 248, 3, 22, 231, 233, 7, 4, 
+    1, 104, 2, 248, 3, 22, 231, 233, 7, 6, 1, 104, 2, 248, 3, 22, 142, 7, 4, 
+    1, 104, 2, 248, 3, 22, 142, 7, 6, 1, 104, 2, 248, 3, 22, 250, 235, 7, 4, 
+    1, 104, 2, 248, 3, 22, 250, 235, 7, 6, 1, 104, 2, 248, 3, 22, 242, 137, 
+    7, 4, 1, 104, 2, 248, 3, 22, 242, 137, 7, 4, 1, 215, 94, 75, 7, 6, 1, 
+    115, 2, 248, 3, 22, 231, 233, 7, 4, 1, 115, 2, 248, 3, 22, 231, 233, 7, 
+    6, 1, 115, 2, 59, 77, 22, 231, 233, 7, 4, 1, 115, 2, 59, 77, 22, 231, 
+    233, 7, 6, 1, 254, 245, 2, 231, 233, 7, 4, 1, 254, 245, 2, 231, 233, 7, 
+    6, 1, 243, 204, 2, 91, 7, 4, 1, 243, 204, 2, 91, 7, 6, 1, 243, 204, 2, 
+    250, 235, 7, 4, 1, 243, 204, 2, 250, 235, 7, 6, 1, 235, 25, 2, 250, 235, 
+    7, 4, 1, 235, 25, 2, 250, 235, 7, 6, 1, 144, 2, 226, 225, 7, 4, 1, 144, 
+    2, 226, 225, 7, 6, 1, 144, 2, 226, 226, 22, 231, 233, 7, 4, 1, 144, 2, 
+    226, 226, 22, 231, 233, 7, 6, 1, 245, 10, 2, 250, 235, 7, 4, 1, 245, 10, 
+    2, 250, 235, 7, 4, 1, 235, 146, 2, 250, 235, 7, 6, 1, 246, 40, 7, 6, 1, 
+    249, 62, 2, 4, 1, 210, 159, 7, 4, 1, 246, 40, 7, 6, 1, 243, 204, 2, 142, 
+    7, 4, 1, 243, 204, 2, 142, 7, 6, 1, 240, 200, 7, 6, 1, 211, 181, 7, 6, 1, 
+    230, 27, 2, 242, 137, 7, 4, 1, 230, 27, 2, 242, 137, 7, 6, 1, 115, 2, 
+    222, 235, 77, 22, 142, 7, 4, 1, 115, 2, 222, 235, 77, 22, 142, 7, 6, 1, 
+    254, 245, 2, 142, 7, 4, 1, 254, 245, 2, 142, 7, 6, 1, 144, 2, 218, 104, 
+    22, 142, 7, 4, 1, 144, 2, 218, 104, 22, 142, 7, 6, 1, 115, 2, 52, 242, 
+    137, 7, 4, 1, 115, 2, 52, 242, 137, 7, 6, 1, 115, 2, 235, 194, 251, 147, 
+    7, 4, 1, 115, 2, 235, 194, 251, 147, 7, 6, 1, 160, 2, 52, 242, 137, 7, 4, 
+    1, 160, 2, 52, 242, 137, 7, 6, 1, 160, 2, 235, 194, 251, 147, 7, 4, 1, 
+    160, 2, 235, 194, 251, 147, 7, 6, 1, 240, 155, 2, 52, 242, 137, 7, 4, 1, 
+    240, 155, 2, 52, 242, 137, 7, 6, 1, 240, 155, 2, 235, 194, 251, 147, 7, 
+    4, 1, 240, 155, 2, 235, 194, 251, 147, 7, 6, 1, 144, 2, 52, 242, 137, 7, 
+    4, 1, 144, 2, 52, 242, 137, 7, 6, 1, 144, 2, 235, 194, 251, 147, 7, 4, 1, 
+    144, 2, 235, 194, 251, 147, 7, 6, 1, 223, 225, 2, 52, 242, 137, 7, 4, 1, 
+    223, 225, 2, 52, 242, 137, 7, 6, 1, 223, 225, 2, 235, 194, 251, 147, 7, 
+    4, 1, 223, 225, 2, 235, 194, 251, 147, 7, 6, 1, 104, 2, 52, 242, 137, 7, 
+    4, 1, 104, 2, 52, 242, 137, 7, 6, 1, 104, 2, 235, 194, 251, 147, 7, 4, 1, 
+    104, 2, 235, 194, 251, 147, 7, 6, 1, 222, 93, 2, 249, 221, 51, 7, 4, 1, 
+    222, 93, 2, 249, 221, 51, 7, 6, 1, 217, 154, 2, 249, 221, 51, 7, 4, 1, 
+    217, 154, 2, 249, 221, 51, 7, 6, 1, 210, 231, 7, 4, 1, 210, 231, 7, 6, 1, 
+    242, 62, 2, 250, 235, 7, 4, 1, 242, 62, 2, 250, 235, 7, 6, 1, 230, 27, 2, 
+    199, 44, 233, 37, 7, 4, 1, 249, 62, 2, 249, 101, 7, 6, 1, 226, 135, 7, 4, 
+    1, 226, 135, 7, 6, 1, 210, 160, 2, 103, 7, 4, 1, 210, 160, 2, 103, 7, 6, 
+    1, 115, 2, 59, 48, 7, 4, 1, 115, 2, 59, 48, 7, 6, 1, 160, 2, 250, 184, 7, 
+    4, 1, 160, 2, 250, 184, 7, 6, 1, 144, 2, 248, 3, 22, 231, 233, 7, 4, 1, 
+    144, 2, 248, 3, 22, 231, 233, 7, 6, 1, 144, 2, 216, 90, 22, 231, 233, 7, 
+    4, 1, 144, 2, 216, 90, 22, 231, 233, 7, 6, 1, 144, 2, 59, 48, 7, 4, 1, 
+    144, 2, 59, 48, 7, 6, 1, 144, 2, 59, 77, 22, 231, 233, 7, 4, 1, 144, 2, 
+    59, 77, 22, 231, 233, 7, 6, 1, 211, 118, 2, 231, 233, 7, 4, 1, 211, 118, 
+    2, 231, 233, 7, 4, 1, 233, 150, 2, 249, 101, 7, 4, 1, 230, 27, 2, 249, 
+    101, 7, 4, 1, 217, 154, 2, 249, 101, 7, 4, 1, 247, 120, 235, 145, 7, 4, 
+    1, 248, 144, 247, 221, 7, 4, 1, 224, 32, 247, 221, 7, 6, 1, 115, 2, 91, 
+    7, 6, 1, 251, 68, 2, 91, 7, 4, 1, 251, 68, 2, 91, 7, 6, 1, 233, 150, 2, 
+    130, 7, 6, 1, 217, 154, 2, 248, 0, 91, 7, 4, 1, 222, 93, 2, 217, 251, 
+    217, 78, 7, 4, 1, 210, 160, 2, 217, 251, 217, 78, 7, 6, 1, 242, 181, 218, 
+    130, 7, 4, 1, 242, 181, 218, 130, 7, 6, 1, 57, 2, 91, 7, 6, 1, 104, 130, 
+    7, 6, 1, 215, 94, 214, 105, 7, 6, 1, 160, 2, 91, 7, 4, 1, 160, 2, 91, 7, 
+    6, 1, 235, 146, 2, 91, 7, 4, 1, 235, 146, 2, 91, 7, 6, 1, 4, 224, 98, 2, 
+    241, 53, 217, 78, 7, 4, 1, 224, 98, 2, 241, 53, 217, 78, 7, 6, 1, 223, 
+    225, 2, 91, 7, 4, 1, 223, 225, 2, 91, 7, 6, 1, 211, 118, 2, 91, 7, 4, 1, 
+    211, 118, 2, 91, 7, 4, 1, 215, 94, 61, 7, 4, 1, 254, 144, 7, 4, 1, 215, 
+    94, 254, 144, 7, 4, 1, 57, 2, 103, 7, 4, 1, 204, 76, 7, 4, 1, 251, 68, 2, 
+    249, 101, 7, 4, 1, 249, 62, 2, 217, 78, 7, 4, 1, 249, 62, 2, 103, 7, 4, 
+    1, 223, 50, 75, 7, 4, 1, 221, 196, 7, 4, 1, 221, 197, 2, 103, 7, 4, 1, 
+    204, 75, 7, 4, 1, 223, 50, 204, 75, 7, 4, 1, 223, 50, 204, 160, 2, 103, 
+    7, 4, 1, 250, 1, 223, 50, 204, 75, 7, 4, 1, 247, 120, 235, 146, 2, 91, 7, 
+    4, 1, 243, 204, 2, 103, 7, 4, 1, 119, 243, 203, 7, 1, 4, 6, 243, 203, 7, 
+    4, 1, 243, 108, 7, 4, 1, 223, 152, 240, 249, 7, 4, 1, 215, 94, 242, 61, 
+    7, 4, 1, 242, 62, 2, 103, 7, 4, 1, 241, 209, 2, 103, 7, 4, 1, 240, 155, 
+    2, 91, 7, 4, 1, 235, 186, 7, 1, 4, 6, 73, 7, 4, 1, 233, 150, 2, 230, 225, 
+    183, 7, 4, 1, 233, 150, 2, 252, 42, 7, 4, 1, 233, 150, 2, 223, 56, 103, 
+    7, 4, 1, 233, 2, 7, 4, 1, 215, 94, 193, 7, 4, 1, 215, 94, 232, 51, 2, 
+    199, 233, 37, 7, 4, 1, 232, 51, 2, 103, 7, 4, 1, 230, 27, 2, 43, 103, 7, 
+    4, 1, 230, 27, 2, 223, 56, 103, 7, 1, 4, 6, 230, 26, 7, 4, 1, 252, 135, 
+    76, 7, 1, 4, 6, 226, 235, 7, 4, 1, 250, 1, 226, 202, 7, 4, 1, 225, 134, 
+    7, 4, 1, 215, 94, 153, 7, 4, 1, 215, 94, 223, 225, 2, 199, 233, 37, 7, 4, 
+    1, 215, 94, 223, 225, 2, 103, 7, 4, 1, 223, 225, 2, 199, 233, 37, 7, 4, 
+    1, 223, 225, 2, 217, 78, 7, 4, 1, 223, 225, 2, 244, 88, 7, 4, 1, 223, 50, 
+    223, 225, 2, 244, 88, 7, 1, 4, 6, 153, 7, 1, 4, 6, 235, 194, 153, 7, 4, 
+    1, 222, 93, 2, 103, 7, 4, 1, 245, 76, 7, 4, 1, 247, 120, 235, 146, 2, 
+    218, 104, 22, 103, 7, 4, 1, 218, 232, 223, 50, 245, 76, 7, 4, 1, 245, 77, 
+    2, 249, 101, 7, 4, 1, 215, 94, 217, 153, 7, 4, 1, 217, 154, 2, 223, 56, 
+    103, 7, 4, 1, 104, 130, 7, 4, 1, 214, 157, 7, 4, 1, 214, 106, 2, 103, 7, 
+    4, 1, 215, 94, 214, 105, 7, 4, 1, 215, 94, 212, 98, 7, 4, 1, 215, 94, 
+    211, 117, 7, 1, 4, 6, 211, 117, 7, 4, 1, 210, 160, 2, 223, 56, 103, 7, 4, 
+    1, 210, 160, 2, 249, 101, 7, 4, 1, 245, 9, 7, 4, 1, 245, 10, 2, 249, 101, 
+    7, 1, 242, 181, 218, 130, 7, 1, 225, 140, 213, 135, 243, 250, 7, 1, 235, 
+    194, 242, 181, 218, 130, 7, 1, 218, 111, 251, 67, 7, 1, 251, 247, 250, 
+    12, 7, 1, 4, 6, 253, 159, 7, 4, 1, 250, 1, 204, 75, 7, 1, 4, 6, 243, 204, 
+    2, 103, 7, 1, 4, 6, 242, 61, 7, 4, 1, 235, 146, 2, 249, 128, 7, 4, 1, 
+    215, 94, 235, 24, 7, 1, 4, 6, 156, 7, 4, 1, 224, 98, 2, 103, 7, 1, 242, 
+    181, 218, 131, 2, 91, 7, 1, 223, 50, 242, 181, 218, 131, 2, 91, 7, 4, 1, 
+    246, 41, 247, 221, 7, 4, 1, 248, 27, 247, 221, 7, 4, 1, 246, 41, 247, 
+    222, 2, 249, 101, 7, 4, 1, 215, 186, 247, 221, 7, 4, 1, 216, 236, 247, 
+    221, 7, 4, 1, 217, 30, 247, 222, 2, 249, 101, 7, 4, 1, 244, 135, 247, 
+    221, 7, 4, 1, 232, 101, 247, 221, 7, 4, 1, 232, 52, 247, 221, 7, 1, 251, 
+    247, 225, 182, 7, 1, 251, 255, 225, 182, 7, 4, 1, 215, 94, 242, 62, 2, 
+    244, 88, 7, 4, 1, 215, 94, 242, 62, 2, 244, 89, 22, 217, 78, 58, 1, 4, 
+    242, 61, 58, 1, 4, 242, 62, 2, 103, 58, 1, 4, 235, 145, 58, 1, 4, 153, 
+    58, 1, 4, 215, 94, 153, 58, 1, 4, 215, 94, 223, 225, 2, 103, 58, 1, 4, 6, 
+    235, 194, 153, 58, 1, 4, 212, 98, 58, 1, 4, 211, 117, 58, 1, 224, 191, 
+    58, 1, 52, 224, 191, 58, 1, 215, 94, 249, 220, 58, 1, 254, 58, 58, 1, 
+    223, 50, 249, 220, 58, 1, 44, 163, 222, 234, 58, 1, 43, 163, 222, 234, 
+    58, 1, 242, 181, 218, 130, 58, 1, 223, 50, 242, 181, 218, 130, 58, 1, 43, 
+    253, 250, 58, 1, 44, 253, 250, 58, 1, 120, 253, 250, 58, 1, 124, 253, 
+    250, 58, 1, 250, 32, 255, 15, 250, 235, 58, 1, 67, 232, 214, 58, 1, 231, 
+    233, 58, 1, 255, 4, 255, 15, 58, 1, 242, 138, 255, 15, 58, 1, 121, 67, 
+    232, 214, 58, 1, 121, 231, 233, 58, 1, 121, 242, 138, 255, 15, 58, 1, 
+    121, 255, 4, 255, 15, 58, 1, 215, 223, 249, 227, 58, 1, 163, 215, 223, 
+    249, 227, 58, 1, 250, 174, 44, 163, 222, 234, 58, 1, 250, 174, 43, 163, 
+    222, 234, 58, 1, 120, 217, 88, 58, 1, 124, 217, 88, 58, 1, 96, 50, 58, 1, 
+    230, 183, 50, 251, 147, 59, 48, 222, 235, 48, 226, 225, 4, 183, 52, 255, 
+    4, 255, 15, 58, 1, 223, 37, 103, 58, 1, 249, 132, 255, 15, 58, 1, 4, 243, 
+    108, 58, 1, 4, 156, 58, 1, 4, 222, 92, 58, 1, 4, 211, 178, 58, 1, 4, 223, 
+    50, 242, 181, 218, 130, 58, 1, 245, 21, 138, 130, 58, 1, 125, 138, 130, 
+    58, 1, 230, 226, 138, 130, 58, 1, 121, 138, 130, 58, 1, 245, 20, 138, 
+    130, 58, 1, 210, 254, 248, 45, 138, 78, 58, 1, 211, 70, 248, 45, 138, 78, 
+    58, 1, 213, 133, 58, 1, 214, 186, 58, 1, 52, 254, 58, 58, 1, 121, 124, 
+    253, 250, 58, 1, 121, 120, 253, 250, 58, 1, 121, 43, 253, 250, 58, 1, 
+    121, 44, 253, 250, 58, 1, 121, 222, 234, 58, 1, 230, 225, 242, 138, 255, 
+    15, 58, 1, 230, 225, 52, 242, 138, 255, 15, 58, 1, 230, 225, 52, 255, 4, 
+    255, 15, 58, 1, 121, 183, 58, 1, 223, 158, 249, 227, 58, 1, 252, 59, 125, 
+    216, 31, 58, 1, 245, 144, 125, 216, 31, 58, 1, 252, 59, 121, 216, 31, 58, 
+    1, 245, 144, 121, 216, 31, 58, 1, 220, 55, 58, 1, 204, 220, 55, 58, 1, 
+    121, 43, 74, 38, 242, 138, 255, 15, 38, 255, 4, 255, 15, 38, 250, 32, 
+    255, 15, 38, 183, 38, 231, 233, 38, 226, 120, 38, 251, 147, 38, 59, 48, 
+    38, 248, 2, 38, 241, 53, 48, 38, 222, 235, 48, 38, 52, 255, 4, 255, 15, 
+    38, 250, 235, 38, 67, 232, 215, 48, 38, 52, 67, 232, 215, 48, 38, 52, 
+    242, 138, 255, 15, 38, 251, 0, 38, 235, 194, 251, 147, 38, 215, 94, 249, 
+    221, 48, 38, 249, 221, 48, 38, 223, 50, 249, 221, 48, 38, 249, 221, 77, 
+    222, 252, 38, 242, 138, 255, 16, 51, 38, 255, 4, 255, 16, 51, 38, 43, 
+    217, 89, 51, 38, 44, 217, 89, 51, 38, 43, 254, 111, 48, 38, 240, 249, 38, 
+    43, 163, 222, 235, 51, 38, 120, 217, 89, 51, 38, 124, 217, 89, 51, 38, 
+    96, 5, 51, 38, 230, 183, 5, 51, 38, 226, 65, 241, 53, 51, 38, 223, 56, 
+    241, 53, 51, 38, 59, 51, 38, 248, 3, 51, 38, 222, 235, 51, 38, 249, 221, 
+    51, 38, 250, 184, 38, 226, 225, 38, 67, 232, 215, 51, 38, 251, 141, 51, 
+    38, 235, 194, 52, 254, 25, 51, 38, 250, 236, 51, 38, 250, 32, 255, 16, 
+    51, 38, 251, 148, 51, 38, 235, 194, 251, 148, 51, 38, 216, 90, 51, 38, 
+    231, 234, 51, 38, 121, 232, 214, 38, 52, 121, 232, 214, 38, 216, 90, 226, 
+    121, 38, 219, 252, 218, 104, 226, 121, 38, 199, 218, 104, 226, 121, 38, 
+    219, 252, 219, 48, 226, 121, 38, 199, 219, 48, 226, 121, 38, 44, 163, 
+    222, 235, 51, 38, 235, 194, 251, 141, 51, 38, 42, 51, 38, 221, 181, 51, 
+    38, 211, 179, 48, 38, 67, 183, 38, 52, 226, 120, 38, 242, 138, 138, 78, 
+    38, 255, 4, 138, 78, 38, 26, 225, 176, 38, 26, 234, 3, 38, 26, 247, 253, 
+    216, 19, 38, 26, 210, 219, 38, 251, 141, 48, 38, 245, 99, 5, 51, 38, 52, 
+    67, 232, 215, 51, 38, 43, 254, 111, 51, 38, 228, 53, 216, 90, 48, 38, 
+    241, 59, 48, 38, 254, 149, 128, 216, 43, 48, 38, 43, 44, 80, 51, 38, 214, 
+    153, 80, 51, 38, 242, 143, 235, 64, 38, 44, 253, 251, 48, 38, 43, 163, 
+    222, 235, 48, 38, 244, 132, 38, 211, 179, 51, 38, 43, 253, 251, 51, 38, 
+    44, 253, 251, 51, 38, 44, 253, 251, 22, 120, 253, 251, 51, 38, 44, 163, 
+    222, 235, 48, 38, 59, 77, 222, 252, 38, 253, 218, 51, 38, 52, 222, 235, 
+    51, 38, 210, 35, 48, 38, 52, 251, 148, 51, 38, 52, 251, 147, 38, 52, 231, 
+    233, 38, 52, 231, 234, 51, 38, 52, 183, 38, 52, 235, 194, 251, 147, 38, 
+    52, 97, 80, 51, 38, 7, 4, 1, 61, 38, 7, 4, 1, 75, 38, 7, 4, 1, 73, 38, 7, 
+    4, 1, 76, 38, 7, 4, 1, 70, 38, 7, 4, 1, 251, 67, 38, 7, 4, 1, 249, 61, 
+    38, 7, 4, 1, 242, 61, 38, 7, 4, 1, 193, 38, 7, 4, 1, 153, 38, 7, 4, 1, 
+    217, 153, 38, 7, 4, 1, 214, 105, 38, 7, 4, 1, 211, 178, 26, 6, 1, 241, 
+    197, 26, 4, 1, 241, 197, 26, 6, 1, 254, 24, 221, 247, 26, 4, 1, 254, 24, 
+    221, 247, 26, 227, 199, 50, 26, 232, 109, 227, 199, 50, 26, 6, 1, 226, 
+    52, 247, 228, 26, 4, 1, 226, 52, 247, 228, 26, 210, 219, 26, 4, 223, 50, 
+    232, 84, 219, 179, 87, 26, 4, 246, 119, 232, 84, 219, 179, 87, 26, 4, 
+    223, 50, 246, 119, 232, 84, 219, 179, 87, 26, 224, 14, 78, 26, 216, 19, 
+    26, 247, 253, 216, 19, 26, 6, 1, 254, 145, 2, 216, 19, 26, 254, 98, 217, 
+    3, 26, 6, 1, 245, 102, 2, 216, 19, 26, 6, 1, 245, 65, 2, 216, 19, 26, 6, 
+    1, 235, 187, 2, 216, 19, 26, 6, 1, 226, 201, 2, 216, 19, 26, 6, 1, 214, 
+    158, 2, 216, 19, 26, 6, 1, 226, 203, 2, 216, 19, 26, 4, 1, 235, 187, 2, 
+    247, 253, 22, 216, 19, 26, 6, 1, 254, 144, 26, 6, 1, 252, 27, 26, 6, 1, 
+    243, 108, 26, 6, 1, 248, 55, 26, 6, 1, 245, 101, 26, 6, 1, 210, 85, 26, 
+    6, 1, 245, 64, 26, 6, 1, 216, 180, 26, 6, 1, 235, 186, 26, 6, 1, 234, 
+    223, 26, 6, 1, 233, 99, 26, 6, 1, 230, 103, 26, 6, 1, 227, 238, 26, 6, 1, 
+    211, 157, 26, 6, 1, 226, 200, 26, 6, 1, 225, 109, 26, 6, 1, 223, 38, 26, 
+    6, 1, 219, 178, 26, 6, 1, 217, 42, 26, 6, 1, 214, 157, 26, 6, 1, 225, 
+    134, 26, 6, 1, 250, 111, 26, 6, 1, 224, 162, 26, 6, 1, 226, 202, 26, 6, 
+    1, 235, 187, 2, 247, 252, 26, 6, 1, 214, 158, 2, 247, 252, 26, 4, 1, 254, 
+    145, 2, 216, 19, 26, 4, 1, 245, 102, 2, 216, 19, 26, 4, 1, 245, 65, 2, 
+    216, 19, 26, 4, 1, 235, 187, 2, 216, 19, 26, 4, 1, 214, 158, 2, 247, 253, 
+    22, 216, 19, 26, 4, 1, 254, 144, 26, 4, 1, 252, 27, 26, 4, 1, 243, 108, 
+    26, 4, 1, 248, 55, 26, 4, 1, 245, 101, 26, 4, 1, 210, 85, 26, 4, 1, 245, 
+    64, 26, 4, 1, 216, 180, 26, 4, 1, 235, 186, 26, 4, 1, 234, 223, 26, 4, 1, 
+    233, 99, 26, 4, 1, 230, 103, 26, 4, 1, 227, 238, 26, 4, 1, 211, 157, 26, 
+    4, 1, 226, 200, 26, 4, 1, 225, 109, 26, 4, 1, 223, 38, 26, 4, 1, 40, 219, 
+    178, 26, 4, 1, 219, 178, 26, 4, 1, 217, 42, 26, 4, 1, 214, 157, 26, 4, 1, 
+    225, 134, 26, 4, 1, 250, 111, 26, 4, 1, 224, 162, 26, 4, 1, 226, 202, 26, 
+    4, 1, 235, 187, 2, 247, 252, 26, 4, 1, 214, 158, 2, 247, 252, 26, 4, 1, 
+    226, 201, 2, 216, 19, 26, 4, 1, 214, 158, 2, 216, 19, 26, 4, 1, 226, 203, 
+    2, 216, 19, 26, 6, 234, 248, 87, 26, 252, 28, 87, 26, 216, 181, 87, 26, 
+    214, 158, 2, 241, 53, 87, 26, 214, 158, 2, 255, 4, 22, 241, 53, 87, 26, 
+    214, 158, 2, 248, 3, 22, 241, 53, 87, 26, 225, 135, 87, 26, 225, 110, 87, 
+    26, 234, 248, 87, 26, 1, 254, 24, 234, 7, 26, 4, 1, 254, 24, 234, 7, 26, 
+    1, 218, 138, 26, 4, 1, 218, 138, 26, 1, 247, 228, 26, 4, 1, 247, 228, 26, 
+    1, 234, 7, 26, 4, 1, 234, 7, 26, 1, 221, 247, 26, 4, 1, 221, 247, 81, 6, 
+    1, 220, 56, 81, 4, 1, 220, 56, 81, 6, 1, 244, 141, 81, 4, 1, 244, 141, 
+    81, 6, 1, 234, 118, 81, 4, 1, 234, 118, 81, 6, 1, 241, 46, 81, 4, 1, 241, 
+    46, 81, 6, 1, 243, 103, 81, 4, 1, 243, 103, 81, 6, 1, 220, 23, 81, 4, 1, 
+    220, 23, 81, 6, 1, 248, 70, 81, 4, 1, 248, 70, 26, 234, 224, 87, 26, 223, 
+    39, 87, 26, 232, 84, 219, 179, 87, 26, 1, 210, 224, 26, 6, 216, 181, 87, 
+    26, 232, 84, 245, 102, 87, 26, 223, 50, 232, 84, 245, 102, 87, 26, 6, 1, 
+    220, 8, 26, 4, 1, 220, 8, 26, 6, 232, 84, 219, 179, 87, 26, 6, 1, 221, 
+    244, 26, 4, 1, 221, 244, 26, 223, 39, 2, 218, 104, 87, 26, 6, 223, 50, 
+    232, 84, 219, 179, 87, 26, 6, 246, 119, 232, 84, 219, 179, 87, 26, 6, 
+    223, 50, 246, 119, 232, 84, 219, 179, 87, 33, 6, 1, 236, 62, 2, 242, 137, 
+    33, 6, 1, 235, 190, 33, 6, 1, 247, 163, 33, 6, 1, 242, 188, 33, 6, 1, 
+    214, 202, 236, 61, 33, 6, 1, 246, 37, 33, 6, 1, 251, 77, 73, 33, 6, 1, 
+    211, 8, 33, 6, 1, 235, 127, 33, 6, 1, 232, 188, 33, 6, 1, 228, 179, 33, 
+    6, 1, 215, 175, 33, 6, 1, 234, 49, 33, 6, 1, 240, 155, 2, 242, 137, 33, 
+    6, 1, 219, 252, 70, 33, 6, 1, 246, 33, 33, 6, 1, 61, 33, 6, 1, 252, 76, 
+    33, 6, 1, 213, 255, 33, 6, 1, 242, 237, 33, 6, 1, 248, 91, 33, 6, 1, 236, 
+    61, 33, 6, 1, 210, 74, 33, 6, 1, 210, 94, 33, 6, 1, 73, 33, 6, 1, 219, 
+    252, 73, 33, 6, 1, 176, 33, 6, 1, 245, 175, 33, 6, 1, 245, 160, 33, 6, 1, 
+    245, 151, 33, 6, 1, 76, 33, 6, 1, 225, 222, 33, 6, 1, 245, 93, 33, 6, 1, 
+    245, 83, 33, 6, 1, 217, 23, 33, 6, 1, 70, 33, 6, 1, 245, 203, 33, 6, 1, 
+    162, 33, 6, 1, 215, 179, 33, 6, 1, 250, 132, 33, 6, 1, 220, 103, 33, 6, 
+    1, 220, 66, 33, 6, 1, 242, 4, 50, 33, 6, 1, 211, 27, 33, 6, 1, 219, 53, 
+    50, 33, 6, 1, 75, 33, 6, 1, 210, 212, 33, 6, 1, 191, 33, 4, 1, 61, 33, 4, 
+    1, 252, 76, 33, 4, 1, 213, 255, 33, 4, 1, 242, 237, 33, 4, 1, 248, 91, 
+    33, 4, 1, 236, 61, 33, 4, 1, 210, 74, 33, 4, 1, 210, 94, 33, 4, 1, 73, 
+    33, 4, 1, 219, 252, 73, 33, 4, 1, 176, 33, 4, 1, 245, 175, 33, 4, 1, 245, 
+    160, 33, 4, 1, 245, 151, 33, 4, 1, 76, 33, 4, 1, 225, 222, 33, 4, 1, 245, 
+    93, 33, 4, 1, 245, 83, 33, 4, 1, 217, 23, 33, 4, 1, 70, 33, 4, 1, 245, 
+    203, 33, 4, 1, 162, 33, 4, 1, 215, 179, 33, 4, 1, 250, 132, 33, 4, 1, 
+    220, 103, 33, 4, 1, 220, 66, 33, 4, 1, 242, 4, 50, 33, 4, 1, 211, 27, 33, 
+    4, 1, 219, 53, 50, 33, 4, 1, 75, 33, 4, 1, 210, 212, 33, 4, 1, 191, 33, 
+    4, 1, 236, 62, 2, 242, 137, 33, 4, 1, 235, 190, 33, 4, 1, 247, 163, 33, 
+    4, 1, 242, 188, 33, 4, 1, 214, 202, 236, 61, 33, 4, 1, 246, 37, 33, 4, 1, 
+    251, 77, 73, 33, 4, 1, 211, 8, 33, 4, 1, 235, 127, 33, 4, 1, 232, 188, 
+    33, 4, 1, 228, 179, 33, 4, 1, 215, 175, 33, 4, 1, 234, 49, 33, 4, 1, 240, 
+    155, 2, 242, 137, 33, 4, 1, 219, 252, 70, 33, 4, 1, 246, 33, 33, 6, 1, 
+    226, 202, 33, 4, 1, 226, 202, 33, 6, 1, 211, 59, 33, 4, 1, 211, 59, 33, 
+    6, 1, 235, 184, 75, 33, 4, 1, 235, 184, 75, 33, 6, 1, 232, 193, 210, 183, 
+    33, 4, 1, 232, 193, 210, 183, 33, 6, 1, 235, 184, 232, 193, 210, 183, 33, 
+    4, 1, 235, 184, 232, 193, 210, 183, 33, 6, 1, 251, 250, 210, 183, 33, 4, 
+    1, 251, 250, 210, 183, 33, 6, 1, 235, 184, 251, 250, 210, 183, 33, 4, 1, 
+    235, 184, 251, 250, 210, 183, 33, 6, 1, 233, 234, 33, 4, 1, 233, 234, 33, 
+    6, 1, 224, 162, 33, 4, 1, 224, 162, 33, 6, 1, 244, 83, 33, 4, 1, 244, 83, 
+    33, 6, 1, 235, 147, 33, 4, 1, 235, 147, 33, 6, 1, 235, 148, 2, 52, 242, 
+    138, 255, 15, 33, 4, 1, 235, 148, 2, 52, 242, 138, 255, 15, 33, 6, 1, 
+    214, 205, 33, 4, 1, 214, 205, 33, 6, 1, 222, 186, 226, 202, 33, 4, 1, 
+    222, 186, 226, 202, 33, 6, 1, 226, 203, 2, 216, 66, 33, 4, 1, 226, 203, 
+    2, 216, 66, 33, 6, 1, 226, 141, 33, 4, 1, 226, 141, 33, 6, 1, 234, 7, 33, 
+    4, 1, 234, 7, 33, 216, 147, 50, 38, 33, 216, 66, 38, 33, 226, 66, 38, 33, 
+    248, 155, 225, 19, 38, 33, 224, 156, 225, 19, 38, 33, 225, 4, 38, 33, 
+    240, 212, 216, 147, 50, 38, 33, 230, 192, 50, 33, 6, 1, 219, 252, 240, 
+    155, 2, 217, 78, 33, 4, 1, 219, 252, 240, 155, 2, 217, 78, 33, 6, 1, 220, 
+    147, 50, 33, 4, 1, 220, 147, 50, 33, 6, 1, 245, 94, 2, 216, 115, 33, 4, 
+    1, 245, 94, 2, 216, 115, 33, 6, 1, 242, 238, 2, 214, 156, 33, 4, 1, 242, 
+    238, 2, 214, 156, 33, 6, 1, 242, 238, 2, 91, 33, 4, 1, 242, 238, 2, 91, 
+    33, 6, 1, 242, 238, 2, 230, 225, 103, 33, 4, 1, 242, 238, 2, 230, 225, 
+    103, 33, 6, 1, 210, 75, 2, 248, 40, 33, 4, 1, 210, 75, 2, 248, 40, 33, 6, 
+    1, 210, 95, 2, 248, 40, 33, 4, 1, 210, 95, 2, 248, 40, 33, 6, 1, 235, 14, 
+    2, 248, 40, 33, 4, 1, 235, 14, 2, 248, 40, 33, 6, 1, 235, 14, 2, 67, 91, 
+    33, 4, 1, 235, 14, 2, 67, 91, 33, 6, 1, 235, 14, 2, 91, 33, 4, 1, 235, 
+    14, 2, 91, 33, 6, 1, 252, 125, 176, 33, 4, 1, 252, 125, 176, 33, 6, 1, 
+    245, 152, 2, 248, 40, 33, 4, 1, 245, 152, 2, 248, 40, 33, 6, 27, 245, 
+    152, 242, 237, 33, 4, 27, 245, 152, 242, 237, 33, 6, 1, 225, 223, 2, 230, 
+    225, 103, 33, 4, 1, 225, 223, 2, 230, 225, 103, 33, 6, 1, 255, 21, 162, 
+    33, 4, 1, 255, 21, 162, 33, 6, 1, 245, 84, 2, 248, 40, 33, 4, 1, 245, 84, 
+    2, 248, 40, 33, 6, 1, 217, 24, 2, 248, 40, 33, 4, 1, 217, 24, 2, 248, 40, 
+    33, 6, 1, 218, 122, 70, 33, 4, 1, 218, 122, 70, 33, 6, 1, 218, 122, 104, 
+    2, 91, 33, 4, 1, 218, 122, 104, 2, 91, 33, 6, 1, 242, 50, 2, 248, 40, 33, 
+    4, 1, 242, 50, 2, 248, 40, 33, 6, 27, 217, 24, 215, 179, 33, 4, 27, 217, 
+    24, 215, 179, 33, 6, 1, 250, 133, 2, 248, 40, 33, 4, 1, 250, 133, 2, 248, 
+    40, 33, 6, 1, 250, 133, 2, 67, 91, 33, 4, 1, 250, 133, 2, 67, 91, 33, 6, 
+    1, 220, 34, 33, 4, 1, 220, 34, 33, 6, 1, 255, 21, 250, 132, 33, 4, 1, 
+    255, 21, 250, 132, 33, 6, 1, 255, 21, 250, 133, 2, 248, 40, 33, 4, 1, 
+    255, 21, 250, 133, 2, 248, 40, 33, 1, 226, 59, 33, 6, 1, 210, 75, 2, 251, 
+    147, 33, 4, 1, 210, 75, 2, 251, 147, 33, 6, 1, 235, 14, 2, 103, 33, 4, 1, 
+    235, 14, 2, 103, 33, 6, 1, 245, 176, 2, 217, 78, 33, 4, 1, 245, 176, 2, 
+    217, 78, 33, 6, 1, 245, 152, 2, 103, 33, 4, 1, 245, 152, 2, 103, 33, 6, 
+    1, 245, 152, 2, 217, 78, 33, 4, 1, 245, 152, 2, 217, 78, 33, 6, 1, 234, 
+    128, 250, 132, 33, 4, 1, 234, 128, 250, 132, 33, 6, 1, 245, 161, 2, 217, 
+    78, 33, 4, 1, 245, 161, 2, 217, 78, 33, 4, 1, 226, 59, 33, 6, 1, 115, 2, 
+    251, 147, 33, 4, 1, 115, 2, 251, 147, 33, 6, 1, 115, 2, 248, 2, 33, 4, 1, 
+    115, 2, 248, 2, 33, 6, 27, 115, 236, 61, 33, 4, 27, 115, 236, 61, 33, 6, 
+    1, 236, 62, 2, 251, 147, 33, 4, 1, 236, 62, 2, 251, 147, 33, 6, 1, 221, 
+    196, 33, 4, 1, 221, 196, 33, 6, 1, 221, 197, 2, 248, 2, 33, 4, 1, 221, 
+    197, 2, 248, 2, 33, 6, 1, 210, 75, 2, 248, 2, 33, 4, 1, 210, 75, 2, 248, 
+    2, 33, 6, 1, 210, 95, 2, 248, 2, 33, 4, 1, 210, 95, 2, 248, 2, 33, 6, 1, 
+    255, 21, 246, 37, 33, 4, 1, 255, 21, 246, 37, 33, 6, 1, 240, 155, 2, 231, 
+    233, 33, 4, 1, 240, 155, 2, 231, 233, 33, 6, 1, 240, 155, 2, 248, 2, 33, 
+    4, 1, 240, 155, 2, 248, 2, 33, 6, 1, 144, 2, 248, 2, 33, 4, 1, 144, 2, 
+    248, 2, 33, 6, 1, 252, 135, 76, 33, 4, 1, 252, 135, 76, 33, 6, 1, 252, 
+    135, 144, 2, 248, 2, 33, 4, 1, 252, 135, 144, 2, 248, 2, 33, 6, 1, 160, 
+    2, 248, 2, 33, 4, 1, 160, 2, 248, 2, 33, 6, 1, 104, 2, 231, 233, 33, 4, 
+    1, 104, 2, 231, 233, 33, 6, 1, 104, 2, 248, 2, 33, 4, 1, 104, 2, 248, 2, 
+    33, 6, 1, 104, 2, 52, 142, 33, 4, 1, 104, 2, 52, 142, 33, 6, 1, 250, 133, 
+    2, 248, 2, 33, 4, 1, 250, 133, 2, 248, 2, 33, 6, 1, 242, 238, 2, 248, 40, 
+    33, 4, 1, 242, 238, 2, 248, 40, 33, 6, 1, 211, 28, 2, 248, 2, 33, 4, 1, 
+    211, 28, 2, 248, 2, 33, 6, 1, 242, 238, 2, 218, 104, 22, 103, 33, 4, 1, 
+    242, 238, 2, 218, 104, 22, 103, 33, 6, 1, 242, 50, 2, 103, 33, 4, 1, 242, 
+    50, 2, 103, 33, 6, 1, 242, 50, 2, 91, 33, 4, 1, 242, 50, 2, 91, 33, 6, 1, 
+    234, 15, 248, 91, 33, 4, 1, 234, 15, 248, 91, 33, 6, 1, 234, 15, 247, 
+    163, 33, 4, 1, 234, 15, 247, 163, 33, 6, 1, 234, 15, 210, 27, 33, 4, 1, 
+    234, 15, 210, 27, 33, 6, 1, 234, 15, 246, 31, 33, 4, 1, 234, 15, 246, 31, 
+    33, 6, 1, 234, 15, 232, 188, 33, 4, 1, 234, 15, 232, 188, 33, 6, 1, 234, 
+    15, 228, 179, 33, 4, 1, 234, 15, 228, 179, 33, 6, 1, 234, 15, 219, 110, 
+    33, 4, 1, 234, 15, 219, 110, 33, 6, 1, 234, 15, 216, 61, 33, 4, 1, 234, 
+    15, 216, 61, 33, 6, 1, 223, 50, 210, 94, 33, 4, 1, 223, 50, 210, 94, 33, 
+    6, 1, 245, 176, 2, 103, 33, 4, 1, 245, 176, 2, 103, 33, 6, 1, 232, 255, 
+    33, 4, 1, 232, 255, 33, 6, 1, 223, 40, 33, 4, 1, 223, 40, 33, 6, 1, 211, 
+    92, 33, 4, 1, 211, 92, 33, 6, 1, 224, 89, 33, 4, 1, 224, 89, 33, 6, 1, 
+    212, 22, 33, 4, 1, 212, 22, 33, 6, 1, 254, 167, 176, 33, 4, 1, 254, 167, 
+    176, 33, 6, 1, 245, 176, 2, 230, 225, 103, 33, 4, 1, 245, 176, 2, 230, 
+    225, 103, 33, 6, 1, 245, 152, 2, 230, 225, 103, 33, 4, 1, 245, 152, 2, 
+    230, 225, 103, 33, 6, 1, 225, 223, 2, 248, 40, 33, 4, 1, 225, 223, 2, 
+    248, 40, 33, 6, 1, 220, 35, 2, 248, 40, 33, 4, 1, 220, 35, 2, 248, 40, 
+    150, 6, 1, 253, 165, 150, 6, 1, 252, 40, 150, 6, 1, 242, 204, 150, 6, 1, 
+    248, 222, 150, 6, 1, 245, 214, 150, 6, 1, 210, 116, 150, 6, 1, 245, 198, 
+    150, 6, 1, 245, 66, 150, 6, 1, 111, 150, 6, 1, 210, 74, 150, 6, 1, 235, 
+    228, 150, 6, 1, 232, 191, 150, 6, 1, 211, 160, 150, 6, 1, 251, 34, 150, 
+    6, 1, 234, 166, 150, 6, 1, 241, 69, 150, 6, 1, 235, 142, 150, 6, 1, 242, 
+    247, 150, 6, 1, 250, 127, 150, 6, 1, 231, 59, 150, 6, 1, 211, 8, 150, 6, 
+    1, 228, 40, 150, 6, 1, 220, 103, 150, 6, 1, 213, 138, 150, 6, 1, 250, 
+    158, 150, 6, 1, 225, 206, 150, 6, 1, 235, 111, 150, 6, 1, 205, 150, 6, 1, 
+    221, 162, 150, 6, 1, 213, 179, 150, 6, 1, 216, 63, 150, 6, 1, 223, 96, 
+    150, 6, 1, 249, 239, 150, 6, 1, 210, 249, 150, 6, 1, 225, 47, 150, 6, 1, 
+    234, 177, 150, 6, 1, 226, 223, 150, 6, 1, 244, 143, 150, 58, 1, 43, 163, 
+    222, 234, 150, 254, 58, 150, 245, 155, 78, 150, 245, 32, 78, 150, 249, 
+    220, 150, 224, 14, 78, 150, 255, 22, 78, 150, 4, 1, 253, 165, 150, 4, 1, 
+    252, 40, 150, 4, 1, 242, 204, 150, 4, 1, 248, 222, 150, 4, 1, 245, 214, 
+    150, 4, 1, 210, 116, 150, 4, 1, 245, 198, 150, 4, 1, 245, 66, 150, 4, 1, 
+    111, 150, 4, 1, 210, 74, 150, 4, 1, 235, 228, 150, 4, 1, 232, 191, 150, 
+    4, 1, 211, 160, 150, 4, 1, 251, 34, 150, 4, 1, 234, 166, 150, 4, 1, 241, 
+    69, 150, 4, 1, 235, 142, 150, 4, 1, 242, 247, 150, 4, 1, 250, 127, 150, 
+    4, 1, 231, 59, 150, 4, 1, 211, 8, 150, 4, 1, 228, 40, 150, 4, 1, 220, 
+    103, 150, 4, 1, 213, 138, 150, 4, 1, 250, 158, 150, 4, 1, 225, 206, 150, 
+    4, 1, 235, 111, 150, 4, 1, 205, 150, 4, 1, 221, 162, 150, 4, 1, 213, 179, 
+    150, 4, 1, 216, 63, 150, 4, 1, 223, 96, 150, 4, 1, 249, 239, 150, 4, 1, 
+    210, 249, 150, 4, 1, 225, 47, 150, 4, 1, 234, 177, 150, 4, 1, 226, 223, 
+    150, 4, 1, 244, 143, 150, 4, 27, 245, 215, 210, 249, 150, 243, 230, 218, 
+    130, 150, 240, 169, 150, 246, 96, 50, 94, 255, 16, 245, 58, 94, 255, 16, 
+    221, 163, 94, 255, 16, 220, 89, 94, 255, 16, 210, 104, 224, 72, 94, 255, 
+    16, 210, 104, 243, 126, 94, 255, 16, 216, 76, 94, 255, 16, 223, 48, 94, 
+    255, 16, 210, 103, 94, 255, 16, 225, 246, 94, 255, 16, 211, 20, 94, 255, 
+    16, 216, 215, 94, 255, 16, 243, 42, 94, 255, 16, 243, 43, 230, 70, 94, 
+    255, 16, 243, 40, 94, 255, 16, 224, 73, 226, 17, 94, 255, 16, 216, 254, 
+    243, 57, 94, 255, 16, 225, 227, 94, 255, 16, 253, 201, 242, 42, 94, 255, 
+    16, 230, 80, 94, 255, 16, 231, 209, 94, 255, 16, 231, 50, 94, 255, 16, 
+    231, 51, 234, 178, 94, 255, 16, 248, 164, 94, 255, 16, 224, 84, 94, 255, 
+    16, 216, 254, 224, 68, 94, 255, 16, 211, 30, 252, 41, 210, 230, 94, 255, 
+    16, 226, 208, 94, 255, 16, 236, 20, 94, 255, 16, 248, 71, 94, 255, 16, 
+    210, 33, 94, 164, 231, 144, 250, 36, 94, 225, 12, 220, 37, 94, 225, 12, 
+    241, 251, 221, 163, 94, 225, 12, 241, 251, 225, 240, 94, 225, 12, 241, 
+    251, 224, 77, 94, 225, 12, 241, 159, 94, 225, 12, 215, 177, 94, 225, 12, 
+    221, 163, 94, 225, 12, 225, 240, 94, 225, 12, 224, 77, 94, 225, 12, 241, 
+    62, 94, 225, 12, 241, 63, 241, 253, 31, 214, 3, 94, 225, 12, 224, 18, 94, 
+    225, 12, 248, 209, 177, 231, 172, 94, 225, 12, 231, 39, 94, 224, 142, 
+    231, 169, 94, 225, 12, 223, 170, 94, 224, 142, 225, 248, 94, 225, 12, 
+    220, 22, 247, 121, 94, 225, 12, 219, 160, 247, 121, 94, 224, 142, 219, 
+    54, 225, 242, 94, 164, 214, 160, 247, 121, 94, 164, 232, 109, 247, 121, 
+    94, 224, 142, 227, 196, 242, 41, 94, 225, 12, 224, 78, 224, 72, 94, 1, 
+    254, 171, 94, 1, 252, 29, 94, 1, 242, 202, 94, 1, 248, 190, 94, 1, 241, 
+    239, 94, 1, 214, 3, 94, 1, 210, 97, 94, 1, 241, 198, 94, 1, 216, 231, 94, 
+    1, 210, 233, 94, 1, 40, 234, 251, 94, 1, 234, 251, 94, 1, 233, 95, 94, 1, 
+    40, 231, 66, 94, 1, 231, 66, 94, 1, 40, 227, 195, 94, 1, 227, 195, 94, 1, 
+    221, 250, 94, 1, 253, 163, 94, 1, 40, 225, 222, 94, 1, 225, 222, 94, 1, 
+    40, 215, 180, 94, 1, 215, 180, 94, 1, 224, 40, 94, 1, 223, 68, 94, 1, 
+    220, 21, 94, 1, 217, 39, 94, 27, 211, 6, 52, 214, 3, 94, 27, 211, 6, 214, 
+    4, 210, 233, 94, 27, 211, 6, 52, 210, 233, 94, 224, 142, 243, 42, 94, 
+    224, 142, 243, 40, 10, 54, 50, 10, 5, 221, 243, 10, 244, 31, 231, 155, 
+    10, 5, 222, 24, 10, 5, 221, 246, 254, 38, 249, 110, 222, 194, 254, 38, 
+    244, 5, 222, 194, 10, 223, 135, 254, 38, 225, 184, 230, 194, 50, 254, 38, 
+    225, 184, 216, 249, 216, 149, 50, 254, 222, 50, 10, 249, 220, 10, 248, 
+    151, 220, 138, 10, 225, 14, 213, 241, 50, 10, 5, 230, 175, 10, 5, 222, 4, 
+    254, 173, 212, 45, 10, 5, 254, 173, 253, 222, 10, 5, 223, 168, 254, 172, 
+    10, 5, 223, 176, 254, 153, 254, 105, 10, 5, 217, 71, 10, 4, 125, 217, 81, 
+    10, 4, 125, 27, 112, 2, 233, 104, 2, 211, 43, 10, 4, 125, 210, 108, 10, 
+    4, 244, 166, 10, 4, 248, 185, 10, 4, 234, 206, 10, 220, 151, 10, 215, 
+    212, 59, 224, 142, 78, 10, 224, 14, 78, 10, 1, 234, 210, 211, 43, 10, 1, 
+    242, 20, 10, 1, 112, 2, 231, 229, 48, 10, 1, 112, 2, 202, 48, 10, 1, 212, 
+    31, 2, 202, 48, 10, 1, 112, 2, 202, 51, 10, 1, 79, 2, 202, 48, 10, 1, 
+    254, 171, 10, 1, 252, 55, 10, 1, 217, 9, 231, 165, 10, 1, 217, 8, 10, 1, 
+    216, 193, 10, 1, 235, 124, 10, 1, 242, 38, 10, 1, 234, 130, 10, 1, 248, 
+    196, 10, 1, 216, 203, 10, 1, 223, 96, 10, 1, 210, 108, 10, 1, 221, 167, 
+    10, 1, 220, 60, 10, 1, 222, 27, 10, 1, 248, 217, 10, 1, 217, 81, 10, 1, 
+    210, 111, 10, 1, 254, 197, 10, 1, 242, 245, 10, 1, 234, 176, 2, 113, 170, 
+    48, 10, 1, 234, 176, 2, 134, 170, 51, 10, 1, 244, 169, 79, 2, 235, 194, 
+    214, 105, 10, 1, 244, 169, 79, 2, 113, 170, 48, 10, 1, 244, 169, 79, 2, 
+    134, 170, 48, 10, 217, 44, 10, 1, 244, 143, 10, 1, 224, 82, 10, 1, 234, 
+    251, 10, 1, 233, 103, 10, 1, 231, 79, 10, 1, 228, 63, 10, 1, 241, 219, 
+    10, 1, 212, 30, 10, 1, 112, 231, 193, 10, 1, 211, 43, 10, 244, 164, 10, 
+    248, 183, 10, 234, 204, 10, 244, 166, 10, 248, 185, 10, 234, 206, 10, 
+    220, 94, 10, 218, 46, 10, 231, 227, 48, 10, 202, 48, 10, 202, 51, 10, 
+    218, 66, 254, 171, 10, 235, 194, 248, 185, 10, 164, 228, 64, 242, 219, 
+    10, 209, 255, 10, 25, 5, 4, 214, 106, 48, 10, 25, 5, 235, 194, 4, 214, 
+    106, 48, 10, 25, 5, 59, 51, 10, 223, 50, 248, 185, 10, 244, 167, 2, 113, 
+    247, 119, 10, 212, 32, 202, 51, 254, 38, 21, 210, 86, 254, 38, 21, 110, 
+    254, 38, 21, 105, 254, 38, 21, 158, 254, 38, 21, 161, 254, 38, 21, 189, 
+    254, 38, 21, 194, 254, 38, 21, 198, 254, 38, 21, 195, 254, 38, 21, 200, 
+    10, 225, 183, 50, 10, 248, 84, 220, 138, 10, 216, 147, 220, 138, 10, 244, 
+    82, 225, 10, 218, 157, 10, 1, 247, 120, 252, 55, 10, 1, 247, 120, 224, 
+    82, 10, 1, 218, 24, 254, 171, 10, 1, 112, 212, 46, 10, 1, 112, 2, 212, 
+    32, 202, 48, 10, 1, 112, 2, 212, 32, 202, 51, 10, 1, 125, 242, 20, 10, 1, 
+    125, 202, 254, 171, 10, 1, 125, 202, 212, 30, 10, 1, 104, 2, 202, 48, 10, 
+    1, 125, 202, 211, 43, 10, 1, 215, 149, 10, 1, 215, 147, 10, 1, 252, 65, 
+    10, 1, 217, 9, 2, 222, 234, 10, 1, 217, 9, 2, 134, 170, 77, 246, 104, 10, 
+    1, 225, 206, 10, 1, 217, 6, 10, 1, 252, 53, 10, 1, 122, 2, 202, 48, 10, 
+    1, 122, 2, 113, 170, 67, 48, 10, 1, 227, 154, 10, 1, 246, 44, 10, 1, 122, 
+    2, 134, 170, 48, 10, 1, 217, 27, 10, 1, 217, 25, 10, 1, 248, 131, 10, 1, 
+    248, 197, 2, 222, 234, 10, 1, 248, 197, 2, 59, 51, 10, 1, 248, 197, 2, 
+    59, 252, 44, 22, 4, 217, 81, 10, 1, 248, 202, 10, 1, 248, 133, 10, 1, 
+    246, 71, 10, 1, 248, 197, 2, 134, 170, 77, 246, 104, 10, 1, 248, 197, 2, 
+    244, 12, 170, 48, 10, 1, 222, 172, 10, 1, 223, 97, 2, 4, 214, 105, 10, 1, 
+    223, 97, 2, 222, 234, 10, 1, 223, 97, 2, 59, 51, 10, 1, 223, 97, 2, 4, 
+    214, 106, 51, 10, 1, 223, 97, 2, 59, 252, 44, 22, 59, 48, 10, 1, 223, 97, 
+    2, 113, 170, 48, 10, 1, 235, 121, 10, 1, 223, 97, 2, 244, 12, 170, 48, 
+    10, 1, 221, 168, 2, 59, 252, 44, 22, 59, 48, 10, 1, 221, 168, 2, 134, 
+    170, 51, 10, 1, 221, 168, 2, 134, 170, 252, 44, 22, 134, 170, 48, 10, 1, 
+    222, 28, 2, 113, 170, 51, 10, 1, 222, 28, 2, 134, 170, 48, 10, 1, 217, 
+    82, 2, 134, 170, 48, 10, 1, 254, 198, 2, 134, 170, 48, 10, 1, 247, 120, 
+    244, 143, 10, 1, 244, 144, 2, 59, 230, 110, 51, 10, 1, 244, 144, 2, 59, 
+    51, 10, 1, 213, 248, 10, 1, 244, 144, 2, 134, 170, 51, 10, 1, 225, 204, 
+    10, 1, 224, 83, 2, 59, 48, 10, 1, 224, 83, 2, 134, 170, 48, 10, 1, 234, 
+    175, 10, 1, 217, 251, 234, 251, 10, 1, 234, 252, 2, 222, 234, 10, 1, 234, 
+    252, 2, 59, 48, 10, 1, 229, 80, 10, 1, 234, 252, 2, 134, 170, 51, 10, 1, 
+    243, 123, 10, 1, 243, 124, 2, 222, 234, 10, 1, 229, 3, 10, 1, 243, 124, 
+    2, 113, 170, 51, 10, 1, 242, 102, 10, 1, 243, 124, 2, 134, 170, 48, 10, 
+    1, 233, 104, 2, 4, 214, 105, 10, 1, 233, 104, 2, 59, 48, 10, 1, 233, 104, 
+    2, 134, 170, 48, 10, 1, 233, 104, 2, 134, 170, 51, 10, 1, 228, 64, 2, 59, 
+    51, 10, 1, 228, 64, 242, 219, 10, 1, 222, 215, 10, 1, 228, 64, 2, 222, 
+    234, 10, 1, 228, 64, 2, 134, 170, 48, 10, 1, 241, 220, 247, 142, 10, 1, 
+    217, 28, 2, 59, 48, 10, 1, 241, 220, 2, 79, 48, 10, 1, 241, 220, 242, 
+    172, 10, 1, 241, 220, 242, 173, 2, 202, 48, 10, 1, 217, 9, 231, 166, 242, 
+    172, 10, 1, 212, 31, 2, 222, 234, 10, 1, 234, 74, 226, 235, 10, 1, 226, 
+    235, 10, 1, 70, 10, 1, 210, 212, 10, 1, 234, 74, 210, 212, 10, 1, 212, 
+    31, 2, 113, 170, 48, 10, 1, 213, 255, 10, 1, 244, 169, 211, 43, 10, 1, 
+    79, 2, 217, 78, 10, 1, 79, 2, 4, 214, 105, 10, 1, 212, 31, 2, 59, 48, 10, 
+    1, 75, 10, 1, 79, 2, 134, 170, 51, 10, 1, 79, 252, 133, 10, 1, 79, 252, 
+    134, 2, 202, 48, 10, 243, 230, 218, 130, 10, 1, 254, 244, 10, 4, 125, 27, 
+    222, 28, 2, 233, 104, 2, 112, 231, 193, 10, 4, 125, 27, 224, 83, 2, 233, 
+    104, 2, 112, 231, 193, 10, 4, 125, 66, 65, 17, 10, 4, 125, 233, 104, 254, 
+    171, 10, 4, 125, 235, 124, 10, 4, 125, 134, 247, 119, 10, 4, 125, 221, 
+    167, 10, 245, 144, 64, 253, 167, 10, 218, 153, 64, 222, 139, 245, 176, 
+    241, 156, 10, 4, 125, 222, 184, 210, 86, 10, 4, 125, 214, 159, 223, 116, 
+    210, 86, 10, 4, 125, 247, 120, 241, 237, 64, 234, 130, 10, 4, 125, 66, 
+    53, 17, 10, 4, 121, 221, 167, 10, 4, 125, 231, 228, 10, 4, 212, 30, 10, 
+    4, 211, 43, 10, 4, 125, 211, 43, 10, 4, 125, 228, 63, 10, 225, 42, 64, 
+    222, 14, 10, 245, 153, 250, 176, 121, 218, 130, 10, 245, 153, 250, 176, 
+    125, 218, 130, 10, 222, 184, 125, 218, 131, 2, 244, 105, 250, 175, 10, 4, 
+    121, 231, 79, 10, 1, 248, 197, 2, 235, 194, 214, 105, 10, 1, 223, 97, 2, 
+    235, 194, 214, 105, 245, 23, 254, 38, 21, 210, 86, 245, 23, 254, 38, 21, 
+    110, 245, 23, 254, 38, 21, 105, 245, 23, 254, 38, 21, 158, 245, 23, 254, 
+    38, 21, 161, 245, 23, 254, 38, 21, 189, 245, 23, 254, 38, 21, 194, 245, 
+    23, 254, 38, 21, 198, 245, 23, 254, 38, 21, 195, 245, 23, 254, 38, 21, 
+    200, 10, 1, 220, 61, 2, 59, 51, 10, 1, 248, 218, 2, 59, 51, 10, 1, 242, 
+    246, 2, 59, 51, 10, 5, 219, 159, 254, 127, 10, 5, 219, 159, 224, 236, 
+    231, 59, 10, 1, 241, 220, 2, 235, 194, 214, 105, 182, 245, 144, 64, 226, 
+    15, 182, 218, 20, 243, 230, 218, 130, 182, 218, 68, 243, 230, 218, 130, 
+    182, 218, 20, 249, 227, 182, 218, 68, 249, 227, 182, 203, 249, 227, 182, 
+    249, 228, 219, 107, 233, 47, 182, 249, 228, 219, 107, 222, 252, 182, 218, 
+    20, 249, 228, 219, 107, 233, 47, 182, 218, 68, 249, 228, 219, 107, 222, 
+    252, 182, 249, 181, 182, 242, 2, 226, 251, 182, 242, 2, 231, 37, 182, 
+    242, 2, 253, 219, 182, 255, 22, 78, 182, 1, 254, 175, 182, 1, 218, 24, 
+    254, 175, 182, 1, 252, 26, 182, 1, 243, 114, 182, 1, 243, 115, 243, 92, 
+    182, 1, 248, 193, 182, 1, 247, 120, 248, 194, 222, 230, 182, 1, 241, 239, 
+    182, 1, 212, 30, 182, 1, 210, 108, 182, 1, 241, 196, 182, 1, 216, 227, 
+    182, 1, 216, 228, 243, 92, 182, 1, 210, 199, 182, 1, 210, 200, 241, 239, 
+    182, 1, 234, 226, 182, 1, 233, 102, 182, 1, 230, 191, 182, 1, 227, 195, 
+    182, 1, 220, 144, 182, 1, 40, 220, 144, 182, 1, 75, 182, 1, 225, 222, 
+    182, 1, 223, 50, 225, 222, 182, 1, 222, 25, 182, 1, 224, 76, 182, 1, 222, 
+    230, 182, 1, 220, 21, 182, 1, 217, 37, 182, 1, 225, 170, 252, 13, 182, 1, 
+    225, 170, 242, 243, 182, 1, 225, 170, 248, 21, 182, 224, 152, 48, 182, 
+    224, 152, 51, 182, 224, 152, 246, 118, 182, 210, 17, 48, 182, 210, 17, 
+    51, 182, 210, 17, 246, 118, 182, 223, 132, 48, 182, 223, 132, 51, 182, 
+    246, 119, 210, 24, 241, 45, 182, 246, 119, 210, 24, 254, 106, 182, 241, 
+    242, 48, 182, 241, 242, 51, 182, 241, 241, 246, 118, 182, 245, 80, 48, 
+    182, 245, 80, 51, 182, 222, 108, 182, 244, 137, 247, 121, 182, 223, 249, 
+    182, 222, 135, 182, 113, 67, 170, 48, 182, 113, 67, 170, 51, 182, 134, 
+    170, 48, 182, 134, 170, 51, 182, 226, 249, 232, 215, 48, 182, 226, 249, 
+    232, 215, 51, 182, 230, 57, 182, 252, 132, 182, 1, 219, 50, 210, 80, 182, 
+    1, 219, 50, 234, 123, 182, 1, 219, 50, 244, 155, 10, 1, 252, 56, 2, 134, 
+    170, 240, 251, 51, 10, 1, 252, 56, 2, 59, 252, 44, 22, 134, 170, 48, 10, 
+    1, 252, 56, 2, 134, 170, 225, 8, 214, 153, 51, 10, 1, 252, 56, 2, 134, 
+    170, 225, 8, 214, 153, 252, 44, 22, 113, 170, 48, 10, 1, 252, 56, 2, 113, 
+    170, 252, 44, 22, 59, 48, 10, 1, 252, 56, 2, 235, 194, 4, 214, 106, 51, 
+    10, 1, 252, 56, 2, 4, 214, 105, 10, 1, 122, 2, 113, 170, 48, 10, 1, 122, 
+    2, 134, 170, 225, 8, 214, 153, 51, 10, 1, 248, 197, 2, 113, 170, 213, 
+    189, 252, 44, 22, 4, 217, 81, 10, 1, 248, 197, 2, 235, 194, 4, 214, 106, 
+    51, 10, 1, 223, 97, 2, 91, 10, 1, 221, 168, 2, 244, 12, 170, 48, 10, 1, 
+    254, 198, 2, 113, 170, 48, 10, 1, 254, 198, 2, 134, 170, 225, 8, 246, 
+    105, 48, 10, 1, 254, 198, 2, 113, 170, 213, 189, 48, 10, 1, 244, 144, 2, 
+    113, 170, 51, 10, 1, 244, 144, 2, 134, 170, 225, 8, 214, 153, 51, 10, 1, 
+    234, 176, 2, 59, 48, 10, 1, 234, 176, 2, 134, 170, 48, 10, 1, 234, 176, 
+    2, 134, 170, 225, 8, 214, 153, 51, 10, 1, 66, 2, 59, 48, 10, 1, 66, 2, 
+    59, 51, 10, 1, 228, 64, 2, 113, 170, 51, 10, 1, 228, 64, 2, 4, 217, 81, 
+    10, 1, 228, 64, 2, 4, 214, 105, 10, 1, 233, 104, 2, 130, 10, 1, 223, 97, 
+    2, 113, 170, 213, 189, 48, 10, 1, 223, 97, 2, 202, 48, 10, 1, 221, 168, 
+    2, 113, 170, 213, 189, 48, 10, 1, 122, 2, 4, 10, 1, 217, 82, 51, 10, 1, 
+    122, 2, 4, 10, 1, 217, 82, 22, 113, 247, 119, 10, 1, 221, 168, 2, 4, 10, 
+    1, 217, 82, 22, 113, 247, 119, 10, 1, 223, 97, 2, 4, 10, 1, 217, 82, 22, 
+    113, 247, 119, 10, 1, 122, 2, 4, 10, 1, 217, 82, 48, 10, 1, 112, 2, 245, 
+    23, 254, 38, 21, 113, 48, 10, 1, 112, 2, 245, 23, 254, 38, 21, 134, 48, 
+    10, 1, 244, 169, 79, 2, 245, 23, 254, 38, 21, 113, 48, 10, 1, 244, 169, 
+    79, 2, 245, 23, 254, 38, 21, 134, 48, 10, 1, 244, 169, 79, 2, 245, 23, 
+    254, 38, 21, 244, 12, 51, 10, 1, 212, 31, 2, 245, 23, 254, 38, 21, 113, 
+    48, 10, 1, 212, 31, 2, 245, 23, 254, 38, 21, 134, 48, 10, 1, 79, 252, 
+    134, 2, 245, 23, 254, 38, 21, 113, 48, 10, 1, 79, 252, 134, 2, 245, 23, 
+    254, 38, 21, 134, 48, 10, 1, 122, 2, 245, 23, 254, 38, 21, 244, 12, 51, 
+    10, 1, 221, 168, 2, 245, 23, 254, 38, 21, 244, 12, 48, 10, 1, 221, 168, 
+    2, 235, 194, 214, 105, 10, 1, 234, 252, 2, 113, 170, 48, 216, 206, 1, 
+    242, 47, 216, 206, 1, 220, 69, 216, 206, 1, 228, 62, 216, 206, 1, 223, 
+    185, 216, 206, 1, 252, 190, 216, 206, 1, 232, 252, 216, 206, 1, 235, 9, 
+    216, 206, 1, 254, 160, 216, 206, 1, 214, 25, 216, 206, 1, 231, 78, 216, 
+    206, 1, 244, 195, 216, 206, 1, 248, 24, 216, 206, 1, 216, 208, 216, 206, 
+    1, 233, 132, 216, 206, 1, 243, 132, 216, 206, 1, 242, 178, 216, 206, 1, 
+    221, 166, 216, 206, 1, 248, 149, 216, 206, 1, 210, 100, 216, 206, 1, 217, 
+    38, 216, 206, 1, 211, 103, 216, 206, 1, 225, 234, 216, 206, 1, 235, 129, 
+    216, 206, 1, 250, 135, 216, 206, 1, 215, 156, 216, 206, 1, 241, 189, 216, 
+    206, 1, 234, 132, 216, 206, 1, 216, 207, 216, 206, 1, 210, 115, 216, 206, 
+    1, 220, 59, 216, 206, 1, 222, 31, 216, 206, 1, 248, 220, 216, 206, 1, 
+    111, 216, 206, 1, 210, 23, 216, 206, 1, 254, 194, 216, 206, 1, 242, 244, 
+    216, 206, 1, 224, 86, 216, 206, 1, 212, 63, 216, 206, 255, 23, 216, 206, 
+    255, 39, 216, 206, 240, 115, 216, 206, 245, 209, 216, 206, 214, 222, 216, 
+    206, 226, 183, 216, 206, 245, 217, 216, 206, 245, 17, 216, 206, 226, 248, 
+    216, 206, 227, 0, 216, 206, 218, 46, 216, 206, 1, 229, 226, 228, 138, 21, 
+    210, 86, 228, 138, 21, 110, 228, 138, 21, 105, 228, 138, 21, 158, 228, 
+    138, 21, 161, 228, 138, 21, 189, 228, 138, 21, 194, 228, 138, 21, 198, 
+    228, 138, 21, 195, 228, 138, 21, 200, 228, 138, 1, 61, 228, 138, 1, 245, 
+    210, 228, 138, 1, 73, 228, 138, 1, 75, 228, 138, 1, 70, 228, 138, 1, 226, 
+    184, 228, 138, 1, 76, 228, 138, 1, 248, 210, 228, 138, 1, 230, 26, 228, 
+    138, 1, 252, 192, 228, 138, 1, 190, 228, 138, 1, 217, 106, 228, 138, 1, 
+    235, 142, 228, 138, 1, 250, 158, 228, 138, 1, 248, 222, 228, 138, 1, 205, 
+    228, 138, 1, 222, 180, 228, 138, 1, 206, 228, 138, 1, 243, 80, 228, 138, 
+    1, 244, 197, 228, 138, 1, 176, 228, 138, 1, 233, 136, 228, 138, 1, 229, 
+    230, 211, 223, 228, 138, 1, 185, 228, 138, 1, 227, 166, 228, 138, 1, 197, 
+    228, 138, 1, 162, 228, 138, 1, 212, 65, 228, 138, 1, 191, 228, 138, 1, 
+    227, 167, 211, 223, 228, 138, 1, 235, 62, 235, 142, 228, 138, 1, 235, 62, 
+    250, 158, 228, 138, 1, 235, 62, 205, 228, 138, 38, 219, 252, 125, 216, 
+    31, 228, 138, 38, 219, 252, 121, 216, 31, 228, 138, 38, 219, 252, 222, 
+    229, 216, 31, 228, 138, 38, 199, 248, 39, 216, 31, 228, 138, 38, 199, 
+    125, 216, 31, 228, 138, 38, 199, 121, 216, 31, 228, 138, 38, 199, 222, 
+    229, 216, 31, 228, 138, 38, 229, 194, 78, 228, 138, 38, 52, 59, 48, 228, 
+    138, 125, 138, 254, 58, 228, 138, 121, 138, 254, 58, 228, 138, 16, 226, 
+    185, 248, 51, 228, 138, 16, 243, 79, 228, 138, 249, 220, 228, 138, 245, 
+    32, 78, 228, 138, 233, 109, 221, 253, 1, 254, 177, 221, 253, 1, 251, 229, 
+    221, 253, 1, 243, 113, 221, 253, 1, 248, 195, 221, 253, 1, 235, 153, 221, 
+    253, 1, 252, 190, 221, 253, 1, 210, 89, 221, 253, 1, 235, 161, 221, 253, 
+    1, 216, 68, 221, 253, 1, 210, 182, 221, 253, 1, 235, 10, 221, 253, 1, 
+    233, 129, 221, 253, 1, 230, 191, 221, 253, 1, 227, 195, 221, 253, 1, 219, 
+    157, 221, 253, 1, 236, 0, 221, 253, 1, 244, 122, 221, 253, 1, 215, 182, 
+    221, 253, 1, 224, 11, 221, 253, 1, 222, 230, 221, 253, 1, 220, 86, 221, 
+    253, 1, 217, 101, 221, 253, 164, 236, 0, 221, 253, 164, 235, 255, 221, 
+    253, 164, 226, 244, 221, 253, 164, 248, 208, 221, 253, 58, 1, 245, 106, 
+    210, 182, 221, 253, 164, 245, 106, 210, 182, 221, 253, 25, 5, 199, 75, 
+    221, 253, 25, 5, 75, 221, 253, 25, 5, 226, 119, 255, 74, 221, 253, 25, 5, 
+    199, 255, 74, 221, 253, 25, 5, 255, 74, 221, 253, 25, 5, 226, 119, 61, 
+    221, 253, 25, 5, 199, 61, 221, 253, 25, 5, 61, 221, 253, 58, 1, 219, 252, 
+    61, 221, 253, 25, 5, 219, 252, 61, 221, 253, 25, 5, 199, 70, 221, 253, 
+    25, 5, 70, 221, 253, 58, 1, 73, 221, 253, 25, 5, 199, 73, 221, 253, 25, 
+    5, 73, 221, 253, 25, 5, 76, 221, 253, 25, 5, 218, 46, 221, 253, 164, 229, 
+    93, 221, 253, 224, 142, 229, 93, 221, 253, 224, 142, 254, 219, 221, 253, 
+    224, 142, 254, 115, 221, 253, 224, 142, 252, 115, 221, 253, 224, 142, 
+    253, 202, 221, 253, 224, 142, 220, 9, 221, 253, 255, 22, 78, 221, 253, 
+    224, 142, 231, 69, 224, 46, 221, 253, 224, 142, 210, 31, 221, 253, 224, 
+    142, 224, 46, 221, 253, 224, 142, 210, 114, 221, 253, 224, 142, 215, 90, 
+    221, 253, 224, 142, 254, 10, 221, 253, 224, 142, 219, 54, 231, 146, 221, 
+    253, 224, 142, 254, 101, 231, 183, 1, 242, 25, 231, 183, 1, 255, 26, 231, 
+    183, 1, 254, 217, 231, 183, 1, 255, 0, 231, 183, 1, 254, 210, 231, 183, 
+    1, 214, 124, 231, 183, 1, 253, 161, 231, 183, 1, 235, 161, 231, 183, 1, 
+    253, 199, 231, 183, 1, 254, 182, 231, 183, 1, 254, 187, 231, 183, 1, 254, 
+    179, 231, 183, 1, 254, 137, 231, 183, 1, 254, 124, 231, 183, 1, 253, 238, 
+    231, 183, 1, 236, 0, 231, 183, 1, 254, 73, 231, 183, 1, 253, 209, 231, 
+    183, 1, 254, 46, 231, 183, 1, 254, 42, 231, 183, 1, 253, 232, 231, 183, 
+    1, 253, 207, 231, 183, 1, 246, 56, 231, 183, 1, 235, 3, 231, 183, 1, 254, 
+    197, 231, 183, 254, 223, 78, 231, 183, 213, 136, 78, 231, 183, 243, 54, 
+    78, 231, 183, 224, 141, 10, 1, 252, 56, 2, 4, 214, 106, 51, 10, 1, 151, 
+    2, 113, 170, 48, 10, 1, 217, 82, 2, 113, 170, 48, 10, 1, 244, 144, 2, 59, 
+    252, 44, 22, 134, 170, 48, 10, 1, 224, 83, 2, 59, 51, 10, 1, 233, 104, 2, 
+    52, 130, 10, 1, 66, 2, 134, 170, 48, 10, 1, 79, 2, 113, 170, 252, 44, 22, 
+    202, 48, 10, 1, 79, 2, 113, 170, 252, 44, 22, 59, 48, 10, 1, 223, 97, 2, 
+    232, 124, 10, 1, 212, 31, 2, 59, 211, 231, 10, 1, 222, 202, 211, 43, 10, 
+    249, 100, 244, 166, 10, 249, 100, 248, 185, 10, 249, 100, 234, 206, 10, 
+    249, 100, 244, 164, 10, 249, 100, 248, 183, 10, 249, 100, 234, 204, 10, 
+    138, 123, 59, 48, 10, 138, 113, 170, 48, 10, 138, 232, 125, 48, 10, 138, 
+    123, 59, 51, 10, 138, 113, 170, 51, 10, 138, 232, 125, 51, 10, 204, 244, 
+    164, 10, 204, 248, 183, 10, 204, 234, 204, 10, 4, 125, 212, 30, 10, 244, 
+    167, 2, 222, 234, 10, 244, 167, 2, 59, 48, 10, 234, 207, 2, 59, 51, 10, 
+    43, 253, 251, 48, 10, 44, 253, 251, 48, 10, 43, 253, 251, 51, 10, 44, 
+    253, 251, 51, 10, 52, 44, 253, 251, 48, 10, 52, 44, 253, 251, 77, 2, 247, 
+    121, 10, 44, 253, 251, 77, 2, 247, 121, 10, 248, 186, 2, 247, 121, 84, 5, 
+    235, 194, 251, 0, 84, 5, 251, 0, 84, 5, 254, 76, 84, 5, 213, 147, 84, 1, 
+    219, 252, 61, 84, 1, 61, 84, 1, 255, 74, 84, 1, 73, 84, 1, 236, 34, 84, 
+    1, 70, 84, 1, 214, 118, 84, 1, 149, 153, 84, 1, 149, 156, 84, 1, 251, 3, 
+    75, 84, 1, 219, 252, 75, 84, 1, 75, 84, 1, 254, 202, 84, 1, 251, 3, 76, 
+    84, 1, 219, 252, 76, 84, 1, 76, 84, 1, 253, 193, 84, 1, 176, 84, 1, 234, 
+    133, 84, 1, 243, 136, 84, 1, 242, 250, 84, 1, 229, 78, 84, 1, 251, 34, 
+    84, 1, 250, 158, 84, 1, 235, 142, 84, 1, 235, 115, 84, 1, 227, 166, 84, 
+    1, 215, 157, 84, 1, 215, 145, 84, 1, 248, 136, 84, 1, 248, 120, 84, 1, 
+    228, 111, 84, 1, 217, 106, 84, 1, 216, 209, 84, 1, 248, 222, 84, 1, 248, 
+    26, 84, 1, 197, 84, 1, 228, 93, 84, 1, 190, 84, 1, 225, 148, 84, 1, 252, 
+    192, 84, 1, 252, 19, 84, 1, 185, 84, 1, 191, 84, 1, 205, 84, 1, 222, 180, 
+    84, 1, 233, 136, 84, 1, 232, 185, 84, 1, 232, 176, 84, 1, 214, 27, 84, 1, 
+    220, 103, 84, 1, 218, 224, 84, 1, 206, 84, 1, 162, 84, 25, 5, 226, 235, 
+    84, 25, 5, 226, 182, 84, 5, 227, 206, 84, 5, 253, 176, 84, 25, 5, 255, 
+    74, 84, 25, 5, 73, 84, 25, 5, 236, 34, 84, 25, 5, 70, 84, 25, 5, 214, 
+    118, 84, 25, 5, 149, 153, 84, 25, 5, 149, 222, 181, 84, 25, 5, 251, 3, 
+    75, 84, 25, 5, 219, 252, 75, 84, 25, 5, 75, 84, 25, 5, 254, 202, 84, 25, 
+    5, 251, 3, 76, 84, 25, 5, 219, 252, 76, 84, 25, 5, 76, 84, 25, 5, 253, 
+    193, 84, 5, 213, 152, 84, 25, 5, 224, 186, 75, 84, 25, 5, 253, 172, 84, 
+    226, 205, 84, 218, 112, 5, 214, 216, 84, 218, 112, 5, 254, 78, 84, 242, 
+    138, 255, 15, 84, 255, 4, 255, 15, 84, 25, 5, 251, 3, 199, 75, 84, 25, 5, 
+    214, 214, 84, 25, 5, 214, 117, 84, 1, 224, 89, 84, 1, 234, 116, 84, 1, 
+    242, 227, 84, 1, 210, 116, 84, 1, 248, 125, 84, 1, 223, 40, 84, 1, 244, 
+    197, 84, 1, 210, 168, 84, 1, 149, 222, 181, 84, 1, 149, 232, 186, 84, 25, 
+    5, 149, 156, 84, 25, 5, 149, 232, 186, 84, 248, 179, 84, 52, 248, 179, 
+    84, 21, 210, 86, 84, 21, 110, 84, 21, 105, 84, 21, 158, 84, 21, 161, 84, 
+    21, 189, 84, 21, 194, 84, 21, 198, 84, 21, 195, 84, 21, 200, 84, 255, 22, 
+    50, 84, 5, 125, 219, 18, 247, 121, 84, 1, 251, 3, 61, 84, 1, 226, 235, 
+    84, 1, 226, 182, 84, 1, 253, 172, 84, 1, 214, 214, 84, 1, 214, 117, 84, 
+    1, 210, 82, 84, 1, 114, 191, 84, 1, 243, 30, 84, 1, 235, 97, 84, 1, 242, 
+    181, 218, 130, 84, 1, 248, 126, 84, 1, 252, 112, 146, 5, 251, 0, 146, 5, 
+    254, 76, 146, 5, 213, 147, 146, 1, 61, 146, 1, 255, 74, 146, 1, 73, 146, 
+    1, 236, 34, 146, 1, 70, 146, 1, 214, 118, 146, 1, 149, 153, 146, 1, 149, 
+    156, 146, 1, 75, 146, 1, 254, 202, 146, 1, 76, 146, 1, 253, 193, 146, 1, 
+    176, 146, 1, 234, 133, 146, 1, 243, 136, 146, 1, 242, 250, 146, 1, 229, 
+    78, 146, 1, 251, 34, 146, 1, 250, 158, 146, 1, 235, 142, 146, 1, 235, 
+    115, 146, 1, 227, 166, 146, 1, 215, 157, 146, 1, 215, 145, 146, 1, 248, 
+    136, 146, 1, 248, 120, 146, 1, 228, 111, 146, 1, 217, 106, 146, 1, 216, 
+    209, 146, 1, 248, 222, 146, 1, 248, 26, 146, 1, 197, 146, 1, 190, 146, 1, 
+    225, 148, 146, 1, 252, 192, 146, 1, 252, 19, 146, 1, 185, 146, 1, 191, 
+    146, 1, 205, 146, 1, 233, 136, 146, 1, 220, 103, 146, 1, 218, 224, 146, 
+    1, 206, 146, 1, 162, 146, 5, 227, 206, 146, 5, 253, 176, 146, 25, 5, 255, 
+    74, 146, 25, 5, 73, 146, 25, 5, 236, 34, 146, 25, 5, 70, 146, 25, 5, 214, 
+    118, 146, 25, 5, 149, 153, 146, 25, 5, 149, 222, 181, 146, 25, 5, 75, 
+    146, 25, 5, 254, 202, 146, 25, 5, 76, 146, 25, 5, 253, 193, 146, 5, 213, 
+    152, 146, 1, 234, 125, 217, 106, 146, 253, 194, 233, 24, 78, 146, 1, 222, 
+    180, 146, 1, 223, 40, 146, 1, 210, 168, 146, 1, 149, 222, 181, 146, 1, 
+    149, 232, 186, 146, 25, 5, 149, 156, 146, 25, 5, 149, 232, 186, 146, 21, 
+    210, 86, 146, 21, 110, 146, 21, 105, 146, 21, 158, 146, 21, 161, 146, 21, 
+    189, 146, 21, 194, 146, 21, 198, 146, 21, 195, 146, 21, 200, 146, 1, 223, 
+    189, 2, 230, 225, 247, 255, 146, 1, 223, 189, 2, 232, 109, 247, 255, 146, 
+    222, 119, 78, 146, 222, 119, 50, 146, 249, 99, 227, 198, 110, 146, 249, 
+    99, 227, 198, 105, 146, 249, 99, 227, 198, 158, 146, 249, 99, 227, 198, 
+    161, 146, 249, 99, 227, 198, 123, 233, 17, 216, 202, 216, 197, 248, 49, 
+    146, 249, 99, 248, 50, 219, 120, 146, 235, 162, 146, 243, 104, 78, 184, 
+    5, 254, 255, 251, 244, 184, 5, 251, 244, 184, 5, 213, 147, 184, 1, 61, 
+    184, 1, 255, 74, 184, 1, 73, 184, 1, 236, 34, 184, 1, 70, 184, 1, 214, 
+    118, 184, 1, 245, 210, 184, 1, 254, 202, 184, 1, 226, 184, 184, 1, 253, 
+    193, 184, 1, 176, 184, 1, 234, 133, 184, 1, 243, 136, 184, 1, 242, 250, 
+    184, 1, 229, 78, 184, 1, 251, 34, 184, 1, 250, 158, 184, 1, 235, 142, 
+    184, 1, 235, 115, 184, 1, 227, 166, 184, 1, 215, 157, 184, 1, 215, 145, 
+    184, 1, 248, 136, 184, 1, 248, 120, 184, 1, 228, 111, 184, 1, 217, 106, 
+    184, 1, 216, 209, 184, 1, 248, 222, 184, 1, 248, 26, 184, 1, 197, 184, 1, 
+    190, 184, 1, 225, 148, 184, 1, 252, 192, 184, 1, 252, 19, 184, 1, 185, 
+    184, 1, 191, 184, 1, 205, 184, 1, 233, 136, 184, 1, 232, 185, 184, 1, 
+    214, 27, 184, 1, 220, 103, 184, 1, 206, 184, 1, 162, 184, 5, 227, 206, 
+    184, 25, 5, 255, 74, 184, 25, 5, 73, 184, 25, 5, 236, 34, 184, 25, 5, 70, 
+    184, 25, 5, 214, 118, 184, 25, 5, 245, 210, 184, 25, 5, 254, 202, 184, 
+    25, 5, 226, 184, 184, 25, 5, 253, 193, 184, 5, 213, 152, 184, 5, 214, 
+    218, 184, 1, 234, 116, 184, 1, 242, 227, 184, 1, 210, 116, 184, 1, 222, 
+    180, 184, 1, 244, 197, 184, 21, 210, 86, 184, 21, 110, 184, 21, 105, 184, 
+    21, 158, 184, 21, 161, 184, 21, 189, 184, 21, 194, 184, 21, 198, 184, 21, 
+    195, 184, 21, 200, 184, 216, 75, 184, 254, 254, 184, 235, 179, 184, 214, 
+    146, 184, 245, 182, 226, 189, 184, 5, 211, 78, 171, 5, 251, 0, 171, 5, 
+    254, 76, 171, 5, 213, 147, 171, 1, 61, 171, 1, 255, 74, 171, 1, 73, 171, 
+    1, 236, 34, 171, 1, 70, 171, 1, 214, 118, 171, 1, 149, 153, 171, 1, 149, 
+    156, 171, 25, 251, 3, 75, 171, 1, 75, 171, 1, 254, 202, 171, 25, 251, 3, 
+    76, 171, 1, 76, 171, 1, 253, 193, 171, 1, 176, 171, 1, 234, 133, 171, 1, 
+    243, 136, 171, 1, 242, 250, 171, 1, 229, 78, 171, 1, 251, 34, 171, 1, 
+    250, 158, 171, 1, 235, 142, 171, 1, 235, 115, 171, 1, 227, 166, 171, 1, 
+    215, 157, 171, 1, 215, 145, 171, 1, 248, 136, 171, 1, 248, 120, 171, 1, 
+    228, 111, 171, 1, 217, 106, 171, 1, 216, 209, 171, 1, 248, 222, 171, 1, 
+    248, 26, 171, 1, 197, 171, 1, 190, 171, 1, 225, 148, 171, 1, 252, 192, 
+    171, 1, 252, 19, 171, 1, 185, 171, 1, 191, 171, 1, 205, 171, 1, 233, 136, 
+    171, 1, 232, 185, 171, 1, 214, 27, 171, 1, 220, 103, 171, 1, 218, 224, 
+    171, 1, 206, 171, 1, 162, 171, 5, 227, 206, 171, 5, 253, 176, 171, 25, 5, 
+    255, 74, 171, 25, 5, 73, 171, 25, 5, 236, 34, 171, 25, 5, 70, 171, 25, 5, 
+    214, 118, 171, 25, 5, 149, 153, 171, 25, 5, 149, 222, 181, 171, 25, 5, 
+    251, 3, 75, 171, 25, 5, 75, 171, 25, 5, 254, 202, 171, 25, 5, 251, 3, 76, 
+    171, 25, 5, 76, 171, 25, 5, 253, 193, 171, 5, 213, 152, 171, 226, 205, 
+    171, 1, 149, 222, 181, 171, 1, 149, 232, 186, 171, 25, 5, 149, 156, 171, 
+    25, 5, 149, 232, 186, 171, 21, 210, 86, 171, 21, 110, 171, 21, 105, 171, 
     21, 158, 171, 21, 161, 171, 21, 189, 171, 21, 194, 171, 21, 198, 171, 21, 
-    195, 171, 21, 200, 171, 255, 21, 50, 171, 222, 118, 50, 157, 5, 250, 255, 
-    157, 5, 254, 75, 157, 5, 213, 147, 157, 1, 61, 157, 1, 255, 73, 157, 1, 
-    73, 157, 1, 236, 33, 157, 1, 70, 157, 1, 214, 118, 157, 1, 149, 153, 157, 
-    1, 149, 156, 157, 1, 75, 157, 1, 254, 201, 157, 1, 76, 157, 1, 253, 192, 
-    157, 1, 176, 157, 1, 234, 132, 157, 1, 243, 135, 157, 1, 242, 249, 157, 
-    1, 229, 77, 157, 1, 251, 33, 157, 1, 250, 157, 157, 1, 235, 141, 157, 1, 
-    235, 114, 157, 1, 227, 165, 157, 1, 215, 156, 157, 1, 215, 144, 157, 1, 
-    248, 135, 157, 1, 248, 119, 157, 1, 228, 110, 157, 1, 217, 105, 157, 1, 
-    216, 208, 157, 1, 248, 221, 157, 1, 248, 25, 157, 1, 197, 157, 1, 190, 
-    157, 1, 225, 147, 157, 1, 252, 191, 157, 1, 252, 18, 157, 1, 184, 157, 1, 
-    191, 157, 1, 205, 157, 1, 233, 135, 157, 1, 232, 184, 157, 1, 214, 27, 
-    157, 1, 220, 102, 157, 1, 218, 223, 157, 1, 206, 157, 1, 162, 157, 5, 
-    227, 205, 157, 5, 253, 175, 157, 25, 5, 255, 73, 157, 25, 5, 73, 157, 25, 
-    5, 236, 33, 157, 25, 5, 70, 157, 25, 5, 214, 118, 157, 25, 5, 149, 153, 
-    157, 25, 5, 149, 222, 180, 157, 25, 5, 75, 157, 25, 5, 254, 201, 157, 25, 
-    5, 76, 157, 25, 5, 253, 192, 157, 5, 213, 152, 157, 254, 202, 233, 23, 
-    78, 157, 253, 193, 233, 23, 78, 157, 1, 222, 179, 157, 1, 223, 39, 157, 
-    1, 210, 168, 157, 1, 149, 222, 180, 157, 1, 149, 232, 185, 157, 25, 5, 
-    149, 156, 157, 25, 5, 149, 232, 185, 157, 21, 210, 86, 157, 21, 110, 157, 
+    195, 171, 21, 200, 171, 255, 22, 50, 171, 222, 119, 50, 157, 5, 251, 0, 
+    157, 5, 254, 76, 157, 5, 213, 147, 157, 1, 61, 157, 1, 255, 74, 157, 1, 
+    73, 157, 1, 236, 34, 157, 1, 70, 157, 1, 214, 118, 157, 1, 149, 153, 157, 
+    1, 149, 156, 157, 1, 75, 157, 1, 254, 202, 157, 1, 76, 157, 1, 253, 193, 
+    157, 1, 176, 157, 1, 234, 133, 157, 1, 243, 136, 157, 1, 242, 250, 157, 
+    1, 229, 78, 157, 1, 251, 34, 157, 1, 250, 158, 157, 1, 235, 142, 157, 1, 
+    235, 115, 157, 1, 227, 166, 157, 1, 215, 157, 157, 1, 215, 145, 157, 1, 
+    248, 136, 157, 1, 248, 120, 157, 1, 228, 111, 157, 1, 217, 106, 157, 1, 
+    216, 209, 157, 1, 248, 222, 157, 1, 248, 26, 157, 1, 197, 157, 1, 190, 
+    157, 1, 225, 148, 157, 1, 252, 192, 157, 1, 252, 19, 157, 1, 185, 157, 1, 
+    191, 157, 1, 205, 157, 1, 233, 136, 157, 1, 232, 185, 157, 1, 214, 27, 
+    157, 1, 220, 103, 157, 1, 218, 224, 157, 1, 206, 157, 1, 162, 157, 5, 
+    227, 206, 157, 5, 253, 176, 157, 25, 5, 255, 74, 157, 25, 5, 73, 157, 25, 
+    5, 236, 34, 157, 25, 5, 70, 157, 25, 5, 214, 118, 157, 25, 5, 149, 153, 
+    157, 25, 5, 149, 222, 181, 157, 25, 5, 75, 157, 25, 5, 254, 202, 157, 25, 
+    5, 76, 157, 25, 5, 253, 193, 157, 5, 213, 152, 157, 254, 203, 233, 24, 
+    78, 157, 253, 194, 233, 24, 78, 157, 1, 222, 180, 157, 1, 223, 40, 157, 
+    1, 210, 168, 157, 1, 149, 222, 181, 157, 1, 149, 232, 186, 157, 25, 5, 
+    149, 156, 157, 25, 5, 149, 232, 186, 157, 21, 210, 86, 157, 21, 110, 157, 
     21, 105, 157, 21, 158, 157, 21, 161, 157, 21, 189, 157, 21, 194, 157, 21, 
-    198, 157, 21, 195, 157, 21, 200, 157, 235, 161, 157, 1, 212, 65, 157, 
-    244, 2, 123, 224, 21, 157, 244, 2, 123, 242, 27, 157, 244, 2, 134, 224, 
-    19, 157, 244, 2, 123, 219, 117, 157, 244, 2, 123, 245, 188, 157, 244, 2, 
-    134, 219, 116, 36, 5, 254, 75, 36, 5, 213, 147, 36, 1, 61, 36, 1, 255, 
-    73, 36, 1, 73, 36, 1, 236, 33, 36, 1, 70, 36, 1, 214, 118, 36, 1, 75, 36, 
-    1, 245, 209, 36, 1, 254, 201, 36, 1, 76, 36, 1, 226, 183, 36, 1, 253, 
-    192, 36, 1, 176, 36, 1, 229, 77, 36, 1, 251, 33, 36, 1, 235, 141, 36, 1, 
-    227, 165, 36, 1, 215, 156, 36, 1, 228, 110, 36, 1, 217, 105, 36, 1, 197, 
-    36, 1, 228, 92, 36, 1, 190, 36, 1, 184, 36, 1, 191, 36, 1, 205, 36, 1, 
-    222, 179, 36, 1, 233, 135, 36, 1, 232, 184, 36, 1, 232, 175, 36, 1, 214, 
-    27, 36, 1, 220, 102, 36, 1, 218, 223, 36, 1, 206, 36, 1, 162, 36, 25, 5, 
-    255, 73, 36, 25, 5, 73, 36, 25, 5, 236, 33, 36, 25, 5, 70, 36, 25, 5, 
-    214, 118, 36, 25, 5, 75, 36, 25, 5, 245, 209, 36, 25, 5, 254, 201, 36, 
-    25, 5, 76, 36, 25, 5, 226, 183, 36, 25, 5, 253, 192, 36, 5, 213, 152, 36, 
-    226, 204, 36, 253, 193, 233, 23, 78, 36, 21, 210, 86, 36, 21, 110, 36, 
+    198, 157, 21, 195, 157, 21, 200, 157, 235, 162, 157, 1, 212, 65, 157, 
+    244, 3, 123, 224, 22, 157, 244, 3, 123, 242, 28, 157, 244, 3, 134, 224, 
+    20, 157, 244, 3, 123, 219, 118, 157, 244, 3, 123, 245, 189, 157, 244, 3, 
+    134, 219, 117, 36, 5, 254, 76, 36, 5, 213, 147, 36, 1, 61, 36, 1, 255, 
+    74, 36, 1, 73, 36, 1, 236, 34, 36, 1, 70, 36, 1, 214, 118, 36, 1, 75, 36, 
+    1, 245, 210, 36, 1, 254, 202, 36, 1, 76, 36, 1, 226, 184, 36, 1, 253, 
+    193, 36, 1, 176, 36, 1, 229, 78, 36, 1, 251, 34, 36, 1, 235, 142, 36, 1, 
+    227, 166, 36, 1, 215, 157, 36, 1, 228, 111, 36, 1, 217, 106, 36, 1, 197, 
+    36, 1, 228, 93, 36, 1, 190, 36, 1, 185, 36, 1, 191, 36, 1, 205, 36, 1, 
+    222, 180, 36, 1, 233, 136, 36, 1, 232, 185, 36, 1, 232, 176, 36, 1, 214, 
+    27, 36, 1, 220, 103, 36, 1, 218, 224, 36, 1, 206, 36, 1, 162, 36, 25, 5, 
+    255, 74, 36, 25, 5, 73, 36, 25, 5, 236, 34, 36, 25, 5, 70, 36, 25, 5, 
+    214, 118, 36, 25, 5, 75, 36, 25, 5, 245, 210, 36, 25, 5, 254, 202, 36, 
+    25, 5, 76, 36, 25, 5, 226, 184, 36, 25, 5, 253, 193, 36, 5, 213, 152, 36, 
+    226, 205, 36, 253, 194, 233, 24, 78, 36, 21, 210, 86, 36, 21, 110, 36, 
     21, 105, 36, 21, 158, 36, 21, 161, 36, 21, 189, 36, 21, 194, 36, 21, 198, 
-    36, 21, 195, 36, 21, 200, 36, 54, 216, 247, 36, 54, 123, 240, 210, 36, 
-    54, 123, 216, 147, 36, 248, 146, 50, 36, 230, 135, 50, 36, 211, 45, 50, 
-    36, 248, 87, 50, 36, 249, 139, 50, 36, 253, 238, 77, 50, 36, 222, 118, 
-    50, 36, 54, 50, 148, 5, 250, 255, 148, 5, 254, 75, 148, 5, 213, 147, 148, 
-    1, 61, 148, 1, 255, 73, 148, 1, 73, 148, 1, 236, 33, 148, 1, 70, 148, 1, 
+    36, 21, 195, 36, 21, 200, 36, 54, 216, 248, 36, 54, 123, 240, 211, 36, 
+    54, 123, 216, 148, 36, 248, 147, 50, 36, 230, 136, 50, 36, 211, 45, 50, 
+    36, 248, 88, 50, 36, 249, 140, 50, 36, 253, 239, 77, 50, 36, 222, 119, 
+    50, 36, 54, 50, 148, 5, 251, 0, 148, 5, 254, 76, 148, 5, 213, 147, 148, 
+    1, 61, 148, 1, 255, 74, 148, 1, 73, 148, 1, 236, 34, 148, 1, 70, 148, 1, 
     214, 118, 148, 1, 149, 153, 148, 1, 149, 156, 148, 1, 75, 148, 1, 245, 
-    209, 148, 1, 254, 201, 148, 1, 76, 148, 1, 226, 183, 148, 1, 253, 192, 
-    148, 1, 176, 148, 1, 234, 132, 148, 1, 243, 135, 148, 1, 242, 249, 148, 
-    1, 229, 77, 148, 1, 251, 33, 148, 1, 250, 157, 148, 1, 235, 141, 148, 1, 
-    235, 114, 148, 1, 227, 165, 148, 1, 215, 156, 148, 1, 215, 144, 148, 1, 
-    248, 135, 148, 1, 248, 119, 148, 1, 228, 110, 148, 1, 217, 105, 148, 1, 
-    216, 208, 148, 1, 248, 221, 148, 1, 248, 25, 148, 1, 197, 148, 1, 190, 
-    148, 1, 225, 147, 148, 1, 252, 191, 148, 1, 252, 18, 148, 1, 184, 148, 1, 
-    191, 148, 1, 205, 148, 1, 222, 179, 148, 1, 233, 135, 148, 1, 232, 184, 
-    148, 1, 214, 27, 148, 1, 220, 102, 148, 1, 218, 223, 148, 1, 206, 148, 1, 
-    162, 148, 5, 253, 175, 148, 25, 5, 255, 73, 148, 25, 5, 73, 148, 25, 5, 
-    236, 33, 148, 25, 5, 70, 148, 25, 5, 214, 118, 148, 25, 5, 149, 153, 148, 
-    25, 5, 149, 222, 180, 148, 25, 5, 75, 148, 25, 5, 245, 209, 148, 25, 5, 
-    254, 201, 148, 25, 5, 76, 148, 25, 5, 226, 183, 148, 25, 5, 253, 192, 
-    148, 5, 213, 152, 148, 233, 23, 78, 148, 254, 202, 233, 23, 78, 148, 1, 
-    215, 183, 148, 1, 246, 38, 148, 1, 149, 222, 180, 148, 1, 149, 232, 185, 
-    148, 25, 5, 149, 156, 148, 25, 5, 149, 232, 185, 148, 21, 210, 86, 148, 
+    210, 148, 1, 254, 202, 148, 1, 76, 148, 1, 226, 184, 148, 1, 253, 193, 
+    148, 1, 176, 148, 1, 234, 133, 148, 1, 243, 136, 148, 1, 242, 250, 148, 
+    1, 229, 78, 148, 1, 251, 34, 148, 1, 250, 158, 148, 1, 235, 142, 148, 1, 
+    235, 115, 148, 1, 227, 166, 148, 1, 215, 157, 148, 1, 215, 145, 148, 1, 
+    248, 136, 148, 1, 248, 120, 148, 1, 228, 111, 148, 1, 217, 106, 148, 1, 
+    216, 209, 148, 1, 248, 222, 148, 1, 248, 26, 148, 1, 197, 148, 1, 190, 
+    148, 1, 225, 148, 148, 1, 252, 192, 148, 1, 252, 19, 148, 1, 185, 148, 1, 
+    191, 148, 1, 205, 148, 1, 222, 180, 148, 1, 233, 136, 148, 1, 232, 185, 
+    148, 1, 214, 27, 148, 1, 220, 103, 148, 1, 218, 224, 148, 1, 206, 148, 1, 
+    162, 148, 5, 253, 176, 148, 25, 5, 255, 74, 148, 25, 5, 73, 148, 25, 5, 
+    236, 34, 148, 25, 5, 70, 148, 25, 5, 214, 118, 148, 25, 5, 149, 153, 148, 
+    25, 5, 149, 222, 181, 148, 25, 5, 75, 148, 25, 5, 245, 210, 148, 25, 5, 
+    254, 202, 148, 25, 5, 76, 148, 25, 5, 226, 184, 148, 25, 5, 253, 193, 
+    148, 5, 213, 152, 148, 233, 24, 78, 148, 254, 203, 233, 24, 78, 148, 1, 
+    215, 184, 148, 1, 246, 39, 148, 1, 149, 222, 181, 148, 1, 149, 232, 186, 
+    148, 25, 5, 149, 156, 148, 25, 5, 149, 232, 186, 148, 21, 210, 86, 148, 
     21, 110, 148, 21, 105, 148, 21, 158, 148, 21, 161, 148, 21, 189, 148, 21, 
-    194, 148, 21, 198, 148, 21, 195, 148, 21, 200, 148, 244, 2, 21, 210, 87, 
-    31, 226, 237, 224, 223, 64, 161, 148, 244, 2, 21, 123, 31, 226, 237, 224, 
-    223, 64, 161, 148, 244, 2, 21, 113, 31, 226, 237, 224, 223, 64, 161, 148, 
-    244, 2, 21, 134, 31, 226, 237, 224, 223, 64, 161, 148, 244, 2, 21, 123, 
-    31, 245, 42, 224, 223, 64, 161, 148, 244, 2, 21, 113, 31, 245, 42, 224, 
-    223, 64, 161, 148, 244, 2, 21, 134, 31, 245, 42, 224, 223, 64, 161, 148, 
-    5, 215, 84, 165, 5, 254, 75, 165, 5, 213, 147, 165, 1, 61, 165, 1, 255, 
-    73, 165, 1, 73, 165, 1, 236, 33, 165, 1, 70, 165, 1, 214, 118, 165, 1, 
-    149, 153, 165, 1, 149, 156, 165, 1, 75, 165, 1, 245, 209, 165, 1, 254, 
-    201, 165, 1, 76, 165, 1, 226, 183, 165, 1, 253, 192, 165, 1, 176, 165, 1, 
-    234, 132, 165, 1, 243, 135, 165, 1, 242, 249, 165, 1, 229, 77, 165, 1, 
-    251, 33, 165, 1, 250, 157, 165, 1, 235, 141, 165, 1, 235, 114, 165, 1, 
-    227, 165, 165, 1, 215, 156, 165, 1, 215, 144, 165, 1, 248, 135, 165, 1, 
-    248, 119, 165, 1, 228, 110, 165, 1, 217, 105, 165, 1, 216, 208, 165, 1, 
-    248, 221, 165, 1, 248, 25, 165, 1, 197, 165, 1, 190, 165, 1, 225, 147, 
-    165, 1, 252, 191, 165, 1, 252, 18, 165, 1, 184, 165, 1, 191, 165, 1, 205, 
-    165, 1, 222, 179, 165, 1, 233, 135, 165, 1, 232, 184, 165, 1, 214, 27, 
-    165, 1, 220, 102, 165, 1, 218, 223, 165, 1, 206, 165, 1, 162, 165, 5, 
-    227, 205, 165, 5, 253, 175, 165, 25, 5, 255, 73, 165, 25, 5, 73, 165, 25, 
-    5, 236, 33, 165, 25, 5, 70, 165, 25, 5, 214, 118, 165, 25, 5, 149, 153, 
-    165, 25, 5, 149, 222, 180, 165, 25, 5, 75, 165, 25, 5, 245, 209, 165, 25, 
-    5, 254, 201, 165, 25, 5, 76, 165, 25, 5, 226, 183, 165, 25, 5, 253, 192, 
-    165, 5, 213, 152, 165, 233, 23, 78, 165, 254, 202, 233, 23, 78, 165, 1, 
-    244, 196, 165, 1, 149, 222, 180, 165, 1, 149, 232, 185, 165, 25, 5, 149, 
-    156, 165, 25, 5, 149, 232, 185, 165, 21, 210, 86, 165, 21, 110, 165, 21, 
+    194, 148, 21, 198, 148, 21, 195, 148, 21, 200, 148, 244, 3, 21, 210, 87, 
+    31, 226, 238, 224, 224, 64, 161, 148, 244, 3, 21, 123, 31, 226, 238, 224, 
+    224, 64, 161, 148, 244, 3, 21, 113, 31, 226, 238, 224, 224, 64, 161, 148, 
+    244, 3, 21, 134, 31, 226, 238, 224, 224, 64, 161, 148, 244, 3, 21, 123, 
+    31, 245, 43, 224, 224, 64, 161, 148, 244, 3, 21, 113, 31, 245, 43, 224, 
+    224, 64, 161, 148, 244, 3, 21, 134, 31, 245, 43, 224, 224, 64, 161, 148, 
+    5, 215, 84, 165, 5, 254, 76, 165, 5, 213, 147, 165, 1, 61, 165, 1, 255, 
+    74, 165, 1, 73, 165, 1, 236, 34, 165, 1, 70, 165, 1, 214, 118, 165, 1, 
+    149, 153, 165, 1, 149, 156, 165, 1, 75, 165, 1, 245, 210, 165, 1, 254, 
+    202, 165, 1, 76, 165, 1, 226, 184, 165, 1, 253, 193, 165, 1, 176, 165, 1, 
+    234, 133, 165, 1, 243, 136, 165, 1, 242, 250, 165, 1, 229, 78, 165, 1, 
+    251, 34, 165, 1, 250, 158, 165, 1, 235, 142, 165, 1, 235, 115, 165, 1, 
+    227, 166, 165, 1, 215, 157, 165, 1, 215, 145, 165, 1, 248, 136, 165, 1, 
+    248, 120, 165, 1, 228, 111, 165, 1, 217, 106, 165, 1, 216, 209, 165, 1, 
+    248, 222, 165, 1, 248, 26, 165, 1, 197, 165, 1, 190, 165, 1, 225, 148, 
+    165, 1, 252, 192, 165, 1, 252, 19, 165, 1, 185, 165, 1, 191, 165, 1, 205, 
+    165, 1, 222, 180, 165, 1, 233, 136, 165, 1, 232, 185, 165, 1, 214, 27, 
+    165, 1, 220, 103, 165, 1, 218, 224, 165, 1, 206, 165, 1, 162, 165, 5, 
+    227, 206, 165, 5, 253, 176, 165, 25, 5, 255, 74, 165, 25, 5, 73, 165, 25, 
+    5, 236, 34, 165, 25, 5, 70, 165, 25, 5, 214, 118, 165, 25, 5, 149, 153, 
+    165, 25, 5, 149, 222, 181, 165, 25, 5, 75, 165, 25, 5, 245, 210, 165, 25, 
+    5, 254, 202, 165, 25, 5, 76, 165, 25, 5, 226, 184, 165, 25, 5, 253, 193, 
+    165, 5, 213, 152, 165, 233, 24, 78, 165, 254, 203, 233, 24, 78, 165, 1, 
+    244, 197, 165, 1, 149, 222, 181, 165, 1, 149, 232, 186, 165, 25, 5, 149, 
+    156, 165, 25, 5, 149, 232, 186, 165, 21, 210, 86, 165, 21, 110, 165, 21, 
     105, 165, 21, 158, 165, 21, 161, 165, 21, 189, 165, 21, 194, 165, 21, 
-    198, 165, 21, 195, 165, 21, 200, 165, 5, 235, 102, 165, 5, 214, 161, 136, 
-    5, 254, 75, 136, 5, 213, 147, 136, 1, 61, 136, 1, 255, 73, 136, 1, 73, 
-    136, 1, 236, 33, 136, 1, 70, 136, 1, 214, 118, 136, 1, 149, 153, 136, 1, 
-    149, 156, 136, 1, 75, 136, 1, 245, 209, 136, 1, 254, 201, 136, 1, 76, 
-    136, 1, 226, 183, 136, 1, 253, 192, 136, 1, 176, 136, 1, 234, 132, 136, 
-    1, 243, 135, 136, 1, 242, 249, 136, 1, 229, 77, 136, 1, 251, 33, 136, 1, 
-    250, 157, 136, 1, 235, 141, 136, 1, 235, 114, 136, 1, 227, 165, 136, 1, 
-    215, 156, 136, 1, 215, 144, 136, 1, 248, 135, 136, 1, 248, 119, 136, 1, 
-    228, 110, 136, 1, 217, 105, 136, 1, 216, 208, 136, 1, 248, 221, 136, 1, 
-    248, 25, 136, 1, 197, 136, 1, 228, 92, 136, 1, 190, 136, 1, 225, 147, 
-    136, 1, 252, 191, 136, 1, 252, 18, 136, 1, 184, 136, 1, 191, 136, 1, 205, 
-    136, 1, 222, 179, 136, 1, 233, 135, 136, 1, 232, 184, 136, 1, 232, 175, 
-    136, 1, 214, 27, 136, 1, 220, 102, 136, 1, 218, 223, 136, 1, 206, 136, 1, 
-    162, 136, 1, 215, 125, 136, 5, 253, 175, 136, 25, 5, 255, 73, 136, 25, 5, 
-    73, 136, 25, 5, 236, 33, 136, 25, 5, 70, 136, 25, 5, 214, 118, 136, 25, 
-    5, 149, 153, 136, 25, 5, 149, 222, 180, 136, 25, 5, 75, 136, 25, 5, 245, 
-    209, 136, 25, 5, 254, 201, 136, 25, 5, 76, 136, 25, 5, 226, 183, 136, 25, 
-    5, 253, 192, 136, 5, 213, 152, 136, 1, 59, 223, 73, 136, 253, 193, 233, 
-    23, 78, 136, 1, 149, 222, 180, 136, 1, 149, 232, 185, 136, 25, 5, 149, 
-    156, 136, 25, 5, 149, 232, 185, 136, 21, 210, 86, 136, 21, 110, 136, 21, 
+    198, 165, 21, 195, 165, 21, 200, 165, 5, 235, 103, 165, 5, 214, 161, 136, 
+    5, 254, 76, 136, 5, 213, 147, 136, 1, 61, 136, 1, 255, 74, 136, 1, 73, 
+    136, 1, 236, 34, 136, 1, 70, 136, 1, 214, 118, 136, 1, 149, 153, 136, 1, 
+    149, 156, 136, 1, 75, 136, 1, 245, 210, 136, 1, 254, 202, 136, 1, 76, 
+    136, 1, 226, 184, 136, 1, 253, 193, 136, 1, 176, 136, 1, 234, 133, 136, 
+    1, 243, 136, 136, 1, 242, 250, 136, 1, 229, 78, 136, 1, 251, 34, 136, 1, 
+    250, 158, 136, 1, 235, 142, 136, 1, 235, 115, 136, 1, 227, 166, 136, 1, 
+    215, 157, 136, 1, 215, 145, 136, 1, 248, 136, 136, 1, 248, 120, 136, 1, 
+    228, 111, 136, 1, 217, 106, 136, 1, 216, 209, 136, 1, 248, 222, 136, 1, 
+    248, 26, 136, 1, 197, 136, 1, 228, 93, 136, 1, 190, 136, 1, 225, 148, 
+    136, 1, 252, 192, 136, 1, 252, 19, 136, 1, 185, 136, 1, 191, 136, 1, 205, 
+    136, 1, 222, 180, 136, 1, 233, 136, 136, 1, 232, 185, 136, 1, 232, 176, 
+    136, 1, 214, 27, 136, 1, 220, 103, 136, 1, 218, 224, 136, 1, 206, 136, 1, 
+    162, 136, 1, 215, 126, 136, 5, 253, 176, 136, 25, 5, 255, 74, 136, 25, 5, 
+    73, 136, 25, 5, 236, 34, 136, 25, 5, 70, 136, 25, 5, 214, 118, 136, 25, 
+    5, 149, 153, 136, 25, 5, 149, 222, 181, 136, 25, 5, 75, 136, 25, 5, 245, 
+    210, 136, 25, 5, 254, 202, 136, 25, 5, 76, 136, 25, 5, 226, 184, 136, 25, 
+    5, 253, 193, 136, 5, 213, 152, 136, 1, 59, 223, 74, 136, 253, 194, 233, 
+    24, 78, 136, 1, 149, 222, 181, 136, 1, 149, 232, 186, 136, 25, 5, 149, 
+    156, 136, 25, 5, 149, 232, 186, 136, 21, 210, 86, 136, 21, 110, 136, 21, 
     105, 136, 21, 158, 136, 21, 161, 136, 21, 189, 136, 21, 194, 136, 21, 
-    198, 136, 21, 195, 136, 21, 200, 136, 54, 216, 247, 136, 54, 123, 240, 
-    210, 136, 54, 123, 216, 147, 136, 244, 2, 123, 224, 21, 136, 244, 2, 123, 
-    242, 27, 136, 244, 2, 134, 224, 19, 136, 248, 150, 78, 136, 1, 250, 99, 
-    228, 111, 136, 1, 250, 99, 230, 25, 136, 1, 250, 99, 222, 180, 136, 1, 
-    250, 99, 156, 136, 1, 250, 99, 232, 185, 136, 1, 250, 99, 235, 23, 175, 
-    5, 254, 74, 175, 5, 213, 146, 175, 1, 253, 165, 175, 1, 255, 27, 175, 1, 
-    254, 223, 175, 1, 254, 238, 175, 1, 235, 151, 175, 1, 236, 32, 175, 1, 
-    214, 110, 175, 1, 214, 112, 175, 1, 235, 173, 175, 1, 235, 174, 175, 1, 
-    236, 18, 175, 1, 236, 20, 175, 1, 245, 17, 175, 1, 245, 204, 175, 1, 254, 
-    188, 175, 1, 226, 108, 175, 1, 226, 177, 175, 1, 253, 178, 175, 1, 254, 
-    146, 234, 187, 175, 1, 231, 209, 234, 187, 175, 1, 254, 146, 243, 82, 
-    175, 1, 231, 209, 243, 82, 175, 1, 234, 229, 229, 222, 175, 1, 221, 236, 
-    243, 82, 175, 1, 254, 146, 250, 216, 175, 1, 231, 209, 250, 216, 175, 1, 
-    254, 146, 235, 127, 175, 1, 231, 209, 235, 127, 175, 1, 217, 98, 229, 
-    222, 175, 1, 217, 98, 221, 235, 229, 223, 175, 1, 221, 236, 235, 127, 
-    175, 1, 254, 146, 215, 152, 175, 1, 231, 209, 215, 152, 175, 1, 254, 146, 
-    248, 126, 175, 1, 231, 209, 248, 126, 175, 1, 230, 53, 229, 180, 175, 1, 
-    221, 236, 248, 126, 175, 1, 254, 146, 217, 30, 175, 1, 231, 209, 217, 30, 
-    175, 1, 254, 146, 248, 144, 175, 1, 231, 209, 248, 144, 175, 1, 248, 174, 
-    229, 180, 175, 1, 221, 236, 248, 144, 175, 1, 254, 146, 225, 228, 175, 1, 
-    231, 209, 225, 228, 175, 1, 254, 146, 252, 112, 175, 1, 231, 209, 252, 
-    112, 175, 1, 231, 131, 175, 1, 254, 131, 252, 112, 175, 1, 211, 51, 175, 
-    1, 223, 133, 175, 1, 248, 174, 233, 67, 175, 1, 214, 1, 175, 1, 217, 98, 
-    221, 210, 175, 1, 230, 53, 221, 210, 175, 1, 248, 174, 221, 210, 175, 1, 
-    241, 242, 175, 1, 230, 53, 233, 67, 175, 1, 244, 156, 175, 5, 254, 177, 
-    175, 25, 5, 254, 233, 175, 25, 5, 234, 155, 254, 240, 175, 25, 5, 247, 
-    228, 254, 240, 175, 25, 5, 234, 155, 235, 170, 175, 25, 5, 247, 228, 235, 
-    170, 175, 25, 5, 234, 155, 226, 88, 175, 25, 5, 247, 228, 226, 88, 175, 
-    25, 5, 243, 124, 175, 25, 5, 234, 15, 175, 25, 5, 247, 228, 234, 15, 175, 
-    25, 5, 234, 17, 248, 67, 175, 25, 5, 234, 16, 242, 47, 254, 233, 175, 25, 
-    5, 234, 16, 242, 47, 247, 228, 254, 233, 175, 25, 5, 234, 16, 242, 47, 
-    243, 81, 175, 25, 5, 243, 81, 175, 25, 5, 247, 228, 243, 124, 175, 25, 5, 
-    247, 228, 243, 81, 175, 224, 141, 233, 207, 168, 135, 234, 29, 234, 246, 
-    168, 135, 234, 106, 234, 128, 168, 135, 234, 106, 234, 99, 168, 135, 234, 
-    106, 234, 95, 168, 135, 234, 106, 234, 103, 168, 135, 234, 106, 223, 154, 
-    168, 135, 229, 5, 228, 248, 168, 135, 250, 87, 250, 147, 168, 135, 250, 
-    87, 250, 95, 168, 135, 250, 87, 250, 146, 168, 135, 219, 59, 219, 58, 
-    168, 135, 250, 87, 250, 83, 168, 135, 210, 245, 210, 252, 168, 135, 247, 
-    146, 250, 154, 168, 135, 216, 42, 225, 238, 168, 135, 216, 157, 216, 200, 
-    168, 135, 216, 157, 229, 201, 168, 135, 216, 157, 225, 111, 168, 135, 
-    228, 75, 229, 98, 168, 135, 247, 146, 248, 68, 168, 135, 216, 42, 217, 
-    55, 168, 135, 216, 157, 216, 131, 168, 135, 216, 157, 216, 204, 168, 135, 
-    216, 157, 216, 154, 168, 135, 228, 75, 227, 237, 168, 135, 251, 206, 252, 
-    164, 168, 135, 225, 17, 225, 42, 168, 135, 225, 122, 225, 113, 168, 135, 
-    244, 44, 244, 196, 168, 135, 225, 122, 225, 141, 168, 135, 244, 44, 244, 
-    173, 168, 135, 225, 122, 221, 247, 168, 135, 230, 162, 184, 168, 135, 
-    210, 245, 211, 79, 168, 135, 222, 212, 222, 139, 168, 135, 222, 140, 168, 
-    135, 232, 157, 232, 206, 168, 135, 232, 98, 168, 135, 211, 228, 212, 61, 
-    168, 135, 219, 59, 222, 6, 168, 135, 219, 59, 222, 114, 168, 135, 219, 
-    59, 218, 82, 168, 135, 241, 69, 241, 159, 168, 135, 232, 157, 250, 68, 
-    168, 135, 144, 254, 115, 168, 135, 241, 69, 228, 70, 168, 135, 226, 68, 
-    168, 135, 221, 230, 61, 168, 135, 231, 204, 242, 17, 168, 135, 221, 230, 
-    255, 73, 168, 135, 221, 230, 254, 136, 168, 135, 221, 230, 73, 168, 135, 
-    221, 230, 236, 33, 168, 135, 221, 230, 214, 214, 168, 135, 221, 230, 214, 
-    212, 168, 135, 221, 230, 70, 168, 135, 221, 230, 214, 118, 168, 135, 225, 
-    124, 168, 249, 98, 16, 252, 165, 168, 135, 221, 230, 75, 168, 135, 221, 
-    230, 254, 243, 168, 135, 221, 230, 76, 168, 135, 221, 230, 254, 202, 231, 
-    198, 168, 135, 221, 230, 254, 202, 231, 199, 168, 135, 233, 106, 168, 
-    135, 231, 195, 168, 135, 231, 196, 168, 135, 231, 204, 245, 180, 168, 
-    135, 231, 204, 216, 156, 168, 135, 231, 204, 215, 228, 168, 135, 231, 
-    204, 250, 135, 168, 135, 216, 198, 168, 135, 228, 205, 168, 135, 211, 73, 
-    168, 135, 244, 35, 168, 21, 210, 86, 168, 21, 110, 168, 21, 105, 168, 21, 
-    158, 168, 21, 161, 168, 21, 189, 168, 21, 194, 168, 21, 198, 168, 21, 
-    195, 168, 21, 200, 168, 135, 254, 111, 168, 135, 234, 104, 209, 209, 1, 
-    234, 28, 209, 209, 1, 234, 106, 218, 35, 209, 209, 1, 234, 106, 217, 62, 
-    209, 209, 1, 229, 4, 209, 209, 1, 249, 238, 209, 209, 1, 219, 59, 217, 
-    62, 209, 209, 1, 227, 134, 209, 209, 1, 247, 145, 209, 209, 1, 111, 209, 
-    209, 1, 216, 157, 218, 35, 209, 209, 1, 216, 157, 217, 62, 209, 209, 1, 
-    228, 74, 209, 209, 1, 251, 205, 209, 209, 1, 225, 16, 209, 209, 1, 225, 
-    122, 218, 35, 209, 209, 1, 244, 44, 217, 62, 209, 209, 1, 225, 122, 217, 
-    62, 209, 209, 1, 244, 44, 218, 35, 209, 209, 1, 230, 161, 209, 209, 1, 
-    210, 244, 209, 209, 1, 232, 157, 232, 206, 209, 209, 1, 232, 157, 232, 
-    121, 209, 209, 1, 211, 227, 209, 209, 1, 219, 59, 218, 35, 209, 209, 1, 
-    241, 69, 218, 35, 209, 209, 1, 76, 209, 209, 1, 241, 69, 217, 62, 209, 
-    209, 245, 163, 209, 209, 25, 5, 61, 209, 209, 25, 5, 231, 204, 234, 234, 
-    209, 209, 25, 5, 255, 73, 209, 209, 25, 5, 254, 136, 209, 209, 25, 5, 73, 
-    209, 209, 25, 5, 236, 33, 209, 209, 25, 5, 211, 117, 209, 209, 25, 5, 
-    210, 169, 209, 209, 25, 5, 70, 209, 209, 25, 5, 214, 118, 209, 209, 25, 
-    5, 231, 204, 234, 13, 209, 209, 220, 145, 5, 232, 156, 209, 209, 220, 
-    145, 5, 227, 134, 209, 209, 25, 5, 75, 209, 209, 25, 5, 245, 195, 209, 
-    209, 25, 5, 76, 209, 209, 25, 5, 253, 167, 209, 209, 25, 5, 254, 201, 
-    209, 209, 234, 29, 233, 135, 209, 209, 138, 231, 204, 245, 180, 209, 209, 
-    138, 231, 204, 216, 156, 209, 209, 138, 231, 204, 216, 117, 209, 209, 
-    138, 231, 204, 250, 223, 209, 209, 251, 4, 78, 209, 209, 228, 214, 209, 
+    198, 136, 21, 195, 136, 21, 200, 136, 54, 216, 248, 136, 54, 123, 240, 
+    211, 136, 54, 123, 216, 148, 136, 244, 3, 123, 224, 22, 136, 244, 3, 123, 
+    242, 28, 136, 244, 3, 134, 224, 20, 136, 248, 151, 78, 136, 1, 250, 100, 
+    228, 112, 136, 1, 250, 100, 230, 26, 136, 1, 250, 100, 222, 181, 136, 1, 
+    250, 100, 156, 136, 1, 250, 100, 232, 186, 136, 1, 250, 100, 235, 24, 
+    175, 5, 254, 75, 175, 5, 213, 146, 175, 1, 253, 166, 175, 1, 255, 28, 
+    175, 1, 254, 224, 175, 1, 254, 239, 175, 1, 235, 152, 175, 1, 236, 33, 
+    175, 1, 214, 110, 175, 1, 214, 112, 175, 1, 235, 174, 175, 1, 235, 175, 
+    175, 1, 236, 19, 175, 1, 236, 21, 175, 1, 245, 18, 175, 1, 245, 205, 175, 
+    1, 254, 189, 175, 1, 226, 109, 175, 1, 226, 178, 175, 1, 253, 179, 175, 
+    1, 254, 147, 234, 188, 175, 1, 231, 210, 234, 188, 175, 1, 254, 147, 243, 
+    83, 175, 1, 231, 210, 243, 83, 175, 1, 234, 230, 229, 223, 175, 1, 221, 
+    237, 243, 83, 175, 1, 254, 147, 250, 217, 175, 1, 231, 210, 250, 217, 
+    175, 1, 254, 147, 235, 128, 175, 1, 231, 210, 235, 128, 175, 1, 217, 99, 
+    229, 223, 175, 1, 217, 99, 221, 236, 229, 224, 175, 1, 221, 237, 235, 
+    128, 175, 1, 254, 147, 215, 153, 175, 1, 231, 210, 215, 153, 175, 1, 254, 
+    147, 248, 127, 175, 1, 231, 210, 248, 127, 175, 1, 230, 54, 229, 181, 
+    175, 1, 221, 237, 248, 127, 175, 1, 254, 147, 217, 31, 175, 1, 231, 210, 
+    217, 31, 175, 1, 254, 147, 248, 145, 175, 1, 231, 210, 248, 145, 175, 1, 
+    248, 175, 229, 181, 175, 1, 221, 237, 248, 145, 175, 1, 254, 147, 225, 
+    229, 175, 1, 231, 210, 225, 229, 175, 1, 254, 147, 252, 113, 175, 1, 231, 
+    210, 252, 113, 175, 1, 231, 132, 175, 1, 254, 132, 252, 113, 175, 1, 211, 
+    51, 175, 1, 223, 134, 175, 1, 248, 175, 233, 68, 175, 1, 214, 1, 175, 1, 
+    217, 99, 221, 211, 175, 1, 230, 54, 221, 211, 175, 1, 248, 175, 221, 211, 
+    175, 1, 241, 243, 175, 1, 230, 54, 233, 68, 175, 1, 244, 157, 175, 5, 
+    254, 178, 175, 25, 5, 254, 234, 175, 25, 5, 234, 156, 254, 241, 175, 25, 
+    5, 247, 229, 254, 241, 175, 25, 5, 234, 156, 235, 171, 175, 25, 5, 247, 
+    229, 235, 171, 175, 25, 5, 234, 156, 226, 89, 175, 25, 5, 247, 229, 226, 
+    89, 175, 25, 5, 243, 125, 175, 25, 5, 234, 16, 175, 25, 5, 247, 229, 234, 
+    16, 175, 25, 5, 234, 18, 248, 68, 175, 25, 5, 234, 17, 242, 48, 254, 234, 
+    175, 25, 5, 234, 17, 242, 48, 247, 229, 254, 234, 175, 25, 5, 234, 17, 
+    242, 48, 243, 82, 175, 25, 5, 243, 82, 175, 25, 5, 247, 229, 243, 125, 
+    175, 25, 5, 247, 229, 243, 82, 175, 224, 142, 233, 208, 168, 135, 234, 
+    30, 234, 247, 168, 135, 234, 107, 234, 129, 168, 135, 234, 107, 234, 100, 
+    168, 135, 234, 107, 234, 96, 168, 135, 234, 107, 234, 104, 168, 135, 234, 
+    107, 223, 155, 168, 135, 229, 6, 228, 249, 168, 135, 250, 88, 250, 148, 
+    168, 135, 250, 88, 250, 96, 168, 135, 250, 88, 250, 147, 168, 135, 219, 
+    60, 219, 59, 168, 135, 250, 88, 250, 84, 168, 135, 210, 245, 210, 252, 
+    168, 135, 247, 147, 250, 155, 168, 135, 216, 43, 225, 239, 168, 135, 216, 
+    158, 216, 201, 168, 135, 216, 158, 229, 202, 168, 135, 216, 158, 225, 
+    112, 168, 135, 228, 76, 229, 99, 168, 135, 247, 147, 248, 69, 168, 135, 
+    216, 43, 217, 56, 168, 135, 216, 158, 216, 132, 168, 135, 216, 158, 216, 
+    205, 168, 135, 216, 158, 216, 155, 168, 135, 228, 76, 227, 238, 168, 135, 
+    251, 207, 252, 165, 168, 135, 225, 18, 225, 43, 168, 135, 225, 123, 225, 
+    114, 168, 135, 244, 45, 244, 197, 168, 135, 225, 123, 225, 142, 168, 135, 
+    244, 45, 244, 174, 168, 135, 225, 123, 221, 248, 168, 135, 230, 163, 185, 
+    168, 135, 210, 245, 211, 79, 168, 135, 222, 213, 222, 140, 168, 135, 222, 
+    141, 168, 135, 232, 158, 232, 207, 168, 135, 232, 99, 168, 135, 211, 228, 
+    212, 61, 168, 135, 219, 60, 222, 7, 168, 135, 219, 60, 222, 115, 168, 
+    135, 219, 60, 218, 83, 168, 135, 241, 70, 241, 160, 168, 135, 232, 158, 
+    250, 69, 168, 135, 144, 254, 116, 168, 135, 241, 70, 228, 71, 168, 135, 
+    226, 69, 168, 135, 221, 231, 61, 168, 135, 231, 205, 242, 18, 168, 135, 
+    221, 231, 255, 74, 168, 135, 221, 231, 254, 137, 168, 135, 221, 231, 73, 
+    168, 135, 221, 231, 236, 34, 168, 135, 221, 231, 214, 214, 168, 135, 221, 
+    231, 214, 212, 168, 135, 221, 231, 70, 168, 135, 221, 231, 214, 118, 168, 
+    135, 225, 125, 168, 249, 99, 16, 252, 166, 168, 135, 221, 231, 75, 168, 
+    135, 221, 231, 254, 244, 168, 135, 221, 231, 76, 168, 135, 221, 231, 254, 
+    203, 231, 199, 168, 135, 221, 231, 254, 203, 231, 200, 168, 135, 233, 
+    107, 168, 135, 231, 196, 168, 135, 231, 197, 168, 135, 231, 205, 245, 
+    181, 168, 135, 231, 205, 216, 157, 168, 135, 231, 205, 215, 229, 168, 
+    135, 231, 205, 250, 136, 168, 135, 216, 199, 168, 135, 228, 206, 168, 
+    135, 211, 73, 168, 135, 244, 36, 168, 21, 210, 86, 168, 21, 110, 168, 21, 
+    105, 168, 21, 158, 168, 21, 161, 168, 21, 189, 168, 21, 194, 168, 21, 
+    198, 168, 21, 195, 168, 21, 200, 168, 135, 254, 112, 168, 135, 234, 105, 
+    209, 209, 1, 234, 29, 209, 209, 1, 234, 107, 218, 36, 209, 209, 1, 234, 
+    107, 217, 63, 209, 209, 1, 229, 5, 209, 209, 1, 249, 239, 209, 209, 1, 
+    219, 60, 217, 63, 209, 209, 1, 227, 135, 209, 209, 1, 247, 146, 209, 209, 
+    1, 111, 209, 209, 1, 216, 158, 218, 36, 209, 209, 1, 216, 158, 217, 63, 
+    209, 209, 1, 228, 75, 209, 209, 1, 251, 206, 209, 209, 1, 225, 17, 209, 
+    209, 1, 225, 123, 218, 36, 209, 209, 1, 244, 45, 217, 63, 209, 209, 1, 
+    225, 123, 217, 63, 209, 209, 1, 244, 45, 218, 36, 209, 209, 1, 230, 162, 
+    209, 209, 1, 210, 244, 209, 209, 1, 232, 158, 232, 207, 209, 209, 1, 232, 
+    158, 232, 122, 209, 209, 1, 211, 227, 209, 209, 1, 219, 60, 218, 36, 209, 
+    209, 1, 241, 70, 218, 36, 209, 209, 1, 76, 209, 209, 1, 241, 70, 217, 63, 
+    209, 209, 245, 164, 209, 209, 25, 5, 61, 209, 209, 25, 5, 231, 205, 234, 
+    235, 209, 209, 25, 5, 255, 74, 209, 209, 25, 5, 254, 137, 209, 209, 25, 
+    5, 73, 209, 209, 25, 5, 236, 34, 209, 209, 25, 5, 211, 117, 209, 209, 25, 
+    5, 210, 169, 209, 209, 25, 5, 70, 209, 209, 25, 5, 214, 118, 209, 209, 
+    25, 5, 231, 205, 234, 14, 209, 209, 220, 146, 5, 232, 157, 209, 209, 220, 
+    146, 5, 227, 135, 209, 209, 25, 5, 75, 209, 209, 25, 5, 245, 196, 209, 
+    209, 25, 5, 76, 209, 209, 25, 5, 253, 168, 209, 209, 25, 5, 254, 202, 
+    209, 209, 234, 30, 233, 136, 209, 209, 138, 231, 205, 245, 181, 209, 209, 
+    138, 231, 205, 216, 157, 209, 209, 138, 231, 205, 216, 118, 209, 209, 
+    138, 231, 205, 250, 224, 209, 209, 251, 5, 78, 209, 209, 228, 215, 209, 
     209, 21, 210, 86, 209, 209, 21, 110, 209, 209, 21, 105, 209, 209, 21, 
     158, 209, 209, 21, 161, 209, 209, 21, 189, 209, 209, 21, 194, 209, 209, 
-    21, 198, 209, 209, 21, 195, 209, 209, 21, 200, 209, 209, 241, 69, 228, 
-    74, 209, 209, 241, 69, 230, 161, 209, 209, 1, 234, 107, 242, 174, 209, 
-    209, 1, 234, 107, 227, 134, 63, 3, 226, 204, 63, 164, 242, 115, 211, 0, 
-    230, 248, 215, 189, 61, 63, 164, 242, 115, 211, 0, 230, 248, 255, 159, 
-    222, 216, 252, 77, 184, 63, 164, 242, 115, 211, 0, 230, 248, 255, 159, 
-    242, 115, 215, 173, 184, 63, 164, 65, 211, 0, 230, 248, 231, 93, 184, 63, 
-    164, 249, 252, 211, 0, 230, 248, 220, 109, 184, 63, 164, 250, 239, 211, 
-    0, 230, 248, 225, 112, 220, 96, 184, 63, 164, 211, 0, 230, 248, 215, 173, 
-    220, 96, 184, 63, 164, 221, 208, 220, 95, 63, 164, 251, 128, 211, 0, 230, 
-    247, 63, 164, 251, 223, 220, 3, 211, 0, 230, 247, 63, 164, 235, 197, 215, 
-    172, 63, 164, 248, 61, 215, 173, 251, 127, 63, 164, 220, 95, 63, 164, 
-    227, 139, 220, 95, 63, 164, 215, 173, 220, 95, 63, 164, 227, 139, 215, 
-    173, 220, 95, 63, 164, 222, 236, 250, 122, 218, 236, 220, 95, 63, 164, 
-    223, 42, 242, 146, 220, 95, 63, 164, 250, 239, 255, 163, 222, 144, 231, 
-    92, 199, 251, 7, 63, 164, 242, 115, 215, 172, 63, 232, 144, 5, 250, 155, 
-    222, 143, 63, 232, 144, 5, 232, 252, 222, 143, 63, 253, 212, 5, 220, 105, 
-    243, 65, 255, 164, 222, 143, 63, 253, 212, 5, 255, 161, 190, 63, 253, 
-    212, 5, 221, 182, 215, 168, 63, 5, 223, 130, 247, 159, 243, 64, 63, 5, 
-    223, 130, 247, 159, 242, 176, 63, 5, 223, 130, 247, 159, 242, 116, 63, 5, 
-    223, 130, 229, 219, 243, 64, 63, 5, 223, 130, 229, 219, 242, 176, 63, 5, 
-    223, 130, 247, 159, 223, 130, 229, 218, 63, 21, 210, 86, 63, 21, 110, 63, 
+    21, 198, 209, 209, 21, 195, 209, 209, 21, 200, 209, 209, 241, 70, 228, 
+    75, 209, 209, 241, 70, 230, 162, 209, 209, 1, 234, 108, 242, 175, 209, 
+    209, 1, 234, 108, 227, 135, 63, 3, 226, 205, 63, 164, 242, 116, 211, 0, 
+    230, 249, 215, 190, 61, 63, 164, 242, 116, 211, 0, 230, 249, 255, 160, 
+    222, 217, 252, 78, 185, 63, 164, 242, 116, 211, 0, 230, 249, 255, 160, 
+    242, 116, 215, 174, 185, 63, 164, 65, 211, 0, 230, 249, 231, 94, 185, 63, 
+    164, 249, 253, 211, 0, 230, 249, 220, 110, 185, 63, 164, 250, 240, 211, 
+    0, 230, 249, 225, 113, 220, 97, 185, 63, 164, 211, 0, 230, 249, 215, 174, 
+    220, 97, 185, 63, 164, 221, 209, 220, 96, 63, 164, 251, 129, 211, 0, 230, 
+    248, 63, 164, 251, 224, 220, 4, 211, 0, 230, 248, 63, 164, 235, 198, 215, 
+    173, 63, 164, 248, 62, 215, 174, 251, 128, 63, 164, 220, 96, 63, 164, 
+    227, 140, 220, 96, 63, 164, 215, 174, 220, 96, 63, 164, 227, 140, 215, 
+    174, 220, 96, 63, 164, 222, 237, 250, 123, 218, 237, 220, 96, 63, 164, 
+    223, 43, 242, 147, 220, 96, 63, 164, 250, 240, 255, 164, 222, 145, 231, 
+    93, 199, 251, 8, 63, 164, 242, 116, 215, 173, 63, 232, 145, 5, 250, 156, 
+    222, 144, 63, 232, 145, 5, 232, 253, 222, 144, 63, 253, 213, 5, 220, 106, 
+    243, 66, 255, 165, 222, 144, 63, 253, 213, 5, 255, 162, 190, 63, 253, 
+    213, 5, 221, 183, 215, 169, 63, 5, 223, 131, 247, 160, 243, 65, 63, 5, 
+    223, 131, 247, 160, 242, 177, 63, 5, 223, 131, 247, 160, 242, 117, 63, 5, 
+    223, 131, 229, 220, 243, 65, 63, 5, 223, 131, 229, 220, 242, 177, 63, 5, 
+    223, 131, 247, 160, 223, 131, 229, 219, 63, 21, 210, 86, 63, 21, 110, 63, 
     21, 105, 63, 21, 158, 63, 21, 161, 63, 21, 189, 63, 21, 194, 63, 21, 198, 
     63, 21, 195, 63, 21, 200, 63, 21, 163, 110, 63, 21, 163, 105, 63, 21, 
     163, 158, 63, 21, 163, 161, 63, 21, 163, 189, 63, 21, 163, 194, 63, 21, 
     163, 198, 63, 21, 163, 195, 63, 21, 163, 200, 63, 21, 163, 210, 86, 63, 
-    164, 251, 130, 222, 143, 63, 164, 229, 68, 251, 68, 227, 149, 210, 25, 
-    63, 164, 250, 239, 255, 163, 222, 144, 251, 69, 230, 202, 251, 7, 63, 
-    164, 229, 68, 251, 68, 220, 106, 222, 143, 63, 164, 250, 132, 230, 247, 
-    63, 164, 215, 184, 255, 160, 63, 164, 242, 100, 222, 144, 242, 63, 63, 
-    164, 242, 100, 222, 144, 242, 69, 63, 164, 254, 116, 234, 123, 242, 63, 
-    63, 164, 254, 116, 234, 123, 242, 69, 63, 5, 211, 65, 215, 171, 63, 5, 
-    231, 167, 215, 171, 63, 1, 176, 63, 1, 234, 132, 63, 1, 243, 135, 63, 1, 
-    242, 249, 63, 1, 229, 77, 63, 1, 251, 33, 63, 1, 250, 157, 63, 1, 235, 
-    141, 63, 1, 227, 165, 63, 1, 215, 156, 63, 1, 215, 144, 63, 1, 248, 135, 
-    63, 1, 248, 119, 63, 1, 228, 110, 63, 1, 217, 105, 63, 1, 216, 208, 63, 
-    1, 248, 221, 63, 1, 248, 25, 63, 1, 197, 63, 1, 190, 63, 1, 225, 147, 63, 
-    1, 252, 191, 63, 1, 252, 18, 63, 1, 184, 63, 1, 215, 183, 63, 1, 215, 
-    175, 63, 1, 246, 38, 63, 1, 246, 33, 63, 1, 212, 65, 63, 1, 210, 82, 63, 
-    1, 210, 116, 63, 1, 255, 166, 63, 1, 191, 63, 1, 205, 63, 1, 233, 135, 
-    63, 1, 220, 102, 63, 1, 218, 223, 63, 1, 206, 63, 1, 162, 63, 1, 61, 63, 
-    1, 233, 231, 63, 1, 244, 77, 205, 63, 1, 234, 46, 63, 1, 222, 179, 63, 
-    25, 5, 255, 73, 63, 25, 5, 73, 63, 25, 5, 236, 33, 63, 25, 5, 70, 63, 25, 
-    5, 214, 118, 63, 25, 5, 149, 153, 63, 25, 5, 149, 222, 180, 63, 25, 5, 
-    149, 156, 63, 25, 5, 149, 232, 185, 63, 25, 5, 75, 63, 25, 5, 245, 209, 
-    63, 25, 5, 76, 63, 25, 5, 226, 183, 63, 5, 222, 221, 218, 84, 229, 78, 
-    222, 211, 63, 5, 222, 216, 252, 76, 63, 25, 5, 223, 49, 73, 63, 25, 5, 
-    223, 49, 236, 33, 63, 5, 227, 149, 210, 26, 229, 226, 248, 221, 63, 5, 
-    219, 71, 233, 60, 63, 164, 242, 29, 63, 164, 226, 57, 63, 5, 233, 63, 
-    222, 143, 63, 5, 211, 70, 222, 143, 63, 5, 233, 64, 215, 184, 251, 7, 63, 
-    5, 231, 95, 251, 7, 63, 5, 242, 119, 251, 8, 223, 40, 63, 5, 242, 119, 
-    231, 85, 223, 40, 63, 5, 235, 193, 231, 95, 251, 7, 63, 218, 73, 5, 233, 
-    64, 215, 184, 251, 7, 63, 218, 73, 5, 231, 95, 251, 7, 63, 218, 73, 5, 
-    235, 193, 231, 95, 251, 7, 63, 218, 73, 1, 176, 63, 218, 73, 1, 234, 132, 
-    63, 218, 73, 1, 243, 135, 63, 218, 73, 1, 242, 249, 63, 218, 73, 1, 229, 
-    77, 63, 218, 73, 1, 251, 33, 63, 218, 73, 1, 250, 157, 63, 218, 73, 1, 
-    235, 141, 63, 218, 73, 1, 227, 165, 63, 218, 73, 1, 215, 156, 63, 218, 
-    73, 1, 215, 144, 63, 218, 73, 1, 248, 135, 63, 218, 73, 1, 248, 119, 63, 
-    218, 73, 1, 228, 110, 63, 218, 73, 1, 217, 105, 63, 218, 73, 1, 216, 208, 
-    63, 218, 73, 1, 248, 221, 63, 218, 73, 1, 248, 25, 63, 218, 73, 1, 197, 
-    63, 218, 73, 1, 190, 63, 218, 73, 1, 225, 147, 63, 218, 73, 1, 252, 191, 
-    63, 218, 73, 1, 252, 18, 63, 218, 73, 1, 184, 63, 218, 73, 1, 215, 183, 
-    63, 218, 73, 1, 215, 175, 63, 218, 73, 1, 246, 38, 63, 218, 73, 1, 246, 
-    33, 63, 218, 73, 1, 212, 65, 63, 218, 73, 1, 210, 82, 63, 218, 73, 1, 
-    210, 116, 63, 218, 73, 1, 255, 166, 63, 218, 73, 1, 191, 63, 218, 73, 1, 
-    205, 63, 218, 73, 1, 233, 135, 63, 218, 73, 1, 220, 102, 63, 218, 73, 1, 
-    218, 223, 63, 218, 73, 1, 206, 63, 218, 73, 1, 162, 63, 218, 73, 1, 61, 
-    63, 218, 73, 1, 233, 231, 63, 218, 73, 1, 244, 77, 212, 65, 63, 218, 73, 
-    1, 244, 77, 191, 63, 218, 73, 1, 244, 77, 205, 63, 233, 218, 222, 141, 
-    234, 132, 63, 233, 218, 222, 141, 234, 133, 251, 69, 230, 202, 251, 7, 
-    63, 250, 252, 5, 114, 252, 70, 63, 250, 252, 5, 192, 252, 70, 63, 250, 
-    252, 5, 250, 253, 217, 20, 63, 250, 252, 5, 221, 207, 255, 165, 63, 16, 
-    246, 91, 251, 125, 63, 16, 223, 129, 222, 222, 63, 16, 226, 77, 243, 63, 
-    63, 16, 223, 129, 222, 223, 223, 42, 242, 145, 63, 16, 225, 112, 190, 63, 
-    16, 228, 59, 251, 125, 63, 16, 228, 59, 251, 126, 227, 139, 255, 162, 63, 
-    16, 228, 59, 251, 126, 242, 117, 255, 162, 63, 16, 228, 59, 251, 126, 
-    251, 69, 255, 162, 63, 5, 223, 130, 229, 219, 223, 130, 247, 158, 63, 5, 
-    223, 130, 229, 219, 242, 116, 63, 164, 251, 129, 220, 3, 242, 215, 230, 
-    248, 223, 41, 63, 164, 230, 163, 211, 0, 242, 215, 230, 248, 223, 41, 63, 
-    164, 227, 139, 215, 172, 63, 164, 65, 251, 152, 222, 213, 211, 0, 230, 
-    248, 231, 93, 184, 63, 164, 249, 252, 251, 152, 222, 213, 211, 0, 230, 
-    248, 220, 109, 184, 222, 250, 217, 255, 50, 233, 45, 217, 255, 50, 222, 
-    250, 217, 255, 5, 2, 247, 118, 233, 45, 217, 255, 5, 2, 247, 118, 63, 
-    164, 233, 55, 231, 96, 222, 143, 63, 164, 215, 250, 231, 96, 222, 143, 
-    68, 1, 176, 68, 1, 234, 132, 68, 1, 243, 135, 68, 1, 242, 249, 68, 1, 
-    229, 77, 68, 1, 251, 33, 68, 1, 250, 157, 68, 1, 235, 141, 68, 1, 235, 
-    114, 68, 1, 227, 165, 68, 1, 228, 76, 68, 1, 215, 156, 68, 1, 215, 144, 
-    68, 1, 248, 135, 68, 1, 248, 119, 68, 1, 228, 110, 68, 1, 217, 105, 68, 
-    1, 216, 208, 68, 1, 248, 221, 68, 1, 248, 25, 68, 1, 197, 68, 1, 190, 68, 
-    1, 225, 147, 68, 1, 252, 191, 68, 1, 252, 18, 68, 1, 184, 68, 1, 191, 68, 
-    1, 205, 68, 1, 233, 135, 68, 1, 212, 65, 68, 1, 206, 68, 1, 162, 68, 1, 
-    232, 184, 68, 1, 61, 68, 1, 220, 86, 61, 68, 1, 73, 68, 1, 236, 33, 68, 
-    1, 70, 68, 1, 214, 118, 68, 1, 75, 68, 1, 230, 151, 75, 68, 1, 76, 68, 1, 
-    253, 192, 68, 25, 5, 217, 64, 255, 73, 68, 25, 5, 255, 73, 68, 25, 5, 73, 
-    68, 25, 5, 236, 33, 68, 25, 5, 70, 68, 25, 5, 214, 118, 68, 25, 5, 75, 
-    68, 25, 5, 254, 201, 68, 25, 5, 230, 151, 236, 33, 68, 25, 5, 230, 151, 
-    76, 68, 25, 5, 160, 48, 68, 5, 254, 75, 68, 5, 59, 51, 68, 5, 213, 147, 
-    68, 5, 213, 152, 68, 5, 253, 235, 68, 116, 5, 147, 191, 68, 116, 5, 147, 
-    205, 68, 116, 5, 147, 212, 65, 68, 116, 5, 147, 162, 68, 1, 242, 132, 
-    206, 68, 21, 210, 86, 68, 21, 110, 68, 21, 105, 68, 21, 158, 68, 21, 161, 
-    68, 21, 189, 68, 21, 194, 68, 21, 198, 68, 21, 195, 68, 21, 200, 68, 5, 
-    232, 192, 221, 172, 68, 5, 221, 172, 68, 16, 232, 153, 68, 16, 249, 213, 
-    68, 16, 254, 220, 68, 16, 243, 48, 68, 1, 220, 102, 68, 1, 218, 223, 68, 
-    1, 149, 153, 68, 1, 149, 222, 180, 68, 1, 149, 156, 68, 1, 149, 232, 185, 
-    68, 25, 5, 149, 153, 68, 25, 5, 149, 222, 180, 68, 25, 5, 149, 156, 68, 
-    25, 5, 149, 232, 185, 68, 1, 230, 151, 229, 77, 68, 1, 230, 151, 235, 
-    114, 68, 1, 230, 151, 252, 111, 68, 1, 230, 151, 252, 106, 68, 116, 5, 
-    230, 151, 147, 197, 68, 116, 5, 230, 151, 147, 184, 68, 116, 5, 230, 151, 
-    147, 233, 135, 68, 1, 220, 108, 234, 213, 220, 102, 68, 25, 5, 220, 108, 
-    234, 213, 245, 55, 68, 138, 164, 220, 108, 234, 213, 241, 247, 68, 138, 
-    164, 220, 108, 234, 213, 234, 183, 225, 121, 68, 1, 212, 7, 224, 108, 
-    234, 213, 216, 208, 68, 1, 212, 7, 224, 108, 234, 213, 224, 114, 68, 25, 
-    5, 212, 7, 224, 108, 234, 213, 245, 55, 68, 25, 5, 212, 7, 224, 108, 234, 
-    213, 214, 214, 68, 5, 212, 7, 224, 108, 234, 213, 216, 29, 68, 5, 212, 7, 
-    224, 108, 234, 213, 216, 28, 68, 5, 212, 7, 224, 108, 234, 213, 216, 27, 
-    68, 5, 212, 7, 224, 108, 234, 213, 216, 26, 68, 5, 212, 7, 224, 108, 234, 
-    213, 216, 25, 68, 1, 245, 219, 224, 108, 234, 213, 228, 110, 68, 1, 245, 
-    219, 224, 108, 234, 213, 210, 176, 68, 1, 245, 219, 224, 108, 234, 213, 
-    242, 217, 68, 25, 5, 243, 59, 234, 213, 73, 68, 25, 5, 234, 188, 226, 
-    234, 68, 25, 5, 234, 188, 70, 68, 25, 5, 234, 188, 245, 209, 68, 1, 220, 
-    86, 176, 68, 1, 220, 86, 234, 132, 68, 1, 220, 86, 243, 135, 68, 1, 220, 
-    86, 251, 33, 68, 1, 220, 86, 210, 116, 68, 1, 220, 86, 227, 165, 68, 1, 
-    220, 86, 248, 221, 68, 1, 220, 86, 197, 68, 1, 220, 86, 225, 147, 68, 1, 
-    220, 86, 244, 196, 68, 1, 220, 86, 252, 191, 68, 1, 220, 86, 216, 208, 
-    68, 1, 220, 86, 162, 68, 116, 5, 220, 86, 147, 212, 65, 68, 25, 5, 220, 
-    86, 255, 73, 68, 25, 5, 220, 86, 75, 68, 25, 5, 220, 86, 160, 48, 68, 25, 
-    5, 220, 86, 40, 211, 117, 68, 5, 220, 86, 216, 28, 68, 5, 220, 86, 216, 
-    27, 68, 5, 220, 86, 216, 25, 68, 5, 220, 86, 216, 24, 68, 5, 220, 86, 
-    249, 152, 216, 28, 68, 5, 220, 86, 249, 152, 216, 27, 68, 5, 220, 86, 
-    249, 152, 245, 153, 216, 30, 68, 1, 222, 128, 226, 63, 244, 196, 68, 5, 
-    222, 128, 226, 63, 216, 25, 68, 220, 86, 21, 210, 86, 68, 220, 86, 21, 
-    110, 68, 220, 86, 21, 105, 68, 220, 86, 21, 158, 68, 220, 86, 21, 161, 
-    68, 220, 86, 21, 189, 68, 220, 86, 21, 194, 68, 220, 86, 21, 198, 68, 
-    220, 86, 21, 195, 68, 220, 86, 21, 200, 68, 5, 234, 126, 216, 29, 68, 5, 
-    234, 126, 216, 27, 68, 25, 5, 254, 190, 61, 68, 25, 5, 254, 190, 254, 
-    201, 68, 16, 220, 86, 110, 68, 16, 220, 86, 245, 30, 98, 6, 1, 254, 123, 
-    98, 6, 1, 252, 152, 98, 6, 1, 243, 106, 98, 6, 1, 247, 128, 98, 6, 1, 
-    245, 150, 98, 6, 1, 213, 160, 98, 6, 1, 210, 89, 98, 6, 1, 217, 60, 98, 
-    6, 1, 235, 255, 98, 6, 1, 234, 234, 98, 6, 1, 233, 81, 98, 6, 1, 231, 
-    185, 98, 6, 1, 229, 195, 98, 6, 1, 226, 196, 98, 6, 1, 226, 17, 98, 6, 1, 
-    210, 78, 98, 6, 1, 223, 171, 98, 6, 1, 221, 243, 98, 6, 1, 217, 50, 98, 
-    6, 1, 214, 190, 98, 6, 1, 225, 140, 98, 6, 1, 234, 121, 98, 6, 1, 242, 
-    241, 98, 6, 1, 224, 73, 98, 6, 1, 220, 20, 98, 6, 1, 250, 97, 98, 6, 1, 
-    251, 7, 98, 6, 1, 235, 100, 98, 6, 1, 250, 40, 98, 6, 1, 250, 143, 98, 6, 
-    1, 211, 163, 98, 6, 1, 235, 111, 98, 6, 1, 242, 43, 98, 6, 1, 241, 238, 
-    98, 6, 1, 241, 175, 98, 6, 1, 212, 22, 98, 6, 1, 242, 4, 98, 6, 1, 241, 
-    65, 98, 6, 1, 210, 246, 98, 6, 1, 254, 232, 98, 1, 254, 123, 98, 1, 252, 
-    152, 98, 1, 243, 106, 98, 1, 247, 128, 98, 1, 245, 150, 98, 1, 213, 160, 
-    98, 1, 210, 89, 98, 1, 217, 60, 98, 1, 235, 255, 98, 1, 234, 234, 98, 1, 
-    233, 81, 98, 1, 231, 185, 98, 1, 229, 195, 98, 1, 226, 196, 98, 1, 226, 
-    17, 98, 1, 210, 78, 98, 1, 223, 171, 98, 1, 221, 243, 98, 1, 217, 50, 98, 
-    1, 214, 190, 98, 1, 225, 140, 98, 1, 234, 121, 98, 1, 242, 241, 98, 1, 
-    224, 73, 98, 1, 220, 20, 98, 1, 250, 97, 98, 1, 251, 7, 98, 1, 235, 100, 
-    98, 1, 250, 40, 98, 1, 250, 143, 98, 1, 211, 163, 98, 1, 235, 111, 98, 1, 
-    242, 43, 98, 1, 241, 238, 98, 1, 241, 175, 98, 1, 212, 22, 98, 1, 242, 4, 
-    98, 1, 241, 65, 98, 1, 244, 121, 98, 1, 210, 246, 98, 1, 245, 165, 98, 1, 
-    215, 94, 243, 106, 98, 1, 254, 196, 98, 226, 15, 220, 137, 58, 1, 98, 
-    229, 195, 98, 1, 254, 232, 98, 1, 242, 3, 50, 98, 1, 233, 127, 50, 24, 
-    100, 234, 58, 24, 100, 218, 215, 24, 100, 228, 226, 24, 100, 216, 101, 
-    24, 100, 218, 204, 24, 100, 223, 26, 24, 100, 230, 217, 24, 100, 225, 95, 
-    24, 100, 218, 212, 24, 100, 219, 148, 24, 100, 218, 209, 24, 100, 236, 
-    56, 24, 100, 250, 46, 24, 100, 218, 219, 24, 100, 250, 106, 24, 100, 234, 
-    110, 24, 100, 216, 173, 24, 100, 225, 131, 24, 100, 241, 172, 24, 100, 
-    228, 222, 24, 100, 218, 213, 24, 100, 228, 216, 24, 100, 228, 220, 24, 
-    100, 216, 98, 24, 100, 223, 14, 24, 100, 218, 211, 24, 100, 223, 24, 24, 
-    100, 234, 218, 24, 100, 230, 210, 24, 100, 234, 221, 24, 100, 225, 90, 
-    24, 100, 225, 88, 24, 100, 225, 76, 24, 100, 225, 84, 24, 100, 225, 82, 
-    24, 100, 225, 79, 24, 100, 225, 81, 24, 100, 225, 78, 24, 100, 225, 83, 
-    24, 100, 225, 93, 24, 100, 225, 94, 24, 100, 225, 77, 24, 100, 225, 87, 
-    24, 100, 234, 219, 24, 100, 234, 217, 24, 100, 219, 141, 24, 100, 219, 
-    139, 24, 100, 219, 131, 24, 100, 219, 134, 24, 100, 219, 140, 24, 100, 
-    219, 136, 24, 100, 219, 135, 24, 100, 219, 133, 24, 100, 219, 144, 24, 
-    100, 219, 146, 24, 100, 219, 147, 24, 100, 219, 142, 24, 100, 219, 132, 
-    24, 100, 219, 137, 24, 100, 219, 145, 24, 100, 250, 90, 24, 100, 250, 88, 
-    24, 100, 250, 168, 24, 100, 250, 166, 24, 100, 226, 32, 24, 100, 236, 51, 
-    24, 100, 236, 42, 24, 100, 236, 50, 24, 100, 236, 47, 24, 100, 236, 45, 
-    24, 100, 236, 49, 24, 100, 218, 216, 24, 100, 236, 54, 24, 100, 236, 55, 
-    24, 100, 236, 43, 24, 100, 236, 48, 24, 100, 211, 26, 24, 100, 250, 45, 
-    24, 100, 250, 91, 24, 100, 250, 89, 24, 100, 250, 169, 24, 100, 250, 167, 
-    24, 100, 250, 104, 24, 100, 250, 105, 24, 100, 250, 92, 24, 100, 250, 
-    170, 24, 100, 225, 129, 24, 100, 234, 220, 24, 100, 218, 217, 24, 100, 
-    211, 32, 24, 100, 234, 49, 24, 100, 228, 218, 24, 100, 228, 224, 24, 100, 
-    228, 223, 24, 100, 216, 95, 24, 100, 244, 103, 24, 143, 244, 103, 24, 
-    143, 61, 24, 143, 254, 243, 24, 143, 191, 24, 143, 211, 92, 24, 143, 245, 
-    117, 24, 143, 75, 24, 143, 211, 36, 24, 143, 211, 47, 24, 143, 76, 24, 
-    143, 212, 65, 24, 143, 212, 62, 24, 143, 226, 234, 24, 143, 210, 244, 24, 
-    143, 70, 24, 143, 212, 11, 24, 143, 212, 22, 24, 143, 211, 250, 24, 143, 
-    210, 212, 24, 143, 245, 55, 24, 143, 211, 8, 24, 143, 73, 24, 143, 255, 
-    157, 24, 143, 255, 156, 24, 143, 211, 106, 24, 143, 211, 104, 24, 143, 
-    245, 115, 24, 143, 245, 114, 24, 143, 245, 116, 24, 143, 211, 35, 24, 
-    143, 211, 34, 24, 143, 227, 84, 24, 143, 227, 85, 24, 143, 227, 78, 24, 
-    143, 227, 83, 24, 143, 227, 81, 24, 143, 210, 238, 24, 143, 210, 237, 24, 
-    143, 210, 236, 24, 143, 210, 239, 24, 143, 210, 240, 24, 143, 215, 30, 
-    24, 143, 215, 29, 24, 143, 215, 27, 24, 143, 215, 24, 24, 143, 215, 25, 
-    24, 143, 210, 211, 24, 143, 210, 208, 24, 143, 210, 209, 24, 143, 210, 
-    203, 24, 143, 210, 204, 24, 143, 210, 205, 24, 143, 210, 207, 24, 143, 
-    245, 49, 24, 143, 245, 51, 24, 143, 211, 7, 24, 143, 240, 153, 24, 143, 
-    240, 145, 24, 143, 240, 148, 24, 143, 240, 146, 24, 143, 240, 150, 24, 
-    143, 240, 152, 24, 143, 254, 34, 24, 143, 254, 31, 24, 143, 254, 29, 24, 
-    143, 254, 30, 24, 143, 218, 220, 24, 143, 255, 158, 24, 143, 211, 105, 
-    24, 143, 211, 33, 24, 143, 227, 80, 24, 143, 227, 79, 24, 90, 234, 58, 
-    24, 90, 218, 215, 24, 90, 234, 51, 24, 90, 228, 226, 24, 90, 228, 224, 
-    24, 90, 228, 223, 24, 90, 216, 101, 24, 90, 223, 26, 24, 90, 223, 21, 24, 
-    90, 223, 18, 24, 90, 223, 11, 24, 90, 223, 6, 24, 90, 223, 1, 24, 90, 
-    223, 12, 24, 90, 223, 24, 24, 90, 230, 217, 24, 90, 225, 95, 24, 90, 225, 
-    84, 24, 90, 219, 148, 24, 90, 218, 209, 24, 90, 236, 56, 24, 90, 250, 46, 
-    24, 90, 250, 106, 24, 90, 234, 110, 24, 90, 216, 173, 24, 90, 225, 131, 
-    24, 90, 241, 172, 24, 90, 234, 52, 24, 90, 234, 50, 24, 90, 228, 222, 24, 
-    90, 228, 216, 24, 90, 228, 218, 24, 90, 228, 221, 24, 90, 228, 217, 24, 
-    90, 216, 98, 24, 90, 216, 95, 24, 90, 223, 19, 24, 90, 223, 14, 24, 90, 
-    223, 0, 24, 90, 222, 255, 24, 90, 218, 211, 24, 90, 223, 16, 24, 90, 223, 
-    15, 24, 90, 223, 8, 24, 90, 223, 10, 24, 90, 223, 23, 24, 90, 223, 3, 24, 
-    90, 223, 13, 24, 90, 223, 22, 24, 90, 222, 254, 24, 90, 230, 213, 24, 90, 
-    230, 208, 24, 90, 230, 210, 24, 90, 230, 207, 24, 90, 230, 205, 24, 90, 
-    230, 211, 24, 90, 230, 216, 24, 90, 230, 214, 24, 90, 234, 221, 24, 90, 
-    225, 86, 24, 90, 225, 87, 24, 90, 225, 92, 24, 90, 234, 219, 24, 90, 219, 
-    141, 24, 90, 219, 131, 24, 90, 219, 134, 24, 90, 219, 136, 24, 90, 226, 
-    32, 24, 90, 236, 51, 24, 90, 236, 44, 24, 90, 218, 216, 24, 90, 236, 52, 
-    24, 90, 211, 26, 24, 90, 211, 22, 24, 90, 211, 23, 24, 90, 225, 129, 24, 
-    90, 234, 220, 24, 90, 241, 170, 24, 90, 241, 168, 24, 90, 241, 171, 24, 
-    90, 241, 169, 24, 90, 211, 32, 24, 90, 234, 54, 24, 90, 234, 53, 24, 90, 
-    234, 57, 24, 90, 234, 55, 24, 90, 234, 56, 24, 90, 218, 213, 29, 3, 162, 
-    29, 3, 240, 222, 29, 3, 241, 180, 29, 3, 242, 46, 29, 3, 241, 220, 29, 3, 
-    241, 238, 29, 3, 241, 68, 29, 3, 241, 67, 29, 3, 233, 135, 29, 3, 232, 
-    98, 29, 3, 232, 241, 29, 3, 233, 134, 29, 3, 233, 50, 29, 3, 233, 58, 29, 
-    3, 232, 156, 29, 3, 232, 70, 29, 3, 241, 189, 29, 3, 241, 183, 29, 3, 
-    241, 185, 29, 3, 241, 188, 29, 3, 241, 186, 29, 3, 241, 187, 29, 3, 241, 
-    184, 29, 3, 241, 182, 29, 3, 184, 29, 3, 230, 102, 29, 3, 230, 230, 29, 
-    3, 231, 237, 29, 3, 231, 80, 29, 3, 231, 91, 29, 3, 230, 161, 29, 3, 230, 
-    42, 29, 3, 217, 163, 29, 3, 217, 157, 29, 3, 217, 159, 29, 3, 217, 162, 
-    29, 3, 217, 160, 29, 3, 217, 161, 29, 3, 217, 158, 29, 3, 217, 156, 29, 
-    3, 205, 29, 3, 222, 140, 29, 3, 223, 35, 29, 3, 223, 184, 29, 3, 223, 
-    108, 29, 3, 223, 128, 29, 3, 222, 211, 29, 3, 222, 109, 29, 3, 206, 29, 
-    3, 218, 83, 29, 3, 219, 191, 29, 3, 222, 31, 29, 3, 221, 170, 29, 3, 221, 
-    181, 29, 3, 219, 58, 29, 3, 217, 253, 29, 3, 220, 102, 29, 3, 219, 225, 
-    29, 3, 220, 32, 29, 3, 220, 98, 29, 3, 220, 61, 29, 3, 220, 63, 29, 3, 
-    220, 7, 29, 3, 219, 208, 29, 3, 224, 88, 29, 3, 224, 30, 29, 3, 224, 53, 
-    29, 3, 224, 87, 29, 3, 224, 68, 29, 3, 224, 69, 29, 3, 224, 42, 29, 3, 
-    224, 41, 29, 3, 223, 242, 29, 3, 223, 238, 29, 3, 223, 241, 29, 3, 223, 
-    239, 29, 3, 223, 240, 29, 3, 224, 65, 29, 3, 224, 59, 29, 3, 224, 61, 29, 
-    3, 224, 64, 29, 3, 224, 62, 29, 3, 224, 63, 29, 3, 224, 60, 29, 3, 224, 
-    58, 29, 3, 224, 54, 29, 3, 224, 57, 29, 3, 224, 55, 29, 3, 224, 56, 29, 
-    3, 252, 191, 29, 3, 251, 125, 29, 3, 252, 6, 29, 3, 252, 189, 29, 3, 252, 
-    66, 29, 3, 252, 75, 29, 3, 251, 205, 29, 3, 251, 83, 29, 3, 214, 27, 29, 
-    3, 212, 116, 29, 3, 213, 176, 29, 3, 214, 26, 29, 3, 213, 250, 29, 3, 
-    213, 255, 29, 3, 213, 138, 29, 3, 212, 107, 29, 3, 217, 105, 29, 3, 215, 
-    118, 29, 3, 216, 117, 29, 3, 217, 101, 29, 3, 217, 11, 29, 3, 217, 22, 
-    29, 3, 111, 29, 3, 215, 80, 29, 3, 251, 33, 29, 3, 249, 112, 29, 3, 250, 
-    51, 29, 3, 251, 32, 29, 3, 250, 182, 29, 3, 250, 190, 29, 3, 249, 238, 
-    29, 3, 249, 81, 29, 3, 211, 165, 29, 3, 211, 141, 29, 3, 211, 157, 29, 3, 
-    211, 164, 29, 3, 211, 161, 29, 3, 211, 162, 29, 3, 211, 148, 29, 3, 211, 
-    147, 29, 3, 211, 136, 29, 3, 211, 132, 29, 3, 211, 135, 29, 3, 211, 133, 
-    29, 3, 211, 134, 29, 3, 197, 29, 3, 227, 237, 29, 3, 228, 233, 29, 3, 
-    229, 225, 29, 3, 229, 103, 29, 3, 229, 107, 29, 3, 228, 74, 29, 3, 227, 
-    174, 29, 3, 227, 165, 29, 3, 227, 128, 29, 3, 227, 148, 29, 3, 227, 164, 
-    29, 3, 227, 155, 29, 3, 227, 156, 29, 3, 227, 134, 29, 3, 227, 119, 29, 
-    3, 242, 180, 61, 29, 3, 242, 180, 70, 29, 3, 242, 180, 73, 29, 3, 242, 
-    180, 255, 73, 29, 3, 242, 180, 245, 209, 29, 3, 242, 180, 75, 29, 3, 242, 
-    180, 76, 29, 3, 242, 180, 212, 65, 29, 3, 176, 29, 3, 233, 217, 29, 3, 
-    234, 92, 29, 3, 235, 10, 29, 3, 234, 181, 29, 3, 234, 182, 29, 3, 234, 
-    28, 29, 3, 234, 27, 29, 3, 233, 182, 29, 3, 233, 176, 29, 3, 233, 181, 
-    29, 3, 233, 177, 29, 3, 233, 178, 29, 3, 233, 171, 29, 3, 233, 165, 29, 
-    3, 233, 167, 29, 3, 233, 170, 29, 3, 233, 168, 29, 3, 233, 169, 29, 3, 
-    233, 166, 29, 3, 233, 164, 29, 3, 233, 160, 29, 3, 233, 163, 29, 3, 233, 
-    161, 29, 3, 233, 162, 29, 3, 212, 65, 29, 3, 211, 195, 29, 3, 211, 250, 
-    29, 3, 212, 64, 29, 3, 212, 17, 29, 3, 212, 22, 29, 3, 211, 227, 29, 3, 
-    211, 226, 29, 3, 225, 139, 61, 29, 3, 225, 139, 70, 29, 3, 225, 139, 73, 
-    29, 3, 225, 139, 255, 73, 29, 3, 225, 139, 245, 209, 29, 3, 225, 139, 75, 
-    29, 3, 225, 139, 76, 29, 3, 210, 116, 29, 3, 210, 13, 29, 3, 210, 44, 29, 
-    3, 210, 115, 29, 3, 210, 92, 29, 3, 210, 94, 29, 3, 210, 23, 29, 3, 210, 
-    0, 29, 3, 210, 82, 29, 3, 210, 62, 29, 3, 210, 69, 29, 3, 210, 81, 29, 3, 
-    210, 73, 29, 3, 210, 74, 29, 3, 210, 67, 29, 3, 210, 53, 29, 3, 191, 29, 
-    3, 210, 212, 29, 3, 211, 8, 29, 3, 211, 103, 29, 3, 211, 44, 29, 3, 211, 
-    47, 29, 3, 210, 244, 29, 3, 210, 235, 29, 3, 248, 221, 29, 3, 246, 78, 
-    29, 3, 248, 3, 29, 3, 248, 220, 29, 3, 248, 77, 29, 3, 248, 90, 29, 3, 
-    247, 145, 29, 3, 246, 47, 29, 3, 248, 135, 29, 3, 248, 100, 29, 3, 248, 
-    112, 29, 3, 248, 134, 29, 3, 248, 122, 29, 3, 248, 123, 29, 3, 248, 105, 
-    29, 3, 248, 91, 29, 3, 235, 141, 29, 3, 235, 51, 29, 3, 235, 108, 29, 3, 
-    235, 140, 29, 3, 235, 124, 29, 3, 235, 126, 29, 3, 235, 68, 29, 3, 235, 
-    31, 29, 3, 243, 135, 29, 3, 242, 113, 29, 3, 242, 214, 29, 3, 243, 132, 
-    29, 3, 243, 55, 29, 3, 243, 62, 29, 3, 242, 174, 29, 3, 242, 173, 29, 3, 
-    242, 78, 29, 3, 242, 74, 29, 3, 242, 77, 29, 3, 242, 75, 29, 3, 242, 76, 
-    29, 3, 243, 29, 29, 3, 243, 9, 29, 3, 243, 19, 29, 3, 243, 28, 29, 3, 
-    243, 23, 29, 3, 243, 24, 29, 3, 243, 13, 29, 3, 242, 254, 29, 3, 216, 
-    208, 29, 3, 216, 136, 29, 3, 216, 175, 29, 3, 216, 207, 29, 3, 216, 194, 
-    29, 3, 216, 195, 29, 3, 216, 156, 29, 3, 216, 128, 29, 3, 250, 157, 29, 
-    3, 250, 69, 29, 3, 250, 110, 29, 3, 250, 156, 29, 3, 250, 128, 29, 3, 
-    250, 131, 29, 3, 250, 86, 29, 3, 250, 58, 29, 3, 225, 147, 29, 3, 225, 
-    114, 29, 3, 225, 133, 29, 3, 225, 146, 29, 3, 225, 135, 29, 3, 225, 136, 
-    29, 3, 225, 121, 29, 3, 225, 110, 29, 3, 215, 183, 29, 3, 215, 163, 29, 
-    3, 215, 167, 29, 3, 215, 182, 29, 3, 215, 177, 29, 3, 215, 178, 29, 3, 
-    215, 166, 29, 3, 215, 161, 29, 3, 215, 39, 29, 3, 215, 31, 29, 3, 215, 
-    35, 29, 3, 215, 38, 29, 3, 215, 36, 29, 3, 215, 37, 29, 3, 215, 33, 29, 
-    3, 215, 32, 29, 3, 244, 196, 29, 3, 243, 234, 29, 3, 244, 121, 29, 3, 
-    244, 195, 29, 3, 244, 147, 29, 3, 244, 154, 29, 3, 244, 43, 29, 3, 243, 
-    213, 29, 3, 190, 29, 3, 224, 150, 29, 3, 225, 108, 29, 3, 226, 89, 29, 3, 
-    225, 211, 29, 3, 225, 221, 29, 3, 225, 16, 29, 3, 224, 114, 29, 3, 222, 
-    99, 29, 3, 230, 31, 29, 3, 243, 207, 29, 38, 243, 53, 22, 25, 233, 23, 
-    78, 29, 38, 25, 233, 23, 78, 29, 38, 243, 53, 78, 29, 221, 173, 78, 29, 
-    211, 208, 29, 243, 229, 218, 129, 29, 249, 219, 29, 220, 150, 29, 249, 
-    226, 29, 224, 199, 249, 226, 29, 224, 13, 78, 29, 226, 15, 220, 137, 29, 
-    21, 110, 29, 21, 105, 29, 21, 158, 29, 21, 161, 29, 21, 189, 29, 21, 194, 
-    29, 21, 198, 29, 21, 195, 29, 21, 200, 29, 54, 216, 247, 29, 54, 215, 73, 
-    29, 54, 216, 162, 29, 54, 244, 15, 29, 54, 244, 114, 29, 54, 219, 111, 
-    29, 54, 220, 116, 29, 54, 245, 184, 29, 54, 228, 195, 29, 54, 240, 210, 
-    29, 54, 216, 248, 216, 147, 29, 3, 221, 177, 230, 42, 29, 3, 230, 38, 29, 
-    3, 230, 39, 29, 3, 230, 40, 29, 3, 221, 177, 251, 83, 29, 3, 251, 80, 29, 
-    3, 251, 81, 29, 3, 251, 82, 29, 3, 221, 177, 243, 213, 29, 3, 243, 209, 
-    29, 3, 243, 210, 29, 3, 243, 211, 29, 3, 221, 177, 224, 114, 29, 3, 224, 
-    110, 29, 3, 224, 111, 29, 3, 224, 112, 29, 216, 31, 164, 210, 247, 29, 
-    216, 31, 164, 248, 41, 29, 216, 31, 164, 222, 238, 29, 216, 31, 164, 219, 
-    251, 222, 238, 29, 216, 31, 164, 247, 235, 29, 216, 31, 164, 234, 164, 
-    29, 216, 31, 164, 250, 94, 29, 216, 31, 164, 241, 177, 29, 216, 31, 164, 
-    248, 40, 29, 216, 31, 164, 233, 194, 169, 1, 61, 169, 1, 75, 169, 1, 73, 
-    169, 1, 76, 169, 1, 70, 169, 1, 214, 105, 169, 1, 243, 135, 169, 1, 176, 
-    169, 1, 243, 62, 169, 1, 242, 214, 169, 1, 242, 174, 169, 1, 242, 113, 
-    169, 1, 242, 79, 169, 1, 162, 169, 1, 241, 238, 169, 1, 241, 180, 169, 1, 
-    241, 68, 169, 1, 240, 222, 169, 1, 240, 201, 169, 1, 233, 135, 169, 1, 
-    233, 58, 169, 1, 232, 241, 169, 1, 232, 156, 169, 1, 232, 98, 169, 1, 
-    232, 71, 169, 1, 184, 169, 1, 231, 91, 169, 1, 230, 230, 169, 1, 230, 
-    161, 169, 1, 230, 102, 169, 1, 197, 169, 1, 241, 90, 169, 1, 229, 213, 
-    169, 1, 229, 107, 169, 1, 228, 233, 169, 1, 228, 74, 169, 1, 227, 237, 
-    169, 1, 227, 176, 169, 1, 224, 29, 169, 1, 224, 16, 169, 1, 224, 9, 169, 
-    1, 224, 1, 169, 1, 223, 246, 169, 1, 223, 244, 169, 1, 206, 169, 1, 222, 
-    91, 169, 1, 221, 181, 169, 1, 219, 191, 169, 1, 219, 58, 169, 1, 218, 83, 
-    169, 1, 218, 2, 169, 1, 248, 221, 169, 1, 217, 105, 169, 1, 248, 90, 169, 
-    1, 217, 22, 169, 1, 248, 3, 169, 1, 216, 117, 169, 1, 247, 145, 169, 1, 
-    246, 78, 169, 1, 246, 50, 169, 1, 247, 156, 169, 1, 216, 59, 169, 1, 216, 
-    58, 169, 1, 216, 47, 169, 1, 216, 46, 169, 1, 216, 45, 169, 1, 216, 44, 
-    169, 1, 215, 183, 169, 1, 215, 178, 169, 1, 215, 167, 169, 1, 215, 166, 
-    169, 1, 215, 163, 169, 1, 215, 162, 169, 1, 212, 65, 169, 1, 212, 22, 
-    169, 1, 211, 250, 169, 1, 211, 227, 169, 1, 211, 195, 169, 1, 211, 183, 
-    169, 1, 191, 169, 1, 211, 47, 169, 1, 211, 8, 169, 1, 210, 244, 169, 1, 
-    210, 212, 169, 1, 210, 177, 18, 19, 240, 168, 18, 19, 75, 18, 19, 255, 
-    37, 18, 19, 73, 18, 19, 236, 33, 18, 19, 76, 18, 19, 226, 183, 18, 19, 
-    211, 116, 226, 183, 18, 19, 72, 245, 209, 18, 19, 72, 73, 18, 19, 61, 18, 
-    19, 255, 73, 18, 19, 212, 22, 18, 19, 159, 212, 22, 18, 19, 211, 250, 18, 
-    19, 159, 211, 250, 18, 19, 211, 242, 18, 19, 159, 211, 242, 18, 19, 211, 
-    227, 18, 19, 159, 211, 227, 18, 19, 211, 215, 18, 19, 159, 211, 215, 18, 
-    19, 229, 190, 211, 215, 18, 19, 212, 65, 18, 19, 159, 212, 65, 18, 19, 
-    212, 64, 18, 19, 159, 212, 64, 18, 19, 229, 190, 212, 64, 18, 19, 254, 
-    201, 18, 19, 211, 116, 212, 98, 18, 19, 242, 180, 218, 129, 18, 19, 40, 
-    142, 18, 19, 40, 242, 136, 18, 19, 40, 251, 175, 163, 222, 233, 18, 19, 
-    40, 216, 14, 163, 222, 233, 18, 19, 40, 44, 163, 222, 233, 18, 19, 40, 
-    222, 233, 18, 19, 40, 52, 142, 18, 19, 40, 52, 219, 251, 67, 218, 90, 18, 
-    19, 40, 230, 224, 247, 120, 18, 19, 40, 219, 251, 203, 91, 18, 19, 40, 
-    225, 22, 18, 19, 40, 124, 217, 87, 18, 19, 245, 150, 18, 19, 235, 255, 
-    18, 19, 226, 196, 18, 19, 254, 123, 18, 19, 225, 221, 18, 19, 226, 87, 
-    18, 19, 225, 108, 18, 19, 225, 71, 18, 19, 225, 16, 18, 19, 224, 249, 18, 
-    19, 211, 116, 224, 249, 18, 19, 72, 241, 220, 18, 19, 72, 241, 180, 18, 
-    19, 190, 18, 19, 226, 89, 18, 19, 224, 112, 18, 19, 159, 224, 112, 18, 
-    19, 224, 110, 18, 19, 159, 224, 110, 18, 19, 224, 109, 18, 19, 159, 224, 
-    109, 18, 19, 224, 107, 18, 19, 159, 224, 107, 18, 19, 224, 106, 18, 19, 
-    159, 224, 106, 18, 19, 224, 114, 18, 19, 159, 224, 114, 18, 19, 224, 113, 
-    18, 19, 159, 224, 113, 18, 19, 211, 116, 224, 113, 18, 19, 226, 105, 18, 
-    19, 159, 226, 105, 18, 19, 72, 242, 60, 18, 19, 217, 22, 18, 19, 217, 99, 
-    18, 19, 216, 117, 18, 19, 216, 103, 18, 19, 111, 18, 19, 216, 17, 18, 19, 
-    211, 116, 216, 17, 18, 19, 72, 248, 77, 18, 19, 72, 248, 3, 18, 19, 217, 
-    105, 18, 19, 217, 101, 18, 19, 215, 78, 18, 19, 159, 215, 78, 18, 19, 
-    215, 62, 18, 19, 159, 215, 62, 18, 19, 215, 61, 18, 19, 159, 215, 61, 18, 
-    19, 105, 18, 19, 159, 105, 18, 19, 215, 54, 18, 19, 159, 215, 54, 18, 19, 
-    215, 80, 18, 19, 159, 215, 80, 18, 19, 215, 79, 18, 19, 159, 215, 79, 18, 
-    19, 229, 190, 215, 79, 18, 19, 217, 152, 18, 19, 215, 151, 18, 19, 215, 
-    135, 18, 19, 215, 133, 18, 19, 215, 156, 18, 19, 234, 182, 18, 19, 235, 
-    7, 18, 19, 234, 92, 18, 19, 234, 83, 18, 19, 234, 28, 18, 19, 234, 10, 
-    18, 19, 211, 116, 234, 10, 18, 19, 176, 18, 19, 235, 10, 18, 19, 233, 
-    178, 18, 19, 159, 233, 178, 18, 19, 233, 176, 18, 19, 159, 233, 176, 18, 
-    19, 233, 175, 18, 19, 159, 233, 175, 18, 19, 233, 174, 18, 19, 159, 233, 
-    174, 18, 19, 233, 173, 18, 19, 159, 233, 173, 18, 19, 233, 182, 18, 19, 
-    159, 233, 182, 18, 19, 233, 181, 18, 19, 159, 233, 181, 18, 19, 229, 190, 
-    233, 181, 18, 19, 235, 23, 18, 19, 233, 183, 18, 19, 219, 27, 234, 176, 
-    18, 19, 219, 27, 234, 84, 18, 19, 219, 27, 234, 23, 18, 19, 219, 27, 234, 
-    248, 18, 19, 250, 190, 18, 19, 251, 31, 18, 19, 250, 51, 18, 19, 250, 41, 
-    18, 19, 249, 238, 18, 19, 249, 174, 18, 19, 211, 116, 249, 174, 18, 19, 
-    251, 33, 18, 19, 251, 32, 18, 19, 249, 79, 18, 19, 159, 249, 79, 18, 19, 
-    249, 77, 18, 19, 159, 249, 77, 18, 19, 249, 76, 18, 19, 159, 249, 76, 18, 
-    19, 249, 75, 18, 19, 159, 249, 75, 18, 19, 249, 74, 18, 19, 159, 249, 74, 
-    18, 19, 249, 81, 18, 19, 159, 249, 81, 18, 19, 249, 80, 18, 19, 159, 249, 
-    80, 18, 19, 229, 190, 249, 80, 18, 19, 251, 66, 18, 19, 221, 209, 216, 
-    210, 18, 19, 231, 91, 18, 19, 231, 236, 18, 19, 230, 230, 18, 19, 230, 
-    201, 18, 19, 230, 161, 18, 19, 230, 132, 18, 19, 211, 116, 230, 132, 18, 
-    19, 184, 18, 19, 231, 237, 18, 19, 230, 40, 18, 19, 159, 230, 40, 18, 19, 
-    230, 38, 18, 19, 159, 230, 38, 18, 19, 230, 37, 18, 19, 159, 230, 37, 18, 
-    19, 230, 36, 18, 19, 159, 230, 36, 18, 19, 230, 35, 18, 19, 159, 230, 35, 
-    18, 19, 230, 42, 18, 19, 159, 230, 42, 18, 19, 230, 41, 18, 19, 159, 230, 
-    41, 18, 19, 229, 190, 230, 41, 18, 19, 193, 18, 19, 159, 193, 18, 19, 
-    230, 234, 18, 19, 253, 205, 193, 18, 19, 221, 209, 193, 18, 19, 229, 107, 
-    18, 19, 229, 224, 18, 19, 228, 233, 18, 19, 228, 208, 18, 19, 228, 74, 
-    18, 19, 228, 64, 18, 19, 211, 116, 228, 64, 18, 19, 197, 18, 19, 229, 
-    225, 18, 19, 227, 172, 18, 19, 159, 227, 172, 18, 19, 227, 174, 18, 19, 
-    159, 227, 174, 18, 19, 227, 173, 18, 19, 159, 227, 173, 18, 19, 229, 190, 
-    227, 173, 18, 19, 230, 25, 18, 19, 72, 229, 79, 18, 19, 228, 238, 18, 19, 
-    233, 58, 18, 19, 233, 133, 18, 19, 232, 241, 18, 19, 232, 227, 18, 19, 
-    232, 156, 18, 19, 232, 127, 18, 19, 211, 116, 232, 127, 18, 19, 233, 135, 
-    18, 19, 233, 134, 18, 19, 232, 68, 18, 19, 159, 232, 68, 18, 19, 232, 67, 
-    18, 19, 159, 232, 67, 18, 19, 232, 66, 18, 19, 159, 232, 66, 18, 19, 232, 
-    65, 18, 19, 159, 232, 65, 18, 19, 232, 64, 18, 19, 159, 232, 64, 18, 19, 
-    232, 70, 18, 19, 159, 232, 70, 18, 19, 232, 69, 18, 19, 159, 232, 69, 18, 
-    19, 156, 18, 19, 159, 156, 18, 19, 147, 156, 18, 19, 221, 181, 18, 19, 
-    222, 29, 18, 19, 219, 191, 18, 19, 219, 175, 18, 19, 219, 58, 18, 19, 
-    219, 40, 18, 19, 211, 116, 219, 40, 18, 19, 206, 18, 19, 222, 31, 18, 19, 
-    217, 249, 18, 19, 159, 217, 249, 18, 19, 217, 243, 18, 19, 159, 217, 243, 
-    18, 19, 217, 242, 18, 19, 159, 217, 242, 18, 19, 217, 238, 18, 19, 159, 
-    217, 238, 18, 19, 217, 237, 18, 19, 159, 217, 237, 18, 19, 217, 253, 18, 
-    19, 159, 217, 253, 18, 19, 217, 252, 18, 19, 159, 217, 252, 18, 19, 229, 
-    190, 217, 252, 18, 19, 222, 91, 18, 19, 253, 205, 222, 91, 18, 19, 217, 
-    254, 18, 19, 251, 218, 222, 91, 18, 19, 230, 127, 219, 108, 18, 19, 229, 
-    190, 219, 99, 18, 19, 229, 190, 222, 89, 18, 19, 229, 190, 218, 235, 18, 
-    19, 229, 190, 218, 86, 18, 19, 229, 190, 219, 98, 18, 19, 229, 190, 221, 
-    184, 18, 19, 220, 63, 18, 19, 220, 32, 18, 19, 220, 27, 18, 19, 220, 7, 
-    18, 19, 220, 1, 18, 19, 220, 102, 18, 19, 220, 98, 18, 19, 219, 206, 18, 
-    19, 159, 219, 206, 18, 19, 219, 205, 18, 19, 159, 219, 205, 18, 19, 219, 
-    204, 18, 19, 159, 219, 204, 18, 19, 219, 203, 18, 19, 159, 219, 203, 18, 
-    19, 219, 202, 18, 19, 159, 219, 202, 18, 19, 219, 208, 18, 19, 159, 219, 
-    208, 18, 19, 219, 207, 18, 19, 159, 219, 207, 18, 19, 220, 104, 18, 19, 
-    211, 47, 18, 19, 211, 101, 18, 19, 211, 8, 18, 19, 210, 255, 18, 19, 210, 
-    244, 18, 19, 210, 229, 18, 19, 211, 116, 210, 229, 18, 19, 191, 18, 19, 
-    211, 103, 18, 19, 210, 174, 18, 19, 159, 210, 174, 18, 19, 210, 173, 18, 
-    19, 159, 210, 173, 18, 19, 210, 172, 18, 19, 159, 210, 172, 18, 19, 210, 
-    171, 18, 19, 159, 210, 171, 18, 19, 210, 170, 18, 19, 159, 210, 170, 18, 
-    19, 210, 176, 18, 19, 159, 210, 176, 18, 19, 210, 175, 18, 19, 159, 210, 
-    175, 18, 19, 229, 190, 210, 175, 18, 19, 211, 117, 18, 19, 252, 4, 211, 
-    117, 18, 19, 159, 211, 117, 18, 19, 221, 209, 211, 8, 18, 19, 223, 128, 
-    18, 19, 223, 223, 223, 128, 18, 19, 159, 233, 58, 18, 19, 223, 183, 18, 
-    19, 223, 35, 18, 19, 222, 239, 18, 19, 222, 211, 18, 19, 222, 197, 18, 
-    19, 159, 232, 156, 18, 19, 205, 18, 19, 223, 184, 18, 19, 159, 233, 135, 
-    18, 19, 222, 108, 18, 19, 159, 222, 108, 18, 19, 153, 18, 19, 159, 153, 
-    18, 19, 147, 153, 18, 19, 244, 154, 18, 19, 244, 193, 18, 19, 244, 121, 
-    18, 19, 244, 108, 18, 19, 244, 43, 18, 19, 244, 34, 18, 19, 244, 196, 18, 
-    19, 244, 195, 18, 19, 243, 212, 18, 19, 159, 243, 212, 18, 19, 245, 6, 
-    18, 19, 216, 195, 18, 19, 230, 23, 216, 195, 18, 19, 216, 175, 18, 19, 
-    230, 23, 216, 175, 18, 19, 216, 171, 18, 19, 230, 23, 216, 171, 18, 19, 
-    216, 156, 18, 19, 216, 153, 18, 19, 216, 208, 18, 19, 216, 207, 18, 19, 
-    216, 127, 18, 19, 159, 216, 127, 18, 19, 216, 210, 18, 19, 215, 142, 18, 
-    19, 215, 140, 18, 19, 215, 139, 18, 19, 215, 144, 18, 19, 215, 145, 18, 
-    19, 215, 52, 18, 19, 215, 51, 18, 19, 215, 50, 18, 19, 215, 53, 18, 19, 
-    227, 193, 241, 238, 18, 19, 227, 193, 241, 180, 18, 19, 227, 193, 241, 
-    161, 18, 19, 227, 193, 241, 68, 18, 19, 227, 193, 241, 53, 18, 19, 227, 
-    193, 162, 18, 19, 227, 193, 242, 46, 18, 19, 227, 193, 242, 60, 18, 19, 
-    227, 192, 242, 60, 18, 19, 241, 154, 18, 19, 224, 84, 18, 19, 224, 53, 
-    18, 19, 224, 48, 18, 19, 224, 42, 18, 19, 224, 37, 18, 19, 224, 88, 18, 
-    19, 224, 87, 18, 19, 224, 96, 18, 19, 216, 55, 18, 19, 216, 53, 18, 19, 
-    216, 52, 18, 19, 216, 56, 18, 19, 159, 223, 128, 18, 19, 159, 223, 35, 
-    18, 19, 159, 222, 211, 18, 19, 159, 205, 18, 19, 229, 75, 18, 19, 229, 
-    27, 18, 19, 229, 23, 18, 19, 229, 4, 18, 19, 228, 255, 18, 19, 229, 77, 
-    18, 19, 229, 76, 18, 19, 229, 79, 18, 19, 228, 103, 18, 19, 221, 209, 
-    220, 63, 18, 19, 221, 209, 220, 32, 18, 19, 221, 209, 220, 7, 18, 19, 
-    221, 209, 220, 102, 18, 19, 211, 213, 216, 195, 18, 19, 211, 213, 216, 
-    175, 18, 19, 211, 213, 216, 156, 18, 19, 211, 213, 216, 208, 18, 19, 211, 
-    213, 216, 210, 18, 19, 232, 248, 18, 19, 232, 247, 18, 19, 232, 246, 18, 
-    19, 232, 245, 18, 19, 232, 254, 18, 19, 232, 253, 18, 19, 232, 255, 18, 
-    19, 216, 209, 216, 195, 18, 19, 216, 209, 216, 175, 18, 19, 216, 209, 
-    216, 171, 18, 19, 216, 209, 216, 156, 18, 19, 216, 209, 216, 153, 18, 19, 
-    216, 209, 216, 208, 18, 19, 216, 209, 216, 207, 18, 19, 216, 209, 216, 
-    210, 18, 19, 254, 189, 253, 158, 18, 19, 251, 218, 75, 18, 19, 251, 218, 
-    73, 18, 19, 251, 218, 76, 18, 19, 251, 218, 61, 18, 19, 251, 218, 212, 
-    22, 18, 19, 251, 218, 211, 250, 18, 19, 251, 218, 211, 227, 18, 19, 251, 
-    218, 212, 65, 18, 19, 251, 218, 229, 107, 18, 19, 251, 218, 228, 233, 18, 
-    19, 251, 218, 228, 74, 18, 19, 251, 218, 197, 18, 19, 251, 218, 234, 182, 
-    18, 19, 251, 218, 234, 92, 18, 19, 251, 218, 234, 28, 18, 19, 251, 218, 
-    176, 18, 19, 221, 209, 241, 238, 18, 19, 221, 209, 241, 180, 18, 19, 221, 
-    209, 241, 68, 18, 19, 221, 209, 162, 18, 19, 72, 242, 220, 18, 19, 72, 
-    242, 224, 18, 19, 72, 242, 236, 18, 19, 72, 242, 235, 18, 19, 72, 242, 
-    225, 18, 19, 72, 242, 249, 18, 19, 72, 222, 140, 18, 19, 72, 222, 211, 
-    18, 19, 72, 223, 128, 18, 19, 72, 223, 108, 18, 19, 72, 223, 35, 18, 19, 
-    72, 205, 18, 19, 72, 211, 195, 18, 19, 72, 211, 227, 18, 19, 72, 212, 22, 
-    18, 19, 72, 212, 17, 18, 19, 72, 211, 250, 18, 19, 72, 212, 65, 18, 19, 
-    72, 240, 194, 18, 19, 72, 240, 195, 18, 19, 72, 240, 198, 18, 19, 72, 
-    240, 197, 18, 19, 72, 240, 196, 18, 19, 72, 240, 200, 18, 19, 72, 216, 
-    136, 18, 19, 72, 216, 156, 18, 19, 72, 216, 195, 18, 19, 72, 216, 194, 
-    18, 19, 72, 216, 175, 18, 19, 72, 216, 208, 18, 19, 72, 215, 123, 18, 19, 
-    72, 215, 133, 18, 19, 72, 215, 151, 18, 19, 72, 215, 150, 18, 19, 72, 
-    215, 135, 18, 19, 72, 215, 156, 18, 19, 72, 224, 150, 18, 19, 72, 225, 
-    16, 18, 19, 72, 225, 221, 18, 19, 72, 225, 211, 18, 19, 72, 225, 108, 18, 
-    19, 72, 190, 18, 19, 72, 226, 105, 18, 19, 72, 242, 113, 18, 19, 72, 242, 
-    174, 18, 19, 72, 243, 62, 18, 19, 72, 243, 55, 18, 19, 72, 242, 214, 18, 
-    19, 72, 243, 135, 18, 19, 72, 234, 100, 18, 19, 72, 234, 105, 18, 19, 72, 
-    234, 119, 18, 19, 72, 234, 118, 18, 19, 72, 234, 112, 18, 19, 72, 234, 
-    132, 18, 19, 72, 234, 41, 18, 19, 72, 234, 42, 18, 19, 72, 234, 45, 18, 
-    19, 72, 234, 44, 18, 19, 72, 234, 43, 18, 19, 72, 234, 46, 18, 19, 72, 
-    234, 47, 18, 19, 72, 227, 237, 18, 19, 72, 228, 74, 18, 19, 72, 229, 107, 
-    18, 19, 72, 229, 103, 18, 19, 72, 228, 233, 18, 19, 72, 197, 18, 19, 72, 
-    230, 102, 18, 19, 72, 230, 161, 18, 19, 72, 231, 91, 18, 19, 72, 231, 80, 
-    18, 19, 72, 230, 230, 18, 19, 72, 184, 18, 19, 72, 210, 212, 18, 19, 72, 
-    210, 244, 18, 19, 72, 211, 47, 18, 19, 72, 211, 44, 18, 19, 72, 211, 8, 
-    18, 19, 72, 191, 18, 19, 72, 235, 51, 18, 19, 221, 209, 235, 51, 18, 19, 
-    72, 235, 68, 18, 19, 72, 235, 126, 18, 19, 72, 235, 124, 18, 19, 72, 235, 
-    108, 18, 19, 221, 209, 235, 108, 18, 19, 72, 235, 141, 18, 19, 72, 235, 
-    81, 18, 19, 72, 235, 85, 18, 19, 72, 235, 95, 18, 19, 72, 235, 94, 18, 
-    19, 72, 235, 93, 18, 19, 72, 235, 96, 18, 19, 72, 232, 98, 18, 19, 72, 
-    232, 156, 18, 19, 72, 233, 58, 18, 19, 72, 233, 50, 18, 19, 72, 232, 241, 
-    18, 19, 72, 233, 135, 18, 19, 72, 247, 149, 18, 19, 72, 247, 150, 18, 19, 
-    72, 247, 155, 18, 19, 72, 247, 154, 18, 19, 72, 247, 151, 18, 19, 72, 
-    247, 156, 18, 19, 72, 232, 244, 18, 19, 72, 232, 246, 18, 19, 72, 232, 
-    250, 18, 19, 72, 232, 249, 18, 19, 72, 232, 248, 18, 19, 72, 232, 254, 
-    18, 19, 72, 216, 50, 18, 19, 72, 216, 52, 18, 19, 72, 216, 55, 18, 19, 
-    72, 216, 54, 18, 19, 72, 216, 53, 18, 19, 72, 216, 56, 18, 19, 72, 216, 
-    45, 18, 19, 72, 216, 46, 18, 19, 72, 216, 58, 18, 19, 72, 216, 57, 18, 
-    19, 72, 216, 47, 18, 19, 72, 216, 59, 18, 19, 72, 210, 13, 18, 19, 72, 
-    210, 23, 18, 19, 72, 210, 94, 18, 19, 72, 210, 92, 18, 19, 72, 210, 44, 
-    18, 19, 72, 210, 116, 18, 19, 72, 210, 159, 18, 19, 72, 65, 210, 159, 18, 
-    19, 72, 246, 28, 18, 19, 72, 246, 29, 18, 19, 72, 246, 36, 18, 19, 72, 
-    246, 35, 18, 19, 72, 246, 31, 18, 19, 72, 246, 38, 18, 19, 72, 218, 83, 
-    18, 19, 72, 219, 58, 18, 19, 72, 221, 181, 18, 19, 72, 221, 170, 18, 19, 
-    72, 219, 191, 18, 19, 72, 206, 18, 19, 72, 219, 225, 18, 19, 72, 220, 7, 
-    18, 19, 72, 220, 63, 18, 19, 72, 220, 61, 18, 19, 72, 220, 32, 18, 19, 
-    72, 220, 102, 18, 19, 72, 220, 104, 18, 19, 72, 215, 163, 18, 19, 72, 
-    215, 166, 18, 19, 72, 215, 178, 18, 19, 72, 215, 177, 18, 19, 72, 215, 
-    167, 18, 19, 72, 215, 183, 18, 19, 72, 250, 69, 18, 19, 72, 250, 86, 18, 
-    19, 72, 250, 131, 18, 19, 72, 250, 128, 18, 19, 72, 250, 110, 18, 19, 72, 
-    250, 157, 18, 19, 72, 215, 126, 18, 19, 72, 215, 127, 18, 19, 72, 215, 
-    130, 18, 19, 72, 215, 129, 18, 19, 72, 215, 128, 18, 19, 72, 215, 131, 
-    18, 19, 250, 111, 50, 18, 19, 243, 229, 218, 129, 18, 19, 224, 80, 18, 
-    19, 229, 73, 18, 19, 228, 100, 18, 19, 228, 99, 18, 19, 228, 98, 18, 19, 
-    228, 97, 18, 19, 228, 102, 18, 19, 228, 101, 18, 19, 211, 213, 216, 125, 
-    18, 19, 211, 213, 216, 124, 18, 19, 211, 213, 216, 123, 18, 19, 211, 213, 
-    216, 122, 18, 19, 211, 213, 216, 121, 18, 19, 211, 213, 216, 128, 18, 19, 
-    211, 213, 216, 127, 18, 19, 211, 213, 40, 216, 210, 18, 19, 251, 218, 
-    212, 98, 226, 226, 219, 19, 78, 226, 226, 1, 252, 48, 226, 226, 1, 232, 
-    87, 226, 226, 1, 244, 151, 226, 226, 1, 222, 15, 226, 226, 1, 228, 193, 
-    226, 226, 1, 214, 226, 226, 226, 1, 248, 197, 226, 226, 1, 216, 80, 226, 
-    226, 1, 249, 229, 226, 226, 1, 250, 180, 226, 226, 1, 230, 91, 226, 226, 
-    1, 242, 156, 226, 226, 1, 229, 63, 226, 226, 1, 218, 122, 226, 226, 1, 
-    222, 135, 226, 226, 1, 254, 198, 226, 226, 1, 226, 187, 226, 226, 1, 214, 
-    150, 226, 226, 1, 245, 231, 226, 226, 1, 235, 188, 226, 226, 1, 245, 232, 
-    226, 226, 1, 226, 158, 226, 226, 1, 214, 206, 226, 226, 1, 236, 39, 226, 
-    226, 1, 245, 229, 226, 226, 1, 225, 202, 226, 226, 244, 150, 78, 226, 
-    226, 223, 49, 244, 150, 78, 178, 1, 244, 141, 244, 133, 244, 155, 245, 6, 
-    178, 1, 214, 105, 178, 1, 214, 135, 214, 151, 70, 178, 1, 210, 214, 178, 
-    1, 211, 117, 178, 1, 212, 98, 178, 1, 216, 130, 216, 129, 216, 151, 178, 
-    1, 245, 59, 178, 1, 254, 93, 61, 178, 1, 226, 143, 76, 178, 1, 255, 17, 
-    61, 178, 1, 254, 227, 178, 1, 232, 133, 76, 178, 1, 219, 244, 76, 178, 1, 
-    76, 178, 1, 226, 234, 178, 1, 226, 196, 178, 1, 223, 164, 223, 177, 223, 
-    94, 153, 178, 1, 234, 193, 178, 1, 250, 177, 178, 1, 234, 194, 235, 23, 
-    178, 1, 243, 202, 178, 1, 245, 138, 178, 1, 243, 58, 242, 66, 243, 202, 
-    178, 1, 243, 96, 178, 1, 211, 188, 211, 182, 212, 98, 178, 1, 242, 38, 
-    242, 60, 178, 1, 242, 42, 242, 60, 178, 1, 232, 135, 242, 60, 178, 1, 
-    219, 247, 242, 60, 178, 1, 229, 185, 227, 157, 229, 186, 230, 25, 178, 1, 
-    219, 245, 230, 25, 178, 1, 246, 115, 178, 1, 235, 168, 235, 172, 235, 
-    162, 73, 178, 1, 75, 178, 1, 235, 117, 235, 144, 178, 1, 243, 43, 178, 1, 
-    232, 136, 254, 243, 178, 1, 219, 249, 61, 178, 1, 235, 154, 245, 113, 
-    178, 1, 225, 164, 225, 186, 226, 105, 178, 1, 254, 163, 245, 111, 178, 1, 
-    219, 24, 222, 91, 178, 1, 219, 179, 232, 132, 222, 91, 178, 1, 219, 243, 
-    222, 91, 178, 1, 251, 66, 178, 1, 210, 159, 178, 1, 216, 63, 216, 73, 
-    215, 41, 217, 152, 178, 1, 219, 242, 217, 152, 178, 1, 249, 60, 178, 1, 
-    252, 31, 252, 34, 251, 224, 253, 158, 178, 1, 219, 248, 253, 158, 178, 1, 
-    246, 114, 178, 1, 226, 171, 178, 1, 245, 196, 245, 198, 75, 178, 1, 231, 
-    178, 231, 186, 193, 178, 1, 232, 134, 193, 178, 1, 219, 246, 193, 178, 1, 
-    233, 73, 233, 114, 232, 143, 156, 178, 1, 246, 116, 178, 1, 235, 230, 
-    178, 1, 235, 231, 178, 1, 248, 210, 248, 215, 249, 60, 178, 1, 226, 138, 
-    245, 58, 76, 178, 1, 245, 227, 178, 1, 235, 187, 178, 1, 249, 78, 178, 1, 
-    251, 17, 178, 1, 250, 189, 178, 1, 218, 161, 178, 1, 232, 131, 178, 1, 
-    219, 241, 178, 1, 240, 110, 178, 1, 224, 96, 178, 1, 211, 178, 178, 219, 
-    155, 224, 140, 178, 230, 85, 224, 140, 178, 249, 131, 224, 140, 178, 254, 
-    6, 87, 178, 215, 82, 87, 178, 252, 46, 87, 217, 83, 1, 61, 217, 83, 1, 
-    73, 217, 83, 1, 70, 217, 83, 1, 176, 217, 83, 1, 243, 135, 217, 83, 1, 
-    229, 77, 217, 83, 1, 217, 105, 217, 83, 1, 248, 221, 217, 83, 1, 197, 
-    217, 83, 1, 190, 217, 83, 1, 252, 191, 217, 83, 1, 184, 217, 83, 1, 191, 
-    217, 83, 1, 233, 135, 217, 83, 1, 212, 65, 217, 83, 1, 206, 217, 83, 1, 
-    162, 217, 83, 25, 5, 73, 217, 83, 25, 5, 70, 217, 83, 5, 213, 152, 242, 
-    7, 1, 61, 242, 7, 1, 73, 242, 7, 1, 70, 242, 7, 1, 176, 242, 7, 1, 243, 
-    135, 242, 7, 1, 229, 77, 242, 7, 1, 217, 105, 242, 7, 1, 248, 221, 242, 
-    7, 1, 197, 242, 7, 1, 190, 242, 7, 1, 252, 191, 242, 7, 1, 184, 242, 7, 
-    1, 191, 242, 7, 1, 205, 242, 7, 1, 233, 135, 242, 7, 1, 212, 65, 242, 7, 
-    1, 206, 242, 7, 1, 162, 242, 7, 25, 5, 73, 242, 7, 25, 5, 70, 242, 7, 5, 
-    226, 49, 225, 126, 219, 155, 224, 140, 225, 126, 52, 224, 140, 251, 120, 
-    1, 61, 251, 120, 1, 73, 251, 120, 1, 70, 251, 120, 1, 176, 251, 120, 1, 
-    243, 135, 251, 120, 1, 229, 77, 251, 120, 1, 217, 105, 251, 120, 1, 248, 
-    221, 251, 120, 1, 197, 251, 120, 1, 190, 251, 120, 1, 252, 191, 251, 120, 
-    1, 184, 251, 120, 1, 191, 251, 120, 1, 205, 251, 120, 1, 233, 135, 251, 
-    120, 1, 212, 65, 251, 120, 1, 206, 251, 120, 1, 162, 251, 120, 25, 5, 73, 
-    251, 120, 25, 5, 70, 217, 82, 1, 61, 217, 82, 1, 73, 217, 82, 1, 70, 217, 
-    82, 1, 176, 217, 82, 1, 243, 135, 217, 82, 1, 229, 77, 217, 82, 1, 217, 
-    105, 217, 82, 1, 248, 221, 217, 82, 1, 197, 217, 82, 1, 190, 217, 82, 1, 
-    252, 191, 217, 82, 1, 184, 217, 82, 1, 191, 217, 82, 1, 233, 135, 217, 
-    82, 1, 212, 65, 217, 82, 1, 206, 217, 82, 25, 5, 73, 217, 82, 25, 5, 70, 
-    69, 1, 176, 69, 1, 234, 132, 69, 1, 234, 28, 69, 1, 234, 105, 69, 1, 229, 
-    4, 69, 1, 251, 33, 69, 1, 250, 157, 69, 1, 249, 238, 69, 1, 250, 86, 69, 
-    1, 227, 134, 69, 1, 248, 221, 69, 1, 215, 144, 69, 1, 247, 145, 69, 1, 
-    215, 139, 69, 1, 228, 80, 69, 1, 217, 105, 69, 1, 216, 208, 69, 1, 111, 
-    69, 1, 216, 156, 69, 1, 228, 74, 69, 1, 252, 191, 69, 1, 225, 147, 69, 1, 
-    225, 16, 69, 1, 225, 121, 69, 1, 230, 161, 69, 1, 210, 244, 69, 1, 222, 
-    211, 69, 1, 232, 156, 69, 1, 213, 138, 69, 1, 220, 102, 69, 1, 218, 184, 
-    69, 1, 206, 69, 1, 162, 69, 1, 233, 135, 69, 1, 224, 88, 69, 235, 243, 
-    25, 224, 74, 69, 235, 243, 25, 224, 87, 69, 235, 243, 25, 224, 53, 69, 
-    235, 243, 25, 224, 48, 69, 235, 243, 25, 224, 30, 69, 235, 243, 25, 224, 
-    2, 69, 235, 243, 25, 223, 246, 69, 235, 243, 25, 223, 245, 69, 235, 243, 
-    25, 222, 100, 69, 235, 243, 25, 222, 93, 69, 235, 243, 25, 232, 62, 69, 
-    235, 243, 25, 232, 52, 69, 235, 243, 25, 224, 69, 69, 235, 243, 25, 224, 
-    80, 69, 235, 243, 25, 224, 38, 215, 49, 110, 69, 235, 243, 25, 224, 38, 
-    215, 49, 105, 69, 235, 243, 25, 224, 70, 69, 25, 235, 229, 254, 45, 69, 
-    25, 235, 229, 255, 73, 69, 25, 5, 255, 73, 69, 25, 5, 73, 69, 25, 5, 236, 
-    33, 69, 25, 5, 211, 117, 69, 25, 5, 210, 169, 69, 25, 5, 70, 69, 25, 5, 
-    214, 118, 69, 25, 5, 214, 229, 69, 25, 5, 226, 234, 69, 25, 5, 191, 69, 
-    25, 5, 236, 60, 69, 25, 5, 75, 69, 25, 5, 254, 243, 69, 25, 5, 254, 201, 
-    69, 25, 5, 226, 183, 69, 25, 5, 253, 192, 69, 5, 228, 206, 69, 5, 223, 
-    126, 69, 5, 210, 180, 69, 5, 230, 52, 69, 5, 215, 213, 69, 5, 252, 143, 
-    69, 5, 222, 206, 69, 5, 216, 40, 69, 5, 234, 241, 69, 5, 254, 203, 69, 5, 
-    221, 244, 221, 238, 69, 5, 213, 149, 69, 5, 249, 232, 69, 5, 252, 117, 
-    69, 5, 234, 125, 69, 5, 252, 137, 69, 5, 251, 9, 225, 72, 233, 187, 69, 
-    5, 233, 30, 216, 17, 69, 5, 252, 20, 69, 5, 225, 123, 230, 99, 69, 5, 
-    234, 9, 69, 249, 98, 16, 223, 28, 69, 5, 253, 174, 69, 5, 253, 195, 69, 
-    21, 210, 86, 69, 21, 110, 69, 21, 105, 69, 21, 158, 69, 21, 161, 69, 21, 
-    189, 69, 21, 194, 69, 21, 198, 69, 21, 195, 69, 21, 200, 69, 16, 233, 30, 
-    253, 197, 219, 43, 69, 16, 233, 30, 253, 197, 230, 71, 69, 16, 233, 30, 
-    253, 197, 225, 71, 69, 16, 233, 30, 253, 197, 252, 49, 69, 16, 233, 30, 
-    253, 197, 251, 103, 69, 16, 233, 30, 253, 197, 224, 215, 69, 16, 233, 30, 
-    253, 197, 224, 209, 69, 16, 233, 30, 253, 197, 224, 207, 69, 16, 233, 30, 
-    253, 197, 224, 213, 69, 16, 233, 30, 253, 197, 224, 211, 83, 251, 236, 
-    83, 245, 163, 83, 249, 219, 83, 243, 229, 218, 129, 83, 249, 226, 83, 
-    244, 11, 247, 118, 83, 216, 39, 219, 52, 240, 168, 83, 219, 190, 3, 251, 
-    172, 231, 154, 83, 231, 183, 249, 219, 83, 231, 183, 243, 229, 218, 129, 
-    83, 228, 191, 83, 243, 253, 45, 221, 157, 110, 83, 243, 253, 45, 221, 
-    157, 105, 83, 243, 253, 45, 221, 157, 158, 83, 25, 220, 137, 83, 21, 210, 
-    86, 83, 21, 110, 83, 21, 105, 83, 21, 158, 83, 21, 161, 83, 21, 189, 83, 
-    21, 194, 83, 21, 198, 83, 21, 195, 83, 21, 200, 83, 1, 61, 83, 1, 75, 83, 
-    1, 73, 83, 1, 76, 83, 1, 70, 83, 1, 226, 234, 83, 1, 214, 214, 83, 1, 
-    245, 209, 83, 1, 197, 83, 1, 254, 115, 83, 1, 252, 191, 83, 1, 190, 83, 
-    1, 224, 88, 83, 1, 243, 135, 83, 1, 184, 83, 1, 233, 135, 83, 1, 206, 83, 
-    1, 220, 102, 83, 1, 217, 105, 83, 1, 248, 221, 83, 1, 250, 157, 83, 1, 
-    235, 141, 83, 1, 191, 83, 1, 205, 83, 1, 212, 65, 83, 1, 244, 196, 83, 1, 
-    176, 83, 1, 234, 132, 83, 1, 215, 183, 83, 1, 210, 116, 83, 1, 242, 46, 
-    83, 1, 210, 16, 83, 1, 232, 254, 83, 1, 210, 69, 83, 1, 250, 110, 83, 1, 
-    216, 39, 199, 25, 50, 83, 1, 216, 39, 75, 83, 1, 216, 39, 73, 83, 1, 216, 
-    39, 76, 83, 1, 216, 39, 70, 83, 1, 216, 39, 226, 234, 83, 1, 216, 39, 
-    214, 214, 83, 1, 216, 39, 254, 115, 83, 1, 216, 39, 252, 191, 83, 1, 216, 
-    39, 190, 83, 1, 216, 39, 224, 88, 83, 1, 216, 39, 243, 135, 83, 1, 216, 
-    39, 184, 83, 1, 216, 39, 217, 105, 83, 1, 216, 39, 248, 221, 83, 1, 216, 
-    39, 250, 157, 83, 1, 216, 39, 235, 141, 83, 1, 216, 39, 215, 183, 83, 1, 
-    216, 39, 191, 83, 1, 216, 39, 212, 65, 83, 1, 216, 39, 176, 83, 1, 216, 
-    39, 243, 132, 83, 1, 216, 39, 242, 46, 83, 1, 216, 39, 235, 107, 83, 1, 
-    216, 39, 228, 231, 83, 1, 216, 39, 246, 38, 83, 1, 219, 190, 75, 83, 1, 
-    219, 190, 73, 83, 1, 219, 190, 235, 152, 83, 1, 219, 190, 214, 214, 83, 
-    1, 219, 190, 70, 83, 1, 219, 190, 254, 115, 83, 1, 219, 190, 176, 83, 1, 
-    219, 190, 243, 135, 83, 1, 219, 190, 162, 83, 1, 219, 190, 190, 83, 1, 
-    219, 190, 220, 102, 83, 1, 219, 190, 217, 105, 83, 1, 219, 190, 248, 221, 
-    83, 1, 219, 190, 235, 141, 83, 1, 219, 190, 244, 196, 83, 1, 219, 190, 
-    243, 132, 83, 1, 219, 190, 242, 46, 83, 1, 219, 190, 215, 183, 83, 1, 
-    219, 190, 210, 116, 83, 1, 219, 190, 223, 184, 83, 1, 219, 190, 250, 157, 
-    83, 1, 219, 190, 210, 82, 83, 1, 231, 183, 73, 83, 1, 231, 183, 176, 83, 
-    1, 231, 183, 205, 83, 1, 231, 183, 244, 196, 83, 1, 231, 183, 210, 82, 
-    83, 1, 254, 162, 243, 116, 254, 76, 110, 83, 1, 254, 162, 243, 116, 213, 
-    148, 110, 83, 1, 254, 162, 243, 116, 248, 186, 83, 1, 254, 162, 243, 116, 
-    214, 224, 83, 1, 254, 162, 243, 116, 235, 193, 214, 224, 83, 1, 254, 162, 
-    243, 116, 252, 155, 83, 1, 254, 162, 243, 116, 134, 252, 155, 83, 1, 254, 
-    162, 243, 116, 61, 83, 1, 254, 162, 243, 116, 73, 83, 1, 254, 162, 243, 
-    116, 176, 83, 1, 254, 162, 243, 116, 229, 77, 83, 1, 254, 162, 243, 116, 
-    251, 33, 83, 1, 254, 162, 243, 116, 215, 156, 83, 1, 254, 162, 243, 116, 
-    215, 144, 83, 1, 254, 162, 243, 116, 248, 135, 83, 1, 254, 162, 243, 116, 
-    228, 110, 83, 1, 254, 162, 243, 116, 217, 105, 83, 1, 254, 162, 243, 116, 
-    248, 221, 83, 1, 254, 162, 243, 116, 190, 83, 1, 254, 162, 243, 116, 225, 
-    147, 83, 1, 254, 162, 243, 116, 218, 223, 83, 1, 254, 162, 243, 116, 210, 
-    82, 83, 1, 254, 162, 243, 116, 210, 116, 83, 1, 254, 162, 243, 116, 254, 
-    209, 83, 1, 216, 39, 254, 162, 243, 116, 217, 105, 83, 1, 216, 39, 254, 
-    162, 243, 116, 210, 82, 83, 1, 231, 183, 254, 162, 243, 116, 242, 249, 
-    83, 1, 231, 183, 254, 162, 243, 116, 229, 77, 83, 1, 231, 183, 254, 162, 
-    243, 116, 251, 33, 83, 1, 231, 183, 254, 162, 243, 116, 235, 114, 83, 1, 
-    231, 183, 254, 162, 243, 116, 215, 156, 83, 1, 231, 183, 254, 162, 243, 
-    116, 248, 119, 83, 1, 231, 183, 254, 162, 243, 116, 217, 105, 83, 1, 231, 
-    183, 254, 162, 243, 116, 248, 25, 83, 1, 231, 183, 254, 162, 243, 116, 
-    218, 223, 83, 1, 231, 183, 254, 162, 243, 116, 249, 72, 83, 1, 231, 183, 
-    254, 162, 243, 116, 210, 82, 83, 1, 231, 183, 254, 162, 243, 116, 210, 
-    116, 83, 1, 254, 162, 243, 116, 163, 70, 83, 1, 254, 162, 243, 116, 163, 
-    191, 83, 1, 231, 183, 254, 162, 243, 116, 252, 18, 83, 1, 254, 162, 243, 
-    116, 248, 211, 83, 1, 231, 183, 254, 162, 243, 116, 232, 254, 18, 19, 
-    226, 109, 18, 19, 253, 167, 18, 19, 255, 28, 18, 19, 212, 25, 18, 19, 
-    224, 221, 18, 19, 225, 229, 18, 19, 224, 105, 18, 19, 217, 31, 18, 19, 
-    234, 189, 18, 19, 233, 179, 18, 19, 231, 132, 18, 19, 228, 37, 18, 19, 
-    229, 181, 18, 19, 233, 68, 18, 19, 219, 22, 18, 19, 221, 211, 18, 19, 
-    219, 232, 18, 19, 220, 66, 18, 19, 219, 201, 18, 19, 210, 220, 18, 19, 
-    211, 52, 18, 19, 223, 134, 18, 19, 227, 171, 18, 19, 226, 216, 227, 171, 
-    18, 19, 227, 170, 18, 19, 226, 216, 227, 170, 18, 19, 227, 169, 18, 19, 
-    226, 216, 227, 169, 18, 19, 227, 168, 18, 19, 226, 216, 227, 168, 18, 19, 
-    222, 105, 18, 19, 222, 104, 18, 19, 222, 103, 18, 19, 222, 102, 18, 19, 
-    222, 101, 18, 19, 222, 109, 18, 19, 226, 216, 226, 105, 18, 19, 226, 216, 
-    217, 152, 18, 19, 226, 216, 235, 23, 18, 19, 226, 216, 251, 66, 18, 19, 
-    226, 216, 193, 18, 19, 226, 216, 230, 25, 18, 19, 226, 216, 222, 91, 18, 
-    19, 226, 216, 220, 104, 18, 19, 245, 219, 212, 98, 18, 19, 212, 7, 212, 
-    98, 18, 19, 40, 4, 222, 233, 18, 19, 40, 223, 157, 247, 120, 18, 19, 223, 
-    223, 222, 106, 18, 19, 159, 232, 127, 18, 19, 159, 233, 134, 18, 19, 216, 
-    126, 18, 19, 216, 128, 18, 19, 215, 136, 18, 19, 215, 138, 18, 19, 215, 
-    143, 18, 19, 216, 49, 18, 19, 216, 51, 18, 19, 221, 209, 219, 206, 18, 
-    19, 221, 209, 220, 1, 18, 19, 221, 209, 241, 53, 18, 19, 72, 242, 73, 18, 
-    19, 72, 248, 52, 243, 55, 18, 19, 72, 243, 132, 18, 19, 72, 242, 78, 18, 
-    19, 221, 209, 235, 33, 18, 19, 72, 235, 31, 18, 19, 252, 68, 248, 52, 
-    156, 18, 19, 252, 68, 248, 52, 153, 18, 19, 72, 248, 47, 222, 91, 232, 
-    223, 213, 122, 233, 10, 232, 223, 1, 176, 232, 223, 1, 234, 132, 232, 
-    223, 1, 243, 135, 232, 223, 1, 242, 249, 232, 223, 1, 229, 77, 232, 223, 
-    1, 251, 33, 232, 223, 1, 250, 157, 232, 223, 1, 235, 141, 232, 223, 1, 
-    235, 114, 232, 223, 1, 211, 71, 232, 223, 1, 217, 105, 232, 223, 1, 216, 
-    208, 232, 223, 1, 248, 221, 232, 223, 1, 248, 25, 232, 223, 1, 197, 232, 
-    223, 1, 190, 232, 223, 1, 225, 147, 232, 223, 1, 252, 191, 232, 223, 1, 
-    252, 18, 232, 223, 1, 184, 232, 223, 1, 191, 232, 223, 1, 205, 232, 223, 
-    1, 233, 135, 232, 223, 1, 212, 65, 232, 223, 1, 220, 102, 232, 223, 1, 
-    218, 223, 232, 223, 1, 206, 232, 223, 1, 162, 232, 223, 25, 5, 61, 232, 
-    223, 25, 5, 73, 232, 223, 25, 5, 70, 232, 223, 25, 5, 245, 209, 232, 223, 
-    25, 5, 254, 201, 232, 223, 25, 5, 226, 183, 232, 223, 25, 5, 253, 192, 
-    232, 223, 25, 5, 75, 232, 223, 25, 5, 76, 232, 223, 218, 73, 1, 191, 232, 
-    223, 218, 73, 1, 205, 232, 223, 218, 73, 1, 212, 65, 232, 223, 4, 1, 176, 
-    232, 223, 4, 1, 229, 77, 232, 223, 4, 1, 254, 75, 232, 223, 4, 1, 217, 
-    105, 232, 223, 4, 1, 197, 232, 223, 4, 1, 190, 232, 223, 4, 1, 184, 232, 
-    223, 4, 1, 205, 232, 223, 4, 1, 233, 135, 232, 223, 5, 230, 89, 232, 223, 
-    5, 234, 171, 232, 223, 5, 222, 32, 232, 223, 5, 232, 127, 232, 223, 245, 
-    31, 78, 232, 223, 224, 13, 78, 232, 223, 21, 210, 86, 232, 223, 21, 110, 
-    232, 223, 21, 105, 232, 223, 21, 158, 232, 223, 21, 161, 232, 223, 21, 
-    189, 232, 223, 21, 194, 232, 223, 21, 198, 232, 223, 21, 195, 232, 223, 
-    21, 200, 39, 233, 59, 1, 176, 39, 233, 59, 1, 211, 165, 39, 233, 59, 1, 
-    229, 77, 39, 233, 59, 1, 215, 183, 39, 233, 59, 1, 206, 39, 233, 59, 1, 
-    191, 39, 233, 59, 1, 217, 105, 39, 233, 59, 1, 216, 208, 39, 233, 59, 1, 
-    233, 135, 39, 233, 59, 1, 190, 39, 233, 59, 1, 225, 147, 39, 233, 59, 1, 
-    184, 39, 233, 59, 1, 244, 196, 39, 233, 59, 1, 214, 27, 39, 233, 59, 1, 
-    162, 39, 233, 59, 1, 224, 88, 39, 233, 59, 1, 234, 132, 39, 233, 59, 1, 
-    215, 175, 39, 233, 59, 1, 197, 39, 233, 59, 1, 61, 39, 233, 59, 1, 73, 
-    39, 233, 59, 1, 245, 209, 39, 233, 59, 1, 245, 197, 39, 233, 59, 1, 70, 
-    39, 233, 59, 1, 226, 183, 39, 233, 59, 1, 76, 39, 233, 59, 1, 214, 214, 
-    39, 233, 59, 1, 75, 39, 233, 59, 1, 253, 190, 39, 233, 59, 1, 254, 201, 
-    39, 233, 59, 1, 216, 28, 39, 233, 59, 1, 216, 27, 39, 233, 59, 1, 216, 
-    26, 39, 233, 59, 1, 216, 25, 39, 233, 59, 1, 216, 24, 166, 39, 173, 1, 
-    125, 224, 88, 166, 39, 173, 1, 121, 224, 88, 166, 39, 173, 1, 125, 176, 
-    166, 39, 173, 1, 125, 211, 165, 166, 39, 173, 1, 125, 229, 77, 166, 39, 
+    164, 251, 131, 222, 144, 63, 164, 229, 69, 251, 69, 227, 150, 210, 25, 
+    63, 164, 250, 240, 255, 164, 222, 145, 251, 70, 230, 203, 251, 8, 63, 
+    164, 229, 69, 251, 69, 220, 107, 222, 144, 63, 164, 250, 133, 230, 248, 
+    63, 164, 215, 185, 255, 161, 63, 164, 242, 101, 222, 145, 242, 64, 63, 
+    164, 242, 101, 222, 145, 242, 70, 63, 164, 254, 117, 234, 124, 242, 64, 
+    63, 164, 254, 117, 234, 124, 242, 70, 63, 5, 211, 65, 215, 172, 63, 5, 
+    231, 168, 215, 172, 63, 1, 176, 63, 1, 234, 133, 63, 1, 243, 136, 63, 1, 
+    242, 250, 63, 1, 229, 78, 63, 1, 251, 34, 63, 1, 250, 158, 63, 1, 235, 
+    142, 63, 1, 227, 166, 63, 1, 215, 157, 63, 1, 215, 145, 63, 1, 248, 136, 
+    63, 1, 248, 120, 63, 1, 228, 111, 63, 1, 217, 106, 63, 1, 216, 209, 63, 
+    1, 248, 222, 63, 1, 248, 26, 63, 1, 197, 63, 1, 190, 63, 1, 225, 148, 63, 
+    1, 252, 192, 63, 1, 252, 19, 63, 1, 185, 63, 1, 215, 184, 63, 1, 215, 
+    176, 63, 1, 246, 39, 63, 1, 246, 34, 63, 1, 212, 65, 63, 1, 210, 82, 63, 
+    1, 210, 116, 63, 1, 255, 167, 63, 1, 191, 63, 1, 205, 63, 1, 233, 136, 
+    63, 1, 220, 103, 63, 1, 218, 224, 63, 1, 206, 63, 1, 162, 63, 1, 61, 63, 
+    1, 233, 232, 63, 1, 244, 78, 205, 63, 1, 234, 47, 63, 1, 222, 180, 63, 
+    25, 5, 255, 74, 63, 25, 5, 73, 63, 25, 5, 236, 34, 63, 25, 5, 70, 63, 25, 
+    5, 214, 118, 63, 25, 5, 149, 153, 63, 25, 5, 149, 222, 181, 63, 25, 5, 
+    149, 156, 63, 25, 5, 149, 232, 186, 63, 25, 5, 75, 63, 25, 5, 245, 210, 
+    63, 25, 5, 76, 63, 25, 5, 226, 184, 63, 5, 222, 222, 218, 85, 229, 79, 
+    222, 212, 63, 5, 222, 217, 252, 77, 63, 25, 5, 223, 50, 73, 63, 25, 5, 
+    223, 50, 236, 34, 63, 5, 227, 150, 210, 26, 229, 227, 248, 222, 63, 5, 
+    219, 72, 233, 61, 63, 164, 242, 30, 63, 164, 226, 58, 63, 5, 233, 64, 
+    222, 144, 63, 5, 211, 70, 222, 144, 63, 5, 233, 65, 215, 185, 251, 8, 63, 
+    5, 231, 96, 251, 8, 63, 5, 242, 120, 251, 9, 223, 41, 63, 5, 242, 120, 
+    231, 86, 223, 41, 63, 5, 235, 194, 231, 96, 251, 8, 63, 218, 74, 5, 233, 
+    65, 215, 185, 251, 8, 63, 218, 74, 5, 231, 96, 251, 8, 63, 218, 74, 5, 
+    235, 194, 231, 96, 251, 8, 63, 218, 74, 1, 176, 63, 218, 74, 1, 234, 133, 
+    63, 218, 74, 1, 243, 136, 63, 218, 74, 1, 242, 250, 63, 218, 74, 1, 229, 
+    78, 63, 218, 74, 1, 251, 34, 63, 218, 74, 1, 250, 158, 63, 218, 74, 1, 
+    235, 142, 63, 218, 74, 1, 227, 166, 63, 218, 74, 1, 215, 157, 63, 218, 
+    74, 1, 215, 145, 63, 218, 74, 1, 248, 136, 63, 218, 74, 1, 248, 120, 63, 
+    218, 74, 1, 228, 111, 63, 218, 74, 1, 217, 106, 63, 218, 74, 1, 216, 209, 
+    63, 218, 74, 1, 248, 222, 63, 218, 74, 1, 248, 26, 63, 218, 74, 1, 197, 
+    63, 218, 74, 1, 190, 63, 218, 74, 1, 225, 148, 63, 218, 74, 1, 252, 192, 
+    63, 218, 74, 1, 252, 19, 63, 218, 74, 1, 185, 63, 218, 74, 1, 215, 184, 
+    63, 218, 74, 1, 215, 176, 63, 218, 74, 1, 246, 39, 63, 218, 74, 1, 246, 
+    34, 63, 218, 74, 1, 212, 65, 63, 218, 74, 1, 210, 82, 63, 218, 74, 1, 
+    210, 116, 63, 218, 74, 1, 255, 167, 63, 218, 74, 1, 191, 63, 218, 74, 1, 
+    205, 63, 218, 74, 1, 233, 136, 63, 218, 74, 1, 220, 103, 63, 218, 74, 1, 
+    218, 224, 63, 218, 74, 1, 206, 63, 218, 74, 1, 162, 63, 218, 74, 1, 61, 
+    63, 218, 74, 1, 233, 232, 63, 218, 74, 1, 244, 78, 212, 65, 63, 218, 74, 
+    1, 244, 78, 191, 63, 218, 74, 1, 244, 78, 205, 63, 233, 219, 222, 142, 
+    234, 133, 63, 233, 219, 222, 142, 234, 134, 251, 70, 230, 203, 251, 8, 
+    63, 250, 253, 5, 114, 252, 71, 63, 250, 253, 5, 192, 252, 71, 63, 250, 
+    253, 5, 250, 254, 217, 21, 63, 250, 253, 5, 221, 208, 255, 166, 63, 16, 
+    246, 92, 251, 126, 63, 16, 223, 130, 222, 223, 63, 16, 226, 78, 243, 64, 
+    63, 16, 223, 130, 222, 224, 223, 43, 242, 146, 63, 16, 225, 113, 190, 63, 
+    16, 228, 60, 251, 126, 63, 16, 228, 60, 251, 127, 227, 140, 255, 163, 63, 
+    16, 228, 60, 251, 127, 242, 118, 255, 163, 63, 16, 228, 60, 251, 127, 
+    251, 70, 255, 163, 63, 5, 223, 131, 229, 220, 223, 131, 247, 159, 63, 5, 
+    223, 131, 229, 220, 242, 117, 63, 164, 251, 130, 220, 4, 242, 216, 230, 
+    249, 223, 42, 63, 164, 230, 164, 211, 0, 242, 216, 230, 249, 223, 42, 63, 
+    164, 227, 140, 215, 173, 63, 164, 65, 251, 153, 222, 214, 211, 0, 230, 
+    249, 231, 94, 185, 63, 164, 249, 253, 251, 153, 222, 214, 211, 0, 230, 
+    249, 220, 110, 185, 222, 251, 218, 0, 50, 233, 46, 218, 0, 50, 222, 251, 
+    218, 0, 5, 2, 247, 119, 233, 46, 218, 0, 5, 2, 247, 119, 63, 164, 233, 
+    56, 231, 97, 222, 144, 63, 164, 215, 251, 231, 97, 222, 144, 68, 1, 176, 
+    68, 1, 234, 133, 68, 1, 243, 136, 68, 1, 242, 250, 68, 1, 229, 78, 68, 1, 
+    251, 34, 68, 1, 250, 158, 68, 1, 235, 142, 68, 1, 235, 115, 68, 1, 227, 
+    166, 68, 1, 228, 77, 68, 1, 215, 157, 68, 1, 215, 145, 68, 1, 248, 136, 
+    68, 1, 248, 120, 68, 1, 228, 111, 68, 1, 217, 106, 68, 1, 216, 209, 68, 
+    1, 248, 222, 68, 1, 248, 26, 68, 1, 197, 68, 1, 190, 68, 1, 225, 148, 68, 
+    1, 252, 192, 68, 1, 252, 19, 68, 1, 185, 68, 1, 191, 68, 1, 205, 68, 1, 
+    233, 136, 68, 1, 212, 65, 68, 1, 206, 68, 1, 162, 68, 1, 232, 185, 68, 1, 
+    61, 68, 1, 220, 87, 61, 68, 1, 73, 68, 1, 236, 34, 68, 1, 70, 68, 1, 214, 
+    118, 68, 1, 75, 68, 1, 230, 152, 75, 68, 1, 76, 68, 1, 253, 193, 68, 25, 
+    5, 217, 65, 255, 74, 68, 25, 5, 255, 74, 68, 25, 5, 73, 68, 25, 5, 236, 
+    34, 68, 25, 5, 70, 68, 25, 5, 214, 118, 68, 25, 5, 75, 68, 25, 5, 254, 
+    202, 68, 25, 5, 230, 152, 236, 34, 68, 25, 5, 230, 152, 76, 68, 25, 5, 
+    160, 48, 68, 5, 254, 76, 68, 5, 59, 51, 68, 5, 213, 147, 68, 5, 213, 152, 
+    68, 5, 253, 236, 68, 116, 5, 147, 191, 68, 116, 5, 147, 205, 68, 116, 5, 
+    147, 212, 65, 68, 116, 5, 147, 162, 68, 1, 242, 133, 206, 68, 21, 210, 
+    86, 68, 21, 110, 68, 21, 105, 68, 21, 158, 68, 21, 161, 68, 21, 189, 68, 
+    21, 194, 68, 21, 198, 68, 21, 195, 68, 21, 200, 68, 5, 232, 193, 221, 
+    173, 68, 5, 221, 173, 68, 16, 232, 154, 68, 16, 249, 214, 68, 16, 254, 
+    221, 68, 16, 243, 49, 68, 1, 220, 103, 68, 1, 218, 224, 68, 1, 149, 153, 
+    68, 1, 149, 222, 181, 68, 1, 149, 156, 68, 1, 149, 232, 186, 68, 25, 5, 
+    149, 153, 68, 25, 5, 149, 222, 181, 68, 25, 5, 149, 156, 68, 25, 5, 149, 
+    232, 186, 68, 1, 230, 152, 229, 78, 68, 1, 230, 152, 235, 115, 68, 1, 
+    230, 152, 252, 112, 68, 1, 230, 152, 252, 107, 68, 116, 5, 230, 152, 147, 
+    197, 68, 116, 5, 230, 152, 147, 185, 68, 116, 5, 230, 152, 147, 233, 136, 
+    68, 1, 220, 109, 234, 214, 220, 103, 68, 25, 5, 220, 109, 234, 214, 245, 
+    56, 68, 138, 164, 220, 109, 234, 214, 241, 248, 68, 138, 164, 220, 109, 
+    234, 214, 234, 184, 225, 122, 68, 1, 212, 7, 224, 109, 234, 214, 216, 
+    209, 68, 1, 212, 7, 224, 109, 234, 214, 224, 115, 68, 25, 5, 212, 7, 224, 
+    109, 234, 214, 245, 56, 68, 25, 5, 212, 7, 224, 109, 234, 214, 214, 214, 
+    68, 5, 212, 7, 224, 109, 234, 214, 216, 30, 68, 5, 212, 7, 224, 109, 234, 
+    214, 216, 29, 68, 5, 212, 7, 224, 109, 234, 214, 216, 28, 68, 5, 212, 7, 
+    224, 109, 234, 214, 216, 27, 68, 5, 212, 7, 224, 109, 234, 214, 216, 26, 
+    68, 1, 245, 220, 224, 109, 234, 214, 228, 111, 68, 1, 245, 220, 224, 109, 
+    234, 214, 210, 176, 68, 1, 245, 220, 224, 109, 234, 214, 242, 218, 68, 
+    25, 5, 243, 60, 234, 214, 73, 68, 25, 5, 234, 189, 226, 235, 68, 25, 5, 
+    234, 189, 70, 68, 25, 5, 234, 189, 245, 210, 68, 1, 220, 87, 176, 68, 1, 
+    220, 87, 234, 133, 68, 1, 220, 87, 243, 136, 68, 1, 220, 87, 251, 34, 68, 
+    1, 220, 87, 210, 116, 68, 1, 220, 87, 227, 166, 68, 1, 220, 87, 248, 222, 
+    68, 1, 220, 87, 197, 68, 1, 220, 87, 225, 148, 68, 1, 220, 87, 244, 197, 
+    68, 1, 220, 87, 252, 192, 68, 1, 220, 87, 216, 209, 68, 1, 220, 87, 162, 
+    68, 116, 5, 220, 87, 147, 212, 65, 68, 25, 5, 220, 87, 255, 74, 68, 25, 
+    5, 220, 87, 75, 68, 25, 5, 220, 87, 160, 48, 68, 25, 5, 220, 87, 40, 211, 
+    117, 68, 5, 220, 87, 216, 29, 68, 5, 220, 87, 216, 28, 68, 5, 220, 87, 
+    216, 26, 68, 5, 220, 87, 216, 25, 68, 5, 220, 87, 249, 153, 216, 29, 68, 
+    5, 220, 87, 249, 153, 216, 28, 68, 5, 220, 87, 249, 153, 245, 154, 216, 
+    31, 68, 1, 222, 129, 226, 64, 244, 197, 68, 5, 222, 129, 226, 64, 216, 
+    26, 68, 220, 87, 21, 210, 86, 68, 220, 87, 21, 110, 68, 220, 87, 21, 105, 
+    68, 220, 87, 21, 158, 68, 220, 87, 21, 161, 68, 220, 87, 21, 189, 68, 
+    220, 87, 21, 194, 68, 220, 87, 21, 198, 68, 220, 87, 21, 195, 68, 220, 
+    87, 21, 200, 68, 5, 234, 127, 216, 30, 68, 5, 234, 127, 216, 28, 68, 25, 
+    5, 254, 191, 61, 68, 25, 5, 254, 191, 254, 202, 68, 16, 220, 87, 110, 68, 
+    16, 220, 87, 245, 31, 98, 6, 1, 254, 124, 98, 6, 1, 252, 153, 98, 6, 1, 
+    243, 107, 98, 6, 1, 247, 129, 98, 6, 1, 245, 151, 98, 6, 1, 213, 160, 98, 
+    6, 1, 210, 89, 98, 6, 1, 217, 61, 98, 6, 1, 236, 0, 98, 6, 1, 234, 235, 
+    98, 6, 1, 233, 82, 98, 6, 1, 231, 186, 98, 6, 1, 229, 196, 98, 6, 1, 226, 
+    197, 98, 6, 1, 226, 18, 98, 6, 1, 210, 78, 98, 6, 1, 223, 172, 98, 6, 1, 
+    221, 244, 98, 6, 1, 217, 51, 98, 6, 1, 214, 190, 98, 6, 1, 225, 141, 98, 
+    6, 1, 234, 122, 98, 6, 1, 242, 242, 98, 6, 1, 224, 74, 98, 6, 1, 220, 21, 
+    98, 6, 1, 250, 98, 98, 6, 1, 251, 8, 98, 6, 1, 235, 101, 98, 6, 1, 250, 
+    41, 98, 6, 1, 250, 144, 98, 6, 1, 211, 163, 98, 6, 1, 235, 112, 98, 6, 1, 
+    242, 44, 98, 6, 1, 241, 239, 98, 6, 1, 241, 176, 98, 6, 1, 212, 22, 98, 
+    6, 1, 242, 5, 98, 6, 1, 241, 66, 98, 6, 1, 210, 246, 98, 6, 1, 254, 233, 
+    98, 1, 254, 124, 98, 1, 252, 153, 98, 1, 243, 107, 98, 1, 247, 129, 98, 
+    1, 245, 151, 98, 1, 213, 160, 98, 1, 210, 89, 98, 1, 217, 61, 98, 1, 236, 
+    0, 98, 1, 234, 235, 98, 1, 233, 82, 98, 1, 231, 186, 98, 1, 229, 196, 98, 
+    1, 226, 197, 98, 1, 226, 18, 98, 1, 210, 78, 98, 1, 223, 172, 98, 1, 221, 
+    244, 98, 1, 217, 51, 98, 1, 214, 190, 98, 1, 225, 141, 98, 1, 234, 122, 
+    98, 1, 242, 242, 98, 1, 224, 74, 98, 1, 220, 21, 98, 1, 250, 98, 98, 1, 
+    251, 8, 98, 1, 235, 101, 98, 1, 250, 41, 98, 1, 250, 144, 98, 1, 211, 
+    163, 98, 1, 235, 112, 98, 1, 242, 44, 98, 1, 241, 239, 98, 1, 241, 176, 
+    98, 1, 212, 22, 98, 1, 242, 5, 98, 1, 241, 66, 98, 1, 244, 122, 98, 1, 
+    210, 246, 98, 1, 245, 166, 98, 1, 215, 94, 243, 107, 98, 1, 254, 197, 98, 
+    226, 16, 220, 138, 58, 1, 98, 229, 196, 98, 1, 254, 233, 98, 1, 242, 4, 
+    50, 98, 1, 233, 128, 50, 24, 100, 234, 59, 24, 100, 218, 216, 24, 100, 
+    228, 227, 24, 100, 216, 102, 24, 100, 218, 205, 24, 100, 223, 27, 24, 
+    100, 230, 218, 24, 100, 225, 96, 24, 100, 218, 213, 24, 100, 219, 149, 
+    24, 100, 218, 210, 24, 100, 236, 57, 24, 100, 250, 47, 24, 100, 218, 220, 
+    24, 100, 250, 107, 24, 100, 234, 111, 24, 100, 216, 174, 24, 100, 225, 
+    132, 24, 100, 241, 173, 24, 100, 228, 223, 24, 100, 218, 214, 24, 100, 
+    228, 217, 24, 100, 228, 221, 24, 100, 216, 99, 24, 100, 223, 15, 24, 100, 
+    218, 212, 24, 100, 223, 25, 24, 100, 234, 219, 24, 100, 230, 211, 24, 
+    100, 234, 222, 24, 100, 225, 91, 24, 100, 225, 89, 24, 100, 225, 77, 24, 
+    100, 225, 85, 24, 100, 225, 83, 24, 100, 225, 80, 24, 100, 225, 82, 24, 
+    100, 225, 79, 24, 100, 225, 84, 24, 100, 225, 94, 24, 100, 225, 95, 24, 
+    100, 225, 78, 24, 100, 225, 88, 24, 100, 234, 220, 24, 100, 234, 218, 24, 
+    100, 219, 142, 24, 100, 219, 140, 24, 100, 219, 132, 24, 100, 219, 135, 
+    24, 100, 219, 141, 24, 100, 219, 137, 24, 100, 219, 136, 24, 100, 219, 
+    134, 24, 100, 219, 145, 24, 100, 219, 147, 24, 100, 219, 148, 24, 100, 
+    219, 143, 24, 100, 219, 133, 24, 100, 219, 138, 24, 100, 219, 146, 24, 
+    100, 250, 91, 24, 100, 250, 89, 24, 100, 250, 169, 24, 100, 250, 167, 24, 
+    100, 226, 33, 24, 100, 236, 52, 24, 100, 236, 43, 24, 100, 236, 51, 24, 
+    100, 236, 48, 24, 100, 236, 46, 24, 100, 236, 50, 24, 100, 218, 217, 24, 
+    100, 236, 55, 24, 100, 236, 56, 24, 100, 236, 44, 24, 100, 236, 49, 24, 
+    100, 211, 26, 24, 100, 250, 46, 24, 100, 250, 92, 24, 100, 250, 90, 24, 
+    100, 250, 170, 24, 100, 250, 168, 24, 100, 250, 105, 24, 100, 250, 106, 
+    24, 100, 250, 93, 24, 100, 250, 171, 24, 100, 225, 130, 24, 100, 234, 
+    221, 24, 100, 218, 218, 24, 100, 211, 32, 24, 100, 234, 50, 24, 100, 228, 
+    219, 24, 100, 228, 225, 24, 100, 228, 224, 24, 100, 216, 96, 24, 100, 
+    244, 104, 24, 143, 244, 104, 24, 143, 61, 24, 143, 254, 244, 24, 143, 
+    191, 24, 143, 211, 92, 24, 143, 245, 118, 24, 143, 75, 24, 143, 211, 36, 
+    24, 143, 211, 47, 24, 143, 76, 24, 143, 212, 65, 24, 143, 212, 62, 24, 
+    143, 226, 235, 24, 143, 210, 244, 24, 143, 70, 24, 143, 212, 11, 24, 143, 
+    212, 22, 24, 143, 211, 250, 24, 143, 210, 212, 24, 143, 245, 56, 24, 143, 
+    211, 8, 24, 143, 73, 24, 143, 255, 158, 24, 143, 255, 157, 24, 143, 211, 
+    106, 24, 143, 211, 104, 24, 143, 245, 116, 24, 143, 245, 115, 24, 143, 
+    245, 117, 24, 143, 211, 35, 24, 143, 211, 34, 24, 143, 227, 85, 24, 143, 
+    227, 86, 24, 143, 227, 79, 24, 143, 227, 84, 24, 143, 227, 82, 24, 143, 
+    210, 238, 24, 143, 210, 237, 24, 143, 210, 236, 24, 143, 210, 239, 24, 
+    143, 210, 240, 24, 143, 215, 30, 24, 143, 215, 29, 24, 143, 215, 27, 24, 
+    143, 215, 24, 24, 143, 215, 25, 24, 143, 210, 211, 24, 143, 210, 208, 24, 
+    143, 210, 209, 24, 143, 210, 203, 24, 143, 210, 204, 24, 143, 210, 205, 
+    24, 143, 210, 207, 24, 143, 245, 50, 24, 143, 245, 52, 24, 143, 211, 7, 
+    24, 143, 240, 154, 24, 143, 240, 146, 24, 143, 240, 149, 24, 143, 240, 
+    147, 24, 143, 240, 151, 24, 143, 240, 153, 24, 143, 254, 35, 24, 143, 
+    254, 32, 24, 143, 254, 30, 24, 143, 254, 31, 24, 143, 218, 221, 24, 143, 
+    255, 159, 24, 143, 211, 105, 24, 143, 211, 33, 24, 143, 227, 81, 24, 143, 
+    227, 80, 24, 90, 234, 59, 24, 90, 218, 216, 24, 90, 234, 52, 24, 90, 228, 
+    227, 24, 90, 228, 225, 24, 90, 228, 224, 24, 90, 216, 102, 24, 90, 223, 
+    27, 24, 90, 223, 22, 24, 90, 223, 19, 24, 90, 223, 12, 24, 90, 223, 7, 
+    24, 90, 223, 2, 24, 90, 223, 13, 24, 90, 223, 25, 24, 90, 230, 218, 24, 
+    90, 225, 96, 24, 90, 225, 85, 24, 90, 219, 149, 24, 90, 218, 210, 24, 90, 
+    236, 57, 24, 90, 250, 47, 24, 90, 250, 107, 24, 90, 234, 111, 24, 90, 
+    216, 174, 24, 90, 225, 132, 24, 90, 241, 173, 24, 90, 234, 53, 24, 90, 
+    234, 51, 24, 90, 228, 223, 24, 90, 228, 217, 24, 90, 228, 219, 24, 90, 
+    228, 222, 24, 90, 228, 218, 24, 90, 216, 99, 24, 90, 216, 96, 24, 90, 
+    223, 20, 24, 90, 223, 15, 24, 90, 223, 1, 24, 90, 223, 0, 24, 90, 218, 
+    212, 24, 90, 223, 17, 24, 90, 223, 16, 24, 90, 223, 9, 24, 90, 223, 11, 
+    24, 90, 223, 24, 24, 90, 223, 4, 24, 90, 223, 14, 24, 90, 223, 23, 24, 
+    90, 222, 255, 24, 90, 230, 214, 24, 90, 230, 209, 24, 90, 230, 211, 24, 
+    90, 230, 208, 24, 90, 230, 206, 24, 90, 230, 212, 24, 90, 230, 217, 24, 
+    90, 230, 215, 24, 90, 234, 222, 24, 90, 225, 87, 24, 90, 225, 88, 24, 90, 
+    225, 93, 24, 90, 234, 220, 24, 90, 219, 142, 24, 90, 219, 132, 24, 90, 
+    219, 135, 24, 90, 219, 137, 24, 90, 226, 33, 24, 90, 236, 52, 24, 90, 
+    236, 45, 24, 90, 218, 217, 24, 90, 236, 53, 24, 90, 211, 26, 24, 90, 211, 
+    22, 24, 90, 211, 23, 24, 90, 225, 130, 24, 90, 234, 221, 24, 90, 241, 
+    171, 24, 90, 241, 169, 24, 90, 241, 172, 24, 90, 241, 170, 24, 90, 211, 
+    32, 24, 90, 234, 55, 24, 90, 234, 54, 24, 90, 234, 58, 24, 90, 234, 56, 
+    24, 90, 234, 57, 24, 90, 218, 214, 29, 3, 162, 29, 3, 240, 223, 29, 3, 
+    241, 181, 29, 3, 242, 47, 29, 3, 241, 221, 29, 3, 241, 239, 29, 3, 241, 
+    69, 29, 3, 241, 68, 29, 3, 233, 136, 29, 3, 232, 99, 29, 3, 232, 242, 29, 
+    3, 233, 135, 29, 3, 233, 51, 29, 3, 233, 59, 29, 3, 232, 157, 29, 3, 232, 
+    71, 29, 3, 241, 190, 29, 3, 241, 184, 29, 3, 241, 186, 29, 3, 241, 189, 
+    29, 3, 241, 187, 29, 3, 241, 188, 29, 3, 241, 185, 29, 3, 241, 183, 29, 
+    3, 185, 29, 3, 230, 103, 29, 3, 230, 231, 29, 3, 231, 238, 29, 3, 231, 
+    81, 29, 3, 231, 92, 29, 3, 230, 162, 29, 3, 230, 43, 29, 3, 217, 164, 29, 
+    3, 217, 158, 29, 3, 217, 160, 29, 3, 217, 163, 29, 3, 217, 161, 29, 3, 
+    217, 162, 29, 3, 217, 159, 29, 3, 217, 157, 29, 3, 205, 29, 3, 222, 141, 
+    29, 3, 223, 36, 29, 3, 223, 185, 29, 3, 223, 109, 29, 3, 223, 129, 29, 3, 
+    222, 212, 29, 3, 222, 110, 29, 3, 206, 29, 3, 218, 84, 29, 3, 219, 192, 
+    29, 3, 222, 32, 29, 3, 221, 171, 29, 3, 221, 182, 29, 3, 219, 59, 29, 3, 
+    217, 254, 29, 3, 220, 103, 29, 3, 219, 226, 29, 3, 220, 33, 29, 3, 220, 
+    99, 29, 3, 220, 62, 29, 3, 220, 64, 29, 3, 220, 8, 29, 3, 219, 209, 29, 
+    3, 224, 89, 29, 3, 224, 31, 29, 3, 224, 54, 29, 3, 224, 88, 29, 3, 224, 
+    69, 29, 3, 224, 70, 29, 3, 224, 43, 29, 3, 224, 42, 29, 3, 223, 243, 29, 
+    3, 223, 239, 29, 3, 223, 242, 29, 3, 223, 240, 29, 3, 223, 241, 29, 3, 
+    224, 66, 29, 3, 224, 60, 29, 3, 224, 62, 29, 3, 224, 65, 29, 3, 224, 63, 
+    29, 3, 224, 64, 29, 3, 224, 61, 29, 3, 224, 59, 29, 3, 224, 55, 29, 3, 
+    224, 58, 29, 3, 224, 56, 29, 3, 224, 57, 29, 3, 252, 192, 29, 3, 251, 
+    126, 29, 3, 252, 7, 29, 3, 252, 190, 29, 3, 252, 67, 29, 3, 252, 76, 29, 
+    3, 251, 206, 29, 3, 251, 84, 29, 3, 214, 27, 29, 3, 212, 116, 29, 3, 213, 
+    176, 29, 3, 214, 26, 29, 3, 213, 250, 29, 3, 213, 255, 29, 3, 213, 138, 
+    29, 3, 212, 107, 29, 3, 217, 106, 29, 3, 215, 119, 29, 3, 216, 118, 29, 
+    3, 217, 102, 29, 3, 217, 12, 29, 3, 217, 23, 29, 3, 111, 29, 3, 215, 80, 
+    29, 3, 251, 34, 29, 3, 249, 113, 29, 3, 250, 52, 29, 3, 251, 33, 29, 3, 
+    250, 183, 29, 3, 250, 191, 29, 3, 249, 239, 29, 3, 249, 82, 29, 3, 211, 
+    165, 29, 3, 211, 141, 29, 3, 211, 157, 29, 3, 211, 164, 29, 3, 211, 161, 
+    29, 3, 211, 162, 29, 3, 211, 148, 29, 3, 211, 147, 29, 3, 211, 136, 29, 
+    3, 211, 132, 29, 3, 211, 135, 29, 3, 211, 133, 29, 3, 211, 134, 29, 3, 
+    197, 29, 3, 227, 238, 29, 3, 228, 234, 29, 3, 229, 226, 29, 3, 229, 104, 
+    29, 3, 229, 108, 29, 3, 228, 75, 29, 3, 227, 175, 29, 3, 227, 166, 29, 3, 
+    227, 129, 29, 3, 227, 149, 29, 3, 227, 165, 29, 3, 227, 156, 29, 3, 227, 
+    157, 29, 3, 227, 135, 29, 3, 227, 120, 29, 3, 242, 181, 61, 29, 3, 242, 
+    181, 70, 29, 3, 242, 181, 73, 29, 3, 242, 181, 255, 74, 29, 3, 242, 181, 
+    245, 210, 29, 3, 242, 181, 75, 29, 3, 242, 181, 76, 29, 3, 242, 181, 212, 
+    65, 29, 3, 176, 29, 3, 233, 218, 29, 3, 234, 93, 29, 3, 235, 11, 29, 3, 
+    234, 182, 29, 3, 234, 183, 29, 3, 234, 29, 29, 3, 234, 28, 29, 3, 233, 
+    183, 29, 3, 233, 177, 29, 3, 233, 182, 29, 3, 233, 178, 29, 3, 233, 179, 
+    29, 3, 233, 172, 29, 3, 233, 166, 29, 3, 233, 168, 29, 3, 233, 171, 29, 
+    3, 233, 169, 29, 3, 233, 170, 29, 3, 233, 167, 29, 3, 233, 165, 29, 3, 
+    233, 161, 29, 3, 233, 164, 29, 3, 233, 162, 29, 3, 233, 163, 29, 3, 212, 
+    65, 29, 3, 211, 195, 29, 3, 211, 250, 29, 3, 212, 64, 29, 3, 212, 17, 29, 
+    3, 212, 22, 29, 3, 211, 227, 29, 3, 211, 226, 29, 3, 225, 140, 61, 29, 3, 
+    225, 140, 70, 29, 3, 225, 140, 73, 29, 3, 225, 140, 255, 74, 29, 3, 225, 
+    140, 245, 210, 29, 3, 225, 140, 75, 29, 3, 225, 140, 76, 29, 3, 210, 116, 
+    29, 3, 210, 13, 29, 3, 210, 44, 29, 3, 210, 115, 29, 3, 210, 92, 29, 3, 
+    210, 94, 29, 3, 210, 23, 29, 3, 210, 0, 29, 3, 210, 82, 29, 3, 210, 62, 
+    29, 3, 210, 69, 29, 3, 210, 81, 29, 3, 210, 73, 29, 3, 210, 74, 29, 3, 
+    210, 67, 29, 3, 210, 53, 29, 3, 191, 29, 3, 210, 212, 29, 3, 211, 8, 29, 
+    3, 211, 103, 29, 3, 211, 44, 29, 3, 211, 47, 29, 3, 210, 244, 29, 3, 210, 
+    235, 29, 3, 248, 222, 29, 3, 246, 79, 29, 3, 248, 4, 29, 3, 248, 221, 29, 
+    3, 248, 78, 29, 3, 248, 91, 29, 3, 247, 146, 29, 3, 246, 48, 29, 3, 248, 
+    136, 29, 3, 248, 101, 29, 3, 248, 113, 29, 3, 248, 135, 29, 3, 248, 123, 
+    29, 3, 248, 124, 29, 3, 248, 106, 29, 3, 248, 92, 29, 3, 235, 142, 29, 3, 
+    235, 52, 29, 3, 235, 109, 29, 3, 235, 141, 29, 3, 235, 125, 29, 3, 235, 
+    127, 29, 3, 235, 69, 29, 3, 235, 32, 29, 3, 243, 136, 29, 3, 242, 114, 
+    29, 3, 242, 215, 29, 3, 243, 133, 29, 3, 243, 56, 29, 3, 243, 63, 29, 3, 
+    242, 175, 29, 3, 242, 174, 29, 3, 242, 79, 29, 3, 242, 75, 29, 3, 242, 
+    78, 29, 3, 242, 76, 29, 3, 242, 77, 29, 3, 243, 30, 29, 3, 243, 10, 29, 
+    3, 243, 20, 29, 3, 243, 29, 29, 3, 243, 24, 29, 3, 243, 25, 29, 3, 243, 
+    14, 29, 3, 242, 255, 29, 3, 216, 209, 29, 3, 216, 137, 29, 3, 216, 176, 
+    29, 3, 216, 208, 29, 3, 216, 195, 29, 3, 216, 196, 29, 3, 216, 157, 29, 
+    3, 216, 129, 29, 3, 250, 158, 29, 3, 250, 70, 29, 3, 250, 111, 29, 3, 
+    250, 157, 29, 3, 250, 129, 29, 3, 250, 132, 29, 3, 250, 87, 29, 3, 250, 
+    59, 29, 3, 225, 148, 29, 3, 225, 115, 29, 3, 225, 134, 29, 3, 225, 147, 
+    29, 3, 225, 136, 29, 3, 225, 137, 29, 3, 225, 122, 29, 3, 225, 111, 29, 
+    3, 215, 184, 29, 3, 215, 164, 29, 3, 215, 168, 29, 3, 215, 183, 29, 3, 
+    215, 178, 29, 3, 215, 179, 29, 3, 215, 167, 29, 3, 215, 162, 29, 3, 215, 
+    39, 29, 3, 215, 31, 29, 3, 215, 35, 29, 3, 215, 38, 29, 3, 215, 36, 29, 
+    3, 215, 37, 29, 3, 215, 33, 29, 3, 215, 32, 29, 3, 244, 197, 29, 3, 243, 
+    235, 29, 3, 244, 122, 29, 3, 244, 196, 29, 3, 244, 148, 29, 3, 244, 155, 
+    29, 3, 244, 44, 29, 3, 243, 214, 29, 3, 190, 29, 3, 224, 151, 29, 3, 225, 
+    109, 29, 3, 226, 90, 29, 3, 225, 212, 29, 3, 225, 222, 29, 3, 225, 17, 
+    29, 3, 224, 115, 29, 3, 222, 100, 29, 3, 230, 32, 29, 3, 243, 208, 29, 
+    38, 243, 54, 22, 25, 233, 24, 78, 29, 38, 25, 233, 24, 78, 29, 38, 243, 
+    54, 78, 29, 221, 174, 78, 29, 211, 208, 29, 243, 230, 218, 130, 29, 249, 
+    220, 29, 220, 151, 29, 249, 227, 29, 224, 200, 249, 227, 29, 224, 14, 78, 
+    29, 226, 16, 220, 138, 29, 21, 110, 29, 21, 105, 29, 21, 158, 29, 21, 
+    161, 29, 21, 189, 29, 21, 194, 29, 21, 198, 29, 21, 195, 29, 21, 200, 29, 
+    54, 216, 248, 29, 54, 215, 73, 29, 54, 216, 163, 29, 54, 244, 16, 29, 54, 
+    244, 115, 29, 54, 219, 112, 29, 54, 220, 117, 29, 54, 245, 185, 29, 54, 
+    228, 196, 29, 54, 240, 211, 29, 54, 216, 249, 216, 148, 29, 3, 221, 178, 
+    230, 43, 29, 3, 230, 39, 29, 3, 230, 40, 29, 3, 230, 41, 29, 3, 221, 178, 
+    251, 84, 29, 3, 251, 81, 29, 3, 251, 82, 29, 3, 251, 83, 29, 3, 221, 178, 
+    243, 214, 29, 3, 243, 210, 29, 3, 243, 211, 29, 3, 243, 212, 29, 3, 221, 
+    178, 224, 115, 29, 3, 224, 111, 29, 3, 224, 112, 29, 3, 224, 113, 29, 
+    216, 32, 164, 210, 247, 29, 216, 32, 164, 248, 42, 29, 216, 32, 164, 222, 
+    239, 29, 216, 32, 164, 219, 252, 222, 239, 29, 216, 32, 164, 247, 236, 
+    29, 216, 32, 164, 234, 165, 29, 216, 32, 164, 250, 95, 29, 216, 32, 164, 
+    241, 178, 29, 216, 32, 164, 248, 41, 29, 216, 32, 164, 233, 195, 169, 1, 
+    61, 169, 1, 75, 169, 1, 73, 169, 1, 76, 169, 1, 70, 169, 1, 214, 105, 
+    169, 1, 243, 136, 169, 1, 176, 169, 1, 243, 63, 169, 1, 242, 215, 169, 1, 
+    242, 175, 169, 1, 242, 114, 169, 1, 242, 80, 169, 1, 162, 169, 1, 241, 
+    239, 169, 1, 241, 181, 169, 1, 241, 69, 169, 1, 240, 223, 169, 1, 240, 
+    202, 169, 1, 233, 136, 169, 1, 233, 59, 169, 1, 232, 242, 169, 1, 232, 
+    157, 169, 1, 232, 99, 169, 1, 232, 72, 169, 1, 185, 169, 1, 231, 92, 169, 
+    1, 230, 231, 169, 1, 230, 162, 169, 1, 230, 103, 169, 1, 197, 169, 1, 
+    241, 91, 169, 1, 229, 214, 169, 1, 229, 108, 169, 1, 228, 234, 169, 1, 
+    228, 75, 169, 1, 227, 238, 169, 1, 227, 177, 169, 1, 224, 30, 169, 1, 
+    224, 17, 169, 1, 224, 10, 169, 1, 224, 2, 169, 1, 223, 247, 169, 1, 223, 
+    245, 169, 1, 206, 169, 1, 222, 92, 169, 1, 221, 182, 169, 1, 219, 192, 
+    169, 1, 219, 59, 169, 1, 218, 84, 169, 1, 218, 3, 169, 1, 248, 222, 169, 
+    1, 217, 106, 169, 1, 248, 91, 169, 1, 217, 23, 169, 1, 248, 4, 169, 1, 
+    216, 118, 169, 1, 247, 146, 169, 1, 246, 79, 169, 1, 246, 51, 169, 1, 
+    247, 157, 169, 1, 216, 60, 169, 1, 216, 59, 169, 1, 216, 48, 169, 1, 216, 
+    47, 169, 1, 216, 46, 169, 1, 216, 45, 169, 1, 215, 184, 169, 1, 215, 179, 
+    169, 1, 215, 168, 169, 1, 215, 167, 169, 1, 215, 164, 169, 1, 215, 163, 
+    169, 1, 212, 65, 169, 1, 212, 22, 169, 1, 211, 250, 169, 1, 211, 227, 
+    169, 1, 211, 195, 169, 1, 211, 183, 169, 1, 191, 169, 1, 211, 47, 169, 1, 
+    211, 8, 169, 1, 210, 244, 169, 1, 210, 212, 169, 1, 210, 177, 18, 19, 
+    240, 169, 18, 19, 75, 18, 19, 255, 38, 18, 19, 73, 18, 19, 236, 34, 18, 
+    19, 76, 18, 19, 226, 184, 18, 19, 211, 116, 226, 184, 18, 19, 72, 245, 
+    210, 18, 19, 72, 73, 18, 19, 61, 18, 19, 255, 74, 18, 19, 212, 22, 18, 
+    19, 159, 212, 22, 18, 19, 211, 250, 18, 19, 159, 211, 250, 18, 19, 211, 
+    242, 18, 19, 159, 211, 242, 18, 19, 211, 227, 18, 19, 159, 211, 227, 18, 
+    19, 211, 215, 18, 19, 159, 211, 215, 18, 19, 229, 191, 211, 215, 18, 19, 
+    212, 65, 18, 19, 159, 212, 65, 18, 19, 212, 64, 18, 19, 159, 212, 64, 18, 
+    19, 229, 191, 212, 64, 18, 19, 254, 202, 18, 19, 211, 116, 212, 98, 18, 
+    19, 242, 181, 218, 130, 18, 19, 40, 142, 18, 19, 40, 242, 137, 18, 19, 
+    40, 251, 176, 163, 222, 234, 18, 19, 40, 216, 15, 163, 222, 234, 18, 19, 
+    40, 44, 163, 222, 234, 18, 19, 40, 222, 234, 18, 19, 40, 52, 142, 18, 19, 
+    40, 52, 219, 252, 67, 218, 91, 18, 19, 40, 230, 225, 247, 121, 18, 19, 
+    40, 219, 252, 203, 91, 18, 19, 40, 225, 23, 18, 19, 40, 124, 217, 88, 18, 
+    19, 245, 151, 18, 19, 236, 0, 18, 19, 226, 197, 18, 19, 254, 124, 18, 19, 
+    225, 222, 18, 19, 226, 88, 18, 19, 225, 109, 18, 19, 225, 72, 18, 19, 
+    225, 17, 18, 19, 224, 250, 18, 19, 211, 116, 224, 250, 18, 19, 72, 241, 
+    221, 18, 19, 72, 241, 181, 18, 19, 190, 18, 19, 226, 90, 18, 19, 224, 
+    113, 18, 19, 159, 224, 113, 18, 19, 224, 111, 18, 19, 159, 224, 111, 18, 
+    19, 224, 110, 18, 19, 159, 224, 110, 18, 19, 224, 108, 18, 19, 159, 224, 
+    108, 18, 19, 224, 107, 18, 19, 159, 224, 107, 18, 19, 224, 115, 18, 19, 
+    159, 224, 115, 18, 19, 224, 114, 18, 19, 159, 224, 114, 18, 19, 211, 116, 
+    224, 114, 18, 19, 226, 106, 18, 19, 159, 226, 106, 18, 19, 72, 242, 61, 
+    18, 19, 217, 23, 18, 19, 217, 100, 18, 19, 216, 118, 18, 19, 216, 104, 
+    18, 19, 111, 18, 19, 216, 18, 18, 19, 211, 116, 216, 18, 18, 19, 72, 248, 
+    78, 18, 19, 72, 248, 4, 18, 19, 217, 106, 18, 19, 217, 102, 18, 19, 215, 
+    78, 18, 19, 159, 215, 78, 18, 19, 215, 62, 18, 19, 159, 215, 62, 18, 19, 
+    215, 61, 18, 19, 159, 215, 61, 18, 19, 105, 18, 19, 159, 105, 18, 19, 
+    215, 54, 18, 19, 159, 215, 54, 18, 19, 215, 80, 18, 19, 159, 215, 80, 18, 
+    19, 215, 79, 18, 19, 159, 215, 79, 18, 19, 229, 191, 215, 79, 18, 19, 
+    217, 153, 18, 19, 215, 152, 18, 19, 215, 136, 18, 19, 215, 134, 18, 19, 
+    215, 157, 18, 19, 234, 183, 18, 19, 235, 8, 18, 19, 234, 93, 18, 19, 234, 
+    84, 18, 19, 234, 29, 18, 19, 234, 11, 18, 19, 211, 116, 234, 11, 18, 19, 
+    176, 18, 19, 235, 11, 18, 19, 233, 179, 18, 19, 159, 233, 179, 18, 19, 
+    233, 177, 18, 19, 159, 233, 177, 18, 19, 233, 176, 18, 19, 159, 233, 176, 
+    18, 19, 233, 175, 18, 19, 159, 233, 175, 18, 19, 233, 174, 18, 19, 159, 
+    233, 174, 18, 19, 233, 183, 18, 19, 159, 233, 183, 18, 19, 233, 182, 18, 
+    19, 159, 233, 182, 18, 19, 229, 191, 233, 182, 18, 19, 235, 24, 18, 19, 
+    233, 184, 18, 19, 219, 28, 234, 177, 18, 19, 219, 28, 234, 85, 18, 19, 
+    219, 28, 234, 24, 18, 19, 219, 28, 234, 249, 18, 19, 250, 191, 18, 19, 
+    251, 32, 18, 19, 250, 52, 18, 19, 250, 42, 18, 19, 249, 239, 18, 19, 249, 
+    175, 18, 19, 211, 116, 249, 175, 18, 19, 251, 34, 18, 19, 251, 33, 18, 
+    19, 249, 80, 18, 19, 159, 249, 80, 18, 19, 249, 78, 18, 19, 159, 249, 78, 
+    18, 19, 249, 77, 18, 19, 159, 249, 77, 18, 19, 249, 76, 18, 19, 159, 249, 
+    76, 18, 19, 249, 75, 18, 19, 159, 249, 75, 18, 19, 249, 82, 18, 19, 159, 
+    249, 82, 18, 19, 249, 81, 18, 19, 159, 249, 81, 18, 19, 229, 191, 249, 
+    81, 18, 19, 251, 67, 18, 19, 221, 210, 216, 211, 18, 19, 231, 92, 18, 19, 
+    231, 237, 18, 19, 230, 231, 18, 19, 230, 202, 18, 19, 230, 162, 18, 19, 
+    230, 133, 18, 19, 211, 116, 230, 133, 18, 19, 185, 18, 19, 231, 238, 18, 
+    19, 230, 41, 18, 19, 159, 230, 41, 18, 19, 230, 39, 18, 19, 159, 230, 39, 
+    18, 19, 230, 38, 18, 19, 159, 230, 38, 18, 19, 230, 37, 18, 19, 159, 230, 
+    37, 18, 19, 230, 36, 18, 19, 159, 230, 36, 18, 19, 230, 43, 18, 19, 159, 
+    230, 43, 18, 19, 230, 42, 18, 19, 159, 230, 42, 18, 19, 229, 191, 230, 
+    42, 18, 19, 193, 18, 19, 159, 193, 18, 19, 230, 235, 18, 19, 253, 206, 
+    193, 18, 19, 221, 210, 193, 18, 19, 229, 108, 18, 19, 229, 225, 18, 19, 
+    228, 234, 18, 19, 228, 209, 18, 19, 228, 75, 18, 19, 228, 65, 18, 19, 
+    211, 116, 228, 65, 18, 19, 197, 18, 19, 229, 226, 18, 19, 227, 173, 18, 
+    19, 159, 227, 173, 18, 19, 227, 175, 18, 19, 159, 227, 175, 18, 19, 227, 
+    174, 18, 19, 159, 227, 174, 18, 19, 229, 191, 227, 174, 18, 19, 230, 26, 
+    18, 19, 72, 229, 80, 18, 19, 228, 239, 18, 19, 233, 59, 18, 19, 233, 134, 
+    18, 19, 232, 242, 18, 19, 232, 228, 18, 19, 232, 157, 18, 19, 232, 128, 
+    18, 19, 211, 116, 232, 128, 18, 19, 233, 136, 18, 19, 233, 135, 18, 19, 
+    232, 69, 18, 19, 159, 232, 69, 18, 19, 232, 68, 18, 19, 159, 232, 68, 18, 
+    19, 232, 67, 18, 19, 159, 232, 67, 18, 19, 232, 66, 18, 19, 159, 232, 66, 
+    18, 19, 232, 65, 18, 19, 159, 232, 65, 18, 19, 232, 71, 18, 19, 159, 232, 
+    71, 18, 19, 232, 70, 18, 19, 159, 232, 70, 18, 19, 156, 18, 19, 159, 156, 
+    18, 19, 147, 156, 18, 19, 221, 182, 18, 19, 222, 30, 18, 19, 219, 192, 
+    18, 19, 219, 176, 18, 19, 219, 59, 18, 19, 219, 41, 18, 19, 211, 116, 
+    219, 41, 18, 19, 206, 18, 19, 222, 32, 18, 19, 217, 250, 18, 19, 159, 
+    217, 250, 18, 19, 217, 244, 18, 19, 159, 217, 244, 18, 19, 217, 243, 18, 
+    19, 159, 217, 243, 18, 19, 217, 239, 18, 19, 159, 217, 239, 18, 19, 217, 
+    238, 18, 19, 159, 217, 238, 18, 19, 217, 254, 18, 19, 159, 217, 254, 18, 
+    19, 217, 253, 18, 19, 159, 217, 253, 18, 19, 229, 191, 217, 253, 18, 19, 
+    222, 92, 18, 19, 253, 206, 222, 92, 18, 19, 217, 255, 18, 19, 251, 219, 
+    222, 92, 18, 19, 230, 128, 219, 109, 18, 19, 229, 191, 219, 100, 18, 19, 
+    229, 191, 222, 90, 18, 19, 229, 191, 218, 236, 18, 19, 229, 191, 218, 87, 
+    18, 19, 229, 191, 219, 99, 18, 19, 229, 191, 221, 185, 18, 19, 220, 64, 
+    18, 19, 220, 33, 18, 19, 220, 28, 18, 19, 220, 8, 18, 19, 220, 2, 18, 19, 
+    220, 103, 18, 19, 220, 99, 18, 19, 219, 207, 18, 19, 159, 219, 207, 18, 
+    19, 219, 206, 18, 19, 159, 219, 206, 18, 19, 219, 205, 18, 19, 159, 219, 
+    205, 18, 19, 219, 204, 18, 19, 159, 219, 204, 18, 19, 219, 203, 18, 19, 
+    159, 219, 203, 18, 19, 219, 209, 18, 19, 159, 219, 209, 18, 19, 219, 208, 
+    18, 19, 159, 219, 208, 18, 19, 220, 105, 18, 19, 211, 47, 18, 19, 211, 
+    101, 18, 19, 211, 8, 18, 19, 210, 255, 18, 19, 210, 244, 18, 19, 210, 
+    229, 18, 19, 211, 116, 210, 229, 18, 19, 191, 18, 19, 211, 103, 18, 19, 
+    210, 174, 18, 19, 159, 210, 174, 18, 19, 210, 173, 18, 19, 159, 210, 173, 
+    18, 19, 210, 172, 18, 19, 159, 210, 172, 18, 19, 210, 171, 18, 19, 159, 
+    210, 171, 18, 19, 210, 170, 18, 19, 159, 210, 170, 18, 19, 210, 176, 18, 
+    19, 159, 210, 176, 18, 19, 210, 175, 18, 19, 159, 210, 175, 18, 19, 229, 
+    191, 210, 175, 18, 19, 211, 117, 18, 19, 252, 5, 211, 117, 18, 19, 159, 
+    211, 117, 18, 19, 221, 210, 211, 8, 18, 19, 223, 129, 18, 19, 223, 224, 
+    223, 129, 18, 19, 159, 233, 59, 18, 19, 223, 184, 18, 19, 223, 36, 18, 
+    19, 222, 240, 18, 19, 222, 212, 18, 19, 222, 198, 18, 19, 159, 232, 157, 
+    18, 19, 205, 18, 19, 223, 185, 18, 19, 159, 233, 136, 18, 19, 222, 109, 
+    18, 19, 159, 222, 109, 18, 19, 153, 18, 19, 159, 153, 18, 19, 147, 153, 
+    18, 19, 244, 155, 18, 19, 244, 194, 18, 19, 244, 122, 18, 19, 244, 109, 
+    18, 19, 244, 44, 18, 19, 244, 35, 18, 19, 244, 197, 18, 19, 244, 196, 18, 
+    19, 243, 213, 18, 19, 159, 243, 213, 18, 19, 245, 7, 18, 19, 216, 196, 
+    18, 19, 230, 24, 216, 196, 18, 19, 216, 176, 18, 19, 230, 24, 216, 176, 
+    18, 19, 216, 172, 18, 19, 230, 24, 216, 172, 18, 19, 216, 157, 18, 19, 
+    216, 154, 18, 19, 216, 209, 18, 19, 216, 208, 18, 19, 216, 128, 18, 19, 
+    159, 216, 128, 18, 19, 216, 211, 18, 19, 215, 143, 18, 19, 215, 141, 18, 
+    19, 215, 140, 18, 19, 215, 145, 18, 19, 215, 146, 18, 19, 215, 52, 18, 
+    19, 215, 51, 18, 19, 215, 50, 18, 19, 215, 53, 18, 19, 227, 194, 241, 
+    239, 18, 19, 227, 194, 241, 181, 18, 19, 227, 194, 241, 162, 18, 19, 227, 
+    194, 241, 69, 18, 19, 227, 194, 241, 54, 18, 19, 227, 194, 162, 18, 19, 
+    227, 194, 242, 47, 18, 19, 227, 194, 242, 61, 18, 19, 227, 193, 242, 61, 
+    18, 19, 241, 155, 18, 19, 224, 85, 18, 19, 224, 54, 18, 19, 224, 49, 18, 
+    19, 224, 43, 18, 19, 224, 38, 18, 19, 224, 89, 18, 19, 224, 88, 18, 19, 
+    224, 97, 18, 19, 216, 56, 18, 19, 216, 54, 18, 19, 216, 53, 18, 19, 216, 
+    57, 18, 19, 159, 223, 129, 18, 19, 159, 223, 36, 18, 19, 159, 222, 212, 
+    18, 19, 159, 205, 18, 19, 229, 76, 18, 19, 229, 28, 18, 19, 229, 24, 18, 
+    19, 229, 5, 18, 19, 229, 0, 18, 19, 229, 78, 18, 19, 229, 77, 18, 19, 
+    229, 80, 18, 19, 228, 104, 18, 19, 221, 210, 220, 64, 18, 19, 221, 210, 
+    220, 33, 18, 19, 221, 210, 220, 8, 18, 19, 221, 210, 220, 103, 18, 19, 
+    211, 213, 216, 196, 18, 19, 211, 213, 216, 176, 18, 19, 211, 213, 216, 
+    157, 18, 19, 211, 213, 216, 209, 18, 19, 211, 213, 216, 211, 18, 19, 232, 
+    249, 18, 19, 232, 248, 18, 19, 232, 247, 18, 19, 232, 246, 18, 19, 232, 
+    255, 18, 19, 232, 254, 18, 19, 233, 0, 18, 19, 216, 210, 216, 196, 18, 
+    19, 216, 210, 216, 176, 18, 19, 216, 210, 216, 172, 18, 19, 216, 210, 
+    216, 157, 18, 19, 216, 210, 216, 154, 18, 19, 216, 210, 216, 209, 18, 19, 
+    216, 210, 216, 208, 18, 19, 216, 210, 216, 211, 18, 19, 254, 190, 253, 
+    159, 18, 19, 251, 219, 75, 18, 19, 251, 219, 73, 18, 19, 251, 219, 76, 
+    18, 19, 251, 219, 61, 18, 19, 251, 219, 212, 22, 18, 19, 251, 219, 211, 
+    250, 18, 19, 251, 219, 211, 227, 18, 19, 251, 219, 212, 65, 18, 19, 251, 
+    219, 229, 108, 18, 19, 251, 219, 228, 234, 18, 19, 251, 219, 228, 75, 18, 
+    19, 251, 219, 197, 18, 19, 251, 219, 234, 183, 18, 19, 251, 219, 234, 93, 
+    18, 19, 251, 219, 234, 29, 18, 19, 251, 219, 176, 18, 19, 221, 210, 241, 
+    239, 18, 19, 221, 210, 241, 181, 18, 19, 221, 210, 241, 69, 18, 19, 221, 
+    210, 162, 18, 19, 72, 242, 221, 18, 19, 72, 242, 225, 18, 19, 72, 242, 
+    237, 18, 19, 72, 242, 236, 18, 19, 72, 242, 226, 18, 19, 72, 242, 250, 
+    18, 19, 72, 222, 141, 18, 19, 72, 222, 212, 18, 19, 72, 223, 129, 18, 19, 
+    72, 223, 109, 18, 19, 72, 223, 36, 18, 19, 72, 205, 18, 19, 72, 211, 195, 
+    18, 19, 72, 211, 227, 18, 19, 72, 212, 22, 18, 19, 72, 212, 17, 18, 19, 
+    72, 211, 250, 18, 19, 72, 212, 65, 18, 19, 72, 240, 195, 18, 19, 72, 240, 
+    196, 18, 19, 72, 240, 199, 18, 19, 72, 240, 198, 18, 19, 72, 240, 197, 
+    18, 19, 72, 240, 201, 18, 19, 72, 216, 137, 18, 19, 72, 216, 157, 18, 19, 
+    72, 216, 196, 18, 19, 72, 216, 195, 18, 19, 72, 216, 176, 18, 19, 72, 
+    216, 209, 18, 19, 72, 215, 124, 18, 19, 72, 215, 134, 18, 19, 72, 215, 
+    152, 18, 19, 72, 215, 151, 18, 19, 72, 215, 136, 18, 19, 72, 215, 157, 
+    18, 19, 72, 224, 151, 18, 19, 72, 225, 17, 18, 19, 72, 225, 222, 18, 19, 
+    72, 225, 212, 18, 19, 72, 225, 109, 18, 19, 72, 190, 18, 19, 72, 226, 
+    106, 18, 19, 72, 242, 114, 18, 19, 72, 242, 175, 18, 19, 72, 243, 63, 18, 
+    19, 72, 243, 56, 18, 19, 72, 242, 215, 18, 19, 72, 243, 136, 18, 19, 72, 
+    234, 101, 18, 19, 72, 234, 106, 18, 19, 72, 234, 120, 18, 19, 72, 234, 
+    119, 18, 19, 72, 234, 113, 18, 19, 72, 234, 133, 18, 19, 72, 234, 42, 18, 
+    19, 72, 234, 43, 18, 19, 72, 234, 46, 18, 19, 72, 234, 45, 18, 19, 72, 
+    234, 44, 18, 19, 72, 234, 47, 18, 19, 72, 234, 48, 18, 19, 72, 227, 238, 
+    18, 19, 72, 228, 75, 18, 19, 72, 229, 108, 18, 19, 72, 229, 104, 18, 19, 
+    72, 228, 234, 18, 19, 72, 197, 18, 19, 72, 230, 103, 18, 19, 72, 230, 
+    162, 18, 19, 72, 231, 92, 18, 19, 72, 231, 81, 18, 19, 72, 230, 231, 18, 
+    19, 72, 185, 18, 19, 72, 210, 212, 18, 19, 72, 210, 244, 18, 19, 72, 211, 
+    47, 18, 19, 72, 211, 44, 18, 19, 72, 211, 8, 18, 19, 72, 191, 18, 19, 72, 
+    235, 52, 18, 19, 221, 210, 235, 52, 18, 19, 72, 235, 69, 18, 19, 72, 235, 
+    127, 18, 19, 72, 235, 125, 18, 19, 72, 235, 109, 18, 19, 221, 210, 235, 
+    109, 18, 19, 72, 235, 142, 18, 19, 72, 235, 82, 18, 19, 72, 235, 86, 18, 
+    19, 72, 235, 96, 18, 19, 72, 235, 95, 18, 19, 72, 235, 94, 18, 19, 72, 
+    235, 97, 18, 19, 72, 232, 99, 18, 19, 72, 232, 157, 18, 19, 72, 233, 59, 
+    18, 19, 72, 233, 51, 18, 19, 72, 232, 242, 18, 19, 72, 233, 136, 18, 19, 
+    72, 247, 150, 18, 19, 72, 247, 151, 18, 19, 72, 247, 156, 18, 19, 72, 
+    247, 155, 18, 19, 72, 247, 152, 18, 19, 72, 247, 157, 18, 19, 72, 232, 
+    245, 18, 19, 72, 232, 247, 18, 19, 72, 232, 251, 18, 19, 72, 232, 250, 
+    18, 19, 72, 232, 249, 18, 19, 72, 232, 255, 18, 19, 72, 216, 51, 18, 19, 
+    72, 216, 53, 18, 19, 72, 216, 56, 18, 19, 72, 216, 55, 18, 19, 72, 216, 
+    54, 18, 19, 72, 216, 57, 18, 19, 72, 216, 46, 18, 19, 72, 216, 47, 18, 
+    19, 72, 216, 59, 18, 19, 72, 216, 58, 18, 19, 72, 216, 48, 18, 19, 72, 
+    216, 60, 18, 19, 72, 210, 13, 18, 19, 72, 210, 23, 18, 19, 72, 210, 94, 
+    18, 19, 72, 210, 92, 18, 19, 72, 210, 44, 18, 19, 72, 210, 116, 18, 19, 
+    72, 210, 159, 18, 19, 72, 65, 210, 159, 18, 19, 72, 246, 29, 18, 19, 72, 
+    246, 30, 18, 19, 72, 246, 37, 18, 19, 72, 246, 36, 18, 19, 72, 246, 32, 
+    18, 19, 72, 246, 39, 18, 19, 72, 218, 84, 18, 19, 72, 219, 59, 18, 19, 
+    72, 221, 182, 18, 19, 72, 221, 171, 18, 19, 72, 219, 192, 18, 19, 72, 
+    206, 18, 19, 72, 219, 226, 18, 19, 72, 220, 8, 18, 19, 72, 220, 64, 18, 
+    19, 72, 220, 62, 18, 19, 72, 220, 33, 18, 19, 72, 220, 103, 18, 19, 72, 
+    220, 105, 18, 19, 72, 215, 164, 18, 19, 72, 215, 167, 18, 19, 72, 215, 
+    179, 18, 19, 72, 215, 178, 18, 19, 72, 215, 168, 18, 19, 72, 215, 184, 
+    18, 19, 72, 250, 70, 18, 19, 72, 250, 87, 18, 19, 72, 250, 132, 18, 19, 
+    72, 250, 129, 18, 19, 72, 250, 111, 18, 19, 72, 250, 158, 18, 19, 72, 
+    215, 127, 18, 19, 72, 215, 128, 18, 19, 72, 215, 131, 18, 19, 72, 215, 
+    130, 18, 19, 72, 215, 129, 18, 19, 72, 215, 132, 18, 19, 250, 112, 50, 
+    18, 19, 243, 230, 218, 130, 18, 19, 224, 81, 18, 19, 229, 74, 18, 19, 
+    228, 101, 18, 19, 228, 100, 18, 19, 228, 99, 18, 19, 228, 98, 18, 19, 
+    228, 103, 18, 19, 228, 102, 18, 19, 211, 213, 216, 126, 18, 19, 211, 213, 
+    216, 125, 18, 19, 211, 213, 216, 124, 18, 19, 211, 213, 216, 123, 18, 19, 
+    211, 213, 216, 122, 18, 19, 211, 213, 216, 129, 18, 19, 211, 213, 216, 
+    128, 18, 19, 211, 213, 40, 216, 211, 18, 19, 251, 219, 212, 98, 226, 227, 
+    219, 20, 78, 226, 227, 1, 252, 49, 226, 227, 1, 232, 88, 226, 227, 1, 
+    244, 152, 226, 227, 1, 222, 16, 226, 227, 1, 228, 194, 226, 227, 1, 214, 
+    226, 226, 227, 1, 248, 198, 226, 227, 1, 216, 81, 226, 227, 1, 249, 230, 
+    226, 227, 1, 250, 181, 226, 227, 1, 230, 92, 226, 227, 1, 242, 157, 226, 
+    227, 1, 229, 64, 226, 227, 1, 218, 123, 226, 227, 1, 222, 136, 226, 227, 
+    1, 254, 199, 226, 227, 1, 226, 188, 226, 227, 1, 214, 150, 226, 227, 1, 
+    245, 232, 226, 227, 1, 235, 189, 226, 227, 1, 245, 233, 226, 227, 1, 226, 
+    159, 226, 227, 1, 214, 206, 226, 227, 1, 236, 40, 226, 227, 1, 245, 230, 
+    226, 227, 1, 225, 203, 226, 227, 244, 151, 78, 226, 227, 223, 50, 244, 
+    151, 78, 178, 1, 244, 142, 244, 134, 244, 156, 245, 7, 178, 1, 214, 105, 
+    178, 1, 214, 135, 214, 151, 70, 178, 1, 210, 214, 178, 1, 211, 117, 178, 
+    1, 212, 98, 178, 1, 216, 131, 216, 130, 216, 152, 178, 1, 245, 60, 178, 
+    1, 254, 94, 61, 178, 1, 226, 144, 76, 178, 1, 255, 18, 61, 178, 1, 254, 
+    228, 178, 1, 232, 134, 76, 178, 1, 219, 245, 76, 178, 1, 76, 178, 1, 226, 
+    235, 178, 1, 226, 197, 178, 1, 223, 165, 223, 178, 223, 95, 153, 178, 1, 
+    234, 194, 178, 1, 250, 178, 178, 1, 234, 195, 235, 24, 178, 1, 243, 203, 
+    178, 1, 245, 139, 178, 1, 243, 59, 242, 67, 243, 203, 178, 1, 243, 97, 
+    178, 1, 211, 188, 211, 182, 212, 98, 178, 1, 242, 39, 242, 61, 178, 1, 
+    242, 43, 242, 61, 178, 1, 232, 136, 242, 61, 178, 1, 219, 248, 242, 61, 
+    178, 1, 229, 186, 227, 158, 229, 187, 230, 26, 178, 1, 219, 246, 230, 26, 
+    178, 1, 246, 116, 178, 1, 235, 169, 235, 173, 235, 163, 73, 178, 1, 75, 
+    178, 1, 235, 118, 235, 145, 178, 1, 243, 44, 178, 1, 232, 137, 254, 244, 
+    178, 1, 219, 250, 61, 178, 1, 235, 155, 245, 114, 178, 1, 225, 165, 225, 
+    187, 226, 106, 178, 1, 254, 164, 245, 112, 178, 1, 219, 25, 222, 92, 178, 
+    1, 219, 180, 232, 133, 222, 92, 178, 1, 219, 244, 222, 92, 178, 1, 251, 
+    67, 178, 1, 210, 159, 178, 1, 216, 64, 216, 74, 215, 41, 217, 153, 178, 
+    1, 219, 243, 217, 153, 178, 1, 249, 61, 178, 1, 252, 32, 252, 35, 251, 
+    225, 253, 159, 178, 1, 219, 249, 253, 159, 178, 1, 246, 115, 178, 1, 226, 
+    172, 178, 1, 245, 197, 245, 199, 75, 178, 1, 231, 179, 231, 187, 193, 
+    178, 1, 232, 135, 193, 178, 1, 219, 247, 193, 178, 1, 233, 74, 233, 115, 
+    232, 144, 156, 178, 1, 246, 117, 178, 1, 235, 231, 178, 1, 235, 232, 178, 
+    1, 248, 211, 248, 216, 249, 61, 178, 1, 226, 139, 245, 59, 76, 178, 1, 
+    245, 228, 178, 1, 235, 188, 178, 1, 249, 79, 178, 1, 251, 18, 178, 1, 
+    250, 190, 178, 1, 218, 162, 178, 1, 232, 132, 178, 1, 219, 242, 178, 1, 
+    240, 111, 178, 1, 224, 97, 178, 1, 211, 178, 178, 219, 156, 224, 141, 
+    178, 230, 86, 224, 141, 178, 249, 132, 224, 141, 178, 254, 7, 87, 178, 
+    215, 82, 87, 178, 252, 47, 87, 217, 84, 1, 61, 217, 84, 1, 73, 217, 84, 
+    1, 70, 217, 84, 1, 176, 217, 84, 1, 243, 136, 217, 84, 1, 229, 78, 217, 
+    84, 1, 217, 106, 217, 84, 1, 248, 222, 217, 84, 1, 197, 217, 84, 1, 190, 
+    217, 84, 1, 252, 192, 217, 84, 1, 185, 217, 84, 1, 191, 217, 84, 1, 233, 
+    136, 217, 84, 1, 212, 65, 217, 84, 1, 206, 217, 84, 1, 162, 217, 84, 25, 
+    5, 73, 217, 84, 25, 5, 70, 217, 84, 5, 213, 152, 242, 8, 1, 61, 242, 8, 
+    1, 73, 242, 8, 1, 70, 242, 8, 1, 176, 242, 8, 1, 243, 136, 242, 8, 1, 
+    229, 78, 242, 8, 1, 217, 106, 242, 8, 1, 248, 222, 242, 8, 1, 197, 242, 
+    8, 1, 190, 242, 8, 1, 252, 192, 242, 8, 1, 185, 242, 8, 1, 191, 242, 8, 
+    1, 205, 242, 8, 1, 233, 136, 242, 8, 1, 212, 65, 242, 8, 1, 206, 242, 8, 
+    1, 162, 242, 8, 25, 5, 73, 242, 8, 25, 5, 70, 242, 8, 5, 226, 50, 225, 
+    127, 219, 156, 224, 141, 225, 127, 52, 224, 141, 251, 121, 1, 61, 251, 
+    121, 1, 73, 251, 121, 1, 70, 251, 121, 1, 176, 251, 121, 1, 243, 136, 
+    251, 121, 1, 229, 78, 251, 121, 1, 217, 106, 251, 121, 1, 248, 222, 251, 
+    121, 1, 197, 251, 121, 1, 190, 251, 121, 1, 252, 192, 251, 121, 1, 185, 
+    251, 121, 1, 191, 251, 121, 1, 205, 251, 121, 1, 233, 136, 251, 121, 1, 
+    212, 65, 251, 121, 1, 206, 251, 121, 1, 162, 251, 121, 25, 5, 73, 251, 
+    121, 25, 5, 70, 217, 83, 1, 61, 217, 83, 1, 73, 217, 83, 1, 70, 217, 83, 
+    1, 176, 217, 83, 1, 243, 136, 217, 83, 1, 229, 78, 217, 83, 1, 217, 106, 
+    217, 83, 1, 248, 222, 217, 83, 1, 197, 217, 83, 1, 190, 217, 83, 1, 252, 
+    192, 217, 83, 1, 185, 217, 83, 1, 191, 217, 83, 1, 233, 136, 217, 83, 1, 
+    212, 65, 217, 83, 1, 206, 217, 83, 25, 5, 73, 217, 83, 25, 5, 70, 69, 1, 
+    176, 69, 1, 234, 133, 69, 1, 234, 29, 69, 1, 234, 106, 69, 1, 229, 5, 69, 
+    1, 251, 34, 69, 1, 250, 158, 69, 1, 249, 239, 69, 1, 250, 87, 69, 1, 227, 
+    135, 69, 1, 248, 222, 69, 1, 215, 145, 69, 1, 247, 146, 69, 1, 215, 140, 
+    69, 1, 228, 81, 69, 1, 217, 106, 69, 1, 216, 209, 69, 1, 111, 69, 1, 216, 
+    157, 69, 1, 228, 75, 69, 1, 252, 192, 69, 1, 225, 148, 69, 1, 225, 17, 
+    69, 1, 225, 122, 69, 1, 230, 162, 69, 1, 210, 244, 69, 1, 222, 212, 69, 
+    1, 232, 157, 69, 1, 213, 138, 69, 1, 220, 103, 69, 1, 218, 185, 69, 1, 
+    206, 69, 1, 162, 69, 1, 233, 136, 69, 1, 224, 89, 69, 235, 244, 25, 224, 
+    75, 69, 235, 244, 25, 224, 88, 69, 235, 244, 25, 224, 54, 69, 235, 244, 
+    25, 224, 49, 69, 235, 244, 25, 224, 31, 69, 235, 244, 25, 224, 3, 69, 
+    235, 244, 25, 223, 247, 69, 235, 244, 25, 223, 246, 69, 235, 244, 25, 
+    222, 101, 69, 235, 244, 25, 222, 94, 69, 235, 244, 25, 232, 63, 69, 235, 
+    244, 25, 232, 53, 69, 235, 244, 25, 224, 70, 69, 235, 244, 25, 224, 81, 
+    69, 235, 244, 25, 224, 39, 215, 49, 110, 69, 235, 244, 25, 224, 39, 215, 
+    49, 105, 69, 235, 244, 25, 224, 71, 69, 25, 235, 230, 254, 46, 69, 25, 
+    235, 230, 255, 74, 69, 25, 5, 255, 74, 69, 25, 5, 73, 69, 25, 5, 236, 34, 
+    69, 25, 5, 211, 117, 69, 25, 5, 210, 169, 69, 25, 5, 70, 69, 25, 5, 214, 
+    118, 69, 25, 5, 214, 229, 69, 25, 5, 226, 235, 69, 25, 5, 191, 69, 25, 5, 
+    236, 61, 69, 25, 5, 75, 69, 25, 5, 254, 244, 69, 25, 5, 254, 202, 69, 25, 
+    5, 226, 184, 69, 25, 5, 253, 193, 69, 5, 228, 207, 69, 5, 223, 127, 69, 
+    5, 210, 180, 69, 5, 230, 53, 69, 5, 215, 214, 69, 5, 252, 144, 69, 5, 
+    222, 207, 69, 5, 216, 41, 69, 5, 234, 242, 69, 5, 254, 204, 69, 5, 221, 
+    245, 221, 239, 69, 5, 213, 149, 69, 5, 249, 233, 69, 5, 252, 118, 69, 5, 
+    234, 126, 69, 5, 252, 138, 69, 5, 251, 10, 225, 73, 233, 188, 69, 5, 233, 
+    31, 216, 18, 69, 5, 252, 21, 69, 5, 225, 124, 230, 100, 69, 5, 234, 10, 
+    69, 249, 99, 16, 223, 29, 69, 5, 253, 175, 69, 5, 253, 196, 69, 21, 210, 
+    86, 69, 21, 110, 69, 21, 105, 69, 21, 158, 69, 21, 161, 69, 21, 189, 69, 
+    21, 194, 69, 21, 198, 69, 21, 195, 69, 21, 200, 69, 16, 233, 31, 253, 
+    198, 219, 44, 69, 16, 233, 31, 253, 198, 230, 72, 69, 16, 233, 31, 253, 
+    198, 225, 72, 69, 16, 233, 31, 253, 198, 252, 50, 69, 16, 233, 31, 253, 
+    198, 251, 104, 69, 16, 233, 31, 253, 198, 224, 216, 69, 16, 233, 31, 253, 
+    198, 224, 210, 69, 16, 233, 31, 253, 198, 224, 208, 69, 16, 233, 31, 253, 
+    198, 224, 214, 69, 16, 233, 31, 253, 198, 224, 212, 83, 251, 237, 83, 
+    245, 164, 83, 249, 220, 83, 243, 230, 218, 130, 83, 249, 227, 83, 244, 
+    12, 247, 119, 83, 216, 40, 219, 53, 240, 169, 83, 219, 191, 3, 251, 173, 
+    231, 155, 83, 231, 184, 249, 220, 83, 231, 184, 243, 230, 218, 130, 83, 
+    228, 192, 83, 243, 254, 45, 221, 158, 110, 83, 243, 254, 45, 221, 158, 
+    105, 83, 243, 254, 45, 221, 158, 158, 83, 25, 220, 138, 83, 21, 210, 86, 
+    83, 21, 110, 83, 21, 105, 83, 21, 158, 83, 21, 161, 83, 21, 189, 83, 21, 
+    194, 83, 21, 198, 83, 21, 195, 83, 21, 200, 83, 1, 61, 83, 1, 75, 83, 1, 
+    73, 83, 1, 76, 83, 1, 70, 83, 1, 226, 235, 83, 1, 214, 214, 83, 1, 245, 
+    210, 83, 1, 197, 83, 1, 254, 116, 83, 1, 252, 192, 83, 1, 190, 83, 1, 
+    224, 89, 83, 1, 243, 136, 83, 1, 185, 83, 1, 233, 136, 83, 1, 206, 83, 1, 
+    220, 103, 83, 1, 217, 106, 83, 1, 248, 222, 83, 1, 250, 158, 83, 1, 235, 
+    142, 83, 1, 191, 83, 1, 205, 83, 1, 212, 65, 83, 1, 244, 197, 83, 1, 176, 
+    83, 1, 234, 133, 83, 1, 215, 184, 83, 1, 210, 116, 83, 1, 242, 47, 83, 1, 
+    210, 16, 83, 1, 232, 255, 83, 1, 210, 69, 83, 1, 250, 111, 83, 1, 216, 
+    40, 199, 25, 50, 83, 1, 216, 40, 75, 83, 1, 216, 40, 73, 83, 1, 216, 40, 
+    76, 83, 1, 216, 40, 70, 83, 1, 216, 40, 226, 235, 83, 1, 216, 40, 214, 
+    214, 83, 1, 216, 40, 254, 116, 83, 1, 216, 40, 252, 192, 83, 1, 216, 40, 
+    190, 83, 1, 216, 40, 224, 89, 83, 1, 216, 40, 243, 136, 83, 1, 216, 40, 
+    185, 83, 1, 216, 40, 217, 106, 83, 1, 216, 40, 248, 222, 83, 1, 216, 40, 
+    250, 158, 83, 1, 216, 40, 235, 142, 83, 1, 216, 40, 215, 184, 83, 1, 216, 
+    40, 191, 83, 1, 216, 40, 212, 65, 83, 1, 216, 40, 176, 83, 1, 216, 40, 
+    243, 133, 83, 1, 216, 40, 242, 47, 83, 1, 216, 40, 235, 108, 83, 1, 216, 
+    40, 228, 232, 83, 1, 216, 40, 246, 39, 83, 1, 219, 191, 75, 83, 1, 219, 
+    191, 73, 83, 1, 219, 191, 235, 153, 83, 1, 219, 191, 214, 214, 83, 1, 
+    219, 191, 70, 83, 1, 219, 191, 254, 116, 83, 1, 219, 191, 176, 83, 1, 
+    219, 191, 243, 136, 83, 1, 219, 191, 162, 83, 1, 219, 191, 190, 83, 1, 
+    219, 191, 220, 103, 83, 1, 219, 191, 217, 106, 83, 1, 219, 191, 248, 222, 
+    83, 1, 219, 191, 235, 142, 83, 1, 219, 191, 244, 197, 83, 1, 219, 191, 
+    243, 133, 83, 1, 219, 191, 242, 47, 83, 1, 219, 191, 215, 184, 83, 1, 
+    219, 191, 210, 116, 83, 1, 219, 191, 223, 185, 83, 1, 219, 191, 250, 158, 
+    83, 1, 219, 191, 210, 82, 83, 1, 231, 184, 73, 83, 1, 231, 184, 176, 83, 
+    1, 231, 184, 205, 83, 1, 231, 184, 244, 197, 83, 1, 231, 184, 210, 82, 
+    83, 1, 254, 163, 243, 117, 254, 77, 110, 83, 1, 254, 163, 243, 117, 213, 
+    148, 110, 83, 1, 254, 163, 243, 117, 248, 187, 83, 1, 254, 163, 243, 117, 
+    214, 224, 83, 1, 254, 163, 243, 117, 235, 194, 214, 224, 83, 1, 254, 163, 
+    243, 117, 252, 156, 83, 1, 254, 163, 243, 117, 134, 252, 156, 83, 1, 254, 
+    163, 243, 117, 61, 83, 1, 254, 163, 243, 117, 73, 83, 1, 254, 163, 243, 
+    117, 176, 83, 1, 254, 163, 243, 117, 229, 78, 83, 1, 254, 163, 243, 117, 
+    251, 34, 83, 1, 254, 163, 243, 117, 215, 157, 83, 1, 254, 163, 243, 117, 
+    215, 145, 83, 1, 254, 163, 243, 117, 248, 136, 83, 1, 254, 163, 243, 117, 
+    228, 111, 83, 1, 254, 163, 243, 117, 217, 106, 83, 1, 254, 163, 243, 117, 
+    248, 222, 83, 1, 254, 163, 243, 117, 190, 83, 1, 254, 163, 243, 117, 225, 
+    148, 83, 1, 254, 163, 243, 117, 218, 224, 83, 1, 254, 163, 243, 117, 210, 
+    82, 83, 1, 254, 163, 243, 117, 210, 116, 83, 1, 254, 163, 243, 117, 254, 
+    210, 83, 1, 216, 40, 254, 163, 243, 117, 217, 106, 83, 1, 216, 40, 254, 
+    163, 243, 117, 210, 82, 83, 1, 231, 184, 254, 163, 243, 117, 242, 250, 
+    83, 1, 231, 184, 254, 163, 243, 117, 229, 78, 83, 1, 231, 184, 254, 163, 
+    243, 117, 251, 34, 83, 1, 231, 184, 254, 163, 243, 117, 235, 115, 83, 1, 
+    231, 184, 254, 163, 243, 117, 215, 157, 83, 1, 231, 184, 254, 163, 243, 
+    117, 248, 120, 83, 1, 231, 184, 254, 163, 243, 117, 217, 106, 83, 1, 231, 
+    184, 254, 163, 243, 117, 248, 26, 83, 1, 231, 184, 254, 163, 243, 117, 
+    218, 224, 83, 1, 231, 184, 254, 163, 243, 117, 249, 73, 83, 1, 231, 184, 
+    254, 163, 243, 117, 210, 82, 83, 1, 231, 184, 254, 163, 243, 117, 210, 
+    116, 83, 1, 254, 163, 243, 117, 163, 70, 83, 1, 254, 163, 243, 117, 163, 
+    191, 83, 1, 231, 184, 254, 163, 243, 117, 252, 19, 83, 1, 254, 163, 243, 
+    117, 248, 212, 83, 1, 231, 184, 254, 163, 243, 117, 232, 255, 18, 19, 
+    226, 110, 18, 19, 253, 168, 18, 19, 255, 29, 18, 19, 212, 25, 18, 19, 
+    224, 222, 18, 19, 225, 230, 18, 19, 224, 106, 18, 19, 217, 32, 18, 19, 
+    234, 190, 18, 19, 233, 180, 18, 19, 231, 133, 18, 19, 228, 38, 18, 19, 
+    229, 182, 18, 19, 233, 69, 18, 19, 219, 23, 18, 19, 221, 212, 18, 19, 
+    219, 233, 18, 19, 220, 67, 18, 19, 219, 202, 18, 19, 210, 220, 18, 19, 
+    211, 52, 18, 19, 223, 135, 18, 19, 227, 172, 18, 19, 226, 217, 227, 172, 
+    18, 19, 227, 171, 18, 19, 226, 217, 227, 171, 18, 19, 227, 170, 18, 19, 
+    226, 217, 227, 170, 18, 19, 227, 169, 18, 19, 226, 217, 227, 169, 18, 19, 
+    222, 106, 18, 19, 222, 105, 18, 19, 222, 104, 18, 19, 222, 103, 18, 19, 
+    222, 102, 18, 19, 222, 110, 18, 19, 226, 217, 226, 106, 18, 19, 226, 217, 
+    217, 153, 18, 19, 226, 217, 235, 24, 18, 19, 226, 217, 251, 67, 18, 19, 
+    226, 217, 193, 18, 19, 226, 217, 230, 26, 18, 19, 226, 217, 222, 92, 18, 
+    19, 226, 217, 220, 105, 18, 19, 245, 220, 212, 98, 18, 19, 212, 7, 212, 
+    98, 18, 19, 40, 4, 222, 234, 18, 19, 40, 223, 158, 247, 121, 18, 19, 223, 
+    224, 222, 107, 18, 19, 159, 232, 128, 18, 19, 159, 233, 135, 18, 19, 216, 
+    127, 18, 19, 216, 129, 18, 19, 215, 137, 18, 19, 215, 139, 18, 19, 215, 
+    144, 18, 19, 216, 50, 18, 19, 216, 52, 18, 19, 221, 210, 219, 207, 18, 
+    19, 221, 210, 220, 2, 18, 19, 221, 210, 241, 54, 18, 19, 72, 242, 74, 18, 
+    19, 72, 248, 53, 243, 56, 18, 19, 72, 243, 133, 18, 19, 72, 242, 79, 18, 
+    19, 221, 210, 235, 34, 18, 19, 72, 235, 32, 18, 19, 252, 69, 248, 53, 
+    156, 18, 19, 252, 69, 248, 53, 153, 18, 19, 72, 248, 48, 222, 92, 232, 
+    224, 213, 122, 233, 11, 232, 224, 1, 176, 232, 224, 1, 234, 133, 232, 
+    224, 1, 243, 136, 232, 224, 1, 242, 250, 232, 224, 1, 229, 78, 232, 224, 
+    1, 251, 34, 232, 224, 1, 250, 158, 232, 224, 1, 235, 142, 232, 224, 1, 
+    235, 115, 232, 224, 1, 211, 71, 232, 224, 1, 217, 106, 232, 224, 1, 216, 
+    209, 232, 224, 1, 248, 222, 232, 224, 1, 248, 26, 232, 224, 1, 197, 232, 
+    224, 1, 190, 232, 224, 1, 225, 148, 232, 224, 1, 252, 192, 232, 224, 1, 
+    252, 19, 232, 224, 1, 185, 232, 224, 1, 191, 232, 224, 1, 205, 232, 224, 
+    1, 233, 136, 232, 224, 1, 212, 65, 232, 224, 1, 220, 103, 232, 224, 1, 
+    218, 224, 232, 224, 1, 206, 232, 224, 1, 162, 232, 224, 25, 5, 61, 232, 
+    224, 25, 5, 73, 232, 224, 25, 5, 70, 232, 224, 25, 5, 245, 210, 232, 224, 
+    25, 5, 254, 202, 232, 224, 25, 5, 226, 184, 232, 224, 25, 5, 253, 193, 
+    232, 224, 25, 5, 75, 232, 224, 25, 5, 76, 232, 224, 218, 74, 1, 191, 232, 
+    224, 218, 74, 1, 205, 232, 224, 218, 74, 1, 212, 65, 232, 224, 4, 1, 176, 
+    232, 224, 4, 1, 229, 78, 232, 224, 4, 1, 254, 76, 232, 224, 4, 1, 217, 
+    106, 232, 224, 4, 1, 197, 232, 224, 4, 1, 190, 232, 224, 4, 1, 185, 232, 
+    224, 4, 1, 205, 232, 224, 4, 1, 233, 136, 232, 224, 5, 230, 90, 232, 224, 
+    5, 234, 172, 232, 224, 5, 222, 33, 232, 224, 5, 232, 128, 232, 224, 245, 
+    32, 78, 232, 224, 224, 14, 78, 232, 224, 21, 210, 86, 232, 224, 21, 110, 
+    232, 224, 21, 105, 232, 224, 21, 158, 232, 224, 21, 161, 232, 224, 21, 
+    189, 232, 224, 21, 194, 232, 224, 21, 198, 232, 224, 21, 195, 232, 224, 
+    21, 200, 39, 233, 60, 1, 176, 39, 233, 60, 1, 211, 165, 39, 233, 60, 1, 
+    229, 78, 39, 233, 60, 1, 215, 184, 39, 233, 60, 1, 206, 39, 233, 60, 1, 
+    191, 39, 233, 60, 1, 217, 106, 39, 233, 60, 1, 216, 209, 39, 233, 60, 1, 
+    233, 136, 39, 233, 60, 1, 190, 39, 233, 60, 1, 225, 148, 39, 233, 60, 1, 
+    185, 39, 233, 60, 1, 244, 197, 39, 233, 60, 1, 214, 27, 39, 233, 60, 1, 
+    162, 39, 233, 60, 1, 224, 89, 39, 233, 60, 1, 234, 133, 39, 233, 60, 1, 
+    215, 176, 39, 233, 60, 1, 197, 39, 233, 60, 1, 61, 39, 233, 60, 1, 73, 
+    39, 233, 60, 1, 245, 210, 39, 233, 60, 1, 245, 198, 39, 233, 60, 1, 70, 
+    39, 233, 60, 1, 226, 184, 39, 233, 60, 1, 76, 39, 233, 60, 1, 214, 214, 
+    39, 233, 60, 1, 75, 39, 233, 60, 1, 253, 191, 39, 233, 60, 1, 254, 202, 
+    39, 233, 60, 1, 216, 29, 39, 233, 60, 1, 216, 28, 39, 233, 60, 1, 216, 
+    27, 39, 233, 60, 1, 216, 26, 39, 233, 60, 1, 216, 25, 166, 39, 173, 1, 
+    125, 224, 89, 166, 39, 173, 1, 121, 224, 89, 166, 39, 173, 1, 125, 176, 
+    166, 39, 173, 1, 125, 211, 165, 166, 39, 173, 1, 125, 229, 78, 166, 39, 
     173, 1, 121, 176, 166, 39, 173, 1, 121, 211, 165, 166, 39, 173, 1, 121, 
-    229, 77, 166, 39, 173, 1, 125, 215, 183, 166, 39, 173, 1, 125, 206, 166, 
-    39, 173, 1, 125, 191, 166, 39, 173, 1, 121, 215, 183, 166, 39, 173, 1, 
-    121, 206, 166, 39, 173, 1, 121, 191, 166, 39, 173, 1, 125, 217, 105, 166, 
-    39, 173, 1, 125, 216, 208, 166, 39, 173, 1, 125, 197, 166, 39, 173, 1, 
-    121, 217, 105, 166, 39, 173, 1, 121, 216, 208, 166, 39, 173, 1, 121, 197, 
-    166, 39, 173, 1, 125, 190, 166, 39, 173, 1, 125, 225, 147, 166, 39, 173, 
-    1, 125, 184, 166, 39, 173, 1, 121, 190, 166, 39, 173, 1, 121, 225, 147, 
-    166, 39, 173, 1, 121, 184, 166, 39, 173, 1, 125, 244, 196, 166, 39, 173, 
-    1, 125, 214, 27, 166, 39, 173, 1, 125, 233, 135, 166, 39, 173, 1, 121, 
-    244, 196, 166, 39, 173, 1, 121, 214, 27, 166, 39, 173, 1, 121, 233, 135, 
-    166, 39, 173, 1, 125, 162, 166, 39, 173, 1, 125, 248, 221, 166, 39, 173, 
-    1, 125, 252, 191, 166, 39, 173, 1, 121, 162, 166, 39, 173, 1, 121, 248, 
-    221, 166, 39, 173, 1, 121, 252, 191, 166, 39, 173, 1, 125, 233, 184, 166, 
-    39, 173, 1, 125, 211, 138, 166, 39, 173, 1, 121, 233, 184, 166, 39, 173, 
-    1, 121, 211, 138, 166, 39, 173, 1, 125, 218, 82, 166, 39, 173, 1, 121, 
-    218, 82, 166, 39, 173, 25, 5, 25, 219, 239, 166, 39, 173, 25, 5, 255, 73, 
-    166, 39, 173, 25, 5, 236, 33, 166, 39, 173, 25, 5, 70, 166, 39, 173, 25, 
-    5, 214, 118, 166, 39, 173, 25, 5, 75, 166, 39, 173, 25, 5, 254, 243, 166, 
-    39, 173, 25, 5, 76, 166, 39, 173, 25, 5, 227, 0, 166, 39, 173, 25, 5, 
-    214, 214, 166, 39, 173, 25, 5, 253, 167, 166, 39, 173, 25, 5, 255, 28, 
-    166, 39, 173, 25, 5, 214, 111, 166, 39, 173, 25, 5, 226, 109, 166, 39, 
-    173, 25, 5, 226, 253, 166, 39, 173, 25, 5, 214, 210, 166, 39, 173, 25, 5, 
-    235, 152, 166, 39, 173, 1, 40, 214, 105, 166, 39, 173, 1, 40, 229, 79, 
-    166, 39, 173, 1, 40, 230, 25, 166, 39, 173, 1, 40, 193, 166, 39, 173, 1, 
-    40, 235, 23, 166, 39, 173, 1, 40, 249, 60, 166, 39, 173, 1, 40, 253, 158, 
-    166, 39, 173, 138, 231, 158, 166, 39, 173, 138, 231, 157, 166, 39, 173, 
+    229, 78, 166, 39, 173, 1, 125, 215, 184, 166, 39, 173, 1, 125, 206, 166, 
+    39, 173, 1, 125, 191, 166, 39, 173, 1, 121, 215, 184, 166, 39, 173, 1, 
+    121, 206, 166, 39, 173, 1, 121, 191, 166, 39, 173, 1, 125, 217, 106, 166, 
+    39, 173, 1, 125, 216, 209, 166, 39, 173, 1, 125, 197, 166, 39, 173, 1, 
+    121, 217, 106, 166, 39, 173, 1, 121, 216, 209, 166, 39, 173, 1, 121, 197, 
+    166, 39, 173, 1, 125, 190, 166, 39, 173, 1, 125, 225, 148, 166, 39, 173, 
+    1, 125, 185, 166, 39, 173, 1, 121, 190, 166, 39, 173, 1, 121, 225, 148, 
+    166, 39, 173, 1, 121, 185, 166, 39, 173, 1, 125, 244, 197, 166, 39, 173, 
+    1, 125, 214, 27, 166, 39, 173, 1, 125, 233, 136, 166, 39, 173, 1, 121, 
+    244, 197, 166, 39, 173, 1, 121, 214, 27, 166, 39, 173, 1, 121, 233, 136, 
+    166, 39, 173, 1, 125, 162, 166, 39, 173, 1, 125, 248, 222, 166, 39, 173, 
+    1, 125, 252, 192, 166, 39, 173, 1, 121, 162, 166, 39, 173, 1, 121, 248, 
+    222, 166, 39, 173, 1, 121, 252, 192, 166, 39, 173, 1, 125, 233, 185, 166, 
+    39, 173, 1, 125, 211, 138, 166, 39, 173, 1, 121, 233, 185, 166, 39, 173, 
+    1, 121, 211, 138, 166, 39, 173, 1, 125, 218, 83, 166, 39, 173, 1, 121, 
+    218, 83, 166, 39, 173, 25, 5, 25, 219, 240, 166, 39, 173, 25, 5, 255, 74, 
+    166, 39, 173, 25, 5, 236, 34, 166, 39, 173, 25, 5, 70, 166, 39, 173, 25, 
+    5, 214, 118, 166, 39, 173, 25, 5, 75, 166, 39, 173, 25, 5, 254, 244, 166, 
+    39, 173, 25, 5, 76, 166, 39, 173, 25, 5, 227, 1, 166, 39, 173, 25, 5, 
+    214, 214, 166, 39, 173, 25, 5, 253, 168, 166, 39, 173, 25, 5, 255, 29, 
+    166, 39, 173, 25, 5, 214, 111, 166, 39, 173, 25, 5, 226, 110, 166, 39, 
+    173, 25, 5, 226, 254, 166, 39, 173, 25, 5, 214, 210, 166, 39, 173, 25, 5, 
+    235, 153, 166, 39, 173, 1, 40, 214, 105, 166, 39, 173, 1, 40, 229, 80, 
+    166, 39, 173, 1, 40, 230, 26, 166, 39, 173, 1, 40, 193, 166, 39, 173, 1, 
+    40, 235, 24, 166, 39, 173, 1, 40, 249, 61, 166, 39, 173, 1, 40, 253, 159, 
+    166, 39, 173, 138, 231, 159, 166, 39, 173, 138, 231, 158, 166, 39, 173, 
     21, 210, 86, 166, 39, 173, 21, 110, 166, 39, 173, 21, 105, 166, 39, 173, 
     21, 158, 166, 39, 173, 21, 161, 166, 39, 173, 21, 189, 166, 39, 173, 21, 
     194, 166, 39, 173, 21, 198, 166, 39, 173, 21, 195, 166, 39, 173, 21, 200, 
-    166, 39, 173, 89, 21, 110, 166, 39, 173, 5, 233, 120, 166, 39, 173, 5, 
-    233, 119, 69, 16, 225, 236, 69, 16, 230, 72, 234, 25, 69, 16, 225, 72, 
-    234, 25, 69, 16, 252, 50, 234, 25, 69, 16, 251, 104, 234, 25, 69, 16, 
-    224, 216, 234, 25, 69, 16, 224, 210, 234, 25, 69, 16, 224, 208, 234, 25, 
-    69, 16, 224, 214, 234, 25, 69, 16, 224, 212, 234, 25, 69, 16, 248, 173, 
-    234, 25, 69, 16, 248, 169, 234, 25, 69, 16, 248, 168, 234, 25, 69, 16, 
-    248, 171, 234, 25, 69, 16, 248, 170, 234, 25, 69, 16, 248, 167, 234, 25, 
-    69, 16, 215, 87, 69, 16, 230, 72, 222, 205, 69, 16, 225, 72, 222, 205, 
-    69, 16, 252, 50, 222, 205, 69, 16, 251, 104, 222, 205, 69, 16, 224, 216, 
-    222, 205, 69, 16, 224, 210, 222, 205, 69, 16, 224, 208, 222, 205, 69, 16, 
-    224, 214, 222, 205, 69, 16, 224, 212, 222, 205, 69, 16, 248, 173, 222, 
-    205, 69, 16, 248, 169, 222, 205, 69, 16, 248, 168, 222, 205, 69, 16, 248, 
-    171, 222, 205, 69, 16, 248, 170, 222, 205, 69, 16, 248, 167, 222, 205, 
-    251, 121, 1, 176, 251, 121, 1, 243, 135, 251, 121, 1, 229, 77, 251, 121, 
-    1, 229, 22, 251, 121, 1, 190, 251, 121, 1, 252, 191, 251, 121, 1, 184, 
-    251, 121, 1, 230, 105, 251, 121, 1, 217, 105, 251, 121, 1, 248, 221, 251, 
-    121, 1, 197, 251, 121, 1, 228, 36, 251, 121, 1, 251, 33, 251, 121, 1, 
-    235, 141, 251, 121, 1, 227, 165, 251, 121, 1, 227, 158, 251, 121, 1, 191, 
-    251, 121, 1, 205, 251, 121, 1, 233, 135, 251, 121, 1, 214, 27, 251, 121, 
-    1, 206, 251, 121, 1, 61, 251, 121, 1, 162, 251, 121, 25, 5, 73, 251, 121, 
-    25, 5, 70, 251, 121, 25, 5, 75, 251, 121, 25, 5, 76, 251, 121, 25, 5, 
-    254, 243, 251, 121, 226, 60, 251, 121, 245, 143, 64, 221, 172, 39, 89, 1, 
-    125, 176, 39, 89, 1, 125, 234, 132, 39, 89, 1, 125, 233, 171, 39, 89, 1, 
-    121, 176, 39, 89, 1, 121, 233, 171, 39, 89, 1, 121, 234, 132, 39, 89, 1, 
-    229, 77, 39, 89, 1, 125, 251, 33, 39, 89, 1, 125, 250, 157, 39, 89, 1, 
-    121, 251, 33, 39, 89, 1, 121, 206, 39, 89, 1, 121, 250, 157, 39, 89, 1, 
-    227, 165, 39, 89, 1, 223, 140, 39, 89, 1, 125, 223, 138, 39, 89, 1, 248, 
-    221, 39, 89, 1, 121, 223, 138, 39, 89, 1, 223, 149, 39, 89, 1, 125, 217, 
-    105, 39, 89, 1, 125, 216, 208, 39, 89, 1, 121, 217, 105, 39, 89, 1, 121, 
-    216, 208, 39, 89, 1, 197, 39, 89, 1, 252, 191, 39, 89, 1, 125, 190, 39, 
-    89, 1, 125, 225, 147, 39, 89, 1, 125, 244, 196, 39, 89, 1, 121, 190, 39, 
-    89, 1, 121, 244, 196, 39, 89, 1, 121, 225, 147, 39, 89, 1, 184, 39, 89, 
-    1, 121, 191, 39, 89, 1, 125, 191, 39, 89, 1, 205, 39, 89, 1, 222, 137, 
-    39, 89, 1, 233, 135, 39, 89, 1, 232, 93, 39, 89, 1, 212, 65, 39, 89, 1, 
-    125, 220, 102, 39, 89, 1, 125, 218, 223, 39, 89, 1, 125, 206, 39, 89, 1, 
-    125, 162, 39, 89, 1, 232, 184, 39, 89, 1, 61, 39, 89, 1, 121, 162, 39, 
-    89, 1, 73, 39, 89, 1, 236, 33, 39, 89, 1, 70, 39, 89, 1, 214, 118, 39, 
-    89, 1, 245, 209, 39, 89, 1, 226, 183, 39, 89, 1, 233, 120, 39, 89, 1, 
-    242, 132, 206, 39, 89, 116, 5, 147, 205, 39, 89, 116, 5, 147, 233, 135, 
-    39, 89, 116, 5, 233, 136, 217, 58, 233, 109, 39, 89, 5, 231, 204, 234, 
-    231, 233, 109, 39, 89, 116, 5, 40, 229, 77, 39, 89, 116, 5, 121, 190, 39, 
-    89, 116, 5, 125, 223, 139, 177, 121, 190, 39, 89, 116, 5, 184, 39, 89, 
-    116, 5, 252, 191, 39, 89, 116, 5, 206, 39, 89, 5, 222, 10, 39, 89, 25, 5, 
-    61, 39, 89, 25, 5, 231, 204, 221, 226, 39, 89, 25, 5, 255, 73, 39, 89, 
-    25, 5, 217, 64, 255, 73, 39, 89, 25, 5, 73, 39, 89, 25, 5, 236, 33, 39, 
+    166, 39, 173, 89, 21, 110, 166, 39, 173, 5, 233, 121, 166, 39, 173, 5, 
+    233, 120, 69, 16, 225, 237, 69, 16, 230, 73, 234, 26, 69, 16, 225, 73, 
+    234, 26, 69, 16, 252, 51, 234, 26, 69, 16, 251, 105, 234, 26, 69, 16, 
+    224, 217, 234, 26, 69, 16, 224, 211, 234, 26, 69, 16, 224, 209, 234, 26, 
+    69, 16, 224, 215, 234, 26, 69, 16, 224, 213, 234, 26, 69, 16, 248, 174, 
+    234, 26, 69, 16, 248, 170, 234, 26, 69, 16, 248, 169, 234, 26, 69, 16, 
+    248, 172, 234, 26, 69, 16, 248, 171, 234, 26, 69, 16, 248, 168, 234, 26, 
+    69, 16, 215, 87, 69, 16, 230, 73, 222, 206, 69, 16, 225, 73, 222, 206, 
+    69, 16, 252, 51, 222, 206, 69, 16, 251, 105, 222, 206, 69, 16, 224, 217, 
+    222, 206, 69, 16, 224, 211, 222, 206, 69, 16, 224, 209, 222, 206, 69, 16, 
+    224, 215, 222, 206, 69, 16, 224, 213, 222, 206, 69, 16, 248, 174, 222, 
+    206, 69, 16, 248, 170, 222, 206, 69, 16, 248, 169, 222, 206, 69, 16, 248, 
+    172, 222, 206, 69, 16, 248, 171, 222, 206, 69, 16, 248, 168, 222, 206, 
+    251, 122, 1, 176, 251, 122, 1, 243, 136, 251, 122, 1, 229, 78, 251, 122, 
+    1, 229, 23, 251, 122, 1, 190, 251, 122, 1, 252, 192, 251, 122, 1, 185, 
+    251, 122, 1, 230, 106, 251, 122, 1, 217, 106, 251, 122, 1, 248, 222, 251, 
+    122, 1, 197, 251, 122, 1, 228, 37, 251, 122, 1, 251, 34, 251, 122, 1, 
+    235, 142, 251, 122, 1, 227, 166, 251, 122, 1, 227, 159, 251, 122, 1, 191, 
+    251, 122, 1, 205, 251, 122, 1, 233, 136, 251, 122, 1, 214, 27, 251, 122, 
+    1, 206, 251, 122, 1, 61, 251, 122, 1, 162, 251, 122, 25, 5, 73, 251, 122, 
+    25, 5, 70, 251, 122, 25, 5, 75, 251, 122, 25, 5, 76, 251, 122, 25, 5, 
+    254, 244, 251, 122, 226, 61, 251, 122, 245, 144, 64, 221, 173, 39, 89, 1, 
+    125, 176, 39, 89, 1, 125, 234, 133, 39, 89, 1, 125, 233, 172, 39, 89, 1, 
+    121, 176, 39, 89, 1, 121, 233, 172, 39, 89, 1, 121, 234, 133, 39, 89, 1, 
+    229, 78, 39, 89, 1, 125, 251, 34, 39, 89, 1, 125, 250, 158, 39, 89, 1, 
+    121, 251, 34, 39, 89, 1, 121, 206, 39, 89, 1, 121, 250, 158, 39, 89, 1, 
+    227, 166, 39, 89, 1, 223, 141, 39, 89, 1, 125, 223, 139, 39, 89, 1, 248, 
+    222, 39, 89, 1, 121, 223, 139, 39, 89, 1, 223, 150, 39, 89, 1, 125, 217, 
+    106, 39, 89, 1, 125, 216, 209, 39, 89, 1, 121, 217, 106, 39, 89, 1, 121, 
+    216, 209, 39, 89, 1, 197, 39, 89, 1, 252, 192, 39, 89, 1, 125, 190, 39, 
+    89, 1, 125, 225, 148, 39, 89, 1, 125, 244, 197, 39, 89, 1, 121, 190, 39, 
+    89, 1, 121, 244, 197, 39, 89, 1, 121, 225, 148, 39, 89, 1, 185, 39, 89, 
+    1, 121, 191, 39, 89, 1, 125, 191, 39, 89, 1, 205, 39, 89, 1, 222, 138, 
+    39, 89, 1, 233, 136, 39, 89, 1, 232, 94, 39, 89, 1, 212, 65, 39, 89, 1, 
+    125, 220, 103, 39, 89, 1, 125, 218, 224, 39, 89, 1, 125, 206, 39, 89, 1, 
+    125, 162, 39, 89, 1, 232, 185, 39, 89, 1, 61, 39, 89, 1, 121, 162, 39, 
+    89, 1, 73, 39, 89, 1, 236, 34, 39, 89, 1, 70, 39, 89, 1, 214, 118, 39, 
+    89, 1, 245, 210, 39, 89, 1, 226, 184, 39, 89, 1, 233, 121, 39, 89, 1, 
+    242, 133, 206, 39, 89, 116, 5, 147, 205, 39, 89, 116, 5, 147, 233, 136, 
+    39, 89, 116, 5, 233, 137, 217, 59, 233, 110, 39, 89, 5, 231, 205, 234, 
+    232, 233, 110, 39, 89, 116, 5, 40, 229, 78, 39, 89, 116, 5, 121, 190, 39, 
+    89, 116, 5, 125, 223, 140, 177, 121, 190, 39, 89, 116, 5, 185, 39, 89, 
+    116, 5, 252, 192, 39, 89, 116, 5, 206, 39, 89, 5, 222, 11, 39, 89, 25, 5, 
+    61, 39, 89, 25, 5, 231, 205, 221, 227, 39, 89, 25, 5, 255, 74, 39, 89, 
+    25, 5, 217, 65, 255, 74, 39, 89, 25, 5, 73, 39, 89, 25, 5, 236, 34, 39, 
     89, 25, 5, 214, 214, 39, 89, 25, 5, 214, 117, 39, 89, 25, 5, 70, 39, 89, 
-    25, 5, 214, 118, 39, 89, 25, 5, 76, 39, 89, 25, 5, 227, 1, 51, 39, 89, 
-    25, 5, 226, 109, 39, 89, 25, 5, 75, 39, 89, 25, 5, 254, 243, 39, 89, 25, 
-    5, 226, 183, 39, 89, 25, 5, 254, 201, 39, 89, 25, 5, 89, 254, 201, 39, 
-    89, 25, 5, 227, 1, 48, 39, 89, 5, 231, 204, 234, 230, 39, 89, 5, 216, 29, 
-    39, 89, 5, 216, 28, 39, 89, 5, 234, 97, 216, 27, 39, 89, 5, 234, 97, 216, 
-    26, 39, 89, 5, 234, 97, 216, 25, 39, 89, 5, 223, 188, 242, 45, 39, 89, 5, 
-    231, 204, 221, 253, 39, 89, 5, 234, 96, 234, 215, 39, 89, 38, 249, 115, 
-    247, 120, 39, 89, 241, 46, 21, 210, 86, 39, 89, 241, 46, 21, 110, 39, 89, 
-    241, 46, 21, 105, 39, 89, 241, 46, 21, 158, 39, 89, 241, 46, 21, 161, 39, 
-    89, 241, 46, 21, 189, 39, 89, 241, 46, 21, 194, 39, 89, 241, 46, 21, 198, 
-    39, 89, 241, 46, 21, 195, 39, 89, 241, 46, 21, 200, 39, 89, 89, 21, 210, 
+    25, 5, 214, 118, 39, 89, 25, 5, 76, 39, 89, 25, 5, 227, 2, 51, 39, 89, 
+    25, 5, 226, 110, 39, 89, 25, 5, 75, 39, 89, 25, 5, 254, 244, 39, 89, 25, 
+    5, 226, 184, 39, 89, 25, 5, 254, 202, 39, 89, 25, 5, 89, 254, 202, 39, 
+    89, 25, 5, 227, 2, 48, 39, 89, 5, 231, 205, 234, 231, 39, 89, 5, 216, 30, 
+    39, 89, 5, 216, 29, 39, 89, 5, 234, 98, 216, 28, 39, 89, 5, 234, 98, 216, 
+    27, 39, 89, 5, 234, 98, 216, 26, 39, 89, 5, 223, 189, 242, 46, 39, 89, 5, 
+    231, 205, 221, 254, 39, 89, 5, 234, 97, 234, 216, 39, 89, 38, 249, 116, 
+    247, 121, 39, 89, 241, 47, 21, 210, 86, 39, 89, 241, 47, 21, 110, 39, 89, 
+    241, 47, 21, 105, 39, 89, 241, 47, 21, 158, 39, 89, 241, 47, 21, 161, 39, 
+    89, 241, 47, 21, 189, 39, 89, 241, 47, 21, 194, 39, 89, 241, 47, 21, 198, 
+    39, 89, 241, 47, 21, 195, 39, 89, 241, 47, 21, 200, 39, 89, 89, 21, 210, 
     86, 39, 89, 89, 21, 110, 39, 89, 89, 21, 105, 39, 89, 89, 21, 158, 39, 
     89, 89, 21, 161, 39, 89, 89, 21, 189, 39, 89, 89, 21, 194, 39, 89, 89, 
     21, 198, 39, 89, 89, 21, 195, 39, 89, 89, 21, 200, 39, 89, 5, 211, 249, 
-    39, 89, 5, 211, 248, 39, 89, 5, 221, 215, 39, 89, 5, 234, 160, 39, 89, 5, 
-    240, 232, 39, 89, 5, 247, 134, 39, 89, 5, 223, 49, 222, 187, 223, 149, 
-    39, 89, 5, 231, 204, 211, 72, 39, 89, 5, 235, 6, 39, 89, 5, 235, 5, 39, 
-    89, 5, 221, 222, 39, 89, 5, 221, 221, 39, 89, 5, 242, 9, 39, 89, 5, 251, 
-    30, 102, 5, 214, 200, 223, 30, 102, 5, 214, 200, 251, 1, 102, 5, 250, 
-    186, 102, 5, 218, 15, 102, 5, 251, 233, 102, 1, 254, 184, 102, 1, 254, 
-    185, 217, 13, 102, 1, 236, 29, 102, 1, 236, 30, 217, 13, 102, 1, 214, 
-    203, 102, 1, 214, 204, 217, 13, 102, 1, 223, 188, 223, 79, 102, 1, 223, 
-    188, 223, 80, 217, 13, 102, 1, 233, 136, 233, 24, 102, 1, 233, 136, 233, 
-    25, 217, 13, 102, 1, 245, 179, 102, 1, 254, 199, 102, 1, 226, 212, 102, 
-    1, 226, 213, 217, 13, 102, 1, 176, 102, 1, 235, 13, 231, 207, 102, 1, 
-    243, 135, 102, 1, 243, 136, 242, 161, 102, 1, 229, 77, 102, 1, 251, 33, 
-    102, 1, 251, 34, 233, 123, 102, 1, 235, 141, 102, 1, 235, 142, 235, 118, 
-    102, 1, 227, 165, 102, 1, 217, 106, 233, 76, 102, 1, 217, 106, 230, 67, 
-    231, 207, 102, 1, 248, 222, 230, 67, 254, 145, 102, 1, 248, 222, 230, 67, 
-    231, 207, 102, 1, 229, 229, 223, 152, 102, 1, 217, 105, 102, 1, 217, 106, 
-    217, 35, 102, 1, 248, 221, 102, 1, 248, 222, 231, 225, 102, 1, 197, 102, 
-    1, 190, 102, 1, 226, 90, 234, 226, 102, 1, 252, 191, 102, 1, 252, 192, 
-    234, 172, 102, 1, 184, 102, 1, 191, 102, 1, 205, 102, 1, 233, 135, 102, 
-    1, 212, 65, 102, 1, 222, 34, 222, 20, 102, 1, 222, 34, 221, 233, 102, 1, 
-    206, 102, 1, 162, 102, 5, 223, 70, 102, 25, 5, 217, 13, 102, 25, 5, 214, 
-    199, 102, 25, 5, 214, 200, 221, 229, 102, 25, 5, 218, 47, 102, 25, 5, 
-    218, 48, 236, 21, 102, 25, 5, 223, 188, 223, 79, 102, 25, 5, 223, 188, 
-    223, 80, 217, 13, 102, 25, 5, 233, 136, 233, 24, 102, 25, 5, 233, 136, 
-    233, 25, 217, 13, 102, 25, 5, 217, 65, 102, 25, 5, 217, 66, 223, 79, 102, 
-    25, 5, 217, 66, 217, 13, 102, 25, 5, 217, 66, 223, 80, 217, 13, 102, 25, 
-    5, 225, 184, 102, 25, 5, 225, 185, 217, 13, 102, 254, 250, 254, 249, 102, 
-    1, 234, 251, 221, 228, 102, 1, 234, 102, 221, 228, 102, 1, 215, 34, 221, 
-    228, 102, 1, 245, 203, 221, 228, 102, 1, 214, 0, 221, 228, 102, 1, 210, 
-    107, 221, 228, 102, 1, 253, 209, 221, 228, 102, 21, 210, 86, 102, 21, 
+    39, 89, 5, 211, 248, 39, 89, 5, 221, 216, 39, 89, 5, 234, 161, 39, 89, 5, 
+    240, 233, 39, 89, 5, 247, 135, 39, 89, 5, 223, 50, 222, 188, 223, 150, 
+    39, 89, 5, 231, 205, 211, 72, 39, 89, 5, 235, 7, 39, 89, 5, 235, 6, 39, 
+    89, 5, 221, 223, 39, 89, 5, 221, 222, 39, 89, 5, 242, 10, 39, 89, 5, 251, 
+    31, 102, 5, 214, 200, 223, 31, 102, 5, 214, 200, 251, 2, 102, 5, 250, 
+    187, 102, 5, 218, 16, 102, 5, 251, 234, 102, 1, 254, 185, 102, 1, 254, 
+    186, 217, 14, 102, 1, 236, 30, 102, 1, 236, 31, 217, 14, 102, 1, 214, 
+    203, 102, 1, 214, 204, 217, 14, 102, 1, 223, 189, 223, 80, 102, 1, 223, 
+    189, 223, 81, 217, 14, 102, 1, 233, 137, 233, 25, 102, 1, 233, 137, 233, 
+    26, 217, 14, 102, 1, 245, 180, 102, 1, 254, 200, 102, 1, 226, 213, 102, 
+    1, 226, 214, 217, 14, 102, 1, 176, 102, 1, 235, 14, 231, 208, 102, 1, 
+    243, 136, 102, 1, 243, 137, 242, 162, 102, 1, 229, 78, 102, 1, 251, 34, 
+    102, 1, 251, 35, 233, 124, 102, 1, 235, 142, 102, 1, 235, 143, 235, 119, 
+    102, 1, 227, 166, 102, 1, 217, 107, 233, 77, 102, 1, 217, 107, 230, 68, 
+    231, 208, 102, 1, 248, 223, 230, 68, 254, 146, 102, 1, 248, 223, 230, 68, 
+    231, 208, 102, 1, 229, 230, 223, 153, 102, 1, 217, 106, 102, 1, 217, 107, 
+    217, 36, 102, 1, 248, 222, 102, 1, 248, 223, 231, 226, 102, 1, 197, 102, 
+    1, 190, 102, 1, 226, 91, 234, 227, 102, 1, 252, 192, 102, 1, 252, 193, 
+    234, 173, 102, 1, 185, 102, 1, 191, 102, 1, 205, 102, 1, 233, 136, 102, 
+    1, 212, 65, 102, 1, 222, 35, 222, 21, 102, 1, 222, 35, 221, 234, 102, 1, 
+    206, 102, 1, 162, 102, 5, 223, 71, 102, 25, 5, 217, 14, 102, 25, 5, 214, 
+    199, 102, 25, 5, 214, 200, 221, 230, 102, 25, 5, 218, 48, 102, 25, 5, 
+    218, 49, 236, 22, 102, 25, 5, 223, 189, 223, 80, 102, 25, 5, 223, 189, 
+    223, 81, 217, 14, 102, 25, 5, 233, 137, 233, 25, 102, 25, 5, 233, 137, 
+    233, 26, 217, 14, 102, 25, 5, 217, 66, 102, 25, 5, 217, 67, 223, 80, 102, 
+    25, 5, 217, 67, 217, 14, 102, 25, 5, 217, 67, 223, 81, 217, 14, 102, 25, 
+    5, 225, 185, 102, 25, 5, 225, 186, 217, 14, 102, 254, 251, 254, 250, 102, 
+    1, 234, 252, 221, 229, 102, 1, 234, 103, 221, 229, 102, 1, 215, 34, 221, 
+    229, 102, 1, 245, 204, 221, 229, 102, 1, 214, 0, 221, 229, 102, 1, 210, 
+    107, 221, 229, 102, 1, 253, 210, 221, 229, 102, 21, 210, 86, 102, 21, 
     110, 102, 21, 105, 102, 21, 158, 102, 21, 161, 102, 21, 189, 102, 21, 
-    194, 102, 21, 198, 102, 21, 195, 102, 21, 200, 102, 226, 29, 102, 226, 
-    55, 102, 211, 238, 102, 250, 236, 226, 48, 102, 250, 236, 219, 172, 102, 
-    250, 236, 226, 2, 102, 226, 54, 102, 28, 16, 247, 126, 102, 28, 16, 248, 
-    51, 102, 28, 16, 246, 64, 102, 28, 16, 248, 176, 102, 28, 16, 248, 177, 
-    218, 15, 102, 28, 16, 247, 205, 102, 28, 16, 248, 214, 102, 28, 16, 248, 
-    33, 102, 28, 16, 248, 198, 102, 28, 16, 248, 177, 243, 57, 102, 28, 16, 
-    38, 217, 9, 102, 28, 16, 38, 245, 141, 102, 28, 16, 38, 234, 167, 102, 
-    28, 16, 38, 234, 169, 102, 28, 16, 38, 235, 122, 102, 28, 16, 38, 234, 
-    168, 2, 235, 122, 102, 28, 16, 38, 234, 170, 2, 235, 122, 102, 28, 16, 
-    38, 252, 37, 102, 28, 16, 38, 242, 165, 102, 28, 16, 222, 249, 204, 246, 
-    74, 102, 28, 16, 222, 249, 204, 248, 212, 102, 28, 16, 222, 249, 250, 0, 
-    215, 111, 102, 28, 16, 222, 249, 250, 0, 217, 73, 102, 28, 16, 233, 44, 
-    204, 226, 43, 102, 28, 16, 233, 44, 204, 224, 139, 102, 28, 16, 233, 44, 
-    250, 0, 225, 38, 102, 28, 16, 233, 44, 250, 0, 225, 26, 102, 28, 16, 233, 
-    44, 204, 225, 61, 207, 5, 226, 26, 207, 5, 226, 39, 207, 5, 226, 35, 207, 
-    1, 61, 207, 1, 73, 207, 1, 70, 207, 1, 254, 243, 207, 1, 76, 207, 1, 75, 
-    207, 1, 245, 55, 207, 1, 176, 207, 1, 224, 88, 207, 1, 243, 135, 207, 1, 
-    229, 77, 207, 1, 251, 33, 207, 1, 235, 141, 207, 1, 210, 116, 207, 1, 
-    227, 165, 207, 1, 217, 105, 207, 1, 248, 221, 207, 1, 197, 207, 1, 190, 
-    207, 1, 244, 196, 207, 1, 214, 27, 207, 1, 252, 191, 207, 1, 184, 207, 1, 
-    191, 207, 1, 205, 207, 1, 233, 135, 207, 1, 212, 65, 207, 1, 206, 207, 1, 
-    211, 165, 207, 1, 162, 207, 116, 5, 226, 52, 207, 116, 5, 226, 28, 207, 
-    116, 5, 226, 25, 207, 25, 5, 226, 42, 207, 25, 5, 226, 24, 207, 25, 5, 
-    226, 46, 207, 25, 5, 226, 34, 207, 25, 5, 226, 53, 207, 25, 5, 226, 44, 
-    207, 5, 226, 56, 207, 5, 213, 152, 207, 116, 5, 225, 248, 184, 207, 116, 
-    5, 225, 248, 212, 65, 207, 1, 234, 132, 207, 1, 217, 231, 207, 21, 210, 
+    194, 102, 21, 198, 102, 21, 195, 102, 21, 200, 102, 226, 30, 102, 226, 
+    56, 102, 211, 238, 102, 250, 237, 226, 49, 102, 250, 237, 219, 173, 102, 
+    250, 237, 226, 3, 102, 226, 55, 102, 28, 16, 247, 127, 102, 28, 16, 248, 
+    52, 102, 28, 16, 246, 65, 102, 28, 16, 248, 177, 102, 28, 16, 248, 178, 
+    218, 16, 102, 28, 16, 247, 206, 102, 28, 16, 248, 215, 102, 28, 16, 248, 
+    34, 102, 28, 16, 248, 199, 102, 28, 16, 248, 178, 243, 58, 102, 28, 16, 
+    38, 217, 10, 102, 28, 16, 38, 245, 142, 102, 28, 16, 38, 234, 168, 102, 
+    28, 16, 38, 234, 170, 102, 28, 16, 38, 235, 123, 102, 28, 16, 38, 234, 
+    169, 2, 235, 123, 102, 28, 16, 38, 234, 171, 2, 235, 123, 102, 28, 16, 
+    38, 252, 38, 102, 28, 16, 38, 242, 166, 102, 28, 16, 222, 250, 204, 246, 
+    75, 102, 28, 16, 222, 250, 204, 248, 213, 102, 28, 16, 222, 250, 250, 1, 
+    215, 112, 102, 28, 16, 222, 250, 250, 1, 217, 74, 102, 28, 16, 233, 45, 
+    204, 226, 44, 102, 28, 16, 233, 45, 204, 224, 140, 102, 28, 16, 233, 45, 
+    250, 1, 225, 39, 102, 28, 16, 233, 45, 250, 1, 225, 27, 102, 28, 16, 233, 
+    45, 204, 225, 62, 207, 5, 226, 27, 207, 5, 226, 40, 207, 5, 226, 36, 207, 
+    1, 61, 207, 1, 73, 207, 1, 70, 207, 1, 254, 244, 207, 1, 76, 207, 1, 75, 
+    207, 1, 245, 56, 207, 1, 176, 207, 1, 224, 89, 207, 1, 243, 136, 207, 1, 
+    229, 78, 207, 1, 251, 34, 207, 1, 235, 142, 207, 1, 210, 116, 207, 1, 
+    227, 166, 207, 1, 217, 106, 207, 1, 248, 222, 207, 1, 197, 207, 1, 190, 
+    207, 1, 244, 197, 207, 1, 214, 27, 207, 1, 252, 192, 207, 1, 185, 207, 1, 
+    191, 207, 1, 205, 207, 1, 233, 136, 207, 1, 212, 65, 207, 1, 206, 207, 1, 
+    211, 165, 207, 1, 162, 207, 116, 5, 226, 53, 207, 116, 5, 226, 29, 207, 
+    116, 5, 226, 26, 207, 25, 5, 226, 43, 207, 25, 5, 226, 25, 207, 25, 5, 
+    226, 47, 207, 25, 5, 226, 35, 207, 25, 5, 226, 54, 207, 25, 5, 226, 45, 
+    207, 5, 226, 57, 207, 5, 213, 152, 207, 116, 5, 225, 249, 185, 207, 116, 
+    5, 225, 249, 212, 65, 207, 1, 234, 133, 207, 1, 217, 232, 207, 21, 210, 
     86, 207, 21, 110, 207, 21, 105, 207, 21, 158, 207, 21, 161, 207, 21, 189, 
-    207, 21, 194, 207, 21, 198, 207, 21, 195, 207, 21, 200, 207, 253, 175, 
-    207, 1, 223, 52, 207, 1, 233, 7, 207, 1, 252, 18, 207, 1, 40, 235, 23, 
-    207, 1, 40, 193, 252, 120, 1, 61, 252, 120, 1, 219, 164, 61, 252, 120, 1, 
-    162, 252, 120, 1, 219, 164, 162, 252, 120, 1, 231, 181, 162, 252, 120, 1, 
-    252, 191, 252, 120, 1, 234, 212, 252, 191, 252, 120, 1, 190, 252, 120, 1, 
-    219, 164, 190, 252, 120, 1, 197, 252, 120, 1, 231, 181, 197, 252, 120, 1, 
-    212, 65, 252, 120, 1, 219, 164, 212, 65, 252, 120, 1, 226, 67, 212, 65, 
-    252, 120, 1, 243, 135, 252, 120, 1, 219, 164, 243, 135, 252, 120, 1, 235, 
-    141, 252, 120, 1, 248, 221, 252, 120, 1, 205, 252, 120, 1, 219, 164, 205, 
-    252, 120, 1, 184, 252, 120, 1, 219, 164, 184, 252, 120, 1, 219, 26, 217, 
-    105, 252, 120, 1, 228, 55, 217, 105, 252, 120, 1, 206, 252, 120, 1, 219, 
-    164, 206, 252, 120, 1, 231, 181, 206, 252, 120, 1, 191, 252, 120, 1, 219, 
-    164, 191, 252, 120, 1, 229, 77, 252, 120, 1, 233, 135, 252, 120, 1, 219, 
-    164, 233, 135, 252, 120, 1, 227, 165, 252, 120, 1, 251, 33, 252, 120, 1, 
-    229, 148, 252, 120, 1, 231, 124, 252, 120, 1, 73, 252, 120, 1, 70, 252, 
-    120, 5, 216, 33, 252, 120, 25, 5, 75, 252, 120, 25, 5, 226, 67, 75, 252, 
-    120, 25, 5, 245, 209, 252, 120, 25, 5, 73, 252, 120, 25, 5, 234, 212, 73, 
-    252, 120, 25, 5, 76, 252, 120, 25, 5, 234, 212, 76, 252, 120, 25, 5, 70, 
-    252, 120, 25, 5, 104, 31, 219, 164, 206, 252, 120, 116, 5, 229, 79, 252, 
-    120, 116, 5, 242, 60, 252, 120, 226, 37, 252, 120, 226, 33, 252, 120, 16, 
-    251, 241, 229, 229, 231, 37, 252, 120, 16, 251, 241, 225, 64, 252, 120, 
-    16, 251, 241, 235, 48, 252, 120, 16, 251, 241, 226, 37, 196, 1, 176, 196, 
-    1, 234, 39, 196, 1, 234, 132, 196, 1, 243, 135, 196, 1, 242, 186, 196, 1, 
-    229, 77, 196, 1, 251, 33, 196, 1, 250, 157, 196, 1, 235, 141, 196, 1, 
-    227, 165, 196, 1, 217, 105, 196, 1, 216, 208, 196, 1, 248, 221, 196, 1, 
-    197, 196, 1, 190, 196, 1, 225, 42, 196, 1, 225, 147, 196, 1, 244, 196, 
-    196, 1, 244, 75, 196, 1, 252, 191, 196, 1, 251, 222, 196, 1, 184, 196, 1, 
-    230, 168, 196, 1, 215, 183, 196, 1, 215, 175, 196, 1, 246, 38, 196, 1, 
-    191, 196, 1, 205, 196, 1, 233, 135, 196, 1, 162, 196, 1, 241, 153, 196, 
-    1, 214, 27, 196, 1, 206, 196, 1, 220, 102, 196, 1, 212, 65, 196, 1, 61, 
-    196, 218, 73, 1, 191, 196, 218, 73, 1, 205, 196, 25, 5, 255, 73, 196, 25, 
-    5, 73, 196, 25, 5, 76, 196, 25, 5, 226, 183, 196, 25, 5, 70, 196, 25, 5, 
-    214, 118, 196, 25, 5, 75, 196, 116, 5, 235, 23, 196, 116, 5, 193, 196, 
-    116, 5, 156, 196, 116, 5, 230, 25, 196, 116, 5, 226, 105, 196, 116, 5, 
-    153, 196, 116, 5, 217, 152, 196, 116, 5, 227, 142, 196, 116, 5, 234, 230, 
-    196, 5, 223, 150, 196, 5, 227, 205, 196, 224, 141, 217, 103, 196, 224, 
-    141, 227, 152, 216, 120, 217, 103, 196, 224, 141, 250, 164, 196, 224, 
-    141, 215, 170, 250, 164, 196, 224, 141, 215, 169, 196, 21, 210, 86, 196, 
+    207, 21, 194, 207, 21, 198, 207, 21, 195, 207, 21, 200, 207, 253, 176, 
+    207, 1, 223, 53, 207, 1, 233, 8, 207, 1, 252, 19, 207, 1, 40, 235, 24, 
+    207, 1, 40, 193, 252, 121, 1, 61, 252, 121, 1, 219, 165, 61, 252, 121, 1, 
+    162, 252, 121, 1, 219, 165, 162, 252, 121, 1, 231, 182, 162, 252, 121, 1, 
+    252, 192, 252, 121, 1, 234, 213, 252, 192, 252, 121, 1, 190, 252, 121, 1, 
+    219, 165, 190, 252, 121, 1, 197, 252, 121, 1, 231, 182, 197, 252, 121, 1, 
+    212, 65, 252, 121, 1, 219, 165, 212, 65, 252, 121, 1, 226, 68, 212, 65, 
+    252, 121, 1, 243, 136, 252, 121, 1, 219, 165, 243, 136, 252, 121, 1, 235, 
+    142, 252, 121, 1, 248, 222, 252, 121, 1, 205, 252, 121, 1, 219, 165, 205, 
+    252, 121, 1, 185, 252, 121, 1, 219, 165, 185, 252, 121, 1, 219, 27, 217, 
+    106, 252, 121, 1, 228, 56, 217, 106, 252, 121, 1, 206, 252, 121, 1, 219, 
+    165, 206, 252, 121, 1, 231, 182, 206, 252, 121, 1, 191, 252, 121, 1, 219, 
+    165, 191, 252, 121, 1, 229, 78, 252, 121, 1, 233, 136, 252, 121, 1, 219, 
+    165, 233, 136, 252, 121, 1, 227, 166, 252, 121, 1, 251, 34, 252, 121, 1, 
+    229, 149, 252, 121, 1, 231, 125, 252, 121, 1, 73, 252, 121, 1, 70, 252, 
+    121, 5, 216, 34, 252, 121, 25, 5, 75, 252, 121, 25, 5, 226, 68, 75, 252, 
+    121, 25, 5, 245, 210, 252, 121, 25, 5, 73, 252, 121, 25, 5, 234, 213, 73, 
+    252, 121, 25, 5, 76, 252, 121, 25, 5, 234, 213, 76, 252, 121, 25, 5, 70, 
+    252, 121, 25, 5, 104, 31, 219, 165, 206, 252, 121, 116, 5, 229, 80, 252, 
+    121, 116, 5, 242, 61, 252, 121, 226, 38, 252, 121, 226, 34, 252, 121, 16, 
+    251, 242, 229, 230, 231, 38, 252, 121, 16, 251, 242, 225, 65, 252, 121, 
+    16, 251, 242, 235, 49, 252, 121, 16, 251, 242, 226, 38, 196, 1, 176, 196, 
+    1, 234, 40, 196, 1, 234, 133, 196, 1, 243, 136, 196, 1, 242, 187, 196, 1, 
+    229, 78, 196, 1, 251, 34, 196, 1, 250, 158, 196, 1, 235, 142, 196, 1, 
+    227, 166, 196, 1, 217, 106, 196, 1, 216, 209, 196, 1, 248, 222, 196, 1, 
+    197, 196, 1, 190, 196, 1, 225, 43, 196, 1, 225, 148, 196, 1, 244, 197, 
+    196, 1, 244, 76, 196, 1, 252, 192, 196, 1, 251, 223, 196, 1, 185, 196, 1, 
+    230, 169, 196, 1, 215, 184, 196, 1, 215, 176, 196, 1, 246, 39, 196, 1, 
+    191, 196, 1, 205, 196, 1, 233, 136, 196, 1, 162, 196, 1, 241, 154, 196, 
+    1, 214, 27, 196, 1, 206, 196, 1, 220, 103, 196, 1, 212, 65, 196, 1, 61, 
+    196, 218, 74, 1, 191, 196, 218, 74, 1, 205, 196, 25, 5, 255, 74, 196, 25, 
+    5, 73, 196, 25, 5, 76, 196, 25, 5, 226, 184, 196, 25, 5, 70, 196, 25, 5, 
+    214, 118, 196, 25, 5, 75, 196, 116, 5, 235, 24, 196, 116, 5, 193, 196, 
+    116, 5, 156, 196, 116, 5, 230, 26, 196, 116, 5, 226, 106, 196, 116, 5, 
+    153, 196, 116, 5, 217, 153, 196, 116, 5, 227, 143, 196, 116, 5, 234, 231, 
+    196, 5, 223, 151, 196, 5, 227, 206, 196, 224, 142, 217, 104, 196, 224, 
+    142, 227, 153, 216, 121, 217, 104, 196, 224, 142, 250, 165, 196, 224, 
+    142, 215, 171, 250, 165, 196, 224, 142, 215, 170, 196, 21, 210, 86, 196, 
     21, 110, 196, 21, 105, 196, 21, 158, 196, 21, 161, 196, 21, 189, 196, 21, 
-    194, 196, 21, 198, 196, 21, 195, 196, 21, 200, 196, 1, 215, 156, 196, 1, 
-    215, 144, 196, 1, 248, 135, 226, 210, 250, 103, 21, 210, 86, 226, 210, 
-    250, 103, 21, 110, 226, 210, 250, 103, 21, 105, 226, 210, 250, 103, 21, 
-    158, 226, 210, 250, 103, 21, 161, 226, 210, 250, 103, 21, 189, 226, 210, 
-    250, 103, 21, 194, 226, 210, 250, 103, 21, 198, 226, 210, 250, 103, 21, 
-    195, 226, 210, 250, 103, 21, 200, 226, 210, 250, 103, 1, 233, 135, 226, 
-    210, 250, 103, 1, 253, 206, 226, 210, 250, 103, 1, 254, 216, 226, 210, 
-    250, 103, 1, 254, 115, 226, 210, 250, 103, 1, 254, 178, 226, 210, 250, 
-    103, 1, 233, 134, 226, 210, 250, 103, 1, 255, 35, 226, 210, 250, 103, 1, 
-    255, 36, 226, 210, 250, 103, 1, 255, 34, 226, 210, 250, 103, 1, 255, 29, 
-    226, 210, 250, 103, 1, 232, 241, 226, 210, 250, 103, 1, 235, 171, 226, 
-    210, 250, 103, 1, 236, 34, 226, 210, 250, 103, 1, 235, 190, 226, 210, 
-    250, 103, 1, 235, 179, 226, 210, 250, 103, 1, 232, 98, 226, 210, 250, 
-    103, 1, 214, 221, 226, 210, 250, 103, 1, 214, 219, 226, 210, 250, 103, 1, 
-    214, 168, 226, 210, 250, 103, 1, 214, 111, 226, 210, 250, 103, 1, 233, 
-    58, 226, 210, 250, 103, 1, 245, 108, 226, 210, 250, 103, 1, 245, 212, 
-    226, 210, 250, 103, 1, 245, 150, 226, 210, 250, 103, 1, 245, 86, 226, 
-    210, 250, 103, 1, 232, 156, 226, 210, 250, 103, 1, 226, 137, 226, 210, 
-    250, 103, 1, 226, 252, 226, 210, 250, 103, 1, 226, 125, 226, 210, 250, 
-    103, 1, 226, 222, 226, 210, 250, 103, 230, 103, 215, 121, 226, 210, 250, 
-    103, 243, 130, 215, 122, 226, 210, 250, 103, 230, 101, 215, 122, 226, 
-    210, 250, 103, 223, 92, 226, 210, 250, 103, 225, 145, 226, 210, 250, 103, 
-    254, 208, 226, 210, 250, 103, 224, 141, 230, 98, 226, 210, 250, 103, 224, 
-    141, 52, 230, 98, 207, 224, 141, 251, 241, 218, 8, 207, 224, 141, 251, 
-    241, 226, 38, 207, 224, 141, 251, 241, 224, 129, 207, 224, 141, 251, 241, 
-    251, 19, 207, 224, 141, 251, 241, 233, 8, 221, 225, 207, 224, 141, 251, 
-    241, 235, 13, 221, 225, 207, 224, 141, 251, 241, 248, 222, 221, 225, 207, 
-    224, 141, 251, 241, 252, 192, 221, 225, 213, 252, 138, 234, 210, 213, 
-    252, 138, 220, 77, 213, 252, 138, 224, 198, 213, 252, 5, 228, 209, 213, 
-    252, 5, 211, 80, 230, 222, 218, 0, 213, 252, 138, 211, 80, 254, 213, 235, 
-    243, 218, 0, 213, 252, 138, 211, 80, 235, 243, 218, 0, 213, 252, 138, 
-    211, 80, 234, 198, 235, 243, 218, 0, 213, 252, 138, 251, 2, 51, 213, 252, 
-    138, 211, 80, 234, 198, 235, 243, 218, 1, 221, 197, 213, 252, 138, 52, 
-    218, 0, 213, 252, 138, 215, 211, 218, 0, 213, 252, 138, 234, 198, 254, 
-    77, 213, 252, 138, 59, 51, 213, 252, 138, 113, 170, 51, 213, 252, 138, 
-    134, 170, 51, 213, 252, 138, 222, 240, 234, 209, 235, 243, 218, 0, 213, 
-    252, 138, 253, 204, 235, 243, 218, 0, 213, 252, 5, 213, 148, 218, 0, 213, 
-    252, 5, 213, 148, 214, 216, 213, 252, 5, 223, 49, 213, 148, 214, 216, 
-    213, 252, 5, 213, 148, 254, 77, 213, 252, 5, 223, 49, 213, 148, 254, 77, 
-    213, 252, 5, 213, 148, 214, 217, 2, 217, 77, 213, 252, 5, 213, 148, 254, 
-    78, 2, 217, 77, 213, 252, 5, 254, 76, 254, 91, 213, 252, 5, 254, 76, 252, 
-    166, 213, 252, 5, 254, 76, 214, 20, 213, 252, 5, 254, 76, 214, 21, 2, 
-    217, 77, 213, 252, 5, 216, 68, 213, 252, 5, 241, 191, 199, 254, 75, 213, 
-    252, 5, 199, 254, 75, 213, 252, 5, 222, 142, 199, 254, 75, 213, 252, 5, 
-    254, 76, 214, 223, 230, 90, 213, 252, 5, 254, 20, 213, 252, 5, 222, 187, 
-    254, 20, 213, 252, 138, 251, 2, 48, 213, 252, 5, 235, 102, 213, 252, 5, 
-    214, 161, 7, 1, 4, 6, 61, 7, 1, 4, 6, 254, 243, 7, 4, 1, 215, 94, 254, 
-    243, 7, 1, 4, 6, 252, 134, 253, 158, 7, 1, 4, 6, 251, 66, 7, 1, 4, 6, 
-    249, 60, 7, 1, 4, 6, 245, 59, 7, 1, 4, 6, 75, 7, 4, 1, 215, 94, 204, 75, 
-    7, 4, 1, 215, 94, 73, 7, 1, 4, 6, 235, 144, 7, 1, 4, 6, 235, 23, 7, 1, 4, 
-    6, 233, 149, 2, 91, 7, 1, 4, 6, 193, 7, 1, 4, 6, 223, 49, 230, 25, 7, 1, 
-    4, 6, 76, 7, 1, 4, 6, 204, 76, 7, 4, 1, 219, 187, 76, 7, 4, 1, 219, 187, 
-    204, 76, 7, 4, 1, 219, 187, 144, 2, 91, 7, 4, 1, 215, 94, 226, 234, 7, 1, 
-    4, 6, 226, 134, 7, 4, 1, 216, 14, 163, 76, 7, 4, 1, 251, 175, 163, 76, 7, 
-    1, 4, 6, 226, 105, 7, 1, 4, 6, 223, 49, 153, 7, 1, 4, 6, 215, 94, 153, 7, 
-    1, 4, 6, 217, 152, 7, 1, 4, 6, 70, 7, 4, 1, 219, 187, 70, 7, 4, 1, 219, 
-    187, 248, 0, 70, 7, 4, 1, 219, 187, 215, 94, 193, 7, 1, 4, 6, 214, 105, 
-    7, 1, 4, 6, 212, 98, 7, 1, 4, 6, 210, 159, 7, 1, 4, 6, 245, 8, 7, 1, 213, 
-    135, 233, 82, 218, 250, 7, 1, 254, 196, 26, 1, 4, 6, 243, 107, 26, 1, 4, 
-    6, 233, 98, 26, 1, 4, 6, 225, 108, 26, 1, 4, 6, 223, 37, 26, 1, 4, 6, 
-    224, 161, 33, 1, 4, 6, 245, 174, 58, 1, 6, 61, 58, 1, 6, 254, 243, 58, 1, 
-    6, 253, 158, 58, 1, 6, 252, 134, 253, 158, 58, 1, 6, 249, 60, 58, 1, 6, 
-    75, 58, 1, 6, 223, 49, 75, 58, 1, 6, 243, 202, 58, 1, 6, 242, 60, 58, 1, 
-    6, 73, 58, 1, 6, 235, 144, 58, 1, 6, 235, 23, 58, 1, 6, 156, 58, 1, 6, 
-    193, 58, 1, 6, 230, 25, 58, 1, 6, 223, 49, 230, 25, 58, 1, 6, 76, 58, 1, 
-    6, 226, 134, 58, 1, 6, 226, 105, 58, 1, 6, 153, 58, 1, 6, 217, 152, 58, 
+    194, 196, 21, 198, 196, 21, 195, 196, 21, 200, 196, 1, 215, 157, 196, 1, 
+    215, 145, 196, 1, 248, 136, 226, 211, 250, 104, 21, 210, 86, 226, 211, 
+    250, 104, 21, 110, 226, 211, 250, 104, 21, 105, 226, 211, 250, 104, 21, 
+    158, 226, 211, 250, 104, 21, 161, 226, 211, 250, 104, 21, 189, 226, 211, 
+    250, 104, 21, 194, 226, 211, 250, 104, 21, 198, 226, 211, 250, 104, 21, 
+    195, 226, 211, 250, 104, 21, 200, 226, 211, 250, 104, 1, 233, 136, 226, 
+    211, 250, 104, 1, 253, 207, 226, 211, 250, 104, 1, 254, 217, 226, 211, 
+    250, 104, 1, 254, 116, 226, 211, 250, 104, 1, 254, 179, 226, 211, 250, 
+    104, 1, 233, 135, 226, 211, 250, 104, 1, 255, 36, 226, 211, 250, 104, 1, 
+    255, 37, 226, 211, 250, 104, 1, 255, 35, 226, 211, 250, 104, 1, 255, 30, 
+    226, 211, 250, 104, 1, 232, 242, 226, 211, 250, 104, 1, 235, 172, 226, 
+    211, 250, 104, 1, 236, 35, 226, 211, 250, 104, 1, 235, 191, 226, 211, 
+    250, 104, 1, 235, 180, 226, 211, 250, 104, 1, 232, 99, 226, 211, 250, 
+    104, 1, 214, 221, 226, 211, 250, 104, 1, 214, 219, 226, 211, 250, 104, 1, 
+    214, 168, 226, 211, 250, 104, 1, 214, 111, 226, 211, 250, 104, 1, 233, 
+    59, 226, 211, 250, 104, 1, 245, 109, 226, 211, 250, 104, 1, 245, 213, 
+    226, 211, 250, 104, 1, 245, 151, 226, 211, 250, 104, 1, 245, 87, 226, 
+    211, 250, 104, 1, 232, 157, 226, 211, 250, 104, 1, 226, 138, 226, 211, 
+    250, 104, 1, 226, 253, 226, 211, 250, 104, 1, 226, 126, 226, 211, 250, 
+    104, 1, 226, 223, 226, 211, 250, 104, 230, 104, 215, 122, 226, 211, 250, 
+    104, 243, 131, 215, 123, 226, 211, 250, 104, 230, 102, 215, 123, 226, 
+    211, 250, 104, 223, 93, 226, 211, 250, 104, 225, 146, 226, 211, 250, 104, 
+    254, 209, 226, 211, 250, 104, 224, 142, 230, 99, 226, 211, 250, 104, 224, 
+    142, 52, 230, 99, 207, 224, 142, 251, 242, 218, 9, 207, 224, 142, 251, 
+    242, 226, 39, 207, 224, 142, 251, 242, 224, 130, 207, 224, 142, 251, 242, 
+    251, 20, 207, 224, 142, 251, 242, 233, 9, 221, 226, 207, 224, 142, 251, 
+    242, 235, 14, 221, 226, 207, 224, 142, 251, 242, 248, 223, 221, 226, 207, 
+    224, 142, 251, 242, 252, 193, 221, 226, 213, 252, 138, 234, 211, 213, 
+    252, 138, 220, 78, 213, 252, 138, 224, 199, 213, 252, 5, 228, 210, 213, 
+    252, 5, 211, 80, 230, 223, 218, 1, 213, 252, 138, 211, 80, 254, 214, 235, 
+    244, 218, 1, 213, 252, 138, 211, 80, 235, 244, 218, 1, 213, 252, 138, 
+    211, 80, 234, 199, 235, 244, 218, 1, 213, 252, 138, 251, 3, 51, 213, 252, 
+    138, 211, 80, 234, 199, 235, 244, 218, 2, 221, 198, 213, 252, 138, 52, 
+    218, 1, 213, 252, 138, 215, 212, 218, 1, 213, 252, 138, 234, 199, 254, 
+    78, 213, 252, 138, 59, 51, 213, 252, 138, 113, 170, 51, 213, 252, 138, 
+    134, 170, 51, 213, 252, 138, 222, 241, 234, 210, 235, 244, 218, 1, 213, 
+    252, 138, 253, 205, 235, 244, 218, 1, 213, 252, 5, 213, 148, 218, 1, 213, 
+    252, 5, 213, 148, 214, 216, 213, 252, 5, 223, 50, 213, 148, 214, 216, 
+    213, 252, 5, 213, 148, 254, 78, 213, 252, 5, 223, 50, 213, 148, 254, 78, 
+    213, 252, 5, 213, 148, 214, 217, 2, 217, 78, 213, 252, 5, 213, 148, 254, 
+    79, 2, 217, 78, 213, 252, 5, 254, 77, 254, 92, 213, 252, 5, 254, 77, 252, 
+    167, 213, 252, 5, 254, 77, 214, 20, 213, 252, 5, 254, 77, 214, 21, 2, 
+    217, 78, 213, 252, 5, 216, 69, 213, 252, 5, 241, 192, 199, 254, 76, 213, 
+    252, 5, 199, 254, 76, 213, 252, 5, 222, 143, 199, 254, 76, 213, 252, 5, 
+    254, 77, 214, 223, 230, 91, 213, 252, 5, 254, 21, 213, 252, 5, 222, 188, 
+    254, 21, 213, 252, 138, 251, 3, 48, 213, 252, 5, 235, 103, 213, 252, 5, 
+    214, 161, 7, 1, 4, 6, 61, 7, 1, 4, 6, 254, 244, 7, 4, 1, 215, 94, 254, 
+    244, 7, 1, 4, 6, 252, 135, 253, 159, 7, 1, 4, 6, 251, 67, 7, 1, 4, 6, 
+    249, 61, 7, 1, 4, 6, 245, 60, 7, 1, 4, 6, 75, 7, 4, 1, 215, 94, 204, 75, 
+    7, 4, 1, 215, 94, 73, 7, 1, 4, 6, 235, 145, 7, 1, 4, 6, 235, 24, 7, 1, 4, 
+    6, 233, 150, 2, 91, 7, 1, 4, 6, 193, 7, 1, 4, 6, 223, 50, 230, 26, 7, 1, 
+    4, 6, 76, 7, 1, 4, 6, 204, 76, 7, 4, 1, 219, 188, 76, 7, 4, 1, 219, 188, 
+    204, 76, 7, 4, 1, 219, 188, 144, 2, 91, 7, 4, 1, 215, 94, 226, 235, 7, 1, 
+    4, 6, 226, 135, 7, 4, 1, 216, 15, 163, 76, 7, 4, 1, 251, 176, 163, 76, 7, 
+    1, 4, 6, 226, 106, 7, 1, 4, 6, 223, 50, 153, 7, 1, 4, 6, 215, 94, 153, 7, 
+    1, 4, 6, 217, 153, 7, 1, 4, 6, 70, 7, 4, 1, 219, 188, 70, 7, 4, 1, 219, 
+    188, 248, 1, 70, 7, 4, 1, 219, 188, 215, 94, 193, 7, 1, 4, 6, 214, 105, 
+    7, 1, 4, 6, 212, 98, 7, 1, 4, 6, 210, 159, 7, 1, 4, 6, 245, 9, 7, 1, 213, 
+    135, 233, 83, 218, 251, 7, 1, 254, 197, 26, 1, 4, 6, 243, 108, 26, 1, 4, 
+    6, 233, 99, 26, 1, 4, 6, 225, 109, 26, 1, 4, 6, 223, 38, 26, 1, 4, 6, 
+    224, 162, 33, 1, 4, 6, 245, 175, 58, 1, 6, 61, 58, 1, 6, 254, 244, 58, 1, 
+    6, 253, 159, 58, 1, 6, 252, 135, 253, 159, 58, 1, 6, 249, 61, 58, 1, 6, 
+    75, 58, 1, 6, 223, 50, 75, 58, 1, 6, 243, 203, 58, 1, 6, 242, 61, 58, 1, 
+    6, 73, 58, 1, 6, 235, 145, 58, 1, 6, 235, 24, 58, 1, 6, 156, 58, 1, 6, 
+    193, 58, 1, 6, 230, 26, 58, 1, 6, 223, 50, 230, 26, 58, 1, 6, 76, 58, 1, 
+    6, 226, 135, 58, 1, 6, 226, 106, 58, 1, 6, 153, 58, 1, 6, 217, 153, 58, 
     1, 6, 70, 58, 1, 6, 212, 98, 58, 1, 4, 61, 58, 1, 4, 215, 94, 61, 58, 1, 
-    4, 254, 143, 58, 1, 4, 215, 94, 254, 243, 58, 1, 4, 253, 158, 58, 1, 4, 
-    249, 60, 58, 1, 4, 75, 58, 1, 4, 221, 195, 58, 1, 4, 204, 75, 58, 1, 4, 
-    215, 94, 204, 75, 58, 1, 4, 243, 202, 58, 1, 4, 215, 94, 73, 58, 1, 4, 
-    235, 23, 58, 1, 4, 193, 58, 1, 4, 245, 138, 58, 1, 4, 76, 58, 1, 4, 204, 
-    76, 58, 1, 4, 216, 14, 163, 76, 58, 1, 4, 251, 175, 163, 76, 58, 1, 4, 
-    226, 105, 58, 1, 4, 217, 152, 58, 1, 4, 70, 58, 1, 4, 219, 187, 70, 58, 
-    1, 4, 215, 94, 193, 58, 1, 4, 214, 105, 58, 1, 4, 254, 196, 58, 1, 4, 
-    252, 26, 58, 1, 4, 26, 243, 107, 58, 1, 4, 248, 54, 58, 1, 4, 26, 225, 
-    133, 58, 1, 4, 250, 110, 7, 218, 65, 4, 1, 73, 7, 218, 65, 4, 1, 153, 7, 
-    218, 65, 4, 1, 70, 7, 218, 65, 4, 1, 214, 105, 26, 218, 65, 4, 1, 252, 
-    26, 26, 218, 65, 4, 1, 243, 107, 26, 218, 65, 4, 1, 223, 37, 26, 218, 65, 
-    4, 1, 225, 133, 26, 218, 65, 4, 1, 250, 110, 7, 4, 1, 214, 214, 7, 4, 1, 
-    57, 2, 230, 224, 182, 7, 4, 1, 249, 61, 2, 230, 224, 182, 7, 4, 1, 245, 
-    7, 2, 230, 224, 182, 7, 4, 1, 232, 50, 2, 230, 224, 182, 7, 4, 1, 230, 
-    26, 2, 230, 224, 182, 7, 4, 1, 226, 106, 2, 230, 224, 182, 7, 4, 1, 223, 
-    224, 2, 230, 224, 182, 7, 4, 1, 223, 224, 2, 244, 88, 22, 230, 224, 182, 
-    7, 4, 1, 222, 92, 2, 230, 224, 182, 7, 4, 1, 217, 153, 2, 230, 224, 182, 
-    7, 4, 1, 210, 160, 2, 230, 224, 182, 7, 4, 1, 215, 94, 243, 202, 58, 1, 
-    33, 245, 150, 7, 4, 1, 235, 213, 243, 202, 7, 4, 1, 216, 211, 2, 218, 
-    107, 7, 4, 6, 1, 240, 154, 2, 91, 7, 4, 1, 235, 186, 2, 91, 7, 4, 1, 226, 
-    106, 2, 91, 7, 4, 6, 1, 104, 2, 91, 7, 4, 1, 214, 158, 2, 91, 7, 4, 1, 
-    57, 2, 226, 66, 103, 7, 4, 1, 249, 61, 2, 226, 66, 103, 7, 4, 1, 245, 7, 
-    2, 226, 66, 103, 7, 4, 1, 243, 203, 2, 226, 66, 103, 7, 4, 1, 235, 24, 2, 
-    226, 66, 103, 7, 4, 1, 233, 149, 2, 226, 66, 103, 7, 4, 1, 232, 50, 2, 
-    226, 66, 103, 7, 4, 1, 230, 26, 2, 226, 66, 103, 7, 4, 1, 226, 106, 2, 
-    226, 66, 103, 7, 4, 1, 223, 224, 2, 226, 66, 103, 7, 4, 1, 222, 92, 2, 
-    226, 66, 103, 7, 4, 1, 245, 76, 2, 226, 66, 103, 7, 4, 1, 214, 106, 2, 
-    226, 66, 103, 7, 4, 1, 211, 179, 2, 226, 66, 103, 7, 4, 1, 210, 160, 2, 
-    226, 66, 103, 7, 4, 1, 115, 2, 223, 55, 103, 7, 4, 1, 254, 144, 2, 223, 
-    55, 103, 7, 4, 1, 249, 61, 2, 241, 52, 22, 217, 77, 7, 4, 1, 160, 2, 223, 
-    55, 103, 7, 4, 1, 204, 160, 2, 223, 55, 103, 7, 4, 1, 223, 49, 204, 160, 
-    2, 223, 55, 103, 7, 4, 1, 221, 196, 2, 223, 55, 103, 7, 4, 1, 240, 154, 
-    2, 223, 55, 103, 7, 4, 1, 204, 144, 2, 223, 55, 103, 7, 4, 1, 245, 76, 2, 
-    223, 55, 103, 7, 4, 1, 104, 2, 223, 55, 103, 7, 4, 1, 245, 9, 2, 223, 55, 
-    103, 58, 1, 4, 215, 94, 254, 143, 58, 1, 4, 251, 66, 58, 1, 4, 251, 67, 
-    2, 249, 100, 58, 1, 4, 245, 59, 58, 1, 4, 223, 49, 204, 75, 58, 1, 4, 
-    245, 6, 58, 1, 4, 247, 119, 235, 145, 2, 91, 58, 1, 4, 119, 243, 202, 58, 
-    1, 4, 215, 94, 242, 60, 58, 1, 4, 240, 154, 2, 91, 58, 1, 4, 235, 185, 
-    58, 1, 4, 6, 73, 58, 1, 4, 6, 240, 154, 2, 91, 58, 1, 4, 235, 145, 2, 
-    249, 127, 58, 1, 4, 233, 149, 2, 223, 55, 103, 58, 1, 4, 233, 149, 2, 
-    226, 66, 103, 58, 1, 4, 6, 156, 58, 1, 4, 232, 50, 2, 103, 58, 1, 4, 215, 
-    94, 232, 50, 2, 199, 233, 36, 58, 1, 4, 230, 26, 2, 43, 103, 58, 1, 4, 
-    230, 26, 2, 223, 55, 103, 58, 1, 4, 6, 230, 25, 58, 1, 4, 252, 134, 76, 
-    58, 1, 4, 225, 133, 58, 1, 4, 222, 92, 2, 103, 58, 1, 4, 245, 75, 58, 1, 
-    4, 217, 153, 2, 226, 66, 103, 58, 1, 4, 104, 130, 58, 1, 4, 214, 157, 58, 
+    4, 254, 144, 58, 1, 4, 215, 94, 254, 244, 58, 1, 4, 253, 159, 58, 1, 4, 
+    249, 61, 58, 1, 4, 75, 58, 1, 4, 221, 196, 58, 1, 4, 204, 75, 58, 1, 4, 
+    215, 94, 204, 75, 58, 1, 4, 243, 203, 58, 1, 4, 215, 94, 73, 58, 1, 4, 
+    235, 24, 58, 1, 4, 193, 58, 1, 4, 245, 139, 58, 1, 4, 76, 58, 1, 4, 204, 
+    76, 58, 1, 4, 216, 15, 163, 76, 58, 1, 4, 251, 176, 163, 76, 58, 1, 4, 
+    226, 106, 58, 1, 4, 217, 153, 58, 1, 4, 70, 58, 1, 4, 219, 188, 70, 58, 
+    1, 4, 215, 94, 193, 58, 1, 4, 214, 105, 58, 1, 4, 254, 197, 58, 1, 4, 
+    252, 27, 58, 1, 4, 26, 243, 108, 58, 1, 4, 248, 55, 58, 1, 4, 26, 225, 
+    134, 58, 1, 4, 250, 111, 7, 218, 66, 4, 1, 73, 7, 218, 66, 4, 1, 153, 7, 
+    218, 66, 4, 1, 70, 7, 218, 66, 4, 1, 214, 105, 26, 218, 66, 4, 1, 252, 
+    27, 26, 218, 66, 4, 1, 243, 108, 26, 218, 66, 4, 1, 223, 38, 26, 218, 66, 
+    4, 1, 225, 134, 26, 218, 66, 4, 1, 250, 111, 7, 4, 1, 214, 214, 7, 4, 1, 
+    57, 2, 230, 225, 183, 7, 4, 1, 249, 62, 2, 230, 225, 183, 7, 4, 1, 245, 
+    8, 2, 230, 225, 183, 7, 4, 1, 232, 51, 2, 230, 225, 183, 7, 4, 1, 230, 
+    27, 2, 230, 225, 183, 7, 4, 1, 226, 107, 2, 230, 225, 183, 7, 4, 1, 223, 
+    225, 2, 230, 225, 183, 7, 4, 1, 223, 225, 2, 244, 89, 22, 230, 225, 183, 
+    7, 4, 1, 222, 93, 2, 230, 225, 183, 7, 4, 1, 217, 154, 2, 230, 225, 183, 
+    7, 4, 1, 210, 160, 2, 230, 225, 183, 7, 4, 1, 215, 94, 243, 203, 58, 1, 
+    33, 245, 151, 7, 4, 1, 235, 214, 243, 203, 7, 4, 1, 216, 212, 2, 218, 
+    108, 7, 4, 6, 1, 240, 155, 2, 91, 7, 4, 1, 235, 187, 2, 91, 7, 4, 1, 226, 
+    107, 2, 91, 7, 4, 6, 1, 104, 2, 91, 7, 4, 1, 214, 158, 2, 91, 7, 4, 1, 
+    57, 2, 226, 67, 103, 7, 4, 1, 249, 62, 2, 226, 67, 103, 7, 4, 1, 245, 8, 
+    2, 226, 67, 103, 7, 4, 1, 243, 204, 2, 226, 67, 103, 7, 4, 1, 235, 25, 2, 
+    226, 67, 103, 7, 4, 1, 233, 150, 2, 226, 67, 103, 7, 4, 1, 232, 51, 2, 
+    226, 67, 103, 7, 4, 1, 230, 27, 2, 226, 67, 103, 7, 4, 1, 226, 107, 2, 
+    226, 67, 103, 7, 4, 1, 223, 225, 2, 226, 67, 103, 7, 4, 1, 222, 93, 2, 
+    226, 67, 103, 7, 4, 1, 245, 77, 2, 226, 67, 103, 7, 4, 1, 214, 106, 2, 
+    226, 67, 103, 7, 4, 1, 211, 179, 2, 226, 67, 103, 7, 4, 1, 210, 160, 2, 
+    226, 67, 103, 7, 4, 1, 115, 2, 223, 56, 103, 7, 4, 1, 254, 145, 2, 223, 
+    56, 103, 7, 4, 1, 249, 62, 2, 241, 53, 22, 217, 78, 7, 4, 1, 160, 2, 223, 
+    56, 103, 7, 4, 1, 204, 160, 2, 223, 56, 103, 7, 4, 1, 223, 50, 204, 160, 
+    2, 223, 56, 103, 7, 4, 1, 221, 197, 2, 223, 56, 103, 7, 4, 1, 240, 155, 
+    2, 223, 56, 103, 7, 4, 1, 204, 144, 2, 223, 56, 103, 7, 4, 1, 245, 77, 2, 
+    223, 56, 103, 7, 4, 1, 104, 2, 223, 56, 103, 7, 4, 1, 245, 10, 2, 223, 
+    56, 103, 58, 1, 4, 215, 94, 254, 144, 58, 1, 4, 251, 67, 58, 1, 4, 251, 
+    68, 2, 249, 101, 58, 1, 4, 245, 60, 58, 1, 4, 223, 50, 204, 75, 58, 1, 4, 
+    245, 7, 58, 1, 4, 247, 120, 235, 146, 2, 91, 58, 1, 4, 119, 243, 203, 58, 
+    1, 4, 215, 94, 242, 61, 58, 1, 4, 240, 155, 2, 91, 58, 1, 4, 235, 186, 
+    58, 1, 4, 6, 73, 58, 1, 4, 6, 240, 155, 2, 91, 58, 1, 4, 235, 146, 2, 
+    249, 128, 58, 1, 4, 233, 150, 2, 223, 56, 103, 58, 1, 4, 233, 150, 2, 
+    226, 67, 103, 58, 1, 4, 6, 156, 58, 1, 4, 232, 51, 2, 103, 58, 1, 4, 215, 
+    94, 232, 51, 2, 199, 233, 37, 58, 1, 4, 230, 27, 2, 43, 103, 58, 1, 4, 
+    230, 27, 2, 223, 56, 103, 58, 1, 4, 6, 230, 26, 58, 1, 4, 252, 135, 76, 
+    58, 1, 4, 225, 134, 58, 1, 4, 222, 93, 2, 103, 58, 1, 4, 245, 76, 58, 1, 
+    4, 217, 154, 2, 226, 67, 103, 58, 1, 4, 104, 130, 58, 1, 4, 214, 157, 58, 
     1, 4, 6, 70, 58, 1, 4, 214, 106, 2, 103, 58, 1, 4, 215, 94, 214, 105, 58, 
-    1, 4, 210, 159, 58, 1, 4, 210, 160, 2, 223, 55, 103, 58, 1, 4, 210, 160, 
-    2, 249, 100, 58, 1, 4, 245, 8, 58, 1, 4, 216, 179, 38, 246, 118, 242, 
-    137, 255, 14, 38, 246, 118, 255, 3, 255, 14, 38, 219, 69, 51, 38, 218, 6, 
-    78, 38, 231, 231, 38, 242, 134, 38, 231, 229, 38, 255, 1, 38, 242, 135, 
-    38, 255, 2, 38, 7, 4, 1, 223, 224, 51, 38, 251, 145, 38, 231, 230, 38, 
-    52, 250, 31, 48, 38, 226, 225, 48, 38, 210, 35, 51, 38, 235, 172, 51, 38, 
-    214, 151, 48, 38, 214, 134, 48, 38, 7, 4, 1, 244, 63, 204, 115, 48, 38, 
-    7, 4, 1, 254, 243, 38, 7, 4, 1, 254, 73, 38, 7, 4, 1, 253, 176, 38, 7, 4, 
-    1, 251, 67, 250, 183, 38, 7, 4, 1, 235, 213, 249, 60, 38, 7, 4, 1, 245, 
-    59, 38, 7, 4, 1, 243, 202, 38, 7, 1, 4, 6, 243, 202, 38, 7, 4, 1, 235, 
-    23, 38, 7, 4, 1, 156, 38, 7, 1, 4, 6, 156, 38, 7, 1, 4, 6, 193, 38, 7, 4, 
-    1, 230, 25, 38, 7, 1, 4, 6, 230, 25, 38, 7, 1, 4, 6, 153, 38, 7, 4, 1, 
-    223, 224, 222, 186, 38, 7, 4, 1, 222, 91, 38, 7, 4, 1, 199, 222, 91, 38, 
-    7, 4, 1, 210, 159, 38, 52, 235, 193, 251, 147, 51, 38, 254, 148, 128, 
-    216, 42, 51, 38, 43, 253, 250, 48, 38, 44, 253, 250, 22, 124, 253, 250, 
-    51, 7, 6, 1, 115, 2, 222, 234, 51, 7, 4, 1, 115, 2, 222, 234, 51, 7, 6, 
+    1, 4, 210, 159, 58, 1, 4, 210, 160, 2, 223, 56, 103, 58, 1, 4, 210, 160, 
+    2, 249, 101, 58, 1, 4, 245, 9, 58, 1, 4, 216, 180, 38, 246, 119, 242, 
+    138, 255, 15, 38, 246, 119, 255, 4, 255, 15, 38, 219, 70, 51, 38, 218, 7, 
+    78, 38, 231, 232, 38, 242, 135, 38, 231, 230, 38, 255, 2, 38, 242, 136, 
+    38, 255, 3, 38, 7, 4, 1, 223, 225, 51, 38, 251, 146, 38, 231, 231, 38, 
+    52, 250, 32, 48, 38, 226, 226, 48, 38, 210, 35, 51, 38, 235, 173, 51, 38, 
+    214, 151, 48, 38, 214, 134, 48, 38, 7, 4, 1, 244, 64, 204, 115, 48, 38, 
+    7, 4, 1, 254, 244, 38, 7, 4, 1, 254, 74, 38, 7, 4, 1, 253, 177, 38, 7, 4, 
+    1, 251, 68, 250, 184, 38, 7, 4, 1, 235, 214, 249, 61, 38, 7, 4, 1, 245, 
+    60, 38, 7, 4, 1, 243, 203, 38, 7, 1, 4, 6, 243, 203, 38, 7, 4, 1, 235, 
+    24, 38, 7, 4, 1, 156, 38, 7, 1, 4, 6, 156, 38, 7, 1, 4, 6, 193, 38, 7, 4, 
+    1, 230, 26, 38, 7, 1, 4, 6, 230, 26, 38, 7, 1, 4, 6, 153, 38, 7, 4, 1, 
+    223, 225, 222, 187, 38, 7, 4, 1, 222, 92, 38, 7, 4, 1, 199, 222, 92, 38, 
+    7, 4, 1, 210, 159, 38, 52, 235, 194, 251, 148, 51, 38, 254, 149, 128, 
+    216, 43, 51, 38, 43, 253, 251, 48, 38, 44, 253, 251, 22, 124, 253, 251, 
+    51, 7, 6, 1, 115, 2, 222, 235, 51, 7, 4, 1, 115, 2, 222, 235, 51, 7, 6, 
     1, 57, 2, 59, 48, 7, 4, 1, 57, 2, 59, 48, 7, 6, 1, 57, 2, 59, 51, 7, 4, 
-    1, 57, 2, 59, 51, 7, 6, 1, 57, 2, 232, 214, 51, 7, 4, 1, 57, 2, 232, 214, 
-    51, 7, 6, 1, 251, 67, 2, 250, 184, 22, 142, 7, 4, 1, 251, 67, 2, 250, 
-    184, 22, 142, 7, 6, 1, 249, 61, 2, 59, 48, 7, 4, 1, 249, 61, 2, 59, 48, 
-    7, 6, 1, 249, 61, 2, 59, 51, 7, 4, 1, 249, 61, 2, 59, 51, 7, 6, 1, 249, 
-    61, 2, 232, 214, 51, 7, 4, 1, 249, 61, 2, 232, 214, 51, 7, 6, 1, 249, 61, 
-    2, 250, 183, 7, 4, 1, 249, 61, 2, 250, 183, 7, 6, 1, 249, 61, 2, 250, 31, 
-    51, 7, 4, 1, 249, 61, 2, 250, 31, 51, 7, 6, 1, 160, 2, 231, 233, 22, 242, 
-    136, 7, 4, 1, 160, 2, 231, 233, 22, 242, 136, 7, 6, 1, 160, 2, 231, 233, 
-    22, 142, 7, 4, 1, 160, 2, 231, 233, 22, 142, 7, 6, 1, 160, 2, 250, 31, 
-    51, 7, 4, 1, 160, 2, 250, 31, 51, 7, 6, 1, 160, 2, 216, 89, 51, 7, 4, 1, 
-    160, 2, 216, 89, 51, 7, 6, 1, 160, 2, 250, 184, 22, 251, 146, 7, 4, 1, 
-    160, 2, 250, 184, 22, 251, 146, 7, 6, 1, 245, 7, 2, 59, 48, 7, 4, 1, 245, 
-    7, 2, 59, 48, 7, 6, 1, 243, 203, 2, 231, 232, 7, 4, 1, 243, 203, 2, 231, 
-    232, 7, 6, 1, 242, 61, 2, 59, 48, 7, 4, 1, 242, 61, 2, 59, 48, 7, 6, 1, 
-    242, 61, 2, 59, 51, 7, 4, 1, 242, 61, 2, 59, 51, 7, 6, 1, 242, 61, 2, 
-    248, 1, 7, 4, 1, 242, 61, 2, 248, 1, 7, 6, 1, 242, 61, 2, 250, 183, 7, 4, 
-    1, 242, 61, 2, 250, 183, 7, 6, 1, 242, 61, 2, 251, 147, 51, 7, 4, 1, 242, 
-    61, 2, 251, 147, 51, 7, 6, 1, 240, 154, 2, 216, 89, 51, 7, 4, 1, 240, 
-    154, 2, 216, 89, 51, 7, 6, 1, 240, 154, 2, 248, 2, 22, 142, 7, 4, 1, 240, 
-    154, 2, 248, 2, 22, 142, 7, 6, 1, 235, 24, 2, 142, 7, 4, 1, 235, 24, 2, 
-    142, 7, 6, 1, 235, 24, 2, 59, 51, 7, 4, 1, 235, 24, 2, 59, 51, 7, 6, 1, 
-    235, 24, 2, 232, 214, 51, 7, 4, 1, 235, 24, 2, 232, 214, 51, 7, 6, 1, 
-    233, 149, 2, 59, 51, 7, 4, 1, 233, 149, 2, 59, 51, 7, 6, 1, 233, 149, 2, 
-    59, 252, 43, 22, 231, 232, 7, 4, 1, 233, 149, 2, 59, 252, 43, 22, 231, 
-    232, 7, 6, 1, 233, 149, 2, 232, 214, 51, 7, 4, 1, 233, 149, 2, 232, 214, 
-    51, 7, 6, 1, 233, 149, 2, 250, 31, 51, 7, 4, 1, 233, 149, 2, 250, 31, 51, 
-    7, 6, 1, 232, 50, 2, 142, 7, 4, 1, 232, 50, 2, 142, 7, 6, 1, 232, 50, 2, 
-    59, 48, 7, 4, 1, 232, 50, 2, 59, 48, 7, 6, 1, 232, 50, 2, 59, 51, 7, 4, 
-    1, 232, 50, 2, 59, 51, 7, 6, 1, 230, 26, 2, 59, 48, 7, 4, 1, 230, 26, 2, 
-    59, 48, 7, 6, 1, 230, 26, 2, 59, 51, 7, 4, 1, 230, 26, 2, 59, 51, 7, 6, 
-    1, 230, 26, 2, 232, 214, 51, 7, 4, 1, 230, 26, 2, 232, 214, 51, 7, 6, 1, 
-    230, 26, 2, 250, 31, 51, 7, 4, 1, 230, 26, 2, 250, 31, 51, 7, 6, 1, 144, 
-    2, 216, 89, 22, 142, 7, 4, 1, 144, 2, 216, 89, 22, 142, 7, 6, 1, 144, 2, 
-    216, 89, 22, 248, 1, 7, 4, 1, 144, 2, 216, 89, 22, 248, 1, 7, 6, 1, 144, 
-    2, 231, 233, 22, 242, 136, 7, 4, 1, 144, 2, 231, 233, 22, 242, 136, 7, 6, 
-    1, 144, 2, 231, 233, 22, 142, 7, 4, 1, 144, 2, 231, 233, 22, 142, 7, 6, 
-    1, 226, 106, 2, 142, 7, 4, 1, 226, 106, 2, 142, 7, 6, 1, 226, 106, 2, 59, 
-    48, 7, 4, 1, 226, 106, 2, 59, 48, 7, 6, 1, 223, 224, 2, 59, 48, 7, 4, 1, 
-    223, 224, 2, 59, 48, 7, 6, 1, 223, 224, 2, 59, 51, 7, 4, 1, 223, 224, 2, 
-    59, 51, 7, 6, 1, 223, 224, 2, 59, 252, 43, 22, 231, 232, 7, 4, 1, 223, 
-    224, 2, 59, 252, 43, 22, 231, 232, 7, 6, 1, 223, 224, 2, 232, 214, 51, 7, 
-    4, 1, 223, 224, 2, 232, 214, 51, 7, 6, 1, 222, 92, 2, 59, 48, 7, 4, 1, 
-    222, 92, 2, 59, 48, 7, 6, 1, 222, 92, 2, 59, 51, 7, 4, 1, 222, 92, 2, 59, 
-    51, 7, 6, 1, 222, 92, 2, 255, 3, 22, 59, 48, 7, 4, 1, 222, 92, 2, 255, 3, 
-    22, 59, 48, 7, 6, 1, 222, 92, 2, 250, 235, 22, 59, 48, 7, 4, 1, 222, 92, 
-    2, 250, 235, 22, 59, 48, 7, 6, 1, 222, 92, 2, 59, 252, 43, 22, 59, 48, 7, 
-    4, 1, 222, 92, 2, 59, 252, 43, 22, 59, 48, 7, 6, 1, 217, 153, 2, 59, 48, 
-    7, 4, 1, 217, 153, 2, 59, 48, 7, 6, 1, 217, 153, 2, 59, 51, 7, 4, 1, 217, 
-    153, 2, 59, 51, 7, 6, 1, 217, 153, 2, 232, 214, 51, 7, 4, 1, 217, 153, 2, 
-    232, 214, 51, 7, 6, 1, 217, 153, 2, 250, 31, 51, 7, 4, 1, 217, 153, 2, 
-    250, 31, 51, 7, 6, 1, 104, 2, 248, 2, 51, 7, 4, 1, 104, 2, 248, 2, 51, 7, 
-    6, 1, 104, 2, 216, 89, 51, 7, 4, 1, 104, 2, 216, 89, 51, 7, 6, 1, 104, 2, 
-    250, 31, 51, 7, 4, 1, 104, 2, 250, 31, 51, 7, 6, 1, 104, 2, 216, 89, 22, 
-    142, 7, 4, 1, 104, 2, 216, 89, 22, 142, 7, 6, 1, 104, 2, 231, 233, 22, 
-    248, 1, 7, 4, 1, 104, 2, 231, 233, 22, 248, 1, 7, 6, 1, 214, 106, 2, 182, 
-    7, 4, 1, 214, 106, 2, 182, 7, 6, 1, 214, 106, 2, 59, 51, 7, 4, 1, 214, 
-    106, 2, 59, 51, 7, 6, 1, 212, 99, 2, 242, 136, 7, 4, 1, 212, 99, 2, 242, 
-    136, 7, 6, 1, 212, 99, 2, 142, 7, 4, 1, 212, 99, 2, 142, 7, 6, 1, 212, 
-    99, 2, 248, 1, 7, 4, 1, 212, 99, 2, 248, 1, 7, 6, 1, 212, 99, 2, 59, 48, 
+    1, 57, 2, 59, 51, 7, 6, 1, 57, 2, 232, 215, 51, 7, 4, 1, 57, 2, 232, 215, 
+    51, 7, 6, 1, 251, 68, 2, 250, 185, 22, 142, 7, 4, 1, 251, 68, 2, 250, 
+    185, 22, 142, 7, 6, 1, 249, 62, 2, 59, 48, 7, 4, 1, 249, 62, 2, 59, 48, 
+    7, 6, 1, 249, 62, 2, 59, 51, 7, 4, 1, 249, 62, 2, 59, 51, 7, 6, 1, 249, 
+    62, 2, 232, 215, 51, 7, 4, 1, 249, 62, 2, 232, 215, 51, 7, 6, 1, 249, 62, 
+    2, 250, 184, 7, 4, 1, 249, 62, 2, 250, 184, 7, 6, 1, 249, 62, 2, 250, 32, 
+    51, 7, 4, 1, 249, 62, 2, 250, 32, 51, 7, 6, 1, 160, 2, 231, 234, 22, 242, 
+    137, 7, 4, 1, 160, 2, 231, 234, 22, 242, 137, 7, 6, 1, 160, 2, 231, 234, 
+    22, 142, 7, 4, 1, 160, 2, 231, 234, 22, 142, 7, 6, 1, 160, 2, 250, 32, 
+    51, 7, 4, 1, 160, 2, 250, 32, 51, 7, 6, 1, 160, 2, 216, 90, 51, 7, 4, 1, 
+    160, 2, 216, 90, 51, 7, 6, 1, 160, 2, 250, 185, 22, 251, 147, 7, 4, 1, 
+    160, 2, 250, 185, 22, 251, 147, 7, 6, 1, 245, 8, 2, 59, 48, 7, 4, 1, 245, 
+    8, 2, 59, 48, 7, 6, 1, 243, 204, 2, 231, 233, 7, 4, 1, 243, 204, 2, 231, 
+    233, 7, 6, 1, 242, 62, 2, 59, 48, 7, 4, 1, 242, 62, 2, 59, 48, 7, 6, 1, 
+    242, 62, 2, 59, 51, 7, 4, 1, 242, 62, 2, 59, 51, 7, 6, 1, 242, 62, 2, 
+    248, 2, 7, 4, 1, 242, 62, 2, 248, 2, 7, 6, 1, 242, 62, 2, 250, 184, 7, 4, 
+    1, 242, 62, 2, 250, 184, 7, 6, 1, 242, 62, 2, 251, 148, 51, 7, 4, 1, 242, 
+    62, 2, 251, 148, 51, 7, 6, 1, 240, 155, 2, 216, 90, 51, 7, 4, 1, 240, 
+    155, 2, 216, 90, 51, 7, 6, 1, 240, 155, 2, 248, 3, 22, 142, 7, 4, 1, 240, 
+    155, 2, 248, 3, 22, 142, 7, 6, 1, 235, 25, 2, 142, 7, 4, 1, 235, 25, 2, 
+    142, 7, 6, 1, 235, 25, 2, 59, 51, 7, 4, 1, 235, 25, 2, 59, 51, 7, 6, 1, 
+    235, 25, 2, 232, 215, 51, 7, 4, 1, 235, 25, 2, 232, 215, 51, 7, 6, 1, 
+    233, 150, 2, 59, 51, 7, 4, 1, 233, 150, 2, 59, 51, 7, 6, 1, 233, 150, 2, 
+    59, 252, 44, 22, 231, 233, 7, 4, 1, 233, 150, 2, 59, 252, 44, 22, 231, 
+    233, 7, 6, 1, 233, 150, 2, 232, 215, 51, 7, 4, 1, 233, 150, 2, 232, 215, 
+    51, 7, 6, 1, 233, 150, 2, 250, 32, 51, 7, 4, 1, 233, 150, 2, 250, 32, 51, 
+    7, 6, 1, 232, 51, 2, 142, 7, 4, 1, 232, 51, 2, 142, 7, 6, 1, 232, 51, 2, 
+    59, 48, 7, 4, 1, 232, 51, 2, 59, 48, 7, 6, 1, 232, 51, 2, 59, 51, 7, 4, 
+    1, 232, 51, 2, 59, 51, 7, 6, 1, 230, 27, 2, 59, 48, 7, 4, 1, 230, 27, 2, 
+    59, 48, 7, 6, 1, 230, 27, 2, 59, 51, 7, 4, 1, 230, 27, 2, 59, 51, 7, 6, 
+    1, 230, 27, 2, 232, 215, 51, 7, 4, 1, 230, 27, 2, 232, 215, 51, 7, 6, 1, 
+    230, 27, 2, 250, 32, 51, 7, 4, 1, 230, 27, 2, 250, 32, 51, 7, 6, 1, 144, 
+    2, 216, 90, 22, 142, 7, 4, 1, 144, 2, 216, 90, 22, 142, 7, 6, 1, 144, 2, 
+    216, 90, 22, 248, 2, 7, 4, 1, 144, 2, 216, 90, 22, 248, 2, 7, 6, 1, 144, 
+    2, 231, 234, 22, 242, 137, 7, 4, 1, 144, 2, 231, 234, 22, 242, 137, 7, 6, 
+    1, 144, 2, 231, 234, 22, 142, 7, 4, 1, 144, 2, 231, 234, 22, 142, 7, 6, 
+    1, 226, 107, 2, 142, 7, 4, 1, 226, 107, 2, 142, 7, 6, 1, 226, 107, 2, 59, 
+    48, 7, 4, 1, 226, 107, 2, 59, 48, 7, 6, 1, 223, 225, 2, 59, 48, 7, 4, 1, 
+    223, 225, 2, 59, 48, 7, 6, 1, 223, 225, 2, 59, 51, 7, 4, 1, 223, 225, 2, 
+    59, 51, 7, 6, 1, 223, 225, 2, 59, 252, 44, 22, 231, 233, 7, 4, 1, 223, 
+    225, 2, 59, 252, 44, 22, 231, 233, 7, 6, 1, 223, 225, 2, 232, 215, 51, 7, 
+    4, 1, 223, 225, 2, 232, 215, 51, 7, 6, 1, 222, 93, 2, 59, 48, 7, 4, 1, 
+    222, 93, 2, 59, 48, 7, 6, 1, 222, 93, 2, 59, 51, 7, 4, 1, 222, 93, 2, 59, 
+    51, 7, 6, 1, 222, 93, 2, 255, 4, 22, 59, 48, 7, 4, 1, 222, 93, 2, 255, 4, 
+    22, 59, 48, 7, 6, 1, 222, 93, 2, 250, 236, 22, 59, 48, 7, 4, 1, 222, 93, 
+    2, 250, 236, 22, 59, 48, 7, 6, 1, 222, 93, 2, 59, 252, 44, 22, 59, 48, 7, 
+    4, 1, 222, 93, 2, 59, 252, 44, 22, 59, 48, 7, 6, 1, 217, 154, 2, 59, 48, 
+    7, 4, 1, 217, 154, 2, 59, 48, 7, 6, 1, 217, 154, 2, 59, 51, 7, 4, 1, 217, 
+    154, 2, 59, 51, 7, 6, 1, 217, 154, 2, 232, 215, 51, 7, 4, 1, 217, 154, 2, 
+    232, 215, 51, 7, 6, 1, 217, 154, 2, 250, 32, 51, 7, 4, 1, 217, 154, 2, 
+    250, 32, 51, 7, 6, 1, 104, 2, 248, 3, 51, 7, 4, 1, 104, 2, 248, 3, 51, 7, 
+    6, 1, 104, 2, 216, 90, 51, 7, 4, 1, 104, 2, 216, 90, 51, 7, 6, 1, 104, 2, 
+    250, 32, 51, 7, 4, 1, 104, 2, 250, 32, 51, 7, 6, 1, 104, 2, 216, 90, 22, 
+    142, 7, 4, 1, 104, 2, 216, 90, 22, 142, 7, 6, 1, 104, 2, 231, 234, 22, 
+    248, 2, 7, 4, 1, 104, 2, 231, 234, 22, 248, 2, 7, 6, 1, 214, 106, 2, 183, 
+    7, 4, 1, 214, 106, 2, 183, 7, 6, 1, 214, 106, 2, 59, 51, 7, 4, 1, 214, 
+    106, 2, 59, 51, 7, 6, 1, 212, 99, 2, 242, 137, 7, 4, 1, 212, 99, 2, 242, 
+    137, 7, 6, 1, 212, 99, 2, 142, 7, 4, 1, 212, 99, 2, 142, 7, 6, 1, 212, 
+    99, 2, 248, 2, 7, 4, 1, 212, 99, 2, 248, 2, 7, 6, 1, 212, 99, 2, 59, 48, 
     7, 4, 1, 212, 99, 2, 59, 48, 7, 6, 1, 212, 99, 2, 59, 51, 7, 4, 1, 212, 
     99, 2, 59, 51, 7, 6, 1, 211, 179, 2, 59, 48, 7, 4, 1, 211, 179, 2, 59, 
-    48, 7, 6, 1, 211, 179, 2, 248, 1, 7, 4, 1, 211, 179, 2, 248, 1, 7, 6, 1, 
+    48, 7, 6, 1, 211, 179, 2, 248, 2, 7, 4, 1, 211, 179, 2, 248, 2, 7, 6, 1, 
     211, 118, 2, 59, 48, 7, 4, 1, 211, 118, 2, 59, 48, 7, 6, 1, 210, 160, 2, 
-    250, 30, 7, 4, 1, 210, 160, 2, 250, 30, 7, 6, 1, 210, 160, 2, 59, 51, 7, 
-    4, 1, 210, 160, 2, 59, 51, 7, 6, 1, 210, 160, 2, 232, 214, 51, 7, 4, 1, 
-    210, 160, 2, 232, 214, 51, 7, 4, 1, 242, 61, 2, 232, 214, 51, 7, 4, 1, 
-    217, 153, 2, 248, 1, 7, 4, 1, 212, 99, 2, 222, 234, 48, 7, 4, 1, 211, 
-    118, 2, 222, 234, 48, 7, 4, 1, 115, 2, 44, 163, 222, 233, 7, 4, 1, 199, 
-    222, 92, 2, 59, 48, 7, 4, 1, 199, 222, 92, 2, 247, 255, 91, 7, 4, 1, 199, 
-    222, 92, 2, 125, 91, 7, 6, 1, 220, 76, 222, 91, 7, 4, 1, 248, 54, 7, 6, 
-    1, 115, 2, 59, 51, 7, 4, 1, 115, 2, 59, 51, 7, 6, 1, 115, 2, 241, 52, 48, 
-    7, 4, 1, 115, 2, 241, 52, 48, 7, 6, 1, 115, 2, 250, 31, 22, 142, 7, 4, 1, 
-    115, 2, 250, 31, 22, 142, 7, 6, 1, 115, 2, 250, 31, 22, 242, 136, 7, 4, 
-    1, 115, 2, 250, 31, 22, 242, 136, 7, 6, 1, 115, 2, 250, 31, 22, 241, 52, 
-    48, 7, 4, 1, 115, 2, 250, 31, 22, 241, 52, 48, 7, 6, 1, 115, 2, 250, 31, 
-    22, 182, 7, 4, 1, 115, 2, 250, 31, 22, 182, 7, 6, 1, 115, 2, 250, 31, 22, 
-    59, 51, 7, 4, 1, 115, 2, 250, 31, 22, 59, 51, 7, 6, 1, 115, 2, 251, 147, 
-    22, 142, 7, 4, 1, 115, 2, 251, 147, 22, 142, 7, 6, 1, 115, 2, 251, 147, 
-    22, 242, 136, 7, 4, 1, 115, 2, 251, 147, 22, 242, 136, 7, 6, 1, 115, 2, 
-    251, 147, 22, 241, 52, 48, 7, 4, 1, 115, 2, 251, 147, 22, 241, 52, 48, 7, 
-    6, 1, 115, 2, 251, 147, 22, 182, 7, 4, 1, 115, 2, 251, 147, 22, 182, 7, 
-    6, 1, 115, 2, 251, 147, 22, 59, 51, 7, 4, 1, 115, 2, 251, 147, 22, 59, 
+    250, 31, 7, 4, 1, 210, 160, 2, 250, 31, 7, 6, 1, 210, 160, 2, 59, 51, 7, 
+    4, 1, 210, 160, 2, 59, 51, 7, 6, 1, 210, 160, 2, 232, 215, 51, 7, 4, 1, 
+    210, 160, 2, 232, 215, 51, 7, 4, 1, 242, 62, 2, 232, 215, 51, 7, 4, 1, 
+    217, 154, 2, 248, 2, 7, 4, 1, 212, 99, 2, 222, 235, 48, 7, 4, 1, 211, 
+    118, 2, 222, 235, 48, 7, 4, 1, 115, 2, 44, 163, 222, 234, 7, 4, 1, 199, 
+    222, 93, 2, 59, 48, 7, 4, 1, 199, 222, 93, 2, 248, 0, 91, 7, 4, 1, 199, 
+    222, 93, 2, 125, 91, 7, 6, 1, 220, 77, 222, 92, 7, 4, 1, 248, 55, 7, 6, 
+    1, 115, 2, 59, 51, 7, 4, 1, 115, 2, 59, 51, 7, 6, 1, 115, 2, 241, 53, 48, 
+    7, 4, 1, 115, 2, 241, 53, 48, 7, 6, 1, 115, 2, 250, 32, 22, 142, 7, 4, 1, 
+    115, 2, 250, 32, 22, 142, 7, 6, 1, 115, 2, 250, 32, 22, 242, 137, 7, 4, 
+    1, 115, 2, 250, 32, 22, 242, 137, 7, 6, 1, 115, 2, 250, 32, 22, 241, 53, 
+    48, 7, 4, 1, 115, 2, 250, 32, 22, 241, 53, 48, 7, 6, 1, 115, 2, 250, 32, 
+    22, 183, 7, 4, 1, 115, 2, 250, 32, 22, 183, 7, 6, 1, 115, 2, 250, 32, 22, 
+    59, 51, 7, 4, 1, 115, 2, 250, 32, 22, 59, 51, 7, 6, 1, 115, 2, 251, 148, 
+    22, 142, 7, 4, 1, 115, 2, 251, 148, 22, 142, 7, 6, 1, 115, 2, 251, 148, 
+    22, 242, 137, 7, 4, 1, 115, 2, 251, 148, 22, 242, 137, 7, 6, 1, 115, 2, 
+    251, 148, 22, 241, 53, 48, 7, 4, 1, 115, 2, 251, 148, 22, 241, 53, 48, 7, 
+    6, 1, 115, 2, 251, 148, 22, 183, 7, 4, 1, 115, 2, 251, 148, 22, 183, 7, 
+    6, 1, 115, 2, 251, 148, 22, 59, 51, 7, 4, 1, 115, 2, 251, 148, 22, 59, 
     51, 7, 6, 1, 160, 2, 59, 51, 7, 4, 1, 160, 2, 59, 51, 7, 6, 1, 160, 2, 
-    241, 52, 48, 7, 4, 1, 160, 2, 241, 52, 48, 7, 6, 1, 160, 2, 182, 7, 4, 1, 
-    160, 2, 182, 7, 6, 1, 160, 2, 250, 31, 22, 142, 7, 4, 1, 160, 2, 250, 31, 
-    22, 142, 7, 6, 1, 160, 2, 250, 31, 22, 242, 136, 7, 4, 1, 160, 2, 250, 
-    31, 22, 242, 136, 7, 6, 1, 160, 2, 250, 31, 22, 241, 52, 48, 7, 4, 1, 
-    160, 2, 250, 31, 22, 241, 52, 48, 7, 6, 1, 160, 2, 250, 31, 22, 182, 7, 
-    4, 1, 160, 2, 250, 31, 22, 182, 7, 6, 1, 160, 2, 250, 31, 22, 59, 51, 7, 
-    4, 1, 160, 2, 250, 31, 22, 59, 51, 7, 6, 1, 240, 154, 2, 241, 52, 48, 7, 
-    4, 1, 240, 154, 2, 241, 52, 48, 7, 6, 1, 240, 154, 2, 59, 51, 7, 4, 1, 
-    240, 154, 2, 59, 51, 7, 6, 1, 144, 2, 59, 51, 7, 4, 1, 144, 2, 59, 51, 7, 
-    6, 1, 144, 2, 241, 52, 48, 7, 4, 1, 144, 2, 241, 52, 48, 7, 6, 1, 144, 2, 
-    250, 31, 22, 142, 7, 4, 1, 144, 2, 250, 31, 22, 142, 7, 6, 1, 144, 2, 
-    250, 31, 22, 242, 136, 7, 4, 1, 144, 2, 250, 31, 22, 242, 136, 7, 6, 1, 
-    144, 2, 250, 31, 22, 241, 52, 48, 7, 4, 1, 144, 2, 250, 31, 22, 241, 52, 
-    48, 7, 6, 1, 144, 2, 250, 31, 22, 182, 7, 4, 1, 144, 2, 250, 31, 22, 182, 
-    7, 6, 1, 144, 2, 250, 31, 22, 59, 51, 7, 4, 1, 144, 2, 250, 31, 22, 59, 
-    51, 7, 6, 1, 144, 2, 240, 249, 22, 142, 7, 4, 1, 144, 2, 240, 249, 22, 
-    142, 7, 6, 1, 144, 2, 240, 249, 22, 242, 136, 7, 4, 1, 144, 2, 240, 249, 
-    22, 242, 136, 7, 6, 1, 144, 2, 240, 249, 22, 241, 52, 48, 7, 4, 1, 144, 
-    2, 240, 249, 22, 241, 52, 48, 7, 6, 1, 144, 2, 240, 249, 22, 182, 7, 4, 
-    1, 144, 2, 240, 249, 22, 182, 7, 6, 1, 144, 2, 240, 249, 22, 59, 51, 7, 
-    4, 1, 144, 2, 240, 249, 22, 59, 51, 7, 6, 1, 104, 2, 59, 51, 7, 4, 1, 
-    104, 2, 59, 51, 7, 6, 1, 104, 2, 241, 52, 48, 7, 4, 1, 104, 2, 241, 52, 
-    48, 7, 6, 1, 104, 2, 240, 249, 22, 142, 7, 4, 1, 104, 2, 240, 249, 22, 
-    142, 7, 6, 1, 104, 2, 240, 249, 22, 242, 136, 7, 4, 1, 104, 2, 240, 249, 
-    22, 242, 136, 7, 6, 1, 104, 2, 240, 249, 22, 241, 52, 48, 7, 4, 1, 104, 
-    2, 240, 249, 22, 241, 52, 48, 7, 6, 1, 104, 2, 240, 249, 22, 182, 7, 4, 
-    1, 104, 2, 240, 249, 22, 182, 7, 6, 1, 104, 2, 240, 249, 22, 59, 51, 7, 
-    4, 1, 104, 2, 240, 249, 22, 59, 51, 7, 6, 1, 211, 118, 2, 242, 136, 7, 4, 
-    1, 211, 118, 2, 242, 136, 7, 6, 1, 211, 118, 2, 59, 51, 7, 4, 1, 211, 
-    118, 2, 59, 51, 7, 6, 1, 211, 118, 2, 241, 52, 48, 7, 4, 1, 211, 118, 2, 
-    241, 52, 48, 7, 6, 1, 211, 118, 2, 182, 7, 4, 1, 211, 118, 2, 182, 7, 6, 
-    1, 230, 223, 232, 185, 7, 4, 1, 230, 223, 232, 185, 7, 6, 1, 230, 223, 
-    214, 105, 7, 4, 1, 230, 223, 214, 105, 7, 6, 1, 211, 118, 2, 232, 123, 7, 
-    4, 1, 211, 118, 2, 232, 123, 26, 4, 1, 254, 144, 2, 224, 154, 26, 4, 1, 
-    254, 144, 2, 248, 153, 26, 4, 1, 254, 144, 2, 224, 155, 22, 214, 13, 26, 
-    4, 1, 254, 144, 2, 248, 154, 22, 214, 13, 26, 4, 1, 254, 144, 2, 224, 
-    155, 22, 226, 110, 26, 4, 1, 254, 144, 2, 248, 154, 22, 226, 110, 26, 4, 
-    1, 254, 144, 2, 224, 155, 22, 225, 175, 26, 4, 1, 254, 144, 2, 248, 154, 
-    22, 225, 175, 26, 6, 1, 254, 144, 2, 224, 154, 26, 6, 1, 254, 144, 2, 
-    248, 153, 26, 6, 1, 254, 144, 2, 224, 155, 22, 214, 13, 26, 6, 1, 254, 
-    144, 2, 248, 154, 22, 214, 13, 26, 6, 1, 254, 144, 2, 224, 155, 22, 226, 
-    110, 26, 6, 1, 254, 144, 2, 248, 154, 22, 226, 110, 26, 6, 1, 254, 144, 
-    2, 224, 155, 22, 225, 175, 26, 6, 1, 254, 144, 2, 248, 154, 22, 225, 175, 
-    26, 4, 1, 245, 101, 2, 224, 154, 26, 4, 1, 245, 101, 2, 248, 153, 26, 4, 
-    1, 245, 101, 2, 224, 155, 22, 214, 13, 26, 4, 1, 245, 101, 2, 248, 154, 
-    22, 214, 13, 26, 4, 1, 245, 101, 2, 224, 155, 22, 226, 110, 26, 4, 1, 
-    245, 101, 2, 248, 154, 22, 226, 110, 26, 6, 1, 245, 101, 2, 224, 154, 26, 
-    6, 1, 245, 101, 2, 248, 153, 26, 6, 1, 245, 101, 2, 224, 155, 22, 214, 
-    13, 26, 6, 1, 245, 101, 2, 248, 154, 22, 214, 13, 26, 6, 1, 245, 101, 2, 
-    224, 155, 22, 226, 110, 26, 6, 1, 245, 101, 2, 248, 154, 22, 226, 110, 
-    26, 4, 1, 245, 64, 2, 224, 154, 26, 4, 1, 245, 64, 2, 248, 153, 26, 4, 1, 
-    245, 64, 2, 224, 155, 22, 214, 13, 26, 4, 1, 245, 64, 2, 248, 154, 22, 
-    214, 13, 26, 4, 1, 245, 64, 2, 224, 155, 22, 226, 110, 26, 4, 1, 245, 64, 
-    2, 248, 154, 22, 226, 110, 26, 4, 1, 245, 64, 2, 224, 155, 22, 225, 175, 
-    26, 4, 1, 245, 64, 2, 248, 154, 22, 225, 175, 26, 6, 1, 245, 64, 2, 224, 
-    154, 26, 6, 1, 245, 64, 2, 248, 153, 26, 6, 1, 245, 64, 2, 224, 155, 22, 
-    214, 13, 26, 6, 1, 245, 64, 2, 248, 154, 22, 214, 13, 26, 6, 1, 245, 64, 
-    2, 224, 155, 22, 226, 110, 26, 6, 1, 245, 64, 2, 248, 154, 22, 226, 110, 
-    26, 6, 1, 245, 64, 2, 224, 155, 22, 225, 175, 26, 6, 1, 245, 64, 2, 248, 
-    154, 22, 225, 175, 26, 4, 1, 235, 186, 2, 224, 154, 26, 4, 1, 235, 186, 
-    2, 248, 153, 26, 4, 1, 235, 186, 2, 224, 155, 22, 214, 13, 26, 4, 1, 235, 
-    186, 2, 248, 154, 22, 214, 13, 26, 4, 1, 235, 186, 2, 224, 155, 22, 226, 
-    110, 26, 4, 1, 235, 186, 2, 248, 154, 22, 226, 110, 26, 4, 1, 235, 186, 
-    2, 224, 155, 22, 225, 175, 26, 4, 1, 235, 186, 2, 248, 154, 22, 225, 175, 
-    26, 6, 1, 235, 186, 2, 224, 154, 26, 6, 1, 235, 186, 2, 248, 153, 26, 6, 
-    1, 235, 186, 2, 224, 155, 22, 214, 13, 26, 6, 1, 235, 186, 2, 248, 154, 
-    22, 214, 13, 26, 6, 1, 235, 186, 2, 224, 155, 22, 226, 110, 26, 6, 1, 
-    235, 186, 2, 248, 154, 22, 226, 110, 26, 6, 1, 235, 186, 2, 224, 155, 22, 
-    225, 175, 26, 6, 1, 235, 186, 2, 248, 154, 22, 225, 175, 26, 4, 1, 226, 
-    200, 2, 224, 154, 26, 4, 1, 226, 200, 2, 248, 153, 26, 4, 1, 226, 200, 2, 
-    224, 155, 22, 214, 13, 26, 4, 1, 226, 200, 2, 248, 154, 22, 214, 13, 26, 
-    4, 1, 226, 200, 2, 224, 155, 22, 226, 110, 26, 4, 1, 226, 200, 2, 248, 
-    154, 22, 226, 110, 26, 6, 1, 226, 200, 2, 224, 154, 26, 6, 1, 226, 200, 
-    2, 248, 153, 26, 6, 1, 226, 200, 2, 224, 155, 22, 214, 13, 26, 6, 1, 226, 
-    200, 2, 248, 154, 22, 214, 13, 26, 6, 1, 226, 200, 2, 224, 155, 22, 226, 
-    110, 26, 6, 1, 226, 200, 2, 248, 154, 22, 226, 110, 26, 4, 1, 214, 158, 
-    2, 224, 154, 26, 4, 1, 214, 158, 2, 248, 153, 26, 4, 1, 214, 158, 2, 224, 
-    155, 22, 214, 13, 26, 4, 1, 214, 158, 2, 248, 154, 22, 214, 13, 26, 4, 1, 
-    214, 158, 2, 224, 155, 22, 226, 110, 26, 4, 1, 214, 158, 2, 248, 154, 22, 
-    226, 110, 26, 4, 1, 214, 158, 2, 224, 155, 22, 225, 175, 26, 4, 1, 214, 
-    158, 2, 248, 154, 22, 225, 175, 26, 6, 1, 214, 158, 2, 248, 153, 26, 6, 
-    1, 214, 158, 2, 248, 154, 22, 214, 13, 26, 6, 1, 214, 158, 2, 248, 154, 
-    22, 226, 110, 26, 6, 1, 214, 158, 2, 248, 154, 22, 225, 175, 26, 4, 1, 
-    226, 202, 2, 224, 154, 26, 4, 1, 226, 202, 2, 248, 153, 26, 4, 1, 226, 
-    202, 2, 224, 155, 22, 214, 13, 26, 4, 1, 226, 202, 2, 248, 154, 22, 214, 
-    13, 26, 4, 1, 226, 202, 2, 224, 155, 22, 226, 110, 26, 4, 1, 226, 202, 2, 
-    248, 154, 22, 226, 110, 26, 4, 1, 226, 202, 2, 224, 155, 22, 225, 175, 
-    26, 4, 1, 226, 202, 2, 248, 154, 22, 225, 175, 26, 6, 1, 226, 202, 2, 
-    224, 154, 26, 6, 1, 226, 202, 2, 248, 153, 26, 6, 1, 226, 202, 2, 224, 
-    155, 22, 214, 13, 26, 6, 1, 226, 202, 2, 248, 154, 22, 214, 13, 26, 6, 1, 
-    226, 202, 2, 224, 155, 22, 226, 110, 26, 6, 1, 226, 202, 2, 248, 154, 22, 
-    226, 110, 26, 6, 1, 226, 202, 2, 224, 155, 22, 225, 175, 26, 6, 1, 226, 
-    202, 2, 248, 154, 22, 225, 175, 26, 4, 1, 254, 144, 2, 214, 13, 26, 4, 1, 
-    254, 144, 2, 226, 110, 26, 4, 1, 245, 101, 2, 214, 13, 26, 4, 1, 245, 
-    101, 2, 226, 110, 26, 4, 1, 245, 64, 2, 214, 13, 26, 4, 1, 245, 64, 2, 
-    226, 110, 26, 4, 1, 235, 186, 2, 214, 13, 26, 4, 1, 235, 186, 2, 226, 
-    110, 26, 4, 1, 226, 200, 2, 214, 13, 26, 4, 1, 226, 200, 2, 226, 110, 26, 
-    4, 1, 214, 158, 2, 214, 13, 26, 4, 1, 214, 158, 2, 226, 110, 26, 4, 1, 
-    226, 202, 2, 214, 13, 26, 4, 1, 226, 202, 2, 226, 110, 26, 4, 1, 254, 
-    144, 2, 224, 155, 22, 210, 219, 26, 4, 1, 254, 144, 2, 248, 154, 22, 210, 
-    219, 26, 4, 1, 254, 144, 2, 224, 155, 22, 214, 14, 22, 210, 219, 26, 4, 
-    1, 254, 144, 2, 248, 154, 22, 214, 14, 22, 210, 219, 26, 4, 1, 254, 144, 
-    2, 224, 155, 22, 226, 111, 22, 210, 219, 26, 4, 1, 254, 144, 2, 248, 154, 
-    22, 226, 111, 22, 210, 219, 26, 4, 1, 254, 144, 2, 224, 155, 22, 225, 
-    176, 22, 210, 219, 26, 4, 1, 254, 144, 2, 248, 154, 22, 225, 176, 22, 
-    210, 219, 26, 6, 1, 254, 144, 2, 224, 155, 22, 224, 167, 26, 6, 1, 254, 
-    144, 2, 248, 154, 22, 224, 167, 26, 6, 1, 254, 144, 2, 224, 155, 22, 214, 
-    14, 22, 224, 167, 26, 6, 1, 254, 144, 2, 248, 154, 22, 214, 14, 22, 224, 
-    167, 26, 6, 1, 254, 144, 2, 224, 155, 22, 226, 111, 22, 224, 167, 26, 6, 
-    1, 254, 144, 2, 248, 154, 22, 226, 111, 22, 224, 167, 26, 6, 1, 254, 144, 
-    2, 224, 155, 22, 225, 176, 22, 224, 167, 26, 6, 1, 254, 144, 2, 248, 154, 
-    22, 225, 176, 22, 224, 167, 26, 4, 1, 245, 64, 2, 224, 155, 22, 210, 219, 
-    26, 4, 1, 245, 64, 2, 248, 154, 22, 210, 219, 26, 4, 1, 245, 64, 2, 224, 
-    155, 22, 214, 14, 22, 210, 219, 26, 4, 1, 245, 64, 2, 248, 154, 22, 214, 
-    14, 22, 210, 219, 26, 4, 1, 245, 64, 2, 224, 155, 22, 226, 111, 22, 210, 
-    219, 26, 4, 1, 245, 64, 2, 248, 154, 22, 226, 111, 22, 210, 219, 26, 4, 
-    1, 245, 64, 2, 224, 155, 22, 225, 176, 22, 210, 219, 26, 4, 1, 245, 64, 
-    2, 248, 154, 22, 225, 176, 22, 210, 219, 26, 6, 1, 245, 64, 2, 224, 155, 
-    22, 224, 167, 26, 6, 1, 245, 64, 2, 248, 154, 22, 224, 167, 26, 6, 1, 
-    245, 64, 2, 224, 155, 22, 214, 14, 22, 224, 167, 26, 6, 1, 245, 64, 2, 
-    248, 154, 22, 214, 14, 22, 224, 167, 26, 6, 1, 245, 64, 2, 224, 155, 22, 
-    226, 111, 22, 224, 167, 26, 6, 1, 245, 64, 2, 248, 154, 22, 226, 111, 22, 
-    224, 167, 26, 6, 1, 245, 64, 2, 224, 155, 22, 225, 176, 22, 224, 167, 26, 
-    6, 1, 245, 64, 2, 248, 154, 22, 225, 176, 22, 224, 167, 26, 4, 1, 226, 
-    202, 2, 224, 155, 22, 210, 219, 26, 4, 1, 226, 202, 2, 248, 154, 22, 210, 
-    219, 26, 4, 1, 226, 202, 2, 224, 155, 22, 214, 14, 22, 210, 219, 26, 4, 
-    1, 226, 202, 2, 248, 154, 22, 214, 14, 22, 210, 219, 26, 4, 1, 226, 202, 
-    2, 224, 155, 22, 226, 111, 22, 210, 219, 26, 4, 1, 226, 202, 2, 248, 154, 
-    22, 226, 111, 22, 210, 219, 26, 4, 1, 226, 202, 2, 224, 155, 22, 225, 
-    176, 22, 210, 219, 26, 4, 1, 226, 202, 2, 248, 154, 22, 225, 176, 22, 
-    210, 219, 26, 6, 1, 226, 202, 2, 224, 155, 22, 224, 167, 26, 6, 1, 226, 
-    202, 2, 248, 154, 22, 224, 167, 26, 6, 1, 226, 202, 2, 224, 155, 22, 214, 
-    14, 22, 224, 167, 26, 6, 1, 226, 202, 2, 248, 154, 22, 214, 14, 22, 224, 
-    167, 26, 6, 1, 226, 202, 2, 224, 155, 22, 226, 111, 22, 224, 167, 26, 6, 
-    1, 226, 202, 2, 248, 154, 22, 226, 111, 22, 224, 167, 26, 6, 1, 226, 202, 
-    2, 224, 155, 22, 225, 176, 22, 224, 167, 26, 6, 1, 226, 202, 2, 248, 154, 
-    22, 225, 176, 22, 224, 167, 26, 4, 1, 254, 144, 2, 213, 120, 26, 4, 1, 
-    254, 144, 2, 231, 232, 26, 4, 1, 254, 144, 2, 214, 14, 22, 210, 219, 26, 
-    4, 1, 254, 144, 2, 210, 219, 26, 4, 1, 254, 144, 2, 226, 111, 22, 210, 
-    219, 26, 4, 1, 254, 144, 2, 225, 175, 26, 4, 1, 254, 144, 2, 225, 176, 
-    22, 210, 219, 26, 6, 1, 254, 144, 2, 213, 120, 26, 6, 1, 254, 144, 2, 
-    231, 232, 26, 6, 1, 254, 144, 2, 214, 13, 26, 6, 1, 254, 144, 2, 226, 
-    110, 26, 6, 1, 254, 144, 2, 224, 167, 26, 234, 2, 26, 224, 167, 26, 224, 
-    154, 26, 225, 175, 26, 247, 252, 22, 225, 175, 26, 4, 1, 245, 64, 2, 214, 
-    14, 22, 210, 219, 26, 4, 1, 245, 64, 2, 210, 219, 26, 4, 1, 245, 64, 2, 
-    226, 111, 22, 210, 219, 26, 4, 1, 245, 64, 2, 225, 175, 26, 4, 1, 245, 
-    64, 2, 225, 176, 22, 210, 219, 26, 6, 1, 245, 101, 2, 214, 13, 26, 6, 1, 
-    245, 101, 2, 226, 110, 26, 6, 1, 245, 64, 2, 214, 13, 26, 6, 1, 245, 64, 
-    2, 226, 110, 26, 6, 1, 245, 64, 2, 224, 167, 26, 224, 155, 22, 214, 13, 
-    26, 224, 155, 22, 226, 110, 26, 224, 155, 22, 225, 175, 26, 4, 1, 235, 
-    186, 2, 213, 120, 26, 4, 1, 235, 186, 2, 231, 232, 26, 4, 1, 235, 186, 2, 
-    247, 252, 22, 214, 13, 26, 4, 1, 235, 186, 2, 247, 252, 22, 226, 110, 26, 
-    4, 1, 235, 186, 2, 225, 175, 26, 4, 1, 235, 186, 2, 247, 252, 22, 225, 
-    175, 26, 6, 1, 235, 186, 2, 213, 120, 26, 6, 1, 235, 186, 2, 231, 232, 
-    26, 6, 1, 235, 186, 2, 214, 13, 26, 6, 1, 235, 186, 2, 226, 110, 26, 248, 
-    154, 22, 214, 13, 26, 248, 154, 22, 226, 110, 26, 248, 154, 22, 225, 175, 
-    26, 4, 1, 214, 158, 2, 213, 120, 26, 4, 1, 214, 158, 2, 231, 232, 26, 4, 
-    1, 214, 158, 2, 247, 252, 22, 214, 13, 26, 4, 1, 214, 158, 2, 247, 252, 
-    22, 226, 110, 26, 4, 1, 223, 38, 2, 224, 154, 26, 4, 1, 223, 38, 2, 248, 
-    153, 26, 4, 1, 214, 158, 2, 225, 175, 26, 4, 1, 214, 158, 2, 247, 252, 
-    22, 225, 175, 26, 6, 1, 214, 158, 2, 213, 120, 26, 6, 1, 214, 158, 2, 
-    231, 232, 26, 6, 1, 214, 158, 2, 214, 13, 26, 6, 1, 214, 158, 2, 226, 
-    110, 26, 6, 1, 223, 38, 2, 248, 153, 26, 247, 252, 22, 214, 13, 26, 247, 
-    252, 22, 226, 110, 26, 214, 13, 26, 4, 1, 226, 202, 2, 214, 14, 22, 210, 
-    219, 26, 4, 1, 226, 202, 2, 210, 219, 26, 4, 1, 226, 202, 2, 226, 111, 
-    22, 210, 219, 26, 4, 1, 226, 202, 2, 225, 175, 26, 4, 1, 226, 202, 2, 
-    225, 176, 22, 210, 219, 26, 6, 1, 226, 200, 2, 214, 13, 26, 6, 1, 226, 
-    200, 2, 226, 110, 26, 6, 1, 226, 202, 2, 214, 13, 26, 6, 1, 226, 202, 2, 
-    226, 110, 26, 6, 1, 226, 202, 2, 224, 167, 26, 226, 110, 26, 248, 153, 
-    245, 151, 224, 27, 245, 160, 224, 27, 245, 151, 219, 18, 245, 160, 219, 
-    18, 216, 141, 219, 18, 244, 9, 219, 18, 219, 123, 219, 18, 244, 112, 219, 
-    18, 224, 141, 219, 18, 216, 170, 219, 18, 242, 35, 219, 18, 210, 87, 211, 
-    245, 219, 18, 210, 87, 211, 245, 228, 67, 210, 87, 211, 245, 235, 63, 
-    233, 38, 78, 222, 243, 78, 240, 168, 228, 68, 240, 168, 244, 112, 248, 
-    156, 245, 151, 248, 156, 245, 160, 248, 156, 203, 130, 52, 67, 232, 213, 
-    52, 121, 232, 213, 43, 219, 155, 223, 254, 78, 44, 219, 155, 223, 254, 
-    78, 219, 155, 232, 109, 223, 254, 78, 219, 155, 241, 163, 223, 254, 78, 
-    43, 52, 223, 254, 78, 44, 52, 223, 254, 78, 52, 232, 109, 223, 254, 78, 
-    52, 241, 163, 223, 254, 78, 248, 205, 52, 248, 205, 251, 113, 215, 222, 
-    251, 113, 123, 59, 233, 56, 113, 59, 233, 56, 203, 245, 163, 240, 166, 
-    225, 10, 232, 214, 220, 137, 226, 15, 220, 137, 233, 38, 245, 158, 222, 
-    243, 245, 158, 224, 246, 247, 196, 244, 19, 233, 38, 226, 117, 222, 243, 
-    226, 117, 229, 194, 228, 73, 219, 18, 225, 183, 230, 193, 50, 225, 183, 
-    216, 248, 216, 148, 50, 224, 190, 52, 224, 190, 215, 211, 224, 190, 223, 
-    49, 224, 190, 223, 49, 52, 224, 190, 223, 49, 215, 211, 224, 190, 250, 
-    238, 219, 155, 233, 42, 254, 110, 223, 254, 78, 219, 155, 222, 247, 254, 
-    110, 223, 254, 78, 223, 107, 78, 52, 245, 31, 78, 235, 201, 226, 119, 
-    214, 180, 135, 216, 111, 250, 239, 235, 216, 225, 10, 253, 214, 240, 169, 
-    251, 113, 244, 2, 219, 95, 43, 42, 251, 158, 2, 224, 7, 44, 42, 251, 158, 
-    2, 224, 7, 52, 224, 13, 78, 224, 13, 245, 31, 78, 245, 31, 224, 13, 78, 
-    216, 70, 5, 245, 65, 223, 49, 225, 68, 50, 85, 140, 251, 113, 85, 97, 
-    251, 113, 121, 253, 216, 223, 49, 220, 150, 250, 1, 214, 163, 113, 253, 
-    215, 254, 158, 213, 188, 249, 217, 230, 182, 50, 217, 234, 248, 156, 235, 
-    193, 214, 180, 244, 52, 224, 141, 78, 134, 59, 224, 140, 224, 24, 224, 
-    190, 244, 11, 59, 224, 140, 244, 81, 59, 224, 140, 113, 59, 224, 140, 
-    244, 11, 59, 78, 246, 118, 249, 130, 215, 221, 67, 244, 11, 247, 118, 
-    231, 82, 11, 219, 18, 211, 209, 235, 63, 243, 227, 254, 52, 235, 191, 
-    216, 85, 235, 191, 220, 137, 235, 191, 225, 22, 235, 228, 217, 182, 217, 
-    251, 255, 5, 217, 182, 217, 251, 235, 228, 10, 244, 20, 220, 80, 255, 5, 
-    10, 244, 20, 220, 80, 229, 189, 21, 220, 81, 228, 69, 21, 220, 81, 218, 
-    23, 210, 86, 218, 23, 7, 4, 1, 73, 218, 23, 161, 218, 23, 189, 218, 23, 
-    194, 218, 23, 198, 218, 23, 195, 218, 23, 200, 218, 23, 96, 50, 218, 23, 
-    230, 181, 218, 23, 245, 98, 50, 218, 23, 43, 226, 3, 218, 23, 44, 226, 3, 
-    218, 23, 7, 4, 1, 230, 25, 218, 65, 210, 86, 218, 65, 110, 218, 65, 105, 
-    218, 65, 158, 218, 65, 161, 218, 65, 189, 218, 65, 194, 218, 65, 198, 
-    218, 65, 195, 218, 65, 200, 218, 65, 96, 50, 218, 65, 230, 181, 218, 65, 
-    245, 98, 50, 218, 65, 43, 226, 3, 218, 65, 44, 226, 3, 7, 218, 65, 4, 1, 
-    61, 7, 218, 65, 4, 1, 75, 7, 218, 65, 4, 1, 76, 7, 218, 65, 4, 1, 211, 
-    178, 7, 218, 65, 4, 1, 221, 195, 7, 218, 65, 4, 1, 242, 60, 7, 218, 65, 
-    4, 1, 235, 23, 7, 218, 65, 4, 1, 156, 7, 218, 65, 4, 1, 193, 7, 218, 65, 
-    4, 1, 230, 25, 7, 218, 65, 4, 1, 226, 105, 7, 218, 65, 4, 1, 222, 91, 7, 
-    218, 65, 4, 1, 217, 152, 245, 46, 50, 249, 227, 50, 249, 117, 50, 243, 
-    251, 243, 254, 50, 232, 198, 50, 230, 194, 50, 229, 210, 50, 225, 162, 
-    50, 222, 118, 50, 211, 217, 50, 166, 220, 49, 50, 247, 127, 50, 245, 47, 
-    50, 234, 76, 50, 215, 112, 50, 246, 101, 50, 243, 40, 225, 193, 50, 225, 
-    160, 50, 242, 109, 50, 253, 182, 50, 240, 228, 50, 250, 185, 50, 232, 
-    191, 216, 3, 50, 219, 0, 50, 216, 245, 50, 235, 241, 222, 118, 50, 38, 
-    43, 241, 255, 48, 38, 44, 241, 255, 48, 38, 199, 67, 232, 214, 226, 120, 
-    38, 219, 251, 67, 232, 214, 226, 120, 38, 254, 88, 80, 48, 38, 250, 2, 
-    80, 48, 38, 43, 80, 48, 38, 44, 80, 48, 38, 222, 234, 226, 120, 38, 250, 
-    2, 222, 234, 226, 120, 38, 254, 88, 222, 234, 226, 120, 38, 134, 170, 48, 
-    38, 244, 11, 170, 48, 38, 245, 146, 250, 35, 38, 245, 146, 218, 234, 38, 
-    245, 146, 247, 248, 38, 245, 146, 250, 36, 252, 180, 38, 43, 44, 80, 48, 
-    38, 245, 146, 221, 188, 38, 245, 146, 234, 135, 38, 245, 146, 214, 155, 
-    225, 7, 215, 225, 38, 223, 50, 219, 47, 226, 120, 38, 52, 67, 218, 103, 
-    226, 120, 38, 254, 98, 87, 38, 215, 211, 214, 182, 38, 211, 247, 251, 
-    140, 48, 38, 140, 80, 226, 120, 38, 199, 52, 219, 47, 226, 120, 38, 97, 
-    241, 255, 2, 252, 139, 246, 103, 38, 140, 241, 255, 2, 252, 139, 246, 
-    103, 38, 43, 80, 51, 38, 44, 80, 51, 38, 253, 217, 48, 255, 11, 226, 231, 
-    254, 251, 216, 42, 216, 196, 218, 74, 139, 6, 251, 66, 248, 71, 250, 178, 
-    250, 175, 232, 214, 87, 250, 240, 226, 231, 251, 26, 214, 189, 245, 48, 
-    249, 191, 221, 185, 248, 71, 244, 179, 119, 4, 243, 202, 119, 6, 242, 60, 
-    251, 219, 6, 242, 60, 139, 6, 242, 60, 225, 37, 249, 191, 225, 37, 249, 
-    192, 117, 113, 225, 108, 119, 6, 73, 251, 219, 6, 73, 119, 6, 156, 119, 
-    4, 156, 233, 149, 57, 252, 141, 87, 139, 6, 230, 25, 227, 196, 50, 219, 
-    31, 223, 119, 249, 162, 119, 6, 226, 105, 139, 6, 226, 105, 139, 6, 224, 
-    96, 119, 6, 153, 251, 219, 6, 153, 139, 6, 153, 224, 196, 217, 71, 223, 
-    62, 220, 132, 78, 217, 1, 50, 215, 253, 164, 50, 213, 240, 139, 6, 210, 
-    159, 226, 133, 50, 226, 221, 50, 235, 193, 226, 221, 50, 251, 219, 6, 
-    210, 159, 215, 94, 26, 4, 1, 235, 185, 234, 173, 50, 254, 107, 50, 119, 
-    6, 253, 158, 251, 219, 6, 251, 66, 245, 68, 87, 119, 4, 75, 119, 6, 75, 
-    119, 6, 245, 6, 215, 94, 6, 245, 6, 119, 6, 193, 119, 4, 76, 112, 87, 
-    252, 29, 87, 242, 202, 87, 248, 190, 87, 235, 232, 219, 29, 222, 187, 6, 
-    224, 96, 244, 182, 50, 139, 4, 225, 108, 139, 4, 243, 107, 139, 6, 243, 
-    107, 139, 6, 225, 108, 139, 230, 24, 218, 40, 215, 94, 35, 6, 243, 202, 
-    215, 94, 35, 6, 156, 223, 49, 35, 6, 156, 215, 94, 35, 6, 211, 117, 139, 
-    32, 6, 249, 60, 139, 32, 4, 249, 60, 139, 32, 4, 75, 139, 32, 4, 73, 139, 
-    32, 4, 235, 144, 224, 170, 232, 213, 215, 94, 254, 126, 225, 183, 50, 
-    254, 180, 215, 94, 4, 245, 6, 16, 31, 221, 252, 219, 29, 212, 114, 244, 
-    2, 123, 220, 118, 212, 114, 244, 2, 123, 228, 194, 212, 114, 244, 2, 123, 
-    216, 241, 212, 114, 244, 2, 123, 216, 168, 212, 114, 244, 2, 113, 216, 
-    166, 212, 114, 244, 2, 123, 244, 117, 212, 114, 244, 2, 113, 244, 116, 
-    212, 114, 244, 2, 134, 244, 116, 212, 114, 244, 2, 244, 11, 244, 116, 
-    212, 114, 244, 2, 123, 219, 115, 212, 114, 244, 2, 244, 81, 219, 113, 
-    212, 114, 244, 2, 123, 245, 188, 212, 114, 244, 2, 134, 245, 186, 212, 
-    114, 244, 2, 244, 81, 245, 186, 212, 114, 244, 2, 220, 122, 245, 186, 
-    244, 2, 227, 197, 110, 222, 198, 227, 198, 110, 222, 198, 227, 198, 105, 
-    222, 198, 227, 198, 158, 222, 198, 227, 198, 161, 222, 198, 227, 198, 
-    189, 222, 198, 227, 198, 194, 222, 198, 227, 198, 198, 222, 198, 227, 
-    198, 195, 222, 198, 227, 198, 200, 222, 198, 227, 198, 216, 247, 222, 
-    198, 227, 198, 245, 167, 222, 198, 227, 198, 215, 76, 222, 198, 227, 198, 
-    244, 114, 222, 198, 227, 198, 123, 240, 210, 222, 198, 227, 198, 244, 81, 
-    240, 210, 222, 198, 227, 198, 123, 216, 147, 4, 222, 198, 227, 198, 110, 
-    4, 222, 198, 227, 198, 105, 4, 222, 198, 227, 198, 158, 4, 222, 198, 227, 
-    198, 161, 4, 222, 198, 227, 198, 189, 4, 222, 198, 227, 198, 194, 4, 222, 
-    198, 227, 198, 198, 4, 222, 198, 227, 198, 195, 4, 222, 198, 227, 198, 
-    200, 4, 222, 198, 227, 198, 216, 247, 4, 222, 198, 227, 198, 245, 167, 4, 
-    222, 198, 227, 198, 215, 76, 4, 222, 198, 227, 198, 244, 114, 4, 222, 
-    198, 227, 198, 123, 240, 210, 4, 222, 198, 227, 198, 244, 81, 240, 210, 
-    4, 222, 198, 227, 198, 123, 216, 147, 222, 198, 227, 198, 123, 216, 148, 
-    251, 67, 249, 60, 222, 198, 227, 198, 244, 81, 216, 147, 222, 198, 227, 
-    198, 216, 248, 216, 147, 222, 198, 227, 198, 223, 49, 123, 240, 210, 7, 
-    4, 1, 223, 49, 251, 66, 222, 198, 227, 198, 219, 125, 233, 78, 17, 222, 
-    198, 227, 198, 244, 115, 245, 226, 17, 222, 198, 227, 198, 244, 115, 216, 
-    147, 222, 198, 227, 198, 123, 240, 211, 216, 147, 212, 114, 244, 2, 210, 
-    87, 216, 166, 140, 74, 214, 153, 74, 97, 74, 246, 104, 74, 43, 44, 74, 
-    120, 124, 74, 228, 56, 212, 9, 74, 228, 56, 245, 220, 74, 219, 28, 245, 
-    220, 74, 219, 28, 212, 9, 74, 140, 80, 2, 91, 97, 80, 2, 91, 140, 212, 
-    36, 74, 97, 212, 36, 74, 140, 113, 241, 234, 74, 214, 153, 113, 241, 234, 
-    74, 97, 113, 241, 234, 74, 246, 104, 113, 241, 234, 74, 140, 80, 2, 217, 
-    77, 97, 80, 2, 217, 77, 140, 80, 243, 243, 130, 214, 153, 80, 243, 243, 
-    130, 97, 80, 243, 243, 130, 246, 104, 80, 243, 243, 130, 120, 124, 80, 2, 
-    252, 127, 140, 80, 2, 103, 97, 80, 2, 103, 140, 80, 2, 232, 123, 97, 80, 
-    2, 232, 123, 43, 44, 212, 36, 74, 43, 44, 80, 2, 91, 246, 104, 210, 35, 
-    74, 214, 153, 80, 2, 216, 77, 233, 37, 214, 153, 80, 2, 216, 77, 222, 
-    241, 246, 104, 80, 2, 216, 77, 233, 37, 246, 104, 80, 2, 216, 77, 222, 
-    241, 97, 80, 2, 249, 161, 246, 103, 246, 104, 80, 2, 249, 161, 233, 37, 
-    254, 88, 216, 14, 220, 153, 74, 250, 2, 216, 14, 220, 153, 74, 228, 56, 
-    212, 9, 80, 216, 42, 199, 130, 140, 80, 216, 42, 252, 141, 117, 97, 80, 
-    216, 42, 130, 254, 88, 204, 250, 36, 74, 250, 2, 204, 250, 36, 74, 140, 
-    241, 255, 2, 252, 139, 214, 152, 140, 241, 255, 2, 252, 139, 246, 103, 
-    214, 153, 241, 255, 2, 252, 139, 222, 241, 214, 153, 241, 255, 2, 252, 
-    139, 233, 37, 97, 241, 255, 2, 252, 139, 214, 152, 97, 241, 255, 2, 252, 
-    139, 246, 103, 246, 104, 241, 255, 2, 252, 139, 222, 241, 246, 104, 241, 
-    255, 2, 252, 139, 233, 37, 97, 80, 117, 140, 74, 214, 153, 80, 140, 64, 
-    246, 104, 74, 140, 80, 117, 97, 74, 140, 226, 70, 253, 247, 214, 153, 
-    226, 70, 253, 247, 97, 226, 70, 253, 247, 246, 104, 226, 70, 253, 247, 
-    140, 241, 255, 117, 97, 241, 254, 97, 241, 255, 117, 140, 241, 254, 140, 
-    52, 80, 2, 91, 43, 44, 52, 80, 2, 91, 97, 52, 80, 2, 91, 140, 52, 74, 
-    214, 153, 52, 74, 97, 52, 74, 246, 104, 52, 74, 43, 44, 52, 74, 120, 124, 
-    52, 74, 228, 56, 212, 9, 52, 74, 228, 56, 245, 220, 52, 74, 219, 28, 245, 
-    220, 52, 74, 219, 28, 212, 9, 52, 74, 140, 215, 211, 74, 97, 215, 211, 
-    74, 140, 218, 230, 74, 97, 218, 230, 74, 214, 153, 80, 2, 52, 91, 246, 
-    104, 80, 2, 52, 91, 140, 248, 155, 74, 214, 153, 248, 155, 74, 97, 248, 
-    155, 74, 246, 104, 248, 155, 74, 140, 80, 216, 42, 130, 97, 80, 216, 42, 
-    130, 140, 71, 74, 214, 153, 71, 74, 97, 71, 74, 246, 104, 71, 74, 214, 
-    153, 71, 80, 243, 243, 130, 214, 153, 71, 80, 226, 197, 225, 214, 214, 
-    153, 71, 80, 226, 197, 225, 215, 2, 203, 130, 214, 153, 71, 80, 226, 197, 
-    225, 215, 2, 67, 130, 214, 153, 71, 52, 74, 214, 153, 71, 52, 80, 226, 
-    197, 225, 214, 97, 71, 80, 243, 243, 212, 56, 228, 56, 212, 9, 80, 216, 
-    42, 249, 160, 219, 28, 245, 220, 80, 216, 42, 249, 160, 120, 124, 71, 74, 
-    44, 80, 2, 4, 250, 35, 246, 104, 80, 140, 64, 214, 153, 74, 134, 97, 253, 
-    247, 140, 80, 2, 67, 91, 97, 80, 2, 67, 91, 43, 44, 80, 2, 67, 91, 140, 
-    80, 2, 52, 67, 91, 97, 80, 2, 52, 67, 91, 43, 44, 80, 2, 52, 67, 91, 140, 
-    226, 173, 74, 97, 226, 173, 74, 43, 44, 226, 173, 74, 31, 254, 154, 249, 
-    214, 225, 253, 247, 233, 216, 187, 245, 27, 216, 187, 247, 138, 228, 52, 
-    245, 28, 245, 152, 220, 127, 235, 245, 229, 221, 245, 170, 226, 231, 228, 
-    52, 254, 124, 245, 170, 226, 231, 4, 245, 170, 226, 231, 249, 186, 253, 
-    238, 231, 62, 247, 138, 228, 52, 249, 188, 253, 238, 231, 62, 4, 249, 
-    186, 253, 238, 231, 62, 245, 143, 64, 224, 172, 230, 24, 224, 180, 230, 
-    24, 249, 165, 230, 24, 218, 40, 230, 182, 50, 230, 180, 50, 59, 225, 22, 
-    247, 169, 219, 95, 220, 128, 230, 181, 253, 217, 226, 167, 222, 234, 226, 
-    167, 251, 114, 226, 167, 42, 222, 193, 249, 109, 222, 193, 244, 4, 222, 
-    193, 224, 168, 111, 235, 234, 44, 254, 109, 254, 109, 231, 88, 254, 109, 
-    218, 255, 254, 109, 247, 171, 247, 138, 228, 52, 247, 174, 226, 8, 111, 
-    228, 52, 226, 8, 111, 232, 146, 254, 118, 232, 146, 226, 158, 235, 198, 
-    214, 175, 235, 211, 52, 235, 211, 215, 211, 235, 211, 249, 182, 235, 211, 
-    218, 13, 235, 211, 213, 129, 235, 211, 250, 2, 235, 211, 250, 2, 249, 
-    182, 235, 211, 254, 88, 249, 182, 235, 211, 216, 186, 252, 67, 223, 137, 
-    224, 169, 59, 230, 181, 245, 33, 243, 46, 224, 169, 241, 57, 216, 89, 
-    226, 167, 223, 49, 182, 235, 193, 233, 65, 222, 91, 219, 157, 212, 35, 
-    211, 200, 224, 180, 228, 52, 182, 230, 182, 182, 253, 210, 128, 111, 228, 
-    52, 253, 210, 128, 111, 254, 48, 128, 111, 254, 48, 251, 88, 228, 52, 
-    255, 4, 128, 111, 229, 100, 254, 48, 228, 59, 255, 4, 128, 111, 254, 148, 
-    128, 111, 228, 52, 254, 148, 128, 111, 254, 148, 128, 177, 128, 111, 215, 
-    211, 182, 254, 155, 128, 111, 245, 94, 111, 243, 45, 245, 94, 111, 247, 
-    234, 252, 23, 254, 50, 216, 196, 232, 221, 243, 45, 128, 111, 254, 48, 
-    128, 216, 42, 177, 216, 196, 236, 15, 226, 231, 236, 15, 64, 177, 254, 
-    48, 128, 111, 249, 227, 245, 97, 245, 98, 249, 226, 222, 234, 236, 0, 
-    128, 111, 222, 234, 128, 111, 249, 154, 111, 245, 67, 245, 96, 111, 218, 
-    157, 245, 97, 248, 55, 128, 111, 128, 216, 42, 251, 78, 248, 72, 231, 88, 
-    251, 77, 224, 11, 128, 111, 228, 52, 128, 111, 240, 104, 111, 228, 52, 
-    240, 104, 111, 218, 109, 245, 94, 111, 233, 15, 177, 128, 111, 242, 130, 
-    177, 128, 111, 233, 15, 117, 128, 111, 242, 130, 117, 128, 111, 233, 15, 
-    251, 88, 228, 52, 128, 111, 242, 130, 251, 88, 228, 52, 128, 111, 230, 
-    97, 233, 14, 230, 97, 242, 129, 252, 23, 228, 52, 245, 94, 111, 228, 52, 
-    233, 14, 228, 52, 242, 129, 229, 100, 233, 15, 228, 59, 128, 111, 229, 
-    100, 242, 130, 228, 59, 128, 111, 233, 15, 177, 245, 94, 111, 242, 130, 
-    177, 245, 94, 111, 229, 100, 233, 15, 228, 59, 245, 94, 111, 229, 100, 
-    242, 130, 228, 59, 245, 94, 111, 233, 15, 177, 242, 129, 242, 130, 177, 
-    233, 14, 229, 100, 233, 15, 228, 59, 242, 129, 229, 100, 242, 130, 228, 
-    59, 233, 14, 224, 202, 218, 55, 224, 203, 177, 128, 111, 218, 56, 177, 
-    128, 111, 224, 203, 177, 245, 94, 111, 218, 56, 177, 245, 94, 111, 247, 
-    138, 228, 52, 224, 205, 247, 138, 228, 52, 218, 57, 218, 64, 226, 231, 
-    218, 22, 226, 231, 228, 52, 115, 218, 64, 226, 231, 228, 52, 115, 218, 
-    22, 226, 231, 218, 64, 64, 177, 128, 111, 218, 22, 64, 177, 128, 111, 
-    229, 100, 115, 218, 64, 64, 228, 59, 128, 111, 229, 100, 115, 218, 22, 
-    64, 228, 59, 128, 111, 218, 64, 64, 2, 228, 52, 128, 111, 218, 22, 64, 2, 
-    228, 52, 128, 111, 230, 81, 230, 82, 230, 83, 230, 82, 214, 175, 42, 236, 
-    15, 226, 231, 42, 226, 150, 226, 231, 42, 236, 15, 64, 177, 128, 111, 42, 
-    226, 150, 64, 177, 128, 111, 42, 250, 251, 42, 249, 102, 37, 225, 22, 37, 
-    230, 181, 37, 216, 85, 37, 247, 169, 219, 95, 37, 59, 226, 167, 37, 222, 
-    234, 226, 167, 37, 253, 217, 226, 167, 37, 245, 97, 37, 248, 156, 92, 
-    225, 22, 92, 230, 181, 92, 216, 85, 92, 59, 226, 167, 44, 217, 87, 43, 
-    217, 87, 124, 217, 87, 120, 217, 87, 253, 220, 230, 156, 215, 191, 244, 
-    25, 215, 211, 67, 252, 141, 44, 215, 93, 52, 67, 252, 141, 52, 44, 215, 
-    93, 247, 138, 228, 52, 224, 163, 228, 52, 215, 191, 247, 138, 228, 52, 
-    244, 26, 229, 102, 52, 67, 252, 141, 52, 44, 215, 93, 224, 203, 214, 184, 
-    223, 91, 218, 56, 214, 184, 223, 91, 228, 57, 218, 77, 226, 231, 249, 
-    186, 253, 238, 228, 57, 218, 76, 228, 57, 218, 77, 64, 177, 128, 111, 
-    249, 186, 253, 238, 228, 57, 218, 77, 177, 128, 111, 226, 150, 226, 231, 
-    236, 15, 226, 231, 230, 87, 241, 200, 249, 196, 231, 137, 235, 208, 211, 
-    145, 229, 202, 228, 58, 44, 254, 110, 2, 254, 25, 44, 215, 225, 230, 24, 
-    232, 146, 254, 118, 230, 24, 232, 146, 226, 158, 230, 24, 235, 198, 230, 
-    24, 214, 175, 247, 249, 226, 167, 59, 226, 167, 218, 157, 226, 167, 247, 
-    169, 216, 85, 251, 164, 43, 228, 57, 244, 181, 220, 149, 224, 180, 44, 
-    228, 57, 244, 181, 220, 149, 224, 180, 43, 220, 149, 224, 180, 44, 220, 
-    149, 224, 180, 223, 49, 216, 89, 245, 97, 249, 99, 232, 146, 226, 158, 
-    249, 99, 232, 146, 254, 118, 52, 218, 63, 52, 218, 21, 52, 235, 198, 52, 
-    214, 175, 225, 47, 128, 22, 226, 8, 111, 233, 15, 2, 247, 120, 242, 130, 
-    2, 247, 120, 213, 187, 230, 97, 233, 14, 213, 187, 230, 97, 242, 129, 
-    233, 15, 128, 216, 42, 177, 242, 129, 242, 130, 128, 216, 42, 177, 233, 
-    14, 128, 216, 42, 177, 233, 14, 128, 216, 42, 177, 242, 129, 128, 216, 
-    42, 177, 224, 202, 128, 216, 42, 177, 218, 55, 247, 138, 228, 52, 224, 
-    206, 177, 245, 99, 247, 138, 228, 52, 218, 58, 177, 245, 99, 228, 52, 42, 
-    236, 15, 64, 177, 128, 111, 228, 52, 42, 226, 150, 64, 177, 128, 111, 42, 
-    236, 15, 64, 177, 228, 52, 128, 111, 42, 226, 150, 64, 177, 228, 52, 128, 
-    111, 233, 15, 251, 88, 228, 52, 245, 94, 111, 242, 130, 251, 88, 228, 52, 
-    245, 94, 111, 224, 203, 251, 88, 228, 52, 245, 94, 111, 218, 56, 251, 88, 
-    228, 52, 245, 94, 111, 228, 52, 228, 57, 218, 77, 226, 231, 247, 138, 
-    228, 52, 249, 188, 253, 238, 228, 57, 218, 76, 228, 52, 228, 57, 218, 77, 
-    64, 177, 128, 111, 247, 138, 228, 52, 249, 188, 253, 238, 228, 57, 218, 
-    77, 177, 245, 99, 67, 245, 163, 230, 222, 203, 245, 163, 120, 44, 247, 
-    255, 245, 163, 124, 44, 247, 255, 245, 163, 245, 170, 64, 2, 199, 203, 
-    91, 245, 170, 64, 2, 67, 252, 141, 253, 207, 245, 143, 64, 203, 91, 4, 
-    245, 170, 64, 2, 67, 252, 141, 253, 207, 245, 143, 64, 203, 91, 245, 170, 
-    64, 2, 59, 48, 245, 170, 64, 2, 226, 123, 4, 245, 170, 64, 2, 226, 123, 
-    245, 170, 64, 2, 214, 183, 245, 170, 64, 2, 113, 203, 218, 90, 249, 186, 
-    2, 199, 203, 91, 249, 186, 2, 67, 252, 141, 253, 207, 245, 143, 64, 203, 
-    91, 4, 249, 186, 2, 67, 252, 141, 253, 207, 245, 143, 64, 203, 91, 249, 
-    186, 2, 226, 123, 4, 249, 186, 2, 226, 123, 210, 160, 187, 252, 173, 231, 
-    61, 247, 250, 50, 245, 172, 74, 240, 234, 120, 253, 249, 124, 253, 249, 
-    224, 175, 225, 165, 212, 32, 232, 213, 43, 250, 181, 44, 250, 181, 43, 
-    244, 57, 44, 244, 57, 251, 175, 44, 249, 132, 251, 175, 43, 249, 132, 
-    216, 14, 44, 249, 132, 216, 14, 43, 249, 132, 223, 49, 228, 52, 50, 42, 
-    232, 104, 254, 25, 221, 164, 221, 171, 217, 1, 223, 120, 224, 241, 235, 
-    238, 213, 165, 218, 234, 225, 41, 64, 235, 207, 50, 215, 94, 228, 52, 50, 
-    212, 42, 240, 236, 216, 14, 43, 249, 160, 216, 14, 44, 249, 160, 251, 
-    175, 43, 249, 160, 251, 175, 44, 249, 160, 216, 14, 163, 235, 211, 251, 
-    175, 163, 235, 211, 243, 240, 219, 75, 120, 253, 250, 252, 24, 113, 203, 
-    252, 129, 226, 160, 234, 138, 245, 90, 216, 42, 216, 196, 222, 251, 211, 
-    179, 236, 0, 115, 223, 117, 251, 163, 234, 137, 233, 42, 254, 110, 127, 
-    222, 247, 254, 110, 127, 245, 90, 216, 42, 216, 196, 233, 46, 252, 35, 
-    222, 233, 249, 70, 254, 155, 254, 1, 217, 181, 216, 4, 222, 123, 247, 
-    215, 226, 151, 249, 198, 217, 52, 219, 86, 249, 151, 249, 150, 254, 66, 
-    243, 225, 16, 240, 151, 254, 66, 243, 225, 16, 218, 228, 224, 27, 254, 
-    66, 243, 225, 16, 224, 28, 245, 99, 254, 66, 243, 225, 16, 224, 28, 247, 
-    174, 254, 66, 243, 225, 16, 224, 28, 247, 248, 254, 66, 243, 225, 16, 
-    224, 28, 235, 56, 254, 66, 243, 225, 16, 224, 28, 250, 35, 254, 66, 243, 
-    225, 16, 250, 36, 218, 135, 254, 66, 243, 225, 16, 250, 36, 235, 56, 254, 
-    66, 243, 225, 16, 219, 96, 130, 254, 66, 243, 225, 16, 252, 181, 130, 
-    254, 66, 243, 225, 16, 224, 28, 219, 95, 254, 66, 243, 225, 16, 224, 28, 
-    252, 180, 254, 66, 243, 225, 16, 224, 28, 233, 14, 254, 66, 243, 225, 16, 
-    224, 28, 242, 129, 254, 66, 243, 225, 16, 140, 214, 19, 254, 66, 243, 
-    225, 16, 97, 214, 19, 254, 66, 243, 225, 16, 224, 28, 140, 74, 254, 66, 
-    243, 225, 16, 224, 28, 97, 74, 254, 66, 243, 225, 16, 250, 36, 252, 180, 
-    254, 66, 243, 225, 16, 124, 217, 88, 214, 183, 254, 66, 243, 225, 16, 
-    248, 55, 218, 135, 254, 66, 243, 225, 16, 224, 28, 124, 250, 238, 254, 
-    66, 243, 225, 16, 224, 28, 248, 54, 254, 66, 243, 225, 16, 124, 217, 88, 
-    235, 56, 254, 66, 243, 225, 16, 214, 153, 214, 19, 254, 66, 243, 225, 16, 
-    224, 28, 214, 153, 74, 254, 66, 243, 225, 16, 120, 217, 88, 226, 123, 
-    254, 66, 243, 225, 16, 248, 66, 218, 135, 254, 66, 243, 225, 16, 224, 28, 
-    120, 250, 238, 254, 66, 243, 225, 16, 224, 28, 248, 65, 254, 66, 243, 
-    225, 16, 120, 217, 88, 235, 56, 254, 66, 243, 225, 16, 246, 104, 214, 19, 
-    254, 66, 243, 225, 16, 224, 28, 246, 104, 74, 254, 66, 243, 225, 16, 223, 
-    253, 214, 183, 254, 66, 243, 225, 16, 248, 55, 214, 183, 254, 66, 243, 
-    225, 16, 247, 249, 214, 183, 254, 66, 243, 225, 16, 235, 57, 214, 183, 
-    254, 66, 243, 225, 16, 250, 36, 214, 183, 254, 66, 243, 225, 16, 120, 
-    220, 5, 235, 56, 254, 66, 243, 225, 16, 223, 253, 224, 27, 254, 66, 243, 
-    225, 16, 250, 36, 218, 156, 254, 66, 243, 225, 16, 224, 28, 249, 226, 
-    254, 66, 243, 225, 16, 120, 217, 88, 248, 1, 254, 66, 243, 225, 16, 248, 
-    66, 248, 1, 254, 66, 243, 225, 16, 218, 157, 248, 1, 254, 66, 243, 225, 
-    16, 235, 57, 248, 1, 254, 66, 243, 225, 16, 250, 36, 248, 1, 254, 66, 
-    243, 225, 16, 124, 220, 5, 218, 135, 254, 66, 243, 225, 16, 43, 220, 5, 
-    218, 135, 254, 66, 243, 225, 16, 216, 89, 248, 1, 254, 66, 243, 225, 16, 
-    242, 130, 248, 1, 254, 66, 243, 225, 16, 249, 220, 130, 254, 66, 243, 
-    225, 16, 248, 66, 182, 254, 66, 243, 225, 16, 210, 34, 254, 66, 243, 225, 
-    16, 218, 136, 182, 254, 66, 243, 225, 16, 220, 151, 214, 183, 254, 66, 
-    243, 225, 16, 224, 28, 228, 52, 245, 99, 254, 66, 243, 225, 16, 224, 28, 
-    224, 12, 254, 66, 243, 225, 16, 124, 250, 239, 182, 254, 66, 243, 225, 
-    16, 120, 250, 239, 182, 254, 66, 243, 225, 16, 235, 185, 254, 66, 243, 
-    225, 16, 223, 37, 254, 66, 243, 225, 16, 226, 201, 254, 66, 243, 225, 16, 
-    254, 144, 214, 183, 254, 66, 243, 225, 16, 245, 101, 214, 183, 254, 66, 
-    243, 225, 16, 235, 186, 214, 183, 254, 66, 243, 225, 16, 226, 202, 214, 
-    183, 254, 66, 243, 225, 16, 254, 143, 228, 52, 250, 130, 78, 44, 254, 
-    110, 2, 246, 104, 210, 35, 74, 219, 235, 204, 251, 163, 252, 45, 87, 67, 
-    232, 214, 2, 230, 224, 247, 120, 235, 216, 87, 249, 183, 214, 181, 87, 
-    247, 189, 214, 181, 87, 245, 154, 87, 249, 210, 87, 71, 42, 2, 250, 175, 
-    67, 232, 213, 245, 130, 87, 254, 139, 234, 139, 87, 241, 213, 87, 37, 
-    203, 252, 141, 2, 228, 50, 37, 215, 226, 246, 106, 251, 135, 250, 36, 2, 
-    228, 54, 74, 214, 179, 87, 230, 137, 87, 240, 164, 87, 226, 174, 242, 59, 
-    87, 226, 174, 233, 147, 87, 225, 244, 87, 225, 243, 87, 247, 197, 249, 
-    97, 16, 244, 20, 105, 219, 50, 87, 254, 66, 243, 225, 16, 224, 27, 248, 
-    83, 220, 138, 234, 139, 87, 224, 192, 226, 75, 229, 82, 226, 75, 224, 
-    188, 221, 189, 87, 250, 17, 221, 189, 87, 43, 226, 4, 214, 160, 103, 43, 
-    226, 4, 245, 21, 43, 226, 4, 232, 108, 103, 44, 226, 4, 214, 160, 103, 
-    44, 226, 4, 245, 21, 44, 226, 4, 232, 108, 103, 43, 42, 251, 158, 214, 
-    160, 249, 160, 43, 42, 251, 158, 245, 21, 43, 42, 251, 158, 232, 108, 
-    249, 160, 44, 42, 251, 158, 214, 160, 249, 160, 44, 42, 251, 158, 245, 
-    21, 44, 42, 251, 158, 232, 108, 249, 160, 43, 249, 99, 251, 158, 214, 
-    160, 103, 43, 249, 99, 251, 158, 230, 224, 225, 101, 43, 249, 99, 251, 
-    158, 232, 108, 103, 249, 99, 251, 158, 245, 21, 44, 249, 99, 251, 158, 
-    214, 160, 103, 44, 249, 99, 251, 158, 230, 224, 225, 101, 44, 249, 99, 
-    251, 158, 232, 108, 103, 235, 212, 245, 21, 203, 232, 214, 245, 21, 214, 
-    160, 43, 177, 232, 108, 44, 249, 99, 251, 158, 221, 172, 214, 160, 44, 
-    177, 232, 108, 43, 249, 99, 251, 158, 221, 172, 218, 41, 216, 13, 218, 
-    41, 251, 174, 216, 14, 42, 127, 251, 175, 42, 127, 251, 175, 42, 251, 
-    158, 117, 216, 14, 42, 127, 34, 16, 251, 174, 43, 67, 93, 232, 213, 44, 
-    67, 93, 232, 213, 203, 221, 205, 232, 212, 203, 221, 205, 232, 211, 203, 
-    221, 205, 232, 210, 203, 221, 205, 232, 209, 248, 46, 16, 192, 67, 22, 
-    216, 14, 222, 251, 248, 46, 16, 192, 67, 22, 251, 175, 222, 251, 248, 46, 
-    16, 192, 67, 2, 250, 35, 248, 46, 16, 192, 124, 22, 203, 2, 250, 35, 248, 
-    46, 16, 192, 120, 22, 203, 2, 250, 35, 248, 46, 16, 192, 67, 2, 215, 225, 
-    248, 46, 16, 192, 124, 22, 203, 2, 215, 225, 248, 46, 16, 192, 120, 22, 
-    203, 2, 215, 225, 248, 46, 16, 192, 67, 22, 212, 35, 248, 46, 16, 192, 
-    124, 22, 203, 2, 212, 35, 248, 46, 16, 192, 120, 22, 203, 2, 212, 35, 
-    248, 46, 16, 192, 124, 22, 241, 44, 248, 46, 16, 192, 120, 22, 241, 44, 
-    248, 46, 16, 192, 67, 22, 216, 14, 233, 46, 248, 46, 16, 192, 67, 22, 
-    251, 175, 233, 46, 42, 244, 32, 223, 54, 87, 245, 182, 87, 67, 232, 214, 
-    245, 21, 231, 33, 251, 146, 231, 33, 199, 117, 219, 250, 231, 33, 219, 
-    251, 117, 232, 137, 231, 33, 199, 117, 113, 219, 237, 231, 33, 113, 219, 
-    238, 117, 232, 137, 231, 33, 113, 219, 238, 235, 64, 231, 33, 215, 208, 
-    231, 33, 216, 223, 231, 33, 225, 188, 245, 224, 242, 122, 243, 219, 216, 
-    14, 226, 3, 251, 175, 226, 3, 216, 14, 249, 99, 127, 251, 175, 249, 99, 
-    127, 216, 14, 216, 6, 220, 53, 127, 251, 175, 216, 6, 220, 53, 127, 71, 
-    215, 239, 252, 35, 222, 234, 2, 250, 35, 218, 120, 244, 64, 255, 17, 249, 
-    96, 245, 171, 235, 198, 248, 83, 245, 24, 87, 85, 222, 247, 52, 215, 225, 
-    85, 233, 42, 52, 215, 225, 85, 214, 162, 52, 215, 225, 85, 246, 105, 52, 
-    215, 225, 85, 222, 247, 52, 215, 226, 2, 67, 130, 85, 233, 42, 52, 215, 
-    226, 2, 67, 130, 85, 222, 247, 215, 226, 2, 52, 67, 130, 254, 173, 250, 
-    3, 218, 126, 216, 86, 250, 3, 240, 237, 2, 244, 50, 221, 241, 16, 31, 
-    227, 202, 16, 31, 218, 152, 64, 241, 233, 16, 31, 218, 152, 64, 216, 212, 
-    16, 31, 245, 143, 64, 216, 212, 16, 31, 245, 143, 64, 215, 243, 16, 31, 
-    245, 132, 16, 31, 255, 7, 16, 31, 252, 44, 16, 31, 252, 179, 16, 31, 203, 
-    217, 89, 16, 31, 232, 214, 244, 145, 16, 31, 67, 217, 89, 16, 31, 244, 
-    20, 244, 145, 16, 31, 250, 230, 223, 53, 16, 31, 220, 28, 226, 130, 16, 
-    31, 220, 28, 235, 255, 16, 31, 248, 151, 232, 204, 245, 77, 16, 31, 248, 
-    31, 249, 178, 110, 16, 31, 248, 31, 249, 178, 105, 16, 31, 248, 31, 249, 
-    178, 158, 16, 31, 248, 31, 249, 178, 161, 16, 31, 152, 255, 7, 16, 31, 
-    217, 177, 236, 62, 16, 31, 245, 143, 64, 215, 244, 251, 213, 16, 31, 251, 
-    5, 16, 31, 245, 143, 64, 231, 81, 16, 31, 218, 61, 16, 31, 245, 77, 16, 
-    31, 244, 107, 220, 137, 16, 31, 242, 121, 220, 137, 16, 31, 223, 121, 
-    220, 137, 16, 31, 214, 174, 220, 137, 16, 31, 219, 18, 16, 31, 248, 63, 
-    251, 216, 87, 204, 251, 163, 16, 31, 229, 85, 16, 31, 248, 64, 244, 20, 
-    105, 16, 31, 218, 62, 244, 20, 105, 226, 241, 103, 226, 241, 250, 152, 
-    226, 241, 244, 23, 226, 241, 235, 193, 244, 23, 226, 241, 252, 42, 251, 
-    124, 226, 241, 251, 170, 216, 111, 226, 241, 251, 155, 252, 146, 240, 
-    103, 226, 241, 254, 127, 64, 250, 129, 226, 241, 248, 156, 226, 241, 249, 
-    87, 255, 11, 227, 200, 226, 241, 52, 252, 180, 37, 21, 110, 37, 21, 105, 
-    37, 21, 158, 37, 21, 161, 37, 21, 189, 37, 21, 194, 37, 21, 198, 37, 21, 
-    195, 37, 21, 200, 37, 54, 216, 247, 37, 54, 245, 167, 37, 54, 215, 76, 
-    37, 54, 216, 164, 37, 54, 244, 5, 37, 54, 244, 118, 37, 54, 219, 119, 37, 
-    54, 220, 119, 37, 54, 245, 190, 37, 54, 228, 197, 37, 54, 215, 73, 88, 
-    21, 110, 88, 21, 105, 88, 21, 158, 88, 21, 161, 88, 21, 189, 88, 21, 194, 
-    88, 21, 198, 88, 21, 195, 88, 21, 200, 88, 54, 216, 247, 88, 54, 245, 
-    167, 88, 54, 215, 76, 88, 54, 216, 164, 88, 54, 244, 5, 88, 54, 244, 118, 
-    88, 54, 219, 119, 88, 54, 220, 119, 88, 54, 245, 190, 88, 54, 228, 197, 
-    88, 54, 215, 73, 21, 123, 243, 229, 218, 129, 21, 113, 243, 229, 218, 
-    129, 21, 134, 243, 229, 218, 129, 21, 244, 11, 243, 229, 218, 129, 21, 
-    244, 81, 243, 229, 218, 129, 21, 219, 125, 243, 229, 218, 129, 21, 220, 
-    122, 243, 229, 218, 129, 21, 245, 193, 243, 229, 218, 129, 21, 228, 200, 
-    243, 229, 218, 129, 54, 216, 248, 243, 229, 218, 129, 54, 245, 168, 243, 
-    229, 218, 129, 54, 215, 77, 243, 229, 218, 129, 54, 216, 165, 243, 229, 
-    218, 129, 54, 244, 6, 243, 229, 218, 129, 54, 244, 119, 243, 229, 218, 
-    129, 54, 219, 120, 243, 229, 218, 129, 54, 220, 120, 243, 229, 218, 129, 
-    54, 245, 191, 243, 229, 218, 129, 54, 228, 198, 243, 229, 218, 129, 54, 
-    215, 74, 243, 229, 218, 129, 88, 7, 4, 1, 61, 88, 7, 4, 1, 253, 158, 88, 
-    7, 4, 1, 251, 66, 88, 7, 4, 1, 249, 60, 88, 7, 4, 1, 75, 88, 7, 4, 1, 
-    245, 6, 88, 7, 4, 1, 243, 202, 88, 7, 4, 1, 242, 60, 88, 7, 4, 1, 73, 88, 
-    7, 4, 1, 235, 144, 88, 7, 4, 1, 235, 23, 88, 7, 4, 1, 156, 88, 7, 4, 1, 
-    193, 88, 7, 4, 1, 230, 25, 88, 7, 4, 1, 76, 88, 7, 4, 1, 226, 105, 88, 7, 
-    4, 1, 224, 96, 88, 7, 4, 1, 153, 88, 7, 4, 1, 222, 91, 88, 7, 4, 1, 217, 
-    152, 88, 7, 4, 1, 70, 88, 7, 4, 1, 214, 105, 88, 7, 4, 1, 212, 98, 88, 7, 
-    4, 1, 211, 178, 88, 7, 4, 1, 211, 117, 88, 7, 4, 1, 210, 159, 37, 7, 6, 
-    1, 61, 37, 7, 6, 1, 253, 158, 37, 7, 6, 1, 251, 66, 37, 7, 6, 1, 249, 60, 
-    37, 7, 6, 1, 75, 37, 7, 6, 1, 245, 6, 37, 7, 6, 1, 243, 202, 37, 7, 6, 1, 
-    242, 60, 37, 7, 6, 1, 73, 37, 7, 6, 1, 235, 144, 37, 7, 6, 1, 235, 23, 
-    37, 7, 6, 1, 156, 37, 7, 6, 1, 193, 37, 7, 6, 1, 230, 25, 37, 7, 6, 1, 
-    76, 37, 7, 6, 1, 226, 105, 37, 7, 6, 1, 224, 96, 37, 7, 6, 1, 153, 37, 7, 
-    6, 1, 222, 91, 37, 7, 6, 1, 217, 152, 37, 7, 6, 1, 70, 37, 7, 6, 1, 214, 
-    105, 37, 7, 6, 1, 212, 98, 37, 7, 6, 1, 211, 178, 37, 7, 6, 1, 211, 117, 
-    37, 7, 6, 1, 210, 159, 37, 7, 4, 1, 61, 37, 7, 4, 1, 253, 158, 37, 7, 4, 
-    1, 251, 66, 37, 7, 4, 1, 249, 60, 37, 7, 4, 1, 75, 37, 7, 4, 1, 245, 6, 
-    37, 7, 4, 1, 243, 202, 37, 7, 4, 1, 242, 60, 37, 7, 4, 1, 73, 37, 7, 4, 
-    1, 235, 144, 37, 7, 4, 1, 235, 23, 37, 7, 4, 1, 156, 37, 7, 4, 1, 193, 
-    37, 7, 4, 1, 230, 25, 37, 7, 4, 1, 76, 37, 7, 4, 1, 226, 105, 37, 7, 4, 
-    1, 224, 96, 37, 7, 4, 1, 153, 37, 7, 4, 1, 222, 91, 37, 7, 4, 1, 217, 
-    152, 37, 7, 4, 1, 70, 37, 7, 4, 1, 214, 105, 37, 7, 4, 1, 212, 98, 37, 7, 
-    4, 1, 211, 178, 37, 7, 4, 1, 211, 117, 37, 7, 4, 1, 210, 159, 37, 21, 
-    210, 86, 152, 37, 54, 245, 167, 152, 37, 54, 215, 76, 152, 37, 54, 216, 
-    164, 152, 37, 54, 244, 5, 152, 37, 54, 244, 118, 152, 37, 54, 219, 119, 
-    152, 37, 54, 220, 119, 152, 37, 54, 245, 190, 152, 37, 54, 228, 197, 152, 
-    37, 54, 215, 73, 52, 37, 21, 110, 52, 37, 21, 105, 52, 37, 21, 158, 52, 
-    37, 21, 161, 52, 37, 21, 189, 52, 37, 21, 194, 52, 37, 21, 198, 52, 37, 
-    21, 195, 52, 37, 21, 200, 52, 37, 54, 216, 247, 152, 37, 21, 210, 86, 93, 
-    99, 192, 241, 44, 93, 99, 114, 241, 44, 93, 99, 192, 213, 239, 93, 99, 
-    114, 213, 239, 93, 99, 192, 215, 211, 248, 157, 241, 44, 93, 99, 114, 
-    215, 211, 248, 157, 241, 44, 93, 99, 192, 215, 211, 248, 157, 213, 239, 
-    93, 99, 114, 215, 211, 248, 157, 213, 239, 93, 99, 192, 224, 24, 248, 
-    157, 241, 44, 93, 99, 114, 224, 24, 248, 157, 241, 44, 93, 99, 192, 224, 
-    24, 248, 157, 213, 239, 93, 99, 114, 224, 24, 248, 157, 213, 239, 93, 99, 
-    192, 124, 22, 222, 251, 93, 99, 124, 192, 22, 44, 241, 221, 93, 99, 124, 
-    114, 22, 44, 232, 230, 93, 99, 114, 124, 22, 222, 251, 93, 99, 192, 124, 
-    22, 233, 46, 93, 99, 124, 192, 22, 43, 241, 221, 93, 99, 124, 114, 22, 
-    43, 232, 230, 93, 99, 114, 124, 22, 233, 46, 93, 99, 192, 120, 22, 222, 
-    251, 93, 99, 120, 192, 22, 44, 241, 221, 93, 99, 120, 114, 22, 44, 232, 
-    230, 93, 99, 114, 120, 22, 222, 251, 93, 99, 192, 120, 22, 233, 46, 93, 
-    99, 120, 192, 22, 43, 241, 221, 93, 99, 120, 114, 22, 43, 232, 230, 93, 
-    99, 114, 120, 22, 233, 46, 93, 99, 192, 67, 22, 222, 251, 93, 99, 67, 
-    192, 22, 44, 241, 221, 93, 99, 120, 114, 22, 44, 124, 232, 230, 93, 99, 
-    124, 114, 22, 44, 120, 232, 230, 93, 99, 67, 114, 22, 44, 232, 230, 93, 
-    99, 124, 192, 22, 44, 120, 241, 221, 93, 99, 120, 192, 22, 44, 124, 241, 
-    221, 93, 99, 114, 67, 22, 222, 251, 93, 99, 192, 67, 22, 233, 46, 93, 99, 
-    67, 192, 22, 43, 241, 221, 93, 99, 120, 114, 22, 43, 124, 232, 230, 93, 
-    99, 124, 114, 22, 43, 120, 232, 230, 93, 99, 67, 114, 22, 43, 232, 230, 
-    93, 99, 124, 192, 22, 43, 120, 241, 221, 93, 99, 120, 192, 22, 43, 124, 
-    241, 221, 93, 99, 114, 67, 22, 233, 46, 93, 99, 192, 124, 22, 241, 44, 
-    93, 99, 43, 114, 22, 44, 124, 232, 230, 93, 99, 44, 114, 22, 43, 124, 
-    232, 230, 93, 99, 124, 192, 22, 203, 241, 221, 93, 99, 124, 114, 22, 203, 
-    232, 230, 93, 99, 44, 192, 22, 43, 124, 241, 221, 93, 99, 43, 192, 22, 
-    44, 124, 241, 221, 93, 99, 114, 124, 22, 241, 44, 93, 99, 192, 120, 22, 
-    241, 44, 93, 99, 43, 114, 22, 44, 120, 232, 230, 93, 99, 44, 114, 22, 43, 
-    120, 232, 230, 93, 99, 120, 192, 22, 203, 241, 221, 93, 99, 120, 114, 22, 
-    203, 232, 230, 93, 99, 44, 192, 22, 43, 120, 241, 221, 93, 99, 43, 192, 
-    22, 44, 120, 241, 221, 93, 99, 114, 120, 22, 241, 44, 93, 99, 192, 67, 
-    22, 241, 44, 93, 99, 43, 114, 22, 44, 67, 232, 230, 93, 99, 44, 114, 22, 
-    43, 67, 232, 230, 93, 99, 67, 192, 22, 203, 241, 221, 93, 99, 120, 114, 
-    22, 124, 203, 232, 230, 93, 99, 124, 114, 22, 120, 203, 232, 230, 93, 99, 
-    67, 114, 22, 203, 232, 230, 93, 99, 43, 120, 114, 22, 44, 124, 232, 230, 
-    93, 99, 44, 120, 114, 22, 43, 124, 232, 230, 93, 99, 43, 124, 114, 22, 
-    44, 120, 232, 230, 93, 99, 44, 124, 114, 22, 43, 120, 232, 230, 93, 99, 
-    124, 192, 22, 120, 203, 241, 221, 93, 99, 120, 192, 22, 124, 203, 241, 
-    221, 93, 99, 44, 192, 22, 43, 67, 241, 221, 93, 99, 43, 192, 22, 44, 67, 
-    241, 221, 93, 99, 114, 67, 22, 241, 44, 93, 99, 192, 52, 248, 157, 241, 
-    44, 93, 99, 114, 52, 248, 157, 241, 44, 93, 99, 192, 52, 248, 157, 213, 
-    239, 93, 99, 114, 52, 248, 157, 213, 239, 93, 99, 52, 241, 44, 93, 99, 
-    52, 213, 239, 93, 99, 124, 219, 155, 22, 44, 246, 113, 93, 99, 124, 52, 
-    22, 44, 219, 154, 93, 99, 52, 124, 22, 222, 251, 93, 99, 124, 219, 155, 
-    22, 43, 246, 113, 93, 99, 124, 52, 22, 43, 219, 154, 93, 99, 52, 124, 22, 
-    233, 46, 93, 99, 120, 219, 155, 22, 44, 246, 113, 93, 99, 120, 52, 22, 
-    44, 219, 154, 93, 99, 52, 120, 22, 222, 251, 93, 99, 120, 219, 155, 22, 
-    43, 246, 113, 93, 99, 120, 52, 22, 43, 219, 154, 93, 99, 52, 120, 22, 
-    233, 46, 93, 99, 67, 219, 155, 22, 44, 246, 113, 93, 99, 67, 52, 22, 44, 
-    219, 154, 93, 99, 52, 67, 22, 222, 251, 93, 99, 67, 219, 155, 22, 43, 
-    246, 113, 93, 99, 67, 52, 22, 43, 219, 154, 93, 99, 52, 67, 22, 233, 46, 
-    93, 99, 124, 219, 155, 22, 203, 246, 113, 93, 99, 124, 52, 22, 203, 219, 
-    154, 93, 99, 52, 124, 22, 241, 44, 93, 99, 120, 219, 155, 22, 203, 246, 
-    113, 93, 99, 120, 52, 22, 203, 219, 154, 93, 99, 52, 120, 22, 241, 44, 
-    93, 99, 67, 219, 155, 22, 203, 246, 113, 93, 99, 67, 52, 22, 203, 219, 
-    154, 93, 99, 52, 67, 22, 241, 44, 93, 99, 192, 254, 26, 124, 22, 222, 
-    251, 93, 99, 192, 254, 26, 124, 22, 233, 46, 93, 99, 192, 254, 26, 120, 
-    22, 233, 46, 93, 99, 192, 254, 26, 120, 22, 222, 251, 93, 99, 192, 247, 
-    255, 214, 160, 44, 216, 42, 232, 108, 233, 46, 93, 99, 192, 247, 255, 
-    214, 160, 43, 216, 42, 232, 108, 222, 251, 93, 99, 192, 247, 255, 249, 
-    130, 93, 99, 192, 233, 46, 93, 99, 192, 214, 163, 93, 99, 192, 222, 251, 
-    93, 99, 192, 246, 106, 93, 99, 114, 233, 46, 93, 99, 114, 214, 163, 93, 
-    99, 114, 222, 251, 93, 99, 114, 246, 106, 93, 99, 192, 43, 22, 114, 222, 
-    251, 93, 99, 192, 120, 22, 114, 246, 106, 93, 99, 114, 43, 22, 192, 222, 
-    251, 93, 99, 114, 120, 22, 192, 246, 106, 214, 160, 163, 251, 213, 232, 
-    108, 123, 245, 189, 251, 213, 232, 108, 123, 224, 22, 251, 213, 232, 108, 
-    134, 245, 187, 251, 213, 232, 108, 163, 251, 213, 232, 108, 244, 81, 245, 
-    187, 251, 213, 232, 108, 134, 224, 20, 251, 213, 232, 108, 220, 122, 245, 
-    187, 251, 213, 243, 229, 251, 213, 43, 220, 122, 245, 187, 251, 213, 43, 
-    134, 224, 20, 251, 213, 43, 244, 81, 245, 187, 251, 213, 43, 163, 251, 
-    213, 43, 134, 245, 187, 251, 213, 43, 123, 224, 22, 251, 213, 43, 123, 
-    245, 189, 251, 213, 44, 163, 251, 213, 192, 220, 92, 231, 82, 220, 92, 
-    248, 162, 220, 92, 214, 160, 123, 245, 189, 251, 213, 44, 123, 245, 189, 
-    251, 213, 224, 26, 232, 108, 233, 46, 224, 26, 232, 108, 222, 251, 224, 
-    26, 214, 160, 233, 46, 224, 26, 214, 160, 43, 22, 232, 108, 43, 22, 232, 
-    108, 222, 251, 224, 26, 214, 160, 43, 22, 232, 108, 222, 251, 224, 26, 
-    214, 160, 43, 22, 214, 160, 44, 22, 232, 108, 233, 46, 224, 26, 214, 160, 
-    43, 22, 214, 160, 44, 22, 232, 108, 222, 251, 224, 26, 214, 160, 222, 
-    251, 224, 26, 214, 160, 44, 22, 232, 108, 233, 46, 224, 26, 214, 160, 44, 
-    22, 232, 108, 43, 22, 232, 108, 222, 251, 85, 218, 234, 71, 218, 234, 71, 
-    42, 2, 222, 183, 249, 159, 71, 42, 249, 187, 85, 4, 218, 234, 42, 2, 203, 
-    244, 105, 42, 2, 67, 244, 105, 42, 2, 226, 144, 249, 126, 244, 105, 42, 
-    2, 214, 160, 43, 216, 42, 232, 108, 44, 244, 105, 42, 2, 214, 160, 44, 
-    216, 42, 232, 108, 43, 244, 105, 42, 2, 247, 255, 249, 126, 244, 105, 85, 
-    4, 218, 234, 71, 4, 218, 234, 85, 223, 116, 71, 223, 116, 85, 67, 223, 
-    116, 71, 67, 223, 116, 85, 226, 6, 71, 226, 6, 85, 214, 162, 215, 225, 
-    71, 214, 162, 215, 225, 85, 214, 162, 4, 215, 225, 71, 214, 162, 4, 215, 
-    225, 85, 222, 247, 215, 225, 71, 222, 247, 215, 225, 85, 222, 247, 4, 
-    215, 225, 71, 222, 247, 4, 215, 225, 85, 222, 247, 225, 8, 71, 222, 247, 
-    225, 8, 85, 246, 105, 215, 225, 71, 246, 105, 215, 225, 85, 246, 105, 4, 
-    215, 225, 71, 246, 105, 4, 215, 225, 85, 233, 42, 215, 225, 71, 233, 42, 
-    215, 225, 85, 233, 42, 4, 215, 225, 71, 233, 42, 4, 215, 225, 85, 233, 
-    42, 225, 8, 71, 233, 42, 225, 8, 85, 247, 248, 71, 247, 248, 71, 247, 
-    249, 249, 187, 85, 4, 247, 248, 244, 89, 232, 104, 71, 250, 35, 246, 118, 
-    250, 35, 250, 36, 2, 67, 244, 105, 251, 111, 85, 250, 35, 250, 36, 2, 43, 
-    163, 251, 221, 250, 36, 2, 44, 163, 251, 221, 250, 36, 2, 232, 108, 163, 
-    251, 221, 250, 36, 2, 214, 160, 163, 251, 221, 250, 36, 2, 214, 160, 44, 
-    224, 26, 251, 221, 250, 36, 2, 254, 155, 251, 88, 214, 160, 43, 224, 26, 
-    251, 221, 43, 163, 85, 250, 35, 44, 163, 85, 250, 35, 235, 194, 251, 113, 
-    235, 194, 71, 250, 35, 214, 160, 163, 235, 194, 71, 250, 35, 232, 108, 
-    163, 235, 194, 71, 250, 35, 214, 160, 43, 224, 26, 250, 33, 254, 25, 214, 
-    160, 44, 224, 26, 250, 33, 254, 25, 232, 108, 44, 224, 26, 250, 33, 254, 
-    25, 232, 108, 43, 224, 26, 250, 33, 254, 25, 214, 160, 163, 250, 35, 232, 
-    108, 163, 250, 35, 85, 232, 108, 44, 215, 225, 85, 232, 108, 43, 215, 
-    225, 85, 214, 160, 43, 215, 225, 85, 214, 160, 44, 215, 225, 71, 251, 
-    113, 42, 2, 43, 163, 251, 221, 42, 2, 44, 163, 251, 221, 42, 2, 214, 160, 
-    43, 247, 255, 163, 251, 221, 42, 2, 232, 108, 44, 247, 255, 163, 251, 
-    221, 71, 42, 2, 67, 251, 232, 232, 213, 71, 214, 162, 215, 226, 2, 247, 
-    120, 214, 162, 215, 226, 2, 43, 163, 251, 221, 214, 162, 215, 226, 2, 44, 
-    163, 251, 221, 233, 85, 250, 35, 71, 42, 2, 214, 160, 43, 224, 25, 71, 
-    42, 2, 232, 108, 43, 224, 25, 71, 42, 2, 232, 108, 44, 224, 25, 71, 42, 
-    2, 214, 160, 44, 224, 25, 71, 250, 36, 2, 214, 160, 43, 224, 25, 71, 250, 
-    36, 2, 232, 108, 43, 224, 25, 71, 250, 36, 2, 232, 108, 44, 224, 25, 71, 
-    250, 36, 2, 214, 160, 44, 224, 25, 214, 160, 43, 215, 225, 214, 160, 44, 
-    215, 225, 232, 108, 43, 215, 225, 71, 231, 82, 218, 234, 85, 231, 82, 
-    218, 234, 71, 231, 82, 4, 218, 234, 85, 231, 82, 4, 218, 234, 232, 108, 
-    44, 215, 225, 85, 218, 38, 2, 223, 132, 249, 247, 214, 194, 219, 60, 249, 
-    222, 85, 218, 156, 71, 218, 156, 232, 228, 216, 132, 218, 37, 253, 234, 
-    228, 71, 248, 38, 228, 71, 249, 195, 226, 163, 85, 217, 0, 71, 217, 0, 
-    252, 156, 251, 163, 252, 156, 93, 2, 250, 129, 252, 156, 93, 2, 211, 178, 
-    221, 254, 214, 195, 2, 223, 160, 246, 84, 240, 243, 252, 22, 71, 220, 2, 
-    225, 101, 85, 220, 2, 225, 101, 220, 87, 223, 49, 222, 187, 244, 55, 241, 
-    228, 251, 113, 85, 43, 225, 7, 235, 242, 85, 44, 225, 7, 235, 242, 71, 
-    43, 225, 7, 235, 242, 71, 120, 225, 7, 235, 242, 71, 44, 225, 7, 235, 
-    242, 71, 124, 225, 7, 235, 242, 219, 101, 22, 249, 129, 250, 219, 50, 
-    223, 172, 50, 251, 239, 50, 251, 25, 254, 102, 226, 145, 249, 130, 250, 
-    111, 223, 37, 249, 131, 64, 232, 118, 249, 131, 64, 235, 116, 218, 157, 
-    22, 249, 136, 244, 168, 87, 254, 248, 220, 89, 242, 22, 22, 219, 189, 
-    225, 220, 87, 210, 254, 211, 69, 215, 215, 31, 241, 223, 215, 215, 31, 
-    233, 107, 215, 215, 31, 244, 96, 215, 215, 31, 216, 133, 215, 215, 31, 
-    211, 239, 215, 215, 31, 212, 40, 215, 215, 31, 230, 115, 215, 215, 31, 
-    245, 223, 212, 1, 64, 248, 18, 71, 243, 239, 244, 190, 71, 219, 74, 244, 
-    190, 85, 219, 74, 244, 190, 71, 218, 38, 2, 223, 132, 244, 92, 224, 22, 
-    230, 128, 233, 80, 224, 22, 230, 128, 231, 54, 244, 138, 50, 245, 223, 
-    231, 190, 50, 235, 38, 221, 220, 214, 145, 229, 93, 225, 20, 254, 12, 
-    217, 40, 243, 52, 251, 3, 233, 19, 213, 150, 232, 238, 221, 191, 222, 19, 
-    250, 248, 254, 42, 225, 52, 71, 250, 117, 234, 78, 71, 250, 117, 224, 14, 
-    71, 250, 117, 222, 195, 71, 250, 117, 251, 231, 71, 250, 117, 234, 30, 
-    71, 250, 117, 225, 231, 85, 250, 117, 234, 78, 85, 250, 117, 224, 14, 85, 
-    250, 117, 222, 195, 85, 250, 117, 251, 231, 85, 250, 117, 234, 30, 85, 
-    250, 117, 225, 231, 85, 219, 16, 218, 50, 71, 241, 228, 218, 50, 71, 247, 
-    249, 218, 50, 85, 249, 245, 218, 50, 71, 219, 16, 218, 50, 85, 241, 228, 
-    218, 50, 85, 247, 249, 218, 50, 71, 249, 245, 218, 50, 240, 243, 218, 
-    238, 224, 22, 228, 47, 245, 189, 228, 47, 252, 73, 245, 189, 228, 42, 
-    252, 73, 219, 118, 228, 42, 230, 57, 244, 66, 50, 230, 57, 229, 188, 50, 
-    230, 57, 220, 76, 50, 212, 9, 188, 249, 130, 245, 220, 188, 249, 130, 
-    214, 171, 223, 112, 87, 223, 112, 16, 31, 215, 48, 225, 34, 223, 112, 16, 
-    31, 215, 47, 225, 34, 223, 112, 16, 31, 215, 46, 225, 34, 223, 112, 16, 
-    31, 215, 45, 225, 34, 223, 112, 16, 31, 215, 44, 225, 34, 223, 112, 16, 
-    31, 215, 43, 225, 34, 223, 112, 16, 31, 215, 42, 225, 34, 223, 112, 16, 
-    31, 243, 50, 231, 138, 85, 214, 171, 223, 112, 87, 223, 113, 226, 20, 87, 
-    225, 252, 226, 20, 87, 225, 174, 226, 20, 50, 211, 255, 87, 247, 241, 
-    244, 189, 247, 241, 244, 188, 247, 241, 244, 187, 247, 241, 244, 186, 
-    247, 241, 244, 185, 247, 241, 244, 184, 71, 250, 36, 2, 59, 222, 251, 71, 
-    250, 36, 2, 113, 247, 118, 85, 250, 36, 2, 71, 59, 222, 251, 85, 250, 36, 
-    2, 113, 71, 247, 118, 230, 142, 31, 211, 69, 230, 142, 31, 210, 253, 247, 
-    224, 31, 242, 131, 211, 69, 247, 224, 31, 233, 13, 210, 253, 247, 224, 
-    31, 233, 13, 211, 69, 247, 224, 31, 242, 131, 210, 253, 71, 244, 73, 85, 
-    244, 73, 242, 22, 22, 225, 104, 254, 120, 249, 128, 217, 235, 218, 164, 
-    64, 254, 226, 221, 206, 254, 169, 244, 51, 243, 60, 218, 164, 64, 241, 
-    202, 253, 199, 87, 244, 62, 226, 126, 71, 218, 156, 134, 232, 208, 249, 
-    175, 222, 251, 134, 232, 208, 249, 175, 233, 46, 212, 50, 50, 125, 213, 
-    130, 50, 246, 110, 244, 138, 50, 246, 110, 231, 190, 50, 235, 203, 244, 
-    138, 22, 231, 190, 50, 231, 190, 22, 244, 138, 50, 231, 190, 2, 218, 103, 
-    50, 231, 190, 2, 218, 103, 22, 231, 190, 22, 244, 138, 50, 67, 231, 190, 
-    2, 218, 103, 50, 203, 231, 190, 2, 218, 103, 50, 231, 82, 71, 250, 35, 
-    231, 82, 85, 250, 35, 231, 82, 4, 71, 250, 35, 231, 153, 87, 247, 167, 
-    87, 214, 169, 225, 251, 87, 249, 231, 243, 224, 214, 141, 229, 88, 250, 
-    161, 226, 61, 235, 44, 213, 185, 250, 93, 85, 230, 129, 232, 225, 220, 
-    112, 220, 147, 224, 5, 220, 130, 219, 55, 252, 159, 252, 126, 92, 234, 
-    138, 71, 246, 93, 231, 185, 71, 246, 93, 234, 78, 85, 246, 93, 231, 185, 
-    85, 246, 93, 234, 78, 219, 61, 211, 230, 219, 64, 218, 38, 252, 51, 249, 
-    247, 223, 159, 85, 219, 60, 216, 134, 249, 248, 22, 223, 159, 215, 94, 
-    71, 220, 2, 225, 101, 215, 94, 85, 220, 2, 225, 101, 71, 247, 249, 236, 
-    0, 218, 234, 249, 125, 233, 91, 247, 193, 250, 244, 226, 166, 225, 104, 
-    250, 245, 219, 88, 241, 212, 2, 71, 249, 130, 37, 249, 125, 233, 91, 250, 
-    153, 228, 75, 245, 124, 254, 141, 226, 191, 43, 212, 26, 215, 251, 85, 
-    215, 55, 43, 212, 26, 215, 251, 71, 215, 55, 43, 212, 26, 215, 251, 85, 
-    43, 233, 92, 231, 53, 71, 43, 233, 92, 231, 53, 246, 89, 219, 82, 50, 
-    114, 71, 246, 105, 215, 225, 43, 250, 0, 245, 124, 92, 221, 254, 244, 
-    175, 247, 255, 236, 0, 71, 250, 36, 236, 0, 85, 218, 234, 85, 215, 192, 
-    223, 60, 43, 245, 123, 223, 60, 43, 245, 122, 253, 211, 16, 31, 214, 145, 
-    114, 250, 36, 2, 218, 103, 22, 113, 170, 48, 225, 189, 222, 248, 235, 
-    205, 225, 189, 233, 43, 235, 205, 225, 189, 235, 193, 225, 189, 85, 249, 
-    131, 226, 197, 220, 29, 220, 17, 219, 229, 250, 61, 250, 226, 241, 157, 
-    219, 126, 243, 61, 211, 230, 240, 220, 243, 61, 2, 242, 12, 231, 173, 16, 
-    31, 232, 229, 230, 115, 214, 195, 226, 197, 242, 122, 244, 12, 244, 74, 
-    236, 0, 241, 59, 244, 129, 222, 14, 42, 244, 11, 249, 159, 219, 104, 240, 
-    112, 219, 107, 225, 168, 2, 252, 159, 216, 242, 235, 131, 252, 146, 87, 
-    241, 231, 242, 133, 87, 243, 232, 224, 142, 249, 103, 226, 197, 85, 218, 
-    234, 71, 244, 74, 2, 203, 230, 224, 85, 218, 104, 214, 160, 251, 217, 
-    221, 193, 85, 221, 193, 232, 108, 251, 217, 221, 193, 71, 221, 193, 71, 
-    114, 250, 130, 78, 217, 1, 232, 154, 50, 217, 53, 246, 88, 254, 191, 245, 
-    119, 223, 157, 244, 85, 223, 157, 242, 15, 213, 174, 242, 15, 211, 198, 
-    242, 15, 232, 108, 44, 225, 198, 225, 198, 214, 160, 44, 225, 198, 71, 
-    228, 230, 85, 228, 230, 250, 130, 78, 114, 250, 130, 78, 230, 84, 211, 
-    178, 114, 230, 84, 211, 178, 252, 156, 211, 178, 114, 252, 156, 211, 178, 
-    226, 126, 26, 249, 130, 114, 26, 249, 130, 204, 250, 175, 249, 130, 114, 
-    204, 250, 175, 249, 130, 7, 249, 130, 220, 91, 71, 7, 249, 130, 226, 126, 
-    7, 249, 130, 231, 187, 249, 130, 218, 157, 64, 248, 149, 244, 11, 217, 
-    15, 253, 216, 244, 11, 252, 157, 253, 216, 114, 244, 11, 252, 157, 253, 
-    216, 244, 11, 249, 243, 253, 216, 85, 244, 11, 225, 9, 218, 156, 71, 244, 
-    11, 225, 9, 218, 156, 219, 11, 218, 111, 226, 126, 71, 218, 156, 37, 71, 
-    218, 156, 204, 250, 175, 85, 218, 156, 85, 250, 175, 71, 218, 156, 226, 
-    126, 85, 218, 156, 114, 226, 126, 85, 218, 156, 225, 60, 218, 156, 220, 
-    91, 71, 218, 156, 114, 253, 216, 204, 250, 175, 253, 216, 245, 193, 218, 
-    244, 253, 216, 245, 193, 225, 9, 85, 218, 156, 245, 193, 225, 9, 225, 60, 
-    218, 156, 219, 125, 225, 9, 85, 218, 156, 245, 193, 225, 9, 223, 114, 85, 
-    218, 156, 114, 245, 193, 225, 9, 223, 114, 85, 218, 156, 215, 77, 225, 9, 
-    85, 218, 156, 219, 120, 225, 9, 253, 216, 217, 15, 253, 216, 204, 250, 
-    175, 217, 15, 253, 216, 114, 217, 15, 253, 216, 219, 125, 225, 157, 85, 
-    22, 71, 244, 54, 85, 244, 54, 71, 244, 54, 245, 193, 225, 157, 226, 126, 
-    85, 244, 54, 37, 204, 250, 175, 245, 193, 225, 9, 218, 156, 114, 217, 15, 
-    225, 60, 253, 216, 219, 62, 216, 105, 215, 218, 219, 62, 114, 250, 114, 
-    219, 62, 219, 13, 114, 219, 13, 252, 157, 253, 216, 245, 193, 217, 15, 
-    224, 171, 253, 216, 114, 245, 193, 217, 15, 224, 171, 253, 216, 249, 131, 
-    78, 220, 91, 71, 250, 35, 152, 92, 249, 131, 78, 232, 108, 44, 246, 86, 
-    71, 218, 234, 214, 160, 44, 246, 86, 71, 218, 234, 232, 108, 44, 220, 91, 
-    71, 218, 234, 214, 160, 44, 220, 91, 71, 218, 234, 85, 224, 13, 164, 226, 
-    147, 71, 224, 13, 164, 226, 147, 71, 245, 31, 164, 226, 147, 85, 247, 
-    249, 230, 182, 71, 211, 178, 114, 245, 31, 164, 87, 192, 67, 130, 231, 
-    82, 67, 130, 114, 67, 130, 114, 219, 155, 215, 94, 249, 220, 223, 254, 
-    164, 226, 147, 114, 219, 155, 249, 220, 223, 254, 164, 226, 147, 114, 52, 
-    215, 94, 249, 220, 223, 254, 164, 226, 147, 114, 52, 249, 220, 223, 254, 
-    164, 226, 147, 114, 121, 219, 155, 249, 220, 223, 254, 164, 226, 147, 
-    114, 121, 52, 249, 220, 223, 254, 164, 226, 147, 249, 91, 218, 140, 226, 
-    15, 5, 226, 147, 114, 245, 31, 164, 226, 147, 114, 241, 228, 245, 31, 
-    164, 226, 147, 114, 85, 241, 227, 222, 187, 114, 85, 241, 228, 251, 113, 
-    244, 55, 241, 227, 222, 187, 244, 55, 241, 228, 251, 113, 231, 82, 43, 
-    226, 4, 226, 147, 231, 82, 44, 226, 4, 226, 147, 231, 82, 244, 63, 43, 
-    226, 4, 226, 147, 231, 82, 244, 63, 44, 226, 4, 226, 147, 231, 82, 233, 
-    42, 254, 110, 251, 158, 226, 147, 231, 82, 222, 247, 254, 110, 251, 158, 
-    226, 147, 114, 233, 42, 254, 110, 223, 254, 164, 226, 147, 114, 222, 247, 
-    254, 110, 223, 254, 164, 226, 147, 114, 233, 42, 254, 110, 251, 158, 226, 
-    147, 114, 222, 247, 254, 110, 251, 158, 226, 147, 192, 43, 216, 6, 220, 
-    53, 251, 158, 226, 147, 192, 44, 216, 6, 220, 53, 251, 158, 226, 147, 
-    231, 82, 43, 249, 99, 251, 158, 226, 147, 231, 82, 44, 249, 99, 251, 158, 
-    226, 147, 247, 204, 152, 37, 21, 110, 247, 204, 152, 37, 21, 105, 247, 
-    204, 152, 37, 21, 158, 247, 204, 152, 37, 21, 161, 247, 204, 152, 37, 21, 
-    189, 247, 204, 152, 37, 21, 194, 247, 204, 152, 37, 21, 198, 247, 204, 
-    152, 37, 21, 195, 247, 204, 152, 37, 21, 200, 247, 204, 152, 37, 54, 216, 
-    247, 247, 204, 37, 35, 21, 110, 247, 204, 37, 35, 21, 105, 247, 204, 37, 
-    35, 21, 158, 247, 204, 37, 35, 21, 161, 247, 204, 37, 35, 21, 189, 247, 
-    204, 37, 35, 21, 194, 247, 204, 37, 35, 21, 198, 247, 204, 37, 35, 21, 
-    195, 247, 204, 37, 35, 21, 200, 247, 204, 37, 35, 54, 216, 247, 247, 204, 
-    152, 37, 35, 21, 110, 247, 204, 152, 37, 35, 21, 105, 247, 204, 152, 37, 
-    35, 21, 158, 247, 204, 152, 37, 35, 21, 161, 247, 204, 152, 37, 35, 21, 
-    189, 247, 204, 152, 37, 35, 21, 194, 247, 204, 152, 37, 35, 21, 198, 247, 
-    204, 152, 37, 35, 21, 195, 247, 204, 152, 37, 35, 21, 200, 247, 204, 152, 
-    37, 35, 54, 216, 247, 114, 211, 246, 97, 74, 114, 96, 50, 114, 230, 182, 
-    50, 114, 247, 169, 50, 114, 219, 28, 245, 220, 74, 114, 97, 74, 114, 228, 
-    56, 245, 220, 74, 246, 98, 225, 11, 97, 74, 114, 222, 184, 97, 74, 215, 
-    224, 97, 74, 114, 215, 224, 97, 74, 248, 155, 215, 224, 97, 74, 114, 248, 
-    155, 215, 224, 97, 74, 85, 97, 74, 216, 144, 216, 12, 97, 253, 249, 216, 
-    144, 251, 173, 97, 253, 249, 85, 97, 253, 249, 114, 85, 249, 91, 246, 
-    104, 22, 97, 74, 114, 85, 249, 91, 214, 153, 22, 97, 74, 218, 231, 85, 
-    97, 74, 114, 249, 206, 85, 97, 74, 222, 246, 71, 97, 74, 233, 41, 71, 97, 
-    74, 252, 183, 220, 91, 71, 97, 74, 243, 241, 220, 91, 71, 97, 74, 114, 
-    232, 108, 222, 245, 71, 97, 74, 114, 214, 160, 222, 245, 71, 97, 74, 228, 
-    49, 232, 108, 222, 245, 71, 97, 74, 249, 99, 232, 123, 228, 49, 214, 160, 
-    222, 245, 71, 97, 74, 37, 114, 71, 97, 74, 211, 252, 97, 74, 251, 220, 
-    219, 28, 245, 220, 74, 251, 220, 97, 74, 251, 220, 228, 56, 245, 220, 74, 
-    114, 251, 220, 219, 28, 245, 220, 74, 114, 251, 220, 97, 74, 114, 251, 
-    220, 228, 56, 245, 220, 74, 217, 17, 97, 74, 114, 217, 16, 97, 74, 212, 
-    18, 97, 74, 114, 212, 18, 97, 74, 226, 172, 97, 74, 52, 249, 99, 232, 
-    123, 134, 247, 214, 254, 109, 71, 215, 226, 249, 187, 4, 71, 215, 225, 
-    225, 171, 204, 218, 63, 204, 218, 21, 43, 222, 90, 252, 173, 248, 60, 44, 
-    222, 90, 252, 173, 248, 60, 177, 2, 59, 235, 215, 223, 50, 219, 47, 224, 
-    201, 218, 63, 218, 22, 224, 201, 219, 46, 67, 252, 141, 2, 203, 91, 11, 
-    222, 228, 247, 254, 199, 247, 168, 11, 244, 175, 247, 254, 92, 232, 146, 
-    254, 118, 92, 232, 146, 226, 158, 71, 247, 249, 2, 250, 173, 247, 120, 
-    22, 2, 247, 120, 245, 170, 64, 226, 170, 214, 152, 232, 108, 44, 249, 
-    161, 2, 247, 120, 214, 160, 43, 249, 161, 2, 247, 120, 43, 226, 128, 235, 
-    66, 44, 226, 128, 235, 66, 243, 229, 226, 128, 235, 66, 233, 85, 120, 
-    217, 87, 233, 85, 124, 217, 87, 43, 22, 44, 52, 215, 93, 43, 22, 44, 217, 
-    87, 43, 230, 87, 199, 44, 217, 87, 199, 43, 217, 87, 120, 217, 88, 2, 
-    250, 36, 48, 232, 105, 247, 173, 251, 78, 203, 222, 133, 71, 249, 205, 
-    247, 248, 71, 249, 205, 247, 249, 2, 140, 216, 114, 71, 249, 205, 247, 
-    249, 2, 97, 216, 114, 71, 42, 2, 140, 216, 114, 71, 42, 2, 97, 216, 114, 
-    11, 43, 71, 42, 127, 11, 44, 71, 42, 127, 11, 43, 254, 110, 127, 11, 44, 
-    254, 110, 127, 11, 43, 52, 254, 110, 127, 11, 44, 52, 254, 110, 127, 11, 
-    43, 71, 216, 6, 220, 53, 127, 11, 44, 71, 216, 6, 220, 53, 127, 11, 43, 
-    244, 63, 226, 3, 11, 44, 244, 63, 226, 3, 214, 153, 224, 24, 74, 246, 
-    104, 224, 24, 74, 254, 88, 243, 98, 250, 36, 74, 250, 2, 243, 98, 250, 
-    36, 74, 44, 80, 2, 37, 225, 22, 199, 140, 74, 199, 97, 74, 199, 43, 44, 
-    74, 199, 140, 52, 74, 199, 97, 52, 74, 199, 43, 44, 52, 74, 199, 140, 80, 
-    243, 243, 130, 199, 97, 80, 243, 243, 130, 199, 140, 52, 80, 243, 243, 
-    130, 199, 97, 52, 80, 243, 243, 130, 199, 97, 218, 230, 74, 46, 47, 251, 
-    215, 46, 47, 247, 117, 46, 47, 246, 245, 46, 47, 247, 116, 46, 47, 246, 
-    181, 46, 47, 247, 52, 46, 47, 246, 244, 46, 47, 247, 115, 46, 47, 246, 
-    149, 46, 47, 247, 20, 46, 47, 246, 212, 46, 47, 247, 83, 46, 47, 246, 
-    180, 46, 47, 247, 51, 46, 47, 246, 243, 46, 47, 247, 114, 46, 47, 246, 
-    133, 46, 47, 247, 4, 46, 47, 246, 196, 46, 47, 247, 67, 46, 47, 246, 164, 
-    46, 47, 247, 35, 46, 47, 246, 227, 46, 47, 247, 98, 46, 47, 246, 148, 46, 
-    47, 247, 19, 46, 47, 246, 211, 46, 47, 247, 82, 46, 47, 246, 179, 46, 47, 
-    247, 50, 46, 47, 246, 242, 46, 47, 247, 113, 46, 47, 246, 125, 46, 47, 
-    246, 252, 46, 47, 246, 188, 46, 47, 247, 59, 46, 47, 246, 156, 46, 47, 
-    247, 27, 46, 47, 246, 219, 46, 47, 247, 90, 46, 47, 246, 140, 46, 47, 
-    247, 11, 46, 47, 246, 203, 46, 47, 247, 74, 46, 47, 246, 171, 46, 47, 
-    247, 42, 46, 47, 246, 234, 46, 47, 247, 105, 46, 47, 246, 132, 46, 47, 
-    247, 3, 46, 47, 246, 195, 46, 47, 247, 66, 46, 47, 246, 163, 46, 47, 247, 
-    34, 46, 47, 246, 226, 46, 47, 247, 97, 46, 47, 246, 147, 46, 47, 247, 18, 
-    46, 47, 246, 210, 46, 47, 247, 81, 46, 47, 246, 178, 46, 47, 247, 49, 46, 
-    47, 246, 241, 46, 47, 247, 112, 46, 47, 246, 121, 46, 47, 246, 248, 46, 
-    47, 246, 184, 46, 47, 247, 55, 46, 47, 246, 152, 46, 47, 247, 23, 46, 47, 
-    246, 215, 46, 47, 247, 86, 46, 47, 246, 136, 46, 47, 247, 7, 46, 47, 246, 
-    199, 46, 47, 247, 70, 46, 47, 246, 167, 46, 47, 247, 38, 46, 47, 246, 
-    230, 46, 47, 247, 101, 46, 47, 246, 128, 46, 47, 246, 255, 46, 47, 246, 
-    191, 46, 47, 247, 62, 46, 47, 246, 159, 46, 47, 247, 30, 46, 47, 246, 
-    222, 46, 47, 247, 93, 46, 47, 246, 143, 46, 47, 247, 14, 46, 47, 246, 
-    206, 46, 47, 247, 77, 46, 47, 246, 174, 46, 47, 247, 45, 46, 47, 246, 
-    237, 46, 47, 247, 108, 46, 47, 246, 124, 46, 47, 246, 251, 46, 47, 246, 
-    187, 46, 47, 247, 58, 46, 47, 246, 155, 46, 47, 247, 26, 46, 47, 246, 
-    218, 46, 47, 247, 89, 46, 47, 246, 139, 46, 47, 247, 10, 46, 47, 246, 
-    202, 46, 47, 247, 73, 46, 47, 246, 170, 46, 47, 247, 41, 46, 47, 246, 
-    233, 46, 47, 247, 104, 46, 47, 246, 131, 46, 47, 247, 2, 46, 47, 246, 
-    194, 46, 47, 247, 65, 46, 47, 246, 162, 46, 47, 247, 33, 46, 47, 246, 
-    225, 46, 47, 247, 96, 46, 47, 246, 146, 46, 47, 247, 17, 46, 47, 246, 
-    209, 46, 47, 247, 80, 46, 47, 246, 177, 46, 47, 247, 48, 46, 47, 246, 
-    240, 46, 47, 247, 111, 46, 47, 246, 119, 46, 47, 246, 246, 46, 47, 246, 
-    182, 46, 47, 247, 53, 46, 47, 246, 150, 46, 47, 247, 21, 46, 47, 246, 
-    213, 46, 47, 247, 84, 46, 47, 246, 134, 46, 47, 247, 5, 46, 47, 246, 197, 
-    46, 47, 247, 68, 46, 47, 246, 165, 46, 47, 247, 36, 46, 47, 246, 228, 46, 
-    47, 247, 99, 46, 47, 246, 126, 46, 47, 246, 253, 46, 47, 246, 189, 46, 
-    47, 247, 60, 46, 47, 246, 157, 46, 47, 247, 28, 46, 47, 246, 220, 46, 47, 
-    247, 91, 46, 47, 246, 141, 46, 47, 247, 12, 46, 47, 246, 204, 46, 47, 
-    247, 75, 46, 47, 246, 172, 46, 47, 247, 43, 46, 47, 246, 235, 46, 47, 
-    247, 106, 46, 47, 246, 122, 46, 47, 246, 249, 46, 47, 246, 185, 46, 47, 
-    247, 56, 46, 47, 246, 153, 46, 47, 247, 24, 46, 47, 246, 216, 46, 47, 
-    247, 87, 46, 47, 246, 137, 46, 47, 247, 8, 46, 47, 246, 200, 46, 47, 247, 
-    71, 46, 47, 246, 168, 46, 47, 247, 39, 46, 47, 246, 231, 46, 47, 247, 
-    102, 46, 47, 246, 129, 46, 47, 247, 0, 46, 47, 246, 192, 46, 47, 247, 63, 
-    46, 47, 246, 160, 46, 47, 247, 31, 46, 47, 246, 223, 46, 47, 247, 94, 46, 
-    47, 246, 144, 46, 47, 247, 15, 46, 47, 246, 207, 46, 47, 247, 78, 46, 47, 
-    246, 175, 46, 47, 247, 46, 46, 47, 246, 238, 46, 47, 247, 109, 46, 47, 
-    246, 120, 46, 47, 246, 247, 46, 47, 246, 183, 46, 47, 247, 54, 46, 47, 
-    246, 151, 46, 47, 247, 22, 46, 47, 246, 214, 46, 47, 247, 85, 46, 47, 
-    246, 135, 46, 47, 247, 6, 46, 47, 246, 198, 46, 47, 247, 69, 46, 47, 246, 
-    166, 46, 47, 247, 37, 46, 47, 246, 229, 46, 47, 247, 100, 46, 47, 246, 
-    127, 46, 47, 246, 254, 46, 47, 246, 190, 46, 47, 247, 61, 46, 47, 246, 
-    158, 46, 47, 247, 29, 46, 47, 246, 221, 46, 47, 247, 92, 46, 47, 246, 
-    142, 46, 47, 247, 13, 46, 47, 246, 205, 46, 47, 247, 76, 46, 47, 246, 
-    173, 46, 47, 247, 44, 46, 47, 246, 236, 46, 47, 247, 107, 46, 47, 246, 
-    123, 46, 47, 246, 250, 46, 47, 246, 186, 46, 47, 247, 57, 46, 47, 246, 
-    154, 46, 47, 247, 25, 46, 47, 246, 217, 46, 47, 247, 88, 46, 47, 246, 
-    138, 46, 47, 247, 9, 46, 47, 246, 201, 46, 47, 247, 72, 46, 47, 246, 169, 
-    46, 47, 247, 40, 46, 47, 246, 232, 46, 47, 247, 103, 46, 47, 246, 130, 
-    46, 47, 247, 1, 46, 47, 246, 193, 46, 47, 247, 64, 46, 47, 246, 161, 46, 
-    47, 247, 32, 46, 47, 246, 224, 46, 47, 247, 95, 46, 47, 246, 145, 46, 47, 
-    247, 16, 46, 47, 246, 208, 46, 47, 247, 79, 46, 47, 246, 176, 46, 47, 
-    247, 47, 46, 47, 246, 239, 46, 47, 247, 110, 97, 215, 58, 80, 2, 67, 91, 
+    241, 53, 48, 7, 4, 1, 160, 2, 241, 53, 48, 7, 6, 1, 160, 2, 183, 7, 4, 1, 
+    160, 2, 183, 7, 6, 1, 160, 2, 250, 32, 22, 142, 7, 4, 1, 160, 2, 250, 32, 
+    22, 142, 7, 6, 1, 160, 2, 250, 32, 22, 242, 137, 7, 4, 1, 160, 2, 250, 
+    32, 22, 242, 137, 7, 6, 1, 160, 2, 250, 32, 22, 241, 53, 48, 7, 4, 1, 
+    160, 2, 250, 32, 22, 241, 53, 48, 7, 6, 1, 160, 2, 250, 32, 22, 183, 7, 
+    4, 1, 160, 2, 250, 32, 22, 183, 7, 6, 1, 160, 2, 250, 32, 22, 59, 51, 7, 
+    4, 1, 160, 2, 250, 32, 22, 59, 51, 7, 6, 1, 240, 155, 2, 241, 53, 48, 7, 
+    4, 1, 240, 155, 2, 241, 53, 48, 7, 6, 1, 240, 155, 2, 59, 51, 7, 4, 1, 
+    240, 155, 2, 59, 51, 7, 6, 1, 144, 2, 59, 51, 7, 4, 1, 144, 2, 59, 51, 7, 
+    6, 1, 144, 2, 241, 53, 48, 7, 4, 1, 144, 2, 241, 53, 48, 7, 6, 1, 144, 2, 
+    250, 32, 22, 142, 7, 4, 1, 144, 2, 250, 32, 22, 142, 7, 6, 1, 144, 2, 
+    250, 32, 22, 242, 137, 7, 4, 1, 144, 2, 250, 32, 22, 242, 137, 7, 6, 1, 
+    144, 2, 250, 32, 22, 241, 53, 48, 7, 4, 1, 144, 2, 250, 32, 22, 241, 53, 
+    48, 7, 6, 1, 144, 2, 250, 32, 22, 183, 7, 4, 1, 144, 2, 250, 32, 22, 183, 
+    7, 6, 1, 144, 2, 250, 32, 22, 59, 51, 7, 4, 1, 144, 2, 250, 32, 22, 59, 
+    51, 7, 6, 1, 144, 2, 240, 250, 22, 142, 7, 4, 1, 144, 2, 240, 250, 22, 
+    142, 7, 6, 1, 144, 2, 240, 250, 22, 242, 137, 7, 4, 1, 144, 2, 240, 250, 
+    22, 242, 137, 7, 6, 1, 144, 2, 240, 250, 22, 241, 53, 48, 7, 4, 1, 144, 
+    2, 240, 250, 22, 241, 53, 48, 7, 6, 1, 144, 2, 240, 250, 22, 183, 7, 4, 
+    1, 144, 2, 240, 250, 22, 183, 7, 6, 1, 144, 2, 240, 250, 22, 59, 51, 7, 
+    4, 1, 144, 2, 240, 250, 22, 59, 51, 7, 6, 1, 104, 2, 59, 51, 7, 4, 1, 
+    104, 2, 59, 51, 7, 6, 1, 104, 2, 241, 53, 48, 7, 4, 1, 104, 2, 241, 53, 
+    48, 7, 6, 1, 104, 2, 240, 250, 22, 142, 7, 4, 1, 104, 2, 240, 250, 22, 
+    142, 7, 6, 1, 104, 2, 240, 250, 22, 242, 137, 7, 4, 1, 104, 2, 240, 250, 
+    22, 242, 137, 7, 6, 1, 104, 2, 240, 250, 22, 241, 53, 48, 7, 4, 1, 104, 
+    2, 240, 250, 22, 241, 53, 48, 7, 6, 1, 104, 2, 240, 250, 22, 183, 7, 4, 
+    1, 104, 2, 240, 250, 22, 183, 7, 6, 1, 104, 2, 240, 250, 22, 59, 51, 7, 
+    4, 1, 104, 2, 240, 250, 22, 59, 51, 7, 6, 1, 211, 118, 2, 242, 137, 7, 4, 
+    1, 211, 118, 2, 242, 137, 7, 6, 1, 211, 118, 2, 59, 51, 7, 4, 1, 211, 
+    118, 2, 59, 51, 7, 6, 1, 211, 118, 2, 241, 53, 48, 7, 4, 1, 211, 118, 2, 
+    241, 53, 48, 7, 6, 1, 211, 118, 2, 183, 7, 4, 1, 211, 118, 2, 183, 7, 6, 
+    1, 230, 224, 232, 186, 7, 4, 1, 230, 224, 232, 186, 7, 6, 1, 230, 224, 
+    214, 105, 7, 4, 1, 230, 224, 214, 105, 7, 6, 1, 211, 118, 2, 232, 124, 7, 
+    4, 1, 211, 118, 2, 232, 124, 26, 4, 1, 254, 145, 2, 224, 155, 26, 4, 1, 
+    254, 145, 2, 248, 154, 26, 4, 1, 254, 145, 2, 224, 156, 22, 214, 13, 26, 
+    4, 1, 254, 145, 2, 248, 155, 22, 214, 13, 26, 4, 1, 254, 145, 2, 224, 
+    156, 22, 226, 111, 26, 4, 1, 254, 145, 2, 248, 155, 22, 226, 111, 26, 4, 
+    1, 254, 145, 2, 224, 156, 22, 225, 176, 26, 4, 1, 254, 145, 2, 248, 155, 
+    22, 225, 176, 26, 6, 1, 254, 145, 2, 224, 155, 26, 6, 1, 254, 145, 2, 
+    248, 154, 26, 6, 1, 254, 145, 2, 224, 156, 22, 214, 13, 26, 6, 1, 254, 
+    145, 2, 248, 155, 22, 214, 13, 26, 6, 1, 254, 145, 2, 224, 156, 22, 226, 
+    111, 26, 6, 1, 254, 145, 2, 248, 155, 22, 226, 111, 26, 6, 1, 254, 145, 
+    2, 224, 156, 22, 225, 176, 26, 6, 1, 254, 145, 2, 248, 155, 22, 225, 176, 
+    26, 4, 1, 245, 102, 2, 224, 155, 26, 4, 1, 245, 102, 2, 248, 154, 26, 4, 
+    1, 245, 102, 2, 224, 156, 22, 214, 13, 26, 4, 1, 245, 102, 2, 248, 155, 
+    22, 214, 13, 26, 4, 1, 245, 102, 2, 224, 156, 22, 226, 111, 26, 4, 1, 
+    245, 102, 2, 248, 155, 22, 226, 111, 26, 6, 1, 245, 102, 2, 224, 155, 26, 
+    6, 1, 245, 102, 2, 248, 154, 26, 6, 1, 245, 102, 2, 224, 156, 22, 214, 
+    13, 26, 6, 1, 245, 102, 2, 248, 155, 22, 214, 13, 26, 6, 1, 245, 102, 2, 
+    224, 156, 22, 226, 111, 26, 6, 1, 245, 102, 2, 248, 155, 22, 226, 111, 
+    26, 4, 1, 245, 65, 2, 224, 155, 26, 4, 1, 245, 65, 2, 248, 154, 26, 4, 1, 
+    245, 65, 2, 224, 156, 22, 214, 13, 26, 4, 1, 245, 65, 2, 248, 155, 22, 
+    214, 13, 26, 4, 1, 245, 65, 2, 224, 156, 22, 226, 111, 26, 4, 1, 245, 65, 
+    2, 248, 155, 22, 226, 111, 26, 4, 1, 245, 65, 2, 224, 156, 22, 225, 176, 
+    26, 4, 1, 245, 65, 2, 248, 155, 22, 225, 176, 26, 6, 1, 245, 65, 2, 224, 
+    155, 26, 6, 1, 245, 65, 2, 248, 154, 26, 6, 1, 245, 65, 2, 224, 156, 22, 
+    214, 13, 26, 6, 1, 245, 65, 2, 248, 155, 22, 214, 13, 26, 6, 1, 245, 65, 
+    2, 224, 156, 22, 226, 111, 26, 6, 1, 245, 65, 2, 248, 155, 22, 226, 111, 
+    26, 6, 1, 245, 65, 2, 224, 156, 22, 225, 176, 26, 6, 1, 245, 65, 2, 248, 
+    155, 22, 225, 176, 26, 4, 1, 235, 187, 2, 224, 155, 26, 4, 1, 235, 187, 
+    2, 248, 154, 26, 4, 1, 235, 187, 2, 224, 156, 22, 214, 13, 26, 4, 1, 235, 
+    187, 2, 248, 155, 22, 214, 13, 26, 4, 1, 235, 187, 2, 224, 156, 22, 226, 
+    111, 26, 4, 1, 235, 187, 2, 248, 155, 22, 226, 111, 26, 4, 1, 235, 187, 
+    2, 224, 156, 22, 225, 176, 26, 4, 1, 235, 187, 2, 248, 155, 22, 225, 176, 
+    26, 6, 1, 235, 187, 2, 224, 155, 26, 6, 1, 235, 187, 2, 248, 154, 26, 6, 
+    1, 235, 187, 2, 224, 156, 22, 214, 13, 26, 6, 1, 235, 187, 2, 248, 155, 
+    22, 214, 13, 26, 6, 1, 235, 187, 2, 224, 156, 22, 226, 111, 26, 6, 1, 
+    235, 187, 2, 248, 155, 22, 226, 111, 26, 6, 1, 235, 187, 2, 224, 156, 22, 
+    225, 176, 26, 6, 1, 235, 187, 2, 248, 155, 22, 225, 176, 26, 4, 1, 226, 
+    201, 2, 224, 155, 26, 4, 1, 226, 201, 2, 248, 154, 26, 4, 1, 226, 201, 2, 
+    224, 156, 22, 214, 13, 26, 4, 1, 226, 201, 2, 248, 155, 22, 214, 13, 26, 
+    4, 1, 226, 201, 2, 224, 156, 22, 226, 111, 26, 4, 1, 226, 201, 2, 248, 
+    155, 22, 226, 111, 26, 6, 1, 226, 201, 2, 224, 155, 26, 6, 1, 226, 201, 
+    2, 248, 154, 26, 6, 1, 226, 201, 2, 224, 156, 22, 214, 13, 26, 6, 1, 226, 
+    201, 2, 248, 155, 22, 214, 13, 26, 6, 1, 226, 201, 2, 224, 156, 22, 226, 
+    111, 26, 6, 1, 226, 201, 2, 248, 155, 22, 226, 111, 26, 4, 1, 214, 158, 
+    2, 224, 155, 26, 4, 1, 214, 158, 2, 248, 154, 26, 4, 1, 214, 158, 2, 224, 
+    156, 22, 214, 13, 26, 4, 1, 214, 158, 2, 248, 155, 22, 214, 13, 26, 4, 1, 
+    214, 158, 2, 224, 156, 22, 226, 111, 26, 4, 1, 214, 158, 2, 248, 155, 22, 
+    226, 111, 26, 4, 1, 214, 158, 2, 224, 156, 22, 225, 176, 26, 4, 1, 214, 
+    158, 2, 248, 155, 22, 225, 176, 26, 6, 1, 214, 158, 2, 248, 154, 26, 6, 
+    1, 214, 158, 2, 248, 155, 22, 214, 13, 26, 6, 1, 214, 158, 2, 248, 155, 
+    22, 226, 111, 26, 6, 1, 214, 158, 2, 248, 155, 22, 225, 176, 26, 4, 1, 
+    226, 203, 2, 224, 155, 26, 4, 1, 226, 203, 2, 248, 154, 26, 4, 1, 226, 
+    203, 2, 224, 156, 22, 214, 13, 26, 4, 1, 226, 203, 2, 248, 155, 22, 214, 
+    13, 26, 4, 1, 226, 203, 2, 224, 156, 22, 226, 111, 26, 4, 1, 226, 203, 2, 
+    248, 155, 22, 226, 111, 26, 4, 1, 226, 203, 2, 224, 156, 22, 225, 176, 
+    26, 4, 1, 226, 203, 2, 248, 155, 22, 225, 176, 26, 6, 1, 226, 203, 2, 
+    224, 155, 26, 6, 1, 226, 203, 2, 248, 154, 26, 6, 1, 226, 203, 2, 224, 
+    156, 22, 214, 13, 26, 6, 1, 226, 203, 2, 248, 155, 22, 214, 13, 26, 6, 1, 
+    226, 203, 2, 224, 156, 22, 226, 111, 26, 6, 1, 226, 203, 2, 248, 155, 22, 
+    226, 111, 26, 6, 1, 226, 203, 2, 224, 156, 22, 225, 176, 26, 6, 1, 226, 
+    203, 2, 248, 155, 22, 225, 176, 26, 4, 1, 254, 145, 2, 214, 13, 26, 4, 1, 
+    254, 145, 2, 226, 111, 26, 4, 1, 245, 102, 2, 214, 13, 26, 4, 1, 245, 
+    102, 2, 226, 111, 26, 4, 1, 245, 65, 2, 214, 13, 26, 4, 1, 245, 65, 2, 
+    226, 111, 26, 4, 1, 235, 187, 2, 214, 13, 26, 4, 1, 235, 187, 2, 226, 
+    111, 26, 4, 1, 226, 201, 2, 214, 13, 26, 4, 1, 226, 201, 2, 226, 111, 26, 
+    4, 1, 214, 158, 2, 214, 13, 26, 4, 1, 214, 158, 2, 226, 111, 26, 4, 1, 
+    226, 203, 2, 214, 13, 26, 4, 1, 226, 203, 2, 226, 111, 26, 4, 1, 254, 
+    145, 2, 224, 156, 22, 210, 219, 26, 4, 1, 254, 145, 2, 248, 155, 22, 210, 
+    219, 26, 4, 1, 254, 145, 2, 224, 156, 22, 214, 14, 22, 210, 219, 26, 4, 
+    1, 254, 145, 2, 248, 155, 22, 214, 14, 22, 210, 219, 26, 4, 1, 254, 145, 
+    2, 224, 156, 22, 226, 112, 22, 210, 219, 26, 4, 1, 254, 145, 2, 248, 155, 
+    22, 226, 112, 22, 210, 219, 26, 4, 1, 254, 145, 2, 224, 156, 22, 225, 
+    177, 22, 210, 219, 26, 4, 1, 254, 145, 2, 248, 155, 22, 225, 177, 22, 
+    210, 219, 26, 6, 1, 254, 145, 2, 224, 156, 22, 224, 168, 26, 6, 1, 254, 
+    145, 2, 248, 155, 22, 224, 168, 26, 6, 1, 254, 145, 2, 224, 156, 22, 214, 
+    14, 22, 224, 168, 26, 6, 1, 254, 145, 2, 248, 155, 22, 214, 14, 22, 224, 
+    168, 26, 6, 1, 254, 145, 2, 224, 156, 22, 226, 112, 22, 224, 168, 26, 6, 
+    1, 254, 145, 2, 248, 155, 22, 226, 112, 22, 224, 168, 26, 6, 1, 254, 145, 
+    2, 224, 156, 22, 225, 177, 22, 224, 168, 26, 6, 1, 254, 145, 2, 248, 155, 
+    22, 225, 177, 22, 224, 168, 26, 4, 1, 245, 65, 2, 224, 156, 22, 210, 219, 
+    26, 4, 1, 245, 65, 2, 248, 155, 22, 210, 219, 26, 4, 1, 245, 65, 2, 224, 
+    156, 22, 214, 14, 22, 210, 219, 26, 4, 1, 245, 65, 2, 248, 155, 22, 214, 
+    14, 22, 210, 219, 26, 4, 1, 245, 65, 2, 224, 156, 22, 226, 112, 22, 210, 
+    219, 26, 4, 1, 245, 65, 2, 248, 155, 22, 226, 112, 22, 210, 219, 26, 4, 
+    1, 245, 65, 2, 224, 156, 22, 225, 177, 22, 210, 219, 26, 4, 1, 245, 65, 
+    2, 248, 155, 22, 225, 177, 22, 210, 219, 26, 6, 1, 245, 65, 2, 224, 156, 
+    22, 224, 168, 26, 6, 1, 245, 65, 2, 248, 155, 22, 224, 168, 26, 6, 1, 
+    245, 65, 2, 224, 156, 22, 214, 14, 22, 224, 168, 26, 6, 1, 245, 65, 2, 
+    248, 155, 22, 214, 14, 22, 224, 168, 26, 6, 1, 245, 65, 2, 224, 156, 22, 
+    226, 112, 22, 224, 168, 26, 6, 1, 245, 65, 2, 248, 155, 22, 226, 112, 22, 
+    224, 168, 26, 6, 1, 245, 65, 2, 224, 156, 22, 225, 177, 22, 224, 168, 26, 
+    6, 1, 245, 65, 2, 248, 155, 22, 225, 177, 22, 224, 168, 26, 4, 1, 226, 
+    203, 2, 224, 156, 22, 210, 219, 26, 4, 1, 226, 203, 2, 248, 155, 22, 210, 
+    219, 26, 4, 1, 226, 203, 2, 224, 156, 22, 214, 14, 22, 210, 219, 26, 4, 
+    1, 226, 203, 2, 248, 155, 22, 214, 14, 22, 210, 219, 26, 4, 1, 226, 203, 
+    2, 224, 156, 22, 226, 112, 22, 210, 219, 26, 4, 1, 226, 203, 2, 248, 155, 
+    22, 226, 112, 22, 210, 219, 26, 4, 1, 226, 203, 2, 224, 156, 22, 225, 
+    177, 22, 210, 219, 26, 4, 1, 226, 203, 2, 248, 155, 22, 225, 177, 22, 
+    210, 219, 26, 6, 1, 226, 203, 2, 224, 156, 22, 224, 168, 26, 6, 1, 226, 
+    203, 2, 248, 155, 22, 224, 168, 26, 6, 1, 226, 203, 2, 224, 156, 22, 214, 
+    14, 22, 224, 168, 26, 6, 1, 226, 203, 2, 248, 155, 22, 214, 14, 22, 224, 
+    168, 26, 6, 1, 226, 203, 2, 224, 156, 22, 226, 112, 22, 224, 168, 26, 6, 
+    1, 226, 203, 2, 248, 155, 22, 226, 112, 22, 224, 168, 26, 6, 1, 226, 203, 
+    2, 224, 156, 22, 225, 177, 22, 224, 168, 26, 6, 1, 226, 203, 2, 248, 155, 
+    22, 225, 177, 22, 224, 168, 26, 4, 1, 254, 145, 2, 213, 120, 26, 4, 1, 
+    254, 145, 2, 231, 233, 26, 4, 1, 254, 145, 2, 214, 14, 22, 210, 219, 26, 
+    4, 1, 254, 145, 2, 210, 219, 26, 4, 1, 254, 145, 2, 226, 112, 22, 210, 
+    219, 26, 4, 1, 254, 145, 2, 225, 176, 26, 4, 1, 254, 145, 2, 225, 177, 
+    22, 210, 219, 26, 6, 1, 254, 145, 2, 213, 120, 26, 6, 1, 254, 145, 2, 
+    231, 233, 26, 6, 1, 254, 145, 2, 214, 13, 26, 6, 1, 254, 145, 2, 226, 
+    111, 26, 6, 1, 254, 145, 2, 224, 168, 26, 234, 3, 26, 224, 168, 26, 224, 
+    155, 26, 225, 176, 26, 247, 253, 22, 225, 176, 26, 4, 1, 245, 65, 2, 214, 
+    14, 22, 210, 219, 26, 4, 1, 245, 65, 2, 210, 219, 26, 4, 1, 245, 65, 2, 
+    226, 112, 22, 210, 219, 26, 4, 1, 245, 65, 2, 225, 176, 26, 4, 1, 245, 
+    65, 2, 225, 177, 22, 210, 219, 26, 6, 1, 245, 102, 2, 214, 13, 26, 6, 1, 
+    245, 102, 2, 226, 111, 26, 6, 1, 245, 65, 2, 214, 13, 26, 6, 1, 245, 65, 
+    2, 226, 111, 26, 6, 1, 245, 65, 2, 224, 168, 26, 224, 156, 22, 214, 13, 
+    26, 224, 156, 22, 226, 111, 26, 224, 156, 22, 225, 176, 26, 4, 1, 235, 
+    187, 2, 213, 120, 26, 4, 1, 235, 187, 2, 231, 233, 26, 4, 1, 235, 187, 2, 
+    247, 253, 22, 214, 13, 26, 4, 1, 235, 187, 2, 247, 253, 22, 226, 111, 26, 
+    4, 1, 235, 187, 2, 225, 176, 26, 4, 1, 235, 187, 2, 247, 253, 22, 225, 
+    176, 26, 6, 1, 235, 187, 2, 213, 120, 26, 6, 1, 235, 187, 2, 231, 233, 
+    26, 6, 1, 235, 187, 2, 214, 13, 26, 6, 1, 235, 187, 2, 226, 111, 26, 248, 
+    155, 22, 214, 13, 26, 248, 155, 22, 226, 111, 26, 248, 155, 22, 225, 176, 
+    26, 4, 1, 214, 158, 2, 213, 120, 26, 4, 1, 214, 158, 2, 231, 233, 26, 4, 
+    1, 214, 158, 2, 247, 253, 22, 214, 13, 26, 4, 1, 214, 158, 2, 247, 253, 
+    22, 226, 111, 26, 4, 1, 223, 39, 2, 224, 155, 26, 4, 1, 223, 39, 2, 248, 
+    154, 26, 4, 1, 214, 158, 2, 225, 176, 26, 4, 1, 214, 158, 2, 247, 253, 
+    22, 225, 176, 26, 6, 1, 214, 158, 2, 213, 120, 26, 6, 1, 214, 158, 2, 
+    231, 233, 26, 6, 1, 214, 158, 2, 214, 13, 26, 6, 1, 214, 158, 2, 226, 
+    111, 26, 6, 1, 223, 39, 2, 248, 154, 26, 247, 253, 22, 214, 13, 26, 247, 
+    253, 22, 226, 111, 26, 214, 13, 26, 4, 1, 226, 203, 2, 214, 14, 22, 210, 
+    219, 26, 4, 1, 226, 203, 2, 210, 219, 26, 4, 1, 226, 203, 2, 226, 112, 
+    22, 210, 219, 26, 4, 1, 226, 203, 2, 225, 176, 26, 4, 1, 226, 203, 2, 
+    225, 177, 22, 210, 219, 26, 6, 1, 226, 201, 2, 214, 13, 26, 6, 1, 226, 
+    201, 2, 226, 111, 26, 6, 1, 226, 203, 2, 214, 13, 26, 6, 1, 226, 203, 2, 
+    226, 111, 26, 6, 1, 226, 203, 2, 224, 168, 26, 226, 111, 26, 248, 154, 
+    245, 152, 224, 28, 245, 161, 224, 28, 245, 152, 219, 19, 245, 161, 219, 
+    19, 216, 142, 219, 19, 244, 10, 219, 19, 219, 124, 219, 19, 244, 113, 
+    219, 19, 224, 142, 219, 19, 216, 171, 219, 19, 242, 36, 219, 19, 210, 87, 
+    211, 245, 219, 19, 210, 87, 211, 245, 228, 68, 210, 87, 211, 245, 235, 
+    64, 233, 39, 78, 222, 244, 78, 240, 169, 228, 69, 240, 169, 244, 113, 
+    248, 157, 245, 152, 248, 157, 245, 161, 248, 157, 203, 130, 52, 67, 232, 
+    214, 52, 121, 232, 214, 43, 219, 156, 223, 255, 78, 44, 219, 156, 223, 
+    255, 78, 219, 156, 232, 110, 223, 255, 78, 219, 156, 241, 164, 223, 255, 
+    78, 43, 52, 223, 255, 78, 44, 52, 223, 255, 78, 52, 232, 110, 223, 255, 
+    78, 52, 241, 164, 223, 255, 78, 248, 206, 52, 248, 206, 251, 114, 215, 
+    223, 251, 114, 123, 59, 233, 57, 113, 59, 233, 57, 203, 245, 164, 240, 
+    167, 225, 11, 232, 215, 220, 138, 226, 16, 220, 138, 233, 39, 245, 159, 
+    222, 244, 245, 159, 224, 247, 247, 197, 244, 20, 233, 39, 226, 118, 222, 
+    244, 226, 118, 229, 195, 228, 74, 219, 19, 225, 184, 230, 194, 50, 225, 
+    184, 216, 249, 216, 149, 50, 224, 191, 52, 224, 191, 215, 212, 224, 191, 
+    223, 50, 224, 191, 223, 50, 52, 224, 191, 223, 50, 215, 212, 224, 191, 
+    250, 239, 219, 156, 233, 43, 254, 111, 223, 255, 78, 219, 156, 222, 248, 
+    254, 111, 223, 255, 78, 223, 108, 78, 52, 245, 32, 78, 235, 202, 226, 
+    120, 214, 180, 135, 216, 112, 250, 240, 235, 217, 225, 11, 253, 215, 240, 
+    170, 251, 114, 244, 3, 219, 96, 43, 42, 251, 159, 2, 224, 8, 44, 42, 251, 
+    159, 2, 224, 8, 52, 224, 14, 78, 224, 14, 245, 32, 78, 245, 32, 224, 14, 
+    78, 216, 71, 5, 245, 66, 223, 50, 225, 69, 50, 85, 140, 251, 114, 85, 97, 
+    251, 114, 121, 253, 217, 223, 50, 220, 151, 250, 2, 214, 163, 113, 253, 
+    216, 254, 159, 213, 188, 249, 218, 230, 183, 50, 217, 235, 248, 157, 235, 
+    194, 214, 180, 244, 53, 224, 142, 78, 134, 59, 224, 141, 224, 25, 224, 
+    191, 244, 12, 59, 224, 141, 244, 82, 59, 224, 141, 113, 59, 224, 141, 
+    244, 12, 59, 78, 246, 119, 249, 131, 215, 222, 67, 244, 12, 247, 119, 
+    231, 83, 11, 219, 19, 211, 209, 235, 64, 243, 228, 254, 53, 235, 192, 
+    216, 86, 235, 192, 220, 138, 235, 192, 225, 23, 235, 229, 217, 183, 217, 
+    252, 255, 6, 217, 183, 217, 252, 235, 229, 10, 244, 21, 220, 81, 255, 6, 
+    10, 244, 21, 220, 81, 229, 190, 21, 220, 82, 228, 70, 21, 220, 82, 218, 
+    24, 210, 86, 218, 24, 7, 4, 1, 73, 218, 24, 161, 218, 24, 189, 218, 24, 
+    194, 218, 24, 198, 218, 24, 195, 218, 24, 200, 218, 24, 96, 50, 218, 24, 
+    230, 182, 218, 24, 245, 99, 50, 218, 24, 43, 226, 4, 218, 24, 44, 226, 4, 
+    218, 24, 7, 4, 1, 230, 26, 218, 66, 210, 86, 218, 66, 110, 218, 66, 105, 
+    218, 66, 158, 218, 66, 161, 218, 66, 189, 218, 66, 194, 218, 66, 198, 
+    218, 66, 195, 218, 66, 200, 218, 66, 96, 50, 218, 66, 230, 182, 218, 66, 
+    245, 99, 50, 218, 66, 43, 226, 4, 218, 66, 44, 226, 4, 7, 218, 66, 4, 1, 
+    61, 7, 218, 66, 4, 1, 75, 7, 218, 66, 4, 1, 76, 7, 218, 66, 4, 1, 211, 
+    178, 7, 218, 66, 4, 1, 221, 196, 7, 218, 66, 4, 1, 242, 61, 7, 218, 66, 
+    4, 1, 235, 24, 7, 218, 66, 4, 1, 156, 7, 218, 66, 4, 1, 193, 7, 218, 66, 
+    4, 1, 230, 26, 7, 218, 66, 4, 1, 226, 106, 7, 218, 66, 4, 1, 222, 92, 7, 
+    218, 66, 4, 1, 217, 153, 245, 47, 50, 249, 228, 50, 249, 118, 50, 243, 
+    252, 243, 255, 50, 232, 199, 50, 230, 195, 50, 229, 211, 50, 225, 163, 
+    50, 222, 119, 50, 211, 217, 50, 166, 220, 50, 50, 247, 128, 50, 245, 48, 
+    50, 234, 77, 50, 215, 113, 50, 246, 102, 50, 243, 41, 225, 194, 50, 225, 
+    161, 50, 242, 110, 50, 253, 183, 50, 240, 229, 50, 250, 186, 50, 232, 
+    192, 216, 4, 50, 219, 1, 50, 216, 246, 50, 235, 242, 222, 119, 50, 215, 
+    97, 232, 199, 50, 38, 43, 242, 0, 48, 38, 44, 242, 0, 48, 38, 199, 67, 
+    232, 215, 226, 121, 38, 219, 252, 67, 232, 215, 226, 121, 38, 254, 89, 
+    80, 48, 38, 250, 3, 80, 48, 38, 43, 80, 48, 38, 44, 80, 48, 38, 222, 235, 
+    226, 121, 38, 250, 3, 222, 235, 226, 121, 38, 254, 89, 222, 235, 226, 
+    121, 38, 134, 170, 48, 38, 244, 12, 170, 48, 38, 245, 147, 250, 36, 38, 
+    245, 147, 218, 235, 38, 245, 147, 247, 249, 38, 245, 147, 250, 37, 252, 
+    181, 38, 43, 44, 80, 48, 38, 245, 147, 221, 189, 38, 245, 147, 234, 136, 
+    38, 245, 147, 214, 155, 225, 8, 215, 226, 38, 223, 51, 219, 48, 226, 121, 
+    38, 52, 67, 218, 104, 226, 121, 38, 254, 99, 87, 38, 215, 212, 214, 182, 
+    38, 211, 247, 251, 141, 48, 38, 140, 80, 226, 121, 38, 199, 52, 219, 48, 
+    226, 121, 38, 97, 242, 0, 2, 252, 140, 246, 104, 38, 140, 242, 0, 2, 252, 
+    140, 246, 104, 38, 43, 80, 51, 38, 44, 80, 51, 38, 253, 218, 48, 255, 12, 
+    226, 232, 254, 252, 216, 43, 216, 197, 218, 75, 139, 6, 251, 67, 248, 72, 
+    250, 179, 250, 176, 232, 215, 87, 250, 241, 226, 232, 251, 27, 214, 189, 
+    245, 49, 249, 192, 221, 186, 248, 72, 244, 180, 119, 4, 243, 203, 119, 6, 
+    242, 61, 251, 220, 6, 242, 61, 139, 6, 242, 61, 225, 38, 249, 192, 225, 
+    38, 249, 193, 117, 113, 225, 109, 119, 6, 73, 251, 220, 6, 73, 119, 6, 
+    156, 119, 4, 156, 233, 150, 57, 252, 142, 87, 139, 6, 230, 26, 227, 197, 
+    50, 219, 32, 223, 120, 249, 163, 119, 6, 226, 106, 139, 6, 226, 106, 139, 
+    6, 224, 97, 119, 6, 153, 251, 220, 6, 153, 139, 6, 153, 224, 197, 217, 
+    72, 223, 63, 220, 133, 78, 217, 2, 50, 215, 254, 164, 50, 213, 240, 139, 
+    6, 210, 159, 226, 134, 50, 226, 222, 50, 235, 194, 226, 222, 50, 251, 
+    220, 6, 210, 159, 215, 94, 26, 4, 1, 235, 186, 234, 174, 50, 254, 108, 
+    50, 119, 6, 253, 159, 251, 220, 6, 251, 67, 245, 69, 87, 119, 4, 75, 119, 
+    6, 75, 119, 6, 245, 7, 215, 94, 6, 245, 7, 119, 6, 193, 119, 4, 76, 112, 
+    87, 252, 30, 87, 242, 203, 87, 248, 191, 87, 235, 233, 219, 30, 222, 188, 
+    6, 224, 97, 244, 183, 50, 139, 4, 225, 109, 139, 4, 243, 108, 139, 6, 
+    243, 108, 139, 6, 225, 109, 139, 230, 25, 218, 41, 215, 94, 35, 6, 243, 
+    203, 215, 94, 35, 6, 156, 223, 50, 35, 6, 156, 215, 94, 35, 6, 211, 117, 
+    139, 32, 6, 249, 61, 139, 32, 4, 249, 61, 139, 32, 4, 75, 139, 32, 4, 73, 
+    139, 32, 4, 235, 145, 224, 171, 232, 214, 215, 94, 254, 127, 225, 184, 
+    50, 254, 181, 215, 94, 4, 245, 7, 16, 31, 221, 253, 219, 30, 212, 114, 
+    244, 3, 123, 220, 119, 212, 114, 244, 3, 123, 228, 195, 212, 114, 244, 3, 
+    123, 216, 242, 212, 114, 244, 3, 123, 216, 169, 212, 114, 244, 3, 113, 
+    216, 167, 212, 114, 244, 3, 123, 244, 118, 212, 114, 244, 3, 113, 244, 
+    117, 212, 114, 244, 3, 134, 244, 117, 212, 114, 244, 3, 244, 12, 244, 
+    117, 212, 114, 244, 3, 123, 219, 116, 212, 114, 244, 3, 244, 82, 219, 
+    114, 212, 114, 244, 3, 123, 245, 189, 212, 114, 244, 3, 134, 245, 187, 
+    212, 114, 244, 3, 244, 82, 245, 187, 212, 114, 244, 3, 220, 123, 245, 
+    187, 244, 3, 227, 198, 110, 222, 199, 227, 199, 110, 222, 199, 227, 199, 
+    105, 222, 199, 227, 199, 158, 222, 199, 227, 199, 161, 222, 199, 227, 
+    199, 189, 222, 199, 227, 199, 194, 222, 199, 227, 199, 198, 222, 199, 
+    227, 199, 195, 222, 199, 227, 199, 200, 222, 199, 227, 199, 216, 248, 
+    222, 199, 227, 199, 245, 168, 222, 199, 227, 199, 215, 76, 222, 199, 227, 
+    199, 244, 115, 222, 199, 227, 199, 123, 240, 211, 222, 199, 227, 199, 
+    244, 82, 240, 211, 222, 199, 227, 199, 123, 216, 148, 4, 222, 199, 227, 
+    199, 110, 4, 222, 199, 227, 199, 105, 4, 222, 199, 227, 199, 158, 4, 222, 
+    199, 227, 199, 161, 4, 222, 199, 227, 199, 189, 4, 222, 199, 227, 199, 
+    194, 4, 222, 199, 227, 199, 198, 4, 222, 199, 227, 199, 195, 4, 222, 199, 
+    227, 199, 200, 4, 222, 199, 227, 199, 216, 248, 4, 222, 199, 227, 199, 
+    245, 168, 4, 222, 199, 227, 199, 215, 76, 4, 222, 199, 227, 199, 244, 
+    115, 4, 222, 199, 227, 199, 123, 240, 211, 4, 222, 199, 227, 199, 244, 
+    82, 240, 211, 4, 222, 199, 227, 199, 123, 216, 148, 222, 199, 227, 199, 
+    123, 216, 149, 251, 68, 249, 61, 222, 199, 227, 199, 244, 82, 216, 148, 
+    222, 199, 227, 199, 216, 249, 216, 148, 222, 199, 227, 199, 223, 50, 123, 
+    240, 211, 7, 4, 1, 223, 50, 251, 67, 222, 199, 227, 199, 219, 126, 233, 
+    79, 17, 222, 199, 227, 199, 244, 116, 245, 227, 17, 222, 199, 227, 199, 
+    244, 116, 216, 148, 222, 199, 227, 199, 123, 240, 212, 216, 148, 212, 
+    114, 244, 3, 210, 87, 216, 167, 140, 74, 214, 153, 74, 97, 74, 246, 105, 
+    74, 43, 44, 74, 120, 124, 74, 228, 57, 212, 9, 74, 228, 57, 245, 221, 74, 
+    219, 29, 245, 221, 74, 219, 29, 212, 9, 74, 140, 80, 2, 91, 97, 80, 2, 
+    91, 140, 212, 36, 74, 97, 212, 36, 74, 140, 113, 241, 235, 74, 214, 153, 
+    113, 241, 235, 74, 97, 113, 241, 235, 74, 246, 105, 113, 241, 235, 74, 
+    140, 80, 2, 217, 78, 97, 80, 2, 217, 78, 140, 80, 243, 244, 130, 214, 
+    153, 80, 243, 244, 130, 97, 80, 243, 244, 130, 246, 105, 80, 243, 244, 
+    130, 120, 124, 80, 2, 252, 128, 140, 80, 2, 103, 97, 80, 2, 103, 140, 80, 
+    2, 232, 124, 97, 80, 2, 232, 124, 43, 44, 212, 36, 74, 43, 44, 80, 2, 91, 
+    246, 105, 210, 35, 74, 214, 153, 80, 2, 216, 78, 233, 38, 214, 153, 80, 
+    2, 216, 78, 222, 242, 246, 105, 80, 2, 216, 78, 233, 38, 246, 105, 80, 2, 
+    216, 78, 222, 242, 97, 80, 2, 249, 162, 246, 104, 246, 105, 80, 2, 249, 
+    162, 233, 38, 254, 89, 216, 15, 220, 154, 74, 250, 3, 216, 15, 220, 154, 
+    74, 228, 57, 212, 9, 80, 216, 43, 199, 130, 140, 80, 216, 43, 252, 142, 
+    117, 97, 80, 216, 43, 130, 254, 89, 204, 250, 37, 74, 250, 3, 204, 250, 
+    37, 74, 140, 242, 0, 2, 252, 140, 214, 152, 140, 242, 0, 2, 252, 140, 
+    246, 104, 214, 153, 242, 0, 2, 252, 140, 222, 242, 214, 153, 242, 0, 2, 
+    252, 140, 233, 38, 97, 242, 0, 2, 252, 140, 214, 152, 97, 242, 0, 2, 252, 
+    140, 246, 104, 246, 105, 242, 0, 2, 252, 140, 222, 242, 246, 105, 242, 0, 
+    2, 252, 140, 233, 38, 97, 80, 117, 140, 74, 214, 153, 80, 140, 64, 246, 
+    105, 74, 140, 80, 117, 97, 74, 140, 226, 71, 253, 248, 214, 153, 226, 71, 
+    253, 248, 97, 226, 71, 253, 248, 246, 105, 226, 71, 253, 248, 140, 242, 
+    0, 117, 97, 241, 255, 97, 242, 0, 117, 140, 241, 255, 140, 52, 80, 2, 91, 
+    43, 44, 52, 80, 2, 91, 97, 52, 80, 2, 91, 140, 52, 74, 214, 153, 52, 74, 
+    97, 52, 74, 246, 105, 52, 74, 43, 44, 52, 74, 120, 124, 52, 74, 228, 57, 
+    212, 9, 52, 74, 228, 57, 245, 221, 52, 74, 219, 29, 245, 221, 52, 74, 
+    219, 29, 212, 9, 52, 74, 140, 215, 212, 74, 97, 215, 212, 74, 140, 218, 
+    231, 74, 97, 218, 231, 74, 214, 153, 80, 2, 52, 91, 246, 105, 80, 2, 52, 
+    91, 140, 248, 156, 74, 214, 153, 248, 156, 74, 97, 248, 156, 74, 246, 
+    105, 248, 156, 74, 140, 80, 216, 43, 130, 97, 80, 216, 43, 130, 140, 71, 
+    74, 214, 153, 71, 74, 97, 71, 74, 246, 105, 71, 74, 214, 153, 71, 80, 
+    243, 244, 130, 214, 153, 71, 80, 226, 198, 225, 215, 214, 153, 71, 80, 
+    226, 198, 225, 216, 2, 203, 130, 214, 153, 71, 80, 226, 198, 225, 216, 2, 
+    67, 130, 214, 153, 71, 52, 74, 214, 153, 71, 52, 80, 226, 198, 225, 215, 
+    97, 71, 80, 243, 244, 212, 56, 228, 57, 212, 9, 80, 216, 43, 249, 161, 
+    219, 29, 245, 221, 80, 216, 43, 249, 161, 120, 124, 71, 74, 44, 80, 2, 4, 
+    250, 36, 246, 105, 80, 140, 64, 214, 153, 74, 134, 97, 253, 248, 140, 80, 
+    2, 67, 91, 97, 80, 2, 67, 91, 43, 44, 80, 2, 67, 91, 140, 80, 2, 52, 67, 
+    91, 97, 80, 2, 52, 67, 91, 43, 44, 80, 2, 52, 67, 91, 140, 226, 174, 74, 
+    97, 226, 174, 74, 43, 44, 226, 174, 74, 31, 254, 155, 249, 215, 225, 254, 
+    247, 234, 216, 188, 245, 28, 216, 188, 247, 139, 228, 53, 245, 29, 245, 
+    153, 220, 128, 235, 246, 229, 222, 245, 171, 226, 232, 228, 53, 254, 125, 
+    245, 171, 226, 232, 4, 245, 171, 226, 232, 249, 187, 253, 239, 231, 63, 
+    247, 139, 228, 53, 249, 189, 253, 239, 231, 63, 4, 249, 187, 253, 239, 
+    231, 63, 245, 144, 64, 224, 173, 230, 25, 224, 181, 230, 25, 249, 166, 
+    230, 25, 218, 41, 230, 183, 50, 230, 181, 50, 59, 225, 23, 247, 170, 219, 
+    96, 220, 129, 230, 182, 253, 218, 226, 168, 222, 235, 226, 168, 251, 115, 
+    226, 168, 42, 222, 194, 249, 110, 222, 194, 244, 5, 222, 194, 224, 169, 
+    111, 235, 235, 44, 254, 110, 254, 110, 231, 89, 254, 110, 219, 0, 254, 
+    110, 247, 172, 247, 139, 228, 53, 247, 175, 226, 9, 111, 228, 53, 226, 9, 
+    111, 232, 147, 254, 119, 232, 147, 226, 159, 235, 199, 214, 175, 235, 
+    212, 52, 235, 212, 215, 212, 235, 212, 249, 183, 235, 212, 218, 14, 235, 
+    212, 213, 129, 235, 212, 250, 3, 235, 212, 250, 3, 249, 183, 235, 212, 
+    254, 89, 249, 183, 235, 212, 216, 187, 252, 68, 223, 138, 224, 170, 59, 
+    230, 182, 245, 34, 243, 47, 224, 170, 241, 58, 216, 90, 226, 168, 223, 
+    50, 183, 235, 194, 233, 66, 222, 92, 219, 158, 212, 35, 211, 200, 224, 
+    181, 228, 53, 183, 230, 183, 183, 253, 211, 128, 111, 228, 53, 253, 211, 
+    128, 111, 254, 49, 128, 111, 254, 49, 251, 89, 228, 53, 255, 5, 128, 111, 
+    229, 101, 254, 49, 228, 60, 255, 5, 128, 111, 254, 149, 128, 111, 228, 
+    53, 254, 149, 128, 111, 254, 149, 128, 177, 128, 111, 215, 212, 183, 254, 
+    156, 128, 111, 245, 95, 111, 243, 46, 245, 95, 111, 247, 235, 252, 24, 
+    254, 51, 216, 197, 232, 222, 243, 46, 128, 111, 254, 49, 128, 216, 43, 
+    177, 216, 197, 236, 16, 226, 232, 236, 16, 64, 177, 254, 49, 128, 111, 
+    249, 228, 245, 98, 245, 99, 249, 227, 222, 235, 236, 1, 128, 111, 222, 
+    235, 128, 111, 249, 155, 111, 245, 68, 245, 97, 111, 218, 158, 245, 98, 
+    248, 56, 128, 111, 128, 216, 43, 251, 79, 248, 73, 231, 89, 251, 78, 224, 
+    12, 128, 111, 228, 53, 128, 111, 240, 105, 111, 228, 53, 240, 105, 111, 
+    218, 110, 245, 95, 111, 233, 16, 177, 128, 111, 242, 131, 177, 128, 111, 
+    233, 16, 117, 128, 111, 242, 131, 117, 128, 111, 233, 16, 251, 89, 228, 
+    53, 128, 111, 242, 131, 251, 89, 228, 53, 128, 111, 230, 98, 233, 15, 
+    230, 98, 242, 130, 252, 24, 228, 53, 245, 95, 111, 228, 53, 233, 15, 228, 
+    53, 242, 130, 229, 101, 233, 16, 228, 60, 128, 111, 229, 101, 242, 131, 
+    228, 60, 128, 111, 233, 16, 177, 245, 95, 111, 242, 131, 177, 245, 95, 
+    111, 229, 101, 233, 16, 228, 60, 245, 95, 111, 229, 101, 242, 131, 228, 
+    60, 245, 95, 111, 233, 16, 177, 242, 130, 242, 131, 177, 233, 15, 229, 
+    101, 233, 16, 228, 60, 242, 130, 229, 101, 242, 131, 228, 60, 233, 15, 
+    224, 203, 218, 56, 224, 204, 177, 128, 111, 218, 57, 177, 128, 111, 224, 
+    204, 177, 245, 95, 111, 218, 57, 177, 245, 95, 111, 247, 139, 228, 53, 
+    224, 206, 247, 139, 228, 53, 218, 58, 218, 65, 226, 232, 218, 23, 226, 
+    232, 228, 53, 115, 218, 65, 226, 232, 228, 53, 115, 218, 23, 226, 232, 
+    218, 65, 64, 177, 128, 111, 218, 23, 64, 177, 128, 111, 229, 101, 115, 
+    218, 65, 64, 228, 60, 128, 111, 229, 101, 115, 218, 23, 64, 228, 60, 128, 
+    111, 218, 65, 64, 2, 228, 53, 128, 111, 218, 23, 64, 2, 228, 53, 128, 
+    111, 230, 82, 230, 83, 230, 84, 230, 83, 214, 175, 42, 236, 16, 226, 232, 
+    42, 226, 151, 226, 232, 42, 236, 16, 64, 177, 128, 111, 42, 226, 151, 64, 
+    177, 128, 111, 42, 250, 252, 42, 249, 103, 37, 225, 23, 37, 230, 182, 37, 
+    216, 86, 37, 247, 170, 219, 96, 37, 59, 226, 168, 37, 222, 235, 226, 168, 
+    37, 253, 218, 226, 168, 37, 245, 98, 37, 248, 157, 92, 225, 23, 92, 230, 
+    182, 92, 216, 86, 92, 59, 226, 168, 44, 217, 88, 43, 217, 88, 124, 217, 
+    88, 120, 217, 88, 253, 221, 230, 157, 215, 192, 244, 26, 215, 212, 67, 
+    252, 142, 44, 215, 93, 52, 67, 252, 142, 52, 44, 215, 93, 247, 139, 228, 
+    53, 224, 164, 228, 53, 215, 192, 247, 139, 228, 53, 244, 27, 229, 103, 
+    52, 67, 252, 142, 52, 44, 215, 93, 224, 204, 214, 184, 223, 92, 218, 57, 
+    214, 184, 223, 92, 228, 58, 218, 78, 226, 232, 249, 187, 253, 239, 228, 
+    58, 218, 77, 228, 58, 218, 78, 64, 177, 128, 111, 249, 187, 253, 239, 
+    228, 58, 218, 78, 177, 128, 111, 226, 151, 226, 232, 236, 16, 226, 232, 
+    230, 88, 241, 201, 249, 197, 231, 138, 235, 209, 211, 145, 229, 203, 228, 
+    59, 44, 254, 111, 2, 254, 26, 44, 215, 226, 230, 25, 232, 147, 254, 119, 
+    230, 25, 232, 147, 226, 159, 230, 25, 235, 199, 230, 25, 214, 175, 247, 
+    250, 226, 168, 59, 226, 168, 218, 158, 226, 168, 247, 170, 216, 86, 251, 
+    165, 43, 228, 58, 244, 182, 220, 150, 224, 181, 44, 228, 58, 244, 182, 
+    220, 150, 224, 181, 43, 220, 150, 224, 181, 44, 220, 150, 224, 181, 223, 
+    50, 216, 90, 245, 98, 249, 100, 232, 147, 226, 159, 249, 100, 232, 147, 
+    254, 119, 52, 218, 64, 52, 218, 22, 52, 235, 199, 52, 214, 175, 225, 48, 
+    128, 22, 226, 9, 111, 233, 16, 2, 247, 121, 242, 131, 2, 247, 121, 213, 
+    187, 230, 98, 233, 15, 213, 187, 230, 98, 242, 130, 233, 16, 128, 216, 
+    43, 177, 242, 130, 242, 131, 128, 216, 43, 177, 233, 15, 128, 216, 43, 
+    177, 233, 15, 128, 216, 43, 177, 242, 130, 128, 216, 43, 177, 224, 203, 
+    128, 216, 43, 177, 218, 56, 247, 139, 228, 53, 224, 207, 177, 245, 100, 
+    247, 139, 228, 53, 218, 59, 177, 245, 100, 228, 53, 42, 236, 16, 64, 177, 
+    128, 111, 228, 53, 42, 226, 151, 64, 177, 128, 111, 42, 236, 16, 64, 177, 
+    228, 53, 128, 111, 42, 226, 151, 64, 177, 228, 53, 128, 111, 233, 16, 
+    251, 89, 228, 53, 245, 95, 111, 242, 131, 251, 89, 228, 53, 245, 95, 111, 
+    224, 204, 251, 89, 228, 53, 245, 95, 111, 218, 57, 251, 89, 228, 53, 245, 
+    95, 111, 228, 53, 228, 58, 218, 78, 226, 232, 247, 139, 228, 53, 249, 
+    189, 253, 239, 228, 58, 218, 77, 228, 53, 228, 58, 218, 78, 64, 177, 128, 
+    111, 247, 139, 228, 53, 249, 189, 253, 239, 228, 58, 218, 78, 177, 245, 
+    100, 67, 245, 164, 230, 223, 203, 245, 164, 120, 44, 248, 0, 245, 164, 
+    124, 44, 248, 0, 245, 164, 245, 171, 64, 2, 199, 203, 91, 245, 171, 64, 
+    2, 67, 252, 142, 253, 208, 245, 144, 64, 203, 91, 4, 245, 171, 64, 2, 67, 
+    252, 142, 253, 208, 245, 144, 64, 203, 91, 245, 171, 64, 2, 59, 48, 245, 
+    171, 64, 2, 226, 124, 4, 245, 171, 64, 2, 226, 124, 245, 171, 64, 2, 214, 
+    183, 245, 171, 64, 2, 113, 203, 218, 91, 249, 187, 2, 199, 203, 91, 249, 
+    187, 2, 67, 252, 142, 253, 208, 245, 144, 64, 203, 91, 4, 249, 187, 2, 
+    67, 252, 142, 253, 208, 245, 144, 64, 203, 91, 249, 187, 2, 226, 124, 4, 
+    249, 187, 2, 226, 124, 210, 160, 188, 252, 174, 231, 62, 247, 251, 50, 
+    245, 173, 74, 240, 235, 120, 253, 250, 124, 253, 250, 224, 176, 225, 166, 
+    212, 32, 232, 214, 43, 250, 182, 44, 250, 182, 43, 244, 58, 44, 244, 58, 
+    251, 176, 44, 249, 133, 251, 176, 43, 249, 133, 216, 15, 44, 249, 133, 
+    216, 15, 43, 249, 133, 223, 50, 228, 53, 50, 42, 232, 105, 254, 26, 221, 
+    165, 221, 172, 217, 2, 223, 121, 224, 242, 235, 239, 213, 165, 218, 235, 
+    225, 42, 64, 235, 208, 50, 215, 94, 228, 53, 50, 212, 42, 240, 237, 216, 
+    15, 43, 249, 161, 216, 15, 44, 249, 161, 251, 176, 43, 249, 161, 251, 
+    176, 44, 249, 161, 216, 15, 163, 235, 212, 251, 176, 163, 235, 212, 243, 
+    241, 219, 76, 120, 253, 251, 252, 25, 113, 203, 252, 130, 226, 161, 234, 
+    139, 245, 91, 216, 43, 216, 197, 222, 252, 211, 179, 236, 1, 115, 223, 
+    118, 251, 164, 234, 138, 233, 43, 254, 111, 127, 222, 248, 254, 111, 127, 
+    245, 91, 216, 43, 216, 197, 233, 47, 252, 36, 222, 234, 249, 71, 254, 
+    156, 254, 2, 217, 182, 216, 5, 222, 124, 247, 216, 226, 152, 249, 199, 
+    217, 53, 219, 87, 249, 152, 249, 151, 254, 67, 243, 226, 16, 240, 152, 
+    254, 67, 243, 226, 16, 218, 229, 224, 28, 254, 67, 243, 226, 16, 224, 29, 
+    245, 100, 254, 67, 243, 226, 16, 224, 29, 247, 175, 254, 67, 243, 226, 
+    16, 224, 29, 247, 249, 254, 67, 243, 226, 16, 224, 29, 235, 57, 254, 67, 
+    243, 226, 16, 224, 29, 250, 36, 254, 67, 243, 226, 16, 250, 37, 218, 136, 
+    254, 67, 243, 226, 16, 250, 37, 235, 57, 254, 67, 243, 226, 16, 219, 97, 
+    130, 254, 67, 243, 226, 16, 252, 182, 130, 254, 67, 243, 226, 16, 224, 
+    29, 219, 96, 254, 67, 243, 226, 16, 224, 29, 252, 181, 254, 67, 243, 226, 
+    16, 224, 29, 233, 15, 254, 67, 243, 226, 16, 224, 29, 242, 130, 254, 67, 
+    243, 226, 16, 140, 214, 19, 254, 67, 243, 226, 16, 97, 214, 19, 254, 67, 
+    243, 226, 16, 224, 29, 140, 74, 254, 67, 243, 226, 16, 224, 29, 97, 74, 
+    254, 67, 243, 226, 16, 250, 37, 252, 181, 254, 67, 243, 226, 16, 124, 
+    217, 89, 214, 183, 254, 67, 243, 226, 16, 248, 56, 218, 136, 254, 67, 
+    243, 226, 16, 224, 29, 124, 250, 239, 254, 67, 243, 226, 16, 224, 29, 
+    248, 55, 254, 67, 243, 226, 16, 124, 217, 89, 235, 57, 254, 67, 243, 226, 
+    16, 214, 153, 214, 19, 254, 67, 243, 226, 16, 224, 29, 214, 153, 74, 254, 
+    67, 243, 226, 16, 120, 217, 89, 226, 124, 254, 67, 243, 226, 16, 248, 67, 
+    218, 136, 254, 67, 243, 226, 16, 224, 29, 120, 250, 239, 254, 67, 243, 
+    226, 16, 224, 29, 248, 66, 254, 67, 243, 226, 16, 120, 217, 89, 235, 57, 
+    254, 67, 243, 226, 16, 246, 105, 214, 19, 254, 67, 243, 226, 16, 224, 29, 
+    246, 105, 74, 254, 67, 243, 226, 16, 223, 254, 214, 183, 254, 67, 243, 
+    226, 16, 248, 56, 214, 183, 254, 67, 243, 226, 16, 247, 250, 214, 183, 
+    254, 67, 243, 226, 16, 235, 58, 214, 183, 254, 67, 243, 226, 16, 250, 37, 
+    214, 183, 254, 67, 243, 226, 16, 120, 220, 6, 235, 57, 254, 67, 243, 226, 
+    16, 223, 254, 224, 28, 254, 67, 243, 226, 16, 250, 37, 218, 157, 254, 67, 
+    243, 226, 16, 224, 29, 249, 227, 254, 67, 243, 226, 16, 120, 217, 89, 
+    248, 2, 254, 67, 243, 226, 16, 248, 67, 248, 2, 254, 67, 243, 226, 16, 
+    218, 158, 248, 2, 254, 67, 243, 226, 16, 235, 58, 248, 2, 254, 67, 243, 
+    226, 16, 250, 37, 248, 2, 254, 67, 243, 226, 16, 124, 220, 6, 218, 136, 
+    254, 67, 243, 226, 16, 43, 220, 6, 218, 136, 254, 67, 243, 226, 16, 216, 
+    90, 248, 2, 254, 67, 243, 226, 16, 242, 131, 248, 2, 254, 67, 243, 226, 
+    16, 249, 221, 130, 254, 67, 243, 226, 16, 248, 67, 183, 254, 67, 243, 
+    226, 16, 210, 34, 254, 67, 243, 226, 16, 218, 137, 183, 254, 67, 243, 
+    226, 16, 220, 152, 214, 183, 254, 67, 243, 226, 16, 224, 29, 228, 53, 
+    245, 100, 254, 67, 243, 226, 16, 224, 29, 224, 13, 254, 67, 243, 226, 16, 
+    124, 250, 240, 183, 254, 67, 243, 226, 16, 120, 250, 240, 183, 254, 67, 
+    243, 226, 16, 235, 186, 254, 67, 243, 226, 16, 223, 38, 254, 67, 243, 
+    226, 16, 226, 202, 254, 67, 243, 226, 16, 254, 145, 214, 183, 254, 67, 
+    243, 226, 16, 245, 102, 214, 183, 254, 67, 243, 226, 16, 235, 187, 214, 
+    183, 254, 67, 243, 226, 16, 226, 203, 214, 183, 254, 67, 243, 226, 16, 
+    254, 144, 228, 53, 250, 131, 78, 44, 254, 111, 2, 246, 105, 210, 35, 74, 
+    219, 236, 204, 251, 164, 252, 46, 87, 67, 232, 215, 2, 230, 225, 247, 
+    121, 235, 217, 87, 249, 184, 214, 181, 87, 247, 190, 214, 181, 87, 245, 
+    155, 87, 249, 211, 87, 71, 42, 2, 250, 176, 67, 232, 214, 245, 131, 87, 
+    254, 140, 234, 140, 87, 241, 214, 87, 37, 203, 252, 142, 2, 228, 51, 37, 
+    215, 227, 246, 107, 251, 136, 250, 37, 2, 228, 55, 74, 214, 179, 87, 230, 
+    138, 87, 240, 165, 87, 226, 175, 242, 60, 87, 226, 175, 233, 148, 87, 
+    225, 245, 87, 225, 244, 87, 247, 198, 249, 98, 16, 244, 21, 105, 219, 51, 
+    87, 254, 67, 243, 226, 16, 224, 28, 248, 84, 220, 139, 234, 140, 87, 224, 
+    193, 226, 76, 229, 83, 226, 76, 224, 189, 221, 190, 87, 250, 18, 221, 
+    190, 87, 43, 226, 5, 214, 160, 103, 43, 226, 5, 245, 22, 43, 226, 5, 232, 
+    109, 103, 44, 226, 5, 214, 160, 103, 44, 226, 5, 245, 22, 44, 226, 5, 
+    232, 109, 103, 43, 42, 251, 159, 214, 160, 249, 161, 43, 42, 251, 159, 
+    245, 22, 43, 42, 251, 159, 232, 109, 249, 161, 44, 42, 251, 159, 214, 
+    160, 249, 161, 44, 42, 251, 159, 245, 22, 44, 42, 251, 159, 232, 109, 
+    249, 161, 43, 249, 100, 251, 159, 214, 160, 103, 43, 249, 100, 251, 159, 
+    230, 225, 225, 102, 43, 249, 100, 251, 159, 232, 109, 103, 249, 100, 251, 
+    159, 245, 22, 44, 249, 100, 251, 159, 214, 160, 103, 44, 249, 100, 251, 
+    159, 230, 225, 225, 102, 44, 249, 100, 251, 159, 232, 109, 103, 235, 213, 
+    245, 22, 203, 232, 215, 245, 22, 214, 160, 43, 177, 232, 109, 44, 249, 
+    100, 251, 159, 221, 173, 214, 160, 44, 177, 232, 109, 43, 249, 100, 251, 
+    159, 221, 173, 218, 42, 216, 14, 218, 42, 251, 175, 216, 15, 42, 127, 
+    251, 176, 42, 127, 251, 176, 42, 251, 159, 117, 216, 15, 42, 127, 34, 16, 
+    251, 175, 43, 67, 93, 232, 214, 44, 67, 93, 232, 214, 203, 221, 206, 232, 
+    213, 203, 221, 206, 232, 212, 203, 221, 206, 232, 211, 203, 221, 206, 
+    232, 210, 248, 47, 16, 192, 67, 22, 216, 15, 222, 252, 248, 47, 16, 192, 
+    67, 22, 251, 176, 222, 252, 248, 47, 16, 192, 67, 2, 250, 36, 248, 47, 
+    16, 192, 124, 22, 203, 2, 250, 36, 248, 47, 16, 192, 120, 22, 203, 2, 
+    250, 36, 248, 47, 16, 192, 67, 2, 215, 226, 248, 47, 16, 192, 124, 22, 
+    203, 2, 215, 226, 248, 47, 16, 192, 120, 22, 203, 2, 215, 226, 248, 47, 
+    16, 192, 67, 22, 212, 35, 248, 47, 16, 192, 124, 22, 203, 2, 212, 35, 
+    248, 47, 16, 192, 120, 22, 203, 2, 212, 35, 248, 47, 16, 192, 124, 22, 
+    241, 45, 248, 47, 16, 192, 120, 22, 241, 45, 248, 47, 16, 192, 67, 22, 
+    216, 15, 233, 47, 248, 47, 16, 192, 67, 22, 251, 176, 233, 47, 42, 244, 
+    33, 223, 55, 87, 245, 183, 87, 67, 232, 215, 245, 22, 231, 34, 251, 147, 
+    231, 34, 199, 117, 219, 251, 231, 34, 219, 252, 117, 232, 138, 231, 34, 
+    199, 117, 113, 219, 238, 231, 34, 113, 219, 239, 117, 232, 138, 231, 34, 
+    113, 219, 239, 235, 65, 231, 34, 215, 209, 231, 34, 216, 224, 231, 34, 
+    225, 189, 245, 225, 242, 123, 243, 220, 216, 15, 226, 4, 251, 176, 226, 
+    4, 216, 15, 249, 100, 127, 251, 176, 249, 100, 127, 216, 15, 216, 7, 220, 
+    54, 127, 251, 176, 216, 7, 220, 54, 127, 71, 215, 240, 252, 36, 222, 235, 
+    2, 250, 36, 218, 121, 244, 65, 255, 18, 249, 97, 245, 172, 235, 199, 248, 
+    84, 245, 25, 87, 85, 222, 248, 52, 215, 226, 85, 233, 43, 52, 215, 226, 
+    85, 214, 162, 52, 215, 226, 85, 246, 106, 52, 215, 226, 85, 222, 248, 52, 
+    215, 227, 2, 67, 130, 85, 233, 43, 52, 215, 227, 2, 67, 130, 85, 222, 
+    248, 215, 227, 2, 52, 67, 130, 254, 174, 250, 4, 218, 127, 216, 87, 250, 
+    4, 240, 238, 2, 244, 51, 221, 242, 16, 31, 227, 203, 16, 31, 218, 153, 
+    64, 241, 234, 16, 31, 218, 153, 64, 216, 213, 16, 31, 245, 144, 64, 216, 
+    213, 16, 31, 245, 144, 64, 215, 244, 16, 31, 245, 133, 16, 31, 255, 8, 
+    16, 31, 252, 45, 16, 31, 252, 180, 16, 31, 203, 217, 90, 16, 31, 232, 
+    215, 244, 146, 16, 31, 67, 217, 90, 16, 31, 244, 21, 244, 146, 16, 31, 
+    250, 231, 223, 54, 16, 31, 220, 29, 226, 131, 16, 31, 220, 29, 236, 0, 
+    16, 31, 248, 152, 232, 205, 245, 78, 16, 31, 248, 32, 249, 179, 110, 16, 
+    31, 248, 32, 249, 179, 105, 16, 31, 248, 32, 249, 179, 158, 16, 31, 248, 
+    32, 249, 179, 161, 16, 31, 152, 255, 8, 16, 31, 217, 178, 236, 63, 16, 
+    31, 245, 144, 64, 215, 245, 251, 214, 16, 31, 251, 6, 16, 31, 245, 144, 
+    64, 231, 82, 16, 31, 218, 62, 16, 31, 245, 78, 16, 31, 244, 108, 220, 
+    138, 16, 31, 242, 122, 220, 138, 16, 31, 223, 122, 220, 138, 16, 31, 214, 
+    174, 220, 138, 16, 31, 219, 19, 16, 31, 248, 64, 251, 217, 87, 204, 251, 
+    164, 16, 31, 229, 86, 16, 31, 248, 65, 244, 21, 105, 16, 31, 218, 63, 
+    244, 21, 105, 226, 242, 103, 226, 242, 250, 153, 226, 242, 244, 24, 226, 
+    242, 235, 194, 244, 24, 226, 242, 252, 43, 251, 125, 226, 242, 251, 171, 
+    216, 112, 226, 242, 251, 156, 252, 147, 240, 104, 226, 242, 254, 128, 64, 
+    250, 130, 226, 242, 248, 157, 226, 242, 249, 88, 255, 12, 227, 201, 226, 
+    242, 52, 252, 181, 37, 21, 110, 37, 21, 105, 37, 21, 158, 37, 21, 161, 
+    37, 21, 189, 37, 21, 194, 37, 21, 198, 37, 21, 195, 37, 21, 200, 37, 54, 
+    216, 248, 37, 54, 245, 168, 37, 54, 215, 76, 37, 54, 216, 165, 37, 54, 
+    244, 6, 37, 54, 244, 119, 37, 54, 219, 120, 37, 54, 220, 120, 37, 54, 
+    245, 191, 37, 54, 228, 198, 37, 54, 215, 73, 88, 21, 110, 88, 21, 105, 
+    88, 21, 158, 88, 21, 161, 88, 21, 189, 88, 21, 194, 88, 21, 198, 88, 21, 
+    195, 88, 21, 200, 88, 54, 216, 248, 88, 54, 245, 168, 88, 54, 215, 76, 
+    88, 54, 216, 165, 88, 54, 244, 6, 88, 54, 244, 119, 88, 54, 219, 120, 88, 
+    54, 220, 120, 88, 54, 245, 191, 88, 54, 228, 198, 88, 54, 215, 73, 21, 
+    123, 243, 230, 218, 130, 21, 113, 243, 230, 218, 130, 21, 134, 243, 230, 
+    218, 130, 21, 244, 12, 243, 230, 218, 130, 21, 244, 82, 243, 230, 218, 
+    130, 21, 219, 126, 243, 230, 218, 130, 21, 220, 123, 243, 230, 218, 130, 
+    21, 245, 194, 243, 230, 218, 130, 21, 228, 201, 243, 230, 218, 130, 54, 
+    216, 249, 243, 230, 218, 130, 54, 245, 169, 243, 230, 218, 130, 54, 215, 
+    77, 243, 230, 218, 130, 54, 216, 166, 243, 230, 218, 130, 54, 244, 7, 
+    243, 230, 218, 130, 54, 244, 120, 243, 230, 218, 130, 54, 219, 121, 243, 
+    230, 218, 130, 54, 220, 121, 243, 230, 218, 130, 54, 245, 192, 243, 230, 
+    218, 130, 54, 228, 199, 243, 230, 218, 130, 54, 215, 74, 243, 230, 218, 
+    130, 88, 7, 4, 1, 61, 88, 7, 4, 1, 253, 159, 88, 7, 4, 1, 251, 67, 88, 7, 
+    4, 1, 249, 61, 88, 7, 4, 1, 75, 88, 7, 4, 1, 245, 7, 88, 7, 4, 1, 243, 
+    203, 88, 7, 4, 1, 242, 61, 88, 7, 4, 1, 73, 88, 7, 4, 1, 235, 145, 88, 7, 
+    4, 1, 235, 24, 88, 7, 4, 1, 156, 88, 7, 4, 1, 193, 88, 7, 4, 1, 230, 26, 
+    88, 7, 4, 1, 76, 88, 7, 4, 1, 226, 106, 88, 7, 4, 1, 224, 97, 88, 7, 4, 
+    1, 153, 88, 7, 4, 1, 222, 92, 88, 7, 4, 1, 217, 153, 88, 7, 4, 1, 70, 88, 
+    7, 4, 1, 214, 105, 88, 7, 4, 1, 212, 98, 88, 7, 4, 1, 211, 178, 88, 7, 4, 
+    1, 211, 117, 88, 7, 4, 1, 210, 159, 37, 7, 6, 1, 61, 37, 7, 6, 1, 253, 
+    159, 37, 7, 6, 1, 251, 67, 37, 7, 6, 1, 249, 61, 37, 7, 6, 1, 75, 37, 7, 
+    6, 1, 245, 7, 37, 7, 6, 1, 243, 203, 37, 7, 6, 1, 242, 61, 37, 7, 6, 1, 
+    73, 37, 7, 6, 1, 235, 145, 37, 7, 6, 1, 235, 24, 37, 7, 6, 1, 156, 37, 7, 
+    6, 1, 193, 37, 7, 6, 1, 230, 26, 37, 7, 6, 1, 76, 37, 7, 6, 1, 226, 106, 
+    37, 7, 6, 1, 224, 97, 37, 7, 6, 1, 153, 37, 7, 6, 1, 222, 92, 37, 7, 6, 
+    1, 217, 153, 37, 7, 6, 1, 70, 37, 7, 6, 1, 214, 105, 37, 7, 6, 1, 212, 
+    98, 37, 7, 6, 1, 211, 178, 37, 7, 6, 1, 211, 117, 37, 7, 6, 1, 210, 159, 
+    37, 7, 4, 1, 61, 37, 7, 4, 1, 253, 159, 37, 7, 4, 1, 251, 67, 37, 7, 4, 
+    1, 249, 61, 37, 7, 4, 1, 75, 37, 7, 4, 1, 245, 7, 37, 7, 4, 1, 243, 203, 
+    37, 7, 4, 1, 242, 61, 37, 7, 4, 1, 73, 37, 7, 4, 1, 235, 145, 37, 7, 4, 
+    1, 235, 24, 37, 7, 4, 1, 156, 37, 7, 4, 1, 193, 37, 7, 4, 1, 230, 26, 37, 
+    7, 4, 1, 76, 37, 7, 4, 1, 226, 106, 37, 7, 4, 1, 224, 97, 37, 7, 4, 1, 
+    153, 37, 7, 4, 1, 222, 92, 37, 7, 4, 1, 217, 153, 37, 7, 4, 1, 70, 37, 7, 
+    4, 1, 214, 105, 37, 7, 4, 1, 212, 98, 37, 7, 4, 1, 211, 178, 37, 7, 4, 1, 
+    211, 117, 37, 7, 4, 1, 210, 159, 37, 21, 210, 86, 152, 37, 54, 245, 168, 
+    152, 37, 54, 215, 76, 152, 37, 54, 216, 165, 152, 37, 54, 244, 6, 152, 
+    37, 54, 244, 119, 152, 37, 54, 219, 120, 152, 37, 54, 220, 120, 152, 37, 
+    54, 245, 191, 152, 37, 54, 228, 198, 152, 37, 54, 215, 73, 52, 37, 21, 
+    110, 52, 37, 21, 105, 52, 37, 21, 158, 52, 37, 21, 161, 52, 37, 21, 189, 
+    52, 37, 21, 194, 52, 37, 21, 198, 52, 37, 21, 195, 52, 37, 21, 200, 52, 
+    37, 54, 216, 248, 152, 37, 21, 210, 86, 93, 99, 192, 241, 45, 93, 99, 
+    114, 241, 45, 93, 99, 192, 213, 239, 93, 99, 114, 213, 239, 93, 99, 192, 
+    215, 212, 248, 158, 241, 45, 93, 99, 114, 215, 212, 248, 158, 241, 45, 
+    93, 99, 192, 215, 212, 248, 158, 213, 239, 93, 99, 114, 215, 212, 248, 
+    158, 213, 239, 93, 99, 192, 224, 25, 248, 158, 241, 45, 93, 99, 114, 224, 
+    25, 248, 158, 241, 45, 93, 99, 192, 224, 25, 248, 158, 213, 239, 93, 99, 
+    114, 224, 25, 248, 158, 213, 239, 93, 99, 192, 124, 22, 222, 252, 93, 99, 
+    124, 192, 22, 44, 241, 222, 93, 99, 124, 114, 22, 44, 232, 231, 93, 99, 
+    114, 124, 22, 222, 252, 93, 99, 192, 124, 22, 233, 47, 93, 99, 124, 192, 
+    22, 43, 241, 222, 93, 99, 124, 114, 22, 43, 232, 231, 93, 99, 114, 124, 
+    22, 233, 47, 93, 99, 192, 120, 22, 222, 252, 93, 99, 120, 192, 22, 44, 
+    241, 222, 93, 99, 120, 114, 22, 44, 232, 231, 93, 99, 114, 120, 22, 222, 
+    252, 93, 99, 192, 120, 22, 233, 47, 93, 99, 120, 192, 22, 43, 241, 222, 
+    93, 99, 120, 114, 22, 43, 232, 231, 93, 99, 114, 120, 22, 233, 47, 93, 
+    99, 192, 67, 22, 222, 252, 93, 99, 67, 192, 22, 44, 241, 222, 93, 99, 
+    120, 114, 22, 44, 124, 232, 231, 93, 99, 124, 114, 22, 44, 120, 232, 231, 
+    93, 99, 67, 114, 22, 44, 232, 231, 93, 99, 124, 192, 22, 44, 120, 241, 
+    222, 93, 99, 120, 192, 22, 44, 124, 241, 222, 93, 99, 114, 67, 22, 222, 
+    252, 93, 99, 192, 67, 22, 233, 47, 93, 99, 67, 192, 22, 43, 241, 222, 93, 
+    99, 120, 114, 22, 43, 124, 232, 231, 93, 99, 124, 114, 22, 43, 120, 232, 
+    231, 93, 99, 67, 114, 22, 43, 232, 231, 93, 99, 124, 192, 22, 43, 120, 
+    241, 222, 93, 99, 120, 192, 22, 43, 124, 241, 222, 93, 99, 114, 67, 22, 
+    233, 47, 93, 99, 192, 124, 22, 241, 45, 93, 99, 43, 114, 22, 44, 124, 
+    232, 231, 93, 99, 44, 114, 22, 43, 124, 232, 231, 93, 99, 124, 192, 22, 
+    203, 241, 222, 93, 99, 124, 114, 22, 203, 232, 231, 93, 99, 44, 192, 22, 
+    43, 124, 241, 222, 93, 99, 43, 192, 22, 44, 124, 241, 222, 93, 99, 114, 
+    124, 22, 241, 45, 93, 99, 192, 120, 22, 241, 45, 93, 99, 43, 114, 22, 44, 
+    120, 232, 231, 93, 99, 44, 114, 22, 43, 120, 232, 231, 93, 99, 120, 192, 
+    22, 203, 241, 222, 93, 99, 120, 114, 22, 203, 232, 231, 93, 99, 44, 192, 
+    22, 43, 120, 241, 222, 93, 99, 43, 192, 22, 44, 120, 241, 222, 93, 99, 
+    114, 120, 22, 241, 45, 93, 99, 192, 67, 22, 241, 45, 93, 99, 43, 114, 22, 
+    44, 67, 232, 231, 93, 99, 44, 114, 22, 43, 67, 232, 231, 93, 99, 67, 192, 
+    22, 203, 241, 222, 93, 99, 120, 114, 22, 124, 203, 232, 231, 93, 99, 124, 
+    114, 22, 120, 203, 232, 231, 93, 99, 67, 114, 22, 203, 232, 231, 93, 99, 
+    43, 120, 114, 22, 44, 124, 232, 231, 93, 99, 44, 120, 114, 22, 43, 124, 
+    232, 231, 93, 99, 43, 124, 114, 22, 44, 120, 232, 231, 93, 99, 44, 124, 
+    114, 22, 43, 120, 232, 231, 93, 99, 124, 192, 22, 120, 203, 241, 222, 93, 
+    99, 120, 192, 22, 124, 203, 241, 222, 93, 99, 44, 192, 22, 43, 67, 241, 
+    222, 93, 99, 43, 192, 22, 44, 67, 241, 222, 93, 99, 114, 67, 22, 241, 45, 
+    93, 99, 192, 52, 248, 158, 241, 45, 93, 99, 114, 52, 248, 158, 241, 45, 
+    93, 99, 192, 52, 248, 158, 213, 239, 93, 99, 114, 52, 248, 158, 213, 239, 
+    93, 99, 52, 241, 45, 93, 99, 52, 213, 239, 93, 99, 124, 219, 156, 22, 44, 
+    246, 114, 93, 99, 124, 52, 22, 44, 219, 155, 93, 99, 52, 124, 22, 222, 
+    252, 93, 99, 124, 219, 156, 22, 43, 246, 114, 93, 99, 124, 52, 22, 43, 
+    219, 155, 93, 99, 52, 124, 22, 233, 47, 93, 99, 120, 219, 156, 22, 44, 
+    246, 114, 93, 99, 120, 52, 22, 44, 219, 155, 93, 99, 52, 120, 22, 222, 
+    252, 93, 99, 120, 219, 156, 22, 43, 246, 114, 93, 99, 120, 52, 22, 43, 
+    219, 155, 93, 99, 52, 120, 22, 233, 47, 93, 99, 67, 219, 156, 22, 44, 
+    246, 114, 93, 99, 67, 52, 22, 44, 219, 155, 93, 99, 52, 67, 22, 222, 252, 
+    93, 99, 67, 219, 156, 22, 43, 246, 114, 93, 99, 67, 52, 22, 43, 219, 155, 
+    93, 99, 52, 67, 22, 233, 47, 93, 99, 124, 219, 156, 22, 203, 246, 114, 
+    93, 99, 124, 52, 22, 203, 219, 155, 93, 99, 52, 124, 22, 241, 45, 93, 99, 
+    120, 219, 156, 22, 203, 246, 114, 93, 99, 120, 52, 22, 203, 219, 155, 93, 
+    99, 52, 120, 22, 241, 45, 93, 99, 67, 219, 156, 22, 203, 246, 114, 93, 
+    99, 67, 52, 22, 203, 219, 155, 93, 99, 52, 67, 22, 241, 45, 93, 99, 192, 
+    254, 27, 124, 22, 222, 252, 93, 99, 192, 254, 27, 124, 22, 233, 47, 93, 
+    99, 192, 254, 27, 120, 22, 233, 47, 93, 99, 192, 254, 27, 120, 22, 222, 
+    252, 93, 99, 192, 248, 0, 214, 160, 44, 216, 43, 232, 109, 233, 47, 93, 
+    99, 192, 248, 0, 214, 160, 43, 216, 43, 232, 109, 222, 252, 93, 99, 192, 
+    248, 0, 249, 131, 93, 99, 192, 233, 47, 93, 99, 192, 214, 163, 93, 99, 
+    192, 222, 252, 93, 99, 192, 246, 107, 93, 99, 114, 233, 47, 93, 99, 114, 
+    214, 163, 93, 99, 114, 222, 252, 93, 99, 114, 246, 107, 93, 99, 192, 43, 
+    22, 114, 222, 252, 93, 99, 192, 120, 22, 114, 246, 107, 93, 99, 114, 43, 
+    22, 192, 222, 252, 93, 99, 114, 120, 22, 192, 246, 107, 214, 160, 163, 
+    251, 214, 232, 109, 123, 245, 190, 251, 214, 232, 109, 123, 224, 23, 251, 
+    214, 232, 109, 134, 245, 188, 251, 214, 232, 109, 163, 251, 214, 232, 
+    109, 244, 82, 245, 188, 251, 214, 232, 109, 134, 224, 21, 251, 214, 232, 
+    109, 220, 123, 245, 188, 251, 214, 243, 230, 251, 214, 43, 220, 123, 245, 
+    188, 251, 214, 43, 134, 224, 21, 251, 214, 43, 244, 82, 245, 188, 251, 
+    214, 43, 163, 251, 214, 43, 134, 245, 188, 251, 214, 43, 123, 224, 23, 
+    251, 214, 43, 123, 245, 190, 251, 214, 44, 163, 251, 214, 192, 220, 93, 
+    231, 83, 220, 93, 248, 163, 220, 93, 214, 160, 123, 245, 190, 251, 214, 
+    44, 123, 245, 190, 251, 214, 224, 27, 232, 109, 233, 47, 224, 27, 232, 
+    109, 222, 252, 224, 27, 214, 160, 233, 47, 224, 27, 214, 160, 43, 22, 
+    232, 109, 43, 22, 232, 109, 222, 252, 224, 27, 214, 160, 43, 22, 232, 
+    109, 222, 252, 224, 27, 214, 160, 43, 22, 214, 160, 44, 22, 232, 109, 
+    233, 47, 224, 27, 214, 160, 43, 22, 214, 160, 44, 22, 232, 109, 222, 252, 
+    224, 27, 214, 160, 222, 252, 224, 27, 214, 160, 44, 22, 232, 109, 233, 
+    47, 224, 27, 214, 160, 44, 22, 232, 109, 43, 22, 232, 109, 222, 252, 85, 
+    218, 235, 71, 218, 235, 71, 42, 2, 222, 184, 249, 160, 71, 42, 249, 188, 
+    85, 4, 218, 235, 42, 2, 203, 244, 106, 42, 2, 67, 244, 106, 42, 2, 226, 
+    145, 249, 127, 244, 106, 42, 2, 214, 160, 43, 216, 43, 232, 109, 44, 244, 
+    106, 42, 2, 214, 160, 44, 216, 43, 232, 109, 43, 244, 106, 42, 2, 248, 0, 
+    249, 127, 244, 106, 85, 4, 218, 235, 71, 4, 218, 235, 85, 223, 117, 71, 
+    223, 117, 85, 67, 223, 117, 71, 67, 223, 117, 85, 226, 7, 71, 226, 7, 85, 
+    214, 162, 215, 226, 71, 214, 162, 215, 226, 85, 214, 162, 4, 215, 226, 
+    71, 214, 162, 4, 215, 226, 85, 222, 248, 215, 226, 71, 222, 248, 215, 
+    226, 85, 222, 248, 4, 215, 226, 71, 222, 248, 4, 215, 226, 85, 222, 248, 
+    225, 9, 71, 222, 248, 225, 9, 85, 246, 106, 215, 226, 71, 246, 106, 215, 
+    226, 85, 246, 106, 4, 215, 226, 71, 246, 106, 4, 215, 226, 85, 233, 43, 
+    215, 226, 71, 233, 43, 215, 226, 85, 233, 43, 4, 215, 226, 71, 233, 43, 
+    4, 215, 226, 85, 233, 43, 225, 9, 71, 233, 43, 225, 9, 85, 247, 249, 71, 
+    247, 249, 71, 247, 250, 249, 188, 85, 4, 247, 249, 244, 90, 232, 105, 71, 
+    250, 36, 246, 119, 250, 36, 250, 37, 2, 67, 244, 106, 251, 112, 85, 250, 
+    36, 250, 37, 2, 43, 163, 251, 222, 250, 37, 2, 44, 163, 251, 222, 250, 
+    37, 2, 232, 109, 163, 251, 222, 250, 37, 2, 214, 160, 163, 251, 222, 250, 
+    37, 2, 214, 160, 44, 224, 27, 251, 222, 250, 37, 2, 254, 156, 251, 89, 
+    214, 160, 43, 224, 27, 251, 222, 43, 163, 85, 250, 36, 44, 163, 85, 250, 
+    36, 235, 195, 251, 114, 235, 195, 71, 250, 36, 214, 160, 163, 235, 195, 
+    71, 250, 36, 232, 109, 163, 235, 195, 71, 250, 36, 214, 160, 43, 224, 27, 
+    250, 34, 254, 26, 214, 160, 44, 224, 27, 250, 34, 254, 26, 232, 109, 44, 
+    224, 27, 250, 34, 254, 26, 232, 109, 43, 224, 27, 250, 34, 254, 26, 214, 
+    160, 163, 250, 36, 232, 109, 163, 250, 36, 85, 232, 109, 44, 215, 226, 
+    85, 232, 109, 43, 215, 226, 85, 214, 160, 43, 215, 226, 85, 214, 160, 44, 
+    215, 226, 71, 251, 114, 42, 2, 43, 163, 251, 222, 42, 2, 44, 163, 251, 
+    222, 42, 2, 214, 160, 43, 248, 0, 163, 251, 222, 42, 2, 232, 109, 44, 
+    248, 0, 163, 251, 222, 71, 42, 2, 67, 251, 233, 232, 214, 71, 214, 162, 
+    215, 227, 2, 247, 121, 214, 162, 215, 227, 2, 43, 163, 251, 222, 214, 
+    162, 215, 227, 2, 44, 163, 251, 222, 233, 86, 250, 36, 71, 42, 2, 214, 
+    160, 43, 224, 26, 71, 42, 2, 232, 109, 43, 224, 26, 71, 42, 2, 232, 109, 
+    44, 224, 26, 71, 42, 2, 214, 160, 44, 224, 26, 71, 250, 37, 2, 214, 160, 
+    43, 224, 26, 71, 250, 37, 2, 232, 109, 43, 224, 26, 71, 250, 37, 2, 232, 
+    109, 44, 224, 26, 71, 250, 37, 2, 214, 160, 44, 224, 26, 214, 160, 43, 
+    215, 226, 214, 160, 44, 215, 226, 232, 109, 43, 215, 226, 71, 231, 83, 
+    218, 235, 85, 231, 83, 218, 235, 71, 231, 83, 4, 218, 235, 85, 231, 83, 
+    4, 218, 235, 232, 109, 44, 215, 226, 85, 218, 39, 2, 223, 133, 249, 248, 
+    214, 194, 219, 61, 249, 223, 85, 218, 157, 71, 218, 157, 232, 229, 216, 
+    133, 218, 38, 253, 235, 228, 72, 248, 39, 228, 72, 249, 196, 226, 164, 
+    85, 217, 1, 71, 217, 1, 252, 157, 251, 164, 252, 157, 93, 2, 250, 130, 
+    252, 157, 93, 2, 211, 178, 221, 255, 214, 195, 2, 223, 161, 246, 85, 240, 
+    244, 252, 23, 71, 220, 3, 225, 102, 85, 220, 3, 225, 102, 220, 88, 223, 
+    50, 222, 188, 244, 56, 241, 229, 251, 114, 85, 43, 225, 8, 235, 243, 85, 
+    44, 225, 8, 235, 243, 71, 43, 225, 8, 235, 243, 71, 120, 225, 8, 235, 
+    243, 71, 44, 225, 8, 235, 243, 71, 124, 225, 8, 235, 243, 219, 102, 22, 
+    249, 130, 250, 220, 50, 223, 173, 50, 251, 240, 50, 251, 26, 254, 103, 
+    226, 146, 249, 131, 250, 112, 223, 38, 249, 132, 64, 232, 119, 249, 132, 
+    64, 235, 117, 218, 158, 22, 249, 137, 244, 169, 87, 254, 249, 220, 90, 
+    242, 23, 22, 219, 190, 225, 221, 87, 210, 254, 211, 69, 215, 216, 31, 
+    241, 224, 215, 216, 31, 233, 108, 215, 216, 31, 244, 97, 215, 216, 31, 
+    216, 134, 215, 216, 31, 211, 239, 215, 216, 31, 212, 40, 215, 216, 31, 
+    230, 116, 215, 216, 31, 245, 224, 212, 1, 64, 248, 19, 71, 243, 240, 244, 
+    191, 71, 219, 75, 244, 191, 85, 219, 75, 244, 191, 71, 218, 39, 2, 223, 
+    133, 244, 93, 224, 23, 230, 129, 233, 81, 224, 23, 230, 129, 231, 55, 
+    244, 139, 50, 245, 224, 231, 191, 50, 235, 39, 221, 221, 214, 145, 229, 
+    94, 225, 21, 254, 13, 217, 41, 243, 53, 251, 4, 233, 20, 213, 150, 232, 
+    239, 221, 192, 222, 20, 250, 249, 254, 43, 225, 53, 71, 250, 118, 234, 
+    79, 71, 250, 118, 224, 15, 71, 250, 118, 222, 196, 71, 250, 118, 251, 
+    232, 71, 250, 118, 234, 31, 71, 250, 118, 225, 232, 85, 250, 118, 234, 
+    79, 85, 250, 118, 224, 15, 85, 250, 118, 222, 196, 85, 250, 118, 251, 
+    232, 85, 250, 118, 234, 31, 85, 250, 118, 225, 232, 85, 219, 17, 218, 51, 
+    71, 241, 229, 218, 51, 71, 247, 250, 218, 51, 85, 249, 246, 218, 51, 71, 
+    219, 17, 218, 51, 85, 241, 229, 218, 51, 85, 247, 250, 218, 51, 71, 249, 
+    246, 218, 51, 240, 244, 218, 239, 224, 23, 228, 48, 245, 190, 228, 48, 
+    252, 74, 245, 190, 228, 43, 252, 74, 219, 119, 228, 43, 230, 58, 244, 67, 
+    50, 230, 58, 229, 189, 50, 230, 58, 220, 77, 50, 212, 9, 182, 249, 131, 
+    245, 221, 182, 249, 131, 214, 171, 223, 113, 87, 223, 113, 16, 31, 215, 
+    48, 225, 35, 223, 113, 16, 31, 215, 47, 225, 35, 223, 113, 16, 31, 215, 
+    46, 225, 35, 223, 113, 16, 31, 215, 45, 225, 35, 223, 113, 16, 31, 215, 
+    44, 225, 35, 223, 113, 16, 31, 215, 43, 225, 35, 223, 113, 16, 31, 215, 
+    42, 225, 35, 223, 113, 16, 31, 243, 51, 231, 139, 85, 214, 171, 223, 113, 
+    87, 223, 114, 226, 21, 87, 225, 253, 226, 21, 87, 225, 175, 226, 21, 50, 
+    211, 255, 87, 247, 242, 244, 190, 247, 242, 244, 189, 247, 242, 244, 188, 
+    247, 242, 244, 187, 247, 242, 244, 186, 247, 242, 244, 185, 71, 250, 37, 
+    2, 59, 222, 252, 71, 250, 37, 2, 113, 247, 119, 85, 250, 37, 2, 71, 59, 
+    222, 252, 85, 250, 37, 2, 113, 71, 247, 119, 230, 143, 31, 211, 69, 230, 
+    143, 31, 210, 253, 247, 225, 31, 242, 132, 211, 69, 247, 225, 31, 233, 
+    14, 210, 253, 247, 225, 31, 233, 14, 211, 69, 247, 225, 31, 242, 132, 
+    210, 253, 71, 244, 74, 85, 244, 74, 242, 23, 22, 225, 105, 254, 121, 249, 
+    129, 217, 236, 218, 165, 64, 254, 227, 221, 207, 254, 170, 244, 52, 243, 
+    61, 218, 165, 64, 241, 203, 253, 200, 87, 244, 63, 226, 127, 71, 218, 
+    157, 134, 232, 209, 249, 176, 222, 252, 134, 232, 209, 249, 176, 233, 47, 
+    212, 50, 50, 125, 213, 130, 50, 246, 111, 244, 139, 50, 246, 111, 231, 
+    191, 50, 235, 204, 244, 139, 22, 231, 191, 50, 231, 191, 22, 244, 139, 
+    50, 231, 191, 2, 218, 104, 50, 231, 191, 2, 218, 104, 22, 231, 191, 22, 
+    244, 139, 50, 67, 231, 191, 2, 218, 104, 50, 203, 231, 191, 2, 218, 104, 
+    50, 231, 83, 71, 250, 36, 231, 83, 85, 250, 36, 231, 83, 4, 71, 250, 36, 
+    231, 154, 87, 247, 168, 87, 214, 169, 225, 252, 87, 249, 232, 243, 225, 
+    214, 141, 229, 89, 250, 162, 226, 62, 235, 45, 213, 185, 250, 94, 85, 
+    230, 130, 232, 226, 220, 113, 220, 148, 224, 6, 220, 131, 219, 56, 252, 
+    160, 252, 127, 92, 234, 139, 71, 246, 94, 231, 186, 71, 246, 94, 234, 79, 
+    85, 246, 94, 231, 186, 85, 246, 94, 234, 79, 219, 62, 211, 230, 219, 65, 
+    218, 39, 252, 52, 249, 248, 223, 160, 85, 219, 61, 216, 135, 249, 249, 
+    22, 223, 160, 215, 94, 71, 220, 3, 225, 102, 215, 94, 85, 220, 3, 225, 
+    102, 71, 247, 250, 236, 1, 218, 235, 249, 126, 233, 92, 247, 194, 250, 
+    245, 226, 167, 225, 105, 250, 246, 219, 89, 241, 213, 2, 71, 249, 131, 
+    37, 249, 126, 233, 92, 250, 154, 228, 76, 245, 125, 254, 142, 226, 192, 
+    43, 212, 26, 215, 252, 85, 215, 55, 43, 212, 26, 215, 252, 71, 215, 55, 
+    43, 212, 26, 215, 252, 85, 43, 233, 93, 231, 54, 71, 43, 233, 93, 231, 
+    54, 246, 90, 219, 83, 50, 114, 71, 246, 106, 215, 226, 43, 250, 1, 245, 
+    125, 92, 221, 255, 244, 176, 248, 0, 236, 1, 71, 250, 37, 236, 1, 85, 
+    218, 235, 85, 215, 193, 223, 61, 43, 245, 124, 223, 61, 43, 245, 123, 
+    253, 212, 16, 31, 214, 145, 114, 250, 37, 2, 218, 104, 22, 113, 170, 48, 
+    225, 190, 222, 249, 235, 206, 225, 190, 233, 44, 235, 206, 225, 190, 235, 
+    194, 225, 190, 85, 249, 132, 226, 198, 220, 30, 220, 18, 219, 230, 250, 
+    62, 250, 227, 241, 158, 219, 127, 243, 62, 211, 230, 240, 221, 243, 62, 
+    2, 242, 13, 231, 174, 16, 31, 232, 230, 230, 116, 214, 195, 226, 198, 
+    242, 123, 244, 13, 244, 75, 236, 1, 241, 60, 244, 130, 222, 15, 42, 244, 
+    12, 249, 160, 219, 105, 240, 113, 219, 108, 225, 169, 2, 252, 160, 216, 
+    243, 235, 132, 252, 147, 87, 241, 232, 242, 134, 87, 243, 233, 224, 143, 
+    249, 104, 226, 198, 85, 218, 235, 71, 244, 75, 2, 203, 230, 225, 85, 218, 
+    105, 214, 160, 251, 218, 221, 194, 85, 221, 194, 232, 109, 251, 218, 221, 
+    194, 71, 221, 194, 71, 114, 250, 131, 78, 217, 2, 232, 155, 50, 217, 54, 
+    246, 89, 254, 192, 245, 120, 223, 158, 244, 86, 223, 158, 242, 16, 213, 
+    174, 242, 16, 211, 198, 242, 16, 232, 109, 44, 225, 199, 225, 199, 214, 
+    160, 44, 225, 199, 71, 228, 231, 85, 228, 231, 250, 131, 78, 114, 250, 
+    131, 78, 230, 85, 211, 178, 114, 230, 85, 211, 178, 252, 157, 211, 178, 
+    114, 252, 157, 211, 178, 226, 127, 26, 249, 131, 114, 26, 249, 131, 204, 
+    250, 176, 249, 131, 114, 204, 250, 176, 249, 131, 7, 249, 131, 220, 92, 
+    71, 7, 249, 131, 226, 127, 7, 249, 131, 231, 188, 249, 131, 218, 158, 64, 
+    248, 150, 244, 12, 217, 16, 253, 217, 244, 12, 252, 158, 253, 217, 114, 
+    244, 12, 252, 158, 253, 217, 244, 12, 249, 244, 253, 217, 85, 244, 12, 
+    225, 10, 218, 157, 71, 244, 12, 225, 10, 218, 157, 219, 12, 218, 112, 
+    226, 127, 71, 218, 157, 37, 71, 218, 157, 204, 250, 176, 85, 218, 157, 
+    85, 250, 176, 71, 218, 157, 226, 127, 85, 218, 157, 114, 226, 127, 85, 
+    218, 157, 225, 61, 218, 157, 220, 92, 71, 218, 157, 114, 253, 217, 204, 
+    250, 176, 253, 217, 245, 194, 218, 245, 253, 217, 245, 194, 225, 10, 85, 
+    218, 157, 245, 194, 225, 10, 225, 61, 218, 157, 219, 126, 225, 10, 85, 
+    218, 157, 245, 194, 225, 10, 223, 115, 85, 218, 157, 114, 245, 194, 225, 
+    10, 223, 115, 85, 218, 157, 215, 77, 225, 10, 85, 218, 157, 219, 121, 
+    225, 10, 253, 217, 217, 16, 253, 217, 204, 250, 176, 217, 16, 253, 217, 
+    114, 217, 16, 253, 217, 219, 126, 225, 158, 85, 22, 71, 244, 55, 85, 244, 
+    55, 71, 244, 55, 245, 194, 225, 158, 226, 127, 85, 244, 55, 37, 204, 250, 
+    176, 245, 194, 225, 10, 218, 157, 114, 217, 16, 225, 61, 253, 217, 219, 
+    63, 216, 106, 215, 219, 219, 63, 114, 250, 115, 219, 63, 219, 14, 114, 
+    219, 14, 252, 158, 253, 217, 245, 194, 217, 16, 224, 172, 253, 217, 114, 
+    245, 194, 217, 16, 224, 172, 253, 217, 249, 132, 78, 220, 92, 71, 250, 
+    36, 152, 92, 249, 132, 78, 232, 109, 44, 246, 87, 71, 218, 235, 214, 160, 
+    44, 246, 87, 71, 218, 235, 232, 109, 44, 220, 92, 71, 218, 235, 214, 160, 
+    44, 220, 92, 71, 218, 235, 85, 224, 14, 164, 226, 148, 71, 224, 14, 164, 
+    226, 148, 71, 245, 32, 164, 226, 148, 85, 247, 250, 230, 183, 71, 211, 
+    178, 114, 245, 32, 164, 87, 192, 67, 130, 231, 83, 67, 130, 114, 67, 130, 
+    114, 219, 156, 215, 94, 249, 221, 223, 255, 164, 226, 148, 114, 219, 156, 
+    249, 221, 223, 255, 164, 226, 148, 114, 52, 215, 94, 249, 221, 223, 255, 
+    164, 226, 148, 114, 52, 249, 221, 223, 255, 164, 226, 148, 114, 121, 219, 
+    156, 249, 221, 223, 255, 164, 226, 148, 114, 121, 52, 249, 221, 223, 255, 
+    164, 226, 148, 249, 92, 218, 141, 226, 16, 5, 226, 148, 114, 245, 32, 
+    164, 226, 148, 114, 241, 229, 245, 32, 164, 226, 148, 114, 85, 241, 228, 
+    222, 188, 114, 85, 241, 229, 251, 114, 244, 56, 241, 228, 222, 188, 244, 
+    56, 241, 229, 251, 114, 231, 83, 43, 226, 5, 226, 148, 231, 83, 44, 226, 
+    5, 226, 148, 231, 83, 244, 64, 43, 226, 5, 226, 148, 231, 83, 244, 64, 
+    44, 226, 5, 226, 148, 231, 83, 233, 43, 254, 111, 251, 159, 226, 148, 
+    231, 83, 222, 248, 254, 111, 251, 159, 226, 148, 114, 233, 43, 254, 111, 
+    223, 255, 164, 226, 148, 114, 222, 248, 254, 111, 223, 255, 164, 226, 
+    148, 114, 233, 43, 254, 111, 251, 159, 226, 148, 114, 222, 248, 254, 111, 
+    251, 159, 226, 148, 192, 43, 216, 7, 220, 54, 251, 159, 226, 148, 192, 
+    44, 216, 7, 220, 54, 251, 159, 226, 148, 231, 83, 43, 249, 100, 251, 159, 
+    226, 148, 231, 83, 44, 249, 100, 251, 159, 226, 148, 247, 205, 152, 37, 
+    21, 110, 247, 205, 152, 37, 21, 105, 247, 205, 152, 37, 21, 158, 247, 
+    205, 152, 37, 21, 161, 247, 205, 152, 37, 21, 189, 247, 205, 152, 37, 21, 
+    194, 247, 205, 152, 37, 21, 198, 247, 205, 152, 37, 21, 195, 247, 205, 
+    152, 37, 21, 200, 247, 205, 152, 37, 54, 216, 248, 247, 205, 37, 35, 21, 
+    110, 247, 205, 37, 35, 21, 105, 247, 205, 37, 35, 21, 158, 247, 205, 37, 
+    35, 21, 161, 247, 205, 37, 35, 21, 189, 247, 205, 37, 35, 21, 194, 247, 
+    205, 37, 35, 21, 198, 247, 205, 37, 35, 21, 195, 247, 205, 37, 35, 21, 
+    200, 247, 205, 37, 35, 54, 216, 248, 247, 205, 152, 37, 35, 21, 110, 247, 
+    205, 152, 37, 35, 21, 105, 247, 205, 152, 37, 35, 21, 158, 247, 205, 152, 
+    37, 35, 21, 161, 247, 205, 152, 37, 35, 21, 189, 247, 205, 152, 37, 35, 
+    21, 194, 247, 205, 152, 37, 35, 21, 198, 247, 205, 152, 37, 35, 21, 195, 
+    247, 205, 152, 37, 35, 21, 200, 247, 205, 152, 37, 35, 54, 216, 248, 114, 
+    211, 246, 97, 74, 114, 96, 50, 114, 230, 183, 50, 114, 247, 170, 50, 114, 
+    219, 29, 245, 221, 74, 114, 97, 74, 114, 228, 57, 245, 221, 74, 246, 99, 
+    225, 12, 97, 74, 114, 222, 185, 97, 74, 215, 225, 97, 74, 114, 215, 225, 
+    97, 74, 248, 156, 215, 225, 97, 74, 114, 248, 156, 215, 225, 97, 74, 85, 
+    97, 74, 216, 145, 216, 13, 97, 253, 250, 216, 145, 251, 174, 97, 253, 
+    250, 85, 97, 253, 250, 114, 85, 249, 92, 246, 105, 22, 97, 74, 114, 85, 
+    249, 92, 214, 153, 22, 97, 74, 218, 232, 85, 97, 74, 114, 249, 207, 85, 
+    97, 74, 222, 247, 71, 97, 74, 233, 42, 71, 97, 74, 252, 184, 220, 92, 71, 
+    97, 74, 243, 242, 220, 92, 71, 97, 74, 114, 232, 109, 222, 246, 71, 97, 
+    74, 114, 214, 160, 222, 246, 71, 97, 74, 228, 50, 232, 109, 222, 246, 71, 
+    97, 74, 249, 100, 232, 124, 228, 50, 214, 160, 222, 246, 71, 97, 74, 37, 
+    114, 71, 97, 74, 211, 252, 97, 74, 251, 221, 219, 29, 245, 221, 74, 251, 
+    221, 97, 74, 251, 221, 228, 57, 245, 221, 74, 114, 251, 221, 219, 29, 
+    245, 221, 74, 114, 251, 221, 97, 74, 114, 251, 221, 228, 57, 245, 221, 
+    74, 217, 18, 97, 74, 114, 217, 17, 97, 74, 212, 18, 97, 74, 114, 212, 18, 
+    97, 74, 226, 173, 97, 74, 52, 249, 100, 232, 124, 134, 247, 215, 254, 
+    110, 71, 215, 227, 249, 188, 4, 71, 215, 226, 225, 172, 204, 218, 64, 
+    204, 218, 22, 43, 222, 91, 252, 174, 248, 61, 44, 222, 91, 252, 174, 248, 
+    61, 177, 2, 59, 235, 216, 223, 51, 219, 48, 224, 202, 218, 64, 218, 23, 
+    224, 202, 219, 47, 67, 252, 142, 2, 203, 91, 11, 222, 229, 247, 255, 199, 
+    247, 169, 11, 244, 176, 247, 255, 92, 232, 147, 254, 119, 92, 232, 147, 
+    226, 159, 71, 247, 250, 2, 250, 174, 247, 121, 22, 2, 247, 121, 245, 171, 
+    64, 226, 171, 214, 152, 232, 109, 44, 249, 162, 2, 247, 121, 214, 160, 
+    43, 249, 162, 2, 247, 121, 43, 226, 129, 235, 67, 44, 226, 129, 235, 67, 
+    243, 230, 226, 129, 235, 67, 233, 86, 120, 217, 88, 233, 86, 124, 217, 
+    88, 43, 22, 44, 52, 215, 93, 43, 22, 44, 217, 88, 43, 230, 88, 199, 44, 
+    217, 88, 199, 43, 217, 88, 120, 217, 89, 2, 250, 37, 48, 232, 106, 247, 
+    174, 251, 79, 203, 222, 134, 71, 249, 206, 247, 249, 71, 249, 206, 247, 
+    250, 2, 140, 216, 115, 71, 249, 206, 247, 250, 2, 97, 216, 115, 71, 42, 
+    2, 140, 216, 115, 71, 42, 2, 97, 216, 115, 11, 43, 71, 42, 127, 11, 44, 
+    71, 42, 127, 11, 43, 254, 111, 127, 11, 44, 254, 111, 127, 11, 43, 52, 
+    254, 111, 127, 11, 44, 52, 254, 111, 127, 11, 43, 71, 216, 7, 220, 54, 
+    127, 11, 44, 71, 216, 7, 220, 54, 127, 11, 43, 244, 64, 226, 4, 11, 44, 
+    244, 64, 226, 4, 214, 153, 224, 25, 74, 246, 105, 224, 25, 74, 254, 89, 
+    243, 99, 250, 37, 74, 250, 3, 243, 99, 250, 37, 74, 44, 80, 2, 37, 225, 
+    23, 199, 140, 74, 199, 97, 74, 199, 43, 44, 74, 199, 140, 52, 74, 199, 
+    97, 52, 74, 199, 43, 44, 52, 74, 199, 140, 80, 243, 244, 130, 199, 97, 
+    80, 243, 244, 130, 199, 140, 52, 80, 243, 244, 130, 199, 97, 52, 80, 243, 
+    244, 130, 199, 97, 218, 231, 74, 46, 47, 251, 216, 46, 47, 247, 118, 46, 
+    47, 246, 246, 46, 47, 247, 117, 46, 47, 246, 182, 46, 47, 247, 53, 46, 
+    47, 246, 245, 46, 47, 247, 116, 46, 47, 246, 150, 46, 47, 247, 21, 46, 
+    47, 246, 213, 46, 47, 247, 84, 46, 47, 246, 181, 46, 47, 247, 52, 46, 47, 
+    246, 244, 46, 47, 247, 115, 46, 47, 246, 134, 46, 47, 247, 5, 46, 47, 
+    246, 197, 46, 47, 247, 68, 46, 47, 246, 165, 46, 47, 247, 36, 46, 47, 
+    246, 228, 46, 47, 247, 99, 46, 47, 246, 149, 46, 47, 247, 20, 46, 47, 
+    246, 212, 46, 47, 247, 83, 46, 47, 246, 180, 46, 47, 247, 51, 46, 47, 
+    246, 243, 46, 47, 247, 114, 46, 47, 246, 126, 46, 47, 246, 253, 46, 47, 
+    246, 189, 46, 47, 247, 60, 46, 47, 246, 157, 46, 47, 247, 28, 46, 47, 
+    246, 220, 46, 47, 247, 91, 46, 47, 246, 141, 46, 47, 247, 12, 46, 47, 
+    246, 204, 46, 47, 247, 75, 46, 47, 246, 172, 46, 47, 247, 43, 46, 47, 
+    246, 235, 46, 47, 247, 106, 46, 47, 246, 133, 46, 47, 247, 4, 46, 47, 
+    246, 196, 46, 47, 247, 67, 46, 47, 246, 164, 46, 47, 247, 35, 46, 47, 
+    246, 227, 46, 47, 247, 98, 46, 47, 246, 148, 46, 47, 247, 19, 46, 47, 
+    246, 211, 46, 47, 247, 82, 46, 47, 246, 179, 46, 47, 247, 50, 46, 47, 
+    246, 242, 46, 47, 247, 113, 46, 47, 246, 122, 46, 47, 246, 249, 46, 47, 
+    246, 185, 46, 47, 247, 56, 46, 47, 246, 153, 46, 47, 247, 24, 46, 47, 
+    246, 216, 46, 47, 247, 87, 46, 47, 246, 137, 46, 47, 247, 8, 46, 47, 246, 
+    200, 46, 47, 247, 71, 46, 47, 246, 168, 46, 47, 247, 39, 46, 47, 246, 
+    231, 46, 47, 247, 102, 46, 47, 246, 129, 46, 47, 247, 0, 46, 47, 246, 
+    192, 46, 47, 247, 63, 46, 47, 246, 160, 46, 47, 247, 31, 46, 47, 246, 
+    223, 46, 47, 247, 94, 46, 47, 246, 144, 46, 47, 247, 15, 46, 47, 246, 
+    207, 46, 47, 247, 78, 46, 47, 246, 175, 46, 47, 247, 46, 46, 47, 246, 
+    238, 46, 47, 247, 109, 46, 47, 246, 125, 46, 47, 246, 252, 46, 47, 246, 
+    188, 46, 47, 247, 59, 46, 47, 246, 156, 46, 47, 247, 27, 46, 47, 246, 
+    219, 46, 47, 247, 90, 46, 47, 246, 140, 46, 47, 247, 11, 46, 47, 246, 
+    203, 46, 47, 247, 74, 46, 47, 246, 171, 46, 47, 247, 42, 46, 47, 246, 
+    234, 46, 47, 247, 105, 46, 47, 246, 132, 46, 47, 247, 3, 46, 47, 246, 
+    195, 46, 47, 247, 66, 46, 47, 246, 163, 46, 47, 247, 34, 46, 47, 246, 
+    226, 46, 47, 247, 97, 46, 47, 246, 147, 46, 47, 247, 18, 46, 47, 246, 
+    210, 46, 47, 247, 81, 46, 47, 246, 178, 46, 47, 247, 49, 46, 47, 246, 
+    241, 46, 47, 247, 112, 46, 47, 246, 120, 46, 47, 246, 247, 46, 47, 246, 
+    183, 46, 47, 247, 54, 46, 47, 246, 151, 46, 47, 247, 22, 46, 47, 246, 
+    214, 46, 47, 247, 85, 46, 47, 246, 135, 46, 47, 247, 6, 46, 47, 246, 198, 
+    46, 47, 247, 69, 46, 47, 246, 166, 46, 47, 247, 37, 46, 47, 246, 229, 46, 
+    47, 247, 100, 46, 47, 246, 127, 46, 47, 246, 254, 46, 47, 246, 190, 46, 
+    47, 247, 61, 46, 47, 246, 158, 46, 47, 247, 29, 46, 47, 246, 221, 46, 47, 
+    247, 92, 46, 47, 246, 142, 46, 47, 247, 13, 46, 47, 246, 205, 46, 47, 
+    247, 76, 46, 47, 246, 173, 46, 47, 247, 44, 46, 47, 246, 236, 46, 47, 
+    247, 107, 46, 47, 246, 123, 46, 47, 246, 250, 46, 47, 246, 186, 46, 47, 
+    247, 57, 46, 47, 246, 154, 46, 47, 247, 25, 46, 47, 246, 217, 46, 47, 
+    247, 88, 46, 47, 246, 138, 46, 47, 247, 9, 46, 47, 246, 201, 46, 47, 247, 
+    72, 46, 47, 246, 169, 46, 47, 247, 40, 46, 47, 246, 232, 46, 47, 247, 
+    103, 46, 47, 246, 130, 46, 47, 247, 1, 46, 47, 246, 193, 46, 47, 247, 64, 
+    46, 47, 246, 161, 46, 47, 247, 32, 46, 47, 246, 224, 46, 47, 247, 95, 46, 
+    47, 246, 145, 46, 47, 247, 16, 46, 47, 246, 208, 46, 47, 247, 79, 46, 47, 
+    246, 176, 46, 47, 247, 47, 46, 47, 246, 239, 46, 47, 247, 110, 46, 47, 
+    246, 121, 46, 47, 246, 248, 46, 47, 246, 184, 46, 47, 247, 55, 46, 47, 
+    246, 152, 46, 47, 247, 23, 46, 47, 246, 215, 46, 47, 247, 86, 46, 47, 
+    246, 136, 46, 47, 247, 7, 46, 47, 246, 199, 46, 47, 247, 70, 46, 47, 246, 
+    167, 46, 47, 247, 38, 46, 47, 246, 230, 46, 47, 247, 101, 46, 47, 246, 
+    128, 46, 47, 246, 255, 46, 47, 246, 191, 46, 47, 247, 62, 46, 47, 246, 
+    159, 46, 47, 247, 30, 46, 47, 246, 222, 46, 47, 247, 93, 46, 47, 246, 
+    143, 46, 47, 247, 14, 46, 47, 246, 206, 46, 47, 247, 77, 46, 47, 246, 
+    174, 46, 47, 247, 45, 46, 47, 246, 237, 46, 47, 247, 108, 46, 47, 246, 
+    124, 46, 47, 246, 251, 46, 47, 246, 187, 46, 47, 247, 58, 46, 47, 246, 
+    155, 46, 47, 247, 26, 46, 47, 246, 218, 46, 47, 247, 89, 46, 47, 246, 
+    139, 46, 47, 247, 10, 46, 47, 246, 202, 46, 47, 247, 73, 46, 47, 246, 
+    170, 46, 47, 247, 41, 46, 47, 246, 233, 46, 47, 247, 104, 46, 47, 246, 
+    131, 46, 47, 247, 2, 46, 47, 246, 194, 46, 47, 247, 65, 46, 47, 246, 162, 
+    46, 47, 247, 33, 46, 47, 246, 225, 46, 47, 247, 96, 46, 47, 246, 146, 46, 
+    47, 247, 17, 46, 47, 246, 209, 46, 47, 247, 80, 46, 47, 246, 177, 46, 47, 
+    247, 48, 46, 47, 246, 240, 46, 47, 247, 111, 97, 215, 58, 80, 2, 67, 91, 
     97, 215, 58, 80, 2, 52, 67, 91, 140, 52, 80, 2, 67, 91, 97, 52, 80, 2, 
-    67, 91, 43, 44, 52, 80, 2, 67, 91, 97, 215, 58, 80, 243, 243, 130, 140, 
-    52, 80, 243, 243, 130, 97, 52, 80, 243, 243, 130, 246, 104, 80, 2, 203, 
-    91, 214, 153, 80, 2, 203, 91, 214, 153, 215, 211, 74, 246, 104, 215, 211, 
-    74, 140, 52, 248, 157, 74, 97, 52, 248, 157, 74, 140, 215, 211, 248, 157, 
-    74, 97, 215, 211, 248, 157, 74, 97, 215, 58, 215, 211, 248, 157, 74, 97, 
-    80, 2, 246, 118, 218, 139, 214, 153, 80, 216, 42, 130, 246, 104, 80, 216, 
-    42, 130, 97, 80, 2, 217, 78, 2, 67, 91, 97, 80, 2, 217, 78, 2, 52, 67, 
-    91, 97, 215, 58, 80, 2, 217, 77, 97, 215, 58, 80, 2, 217, 78, 2, 67, 91, 
-    97, 215, 58, 80, 2, 217, 78, 2, 52, 67, 91, 140, 253, 251, 97, 253, 251, 
-    140, 52, 253, 251, 97, 52, 253, 251, 140, 80, 216, 42, 85, 247, 248, 97, 
-    80, 216, 42, 85, 247, 248, 140, 80, 243, 243, 252, 141, 216, 42, 85, 247, 
-    248, 97, 80, 243, 243, 252, 141, 216, 42, 85, 247, 248, 228, 56, 212, 9, 
-    22, 219, 28, 245, 220, 74, 228, 56, 245, 220, 22, 219, 28, 212, 9, 74, 
-    228, 56, 212, 9, 80, 2, 103, 228, 56, 245, 220, 80, 2, 103, 219, 28, 245, 
-    220, 80, 2, 103, 219, 28, 212, 9, 80, 2, 103, 228, 56, 212, 9, 80, 22, 
-    228, 56, 245, 220, 74, 228, 56, 245, 220, 80, 22, 219, 28, 245, 220, 74, 
-    219, 28, 245, 220, 80, 22, 219, 28, 212, 9, 74, 219, 28, 212, 9, 80, 22, 
-    228, 56, 212, 9, 74, 222, 228, 247, 255, 249, 125, 244, 175, 247, 254, 
-    244, 175, 247, 255, 249, 125, 222, 228, 247, 254, 219, 28, 245, 220, 80, 
-    249, 125, 228, 56, 245, 220, 74, 228, 56, 245, 220, 80, 249, 125, 219, 
-    28, 245, 220, 74, 244, 175, 247, 255, 249, 125, 228, 56, 245, 220, 74, 
-    222, 228, 247, 255, 249, 125, 219, 28, 245, 220, 74, 228, 56, 245, 220, 
-    80, 249, 125, 228, 56, 212, 9, 74, 228, 56, 212, 9, 80, 249, 125, 228, 
-    56, 245, 220, 74, 212, 36, 80, 225, 7, 247, 195, 222, 251, 80, 225, 7, 
-    97, 216, 188, 249, 90, 214, 152, 80, 225, 7, 97, 216, 188, 249, 90, 246, 
-    103, 80, 225, 7, 246, 104, 216, 188, 249, 90, 233, 37, 80, 225, 7, 246, 
-    104, 216, 188, 249, 90, 222, 241, 222, 244, 254, 26, 250, 2, 74, 233, 40, 
-    254, 26, 254, 88, 74, 216, 14, 254, 26, 254, 88, 74, 251, 175, 254, 26, 
-    254, 88, 74, 216, 14, 254, 26, 250, 2, 80, 2, 230, 181, 216, 14, 254, 26, 
-    254, 88, 80, 2, 225, 22, 232, 108, 44, 220, 152, 250, 2, 74, 232, 108, 
-    43, 220, 152, 254, 88, 74, 254, 88, 250, 0, 250, 36, 74, 250, 2, 250, 0, 
-    250, 36, 74, 97, 80, 77, 219, 251, 140, 74, 140, 80, 77, 219, 251, 97, 
-    74, 219, 251, 97, 80, 77, 140, 74, 97, 80, 2, 96, 51, 140, 80, 2, 96, 51, 
-    97, 80, 216, 139, 211, 178, 43, 44, 80, 216, 139, 4, 250, 35, 214, 153, 
-    215, 58, 80, 243, 243, 4, 250, 35, 43, 252, 139, 120, 44, 252, 139, 124, 
-    241, 254, 43, 252, 139, 124, 44, 252, 139, 120, 241, 254, 120, 252, 139, 
-    44, 124, 252, 139, 43, 241, 254, 120, 252, 139, 43, 124, 252, 139, 44, 
-    241, 254, 43, 252, 139, 120, 44, 252, 139, 120, 241, 254, 120, 252, 139, 
-    44, 124, 252, 139, 44, 241, 254, 43, 252, 139, 124, 44, 252, 139, 124, 
-    241, 254, 120, 252, 139, 43, 124, 252, 139, 43, 241, 254, 140, 241, 255, 
-    2, 252, 139, 120, 216, 42, 130, 97, 241, 255, 2, 252, 139, 120, 216, 42, 
-    130, 214, 153, 241, 255, 2, 252, 139, 44, 216, 42, 130, 246, 104, 241, 
-    255, 2, 252, 139, 44, 216, 42, 130, 140, 241, 255, 2, 252, 139, 124, 216, 
-    42, 130, 97, 241, 255, 2, 252, 139, 124, 216, 42, 130, 214, 153, 241, 
-    255, 2, 252, 139, 43, 216, 42, 130, 246, 104, 241, 255, 2, 252, 139, 43, 
-    216, 42, 130, 140, 241, 255, 2, 252, 139, 120, 243, 243, 130, 97, 241, 
-    255, 2, 252, 139, 120, 243, 243, 130, 214, 153, 241, 255, 2, 252, 139, 
-    44, 243, 243, 130, 246, 104, 241, 255, 2, 252, 139, 44, 243, 243, 130, 
-    140, 241, 255, 2, 252, 139, 124, 243, 243, 130, 97, 241, 255, 2, 252, 
-    139, 124, 243, 243, 130, 214, 153, 241, 255, 2, 252, 139, 43, 243, 243, 
-    130, 246, 104, 241, 255, 2, 252, 139, 43, 243, 243, 130, 140, 241, 255, 
-    2, 252, 139, 120, 77, 140, 241, 255, 2, 252, 139, 246, 106, 214, 153, 
-    241, 255, 2, 252, 139, 43, 252, 30, 214, 153, 241, 255, 2, 252, 139, 222, 
-    251, 97, 241, 255, 2, 252, 139, 120, 77, 97, 241, 255, 2, 252, 139, 246, 
-    106, 246, 104, 241, 255, 2, 252, 139, 43, 252, 30, 246, 104, 241, 255, 2, 
-    252, 139, 222, 251, 140, 241, 255, 2, 252, 139, 120, 77, 97, 241, 255, 2, 
-    252, 139, 214, 163, 140, 241, 255, 2, 252, 139, 124, 77, 97, 241, 255, 2, 
-    252, 139, 246, 106, 97, 241, 255, 2, 252, 139, 120, 77, 140, 241, 255, 2, 
-    252, 139, 214, 163, 97, 241, 255, 2, 252, 139, 124, 77, 140, 241, 255, 2, 
-    252, 139, 246, 106, 140, 241, 255, 2, 252, 139, 120, 77, 199, 248, 156, 
-    140, 241, 255, 2, 252, 139, 124, 252, 43, 199, 248, 156, 97, 241, 255, 2, 
-    252, 139, 120, 77, 199, 248, 156, 97, 241, 255, 2, 252, 139, 124, 252, 
-    43, 199, 248, 156, 214, 153, 241, 255, 2, 252, 139, 43, 252, 30, 246, 
-    104, 241, 255, 2, 252, 139, 222, 251, 246, 104, 241, 255, 2, 252, 139, 
-    43, 252, 30, 214, 153, 241, 255, 2, 252, 139, 222, 251, 44, 52, 80, 2, 
-    222, 183, 241, 235, 245, 98, 5, 77, 97, 74, 216, 89, 226, 168, 77, 97, 
-    74, 140, 80, 77, 216, 89, 226, 167, 97, 80, 77, 216, 89, 226, 167, 97, 
-    80, 77, 254, 148, 128, 111, 233, 15, 77, 140, 74, 140, 80, 216, 139, 233, 
-    14, 242, 130, 77, 97, 74, 218, 64, 77, 97, 74, 140, 80, 216, 139, 218, 
-    63, 218, 22, 77, 140, 74, 43, 244, 91, 217, 77, 44, 244, 91, 217, 77, 
-    120, 244, 91, 217, 77, 124, 244, 91, 217, 77, 215, 211, 67, 252, 141, 
-    248, 60, 210, 160, 187, 218, 242, 210, 160, 187, 215, 49, 249, 226, 43, 
-    71, 249, 99, 127, 44, 71, 249, 99, 127, 43, 71, 226, 3, 44, 71, 226, 3, 
-    210, 160, 187, 43, 236, 15, 127, 210, 160, 187, 44, 236, 15, 127, 210, 
-    160, 187, 43, 251, 242, 127, 210, 160, 187, 44, 251, 242, 127, 43, 42, 
-    251, 158, 2, 214, 183, 44, 42, 251, 158, 2, 214, 183, 43, 42, 251, 158, 
-    2, 216, 115, 236, 0, 216, 14, 249, 160, 44, 42, 251, 158, 2, 216, 115, 
-    236, 0, 251, 175, 249, 160, 43, 42, 251, 158, 2, 216, 115, 236, 0, 251, 
-    175, 249, 160, 44, 42, 251, 158, 2, 216, 115, 236, 0, 216, 14, 249, 160, 
-    43, 254, 110, 251, 158, 2, 247, 120, 44, 254, 110, 251, 158, 2, 247, 120, 
-    43, 254, 26, 233, 15, 127, 44, 254, 26, 242, 130, 127, 52, 43, 254, 26, 
-    242, 130, 127, 52, 44, 254, 26, 233, 15, 127, 43, 85, 216, 6, 220, 53, 
-    127, 44, 85, 216, 6, 220, 53, 127, 246, 118, 244, 135, 67, 210, 35, 232, 
-    213, 231, 88, 254, 110, 226, 170, 233, 46, 44, 254, 110, 214, 12, 2, 218, 
-    234, 231, 88, 44, 254, 110, 2, 247, 120, 254, 110, 2, 222, 92, 235, 215, 
-    255, 3, 254, 109, 218, 255, 254, 110, 226, 170, 233, 46, 218, 255, 254, 
-    110, 226, 170, 214, 163, 215, 94, 254, 109, 223, 49, 254, 109, 254, 110, 
-    2, 214, 183, 223, 49, 254, 110, 2, 214, 183, 226, 248, 254, 110, 226, 
-    170, 214, 163, 226, 248, 254, 110, 226, 170, 246, 106, 231, 88, 254, 110, 
-    2, 204, 254, 5, 245, 140, 236, 0, 80, 225, 7, 120, 22, 222, 251, 231, 88, 
-    254, 110, 2, 204, 254, 5, 245, 140, 236, 0, 80, 225, 7, 120, 22, 233, 46, 
-    231, 88, 254, 110, 2, 204, 254, 5, 245, 140, 236, 0, 80, 225, 7, 124, 22, 
-    222, 251, 231, 88, 254, 110, 2, 204, 254, 5, 245, 140, 236, 0, 80, 225, 
-    7, 124, 22, 233, 46, 231, 88, 254, 110, 2, 204, 254, 5, 245, 140, 236, 0, 
-    80, 225, 7, 44, 22, 214, 163, 231, 88, 254, 110, 2, 204, 254, 5, 245, 
-    140, 236, 0, 80, 225, 7, 43, 22, 214, 163, 231, 88, 254, 110, 2, 204, 
-    254, 5, 245, 140, 236, 0, 80, 225, 7, 44, 22, 246, 106, 231, 88, 254, 
-    110, 2, 204, 254, 5, 245, 140, 236, 0, 80, 225, 7, 43, 22, 246, 106, 223, 
-    49, 245, 152, 220, 127, 245, 152, 220, 128, 2, 226, 123, 245, 152, 220, 
-    128, 2, 4, 250, 36, 48, 245, 152, 220, 128, 2, 44, 80, 48, 245, 152, 220, 
-    128, 2, 43, 80, 48, 250, 36, 2, 203, 130, 37, 67, 130, 37, 226, 7, 37, 
-    223, 50, 219, 46, 37, 225, 171, 250, 36, 247, 173, 251, 78, 203, 252, 
-    141, 22, 216, 14, 163, 247, 173, 251, 78, 67, 130, 250, 36, 2, 218, 24, 
-    211, 178, 37, 254, 87, 247, 169, 50, 120, 80, 216, 139, 250, 35, 37, 71, 
-    251, 113, 37, 251, 113, 37, 233, 14, 37, 242, 129, 250, 36, 2, 4, 250, 
-    36, 216, 42, 216, 196, 222, 251, 250, 36, 2, 113, 203, 218, 91, 216, 42, 
-    216, 196, 222, 251, 92, 222, 228, 247, 255, 219, 95, 92, 244, 175, 247, 
-    255, 219, 95, 92, 253, 216, 92, 4, 250, 35, 92, 218, 234, 113, 235, 65, 
-    218, 232, 215, 226, 2, 59, 48, 215, 226, 2, 214, 183, 222, 92, 236, 0, 
-    215, 225, 215, 226, 2, 220, 134, 253, 207, 251, 174, 44, 215, 226, 77, 
-    43, 215, 225, 43, 215, 226, 252, 30, 67, 130, 67, 252, 141, 252, 30, 44, 
-    215, 225, 251, 165, 2, 43, 163, 251, 221, 251, 165, 2, 44, 163, 251, 221, 
-    85, 251, 164, 30, 2, 43, 163, 251, 221, 30, 2, 44, 163, 251, 221, 71, 
-    240, 236, 85, 240, 236, 43, 211, 244, 244, 135, 44, 211, 244, 244, 135, 
-    43, 52, 211, 244, 244, 135, 44, 52, 211, 244, 244, 135, 235, 248, 235, 
-    234, 216, 112, 117, 235, 234, 235, 235, 229, 102, 2, 67, 130, 246, 112, 
-    230, 87, 42, 2, 249, 181, 226, 127, 235, 246, 253, 237, 219, 219, 224, 
-    180, 245, 98, 5, 22, 219, 97, 226, 7, 245, 98, 5, 22, 219, 97, 226, 8, 2, 
-    216, 89, 48, 240, 104, 216, 42, 22, 219, 97, 226, 7, 242, 183, 218, 155, 
-    216, 185, 246, 105, 215, 226, 2, 43, 163, 251, 221, 246, 105, 215, 226, 
-    2, 44, 163, 251, 221, 85, 247, 249, 2, 124, 74, 85, 232, 104, 71, 250, 
-    36, 2, 124, 74, 85, 250, 36, 2, 124, 74, 245, 85, 71, 218, 234, 245, 85, 
-    85, 218, 234, 245, 85, 71, 247, 248, 245, 85, 85, 247, 248, 245, 85, 71, 
-    250, 35, 245, 85, 85, 250, 35, 222, 132, 223, 50, 219, 47, 226, 167, 219, 
-    47, 2, 226, 123, 223, 50, 219, 47, 2, 203, 91, 251, 249, 219, 46, 251, 
-    249, 223, 50, 219, 46, 52, 225, 22, 215, 211, 225, 22, 233, 42, 249, 91, 
-    254, 110, 127, 222, 247, 249, 91, 254, 110, 127, 216, 78, 230, 179, 230, 
-    24, 37, 59, 226, 167, 230, 24, 37, 96, 226, 167, 230, 24, 37, 30, 226, 
-    167, 230, 24, 214, 176, 226, 168, 2, 247, 120, 230, 24, 214, 176, 226, 
-    168, 2, 225, 22, 230, 24, 42, 235, 199, 226, 167, 230, 24, 42, 214, 176, 
-    226, 167, 113, 232, 146, 22, 226, 167, 113, 232, 146, 177, 226, 167, 230, 
-    24, 30, 226, 167, 230, 154, 113, 218, 43, 218, 41, 2, 235, 211, 224, 24, 
-    235, 212, 226, 167, 244, 99, 225, 255, 235, 211, 235, 212, 2, 52, 91, 
-    235, 212, 253, 173, 2, 219, 95, 250, 32, 243, 226, 254, 88, 235, 209, 
-    232, 214, 235, 210, 2, 223, 115, 225, 237, 254, 2, 225, 1, 232, 214, 235, 
-    210, 2, 220, 152, 225, 237, 254, 2, 225, 1, 232, 214, 235, 210, 228, 52, 
-    235, 250, 216, 196, 225, 1, 235, 212, 254, 2, 115, 225, 11, 226, 167, 
-    224, 18, 235, 212, 226, 167, 235, 212, 2, 140, 80, 2, 103, 235, 212, 2, 
-    30, 50, 235, 212, 2, 235, 198, 235, 212, 2, 214, 175, 235, 212, 2, 226, 
-    123, 235, 212, 2, 214, 183, 235, 66, 233, 85, 43, 215, 226, 226, 167, 
-    210, 160, 187, 221, 201, 249, 209, 210, 160, 187, 221, 201, 225, 56, 210, 
-    160, 187, 221, 201, 224, 176, 96, 5, 2, 4, 250, 36, 48, 96, 5, 2, 250, 
-    31, 255, 15, 48, 96, 5, 2, 216, 89, 48, 96, 5, 2, 59, 51, 96, 5, 2, 216, 
-    89, 51, 96, 5, 2, 218, 65, 105, 96, 5, 2, 85, 215, 225, 230, 182, 5, 2, 
-    249, 220, 48, 230, 182, 5, 2, 59, 51, 230, 182, 5, 2, 244, 175, 247, 118, 
-    230, 182, 5, 2, 222, 228, 247, 118, 96, 5, 236, 0, 43, 163, 250, 35, 96, 
-    5, 236, 0, 44, 163, 250, 35, 213, 254, 177, 249, 131, 224, 180, 230, 84, 
-    5, 2, 59, 48, 230, 84, 5, 2, 214, 183, 220, 149, 224, 181, 2, 251, 175, 
-    249, 255, 219, 77, 224, 180, 230, 84, 5, 236, 0, 43, 163, 250, 35, 230, 
-    84, 5, 236, 0, 44, 163, 250, 35, 37, 230, 84, 5, 2, 250, 31, 255, 14, 
-    230, 84, 5, 236, 0, 52, 250, 35, 37, 247, 169, 50, 96, 5, 236, 0, 215, 
-    225, 230, 182, 5, 236, 0, 215, 225, 230, 84, 5, 236, 0, 215, 225, 235, 
-    206, 224, 180, 222, 242, 235, 206, 224, 180, 210, 160, 187, 223, 90, 249, 
-    209, 254, 134, 177, 249, 165, 235, 199, 2, 247, 120, 214, 176, 2, 230, 
-    182, 50, 214, 176, 2, 226, 123, 235, 199, 2, 226, 123, 235, 199, 2, 232, 
-    146, 254, 118, 214, 176, 2, 232, 146, 226, 158, 214, 176, 77, 235, 198, 
-    235, 199, 77, 214, 175, 214, 176, 77, 252, 141, 77, 235, 198, 235, 199, 
-    77, 252, 141, 77, 214, 175, 214, 176, 252, 30, 22, 235, 65, 2, 214, 175, 
-    235, 199, 252, 30, 22, 235, 65, 2, 235, 198, 250, 0, 214, 176, 2, 220, 
-    133, 250, 0, 235, 199, 2, 220, 133, 52, 42, 235, 198, 52, 42, 214, 175, 
-    250, 0, 214, 176, 2, 220, 134, 22, 219, 77, 224, 180, 232, 146, 22, 2, 
-    59, 48, 232, 146, 177, 2, 59, 48, 52, 232, 146, 254, 118, 52, 232, 146, 
-    226, 158, 113, 235, 200, 232, 146, 254, 118, 113, 235, 200, 232, 146, 
-    226, 158, 219, 85, 233, 85, 226, 158, 219, 85, 233, 85, 254, 118, 232, 
-    146, 177, 226, 121, 232, 146, 254, 118, 232, 146, 22, 2, 230, 224, 218, 
-    139, 232, 146, 177, 2, 230, 224, 218, 139, 232, 146, 22, 2, 203, 248, 
-    156, 232, 146, 177, 2, 203, 248, 156, 232, 146, 22, 2, 52, 226, 123, 232, 
-    146, 22, 2, 214, 183, 232, 146, 22, 2, 52, 214, 183, 4, 213, 251, 2, 214, 
-    183, 232, 146, 177, 2, 52, 226, 123, 232, 146, 177, 2, 52, 214, 183, 210, 
-    160, 187, 247, 129, 254, 79, 210, 160, 187, 223, 148, 254, 79, 245, 98, 
-    5, 2, 59, 51, 240, 104, 2, 59, 48, 215, 211, 203, 252, 141, 2, 52, 67, 
-    91, 215, 211, 203, 252, 141, 2, 215, 211, 67, 91, 216, 89, 226, 168, 2, 
-    59, 48, 216, 89, 226, 168, 2, 222, 228, 247, 118, 219, 162, 230, 182, 
-    219, 161, 249, 199, 2, 59, 48, 245, 98, 2, 253, 216, 254, 148, 128, 216, 
-    42, 2, 250, 31, 255, 14, 254, 48, 128, 177, 128, 111, 245, 98, 5, 77, 96, 
-    50, 96, 5, 77, 245, 98, 50, 245, 98, 5, 77, 216, 89, 226, 167, 52, 249, 
-    227, 245, 99, 113, 249, 194, 245, 98, 219, 176, 134, 249, 194, 245, 98, 
-    219, 176, 245, 98, 5, 2, 113, 170, 77, 22, 113, 170, 51, 245, 94, 2, 244, 
-    11, 170, 48, 233, 15, 2, 250, 36, 235, 215, 242, 130, 2, 250, 36, 235, 
-    215, 233, 15, 2, 224, 13, 164, 48, 242, 130, 2, 224, 13, 164, 48, 233, 
-    15, 177, 219, 97, 128, 111, 242, 130, 177, 219, 97, 128, 111, 233, 15, 
-    177, 219, 97, 128, 216, 42, 2, 59, 235, 215, 242, 130, 177, 219, 97, 128, 
-    216, 42, 2, 59, 235, 215, 233, 15, 177, 219, 97, 128, 216, 42, 2, 59, 48, 
-    242, 130, 177, 219, 97, 128, 216, 42, 2, 59, 48, 233, 15, 177, 219, 97, 
-    128, 216, 42, 2, 59, 77, 222, 251, 242, 130, 177, 219, 97, 128, 216, 42, 
-    2, 59, 77, 233, 46, 233, 15, 177, 254, 49, 242, 130, 177, 254, 49, 233, 
-    15, 22, 219, 153, 228, 52, 128, 111, 242, 130, 22, 219, 153, 228, 52, 
-    128, 111, 233, 15, 22, 228, 52, 254, 49, 242, 130, 22, 228, 52, 254, 49, 
-    233, 15, 77, 246, 111, 128, 77, 242, 129, 242, 130, 77, 246, 111, 128, 
-    77, 233, 14, 233, 15, 77, 219, 162, 177, 245, 99, 242, 130, 77, 219, 162, 
-    177, 245, 99, 233, 15, 77, 219, 162, 77, 242, 129, 242, 130, 77, 219, 
-    162, 77, 233, 14, 233, 15, 77, 242, 130, 77, 246, 111, 245, 99, 242, 130, 
-    77, 233, 15, 77, 246, 111, 245, 99, 233, 15, 77, 219, 97, 128, 77, 242, 
-    130, 77, 219, 97, 245, 99, 242, 130, 77, 219, 97, 128, 77, 233, 15, 77, 
-    219, 97, 245, 99, 219, 97, 128, 216, 42, 177, 233, 14, 219, 97, 128, 216, 
-    42, 177, 242, 129, 219, 97, 128, 216, 42, 177, 233, 15, 2, 59, 235, 215, 
-    219, 97, 128, 216, 42, 177, 242, 130, 2, 59, 235, 215, 246, 111, 128, 
-    216, 42, 177, 233, 14, 246, 111, 128, 216, 42, 177, 242, 129, 246, 111, 
-    219, 97, 128, 216, 42, 177, 233, 14, 246, 111, 219, 97, 128, 216, 42, 
-    177, 242, 129, 219, 162, 177, 233, 14, 219, 162, 177, 242, 129, 219, 162, 
-    77, 233, 15, 77, 245, 98, 50, 219, 162, 77, 242, 130, 77, 245, 98, 50, 
-    52, 229, 91, 233, 14, 52, 229, 91, 242, 129, 52, 229, 91, 233, 15, 2, 
-    214, 183, 242, 130, 226, 121, 233, 14, 242, 130, 252, 30, 233, 14, 233, 
-    15, 250, 0, 251, 78, 249, 92, 242, 130, 250, 0, 251, 78, 249, 92, 233, 
-    15, 250, 0, 251, 78, 249, 93, 77, 219, 97, 245, 99, 242, 130, 250, 0, 
-    251, 78, 249, 93, 77, 219, 97, 245, 99, 219, 78, 216, 200, 233, 83, 216, 
-    200, 219, 78, 216, 201, 177, 128, 111, 233, 83, 216, 201, 177, 128, 111, 
-    245, 98, 5, 2, 251, 108, 48, 224, 203, 77, 219, 153, 245, 98, 50, 218, 
-    56, 77, 219, 153, 245, 98, 50, 224, 203, 77, 219, 153, 228, 52, 128, 111, 
-    218, 56, 77, 219, 153, 228, 52, 128, 111, 224, 203, 77, 245, 98, 50, 218, 
-    56, 77, 245, 98, 50, 224, 203, 77, 228, 52, 128, 111, 218, 56, 77, 228, 
-    52, 128, 111, 224, 203, 77, 254, 148, 128, 111, 218, 56, 77, 254, 148, 
-    128, 111, 224, 203, 77, 228, 52, 254, 148, 128, 111, 218, 56, 77, 228, 
-    52, 254, 148, 128, 111, 52, 224, 202, 52, 218, 55, 218, 64, 2, 247, 120, 
-    218, 22, 2, 247, 120, 218, 64, 2, 96, 5, 51, 218, 22, 2, 96, 5, 51, 218, 
-    64, 2, 230, 84, 5, 51, 218, 22, 2, 230, 84, 5, 51, 218, 64, 64, 177, 128, 
-    216, 42, 2, 59, 48, 218, 22, 64, 177, 128, 216, 42, 2, 59, 48, 218, 64, 
-    64, 77, 245, 98, 50, 218, 22, 64, 77, 245, 98, 50, 218, 64, 64, 77, 216, 
-    89, 226, 167, 218, 22, 64, 77, 216, 89, 226, 167, 218, 64, 64, 77, 254, 
-    148, 128, 111, 218, 22, 64, 77, 254, 148, 128, 111, 218, 64, 64, 77, 228, 
-    52, 128, 111, 218, 22, 64, 77, 228, 52, 128, 111, 42, 43, 204, 93, 226, 
-    167, 42, 44, 204, 93, 226, 167, 250, 0, 218, 63, 250, 0, 218, 21, 250, 0, 
-    218, 64, 177, 128, 111, 250, 0, 218, 22, 177, 128, 111, 218, 64, 77, 218, 
-    21, 218, 22, 77, 218, 63, 218, 64, 77, 218, 63, 218, 22, 77, 218, 21, 
-    218, 22, 252, 30, 218, 63, 218, 22, 252, 30, 22, 235, 65, 251, 78, 248, 
-    157, 2, 218, 63, 245, 170, 64, 226, 170, 246, 103, 225, 48, 2, 217, 12, 
-    216, 13, 215, 240, 235, 198, 244, 21, 228, 65, 219, 251, 43, 217, 87, 
-    219, 251, 124, 217, 87, 219, 251, 120, 217, 87, 225, 172, 2, 222, 91, 67, 
-    252, 141, 215, 211, 44, 215, 93, 52, 67, 252, 141, 43, 215, 93, 67, 252, 
-    141, 52, 43, 215, 93, 52, 67, 252, 141, 52, 43, 215, 93, 199, 248, 157, 
-    243, 243, 43, 231, 63, 64, 52, 213, 239, 219, 251, 124, 217, 88, 2, 226, 
-    123, 219, 251, 120, 217, 88, 2, 214, 183, 219, 251, 120, 217, 88, 77, 
-    219, 251, 124, 217, 87, 52, 124, 217, 87, 52, 120, 217, 87, 52, 218, 103, 
-    228, 52, 50, 223, 49, 52, 218, 103, 228, 52, 50, 247, 138, 228, 52, 247, 
-    175, 2, 223, 49, 229, 101, 219, 95, 67, 232, 214, 2, 250, 36, 48, 67, 
-    232, 214, 2, 250, 36, 51, 124, 217, 88, 2, 250, 36, 51, 226, 8, 2, 203, 
-    91, 226, 8, 2, 216, 89, 226, 167, 215, 211, 67, 252, 141, 251, 244, 223, 
-    91, 215, 211, 67, 252, 141, 2, 203, 91, 215, 211, 249, 227, 226, 167, 
-    215, 211, 229, 91, 233, 14, 215, 211, 229, 91, 242, 129, 246, 111, 219, 
-    97, 233, 15, 177, 128, 111, 246, 111, 219, 97, 242, 130, 177, 128, 111, 
-    215, 211, 219, 47, 251, 244, 223, 91, 233, 85, 215, 211, 67, 252, 141, 
-    226, 167, 52, 219, 47, 226, 167, 71, 67, 130, 230, 24, 71, 67, 130, 228, 
-    56, 245, 220, 71, 74, 228, 56, 212, 9, 71, 74, 219, 28, 245, 220, 71, 74, 
-    219, 28, 212, 9, 71, 74, 43, 44, 71, 74, 140, 85, 74, 214, 153, 85, 74, 
-    246, 104, 85, 74, 228, 56, 245, 220, 85, 74, 228, 56, 212, 9, 85, 74, 
-    219, 28, 245, 220, 85, 74, 219, 28, 212, 9, 85, 74, 43, 44, 85, 74, 120, 
-    124, 85, 74, 97, 80, 2, 216, 77, 246, 103, 97, 80, 2, 216, 77, 214, 152, 
-    140, 80, 2, 216, 77, 246, 103, 140, 80, 2, 216, 77, 214, 152, 42, 2, 216, 
-    14, 163, 251, 221, 42, 2, 251, 175, 163, 251, 221, 42, 2, 214, 160, 44, 
-    247, 255, 163, 251, 221, 42, 2, 232, 108, 43, 247, 255, 163, 251, 221, 
-    247, 249, 2, 43, 163, 251, 221, 247, 249, 2, 44, 163, 251, 221, 247, 249, 
-    2, 216, 14, 163, 251, 221, 247, 249, 2, 251, 175, 163, 251, 221, 246, 
-    118, 218, 234, 85, 233, 85, 218, 234, 71, 233, 85, 218, 234, 85, 213, 
-    187, 4, 218, 234, 71, 213, 187, 4, 218, 234, 85, 225, 190, 71, 225, 190, 
-    71, 241, 193, 85, 241, 193, 203, 85, 241, 193, 85, 233, 85, 250, 35, 85, 
-    231, 82, 247, 248, 71, 231, 82, 247, 248, 85, 231, 82, 232, 104, 71, 231, 
-    82, 232, 104, 85, 4, 247, 248, 85, 4, 232, 104, 71, 4, 232, 104, 85, 203, 
-    245, 164, 71, 203, 245, 164, 85, 67, 245, 164, 71, 67, 245, 164, 43, 80, 
-    2, 4, 250, 35, 134, 140, 253, 247, 43, 80, 2, 37, 225, 22, 199, 140, 218, 
-    230, 74, 140, 215, 58, 80, 2, 67, 91, 140, 215, 58, 80, 2, 52, 67, 91, 
-    140, 215, 58, 80, 243, 243, 130, 140, 215, 58, 215, 211, 248, 157, 74, 
-    140, 80, 2, 246, 118, 218, 139, 140, 80, 2, 217, 78, 2, 67, 91, 140, 80, 
-    2, 217, 78, 2, 52, 67, 91, 140, 215, 58, 80, 2, 217, 77, 140, 215, 58, 
-    80, 2, 217, 78, 2, 67, 91, 140, 215, 58, 80, 2, 217, 78, 2, 52, 67, 91, 
-    140, 80, 216, 139, 211, 178, 212, 36, 80, 225, 7, 247, 195, 233, 46, 245, 
-    98, 5, 77, 140, 74, 223, 50, 216, 89, 226, 168, 77, 140, 74, 140, 80, 77, 
-    223, 50, 254, 148, 128, 111, 97, 80, 216, 139, 242, 129, 97, 80, 216, 
-    139, 218, 21, 140, 224, 24, 74, 97, 224, 24, 74, 223, 50, 216, 89, 226, 
-    168, 77, 97, 74, 97, 80, 77, 223, 50, 254, 148, 128, 111, 216, 89, 226, 
-    168, 77, 140, 74, 140, 80, 77, 254, 148, 128, 111, 140, 80, 77, 223, 50, 
-    216, 89, 226, 167, 97, 80, 77, 223, 50, 216, 89, 226, 167, 71, 231, 82, 
-    218, 156, 85, 4, 218, 156, 71, 4, 218, 156, 85, 222, 247, 225, 190, 71, 
-    222, 247, 225, 190, 114, 233, 85, 250, 35, 114, 226, 124, 2, 226, 124, 
-    235, 215, 114, 250, 36, 2, 250, 36, 235, 215, 114, 250, 35, 114, 37, 221, 
-    254, 145, 6, 1, 253, 159, 145, 6, 1, 251, 117, 145, 6, 1, 213, 253, 145, 
-    6, 1, 242, 185, 145, 6, 1, 247, 140, 145, 6, 1, 211, 21, 145, 6, 1, 210, 
-    68, 145, 6, 1, 246, 34, 145, 6, 1, 210, 91, 145, 6, 1, 235, 148, 145, 6, 
-    1, 65, 235, 148, 145, 6, 1, 73, 145, 6, 1, 247, 160, 145, 6, 1, 234, 240, 
-    145, 6, 1, 232, 186, 145, 6, 1, 230, 29, 145, 6, 1, 229, 191, 145, 6, 1, 
-    226, 185, 145, 6, 1, 225, 4, 145, 6, 1, 222, 227, 145, 6, 1, 219, 83, 
-    145, 6, 1, 215, 81, 145, 6, 1, 214, 201, 145, 6, 1, 243, 246, 145, 6, 1, 
-    241, 199, 145, 6, 1, 226, 135, 145, 6, 1, 225, 221, 145, 6, 1, 219, 228, 
-    145, 6, 1, 215, 167, 145, 6, 1, 250, 75, 145, 6, 1, 220, 102, 145, 6, 1, 
-    211, 27, 145, 6, 1, 211, 29, 145, 6, 1, 211, 57, 145, 6, 1, 218, 253, 
-    162, 145, 6, 1, 210, 212, 145, 6, 1, 4, 210, 183, 145, 6, 1, 4, 210, 184, 
-    2, 217, 77, 145, 6, 1, 210, 244, 145, 6, 1, 235, 184, 4, 210, 183, 145, 
-    6, 1, 251, 249, 210, 183, 145, 6, 1, 235, 184, 251, 249, 210, 183, 145, 
-    6, 1, 244, 82, 145, 6, 1, 235, 146, 145, 6, 1, 219, 227, 145, 6, 1, 215, 
-    202, 61, 145, 6, 1, 233, 75, 230, 29, 145, 4, 1, 253, 159, 145, 4, 1, 
-    251, 117, 145, 4, 1, 213, 253, 145, 4, 1, 242, 185, 145, 4, 1, 247, 140, 
-    145, 4, 1, 211, 21, 145, 4, 1, 210, 68, 145, 4, 1, 246, 34, 145, 4, 1, 
-    210, 91, 145, 4, 1, 235, 148, 145, 4, 1, 65, 235, 148, 145, 4, 1, 73, 
-    145, 4, 1, 247, 160, 145, 4, 1, 234, 240, 145, 4, 1, 232, 186, 145, 4, 1, 
-    230, 29, 145, 4, 1, 229, 191, 145, 4, 1, 226, 185, 145, 4, 1, 225, 4, 
-    145, 4, 1, 222, 227, 145, 4, 1, 219, 83, 145, 4, 1, 215, 81, 145, 4, 1, 
-    214, 201, 145, 4, 1, 243, 246, 145, 4, 1, 241, 199, 145, 4, 1, 226, 135, 
-    145, 4, 1, 225, 221, 145, 4, 1, 219, 228, 145, 4, 1, 215, 167, 145, 4, 1, 
-    250, 75, 145, 4, 1, 220, 102, 145, 4, 1, 211, 27, 145, 4, 1, 211, 29, 
-    145, 4, 1, 211, 57, 145, 4, 1, 218, 253, 162, 145, 4, 1, 210, 212, 145, 
-    4, 1, 4, 210, 183, 145, 4, 1, 4, 210, 184, 2, 217, 77, 145, 4, 1, 210, 
-    244, 145, 4, 1, 235, 184, 4, 210, 183, 145, 4, 1, 251, 249, 210, 183, 
-    145, 4, 1, 235, 184, 251, 249, 210, 183, 145, 4, 1, 244, 82, 145, 4, 1, 
-    235, 146, 145, 4, 1, 219, 227, 145, 4, 1, 215, 202, 61, 145, 4, 1, 233, 
-    75, 230, 29, 7, 6, 1, 233, 149, 2, 52, 130, 7, 4, 1, 233, 149, 2, 52, 
-    130, 7, 6, 1, 233, 149, 2, 230, 224, 182, 7, 6, 1, 226, 106, 2, 91, 7, 6, 
-    1, 223, 224, 2, 217, 77, 7, 4, 1, 115, 2, 91, 7, 4, 1, 217, 153, 2, 247, 
-    255, 91, 7, 6, 1, 242, 61, 2, 248, 39, 7, 4, 1, 242, 61, 2, 248, 39, 7, 
-    6, 1, 235, 24, 2, 248, 39, 7, 4, 1, 235, 24, 2, 248, 39, 7, 6, 1, 210, 
-    160, 2, 248, 39, 7, 4, 1, 210, 160, 2, 248, 39, 7, 6, 1, 254, 143, 7, 6, 
-    1, 232, 50, 2, 103, 7, 6, 1, 215, 94, 61, 7, 6, 1, 215, 94, 254, 143, 7, 
-    4, 1, 214, 106, 2, 44, 103, 7, 6, 1, 212, 99, 2, 103, 7, 4, 1, 212, 99, 
-    2, 103, 7, 4, 1, 214, 106, 2, 249, 100, 7, 6, 1, 163, 242, 60, 7, 4, 1, 
-    163, 242, 60, 7, 4, 1, 217, 75, 225, 133, 7, 4, 1, 160, 2, 228, 50, 7, 4, 
-    1, 215, 94, 223, 224, 2, 217, 77, 7, 4, 1, 144, 2, 121, 222, 234, 235, 
-    215, 7, 1, 4, 6, 215, 94, 75, 7, 218, 65, 4, 1, 235, 144, 58, 1, 6, 214, 
-    105, 7, 6, 1, 222, 92, 2, 217, 250, 217, 77, 7, 6, 1, 210, 160, 2, 217, 
-    250, 217, 77, 81, 6, 1, 254, 164, 81, 4, 1, 254, 164, 81, 6, 1, 213, 173, 
-    81, 4, 1, 213, 173, 81, 6, 1, 243, 107, 81, 4, 1, 243, 107, 81, 6, 1, 
-    248, 191, 81, 4, 1, 248, 191, 81, 6, 1, 245, 194, 81, 4, 1, 245, 194, 81, 
-    6, 1, 219, 33, 81, 4, 1, 219, 33, 81, 6, 1, 210, 101, 81, 4, 1, 210, 101, 
-    81, 6, 1, 241, 248, 81, 4, 1, 241, 248, 81, 6, 1, 216, 177, 81, 4, 1, 
-    216, 177, 81, 6, 1, 240, 116, 81, 4, 1, 240, 116, 81, 6, 1, 234, 227, 81, 
-    4, 1, 234, 227, 81, 6, 1, 233, 72, 81, 4, 1, 233, 72, 81, 6, 1, 230, 230, 
-    81, 4, 1, 230, 230, 81, 6, 1, 228, 233, 81, 4, 1, 228, 233, 81, 6, 1, 
-    233, 233, 81, 4, 1, 233, 233, 81, 6, 1, 76, 81, 4, 1, 76, 81, 6, 1, 225, 
-    108, 81, 4, 1, 225, 108, 81, 6, 1, 222, 211, 81, 4, 1, 222, 211, 81, 6, 
-    1, 219, 165, 81, 4, 1, 219, 165, 81, 6, 1, 217, 41, 81, 4, 1, 217, 41, 
-    81, 6, 1, 214, 229, 81, 4, 1, 214, 229, 81, 6, 1, 244, 121, 81, 4, 1, 
-    244, 121, 81, 6, 1, 234, 112, 81, 4, 1, 234, 112, 81, 6, 1, 224, 161, 81, 
-    4, 1, 224, 161, 81, 6, 1, 226, 178, 81, 4, 1, 226, 178, 81, 6, 1, 247, 
-    253, 254, 170, 81, 4, 1, 247, 253, 254, 170, 81, 6, 1, 55, 81, 254, 196, 
-    81, 4, 1, 55, 81, 254, 196, 81, 6, 1, 249, 115, 245, 194, 81, 4, 1, 249, 
-    115, 245, 194, 81, 6, 1, 247, 253, 234, 227, 81, 4, 1, 247, 253, 234, 
-    227, 81, 6, 1, 247, 253, 228, 233, 81, 4, 1, 247, 253, 228, 233, 81, 6, 
-    1, 249, 115, 228, 233, 81, 4, 1, 249, 115, 228, 233, 81, 6, 1, 55, 81, 
-    226, 178, 81, 4, 1, 55, 81, 226, 178, 81, 6, 1, 221, 246, 81, 4, 1, 221, 
-    246, 81, 6, 1, 249, 128, 220, 55, 81, 4, 1, 249, 128, 220, 55, 81, 6, 1, 
-    55, 81, 220, 55, 81, 4, 1, 55, 81, 220, 55, 81, 6, 1, 55, 81, 245, 75, 
-    81, 4, 1, 55, 81, 245, 75, 81, 6, 1, 254, 182, 234, 117, 81, 4, 1, 254, 
-    182, 234, 117, 81, 6, 1, 247, 253, 241, 45, 81, 4, 1, 247, 253, 241, 45, 
-    81, 6, 1, 55, 81, 241, 45, 81, 4, 1, 55, 81, 241, 45, 81, 6, 1, 55, 81, 
-    162, 81, 4, 1, 55, 81, 162, 81, 6, 1, 233, 148, 162, 81, 4, 1, 233, 148, 
-    162, 81, 6, 1, 55, 81, 241, 217, 81, 4, 1, 55, 81, 241, 217, 81, 6, 1, 
-    55, 81, 241, 251, 81, 4, 1, 55, 81, 241, 251, 81, 6, 1, 55, 81, 243, 102, 
-    81, 4, 1, 55, 81, 243, 102, 81, 6, 1, 55, 81, 247, 163, 81, 4, 1, 55, 81, 
-    247, 163, 81, 6, 1, 55, 81, 220, 22, 81, 4, 1, 55, 81, 220, 22, 81, 6, 1, 
-    55, 227, 208, 220, 22, 81, 4, 1, 55, 227, 208, 220, 22, 81, 6, 1, 55, 
-    227, 208, 229, 27, 81, 4, 1, 55, 227, 208, 229, 27, 81, 6, 1, 55, 227, 
-    208, 227, 148, 81, 4, 1, 55, 227, 208, 227, 148, 81, 6, 1, 55, 227, 208, 
-    212, 37, 81, 4, 1, 55, 227, 208, 212, 37, 81, 16, 234, 246, 81, 16, 230, 
-    231, 222, 211, 81, 16, 225, 109, 222, 211, 81, 16, 218, 147, 81, 16, 217, 
-    42, 222, 211, 81, 16, 234, 113, 222, 211, 81, 16, 220, 23, 219, 165, 81, 
-    6, 1, 249, 115, 220, 55, 81, 4, 1, 249, 115, 220, 55, 81, 6, 1, 249, 115, 
-    243, 102, 81, 4, 1, 249, 115, 243, 102, 81, 38, 228, 234, 48, 81, 38, 
-    218, 247, 253, 224, 81, 38, 218, 247, 233, 21, 81, 6, 1, 251, 199, 234, 
-    117, 81, 4, 1, 251, 199, 234, 117, 81, 55, 227, 208, 243, 229, 218, 129, 
-    81, 55, 227, 208, 247, 197, 224, 13, 78, 81, 55, 227, 208, 235, 237, 224, 
-    13, 78, 81, 55, 227, 208, 213, 241, 247, 172, 81, 244, 2, 123, 242, 27, 
-    81, 243, 229, 218, 129, 81, 230, 124, 247, 172, 98, 4, 1, 254, 123, 98, 
-    4, 1, 252, 152, 98, 4, 1, 243, 106, 98, 4, 1, 247, 128, 98, 4, 1, 245, 
-    150, 98, 4, 1, 213, 160, 98, 4, 1, 210, 89, 98, 4, 1, 217, 60, 98, 4, 1, 
-    235, 255, 98, 4, 1, 234, 234, 98, 4, 1, 233, 81, 98, 4, 1, 231, 185, 98, 
-    4, 1, 229, 195, 98, 4, 1, 226, 196, 98, 4, 1, 226, 17, 98, 4, 1, 210, 78, 
-    98, 4, 1, 223, 171, 98, 4, 1, 221, 243, 98, 4, 1, 217, 50, 98, 4, 1, 214, 
-    190, 98, 4, 1, 225, 140, 98, 4, 1, 234, 121, 98, 4, 1, 242, 241, 98, 4, 
-    1, 224, 73, 98, 4, 1, 220, 20, 98, 4, 1, 250, 97, 98, 4, 1, 251, 7, 98, 
-    4, 1, 235, 100, 98, 4, 1, 250, 40, 98, 4, 1, 250, 143, 98, 4, 1, 211, 
-    163, 98, 4, 1, 235, 111, 98, 4, 1, 242, 43, 98, 4, 1, 241, 238, 98, 4, 1, 
-    241, 175, 98, 4, 1, 212, 22, 98, 4, 1, 242, 4, 98, 4, 1, 241, 65, 98, 4, 
-    1, 210, 246, 98, 4, 1, 254, 232, 216, 108, 1, 191, 216, 108, 1, 211, 99, 
-    216, 108, 1, 211, 98, 216, 108, 1, 211, 88, 216, 108, 1, 211, 86, 216, 
-    108, 1, 252, 32, 255, 16, 211, 81, 216, 108, 1, 211, 81, 216, 108, 1, 
-    211, 96, 216, 108, 1, 211, 93, 216, 108, 1, 211, 95, 216, 108, 1, 211, 
-    94, 216, 108, 1, 211, 12, 216, 108, 1, 211, 90, 216, 108, 1, 211, 79, 
-    216, 108, 1, 215, 115, 211, 79, 216, 108, 1, 211, 76, 216, 108, 1, 211, 
-    84, 216, 108, 1, 252, 32, 255, 16, 211, 84, 216, 108, 1, 215, 115, 211, 
-    84, 216, 108, 1, 211, 83, 216, 108, 1, 211, 103, 216, 108, 1, 211, 77, 
-    216, 108, 1, 215, 115, 211, 77, 216, 108, 1, 211, 66, 216, 108, 1, 215, 
-    115, 211, 66, 216, 108, 1, 211, 8, 216, 108, 1, 211, 49, 216, 108, 1, 
-    254, 207, 211, 49, 216, 108, 1, 215, 115, 211, 49, 216, 108, 1, 211, 75, 
-    216, 108, 1, 211, 74, 216, 108, 1, 211, 71, 216, 108, 1, 215, 115, 211, 
-    85, 216, 108, 1, 215, 115, 211, 69, 216, 108, 1, 211, 67, 216, 108, 1, 
-    210, 212, 216, 108, 1, 211, 64, 216, 108, 1, 211, 63, 216, 108, 1, 211, 
-    87, 216, 108, 1, 215, 115, 211, 87, 216, 108, 1, 253, 163, 211, 87, 216, 
-    108, 1, 211, 62, 216, 108, 1, 211, 60, 216, 108, 1, 211, 61, 216, 108, 1, 
-    211, 59, 216, 108, 1, 211, 58, 216, 108, 1, 211, 97, 216, 108, 1, 211, 
-    56, 216, 108, 1, 211, 54, 216, 108, 1, 211, 53, 216, 108, 1, 211, 52, 
-    216, 108, 1, 211, 50, 216, 108, 1, 217, 34, 211, 50, 216, 108, 1, 211, 
-    48, 216, 108, 1, 211, 47, 216, 108, 1, 210, 244, 216, 108, 58, 1, 233, 
-    126, 78, 216, 108, 220, 138, 78, 216, 108, 116, 235, 63, 29, 3, 232, 155, 
-    29, 3, 230, 160, 29, 3, 222, 209, 29, 3, 219, 57, 29, 3, 220, 6, 29, 3, 
-    251, 204, 29, 3, 216, 41, 29, 3, 249, 237, 29, 3, 228, 72, 29, 3, 227, 
-    133, 29, 3, 242, 180, 227, 0, 29, 3, 210, 22, 29, 3, 247, 143, 29, 3, 
-    248, 104, 29, 3, 235, 67, 29, 3, 216, 155, 29, 3, 250, 85, 29, 3, 225, 
-    120, 29, 3, 225, 15, 29, 3, 242, 255, 29, 3, 242, 251, 29, 3, 242, 252, 
-    29, 3, 242, 253, 29, 3, 218, 223, 29, 3, 218, 179, 29, 3, 218, 192, 29, 
-    3, 218, 222, 29, 3, 218, 196, 29, 3, 218, 197, 29, 3, 218, 184, 29, 3, 
-    250, 213, 29, 3, 250, 192, 29, 3, 250, 194, 29, 3, 250, 212, 29, 3, 250, 
-    210, 29, 3, 250, 211, 29, 3, 250, 193, 29, 3, 209, 243, 29, 3, 209, 221, 
-    29, 3, 209, 234, 29, 3, 209, 242, 29, 3, 209, 237, 29, 3, 209, 238, 29, 
-    3, 209, 226, 29, 3, 250, 208, 29, 3, 250, 195, 29, 3, 250, 197, 29, 3, 
-    250, 207, 29, 3, 250, 205, 29, 3, 250, 206, 29, 3, 250, 196, 29, 3, 223, 
-    236, 29, 3, 223, 226, 29, 3, 223, 232, 29, 3, 223, 235, 29, 3, 223, 233, 
-    29, 3, 223, 234, 29, 3, 223, 231, 29, 3, 233, 159, 29, 3, 233, 151, 29, 
-    3, 233, 154, 29, 3, 233, 158, 29, 3, 233, 155, 29, 3, 233, 156, 29, 3, 
-    233, 152, 29, 3, 211, 130, 29, 3, 211, 120, 29, 3, 211, 126, 29, 3, 211, 
-    129, 29, 3, 211, 127, 29, 3, 211, 128, 29, 3, 211, 125, 29, 3, 242, 71, 
-    29, 3, 242, 62, 29, 3, 242, 65, 29, 3, 242, 70, 29, 3, 242, 67, 29, 3, 
-    242, 68, 29, 3, 242, 64, 38, 33, 1, 252, 75, 38, 33, 1, 213, 255, 38, 33, 
-    1, 242, 236, 38, 33, 1, 248, 90, 38, 33, 1, 210, 74, 38, 33, 1, 210, 94, 
-    38, 33, 1, 176, 38, 33, 1, 245, 174, 38, 33, 1, 245, 159, 38, 33, 1, 245, 
-    150, 38, 33, 1, 76, 38, 33, 1, 225, 221, 38, 33, 1, 245, 92, 38, 33, 1, 
-    245, 82, 38, 33, 1, 217, 22, 38, 33, 1, 162, 38, 33, 1, 215, 178, 38, 33, 
-    1, 250, 131, 38, 33, 1, 220, 102, 38, 33, 1, 220, 65, 38, 33, 1, 244, 82, 
-    38, 33, 1, 245, 81, 38, 33, 1, 61, 38, 33, 1, 236, 60, 38, 33, 1, 247, 
-    161, 38, 33, 1, 230, 140, 214, 205, 38, 33, 1, 211, 59, 38, 33, 1, 210, 
-    212, 38, 33, 1, 235, 183, 61, 38, 33, 1, 232, 192, 210, 183, 38, 33, 1, 
-    251, 249, 210, 183, 38, 33, 1, 235, 183, 251, 249, 210, 183, 44, 254, 
-    110, 218, 60, 231, 154, 44, 254, 110, 246, 118, 218, 60, 231, 154, 43, 
-    218, 60, 127, 44, 218, 60, 127, 43, 246, 118, 218, 60, 127, 44, 246, 118, 
-    218, 60, 127, 223, 157, 235, 202, 231, 154, 223, 157, 246, 118, 235, 202, 
-    231, 154, 246, 118, 215, 241, 231, 154, 43, 215, 241, 127, 44, 215, 241, 
-    127, 223, 157, 218, 234, 43, 223, 157, 226, 198, 127, 44, 223, 157, 226, 
-    198, 127, 245, 210, 249, 158, 226, 13, 244, 22, 226, 13, 223, 49, 244, 
-    22, 226, 13, 240, 165, 246, 118, 226, 251, 246, 104, 254, 119, 214, 153, 
-    254, 119, 246, 118, 222, 247, 254, 109, 52, 226, 248, 240, 168, 235, 193, 
-    235, 201, 226, 59, 251, 154, 240, 169, 2, 248, 1, 216, 89, 2, 222, 234, 
-    48, 43, 121, 226, 5, 127, 44, 121, 226, 5, 127, 216, 89, 2, 59, 48, 216, 
-    89, 2, 59, 51, 43, 67, 252, 141, 2, 224, 7, 44, 67, 252, 141, 2, 224, 7, 
-    216, 14, 43, 163, 127, 216, 14, 44, 163, 127, 251, 175, 43, 163, 127, 
-    251, 175, 44, 163, 127, 43, 219, 187, 104, 127, 44, 219, 187, 104, 127, 
-    43, 52, 226, 3, 44, 52, 226, 3, 113, 170, 117, 123, 59, 224, 140, 123, 
-    59, 117, 113, 170, 224, 140, 92, 244, 11, 59, 224, 140, 244, 81, 59, 78, 
-    223, 49, 224, 13, 78, 67, 182, 222, 234, 225, 10, 211, 209, 220, 138, 
-    230, 224, 247, 120, 215, 94, 249, 219, 223, 157, 247, 120, 223, 157, 249, 
-    219, 215, 94, 220, 150, 248, 206, 2, 43, 242, 108, 248, 206, 2, 44, 242, 
-    108, 215, 94, 248, 205, 216, 14, 163, 221, 173, 50, 215, 59, 248, 156, 
-    216, 143, 248, 156, 9, 34, 223, 76, 9, 34, 250, 10, 9, 34, 221, 176, 110, 
-    9, 34, 221, 176, 105, 9, 34, 221, 176, 158, 9, 34, 225, 167, 9, 34, 251, 
-    163, 9, 34, 217, 92, 9, 34, 234, 33, 110, 9, 34, 234, 33, 105, 9, 34, 
-    247, 170, 9, 34, 221, 179, 9, 34, 4, 110, 9, 34, 4, 105, 9, 34, 233, 97, 
-    110, 9, 34, 233, 97, 105, 9, 34, 233, 97, 158, 9, 34, 233, 97, 161, 9, 
-    34, 219, 68, 9, 34, 216, 145, 9, 34, 219, 66, 110, 9, 34, 219, 66, 105, 
-    9, 34, 241, 228, 110, 9, 34, 241, 228, 105, 9, 34, 242, 15, 9, 34, 223, 
-    147, 9, 34, 250, 82, 9, 34, 218, 37, 9, 34, 230, 128, 9, 34, 248, 88, 9, 
-    34, 230, 120, 9, 34, 250, 25, 9, 34, 212, 41, 110, 9, 34, 212, 41, 105, 
-    9, 34, 244, 96, 9, 34, 225, 232, 110, 9, 34, 225, 232, 105, 9, 34, 219, 
-    160, 163, 215, 236, 215, 188, 9, 34, 249, 145, 9, 34, 247, 136, 9, 34, 
-    235, 137, 9, 34, 251, 198, 64, 249, 250, 9, 34, 245, 15, 9, 34, 218, 249, 
-    110, 9, 34, 218, 249, 105, 9, 34, 252, 154, 9, 34, 219, 167, 9, 34, 251, 
-    63, 219, 167, 9, 34, 229, 90, 110, 9, 34, 229, 90, 105, 9, 34, 229, 90, 
-    158, 9, 34, 229, 90, 161, 9, 34, 231, 46, 9, 34, 220, 57, 9, 34, 223, 
-    153, 9, 34, 245, 37, 9, 34, 226, 209, 9, 34, 251, 133, 110, 9, 34, 251, 
-    133, 105, 9, 34, 231, 86, 9, 34, 230, 123, 9, 34, 242, 140, 110, 9, 34, 
-    242, 140, 105, 9, 34, 242, 140, 158, 9, 34, 216, 106, 9, 34, 249, 249, 9, 
-    34, 212, 9, 110, 9, 34, 212, 9, 105, 9, 34, 251, 63, 221, 170, 9, 34, 
-    219, 160, 240, 248, 9, 34, 240, 248, 9, 34, 251, 63, 219, 2, 9, 34, 251, 
-    63, 220, 52, 9, 34, 244, 32, 9, 34, 251, 63, 250, 228, 9, 34, 219, 160, 
-    212, 57, 9, 34, 212, 58, 110, 9, 34, 212, 58, 105, 9, 34, 250, 27, 9, 34, 
-    251, 63, 242, 166, 9, 34, 199, 110, 9, 34, 199, 105, 9, 34, 251, 63, 232, 
-    137, 9, 34, 251, 63, 243, 88, 9, 34, 230, 119, 110, 9, 34, 230, 119, 105, 
-    9, 34, 223, 159, 9, 34, 251, 207, 9, 34, 251, 63, 217, 56, 233, 52, 9, 
-    34, 251, 63, 233, 53, 9, 34, 251, 63, 211, 239, 9, 34, 251, 63, 244, 46, 
-    9, 34, 245, 218, 110, 9, 34, 245, 218, 105, 9, 34, 245, 218, 158, 9, 34, 
-    251, 63, 245, 217, 9, 34, 241, 235, 9, 34, 251, 63, 240, 245, 9, 34, 251, 
-    194, 9, 34, 242, 222, 9, 34, 251, 63, 244, 90, 9, 34, 251, 63, 251, 237, 
-    9, 34, 251, 63, 222, 1, 9, 34, 219, 160, 212, 2, 9, 34, 219, 160, 211, 
-    41, 9, 34, 251, 63, 243, 244, 9, 34, 235, 143, 245, 41, 9, 34, 251, 63, 
-    245, 41, 9, 34, 235, 143, 216, 15, 9, 34, 251, 63, 216, 15, 9, 34, 235, 
-    143, 246, 96, 9, 34, 251, 63, 246, 96, 9, 34, 215, 91, 9, 34, 235, 143, 
-    215, 91, 9, 34, 251, 63, 215, 91, 60, 34, 110, 60, 34, 232, 213, 60, 34, 
-    247, 120, 60, 34, 219, 95, 60, 34, 221, 175, 60, 34, 103, 60, 34, 105, 
-    60, 34, 232, 237, 60, 34, 231, 185, 60, 34, 233, 33, 60, 34, 245, 129, 
-    60, 34, 195, 60, 34, 124, 251, 163, 60, 34, 249, 147, 60, 34, 240, 111, 
-    60, 34, 217, 92, 60, 34, 204, 251, 163, 60, 34, 234, 32, 60, 34, 224, 
-    224, 60, 34, 211, 202, 60, 34, 218, 243, 60, 34, 44, 204, 251, 163, 60, 
-    34, 241, 176, 245, 145, 60, 34, 216, 247, 60, 34, 247, 170, 60, 34, 221, 
-    179, 60, 34, 250, 10, 60, 34, 224, 182, 60, 34, 254, 215, 60, 34, 230, 
-    110, 60, 34, 245, 145, 60, 34, 245, 223, 60, 34, 221, 200, 60, 34, 242, 
-    174, 60, 34, 242, 175, 219, 81, 60, 34, 245, 40, 60, 34, 251, 248, 60, 
-    34, 211, 221, 60, 34, 250, 101, 60, 34, 222, 196, 60, 34, 235, 251, 60, 
-    34, 219, 79, 60, 34, 233, 96, 60, 34, 249, 156, 60, 34, 218, 237, 60, 34, 
-    230, 115, 60, 34, 222, 224, 60, 34, 211, 206, 60, 34, 226, 190, 60, 34, 
-    215, 97, 60, 34, 246, 80, 60, 34, 219, 251, 216, 145, 60, 34, 246, 118, 
-    250, 10, 60, 34, 199, 218, 108, 60, 34, 113, 242, 10, 60, 34, 220, 0, 60, 
-    34, 251, 169, 60, 34, 219, 65, 60, 34, 251, 137, 60, 34, 218, 138, 60, 
-    34, 241, 227, 60, 34, 242, 28, 60, 34, 247, 123, 60, 34, 242, 15, 60, 34, 
-    251, 154, 60, 34, 223, 147, 60, 34, 221, 187, 60, 34, 247, 199, 60, 34, 
-    253, 168, 60, 34, 218, 234, 60, 34, 228, 51, 60, 34, 218, 37, 60, 34, 
-    221, 211, 60, 34, 230, 128, 60, 34, 215, 235, 60, 34, 233, 122, 60, 34, 
-    218, 129, 60, 34, 248, 88, 60, 34, 212, 21, 60, 34, 247, 146, 228, 51, 
-    60, 34, 249, 215, 60, 34, 243, 222, 60, 34, 250, 21, 60, 34, 218, 142, 
-    60, 34, 212, 40, 60, 34, 244, 96, 60, 34, 250, 18, 60, 34, 244, 161, 60, 
-    34, 52, 211, 178, 60, 34, 163, 215, 236, 215, 188, 60, 34, 219, 89, 60, 
-    34, 244, 171, 60, 34, 249, 145, 60, 34, 247, 136, 60, 34, 224, 179, 60, 
-    34, 235, 137, 60, 34, 231, 67, 60, 34, 216, 88, 60, 34, 217, 245, 60, 34, 
-    232, 231, 60, 34, 214, 131, 60, 34, 244, 120, 60, 34, 251, 198, 64, 249, 
-    250, 60, 34, 219, 188, 60, 34, 246, 118, 216, 242, 60, 34, 211, 253, 60, 
-    34, 219, 103, 60, 34, 247, 187, 60, 34, 245, 15, 60, 34, 219, 5, 60, 34, 
-    74, 60, 34, 218, 131, 60, 34, 218, 248, 60, 34, 215, 255, 60, 34, 242, 
-    147, 60, 34, 250, 218, 60, 34, 218, 160, 60, 34, 252, 154, 60, 34, 223, 
-    31, 60, 34, 219, 167, 60, 34, 235, 130, 60, 34, 229, 89, 60, 34, 220, 57, 
-    60, 34, 244, 149, 60, 34, 226, 209, 60, 34, 254, 118, 60, 34, 225, 29, 
-    60, 34, 245, 227, 60, 34, 251, 132, 60, 34, 231, 86, 60, 34, 230, 183, 
-    60, 34, 220, 156, 60, 34, 253, 252, 60, 34, 230, 123, 60, 34, 216, 19, 
-    60, 34, 226, 165, 60, 34, 251, 201, 60, 34, 218, 127, 60, 34, 249, 225, 
-    60, 34, 242, 139, 60, 34, 216, 106, 60, 34, 235, 217, 60, 34, 251, 211, 
-    60, 34, 212, 58, 245, 145, 60, 34, 249, 249, 60, 34, 212, 8, 60, 34, 221, 
-    170, 60, 34, 240, 248, 60, 34, 219, 2, 60, 34, 214, 22, 60, 34, 252, 72, 
-    60, 34, 225, 73, 60, 34, 252, 174, 60, 34, 220, 52, 60, 34, 223, 110, 60, 
-    34, 222, 126, 60, 34, 244, 32, 60, 34, 251, 200, 60, 34, 250, 228, 60, 
-    34, 251, 226, 60, 34, 230, 125, 60, 34, 212, 57, 60, 34, 250, 27, 60, 34, 
-    211, 236, 60, 34, 247, 180, 60, 34, 213, 161, 60, 34, 242, 166, 60, 34, 
-    232, 137, 60, 34, 243, 88, 60, 34, 230, 118, 60, 34, 219, 94, 60, 34, 
-    219, 251, 217, 76, 251, 237, 60, 34, 223, 159, 60, 34, 251, 207, 60, 34, 
-    211, 197, 60, 34, 244, 190, 60, 34, 233, 52, 60, 34, 217, 56, 233, 52, 
-    60, 34, 233, 48, 60, 34, 219, 30, 60, 34, 233, 53, 60, 34, 211, 239, 60, 
-    34, 244, 46, 60, 34, 245, 217, 60, 34, 241, 235, 60, 34, 244, 0, 60, 34, 
-    240, 245, 60, 34, 251, 194, 60, 34, 217, 63, 60, 34, 242, 34, 60, 34, 
-    244, 113, 60, 34, 222, 28, 211, 236, 60, 34, 250, 220, 60, 34, 242, 222, 
-    60, 34, 244, 90, 60, 34, 251, 237, 60, 34, 222, 1, 60, 34, 248, 74, 60, 
-    34, 212, 2, 60, 34, 241, 210, 60, 34, 211, 41, 60, 34, 230, 192, 60, 34, 
-    251, 221, 60, 34, 245, 155, 60, 34, 243, 244, 60, 34, 215, 209, 60, 34, 
-    246, 82, 60, 34, 223, 141, 60, 34, 228, 53, 60, 34, 245, 41, 60, 34, 216, 
-    15, 60, 34, 246, 96, 60, 34, 215, 91, 60, 34, 244, 48, 109, 248, 37, 135, 
-    43, 216, 42, 222, 251, 109, 248, 37, 135, 77, 216, 42, 51, 109, 248, 37, 
-    135, 43, 216, 42, 230, 224, 22, 222, 251, 109, 248, 37, 135, 77, 216, 42, 
-    230, 224, 22, 51, 109, 248, 37, 135, 243, 229, 218, 10, 109, 248, 37, 
-    135, 218, 11, 243, 243, 48, 109, 248, 37, 135, 218, 11, 243, 243, 51, 
-    109, 248, 37, 135, 218, 11, 243, 243, 233, 46, 109, 248, 37, 135, 218, 
-    11, 243, 243, 214, 160, 233, 46, 109, 248, 37, 135, 218, 11, 243, 243, 
-    214, 160, 222, 251, 109, 248, 37, 135, 218, 11, 243, 243, 232, 108, 233, 
-    46, 109, 248, 37, 135, 226, 122, 109, 219, 18, 109, 249, 219, 109, 243, 
-    229, 218, 129, 247, 177, 78, 235, 131, 235, 236, 218, 159, 87, 109, 235, 
-    158, 78, 109, 249, 252, 78, 109, 54, 210, 86, 43, 254, 110, 127, 44, 254, 
-    110, 127, 43, 52, 254, 110, 127, 44, 52, 254, 110, 127, 43, 249, 161, 
-    127, 44, 249, 161, 127, 43, 71, 249, 161, 127, 44, 71, 249, 161, 127, 43, 
-    85, 233, 20, 127, 44, 85, 233, 20, 127, 224, 237, 78, 243, 32, 78, 43, 
-    216, 6, 220, 53, 127, 44, 216, 6, 220, 53, 127, 43, 71, 233, 20, 127, 44, 
-    71, 233, 20, 127, 43, 71, 216, 6, 220, 53, 127, 44, 71, 216, 6, 220, 53, 
-    127, 43, 71, 42, 127, 44, 71, 42, 127, 212, 36, 248, 156, 223, 49, 52, 
-    224, 191, 223, 254, 78, 52, 224, 191, 223, 254, 78, 121, 52, 224, 191, 
-    223, 254, 78, 224, 237, 164, 244, 190, 242, 8, 227, 198, 110, 242, 8, 
-    227, 198, 105, 242, 8, 227, 198, 158, 242, 8, 227, 198, 161, 242, 8, 227, 
-    198, 189, 242, 8, 227, 198, 194, 242, 8, 227, 198, 198, 242, 8, 227, 198, 
-    195, 242, 8, 227, 198, 200, 109, 233, 3, 138, 78, 109, 222, 228, 138, 78, 
-    109, 248, 44, 138, 78, 109, 245, 128, 138, 78, 24, 219, 155, 59, 138, 78, 
-    24, 52, 59, 138, 78, 212, 32, 248, 156, 67, 234, 233, 223, 77, 78, 67, 
-    234, 233, 223, 77, 2, 213, 135, 219, 31, 78, 67, 234, 233, 223, 77, 164, 
-    214, 160, 242, 27, 67, 234, 233, 223, 77, 2, 213, 135, 219, 31, 164, 214, 
-    160, 242, 27, 67, 234, 233, 223, 77, 164, 232, 108, 242, 27, 37, 224, 
-    237, 78, 109, 217, 3, 232, 214, 244, 146, 220, 138, 87, 242, 8, 227, 198, 
-    216, 247, 242, 8, 227, 198, 215, 73, 242, 8, 227, 198, 216, 162, 67, 109, 
-    235, 158, 78, 231, 140, 78, 225, 255, 254, 140, 78, 109, 45, 235, 238, 
-    109, 163, 244, 106, 219, 18, 141, 1, 4, 61, 141, 1, 61, 141, 1, 4, 73, 
-    141, 1, 73, 141, 1, 4, 70, 141, 1, 70, 141, 1, 4, 75, 141, 1, 75, 141, 1, 
-    4, 76, 141, 1, 76, 141, 1, 176, 141, 1, 243, 135, 141, 1, 234, 92, 141, 
-    1, 242, 214, 141, 1, 233, 217, 141, 1, 242, 113, 141, 1, 234, 182, 141, 
-    1, 243, 62, 141, 1, 234, 28, 141, 1, 242, 174, 141, 1, 206, 141, 1, 210, 
-    116, 141, 1, 219, 191, 141, 1, 210, 44, 141, 1, 218, 83, 141, 1, 210, 13, 
-    141, 1, 221, 181, 141, 1, 210, 94, 141, 1, 219, 58, 141, 1, 210, 23, 141, 
-    1, 217, 105, 141, 1, 248, 221, 141, 1, 216, 117, 141, 1, 248, 3, 141, 1, 
-    4, 215, 118, 141, 1, 215, 118, 141, 1, 246, 78, 141, 1, 217, 22, 141, 1, 
-    248, 90, 141, 1, 111, 141, 1, 247, 145, 141, 1, 197, 141, 1, 228, 233, 
-    141, 1, 227, 237, 141, 1, 229, 107, 141, 1, 228, 74, 141, 1, 162, 141, 1, 
-    252, 191, 141, 1, 190, 141, 1, 241, 180, 141, 1, 252, 6, 141, 1, 225, 
-    108, 141, 1, 240, 222, 141, 1, 251, 125, 141, 1, 224, 150, 141, 1, 241, 
-    238, 141, 1, 252, 75, 141, 1, 225, 221, 141, 1, 241, 68, 141, 1, 251, 
-    205, 141, 1, 225, 16, 141, 1, 184, 141, 1, 230, 230, 141, 1, 230, 102, 
-    141, 1, 231, 91, 141, 1, 230, 161, 141, 1, 4, 191, 141, 1, 191, 141, 1, 
-    4, 210, 212, 141, 1, 210, 212, 141, 1, 4, 210, 244, 141, 1, 210, 244, 
-    141, 1, 205, 141, 1, 223, 35, 141, 1, 222, 140, 141, 1, 223, 128, 141, 1, 
-    222, 211, 141, 1, 4, 212, 65, 141, 1, 212, 65, 141, 1, 211, 250, 141, 1, 
-    212, 22, 141, 1, 211, 227, 141, 1, 230, 25, 141, 1, 212, 116, 141, 1, 4, 
-    176, 141, 1, 4, 234, 182, 38, 234, 201, 213, 135, 219, 31, 78, 38, 234, 
-    201, 220, 155, 219, 31, 78, 234, 201, 213, 135, 219, 31, 78, 234, 201, 
-    220, 155, 219, 31, 78, 141, 235, 158, 78, 141, 213, 135, 235, 158, 78, 
-    141, 247, 221, 210, 225, 234, 201, 52, 240, 168, 56, 1, 4, 61, 56, 1, 61, 
-    56, 1, 4, 73, 56, 1, 73, 56, 1, 4, 70, 56, 1, 70, 56, 1, 4, 75, 56, 1, 
-    75, 56, 1, 4, 76, 56, 1, 76, 56, 1, 176, 56, 1, 243, 135, 56, 1, 234, 92, 
-    56, 1, 242, 214, 56, 1, 233, 217, 56, 1, 242, 113, 56, 1, 234, 182, 56, 
-    1, 243, 62, 56, 1, 234, 28, 56, 1, 242, 174, 56, 1, 206, 56, 1, 210, 116, 
-    56, 1, 219, 191, 56, 1, 210, 44, 56, 1, 218, 83, 56, 1, 210, 13, 56, 1, 
-    221, 181, 56, 1, 210, 94, 56, 1, 219, 58, 56, 1, 210, 23, 56, 1, 217, 
-    105, 56, 1, 248, 221, 56, 1, 216, 117, 56, 1, 248, 3, 56, 1, 4, 215, 118, 
-    56, 1, 215, 118, 56, 1, 246, 78, 56, 1, 217, 22, 56, 1, 248, 90, 56, 1, 
-    111, 56, 1, 247, 145, 56, 1, 197, 56, 1, 228, 233, 56, 1, 227, 237, 56, 
-    1, 229, 107, 56, 1, 228, 74, 56, 1, 162, 56, 1, 252, 191, 56, 1, 190, 56, 
-    1, 241, 180, 56, 1, 252, 6, 56, 1, 225, 108, 56, 1, 240, 222, 56, 1, 251, 
-    125, 56, 1, 224, 150, 56, 1, 241, 238, 56, 1, 252, 75, 56, 1, 225, 221, 
-    56, 1, 241, 68, 56, 1, 251, 205, 56, 1, 225, 16, 56, 1, 184, 56, 1, 230, 
-    230, 56, 1, 230, 102, 56, 1, 231, 91, 56, 1, 230, 161, 56, 1, 4, 191, 56, 
-    1, 191, 56, 1, 4, 210, 212, 56, 1, 210, 212, 56, 1, 4, 210, 244, 56, 1, 
-    210, 244, 56, 1, 205, 56, 1, 223, 35, 56, 1, 222, 140, 56, 1, 223, 128, 
-    56, 1, 222, 211, 56, 1, 4, 212, 65, 56, 1, 212, 65, 56, 1, 211, 250, 56, 
-    1, 212, 22, 56, 1, 211, 227, 56, 1, 230, 25, 56, 1, 212, 116, 56, 1, 4, 
-    176, 56, 1, 4, 234, 182, 56, 1, 214, 27, 56, 1, 213, 176, 56, 1, 213, 
-    255, 56, 1, 213, 138, 56, 230, 224, 247, 120, 234, 201, 224, 173, 219, 
-    31, 78, 56, 235, 158, 78, 56, 213, 135, 235, 158, 78, 56, 247, 221, 233, 
-    255, 251, 184, 1, 253, 158, 251, 184, 1, 226, 105, 251, 184, 1, 193, 251, 
-    184, 1, 245, 6, 251, 184, 1, 249, 60, 251, 184, 1, 217, 152, 251, 184, 1, 
-    230, 25, 251, 184, 1, 156, 251, 184, 1, 243, 202, 251, 184, 1, 235, 23, 
-    251, 184, 1, 242, 60, 251, 184, 1, 235, 144, 251, 184, 1, 224, 96, 251, 
-    184, 1, 211, 178, 251, 184, 1, 210, 83, 251, 184, 1, 250, 158, 251, 184, 
-    1, 220, 104, 251, 184, 1, 153, 251, 184, 1, 210, 159, 251, 184, 1, 251, 
-    66, 251, 184, 1, 222, 91, 251, 184, 1, 61, 251, 184, 1, 76, 251, 184, 1, 
-    75, 251, 184, 1, 245, 197, 251, 184, 1, 254, 201, 251, 184, 1, 245, 195, 
-    251, 184, 1, 253, 192, 251, 184, 1, 226, 134, 251, 184, 1, 254, 123, 251, 
-    184, 1, 245, 150, 251, 184, 1, 254, 115, 251, 184, 1, 245, 138, 251, 184, 
-    1, 245, 92, 251, 184, 1, 73, 251, 184, 1, 70, 251, 184, 1, 235, 156, 251, 
-    184, 1, 214, 105, 251, 184, 1, 229, 79, 251, 184, 1, 242, 178, 251, 184, 
-    1, 236, 34, 24, 1, 234, 58, 24, 1, 218, 215, 24, 1, 234, 51, 24, 1, 228, 
-    226, 24, 1, 228, 224, 24, 1, 228, 223, 24, 1, 216, 101, 24, 1, 218, 204, 
-    24, 1, 223, 26, 24, 1, 223, 21, 24, 1, 223, 18, 24, 1, 223, 11, 24, 1, 
-    223, 6, 24, 1, 223, 1, 24, 1, 223, 12, 24, 1, 223, 24, 24, 1, 230, 217, 
-    24, 1, 225, 95, 24, 1, 218, 212, 24, 1, 225, 84, 24, 1, 219, 148, 24, 1, 
-    218, 209, 24, 1, 236, 56, 24, 1, 250, 46, 24, 1, 218, 219, 24, 1, 250, 
-    106, 24, 1, 234, 110, 24, 1, 216, 173, 24, 1, 225, 131, 24, 1, 241, 172, 
-    24, 1, 61, 24, 1, 254, 243, 24, 1, 191, 24, 1, 211, 92, 24, 1, 245, 117, 
-    24, 1, 75, 24, 1, 211, 36, 24, 1, 211, 47, 24, 1, 76, 24, 1, 212, 65, 24, 
-    1, 212, 62, 24, 1, 226, 234, 24, 1, 210, 244, 24, 1, 70, 24, 1, 212, 11, 
-    24, 1, 212, 22, 24, 1, 211, 250, 24, 1, 210, 212, 24, 1, 245, 55, 24, 1, 
-    211, 8, 24, 1, 73, 24, 244, 103, 24, 1, 218, 213, 24, 1, 228, 216, 24, 1, 
-    228, 218, 24, 1, 228, 221, 24, 1, 223, 19, 24, 1, 223, 0, 24, 1, 223, 8, 
-    24, 1, 223, 13, 24, 1, 222, 254, 24, 1, 230, 210, 24, 1, 230, 207, 24, 1, 
-    230, 211, 24, 1, 234, 221, 24, 1, 225, 90, 24, 1, 225, 76, 24, 1, 225, 
-    82, 24, 1, 225, 79, 24, 1, 225, 93, 24, 1, 225, 77, 24, 1, 234, 219, 24, 
-    1, 234, 217, 24, 1, 219, 141, 24, 1, 219, 139, 24, 1, 219, 131, 24, 1, 
-    219, 136, 24, 1, 219, 146, 24, 1, 226, 32, 24, 1, 218, 216, 24, 1, 211, 
-    26, 24, 1, 211, 22, 24, 1, 211, 23, 24, 1, 234, 220, 24, 1, 218, 217, 24, 
+    67, 91, 43, 44, 52, 80, 2, 67, 91, 97, 215, 58, 80, 243, 244, 130, 140, 
+    52, 80, 243, 244, 130, 97, 52, 80, 243, 244, 130, 246, 105, 80, 2, 203, 
+    91, 214, 153, 80, 2, 203, 91, 214, 153, 215, 212, 74, 246, 105, 215, 212, 
+    74, 140, 52, 248, 158, 74, 97, 52, 248, 158, 74, 140, 215, 212, 248, 158, 
+    74, 97, 215, 212, 248, 158, 74, 97, 215, 58, 215, 212, 248, 158, 74, 97, 
+    80, 2, 246, 119, 218, 140, 214, 153, 80, 216, 43, 130, 246, 105, 80, 216, 
+    43, 130, 97, 80, 2, 217, 79, 2, 67, 91, 97, 80, 2, 217, 79, 2, 52, 67, 
+    91, 97, 215, 58, 80, 2, 217, 78, 97, 215, 58, 80, 2, 217, 79, 2, 67, 91, 
+    97, 215, 58, 80, 2, 217, 79, 2, 52, 67, 91, 140, 253, 252, 97, 253, 252, 
+    140, 52, 253, 252, 97, 52, 253, 252, 140, 80, 216, 43, 85, 247, 249, 97, 
+    80, 216, 43, 85, 247, 249, 140, 80, 243, 244, 252, 142, 216, 43, 85, 247, 
+    249, 97, 80, 243, 244, 252, 142, 216, 43, 85, 247, 249, 228, 57, 212, 9, 
+    22, 219, 29, 245, 221, 74, 228, 57, 245, 221, 22, 219, 29, 212, 9, 74, 
+    228, 57, 212, 9, 80, 2, 103, 228, 57, 245, 221, 80, 2, 103, 219, 29, 245, 
+    221, 80, 2, 103, 219, 29, 212, 9, 80, 2, 103, 228, 57, 212, 9, 80, 22, 
+    228, 57, 245, 221, 74, 228, 57, 245, 221, 80, 22, 219, 29, 245, 221, 74, 
+    219, 29, 245, 221, 80, 22, 219, 29, 212, 9, 74, 219, 29, 212, 9, 80, 22, 
+    228, 57, 212, 9, 74, 222, 229, 248, 0, 249, 126, 244, 176, 247, 255, 244, 
+    176, 248, 0, 249, 126, 222, 229, 247, 255, 219, 29, 245, 221, 80, 249, 
+    126, 228, 57, 245, 221, 74, 228, 57, 245, 221, 80, 249, 126, 219, 29, 
+    245, 221, 74, 244, 176, 248, 0, 249, 126, 228, 57, 245, 221, 74, 222, 
+    229, 248, 0, 249, 126, 219, 29, 245, 221, 74, 228, 57, 245, 221, 80, 249, 
+    126, 228, 57, 212, 9, 74, 228, 57, 212, 9, 80, 249, 126, 228, 57, 245, 
+    221, 74, 212, 36, 80, 225, 8, 247, 196, 222, 252, 80, 225, 8, 97, 216, 
+    189, 249, 91, 214, 152, 80, 225, 8, 97, 216, 189, 249, 91, 246, 104, 80, 
+    225, 8, 246, 105, 216, 189, 249, 91, 233, 38, 80, 225, 8, 246, 105, 216, 
+    189, 249, 91, 222, 242, 222, 245, 254, 27, 250, 3, 74, 233, 41, 254, 27, 
+    254, 89, 74, 216, 15, 254, 27, 254, 89, 74, 251, 176, 254, 27, 254, 89, 
+    74, 216, 15, 254, 27, 250, 3, 80, 2, 230, 182, 216, 15, 254, 27, 254, 89, 
+    80, 2, 225, 23, 232, 109, 44, 220, 153, 250, 3, 74, 232, 109, 43, 220, 
+    153, 254, 89, 74, 254, 89, 250, 1, 250, 37, 74, 250, 3, 250, 1, 250, 37, 
+    74, 97, 80, 77, 219, 252, 140, 74, 140, 80, 77, 219, 252, 97, 74, 219, 
+    252, 97, 80, 77, 140, 74, 97, 80, 2, 96, 51, 140, 80, 2, 96, 51, 97, 80, 
+    216, 140, 211, 178, 43, 44, 80, 216, 140, 4, 250, 36, 214, 153, 215, 58, 
+    80, 243, 244, 4, 250, 36, 43, 252, 140, 120, 44, 252, 140, 124, 241, 255, 
+    43, 252, 140, 124, 44, 252, 140, 120, 241, 255, 120, 252, 140, 44, 124, 
+    252, 140, 43, 241, 255, 120, 252, 140, 43, 124, 252, 140, 44, 241, 255, 
+    43, 252, 140, 120, 44, 252, 140, 120, 241, 255, 120, 252, 140, 44, 124, 
+    252, 140, 44, 241, 255, 43, 252, 140, 124, 44, 252, 140, 124, 241, 255, 
+    120, 252, 140, 43, 124, 252, 140, 43, 241, 255, 140, 242, 0, 2, 252, 140, 
+    120, 216, 43, 130, 97, 242, 0, 2, 252, 140, 120, 216, 43, 130, 214, 153, 
+    242, 0, 2, 252, 140, 44, 216, 43, 130, 246, 105, 242, 0, 2, 252, 140, 44, 
+    216, 43, 130, 140, 242, 0, 2, 252, 140, 124, 216, 43, 130, 97, 242, 0, 2, 
+    252, 140, 124, 216, 43, 130, 214, 153, 242, 0, 2, 252, 140, 43, 216, 43, 
+    130, 246, 105, 242, 0, 2, 252, 140, 43, 216, 43, 130, 140, 242, 0, 2, 
+    252, 140, 120, 243, 244, 130, 97, 242, 0, 2, 252, 140, 120, 243, 244, 
+    130, 214, 153, 242, 0, 2, 252, 140, 44, 243, 244, 130, 246, 105, 242, 0, 
+    2, 252, 140, 44, 243, 244, 130, 140, 242, 0, 2, 252, 140, 124, 243, 244, 
+    130, 97, 242, 0, 2, 252, 140, 124, 243, 244, 130, 214, 153, 242, 0, 2, 
+    252, 140, 43, 243, 244, 130, 246, 105, 242, 0, 2, 252, 140, 43, 243, 244, 
+    130, 140, 242, 0, 2, 252, 140, 120, 77, 140, 242, 0, 2, 252, 140, 246, 
+    107, 214, 153, 242, 0, 2, 252, 140, 43, 252, 31, 214, 153, 242, 0, 2, 
+    252, 140, 222, 252, 97, 242, 0, 2, 252, 140, 120, 77, 97, 242, 0, 2, 252, 
+    140, 246, 107, 246, 105, 242, 0, 2, 252, 140, 43, 252, 31, 246, 105, 242, 
+    0, 2, 252, 140, 222, 252, 140, 242, 0, 2, 252, 140, 120, 77, 97, 242, 0, 
+    2, 252, 140, 214, 163, 140, 242, 0, 2, 252, 140, 124, 77, 97, 242, 0, 2, 
+    252, 140, 246, 107, 97, 242, 0, 2, 252, 140, 120, 77, 140, 242, 0, 2, 
+    252, 140, 214, 163, 97, 242, 0, 2, 252, 140, 124, 77, 140, 242, 0, 2, 
+    252, 140, 246, 107, 140, 242, 0, 2, 252, 140, 120, 77, 199, 248, 157, 
+    140, 242, 0, 2, 252, 140, 124, 252, 44, 199, 248, 157, 97, 242, 0, 2, 
+    252, 140, 120, 77, 199, 248, 157, 97, 242, 0, 2, 252, 140, 124, 252, 44, 
+    199, 248, 157, 214, 153, 242, 0, 2, 252, 140, 43, 252, 31, 246, 105, 242, 
+    0, 2, 252, 140, 222, 252, 246, 105, 242, 0, 2, 252, 140, 43, 252, 31, 
+    214, 153, 242, 0, 2, 252, 140, 222, 252, 44, 52, 80, 2, 222, 184, 241, 
+    236, 245, 99, 5, 77, 97, 74, 216, 90, 226, 169, 77, 97, 74, 140, 80, 77, 
+    216, 90, 226, 168, 97, 80, 77, 216, 90, 226, 168, 97, 80, 77, 254, 149, 
+    128, 111, 233, 16, 77, 140, 74, 140, 80, 216, 140, 233, 15, 242, 131, 77, 
+    97, 74, 218, 65, 77, 97, 74, 140, 80, 216, 140, 218, 64, 218, 23, 77, 
+    140, 74, 43, 244, 92, 217, 78, 44, 244, 92, 217, 78, 120, 244, 92, 217, 
+    78, 124, 244, 92, 217, 78, 215, 212, 67, 252, 142, 248, 61, 210, 160, 
+    188, 218, 243, 210, 160, 188, 215, 49, 249, 227, 43, 71, 249, 100, 127, 
+    44, 71, 249, 100, 127, 43, 71, 226, 4, 44, 71, 226, 4, 210, 160, 188, 43, 
+    236, 16, 127, 210, 160, 188, 44, 236, 16, 127, 210, 160, 188, 43, 251, 
+    243, 127, 210, 160, 188, 44, 251, 243, 127, 43, 42, 251, 159, 2, 214, 
+    183, 44, 42, 251, 159, 2, 214, 183, 43, 42, 251, 159, 2, 216, 116, 236, 
+    1, 216, 15, 249, 161, 44, 42, 251, 159, 2, 216, 116, 236, 1, 251, 176, 
+    249, 161, 43, 42, 251, 159, 2, 216, 116, 236, 1, 251, 176, 249, 161, 44, 
+    42, 251, 159, 2, 216, 116, 236, 1, 216, 15, 249, 161, 43, 254, 111, 251, 
+    159, 2, 247, 121, 44, 254, 111, 251, 159, 2, 247, 121, 43, 254, 27, 233, 
+    16, 127, 44, 254, 27, 242, 131, 127, 52, 43, 254, 27, 242, 131, 127, 52, 
+    44, 254, 27, 233, 16, 127, 43, 85, 216, 7, 220, 54, 127, 44, 85, 216, 7, 
+    220, 54, 127, 246, 119, 244, 136, 67, 210, 35, 232, 214, 231, 89, 254, 
+    111, 226, 171, 233, 47, 44, 254, 111, 214, 12, 2, 218, 235, 231, 89, 44, 
+    254, 111, 2, 247, 121, 254, 111, 2, 222, 93, 235, 216, 255, 4, 254, 110, 
+    219, 0, 254, 111, 226, 171, 233, 47, 219, 0, 254, 111, 226, 171, 214, 
+    163, 215, 94, 254, 110, 223, 50, 254, 110, 254, 111, 2, 214, 183, 223, 
+    50, 254, 111, 2, 214, 183, 226, 249, 254, 111, 226, 171, 214, 163, 226, 
+    249, 254, 111, 226, 171, 246, 107, 231, 89, 254, 111, 2, 204, 254, 6, 
+    245, 141, 236, 1, 80, 225, 8, 120, 22, 222, 252, 231, 89, 254, 111, 2, 
+    204, 254, 6, 245, 141, 236, 1, 80, 225, 8, 120, 22, 233, 47, 231, 89, 
+    254, 111, 2, 204, 254, 6, 245, 141, 236, 1, 80, 225, 8, 124, 22, 222, 
+    252, 231, 89, 254, 111, 2, 204, 254, 6, 245, 141, 236, 1, 80, 225, 8, 
+    124, 22, 233, 47, 231, 89, 254, 111, 2, 204, 254, 6, 245, 141, 236, 1, 
+    80, 225, 8, 44, 22, 214, 163, 231, 89, 254, 111, 2, 204, 254, 6, 245, 
+    141, 236, 1, 80, 225, 8, 43, 22, 214, 163, 231, 89, 254, 111, 2, 204, 
+    254, 6, 245, 141, 236, 1, 80, 225, 8, 44, 22, 246, 107, 231, 89, 254, 
+    111, 2, 204, 254, 6, 245, 141, 236, 1, 80, 225, 8, 43, 22, 246, 107, 223, 
+    50, 245, 153, 220, 128, 245, 153, 220, 129, 2, 226, 124, 245, 153, 220, 
+    129, 2, 4, 250, 37, 48, 245, 153, 220, 129, 2, 44, 80, 48, 245, 153, 220, 
+    129, 2, 43, 80, 48, 250, 37, 2, 203, 130, 37, 67, 130, 37, 226, 8, 37, 
+    223, 51, 219, 47, 37, 225, 172, 250, 37, 247, 174, 251, 79, 203, 252, 
+    142, 22, 216, 15, 163, 247, 174, 251, 79, 67, 130, 250, 37, 2, 218, 25, 
+    211, 178, 37, 254, 88, 247, 170, 50, 120, 80, 216, 140, 250, 36, 37, 71, 
+    251, 114, 37, 251, 114, 37, 233, 15, 37, 242, 130, 250, 37, 2, 4, 250, 
+    37, 216, 43, 216, 197, 222, 252, 250, 37, 2, 113, 203, 218, 92, 216, 43, 
+    216, 197, 222, 252, 92, 222, 229, 248, 0, 219, 96, 92, 244, 176, 248, 0, 
+    219, 96, 92, 253, 217, 92, 4, 250, 36, 92, 218, 235, 113, 235, 66, 218, 
+    233, 215, 227, 2, 59, 48, 215, 227, 2, 214, 183, 222, 93, 236, 1, 215, 
+    226, 215, 227, 2, 220, 135, 253, 208, 251, 175, 44, 215, 227, 77, 43, 
+    215, 226, 43, 215, 227, 252, 31, 67, 130, 67, 252, 142, 252, 31, 44, 215, 
+    226, 251, 166, 2, 43, 163, 251, 222, 251, 166, 2, 44, 163, 251, 222, 85, 
+    251, 165, 30, 2, 43, 163, 251, 222, 30, 2, 44, 163, 251, 222, 71, 240, 
+    237, 85, 240, 237, 43, 211, 244, 244, 136, 44, 211, 244, 244, 136, 43, 
+    52, 211, 244, 244, 136, 44, 52, 211, 244, 244, 136, 235, 249, 235, 235, 
+    216, 113, 117, 235, 235, 235, 236, 229, 103, 2, 67, 130, 246, 113, 230, 
+    88, 42, 2, 249, 182, 226, 128, 235, 247, 253, 238, 219, 220, 224, 181, 
+    245, 99, 5, 22, 219, 98, 226, 8, 245, 99, 5, 22, 219, 98, 226, 9, 2, 216, 
+    90, 48, 240, 105, 216, 43, 22, 219, 98, 226, 8, 242, 184, 218, 156, 216, 
+    186, 246, 106, 215, 227, 2, 43, 163, 251, 222, 246, 106, 215, 227, 2, 44, 
+    163, 251, 222, 85, 247, 250, 2, 124, 74, 85, 232, 105, 71, 250, 37, 2, 
+    124, 74, 85, 250, 37, 2, 124, 74, 245, 86, 71, 218, 235, 245, 86, 85, 
+    218, 235, 245, 86, 71, 247, 249, 245, 86, 85, 247, 249, 245, 86, 71, 250, 
+    36, 245, 86, 85, 250, 36, 222, 133, 223, 51, 219, 48, 226, 168, 219, 48, 
+    2, 226, 124, 223, 51, 219, 48, 2, 203, 91, 251, 250, 219, 47, 251, 250, 
+    223, 51, 219, 47, 52, 225, 23, 215, 212, 225, 23, 233, 43, 249, 92, 254, 
+    111, 127, 222, 248, 249, 92, 254, 111, 127, 216, 79, 230, 180, 230, 25, 
+    37, 59, 226, 168, 230, 25, 37, 96, 226, 168, 230, 25, 37, 30, 226, 168, 
+    230, 25, 214, 176, 226, 169, 2, 247, 121, 230, 25, 214, 176, 226, 169, 2, 
+    225, 23, 230, 25, 42, 235, 200, 226, 168, 230, 25, 42, 214, 176, 226, 
+    168, 113, 232, 147, 22, 226, 168, 113, 232, 147, 177, 226, 168, 230, 25, 
+    30, 226, 168, 230, 155, 113, 218, 44, 218, 42, 2, 235, 212, 224, 25, 235, 
+    213, 226, 168, 244, 100, 226, 0, 235, 212, 235, 213, 2, 52, 91, 235, 213, 
+    253, 174, 2, 219, 96, 250, 33, 243, 227, 254, 89, 235, 210, 232, 215, 
+    235, 211, 2, 223, 116, 225, 238, 254, 3, 225, 2, 232, 215, 235, 211, 2, 
+    220, 153, 225, 238, 254, 3, 225, 2, 232, 215, 235, 211, 228, 53, 235, 
+    251, 216, 197, 225, 2, 235, 213, 254, 3, 115, 225, 12, 226, 168, 224, 19, 
+    235, 213, 226, 168, 235, 213, 2, 140, 80, 2, 103, 235, 213, 2, 30, 50, 
+    235, 213, 2, 235, 199, 235, 213, 2, 214, 175, 235, 213, 2, 226, 124, 235, 
+    213, 2, 214, 183, 235, 67, 233, 86, 43, 215, 227, 226, 168, 210, 160, 
+    188, 221, 202, 249, 210, 210, 160, 188, 221, 202, 225, 57, 210, 160, 188, 
+    221, 202, 224, 177, 96, 5, 2, 4, 250, 37, 48, 96, 5, 2, 250, 32, 255, 16, 
+    48, 96, 5, 2, 216, 90, 48, 96, 5, 2, 59, 51, 96, 5, 2, 216, 90, 51, 96, 
+    5, 2, 218, 66, 105, 96, 5, 2, 85, 215, 226, 230, 183, 5, 2, 249, 221, 48, 
+    230, 183, 5, 2, 59, 51, 230, 183, 5, 2, 244, 176, 247, 119, 230, 183, 5, 
+    2, 222, 229, 247, 119, 96, 5, 236, 1, 43, 163, 250, 36, 96, 5, 236, 1, 
+    44, 163, 250, 36, 213, 254, 177, 249, 132, 224, 181, 230, 85, 5, 2, 59, 
+    48, 230, 85, 5, 2, 214, 183, 220, 150, 224, 182, 2, 251, 176, 250, 0, 
+    219, 78, 224, 181, 230, 85, 5, 236, 1, 43, 163, 250, 36, 230, 85, 5, 236, 
+    1, 44, 163, 250, 36, 37, 230, 85, 5, 2, 250, 32, 255, 15, 230, 85, 5, 
+    236, 1, 52, 250, 36, 37, 247, 170, 50, 96, 5, 236, 1, 215, 226, 230, 183, 
+    5, 236, 1, 215, 226, 230, 85, 5, 236, 1, 215, 226, 235, 207, 224, 181, 
+    222, 243, 235, 207, 224, 181, 210, 160, 188, 223, 91, 249, 210, 254, 135, 
+    177, 249, 166, 235, 200, 2, 247, 121, 214, 176, 2, 230, 183, 50, 214, 
+    176, 2, 226, 124, 235, 200, 2, 226, 124, 235, 200, 2, 232, 147, 254, 119, 
+    214, 176, 2, 232, 147, 226, 159, 214, 176, 77, 235, 199, 235, 200, 77, 
+    214, 175, 214, 176, 77, 252, 142, 77, 235, 199, 235, 200, 77, 252, 142, 
+    77, 214, 175, 214, 176, 252, 31, 22, 235, 66, 2, 214, 175, 235, 200, 252, 
+    31, 22, 235, 66, 2, 235, 199, 250, 1, 214, 176, 2, 220, 134, 250, 1, 235, 
+    200, 2, 220, 134, 52, 42, 235, 199, 52, 42, 214, 175, 250, 1, 214, 176, 
+    2, 220, 135, 22, 219, 78, 224, 181, 232, 147, 22, 2, 59, 48, 232, 147, 
+    177, 2, 59, 48, 52, 232, 147, 254, 119, 52, 232, 147, 226, 159, 113, 235, 
+    201, 232, 147, 254, 119, 113, 235, 201, 232, 147, 226, 159, 219, 86, 233, 
+    86, 226, 159, 219, 86, 233, 86, 254, 119, 232, 147, 177, 226, 122, 232, 
+    147, 254, 119, 232, 147, 22, 2, 230, 225, 218, 140, 232, 147, 177, 2, 
+    230, 225, 218, 140, 232, 147, 22, 2, 203, 248, 157, 232, 147, 177, 2, 
+    203, 248, 157, 232, 147, 22, 2, 52, 226, 124, 232, 147, 22, 2, 214, 183, 
+    232, 147, 22, 2, 52, 214, 183, 4, 213, 251, 2, 214, 183, 232, 147, 177, 
+    2, 52, 226, 124, 232, 147, 177, 2, 52, 214, 183, 210, 160, 188, 247, 130, 
+    254, 80, 210, 160, 188, 223, 149, 254, 80, 245, 99, 5, 2, 59, 51, 240, 
+    105, 2, 59, 48, 215, 212, 203, 252, 142, 2, 52, 67, 91, 215, 212, 203, 
+    252, 142, 2, 215, 212, 67, 91, 216, 90, 226, 169, 2, 59, 48, 216, 90, 
+    226, 169, 2, 222, 229, 247, 119, 219, 163, 230, 183, 219, 162, 249, 200, 
+    2, 59, 48, 245, 99, 2, 253, 217, 254, 149, 128, 216, 43, 2, 250, 32, 255, 
+    15, 254, 49, 128, 177, 128, 111, 245, 99, 5, 77, 96, 50, 96, 5, 77, 245, 
+    99, 50, 245, 99, 5, 77, 216, 90, 226, 168, 52, 249, 228, 245, 100, 113, 
+    249, 195, 245, 99, 219, 177, 134, 249, 195, 245, 99, 219, 177, 245, 99, 
+    5, 2, 113, 170, 77, 22, 113, 170, 51, 245, 95, 2, 244, 12, 170, 48, 233, 
+    16, 2, 250, 37, 235, 216, 242, 131, 2, 250, 37, 235, 216, 233, 16, 2, 
+    224, 14, 164, 48, 242, 131, 2, 224, 14, 164, 48, 233, 16, 177, 219, 98, 
+    128, 111, 242, 131, 177, 219, 98, 128, 111, 233, 16, 177, 219, 98, 128, 
+    216, 43, 2, 59, 235, 216, 242, 131, 177, 219, 98, 128, 216, 43, 2, 59, 
+    235, 216, 233, 16, 177, 219, 98, 128, 216, 43, 2, 59, 48, 242, 131, 177, 
+    219, 98, 128, 216, 43, 2, 59, 48, 233, 16, 177, 219, 98, 128, 216, 43, 2, 
+    59, 77, 222, 252, 242, 131, 177, 219, 98, 128, 216, 43, 2, 59, 77, 233, 
+    47, 233, 16, 177, 254, 50, 242, 131, 177, 254, 50, 233, 16, 22, 219, 154, 
+    228, 53, 128, 111, 242, 131, 22, 219, 154, 228, 53, 128, 111, 233, 16, 
+    22, 228, 53, 254, 50, 242, 131, 22, 228, 53, 254, 50, 233, 16, 77, 246, 
+    112, 128, 77, 242, 130, 242, 131, 77, 246, 112, 128, 77, 233, 15, 233, 
+    16, 77, 219, 163, 177, 245, 100, 242, 131, 77, 219, 163, 177, 245, 100, 
+    233, 16, 77, 219, 163, 77, 242, 130, 242, 131, 77, 219, 163, 77, 233, 15, 
+    233, 16, 77, 242, 131, 77, 246, 112, 245, 100, 242, 131, 77, 233, 16, 77, 
+    246, 112, 245, 100, 233, 16, 77, 219, 98, 128, 77, 242, 131, 77, 219, 98, 
+    245, 100, 242, 131, 77, 219, 98, 128, 77, 233, 16, 77, 219, 98, 245, 100, 
+    219, 98, 128, 216, 43, 177, 233, 15, 219, 98, 128, 216, 43, 177, 242, 
+    130, 219, 98, 128, 216, 43, 177, 233, 16, 2, 59, 235, 216, 219, 98, 128, 
+    216, 43, 177, 242, 131, 2, 59, 235, 216, 246, 112, 128, 216, 43, 177, 
+    233, 15, 246, 112, 128, 216, 43, 177, 242, 130, 246, 112, 219, 98, 128, 
+    216, 43, 177, 233, 15, 246, 112, 219, 98, 128, 216, 43, 177, 242, 130, 
+    219, 163, 177, 233, 15, 219, 163, 177, 242, 130, 219, 163, 77, 233, 16, 
+    77, 245, 99, 50, 219, 163, 77, 242, 131, 77, 245, 99, 50, 52, 229, 92, 
+    233, 15, 52, 229, 92, 242, 130, 52, 229, 92, 233, 16, 2, 214, 183, 242, 
+    131, 226, 122, 233, 15, 242, 131, 252, 31, 233, 15, 233, 16, 250, 1, 251, 
+    79, 249, 93, 242, 131, 250, 1, 251, 79, 249, 93, 233, 16, 250, 1, 251, 
+    79, 249, 94, 77, 219, 98, 245, 100, 242, 131, 250, 1, 251, 79, 249, 94, 
+    77, 219, 98, 245, 100, 219, 79, 216, 201, 233, 84, 216, 201, 219, 79, 
+    216, 202, 177, 128, 111, 233, 84, 216, 202, 177, 128, 111, 245, 99, 5, 2, 
+    251, 109, 48, 224, 204, 77, 219, 154, 245, 99, 50, 218, 57, 77, 219, 154, 
+    245, 99, 50, 224, 204, 77, 219, 154, 228, 53, 128, 111, 218, 57, 77, 219, 
+    154, 228, 53, 128, 111, 224, 204, 77, 245, 99, 50, 218, 57, 77, 245, 99, 
+    50, 224, 204, 77, 228, 53, 128, 111, 218, 57, 77, 228, 53, 128, 111, 224, 
+    204, 77, 254, 149, 128, 111, 218, 57, 77, 254, 149, 128, 111, 224, 204, 
+    77, 228, 53, 254, 149, 128, 111, 218, 57, 77, 228, 53, 254, 149, 128, 
+    111, 52, 224, 203, 52, 218, 56, 218, 65, 2, 247, 121, 218, 23, 2, 247, 
+    121, 218, 65, 2, 96, 5, 51, 218, 23, 2, 96, 5, 51, 218, 65, 2, 230, 85, 
+    5, 51, 218, 23, 2, 230, 85, 5, 51, 218, 65, 64, 177, 128, 216, 43, 2, 59, 
+    48, 218, 23, 64, 177, 128, 216, 43, 2, 59, 48, 218, 65, 64, 77, 245, 99, 
+    50, 218, 23, 64, 77, 245, 99, 50, 218, 65, 64, 77, 216, 90, 226, 168, 
+    218, 23, 64, 77, 216, 90, 226, 168, 218, 65, 64, 77, 254, 149, 128, 111, 
+    218, 23, 64, 77, 254, 149, 128, 111, 218, 65, 64, 77, 228, 53, 128, 111, 
+    218, 23, 64, 77, 228, 53, 128, 111, 42, 43, 204, 93, 226, 168, 42, 44, 
+    204, 93, 226, 168, 250, 1, 218, 64, 250, 1, 218, 22, 250, 1, 218, 65, 
+    177, 128, 111, 250, 1, 218, 23, 177, 128, 111, 218, 65, 77, 218, 22, 218, 
+    23, 77, 218, 64, 218, 65, 77, 218, 64, 218, 23, 77, 218, 22, 218, 23, 
+    252, 31, 218, 64, 218, 23, 252, 31, 22, 235, 66, 251, 79, 248, 158, 2, 
+    218, 64, 245, 171, 64, 226, 171, 246, 104, 225, 49, 2, 217, 13, 216, 14, 
+    215, 241, 235, 199, 244, 22, 228, 66, 219, 252, 43, 217, 88, 219, 252, 
+    124, 217, 88, 219, 252, 120, 217, 88, 225, 173, 2, 222, 92, 67, 252, 142, 
+    215, 212, 44, 215, 93, 52, 67, 252, 142, 43, 215, 93, 67, 252, 142, 52, 
+    43, 215, 93, 52, 67, 252, 142, 52, 43, 215, 93, 199, 248, 158, 243, 244, 
+    43, 231, 64, 64, 52, 213, 239, 219, 252, 124, 217, 89, 2, 226, 124, 219, 
+    252, 120, 217, 89, 2, 214, 183, 219, 252, 120, 217, 89, 77, 219, 252, 
+    124, 217, 88, 52, 124, 217, 88, 52, 120, 217, 88, 52, 218, 104, 228, 53, 
+    50, 223, 50, 52, 218, 104, 228, 53, 50, 247, 139, 228, 53, 247, 176, 2, 
+    223, 50, 229, 102, 219, 96, 67, 232, 215, 2, 250, 37, 48, 67, 232, 215, 
+    2, 250, 37, 51, 124, 217, 89, 2, 250, 37, 51, 226, 9, 2, 203, 91, 226, 9, 
+    2, 216, 90, 226, 168, 215, 212, 67, 252, 142, 251, 245, 223, 92, 215, 
+    212, 67, 252, 142, 2, 203, 91, 215, 212, 249, 228, 226, 168, 215, 212, 
+    229, 92, 233, 15, 215, 212, 229, 92, 242, 130, 246, 112, 219, 98, 233, 
+    16, 177, 128, 111, 246, 112, 219, 98, 242, 131, 177, 128, 111, 215, 212, 
+    219, 48, 251, 245, 223, 92, 233, 86, 215, 212, 67, 252, 142, 226, 168, 
+    52, 219, 48, 226, 168, 71, 67, 130, 230, 25, 71, 67, 130, 228, 57, 245, 
+    221, 71, 74, 228, 57, 212, 9, 71, 74, 219, 29, 245, 221, 71, 74, 219, 29, 
+    212, 9, 71, 74, 43, 44, 71, 74, 140, 85, 74, 214, 153, 85, 74, 246, 105, 
+    85, 74, 228, 57, 245, 221, 85, 74, 228, 57, 212, 9, 85, 74, 219, 29, 245, 
+    221, 85, 74, 219, 29, 212, 9, 85, 74, 43, 44, 85, 74, 120, 124, 85, 74, 
+    97, 80, 2, 216, 78, 246, 104, 97, 80, 2, 216, 78, 214, 152, 140, 80, 2, 
+    216, 78, 246, 104, 140, 80, 2, 216, 78, 214, 152, 42, 2, 216, 15, 163, 
+    251, 222, 42, 2, 251, 176, 163, 251, 222, 42, 2, 214, 160, 44, 248, 0, 
+    163, 251, 222, 42, 2, 232, 109, 43, 248, 0, 163, 251, 222, 247, 250, 2, 
+    43, 163, 251, 222, 247, 250, 2, 44, 163, 251, 222, 247, 250, 2, 216, 15, 
+    163, 251, 222, 247, 250, 2, 251, 176, 163, 251, 222, 246, 119, 218, 235, 
+    85, 233, 86, 218, 235, 71, 233, 86, 218, 235, 85, 213, 187, 4, 218, 235, 
+    71, 213, 187, 4, 218, 235, 85, 225, 191, 71, 225, 191, 71, 241, 194, 85, 
+    241, 194, 203, 85, 241, 194, 85, 233, 86, 250, 36, 85, 231, 83, 247, 249, 
+    71, 231, 83, 247, 249, 85, 231, 83, 232, 105, 71, 231, 83, 232, 105, 85, 
+    4, 247, 249, 85, 4, 232, 105, 71, 4, 232, 105, 85, 203, 245, 165, 71, 
+    203, 245, 165, 85, 67, 245, 165, 71, 67, 245, 165, 43, 80, 2, 4, 250, 36, 
+    134, 140, 253, 248, 43, 80, 2, 37, 225, 23, 199, 140, 218, 231, 74, 140, 
+    215, 58, 80, 2, 67, 91, 140, 215, 58, 80, 2, 52, 67, 91, 140, 215, 58, 
+    80, 243, 244, 130, 140, 215, 58, 215, 212, 248, 158, 74, 140, 80, 2, 246, 
+    119, 218, 140, 140, 80, 2, 217, 79, 2, 67, 91, 140, 80, 2, 217, 79, 2, 
+    52, 67, 91, 140, 215, 58, 80, 2, 217, 78, 140, 215, 58, 80, 2, 217, 79, 
+    2, 67, 91, 140, 215, 58, 80, 2, 217, 79, 2, 52, 67, 91, 140, 80, 216, 
+    140, 211, 178, 212, 36, 80, 225, 8, 247, 196, 233, 47, 245, 99, 5, 77, 
+    140, 74, 223, 51, 216, 90, 226, 169, 77, 140, 74, 140, 80, 77, 223, 51, 
+    254, 149, 128, 111, 97, 80, 216, 140, 242, 130, 97, 80, 216, 140, 218, 
+    22, 140, 224, 25, 74, 97, 224, 25, 74, 223, 51, 216, 90, 226, 169, 77, 
+    97, 74, 97, 80, 77, 223, 51, 254, 149, 128, 111, 216, 90, 226, 169, 77, 
+    140, 74, 140, 80, 77, 254, 149, 128, 111, 140, 80, 77, 223, 51, 216, 90, 
+    226, 168, 97, 80, 77, 223, 51, 216, 90, 226, 168, 71, 231, 83, 218, 157, 
+    85, 4, 218, 157, 71, 4, 218, 157, 85, 222, 248, 225, 191, 71, 222, 248, 
+    225, 191, 114, 233, 86, 250, 36, 114, 226, 125, 2, 226, 125, 235, 216, 
+    114, 250, 37, 2, 250, 37, 235, 216, 114, 250, 36, 114, 37, 221, 255, 145, 
+    6, 1, 253, 160, 145, 6, 1, 251, 118, 145, 6, 1, 213, 253, 145, 6, 1, 242, 
+    186, 145, 6, 1, 247, 141, 145, 6, 1, 211, 21, 145, 6, 1, 210, 68, 145, 6, 
+    1, 246, 35, 145, 6, 1, 210, 91, 145, 6, 1, 235, 149, 145, 6, 1, 65, 235, 
+    149, 145, 6, 1, 73, 145, 6, 1, 247, 161, 145, 6, 1, 234, 241, 145, 6, 1, 
+    232, 187, 145, 6, 1, 230, 30, 145, 6, 1, 229, 192, 145, 6, 1, 226, 186, 
+    145, 6, 1, 225, 5, 145, 6, 1, 222, 228, 145, 6, 1, 219, 84, 145, 6, 1, 
+    215, 81, 145, 6, 1, 214, 201, 145, 6, 1, 243, 247, 145, 6, 1, 241, 200, 
+    145, 6, 1, 226, 136, 145, 6, 1, 225, 222, 145, 6, 1, 219, 229, 145, 6, 1, 
+    215, 168, 145, 6, 1, 250, 76, 145, 6, 1, 220, 103, 145, 6, 1, 211, 27, 
+    145, 6, 1, 211, 29, 145, 6, 1, 211, 57, 145, 6, 1, 218, 254, 162, 145, 6, 
+    1, 210, 212, 145, 6, 1, 4, 210, 183, 145, 6, 1, 4, 210, 184, 2, 217, 78, 
+    145, 6, 1, 210, 244, 145, 6, 1, 235, 185, 4, 210, 183, 145, 6, 1, 251, 
+    250, 210, 183, 145, 6, 1, 235, 185, 251, 250, 210, 183, 145, 6, 1, 244, 
+    83, 145, 6, 1, 235, 147, 145, 6, 1, 219, 228, 145, 6, 1, 215, 203, 61, 
+    145, 6, 1, 233, 76, 230, 30, 145, 4, 1, 253, 160, 145, 4, 1, 251, 118, 
+    145, 4, 1, 213, 253, 145, 4, 1, 242, 186, 145, 4, 1, 247, 141, 145, 4, 1, 
+    211, 21, 145, 4, 1, 210, 68, 145, 4, 1, 246, 35, 145, 4, 1, 210, 91, 145, 
+    4, 1, 235, 149, 145, 4, 1, 65, 235, 149, 145, 4, 1, 73, 145, 4, 1, 247, 
+    161, 145, 4, 1, 234, 241, 145, 4, 1, 232, 187, 145, 4, 1, 230, 30, 145, 
+    4, 1, 229, 192, 145, 4, 1, 226, 186, 145, 4, 1, 225, 5, 145, 4, 1, 222, 
+    228, 145, 4, 1, 219, 84, 145, 4, 1, 215, 81, 145, 4, 1, 214, 201, 145, 4, 
+    1, 243, 247, 145, 4, 1, 241, 200, 145, 4, 1, 226, 136, 145, 4, 1, 225, 
+    222, 145, 4, 1, 219, 229, 145, 4, 1, 215, 168, 145, 4, 1, 250, 76, 145, 
+    4, 1, 220, 103, 145, 4, 1, 211, 27, 145, 4, 1, 211, 29, 145, 4, 1, 211, 
+    57, 145, 4, 1, 218, 254, 162, 145, 4, 1, 210, 212, 145, 4, 1, 4, 210, 
+    183, 145, 4, 1, 4, 210, 184, 2, 217, 78, 145, 4, 1, 210, 244, 145, 4, 1, 
+    235, 185, 4, 210, 183, 145, 4, 1, 251, 250, 210, 183, 145, 4, 1, 235, 
+    185, 251, 250, 210, 183, 145, 4, 1, 244, 83, 145, 4, 1, 235, 147, 145, 4, 
+    1, 219, 228, 145, 4, 1, 215, 203, 61, 145, 4, 1, 233, 76, 230, 30, 7, 6, 
+    1, 233, 150, 2, 52, 130, 7, 4, 1, 233, 150, 2, 52, 130, 7, 6, 1, 233, 
+    150, 2, 230, 225, 183, 7, 6, 1, 226, 107, 2, 91, 7, 6, 1, 223, 225, 2, 
+    217, 78, 7, 4, 1, 115, 2, 91, 7, 4, 1, 217, 154, 2, 248, 0, 91, 7, 6, 1, 
+    242, 62, 2, 248, 40, 7, 4, 1, 242, 62, 2, 248, 40, 7, 6, 1, 235, 25, 2, 
+    248, 40, 7, 4, 1, 235, 25, 2, 248, 40, 7, 6, 1, 210, 160, 2, 248, 40, 7, 
+    4, 1, 210, 160, 2, 248, 40, 7, 6, 1, 254, 144, 7, 6, 1, 232, 51, 2, 103, 
+    7, 6, 1, 215, 94, 61, 7, 6, 1, 215, 94, 254, 144, 7, 4, 1, 214, 106, 2, 
+    44, 103, 7, 6, 1, 212, 99, 2, 103, 7, 4, 1, 212, 99, 2, 103, 7, 4, 1, 
+    214, 106, 2, 249, 101, 7, 6, 1, 163, 242, 61, 7, 4, 1, 163, 242, 61, 7, 
+    4, 1, 217, 76, 225, 134, 7, 4, 1, 160, 2, 228, 51, 7, 4, 1, 215, 94, 223, 
+    225, 2, 217, 78, 7, 4, 1, 144, 2, 121, 222, 235, 235, 216, 7, 1, 4, 6, 
+    215, 94, 75, 7, 218, 66, 4, 1, 235, 145, 58, 1, 6, 214, 105, 7, 6, 1, 
+    222, 93, 2, 217, 251, 217, 78, 7, 6, 1, 210, 160, 2, 217, 251, 217, 78, 
+    81, 6, 1, 254, 165, 81, 4, 1, 254, 165, 81, 6, 1, 213, 173, 81, 4, 1, 
+    213, 173, 81, 6, 1, 243, 108, 81, 4, 1, 243, 108, 81, 6, 1, 248, 192, 81, 
+    4, 1, 248, 192, 81, 6, 1, 245, 195, 81, 4, 1, 245, 195, 81, 6, 1, 219, 
+    34, 81, 4, 1, 219, 34, 81, 6, 1, 210, 101, 81, 4, 1, 210, 101, 81, 6, 1, 
+    241, 249, 81, 4, 1, 241, 249, 81, 6, 1, 216, 178, 81, 4, 1, 216, 178, 81, 
+    6, 1, 240, 117, 81, 4, 1, 240, 117, 81, 6, 1, 234, 228, 81, 4, 1, 234, 
+    228, 81, 6, 1, 233, 73, 81, 4, 1, 233, 73, 81, 6, 1, 230, 231, 81, 4, 1, 
+    230, 231, 81, 6, 1, 228, 234, 81, 4, 1, 228, 234, 81, 6, 1, 233, 234, 81, 
+    4, 1, 233, 234, 81, 6, 1, 76, 81, 4, 1, 76, 81, 6, 1, 225, 109, 81, 4, 1, 
+    225, 109, 81, 6, 1, 222, 212, 81, 4, 1, 222, 212, 81, 6, 1, 219, 166, 81, 
+    4, 1, 219, 166, 81, 6, 1, 217, 42, 81, 4, 1, 217, 42, 81, 6, 1, 214, 229, 
+    81, 4, 1, 214, 229, 81, 6, 1, 244, 122, 81, 4, 1, 244, 122, 81, 6, 1, 
+    234, 113, 81, 4, 1, 234, 113, 81, 6, 1, 224, 162, 81, 4, 1, 224, 162, 81, 
+    6, 1, 226, 179, 81, 4, 1, 226, 179, 81, 6, 1, 247, 254, 254, 171, 81, 4, 
+    1, 247, 254, 254, 171, 81, 6, 1, 55, 81, 254, 197, 81, 4, 1, 55, 81, 254, 
+    197, 81, 6, 1, 249, 116, 245, 195, 81, 4, 1, 249, 116, 245, 195, 81, 6, 
+    1, 247, 254, 234, 228, 81, 4, 1, 247, 254, 234, 228, 81, 6, 1, 247, 254, 
+    228, 234, 81, 4, 1, 247, 254, 228, 234, 81, 6, 1, 249, 116, 228, 234, 81, 
+    4, 1, 249, 116, 228, 234, 81, 6, 1, 55, 81, 226, 179, 81, 4, 1, 55, 81, 
+    226, 179, 81, 6, 1, 221, 247, 81, 4, 1, 221, 247, 81, 6, 1, 249, 129, 
+    220, 56, 81, 4, 1, 249, 129, 220, 56, 81, 6, 1, 55, 81, 220, 56, 81, 4, 
+    1, 55, 81, 220, 56, 81, 6, 1, 55, 81, 245, 76, 81, 4, 1, 55, 81, 245, 76, 
+    81, 6, 1, 254, 183, 234, 118, 81, 4, 1, 254, 183, 234, 118, 81, 6, 1, 
+    247, 254, 241, 46, 81, 4, 1, 247, 254, 241, 46, 81, 6, 1, 55, 81, 241, 
+    46, 81, 4, 1, 55, 81, 241, 46, 81, 6, 1, 55, 81, 162, 81, 4, 1, 55, 81, 
+    162, 81, 6, 1, 233, 149, 162, 81, 4, 1, 233, 149, 162, 81, 6, 1, 55, 81, 
+    241, 218, 81, 4, 1, 55, 81, 241, 218, 81, 6, 1, 55, 81, 241, 252, 81, 4, 
+    1, 55, 81, 241, 252, 81, 6, 1, 55, 81, 243, 103, 81, 4, 1, 55, 81, 243, 
+    103, 81, 6, 1, 55, 81, 247, 164, 81, 4, 1, 55, 81, 247, 164, 81, 6, 1, 
+    55, 81, 220, 23, 81, 4, 1, 55, 81, 220, 23, 81, 6, 1, 55, 227, 209, 220, 
+    23, 81, 4, 1, 55, 227, 209, 220, 23, 81, 6, 1, 55, 227, 209, 229, 28, 81, 
+    4, 1, 55, 227, 209, 229, 28, 81, 6, 1, 55, 227, 209, 227, 149, 81, 4, 1, 
+    55, 227, 209, 227, 149, 81, 6, 1, 55, 227, 209, 212, 37, 81, 4, 1, 55, 
+    227, 209, 212, 37, 81, 16, 234, 247, 81, 16, 230, 232, 222, 212, 81, 16, 
+    225, 110, 222, 212, 81, 16, 218, 148, 81, 16, 217, 43, 222, 212, 81, 16, 
+    234, 114, 222, 212, 81, 16, 220, 24, 219, 166, 81, 6, 1, 249, 116, 220, 
+    56, 81, 4, 1, 249, 116, 220, 56, 81, 6, 1, 249, 116, 243, 103, 81, 4, 1, 
+    249, 116, 243, 103, 81, 38, 228, 235, 48, 81, 38, 218, 248, 253, 225, 81, 
+    38, 218, 248, 233, 22, 81, 6, 1, 251, 200, 234, 118, 81, 4, 1, 251, 200, 
+    234, 118, 81, 55, 227, 209, 243, 230, 218, 130, 81, 55, 227, 209, 247, 
+    198, 224, 14, 78, 81, 55, 227, 209, 235, 238, 224, 14, 78, 81, 55, 227, 
+    209, 213, 241, 247, 173, 81, 244, 3, 123, 242, 28, 81, 243, 230, 218, 
+    130, 81, 230, 125, 247, 173, 98, 4, 1, 254, 124, 98, 4, 1, 252, 153, 98, 
+    4, 1, 243, 107, 98, 4, 1, 247, 129, 98, 4, 1, 245, 151, 98, 4, 1, 213, 
+    160, 98, 4, 1, 210, 89, 98, 4, 1, 217, 61, 98, 4, 1, 236, 0, 98, 4, 1, 
+    234, 235, 98, 4, 1, 233, 82, 98, 4, 1, 231, 186, 98, 4, 1, 229, 196, 98, 
+    4, 1, 226, 197, 98, 4, 1, 226, 18, 98, 4, 1, 210, 78, 98, 4, 1, 223, 172, 
+    98, 4, 1, 221, 244, 98, 4, 1, 217, 51, 98, 4, 1, 214, 190, 98, 4, 1, 225, 
+    141, 98, 4, 1, 234, 122, 98, 4, 1, 242, 242, 98, 4, 1, 224, 74, 98, 4, 1, 
+    220, 21, 98, 4, 1, 250, 98, 98, 4, 1, 251, 8, 98, 4, 1, 235, 101, 98, 4, 
+    1, 250, 41, 98, 4, 1, 250, 144, 98, 4, 1, 211, 163, 98, 4, 1, 235, 112, 
+    98, 4, 1, 242, 44, 98, 4, 1, 241, 239, 98, 4, 1, 241, 176, 98, 4, 1, 212, 
+    22, 98, 4, 1, 242, 5, 98, 4, 1, 241, 66, 98, 4, 1, 210, 246, 98, 4, 1, 
+    254, 233, 216, 109, 1, 191, 216, 109, 1, 211, 99, 216, 109, 1, 211, 98, 
+    216, 109, 1, 211, 88, 216, 109, 1, 211, 86, 216, 109, 1, 252, 33, 255, 
+    17, 211, 81, 216, 109, 1, 211, 81, 216, 109, 1, 211, 96, 216, 109, 1, 
+    211, 93, 216, 109, 1, 211, 95, 216, 109, 1, 211, 94, 216, 109, 1, 211, 
+    12, 216, 109, 1, 211, 90, 216, 109, 1, 211, 79, 216, 109, 1, 215, 116, 
+    211, 79, 216, 109, 1, 211, 76, 216, 109, 1, 211, 84, 216, 109, 1, 252, 
+    33, 255, 17, 211, 84, 216, 109, 1, 215, 116, 211, 84, 216, 109, 1, 211, 
+    83, 216, 109, 1, 211, 103, 216, 109, 1, 211, 77, 216, 109, 1, 215, 116, 
+    211, 77, 216, 109, 1, 211, 66, 216, 109, 1, 215, 116, 211, 66, 216, 109, 
+    1, 211, 8, 216, 109, 1, 211, 49, 216, 109, 1, 254, 208, 211, 49, 216, 
+    109, 1, 215, 116, 211, 49, 216, 109, 1, 211, 75, 216, 109, 1, 211, 74, 
+    216, 109, 1, 211, 71, 216, 109, 1, 215, 116, 211, 85, 216, 109, 1, 215, 
+    116, 211, 69, 216, 109, 1, 211, 67, 216, 109, 1, 210, 212, 216, 109, 1, 
+    211, 64, 216, 109, 1, 211, 63, 216, 109, 1, 211, 87, 216, 109, 1, 215, 
+    116, 211, 87, 216, 109, 1, 253, 164, 211, 87, 216, 109, 1, 211, 62, 216, 
+    109, 1, 211, 60, 216, 109, 1, 211, 61, 216, 109, 1, 211, 59, 216, 109, 1, 
+    211, 58, 216, 109, 1, 211, 97, 216, 109, 1, 211, 56, 216, 109, 1, 211, 
+    54, 216, 109, 1, 211, 53, 216, 109, 1, 211, 52, 216, 109, 1, 211, 50, 
+    216, 109, 1, 217, 35, 211, 50, 216, 109, 1, 211, 48, 216, 109, 1, 211, 
+    47, 216, 109, 1, 210, 244, 216, 109, 58, 1, 233, 127, 78, 216, 109, 220, 
+    139, 78, 216, 109, 116, 235, 64, 29, 3, 232, 156, 29, 3, 230, 161, 29, 3, 
+    222, 210, 29, 3, 219, 58, 29, 3, 220, 7, 29, 3, 251, 205, 29, 3, 216, 42, 
+    29, 3, 249, 238, 29, 3, 228, 73, 29, 3, 227, 134, 29, 3, 242, 181, 227, 
+    1, 29, 3, 210, 22, 29, 3, 247, 144, 29, 3, 248, 105, 29, 3, 235, 68, 29, 
+    3, 216, 156, 29, 3, 250, 86, 29, 3, 225, 121, 29, 3, 225, 16, 29, 3, 243, 
+    0, 29, 3, 242, 252, 29, 3, 242, 253, 29, 3, 242, 254, 29, 3, 218, 224, 
+    29, 3, 218, 180, 29, 3, 218, 193, 29, 3, 218, 223, 29, 3, 218, 197, 29, 
+    3, 218, 198, 29, 3, 218, 185, 29, 3, 250, 214, 29, 3, 250, 193, 29, 3, 
+    250, 195, 29, 3, 250, 213, 29, 3, 250, 211, 29, 3, 250, 212, 29, 3, 250, 
+    194, 29, 3, 209, 243, 29, 3, 209, 221, 29, 3, 209, 234, 29, 3, 209, 242, 
+    29, 3, 209, 237, 29, 3, 209, 238, 29, 3, 209, 226, 29, 3, 250, 209, 29, 
+    3, 250, 196, 29, 3, 250, 198, 29, 3, 250, 208, 29, 3, 250, 206, 29, 3, 
+    250, 207, 29, 3, 250, 197, 29, 3, 223, 237, 29, 3, 223, 227, 29, 3, 223, 
+    233, 29, 3, 223, 236, 29, 3, 223, 234, 29, 3, 223, 235, 29, 3, 223, 232, 
+    29, 3, 233, 160, 29, 3, 233, 152, 29, 3, 233, 155, 29, 3, 233, 159, 29, 
+    3, 233, 156, 29, 3, 233, 157, 29, 3, 233, 153, 29, 3, 211, 130, 29, 3, 
+    211, 120, 29, 3, 211, 126, 29, 3, 211, 129, 29, 3, 211, 127, 29, 3, 211, 
+    128, 29, 3, 211, 125, 29, 3, 242, 72, 29, 3, 242, 63, 29, 3, 242, 66, 29, 
+    3, 242, 71, 29, 3, 242, 68, 29, 3, 242, 69, 29, 3, 242, 65, 38, 33, 1, 
+    252, 76, 38, 33, 1, 213, 255, 38, 33, 1, 242, 237, 38, 33, 1, 248, 91, 
+    38, 33, 1, 210, 74, 38, 33, 1, 210, 94, 38, 33, 1, 176, 38, 33, 1, 245, 
+    175, 38, 33, 1, 245, 160, 38, 33, 1, 245, 151, 38, 33, 1, 76, 38, 33, 1, 
+    225, 222, 38, 33, 1, 245, 93, 38, 33, 1, 245, 83, 38, 33, 1, 217, 23, 38, 
+    33, 1, 162, 38, 33, 1, 215, 179, 38, 33, 1, 250, 132, 38, 33, 1, 220, 
+    103, 38, 33, 1, 220, 66, 38, 33, 1, 244, 83, 38, 33, 1, 245, 82, 38, 33, 
+    1, 61, 38, 33, 1, 236, 61, 38, 33, 1, 247, 162, 38, 33, 1, 230, 141, 214, 
+    205, 38, 33, 1, 211, 59, 38, 33, 1, 210, 212, 38, 33, 1, 235, 184, 61, 
+    38, 33, 1, 232, 193, 210, 183, 38, 33, 1, 251, 250, 210, 183, 38, 33, 1, 
+    235, 184, 251, 250, 210, 183, 44, 254, 111, 218, 61, 231, 155, 44, 254, 
+    111, 246, 119, 218, 61, 231, 155, 43, 218, 61, 127, 44, 218, 61, 127, 43, 
+    246, 119, 218, 61, 127, 44, 246, 119, 218, 61, 127, 223, 158, 235, 203, 
+    231, 155, 223, 158, 246, 119, 235, 203, 231, 155, 246, 119, 215, 242, 
+    231, 155, 43, 215, 242, 127, 44, 215, 242, 127, 223, 158, 218, 235, 43, 
+    223, 158, 226, 199, 127, 44, 223, 158, 226, 199, 127, 245, 211, 249, 159, 
+    226, 14, 244, 23, 226, 14, 223, 50, 244, 23, 226, 14, 240, 166, 246, 119, 
+    226, 252, 246, 105, 254, 120, 214, 153, 254, 120, 246, 119, 222, 248, 
+    254, 110, 52, 226, 249, 240, 169, 235, 194, 235, 202, 226, 60, 251, 155, 
+    240, 170, 2, 248, 2, 216, 90, 2, 222, 235, 48, 43, 121, 226, 6, 127, 44, 
+    121, 226, 6, 127, 216, 90, 2, 59, 48, 216, 90, 2, 59, 51, 43, 67, 252, 
+    142, 2, 224, 8, 44, 67, 252, 142, 2, 224, 8, 216, 15, 43, 163, 127, 216, 
+    15, 44, 163, 127, 251, 176, 43, 163, 127, 251, 176, 44, 163, 127, 43, 
+    219, 188, 104, 127, 44, 219, 188, 104, 127, 43, 52, 226, 4, 44, 52, 226, 
+    4, 113, 170, 117, 123, 59, 224, 141, 123, 59, 117, 113, 170, 224, 141, 
+    92, 244, 12, 59, 224, 141, 244, 82, 59, 78, 223, 50, 224, 14, 78, 67, 
+    183, 222, 235, 225, 11, 211, 209, 220, 139, 230, 225, 247, 121, 215, 94, 
+    249, 220, 223, 158, 247, 121, 223, 158, 249, 220, 215, 94, 220, 151, 248, 
+    207, 2, 43, 242, 109, 248, 207, 2, 44, 242, 109, 215, 94, 248, 206, 216, 
+    15, 163, 221, 174, 50, 215, 59, 248, 157, 216, 144, 248, 157, 9, 34, 223, 
+    77, 9, 34, 250, 11, 9, 34, 221, 177, 110, 9, 34, 221, 177, 105, 9, 34, 
+    221, 177, 158, 9, 34, 225, 168, 9, 34, 251, 164, 9, 34, 217, 93, 9, 34, 
+    234, 34, 110, 9, 34, 234, 34, 105, 9, 34, 247, 171, 9, 34, 221, 180, 9, 
+    34, 4, 110, 9, 34, 4, 105, 9, 34, 233, 98, 110, 9, 34, 233, 98, 105, 9, 
+    34, 233, 98, 158, 9, 34, 233, 98, 161, 9, 34, 219, 69, 9, 34, 216, 146, 
+    9, 34, 219, 67, 110, 9, 34, 219, 67, 105, 9, 34, 241, 229, 110, 9, 34, 
+    241, 229, 105, 9, 34, 242, 16, 9, 34, 223, 148, 9, 34, 250, 83, 9, 34, 
+    218, 38, 9, 34, 230, 129, 9, 34, 248, 89, 9, 34, 230, 121, 9, 34, 250, 
+    26, 9, 34, 212, 41, 110, 9, 34, 212, 41, 105, 9, 34, 244, 97, 9, 34, 225, 
+    233, 110, 9, 34, 225, 233, 105, 9, 34, 219, 161, 163, 215, 237, 215, 189, 
+    9, 34, 249, 146, 9, 34, 247, 137, 9, 34, 235, 138, 9, 34, 251, 199, 64, 
+    249, 251, 9, 34, 245, 16, 9, 34, 218, 250, 110, 9, 34, 218, 250, 105, 9, 
+    34, 252, 155, 9, 34, 219, 168, 9, 34, 251, 64, 219, 168, 9, 34, 229, 91, 
+    110, 9, 34, 229, 91, 105, 9, 34, 229, 91, 158, 9, 34, 229, 91, 161, 9, 
+    34, 231, 47, 9, 34, 220, 58, 9, 34, 223, 154, 9, 34, 245, 38, 9, 34, 226, 
+    210, 9, 34, 251, 134, 110, 9, 34, 251, 134, 105, 9, 34, 231, 87, 9, 34, 
+    230, 124, 9, 34, 242, 141, 110, 9, 34, 242, 141, 105, 9, 34, 242, 141, 
+    158, 9, 34, 216, 107, 9, 34, 249, 250, 9, 34, 212, 9, 110, 9, 34, 212, 9, 
+    105, 9, 34, 251, 64, 221, 171, 9, 34, 219, 161, 240, 249, 9, 34, 240, 
+    249, 9, 34, 251, 64, 219, 3, 9, 34, 251, 64, 220, 53, 9, 34, 244, 33, 9, 
+    34, 251, 64, 250, 229, 9, 34, 219, 161, 212, 57, 9, 34, 212, 58, 110, 9, 
+    34, 212, 58, 105, 9, 34, 250, 28, 9, 34, 251, 64, 242, 167, 9, 34, 199, 
+    110, 9, 34, 199, 105, 9, 34, 251, 64, 232, 138, 9, 34, 251, 64, 243, 89, 
+    9, 34, 230, 120, 110, 9, 34, 230, 120, 105, 9, 34, 223, 160, 9, 34, 251, 
+    208, 9, 34, 251, 64, 217, 57, 233, 53, 9, 34, 251, 64, 233, 54, 9, 34, 
+    251, 64, 211, 239, 9, 34, 251, 64, 244, 47, 9, 34, 245, 219, 110, 9, 34, 
+    245, 219, 105, 9, 34, 245, 219, 158, 9, 34, 251, 64, 245, 218, 9, 34, 
+    241, 236, 9, 34, 251, 64, 240, 246, 9, 34, 251, 195, 9, 34, 242, 223, 9, 
+    34, 251, 64, 244, 91, 9, 34, 251, 64, 251, 238, 9, 34, 251, 64, 222, 2, 
+    9, 34, 219, 161, 212, 2, 9, 34, 219, 161, 211, 41, 9, 34, 251, 64, 243, 
+    245, 9, 34, 235, 144, 245, 42, 9, 34, 251, 64, 245, 42, 9, 34, 235, 144, 
+    216, 16, 9, 34, 251, 64, 216, 16, 9, 34, 235, 144, 246, 97, 9, 34, 251, 
+    64, 246, 97, 9, 34, 215, 91, 9, 34, 235, 144, 215, 91, 9, 34, 251, 64, 
+    215, 91, 60, 34, 110, 60, 34, 232, 214, 60, 34, 247, 121, 60, 34, 219, 
+    96, 60, 34, 221, 176, 60, 34, 103, 60, 34, 105, 60, 34, 232, 238, 60, 34, 
+    231, 186, 60, 34, 233, 34, 60, 34, 245, 130, 60, 34, 195, 60, 34, 124, 
+    251, 164, 60, 34, 249, 148, 60, 34, 240, 112, 60, 34, 217, 93, 60, 34, 
+    204, 251, 164, 60, 34, 234, 33, 60, 34, 224, 225, 60, 34, 211, 202, 60, 
+    34, 218, 244, 60, 34, 44, 204, 251, 164, 60, 34, 241, 177, 245, 146, 60, 
+    34, 216, 248, 60, 34, 247, 171, 60, 34, 221, 180, 60, 34, 250, 11, 60, 
+    34, 224, 183, 60, 34, 254, 216, 60, 34, 230, 111, 60, 34, 245, 146, 60, 
+    34, 245, 224, 60, 34, 221, 201, 60, 34, 242, 175, 60, 34, 242, 176, 219, 
+    82, 60, 34, 245, 41, 60, 34, 251, 249, 60, 34, 211, 221, 60, 34, 250, 
+    102, 60, 34, 222, 197, 60, 34, 235, 252, 60, 34, 219, 80, 60, 34, 233, 
+    97, 60, 34, 249, 157, 60, 34, 218, 238, 60, 34, 230, 116, 60, 34, 222, 
+    225, 60, 34, 211, 206, 60, 34, 226, 191, 60, 34, 215, 98, 60, 34, 246, 
+    81, 60, 34, 219, 252, 216, 146, 60, 34, 246, 119, 250, 11, 60, 34, 199, 
+    218, 109, 60, 34, 113, 242, 11, 60, 34, 220, 1, 60, 34, 251, 170, 60, 34, 
+    219, 66, 60, 34, 251, 138, 60, 34, 218, 139, 60, 34, 241, 228, 60, 34, 
+    242, 29, 60, 34, 247, 124, 60, 34, 242, 16, 60, 34, 251, 155, 60, 34, 
+    223, 148, 60, 34, 221, 188, 60, 34, 247, 200, 60, 34, 253, 169, 60, 34, 
+    218, 235, 60, 34, 228, 52, 60, 34, 218, 38, 60, 34, 221, 212, 60, 34, 
+    230, 129, 60, 34, 215, 236, 60, 34, 233, 123, 60, 34, 218, 130, 60, 34, 
+    248, 89, 60, 34, 212, 21, 60, 34, 247, 147, 228, 52, 60, 34, 249, 216, 
+    60, 34, 243, 223, 60, 34, 250, 22, 60, 34, 218, 143, 60, 34, 212, 40, 60, 
+    34, 244, 97, 60, 34, 250, 19, 60, 34, 244, 162, 60, 34, 52, 211, 178, 60, 
+    34, 163, 215, 237, 215, 189, 60, 34, 219, 90, 60, 34, 244, 172, 60, 34, 
+    249, 146, 60, 34, 247, 137, 60, 34, 224, 180, 60, 34, 235, 138, 60, 34, 
+    231, 68, 60, 34, 216, 89, 60, 34, 217, 246, 60, 34, 232, 232, 60, 34, 
+    214, 131, 60, 34, 244, 121, 60, 34, 251, 199, 64, 249, 251, 60, 34, 219, 
+    189, 60, 34, 246, 119, 216, 243, 60, 34, 211, 253, 60, 34, 219, 104, 60, 
+    34, 247, 188, 60, 34, 245, 16, 60, 34, 219, 6, 60, 34, 74, 60, 34, 218, 
+    132, 60, 34, 218, 249, 60, 34, 216, 0, 60, 34, 242, 148, 60, 34, 250, 
+    219, 60, 34, 218, 161, 60, 34, 252, 155, 60, 34, 223, 32, 60, 34, 219, 
+    168, 60, 34, 235, 131, 60, 34, 229, 90, 60, 34, 220, 58, 60, 34, 244, 
+    150, 60, 34, 226, 210, 60, 34, 254, 119, 60, 34, 225, 30, 60, 34, 245, 
+    228, 60, 34, 251, 133, 60, 34, 231, 87, 60, 34, 230, 184, 60, 34, 220, 
+    157, 60, 34, 253, 253, 60, 34, 230, 124, 60, 34, 216, 20, 60, 34, 226, 
+    166, 60, 34, 251, 202, 60, 34, 218, 128, 60, 34, 249, 226, 60, 34, 242, 
+    140, 60, 34, 216, 107, 60, 34, 235, 218, 60, 34, 251, 212, 60, 34, 212, 
+    58, 245, 146, 60, 34, 249, 250, 60, 34, 212, 8, 60, 34, 221, 171, 60, 34, 
+    240, 249, 60, 34, 219, 3, 60, 34, 214, 22, 60, 34, 252, 73, 60, 34, 225, 
+    74, 60, 34, 252, 175, 60, 34, 220, 53, 60, 34, 223, 111, 60, 34, 222, 
+    127, 60, 34, 244, 33, 60, 34, 251, 201, 60, 34, 250, 229, 60, 34, 251, 
+    227, 60, 34, 230, 126, 60, 34, 212, 57, 60, 34, 250, 28, 60, 34, 211, 
+    236, 60, 34, 247, 181, 60, 34, 213, 161, 60, 34, 242, 167, 60, 34, 232, 
+    138, 60, 34, 243, 89, 60, 34, 230, 119, 60, 34, 219, 95, 60, 34, 219, 
+    252, 217, 77, 251, 238, 60, 34, 223, 160, 60, 34, 251, 208, 60, 34, 211, 
+    197, 60, 34, 244, 191, 60, 34, 233, 53, 60, 34, 217, 57, 233, 53, 60, 34, 
+    233, 49, 60, 34, 219, 31, 60, 34, 233, 54, 60, 34, 211, 239, 60, 34, 244, 
+    47, 60, 34, 245, 218, 60, 34, 241, 236, 60, 34, 244, 1, 60, 34, 240, 246, 
+    60, 34, 251, 195, 60, 34, 217, 64, 60, 34, 242, 35, 60, 34, 244, 114, 60, 
+    34, 222, 29, 211, 236, 60, 34, 250, 221, 60, 34, 242, 223, 60, 34, 244, 
+    91, 60, 34, 251, 238, 60, 34, 222, 2, 60, 34, 248, 75, 60, 34, 212, 2, 
+    60, 34, 241, 211, 60, 34, 211, 41, 60, 34, 230, 193, 60, 34, 251, 222, 
+    60, 34, 245, 156, 60, 34, 243, 245, 60, 34, 215, 210, 60, 34, 246, 83, 
+    60, 34, 223, 142, 60, 34, 228, 54, 60, 34, 245, 42, 60, 34, 216, 16, 60, 
+    34, 246, 97, 60, 34, 215, 91, 60, 34, 244, 49, 109, 248, 38, 135, 43, 
+    216, 43, 222, 252, 109, 248, 38, 135, 77, 216, 43, 51, 109, 248, 38, 135, 
+    43, 216, 43, 230, 225, 22, 222, 252, 109, 248, 38, 135, 77, 216, 43, 230, 
+    225, 22, 51, 109, 248, 38, 135, 243, 230, 218, 11, 109, 248, 38, 135, 
+    218, 12, 243, 244, 48, 109, 248, 38, 135, 218, 12, 243, 244, 51, 109, 
+    248, 38, 135, 218, 12, 243, 244, 233, 47, 109, 248, 38, 135, 218, 12, 
+    243, 244, 214, 160, 233, 47, 109, 248, 38, 135, 218, 12, 243, 244, 214, 
+    160, 222, 252, 109, 248, 38, 135, 218, 12, 243, 244, 232, 109, 233, 47, 
+    109, 248, 38, 135, 226, 123, 109, 219, 19, 109, 249, 220, 109, 243, 230, 
+    218, 130, 247, 178, 78, 235, 132, 235, 237, 218, 160, 87, 109, 235, 159, 
+    78, 109, 249, 253, 78, 109, 54, 210, 86, 43, 254, 111, 127, 44, 254, 111, 
+    127, 43, 52, 254, 111, 127, 44, 52, 254, 111, 127, 43, 249, 162, 127, 44, 
+    249, 162, 127, 43, 71, 249, 162, 127, 44, 71, 249, 162, 127, 43, 85, 233, 
+    21, 127, 44, 85, 233, 21, 127, 224, 238, 78, 243, 33, 78, 43, 216, 7, 
+    220, 54, 127, 44, 216, 7, 220, 54, 127, 43, 71, 233, 21, 127, 44, 71, 
+    233, 21, 127, 43, 71, 216, 7, 220, 54, 127, 44, 71, 216, 7, 220, 54, 127, 
+    43, 71, 42, 127, 44, 71, 42, 127, 212, 36, 248, 157, 223, 50, 52, 224, 
+    192, 223, 255, 78, 52, 224, 192, 223, 255, 78, 121, 52, 224, 192, 223, 
+    255, 78, 224, 238, 164, 244, 191, 242, 9, 227, 199, 110, 242, 9, 227, 
+    199, 105, 242, 9, 227, 199, 158, 242, 9, 227, 199, 161, 242, 9, 227, 199, 
+    189, 242, 9, 227, 199, 194, 242, 9, 227, 199, 198, 242, 9, 227, 199, 195, 
+    242, 9, 227, 199, 200, 109, 233, 4, 138, 78, 109, 222, 229, 138, 78, 109, 
+    248, 45, 138, 78, 109, 245, 129, 138, 78, 24, 219, 156, 59, 138, 78, 24, 
+    52, 59, 138, 78, 212, 32, 248, 157, 67, 234, 234, 223, 78, 78, 67, 234, 
+    234, 223, 78, 2, 213, 135, 219, 32, 78, 67, 234, 234, 223, 78, 164, 214, 
+    160, 242, 28, 67, 234, 234, 223, 78, 2, 213, 135, 219, 32, 164, 214, 160, 
+    242, 28, 67, 234, 234, 223, 78, 164, 232, 109, 242, 28, 37, 224, 238, 78, 
+    109, 217, 4, 232, 215, 244, 147, 220, 139, 87, 242, 9, 227, 199, 216, 
+    248, 242, 9, 227, 199, 215, 73, 242, 9, 227, 199, 216, 163, 67, 109, 235, 
+    159, 78, 231, 141, 78, 226, 0, 254, 141, 78, 109, 45, 235, 239, 109, 163, 
+    244, 107, 219, 19, 141, 1, 4, 61, 141, 1, 61, 141, 1, 4, 73, 141, 1, 73, 
+    141, 1, 4, 70, 141, 1, 70, 141, 1, 4, 75, 141, 1, 75, 141, 1, 4, 76, 141, 
+    1, 76, 141, 1, 176, 141, 1, 243, 136, 141, 1, 234, 93, 141, 1, 242, 215, 
+    141, 1, 233, 218, 141, 1, 242, 114, 141, 1, 234, 183, 141, 1, 243, 63, 
+    141, 1, 234, 29, 141, 1, 242, 175, 141, 1, 206, 141, 1, 210, 116, 141, 1, 
+    219, 192, 141, 1, 210, 44, 141, 1, 218, 84, 141, 1, 210, 13, 141, 1, 221, 
+    182, 141, 1, 210, 94, 141, 1, 219, 59, 141, 1, 210, 23, 141, 1, 217, 106, 
+    141, 1, 248, 222, 141, 1, 216, 118, 141, 1, 248, 4, 141, 1, 4, 215, 119, 
+    141, 1, 215, 119, 141, 1, 246, 79, 141, 1, 217, 23, 141, 1, 248, 91, 141, 
+    1, 111, 141, 1, 247, 146, 141, 1, 197, 141, 1, 228, 234, 141, 1, 227, 
+    238, 141, 1, 229, 108, 141, 1, 228, 75, 141, 1, 162, 141, 1, 252, 192, 
+    141, 1, 190, 141, 1, 241, 181, 141, 1, 252, 7, 141, 1, 225, 109, 141, 1, 
+    240, 223, 141, 1, 251, 126, 141, 1, 224, 151, 141, 1, 241, 239, 141, 1, 
+    252, 76, 141, 1, 225, 222, 141, 1, 241, 69, 141, 1, 251, 206, 141, 1, 
+    225, 17, 141, 1, 185, 141, 1, 230, 231, 141, 1, 230, 103, 141, 1, 231, 
+    92, 141, 1, 230, 162, 141, 1, 4, 191, 141, 1, 191, 141, 1, 4, 210, 212, 
+    141, 1, 210, 212, 141, 1, 4, 210, 244, 141, 1, 210, 244, 141, 1, 205, 
+    141, 1, 223, 36, 141, 1, 222, 141, 141, 1, 223, 129, 141, 1, 222, 212, 
+    141, 1, 4, 212, 65, 141, 1, 212, 65, 141, 1, 211, 250, 141, 1, 212, 22, 
+    141, 1, 211, 227, 141, 1, 230, 26, 141, 1, 212, 116, 141, 1, 4, 176, 141, 
+    1, 4, 234, 183, 38, 234, 202, 213, 135, 219, 32, 78, 38, 234, 202, 220, 
+    156, 219, 32, 78, 234, 202, 213, 135, 219, 32, 78, 234, 202, 220, 156, 
+    219, 32, 78, 141, 235, 159, 78, 141, 213, 135, 235, 159, 78, 141, 247, 
+    222, 210, 225, 234, 202, 52, 240, 169, 56, 1, 4, 61, 56, 1, 61, 56, 1, 4, 
+    73, 56, 1, 73, 56, 1, 4, 70, 56, 1, 70, 56, 1, 4, 75, 56, 1, 75, 56, 1, 
+    4, 76, 56, 1, 76, 56, 1, 176, 56, 1, 243, 136, 56, 1, 234, 93, 56, 1, 
+    242, 215, 56, 1, 233, 218, 56, 1, 242, 114, 56, 1, 234, 183, 56, 1, 243, 
+    63, 56, 1, 234, 29, 56, 1, 242, 175, 56, 1, 206, 56, 1, 210, 116, 56, 1, 
+    219, 192, 56, 1, 210, 44, 56, 1, 218, 84, 56, 1, 210, 13, 56, 1, 221, 
+    182, 56, 1, 210, 94, 56, 1, 219, 59, 56, 1, 210, 23, 56, 1, 217, 106, 56, 
+    1, 248, 222, 56, 1, 216, 118, 56, 1, 248, 4, 56, 1, 4, 215, 119, 56, 1, 
+    215, 119, 56, 1, 246, 79, 56, 1, 217, 23, 56, 1, 248, 91, 56, 1, 111, 56, 
+    1, 247, 146, 56, 1, 197, 56, 1, 228, 234, 56, 1, 227, 238, 56, 1, 229, 
+    108, 56, 1, 228, 75, 56, 1, 162, 56, 1, 252, 192, 56, 1, 190, 56, 1, 241, 
+    181, 56, 1, 252, 7, 56, 1, 225, 109, 56, 1, 240, 223, 56, 1, 251, 126, 
+    56, 1, 224, 151, 56, 1, 241, 239, 56, 1, 252, 76, 56, 1, 225, 222, 56, 1, 
+    241, 69, 56, 1, 251, 206, 56, 1, 225, 17, 56, 1, 185, 56, 1, 230, 231, 
+    56, 1, 230, 103, 56, 1, 231, 92, 56, 1, 230, 162, 56, 1, 4, 191, 56, 1, 
+    191, 56, 1, 4, 210, 212, 56, 1, 210, 212, 56, 1, 4, 210, 244, 56, 1, 210, 
+    244, 56, 1, 205, 56, 1, 223, 36, 56, 1, 222, 141, 56, 1, 223, 129, 56, 1, 
+    222, 212, 56, 1, 4, 212, 65, 56, 1, 212, 65, 56, 1, 211, 250, 56, 1, 212, 
+    22, 56, 1, 211, 227, 56, 1, 230, 26, 56, 1, 212, 116, 56, 1, 4, 176, 56, 
+    1, 4, 234, 183, 56, 1, 214, 27, 56, 1, 213, 176, 56, 1, 213, 255, 56, 1, 
+    213, 138, 56, 230, 225, 247, 121, 234, 202, 224, 174, 219, 32, 78, 56, 
+    235, 159, 78, 56, 213, 135, 235, 159, 78, 56, 247, 222, 234, 0, 251, 185, 
+    1, 253, 159, 251, 185, 1, 226, 106, 251, 185, 1, 193, 251, 185, 1, 245, 
+    7, 251, 185, 1, 249, 61, 251, 185, 1, 217, 153, 251, 185, 1, 230, 26, 
+    251, 185, 1, 156, 251, 185, 1, 243, 203, 251, 185, 1, 235, 24, 251, 185, 
+    1, 242, 61, 251, 185, 1, 235, 145, 251, 185, 1, 224, 97, 251, 185, 1, 
+    211, 178, 251, 185, 1, 210, 83, 251, 185, 1, 250, 159, 251, 185, 1, 220, 
+    105, 251, 185, 1, 153, 251, 185, 1, 210, 159, 251, 185, 1, 251, 67, 251, 
+    185, 1, 222, 92, 251, 185, 1, 61, 251, 185, 1, 76, 251, 185, 1, 75, 251, 
+    185, 1, 245, 198, 251, 185, 1, 254, 202, 251, 185, 1, 245, 196, 251, 185, 
+    1, 253, 193, 251, 185, 1, 226, 135, 251, 185, 1, 254, 124, 251, 185, 1, 
+    245, 151, 251, 185, 1, 254, 116, 251, 185, 1, 245, 139, 251, 185, 1, 245, 
+    93, 251, 185, 1, 73, 251, 185, 1, 70, 251, 185, 1, 235, 157, 251, 185, 1, 
+    214, 105, 251, 185, 1, 229, 80, 251, 185, 1, 242, 179, 251, 185, 1, 236, 
+    35, 24, 1, 234, 59, 24, 1, 218, 216, 24, 1, 234, 52, 24, 1, 228, 227, 24, 
+    1, 228, 225, 24, 1, 228, 224, 24, 1, 216, 102, 24, 1, 218, 205, 24, 1, 
+    223, 27, 24, 1, 223, 22, 24, 1, 223, 19, 24, 1, 223, 12, 24, 1, 223, 7, 
+    24, 1, 223, 2, 24, 1, 223, 13, 24, 1, 223, 25, 24, 1, 230, 218, 24, 1, 
+    225, 96, 24, 1, 218, 213, 24, 1, 225, 85, 24, 1, 219, 149, 24, 1, 218, 
+    210, 24, 1, 236, 57, 24, 1, 250, 47, 24, 1, 218, 220, 24, 1, 250, 107, 
+    24, 1, 234, 111, 24, 1, 216, 174, 24, 1, 225, 132, 24, 1, 241, 173, 24, 
+    1, 61, 24, 1, 254, 244, 24, 1, 191, 24, 1, 211, 92, 24, 1, 245, 118, 24, 
+    1, 75, 24, 1, 211, 36, 24, 1, 211, 47, 24, 1, 76, 24, 1, 212, 65, 24, 1, 
+    212, 62, 24, 1, 226, 235, 24, 1, 210, 244, 24, 1, 70, 24, 1, 212, 11, 24, 
+    1, 212, 22, 24, 1, 211, 250, 24, 1, 210, 212, 24, 1, 245, 56, 24, 1, 211, 
+    8, 24, 1, 73, 24, 244, 104, 24, 1, 218, 214, 24, 1, 228, 217, 24, 1, 228, 
+    219, 24, 1, 228, 222, 24, 1, 223, 20, 24, 1, 223, 1, 24, 1, 223, 9, 24, 
+    1, 223, 14, 24, 1, 222, 255, 24, 1, 230, 211, 24, 1, 230, 208, 24, 1, 
+    230, 212, 24, 1, 234, 222, 24, 1, 225, 91, 24, 1, 225, 77, 24, 1, 225, 
+    83, 24, 1, 225, 80, 24, 1, 225, 94, 24, 1, 225, 78, 24, 1, 234, 220, 24, 
+    1, 234, 218, 24, 1, 219, 142, 24, 1, 219, 140, 24, 1, 219, 132, 24, 1, 
+    219, 137, 24, 1, 219, 147, 24, 1, 226, 33, 24, 1, 218, 217, 24, 1, 211, 
+    26, 24, 1, 211, 22, 24, 1, 211, 23, 24, 1, 234, 221, 24, 1, 218, 218, 24, 
     1, 211, 32, 24, 1, 210, 238, 24, 1, 210, 237, 24, 1, 210, 240, 24, 1, 
-    210, 203, 24, 1, 210, 204, 24, 1, 210, 207, 24, 1, 254, 34, 24, 1, 254, 
-    28, 109, 254, 99, 232, 203, 78, 109, 254, 99, 223, 50, 78, 109, 254, 99, 
-    123, 78, 109, 254, 99, 113, 78, 109, 254, 99, 134, 78, 109, 254, 99, 244, 
-    11, 78, 109, 254, 99, 216, 14, 78, 109, 254, 99, 230, 224, 78, 109, 254, 
-    99, 251, 175, 78, 109, 254, 99, 244, 92, 78, 109, 254, 99, 221, 176, 78, 
-    109, 254, 99, 216, 169, 78, 109, 254, 99, 244, 4, 78, 109, 254, 99, 241, 
-    224, 78, 109, 254, 99, 245, 224, 78, 109, 254, 99, 231, 186, 78, 251, 
-    184, 1, 251, 125, 251, 184, 1, 210, 44, 251, 184, 1, 235, 108, 251, 184, 
-    1, 242, 113, 251, 184, 1, 245, 209, 251, 184, 1, 245, 135, 251, 184, 1, 
-    226, 183, 251, 184, 1, 226, 187, 251, 184, 1, 235, 179, 251, 184, 1, 254, 
-    101, 251, 184, 1, 235, 224, 251, 184, 1, 214, 168, 251, 184, 1, 236, 16, 
-    251, 184, 1, 229, 57, 251, 184, 1, 254, 195, 251, 184, 1, 253, 187, 251, 
-    184, 1, 254, 136, 251, 184, 1, 226, 204, 251, 184, 1, 226, 189, 251, 184, 
-    1, 235, 221, 251, 184, 40, 1, 226, 105, 251, 184, 40, 1, 217, 152, 251, 
-    184, 40, 1, 235, 23, 251, 184, 40, 1, 242, 60, 251, 184, 1, 242, 250, 
-    251, 184, 1, 232, 255, 251, 184, 1, 209, 250, 9, 218, 103, 217, 152, 9, 
-    218, 103, 212, 4, 9, 218, 103, 211, 158, 9, 218, 103, 251, 79, 9, 218, 
-    103, 217, 254, 9, 218, 103, 240, 158, 9, 218, 103, 240, 162, 9, 218, 103, 
-    240, 231, 9, 218, 103, 240, 159, 9, 218, 103, 217, 155, 9, 218, 103, 240, 
-    161, 9, 218, 103, 240, 157, 9, 218, 103, 240, 229, 9, 218, 103, 240, 160, 
-    9, 218, 103, 240, 156, 9, 218, 103, 230, 25, 9, 218, 103, 242, 60, 9, 
-    218, 103, 222, 91, 9, 218, 103, 226, 105, 9, 218, 103, 219, 21, 9, 218, 
-    103, 249, 60, 9, 218, 103, 240, 163, 9, 218, 103, 241, 190, 9, 218, 103, 
-    217, 164, 9, 218, 103, 217, 233, 9, 218, 103, 218, 168, 9, 218, 103, 220, 
-    110, 9, 218, 103, 225, 224, 9, 218, 103, 224, 98, 9, 218, 103, 216, 43, 
-    9, 218, 103, 217, 154, 9, 218, 103, 217, 244, 9, 218, 103, 240, 170, 9, 
-    218, 103, 240, 155, 9, 218, 103, 225, 149, 9, 218, 103, 224, 96, 56, 1, 
-    4, 233, 217, 56, 1, 4, 219, 191, 56, 1, 4, 218, 83, 56, 1, 4, 111, 56, 1, 
-    4, 227, 237, 56, 1, 4, 162, 56, 1, 4, 241, 180, 56, 1, 4, 240, 222, 56, 
-    1, 4, 241, 238, 56, 1, 4, 241, 68, 56, 1, 4, 230, 102, 56, 1, 4, 205, 56, 
-    1, 4, 223, 35, 56, 1, 4, 222, 140, 56, 1, 4, 223, 128, 56, 1, 4, 222, 
-    211, 88, 24, 234, 58, 88, 24, 228, 226, 88, 24, 216, 101, 88, 24, 223, 
-    26, 88, 24, 230, 217, 88, 24, 225, 95, 88, 24, 219, 148, 88, 24, 236, 56, 
-    88, 24, 250, 46, 88, 24, 250, 106, 88, 24, 234, 110, 88, 24, 216, 173, 
-    88, 24, 225, 131, 88, 24, 241, 172, 88, 24, 234, 59, 61, 88, 24, 228, 
-    227, 61, 88, 24, 216, 102, 61, 88, 24, 223, 27, 61, 88, 24, 230, 218, 61, 
-    88, 24, 225, 96, 61, 88, 24, 219, 149, 61, 88, 24, 236, 57, 61, 88, 24, 
-    250, 47, 61, 88, 24, 250, 107, 61, 88, 24, 234, 111, 61, 88, 24, 216, 
-    174, 61, 88, 24, 225, 132, 61, 88, 24, 241, 173, 61, 88, 24, 250, 47, 70, 
-    88, 234, 3, 135, 226, 217, 88, 234, 3, 135, 144, 240, 222, 88, 154, 110, 
-    88, 154, 105, 88, 154, 158, 88, 154, 161, 88, 154, 189, 88, 154, 194, 88, 
-    154, 198, 88, 154, 195, 88, 154, 200, 88, 154, 216, 247, 88, 154, 230, 
-    128, 88, 154, 244, 96, 88, 154, 212, 40, 88, 154, 211, 214, 88, 154, 231, 
-    39, 88, 154, 245, 223, 88, 154, 218, 37, 88, 154, 218, 132, 88, 154, 241, 
-    244, 88, 154, 219, 54, 88, 154, 229, 204, 88, 154, 219, 4, 88, 154, 244, 
-    102, 88, 154, 249, 200, 88, 154, 233, 125, 88, 154, 223, 71, 88, 154, 
-    251, 15, 88, 154, 218, 87, 88, 154, 218, 20, 88, 154, 245, 127, 88, 154, 
-    223, 63, 88, 154, 254, 150, 88, 154, 244, 128, 88, 154, 223, 61, 88, 154, 
-    220, 156, 88, 154, 223, 127, 37, 154, 224, 12, 37, 154, 234, 80, 37, 154, 
-    221, 198, 37, 154, 233, 255, 37, 54, 216, 248, 226, 197, 85, 218, 234, 
-    37, 54, 215, 74, 226, 197, 85, 218, 234, 37, 54, 216, 163, 226, 197, 85, 
-    218, 234, 37, 54, 244, 16, 226, 197, 85, 218, 234, 37, 54, 244, 115, 226, 
-    197, 85, 218, 234, 37, 54, 219, 112, 226, 197, 85, 218, 234, 37, 54, 220, 
-    117, 226, 197, 85, 218, 234, 37, 54, 245, 185, 226, 197, 85, 218, 234, 
-    225, 251, 50, 37, 54, 215, 74, 110, 37, 54, 215, 74, 105, 37, 54, 215, 
-    74, 158, 37, 54, 215, 74, 161, 37, 54, 215, 74, 189, 37, 54, 215, 74, 
-    194, 37, 54, 215, 74, 198, 37, 54, 215, 74, 195, 37, 54, 215, 74, 200, 
-    37, 54, 216, 162, 37, 54, 216, 163, 110, 37, 54, 216, 163, 105, 37, 54, 
-    216, 163, 158, 37, 54, 216, 163, 161, 37, 54, 216, 163, 189, 37, 24, 234, 
-    58, 37, 24, 228, 226, 37, 24, 216, 101, 37, 24, 223, 26, 37, 24, 230, 
-    217, 37, 24, 225, 95, 37, 24, 219, 148, 37, 24, 236, 56, 37, 24, 250, 46, 
-    37, 24, 250, 106, 37, 24, 234, 110, 37, 24, 216, 173, 37, 24, 225, 131, 
-    37, 24, 241, 172, 37, 24, 234, 59, 61, 37, 24, 228, 227, 61, 37, 24, 216, 
-    102, 61, 37, 24, 223, 27, 61, 37, 24, 230, 218, 61, 37, 24, 225, 96, 61, 
-    37, 24, 219, 149, 61, 37, 24, 236, 57, 61, 37, 24, 250, 47, 61, 37, 24, 
-    250, 107, 61, 37, 24, 234, 111, 61, 37, 24, 216, 174, 61, 37, 24, 225, 
-    132, 61, 37, 24, 241, 173, 61, 37, 234, 3, 135, 250, 148, 37, 234, 3, 
-    135, 235, 47, 37, 24, 236, 57, 70, 234, 3, 218, 159, 87, 37, 154, 110, 
-    37, 154, 105, 37, 154, 158, 37, 154, 161, 37, 154, 189, 37, 154, 194, 37, 
-    154, 198, 37, 154, 195, 37, 154, 200, 37, 154, 216, 247, 37, 154, 230, 
-    128, 37, 154, 244, 96, 37, 154, 212, 40, 37, 154, 211, 214, 37, 154, 231, 
-    39, 37, 154, 245, 223, 37, 154, 218, 37, 37, 154, 218, 132, 37, 154, 241, 
-    244, 37, 154, 219, 54, 37, 154, 229, 204, 37, 154, 219, 4, 37, 154, 244, 
-    102, 37, 154, 249, 200, 37, 154, 233, 125, 37, 154, 221, 174, 37, 154, 
-    231, 189, 37, 154, 244, 137, 37, 154, 218, 49, 37, 154, 245, 34, 37, 154, 
-    224, 187, 37, 154, 253, 196, 37, 154, 235, 159, 37, 154, 223, 61, 37, 
-    154, 249, 164, 37, 154, 249, 155, 37, 154, 241, 165, 37, 154, 250, 174, 
-    37, 154, 232, 110, 37, 154, 233, 46, 37, 154, 222, 251, 37, 154, 231, 83, 
-    37, 154, 223, 87, 37, 154, 218, 87, 37, 154, 218, 20, 37, 154, 245, 127, 
-    37, 154, 223, 63, 37, 154, 254, 150, 37, 154, 228, 212, 37, 54, 216, 163, 
-    194, 37, 54, 216, 163, 198, 37, 54, 216, 163, 195, 37, 54, 216, 163, 200, 
-    37, 54, 244, 15, 37, 54, 244, 16, 110, 37, 54, 244, 16, 105, 37, 54, 244, 
-    16, 158, 37, 54, 244, 16, 161, 37, 54, 244, 16, 189, 37, 54, 244, 16, 
-    194, 37, 54, 244, 16, 198, 37, 54, 244, 16, 195, 37, 54, 244, 16, 200, 
-    37, 54, 244, 114, 109, 217, 3, 16, 31, 235, 133, 109, 217, 3, 16, 31, 
-    244, 148, 109, 217, 3, 16, 31, 231, 160, 109, 217, 3, 16, 31, 254, 47, 
-    109, 217, 3, 16, 31, 231, 132, 109, 217, 3, 16, 31, 235, 45, 109, 217, 3, 
-    16, 31, 235, 46, 109, 217, 3, 16, 31, 253, 188, 109, 217, 3, 16, 31, 220, 
-    136, 109, 217, 3, 16, 31, 226, 239, 109, 217, 3, 16, 31, 228, 40, 109, 
-    217, 3, 16, 31, 248, 85, 42, 241, 190, 42, 245, 88, 42, 245, 43, 232, 
-    219, 232, 240, 50, 37, 56, 61, 37, 56, 73, 37, 56, 70, 37, 56, 75, 37, 
-    56, 76, 37, 56, 176, 37, 56, 234, 92, 37, 56, 233, 217, 37, 56, 234, 182, 
-    37, 56, 234, 28, 37, 56, 206, 37, 56, 219, 191, 37, 56, 218, 83, 37, 56, 
-    221, 181, 37, 56, 219, 58, 37, 56, 217, 105, 37, 56, 216, 117, 37, 56, 
-    215, 118, 37, 56, 217, 22, 37, 56, 111, 37, 56, 197, 37, 56, 228, 233, 
-    37, 56, 227, 237, 37, 56, 229, 107, 37, 56, 228, 74, 37, 56, 162, 37, 56, 
-    241, 180, 37, 56, 240, 222, 37, 56, 241, 238, 37, 56, 241, 68, 37, 56, 
-    184, 37, 56, 230, 230, 37, 56, 230, 102, 37, 56, 231, 91, 37, 56, 230, 
-    161, 37, 56, 191, 37, 56, 210, 212, 37, 56, 210, 244, 37, 56, 205, 37, 
-    56, 223, 35, 37, 56, 222, 140, 37, 56, 223, 128, 37, 56, 222, 211, 37, 
-    56, 212, 65, 37, 56, 211, 250, 37, 56, 212, 22, 37, 56, 211, 227, 42, 
-    254, 71, 42, 253, 239, 42, 254, 95, 42, 255, 31, 42, 235, 226, 42, 235, 
-    196, 42, 214, 166, 42, 245, 66, 42, 245, 206, 42, 226, 186, 42, 226, 180, 
-    42, 234, 245, 42, 234, 214, 42, 234, 211, 42, 243, 92, 42, 243, 101, 42, 
-    242, 204, 42, 242, 200, 42, 233, 150, 42, 242, 193, 42, 234, 72, 42, 234, 
-    71, 42, 234, 70, 42, 234, 69, 42, 242, 86, 42, 242, 85, 42, 233, 193, 42, 
-    233, 195, 42, 234, 178, 42, 234, 1, 42, 234, 8, 42, 222, 16, 42, 221, 
-    237, 42, 219, 129, 42, 220, 141, 42, 220, 140, 42, 248, 218, 42, 248, 36, 
-    42, 247, 121, 42, 216, 32, 42, 229, 200, 42, 228, 41, 42, 242, 32, 42, 
-    226, 84, 42, 226, 83, 42, 252, 188, 42, 225, 105, 42, 225, 69, 42, 225, 
-    70, 42, 251, 234, 42, 240, 221, 42, 240, 217, 42, 251, 91, 42, 240, 204, 
-    42, 241, 215, 42, 225, 159, 42, 225, 194, 42, 241, 198, 42, 225, 191, 42, 
-    225, 207, 42, 252, 61, 42, 225, 6, 42, 251, 180, 42, 241, 56, 42, 224, 
-    250, 42, 241, 48, 42, 241, 50, 42, 231, 201, 42, 231, 197, 42, 231, 206, 
-    42, 231, 150, 42, 231, 175, 42, 230, 197, 42, 230, 176, 42, 230, 175, 42, 
-    231, 74, 42, 231, 71, 42, 231, 75, 42, 211, 102, 42, 211, 100, 42, 210, 
-    201, 42, 222, 226, 42, 222, 230, 42, 222, 117, 42, 222, 111, 42, 223, 85, 
-    42, 223, 82, 42, 212, 38, 109, 217, 3, 16, 31, 240, 239, 210, 86, 109, 
-    217, 3, 16, 31, 240, 239, 110, 109, 217, 3, 16, 31, 240, 239, 105, 109, 
-    217, 3, 16, 31, 240, 239, 158, 109, 217, 3, 16, 31, 240, 239, 161, 109, 
-    217, 3, 16, 31, 240, 239, 189, 109, 217, 3, 16, 31, 240, 239, 194, 109, 
-    217, 3, 16, 31, 240, 239, 198, 109, 217, 3, 16, 31, 240, 239, 195, 109, 
-    217, 3, 16, 31, 240, 239, 200, 109, 217, 3, 16, 31, 240, 239, 216, 247, 
-    109, 217, 3, 16, 31, 240, 239, 245, 167, 109, 217, 3, 16, 31, 240, 239, 
-    215, 76, 109, 217, 3, 16, 31, 240, 239, 216, 164, 109, 217, 3, 16, 31, 
-    240, 239, 244, 5, 109, 217, 3, 16, 31, 240, 239, 244, 118, 109, 217, 3, 
-    16, 31, 240, 239, 219, 119, 109, 217, 3, 16, 31, 240, 239, 220, 119, 109, 
-    217, 3, 16, 31, 240, 239, 245, 190, 109, 217, 3, 16, 31, 240, 239, 228, 
-    197, 109, 217, 3, 16, 31, 240, 239, 215, 73, 109, 217, 3, 16, 31, 240, 
-    239, 215, 67, 109, 217, 3, 16, 31, 240, 239, 215, 63, 109, 217, 3, 16, 
-    31, 240, 239, 215, 64, 109, 217, 3, 16, 31, 240, 239, 215, 69, 42, 240, 
-    230, 42, 248, 221, 42, 253, 192, 42, 130, 42, 226, 125, 42, 225, 225, 42, 
-    247, 147, 42, 247, 148, 218, 233, 42, 247, 148, 249, 108, 42, 235, 156, 
-    42, 245, 91, 229, 205, 241, 216, 42, 245, 91, 229, 205, 217, 174, 42, 
-    245, 91, 229, 205, 217, 74, 42, 245, 91, 229, 205, 231, 70, 42, 249, 157, 
-    42, 226, 90, 254, 125, 42, 197, 42, 230, 103, 61, 42, 184, 42, 176, 42, 
-    234, 185, 42, 231, 129, 42, 243, 80, 42, 251, 18, 42, 234, 184, 42, 225, 
-    150, 42, 229, 81, 42, 230, 103, 245, 6, 42, 230, 103, 243, 202, 42, 231, 
-    15, 42, 234, 134, 42, 240, 163, 42, 234, 94, 42, 230, 232, 42, 242, 216, 
-    42, 216, 119, 42, 230, 103, 156, 42, 230, 169, 42, 247, 157, 42, 234, 40, 
-    42, 244, 45, 42, 228, 112, 42, 230, 103, 193, 42, 230, 166, 42, 249, 239, 
-    42, 234, 34, 42, 230, 167, 218, 233, 42, 249, 240, 218, 233, 42, 232, 50, 
-    218, 233, 42, 234, 35, 218, 233, 42, 230, 167, 249, 108, 42, 249, 240, 
-    249, 108, 42, 232, 50, 249, 108, 42, 234, 35, 249, 108, 42, 232, 50, 117, 
-    222, 91, 42, 232, 50, 117, 222, 92, 218, 233, 42, 190, 42, 233, 251, 42, 
-    230, 105, 42, 242, 151, 42, 223, 176, 42, 223, 177, 117, 222, 91, 42, 
-    223, 177, 117, 222, 92, 218, 233, 42, 224, 162, 42, 228, 13, 42, 230, 
-    103, 222, 91, 42, 230, 104, 42, 224, 116, 42, 227, 176, 42, 230, 103, 
-    214, 105, 42, 230, 49, 42, 233, 185, 42, 230, 50, 231, 74, 42, 224, 115, 
-    42, 227, 175, 42, 230, 103, 212, 98, 42, 230, 43, 42, 233, 183, 42, 230, 
-    44, 231, 74, 42, 235, 24, 226, 220, 42, 232, 50, 226, 220, 42, 254, 136, 
-    42, 251, 160, 42, 250, 214, 42, 250, 191, 42, 251, 67, 117, 234, 134, 42, 
-    249, 238, 42, 248, 142, 42, 242, 72, 42, 162, 42, 240, 231, 42, 235, 255, 
-    42, 234, 47, 42, 234, 35, 250, 250, 42, 233, 219, 42, 232, 159, 42, 232, 
-    158, 42, 232, 147, 42, 232, 63, 42, 231, 130, 219, 79, 42, 230, 196, 42, 
-    230, 152, 42, 225, 148, 42, 225, 19, 42, 224, 219, 42, 224, 217, 42, 218, 
-    227, 42, 218, 2, 42, 212, 24, 42, 214, 106, 117, 193, 42, 115, 117, 193, 
-    109, 217, 3, 16, 31, 248, 146, 110, 109, 217, 3, 16, 31, 248, 146, 105, 
-    109, 217, 3, 16, 31, 248, 146, 158, 109, 217, 3, 16, 31, 248, 146, 161, 
-    109, 217, 3, 16, 31, 248, 146, 189, 109, 217, 3, 16, 31, 248, 146, 194, 
-    109, 217, 3, 16, 31, 248, 146, 198, 109, 217, 3, 16, 31, 248, 146, 195, 
-    109, 217, 3, 16, 31, 248, 146, 200, 109, 217, 3, 16, 31, 248, 146, 216, 
-    247, 109, 217, 3, 16, 31, 248, 146, 245, 167, 109, 217, 3, 16, 31, 248, 
-    146, 215, 76, 109, 217, 3, 16, 31, 248, 146, 216, 164, 109, 217, 3, 16, 
-    31, 248, 146, 244, 5, 109, 217, 3, 16, 31, 248, 146, 244, 118, 109, 217, 
-    3, 16, 31, 248, 146, 219, 119, 109, 217, 3, 16, 31, 248, 146, 220, 119, 
-    109, 217, 3, 16, 31, 248, 146, 245, 190, 109, 217, 3, 16, 31, 248, 146, 
-    228, 197, 109, 217, 3, 16, 31, 248, 146, 215, 73, 109, 217, 3, 16, 31, 
-    248, 146, 215, 67, 109, 217, 3, 16, 31, 248, 146, 215, 63, 109, 217, 3, 
-    16, 31, 248, 146, 215, 64, 109, 217, 3, 16, 31, 248, 146, 215, 69, 109, 
-    217, 3, 16, 31, 248, 146, 215, 70, 109, 217, 3, 16, 31, 248, 146, 215, 
-    65, 109, 217, 3, 16, 31, 248, 146, 215, 66, 109, 217, 3, 16, 31, 248, 
-    146, 215, 72, 109, 217, 3, 16, 31, 248, 146, 215, 68, 109, 217, 3, 16, 
-    31, 248, 146, 216, 162, 109, 217, 3, 16, 31, 248, 146, 216, 161, 42, 243, 
-    118, 241, 192, 31, 216, 196, 249, 140, 241, 223, 241, 192, 31, 216, 196, 
-    223, 122, 245, 223, 241, 192, 31, 247, 231, 253, 207, 216, 196, 252, 56, 
-    241, 192, 31, 210, 223, 244, 38, 241, 192, 31, 212, 59, 241, 192, 31, 
-    249, 203, 241, 192, 31, 216, 196, 254, 3, 241, 192, 31, 241, 60, 216, 38, 
-    241, 192, 31, 4, 217, 61, 241, 192, 31, 215, 237, 241, 192, 31, 225, 219, 
-    241, 192, 31, 218, 158, 241, 192, 31, 244, 139, 241, 192, 31, 242, 132, 
-    224, 240, 241, 192, 31, 230, 155, 241, 192, 31, 245, 126, 241, 192, 31, 
-    244, 39, 241, 192, 31, 211, 207, 226, 197, 216, 196, 248, 86, 241, 192, 
-    31, 254, 51, 241, 192, 31, 249, 185, 241, 192, 31, 251, 227, 216, 138, 
-    241, 192, 31, 242, 149, 241, 192, 31, 218, 245, 254, 70, 241, 192, 31, 
-    223, 53, 241, 192, 31, 235, 220, 241, 192, 31, 242, 132, 217, 61, 241, 
-    192, 31, 230, 111, 249, 159, 241, 192, 31, 242, 132, 224, 197, 241, 192, 
-    31, 216, 196, 255, 18, 212, 40, 241, 192, 31, 216, 196, 250, 8, 244, 96, 
-    241, 192, 31, 235, 233, 241, 192, 31, 246, 57, 241, 192, 31, 223, 56, 
-    241, 192, 31, 242, 132, 224, 224, 241, 192, 31, 224, 177, 241, 192, 31, 
-    248, 161, 64, 216, 196, 232, 230, 241, 192, 31, 216, 196, 244, 174, 241, 
-    192, 31, 226, 163, 241, 192, 31, 226, 244, 241, 192, 31, 248, 59, 241, 
-    192, 31, 248, 79, 241, 192, 31, 235, 247, 241, 192, 31, 251, 149, 241, 
-    192, 31, 249, 221, 216, 42, 231, 76, 241, 192, 31, 243, 87, 216, 38, 241, 
-    192, 31, 224, 125, 214, 154, 241, 192, 31, 226, 162, 241, 192, 31, 216, 
-    196, 212, 13, 241, 192, 31, 223, 45, 241, 192, 31, 216, 196, 250, 220, 
-    241, 192, 31, 216, 196, 253, 255, 216, 133, 241, 192, 31, 216, 196, 234, 
-    179, 218, 134, 230, 115, 241, 192, 31, 248, 32, 241, 192, 31, 216, 196, 
-    231, 152, 231, 202, 241, 192, 31, 255, 19, 241, 192, 31, 216, 196, 212, 
-    54, 241, 192, 31, 216, 196, 243, 47, 211, 239, 241, 192, 31, 216, 196, 
-    235, 52, 233, 107, 241, 192, 31, 247, 184, 241, 192, 31, 232, 220, 241, 
-    192, 31, 235, 223, 215, 187, 241, 192, 31, 4, 224, 197, 241, 192, 31, 
-    254, 217, 249, 212, 241, 192, 31, 252, 59, 249, 212, 8, 3, 235, 160, 8, 
-    3, 235, 153, 8, 3, 73, 8, 3, 235, 182, 8, 3, 236, 58, 8, 3, 236, 41, 8, 
-    3, 236, 60, 8, 3, 236, 59, 8, 3, 253, 206, 8, 3, 253, 169, 8, 3, 61, 8, 
-    3, 254, 72, 8, 3, 214, 164, 8, 3, 214, 167, 8, 3, 214, 165, 8, 3, 226, 
-    140, 8, 3, 226, 114, 8, 3, 76, 8, 3, 226, 175, 8, 3, 245, 35, 8, 3, 75, 
-    8, 3, 211, 195, 8, 3, 251, 228, 8, 3, 251, 225, 8, 3, 252, 6, 8, 3, 251, 
-    238, 8, 3, 251, 251, 8, 3, 251, 250, 8, 3, 251, 253, 8, 3, 251, 252, 8, 
-    3, 252, 121, 8, 3, 252, 113, 8, 3, 252, 191, 8, 3, 252, 142, 8, 3, 251, 
-    101, 8, 3, 251, 105, 8, 3, 251, 102, 8, 3, 251, 179, 8, 3, 251, 163, 8, 
-    3, 251, 205, 8, 3, 251, 185, 8, 3, 252, 21, 8, 3, 252, 75, 8, 3, 252, 33, 
-    8, 3, 251, 87, 8, 3, 251, 84, 8, 3, 251, 125, 8, 3, 251, 100, 8, 3, 251, 
-    94, 8, 3, 251, 98, 8, 3, 251, 72, 8, 3, 251, 70, 8, 3, 251, 77, 8, 3, 
-    251, 75, 8, 3, 251, 73, 8, 3, 251, 74, 8, 3, 225, 49, 8, 3, 225, 45, 8, 
-    3, 225, 108, 8, 3, 225, 59, 8, 3, 225, 75, 8, 3, 225, 102, 8, 3, 225, 98, 
-    8, 3, 225, 240, 8, 3, 225, 230, 8, 3, 190, 8, 3, 226, 21, 8, 3, 224, 135, 
-    8, 3, 224, 137, 8, 3, 224, 136, 8, 3, 224, 233, 8, 3, 224, 222, 8, 3, 
-    225, 16, 8, 3, 224, 245, 8, 3, 224, 121, 8, 3, 224, 117, 8, 3, 224, 150, 
-    8, 3, 224, 134, 8, 3, 224, 126, 8, 3, 224, 132, 8, 3, 224, 100, 8, 3, 
-    224, 99, 8, 3, 224, 104, 8, 3, 224, 103, 8, 3, 224, 101, 8, 3, 224, 102, 
-    8, 3, 252, 96, 8, 3, 252, 95, 8, 3, 252, 102, 8, 3, 252, 97, 8, 3, 252, 
-    99, 8, 3, 252, 98, 8, 3, 252, 101, 8, 3, 252, 100, 8, 3, 252, 108, 8, 3, 
-    252, 107, 8, 3, 252, 111, 8, 3, 252, 109, 8, 3, 252, 87, 8, 3, 252, 89, 
-    8, 3, 252, 88, 8, 3, 252, 92, 8, 3, 252, 91, 8, 3, 252, 94, 8, 3, 252, 
-    93, 8, 3, 252, 103, 8, 3, 252, 106, 8, 3, 252, 104, 8, 3, 252, 83, 8, 3, 
-    252, 82, 8, 3, 252, 90, 8, 3, 252, 86, 8, 3, 252, 84, 8, 3, 252, 85, 8, 
-    3, 252, 79, 8, 3, 252, 78, 8, 3, 252, 81, 8, 3, 252, 80, 8, 3, 229, 169, 
-    8, 3, 229, 168, 8, 3, 229, 174, 8, 3, 229, 170, 8, 3, 229, 171, 8, 3, 
-    229, 173, 8, 3, 229, 172, 8, 3, 229, 177, 8, 3, 229, 176, 8, 3, 229, 179, 
-    8, 3, 229, 178, 8, 3, 229, 165, 8, 3, 229, 164, 8, 3, 229, 167, 8, 3, 
-    229, 166, 8, 3, 229, 158, 8, 3, 229, 157, 8, 3, 229, 162, 8, 3, 229, 161, 
-    8, 3, 229, 159, 8, 3, 229, 160, 8, 3, 229, 152, 8, 3, 229, 151, 8, 3, 
-    229, 156, 8, 3, 229, 155, 8, 3, 229, 153, 8, 3, 229, 154, 8, 3, 241, 110, 
-    8, 3, 241, 109, 8, 3, 241, 115, 8, 3, 241, 111, 8, 3, 241, 112, 8, 3, 
-    241, 114, 8, 3, 241, 113, 8, 3, 241, 118, 8, 3, 241, 117, 8, 3, 241, 120, 
-    8, 3, 241, 119, 8, 3, 241, 101, 8, 3, 241, 103, 8, 3, 241, 102, 8, 3, 
-    241, 106, 8, 3, 241, 105, 8, 3, 241, 108, 8, 3, 241, 107, 8, 3, 241, 97, 
-    8, 3, 241, 96, 8, 3, 241, 104, 8, 3, 241, 100, 8, 3, 241, 98, 8, 3, 241, 
-    99, 8, 3, 241, 91, 8, 3, 241, 95, 8, 3, 241, 94, 8, 3, 241, 92, 8, 3, 
-    241, 93, 8, 3, 230, 172, 8, 3, 230, 171, 8, 3, 230, 230, 8, 3, 230, 178, 
-    8, 3, 230, 203, 8, 3, 230, 221, 8, 3, 230, 219, 8, 3, 231, 139, 8, 3, 
-    231, 134, 8, 3, 184, 8, 3, 231, 172, 8, 3, 230, 74, 8, 3, 230, 73, 8, 3, 
-    230, 77, 8, 3, 230, 75, 8, 3, 230, 121, 8, 3, 230, 107, 8, 3, 230, 161, 
-    8, 3, 230, 126, 8, 3, 231, 26, 8, 3, 231, 91, 8, 3, 230, 55, 8, 3, 230, 
-    51, 8, 3, 230, 102, 8, 3, 230, 70, 8, 3, 230, 63, 8, 3, 230, 68, 8, 3, 
-    230, 28, 8, 3, 230, 27, 8, 3, 230, 33, 8, 3, 230, 30, 8, 3, 244, 83, 8, 
-    3, 244, 78, 8, 3, 244, 121, 8, 3, 244, 98, 8, 3, 244, 167, 8, 3, 244, 
-    158, 8, 3, 244, 196, 8, 3, 244, 170, 8, 3, 244, 3, 8, 3, 244, 43, 8, 3, 
-    244, 27, 8, 3, 243, 218, 8, 3, 243, 217, 8, 3, 243, 234, 8, 3, 243, 223, 
-    8, 3, 243, 221, 8, 3, 243, 222, 8, 3, 243, 205, 8, 3, 243, 204, 8, 3, 
-    243, 208, 8, 3, 243, 206, 8, 3, 213, 144, 8, 3, 213, 139, 8, 3, 213, 176, 
-    8, 3, 213, 153, 8, 3, 213, 166, 8, 3, 213, 163, 8, 3, 213, 168, 8, 3, 
-    213, 167, 8, 3, 214, 7, 8, 3, 214, 2, 8, 3, 214, 27, 8, 3, 214, 18, 8, 3, 
-    213, 125, 8, 3, 213, 121, 8, 3, 213, 138, 8, 3, 213, 126, 8, 3, 213, 178, 
-    8, 3, 213, 244, 8, 3, 212, 110, 8, 3, 212, 108, 8, 3, 212, 116, 8, 3, 
-    212, 113, 8, 3, 212, 111, 8, 3, 212, 112, 8, 3, 212, 102, 8, 3, 212, 101, 
-    8, 3, 212, 106, 8, 3, 212, 105, 8, 3, 212, 103, 8, 3, 212, 104, 8, 3, 
-    247, 178, 8, 3, 247, 166, 8, 3, 248, 3, 8, 3, 247, 203, 8, 3, 247, 236, 
-    8, 3, 247, 240, 8, 3, 247, 239, 8, 3, 248, 152, 8, 3, 248, 147, 8, 3, 
-    248, 221, 8, 3, 248, 172, 8, 3, 246, 62, 8, 3, 246, 63, 8, 3, 247, 120, 
-    8, 3, 246, 102, 8, 3, 247, 145, 8, 3, 247, 122, 8, 3, 248, 30, 8, 3, 248, 
-    90, 8, 3, 248, 45, 8, 3, 246, 53, 8, 3, 246, 51, 8, 3, 246, 78, 8, 3, 
-    246, 61, 8, 3, 246, 56, 8, 3, 246, 59, 8, 3, 216, 67, 8, 3, 216, 61, 8, 
-    3, 216, 117, 8, 3, 216, 76, 8, 3, 216, 109, 8, 3, 216, 111, 8, 3, 216, 
-    110, 8, 3, 217, 46, 8, 3, 217, 33, 8, 3, 217, 105, 8, 3, 217, 54, 8, 3, 
-    215, 102, 8, 3, 215, 101, 8, 3, 215, 104, 8, 3, 215, 103, 8, 3, 216, 5, 
-    8, 3, 216, 1, 8, 3, 111, 8, 3, 216, 13, 8, 3, 216, 213, 8, 3, 217, 22, 8, 
-    3, 216, 237, 8, 3, 215, 88, 8, 3, 215, 83, 8, 3, 215, 118, 8, 3, 215, 
-    100, 8, 3, 215, 89, 8, 3, 215, 98, 8, 3, 248, 107, 8, 3, 248, 106, 8, 3, 
-    248, 112, 8, 3, 248, 108, 8, 3, 248, 109, 8, 3, 248, 111, 8, 3, 248, 110, 
-    8, 3, 248, 128, 8, 3, 248, 127, 8, 3, 248, 135, 8, 3, 248, 129, 8, 3, 
-    248, 97, 8, 3, 248, 99, 8, 3, 248, 98, 8, 3, 248, 102, 8, 3, 248, 101, 8, 
-    3, 248, 105, 8, 3, 248, 103, 8, 3, 248, 120, 8, 3, 248, 123, 8, 3, 248, 
-    121, 8, 3, 248, 93, 8, 3, 248, 92, 8, 3, 248, 100, 8, 3, 248, 96, 8, 3, 
-    248, 94, 8, 3, 248, 95, 8, 3, 229, 126, 8, 3, 229, 125, 8, 3, 229, 133, 
-    8, 3, 229, 128, 8, 3, 229, 129, 8, 3, 229, 130, 8, 3, 229, 142, 8, 3, 
-    229, 141, 8, 3, 229, 148, 8, 3, 229, 143, 8, 3, 229, 118, 8, 3, 229, 117, 
-    8, 3, 229, 124, 8, 3, 229, 119, 8, 3, 229, 134, 8, 3, 229, 140, 8, 3, 
-    229, 138, 8, 3, 229, 110, 8, 3, 229, 109, 8, 3, 229, 115, 8, 3, 229, 113, 
-    8, 3, 229, 111, 8, 3, 229, 112, 8, 3, 241, 77, 8, 3, 241, 76, 8, 3, 241, 
-    83, 8, 3, 241, 78, 8, 3, 241, 80, 8, 3, 241, 79, 8, 3, 241, 82, 8, 3, 
-    241, 81, 8, 3, 241, 88, 8, 3, 241, 87, 8, 3, 241, 90, 8, 3, 241, 89, 8, 
-    3, 241, 71, 8, 3, 241, 72, 8, 3, 241, 74, 8, 3, 241, 73, 8, 3, 241, 75, 
-    8, 3, 241, 84, 8, 3, 241, 86, 8, 3, 241, 85, 8, 3, 241, 70, 8, 3, 228, 
-    189, 8, 3, 228, 187, 8, 3, 228, 233, 8, 3, 228, 192, 8, 3, 228, 215, 8, 
-    3, 228, 229, 8, 3, 228, 228, 8, 3, 229, 183, 8, 3, 197, 8, 3, 229, 197, 
-    8, 3, 227, 186, 8, 3, 227, 188, 8, 3, 227, 187, 8, 3, 228, 51, 8, 3, 228, 
-    38, 8, 3, 228, 74, 8, 3, 228, 60, 8, 3, 229, 83, 8, 3, 229, 107, 8, 3, 
-    229, 94, 8, 3, 227, 181, 8, 3, 227, 177, 8, 3, 227, 237, 8, 3, 227, 185, 
-    8, 3, 227, 183, 8, 3, 227, 184, 8, 3, 241, 141, 8, 3, 241, 140, 8, 3, 
-    241, 146, 8, 3, 241, 142, 8, 3, 241, 143, 8, 3, 241, 145, 8, 3, 241, 144, 
-    8, 3, 241, 151, 8, 3, 241, 150, 8, 3, 241, 153, 8, 3, 241, 152, 8, 3, 
-    241, 133, 8, 3, 241, 135, 8, 3, 241, 134, 8, 3, 241, 137, 8, 3, 241, 139, 
-    8, 3, 241, 138, 8, 3, 241, 147, 8, 3, 241, 149, 8, 3, 241, 148, 8, 3, 
-    241, 129, 8, 3, 241, 128, 8, 3, 241, 136, 8, 3, 241, 132, 8, 3, 241, 130, 
-    8, 3, 241, 131, 8, 3, 241, 123, 8, 3, 241, 122, 8, 3, 241, 127, 8, 3, 
-    241, 126, 8, 3, 241, 124, 8, 3, 241, 125, 8, 3, 232, 195, 8, 3, 232, 189, 
-    8, 3, 232, 241, 8, 3, 232, 202, 8, 3, 232, 233, 8, 3, 232, 232, 8, 3, 
-    232, 236, 8, 3, 232, 234, 8, 3, 233, 79, 8, 3, 233, 69, 8, 3, 233, 135, 
-    8, 3, 233, 88, 8, 3, 232, 79, 8, 3, 232, 78, 8, 3, 232, 81, 8, 3, 232, 
-    80, 8, 3, 232, 116, 8, 3, 232, 106, 8, 3, 232, 156, 8, 3, 232, 120, 8, 3, 
-    233, 2, 8, 3, 233, 58, 8, 3, 233, 17, 8, 3, 232, 74, 8, 3, 232, 72, 8, 3, 
-    232, 98, 8, 3, 232, 77, 8, 3, 232, 75, 8, 3, 232, 76, 8, 3, 232, 54, 8, 
-    3, 232, 53, 8, 3, 232, 62, 8, 3, 232, 57, 8, 3, 232, 55, 8, 3, 232, 56, 
-    8, 3, 242, 189, 8, 3, 242, 188, 8, 3, 242, 214, 8, 3, 242, 199, 8, 3, 
-    242, 206, 8, 3, 242, 205, 8, 3, 242, 208, 8, 3, 242, 207, 8, 3, 243, 89, 
-    8, 3, 243, 84, 8, 3, 243, 135, 8, 3, 243, 99, 8, 3, 242, 91, 8, 3, 242, 
-    90, 8, 3, 242, 93, 8, 3, 242, 92, 8, 3, 242, 154, 8, 3, 242, 152, 8, 3, 
-    242, 174, 8, 3, 242, 162, 8, 3, 243, 33, 8, 3, 243, 31, 8, 3, 243, 62, 8, 
-    3, 243, 44, 8, 3, 242, 81, 8, 3, 242, 80, 8, 3, 242, 113, 8, 3, 242, 89, 
-    8, 3, 242, 82, 8, 3, 242, 88, 8, 3, 234, 61, 8, 3, 234, 60, 8, 3, 234, 
-    92, 8, 3, 234, 75, 8, 3, 234, 85, 8, 3, 234, 88, 8, 3, 234, 86, 8, 3, 
-    234, 202, 8, 3, 234, 190, 8, 3, 176, 8, 3, 234, 228, 8, 3, 233, 200, 8, 
-    3, 233, 205, 8, 3, 233, 202, 8, 3, 234, 0, 8, 3, 233, 252, 8, 3, 234, 28, 
-    8, 3, 234, 7, 8, 3, 234, 156, 8, 3, 234, 140, 8, 3, 234, 182, 8, 3, 234, 
-    159, 8, 3, 233, 189, 8, 3, 233, 186, 8, 3, 233, 217, 8, 3, 233, 199, 8, 
-    3, 233, 192, 8, 3, 233, 196, 8, 3, 243, 15, 8, 3, 243, 14, 8, 3, 243, 19, 
-    8, 3, 243, 16, 8, 3, 243, 18, 8, 3, 243, 17, 8, 3, 243, 26, 8, 3, 243, 
-    25, 8, 3, 243, 29, 8, 3, 243, 27, 8, 3, 243, 6, 8, 3, 243, 5, 8, 3, 243, 
-    8, 8, 3, 243, 7, 8, 3, 243, 11, 8, 3, 243, 10, 8, 3, 243, 13, 8, 3, 243, 
-    12, 8, 3, 243, 21, 8, 3, 243, 20, 8, 3, 243, 24, 8, 3, 243, 22, 8, 3, 
-    243, 1, 8, 3, 243, 0, 8, 3, 243, 9, 8, 3, 243, 4, 8, 3, 243, 2, 8, 3, 
-    243, 3, 8, 3, 230, 249, 8, 3, 230, 250, 8, 3, 231, 12, 8, 3, 231, 11, 8, 
-    3, 231, 14, 8, 3, 231, 13, 8, 3, 230, 240, 8, 3, 230, 242, 8, 3, 230, 
-    241, 8, 3, 230, 245, 8, 3, 230, 244, 8, 3, 230, 247, 8, 3, 230, 246, 8, 
-    3, 230, 251, 8, 3, 230, 253, 8, 3, 230, 252, 8, 3, 230, 236, 8, 3, 230, 
-    235, 8, 3, 230, 243, 8, 3, 230, 239, 8, 3, 230, 237, 8, 3, 230, 238, 8, 
-    3, 240, 180, 8, 3, 240, 179, 8, 3, 240, 186, 8, 3, 240, 181, 8, 3, 240, 
-    183, 8, 3, 240, 182, 8, 3, 240, 185, 8, 3, 240, 184, 8, 3, 240, 191, 8, 
-    3, 240, 190, 8, 3, 240, 193, 8, 3, 240, 192, 8, 3, 240, 172, 8, 3, 240, 
-    171, 8, 3, 240, 174, 8, 3, 240, 173, 8, 3, 240, 176, 8, 3, 240, 175, 8, 
-    3, 240, 178, 8, 3, 240, 177, 8, 3, 240, 187, 8, 3, 240, 189, 8, 3, 240, 
-    188, 8, 3, 229, 24, 8, 3, 229, 26, 8, 3, 229, 25, 8, 3, 229, 67, 8, 3, 
-    229, 65, 8, 3, 229, 77, 8, 3, 229, 70, 8, 3, 228, 243, 8, 3, 228, 242, 8, 
-    3, 228, 244, 8, 3, 228, 252, 8, 3, 228, 249, 8, 3, 229, 4, 8, 3, 228, 
-    254, 8, 3, 229, 58, 8, 3, 229, 64, 8, 3, 229, 60, 8, 3, 241, 156, 8, 3, 
-    241, 166, 8, 3, 241, 175, 8, 3, 241, 251, 8, 3, 241, 243, 8, 3, 162, 8, 
-    3, 242, 6, 8, 3, 240, 206, 8, 3, 240, 205, 8, 3, 240, 208, 8, 3, 240, 
-    207, 8, 3, 240, 242, 8, 3, 240, 233, 8, 3, 241, 68, 8, 3, 241, 47, 8, 3, 
-    241, 194, 8, 3, 241, 238, 8, 3, 241, 206, 8, 3, 212, 43, 8, 3, 212, 28, 
-    8, 3, 212, 65, 8, 3, 212, 51, 8, 3, 211, 185, 8, 3, 211, 187, 8, 3, 211, 
-    186, 8, 3, 211, 203, 8, 3, 211, 227, 8, 3, 211, 210, 8, 3, 212, 5, 8, 3, 
-    212, 22, 8, 3, 212, 10, 8, 3, 210, 30, 8, 3, 210, 29, 8, 3, 210, 44, 8, 
-    3, 210, 32, 8, 3, 210, 37, 8, 3, 210, 39, 8, 3, 210, 38, 8, 3, 210, 102, 
-    8, 3, 210, 99, 8, 3, 210, 116, 8, 3, 210, 105, 8, 3, 210, 6, 8, 3, 210, 
-    8, 8, 3, 210, 7, 8, 3, 210, 19, 8, 3, 210, 18, 8, 3, 210, 23, 8, 3, 210, 
-    20, 8, 3, 210, 84, 8, 3, 210, 94, 8, 3, 210, 88, 8, 3, 210, 2, 8, 3, 210, 
-    1, 8, 3, 210, 13, 8, 3, 210, 5, 8, 3, 210, 3, 8, 3, 210, 4, 8, 3, 209, 
-    245, 8, 3, 209, 244, 8, 3, 209, 250, 8, 3, 209, 248, 8, 3, 209, 246, 8, 
-    3, 209, 247, 8, 3, 250, 28, 8, 3, 250, 24, 8, 3, 250, 51, 8, 3, 250, 37, 
-    8, 3, 250, 48, 8, 3, 250, 42, 8, 3, 250, 50, 8, 3, 250, 49, 8, 3, 250, 
-    224, 8, 3, 250, 217, 8, 3, 251, 33, 8, 3, 250, 251, 8, 3, 249, 104, 8, 3, 
-    249, 106, 8, 3, 249, 105, 8, 3, 249, 153, 8, 3, 249, 144, 8, 3, 249, 238, 
-    8, 3, 249, 169, 8, 3, 250, 160, 8, 3, 250, 190, 8, 3, 250, 165, 8, 3, 
-    249, 84, 8, 3, 249, 82, 8, 3, 249, 112, 8, 3, 249, 102, 8, 3, 249, 89, 8, 
-    3, 249, 101, 8, 3, 249, 63, 8, 3, 249, 62, 8, 3, 249, 73, 8, 3, 249, 69, 
-    8, 3, 249, 64, 8, 3, 249, 66, 8, 3, 209, 228, 8, 3, 209, 227, 8, 3, 209, 
-    234, 8, 3, 209, 229, 8, 3, 209, 231, 8, 3, 209, 230, 8, 3, 209, 233, 8, 
-    3, 209, 232, 8, 3, 209, 240, 8, 3, 209, 239, 8, 3, 209, 243, 8, 3, 209, 
-    241, 8, 3, 209, 224, 8, 3, 209, 226, 8, 3, 209, 225, 8, 3, 209, 235, 8, 
-    3, 209, 238, 8, 3, 209, 236, 8, 3, 209, 217, 8, 3, 209, 221, 8, 3, 209, 
-    220, 8, 3, 209, 218, 8, 3, 209, 219, 8, 3, 209, 211, 8, 3, 209, 210, 8, 
-    3, 209, 216, 8, 3, 209, 214, 8, 3, 209, 212, 8, 3, 209, 213, 8, 3, 227, 
-    104, 8, 3, 227, 103, 8, 3, 227, 109, 8, 3, 227, 105, 8, 3, 227, 106, 8, 
-    3, 227, 108, 8, 3, 227, 107, 8, 3, 227, 114, 8, 3, 227, 113, 8, 3, 227, 
-    117, 8, 3, 227, 116, 8, 3, 227, 97, 8, 3, 227, 98, 8, 3, 227, 101, 8, 3, 
-    227, 102, 8, 3, 227, 110, 8, 3, 227, 112, 8, 3, 227, 92, 8, 3, 227, 100, 
-    8, 3, 227, 96, 8, 3, 227, 93, 8, 3, 227, 94, 8, 3, 227, 87, 8, 3, 227, 
-    86, 8, 3, 227, 91, 8, 3, 227, 90, 8, 3, 227, 88, 8, 3, 227, 89, 8, 3, 
-    219, 127, 8, 3, 194, 8, 3, 219, 191, 8, 3, 219, 130, 8, 3, 219, 183, 8, 
-    3, 219, 186, 8, 3, 219, 184, 8, 3, 221, 226, 8, 3, 221, 214, 8, 3, 206, 
-    8, 3, 221, 234, 8, 3, 218, 28, 8, 3, 218, 30, 8, 3, 218, 29, 8, 3, 219, 
-    34, 8, 3, 219, 23, 8, 3, 219, 58, 8, 3, 219, 38, 8, 3, 220, 114, 8, 3, 
-    221, 181, 8, 3, 220, 139, 8, 3, 218, 5, 8, 3, 218, 3, 8, 3, 218, 83, 8, 
-    3, 218, 27, 8, 3, 218, 9, 8, 3, 218, 17, 8, 3, 217, 166, 8, 3, 217, 165, 
-    8, 3, 217, 232, 8, 3, 217, 173, 8, 3, 217, 168, 8, 3, 217, 172, 8, 3, 
-    218, 186, 8, 3, 218, 185, 8, 3, 218, 192, 8, 3, 218, 187, 8, 3, 218, 189, 
-    8, 3, 218, 191, 8, 3, 218, 190, 8, 3, 218, 200, 8, 3, 218, 198, 8, 3, 
-    218, 223, 8, 3, 218, 201, 8, 3, 218, 181, 8, 3, 218, 180, 8, 3, 218, 184, 
-    8, 3, 218, 182, 8, 3, 218, 194, 8, 3, 218, 197, 8, 3, 218, 195, 8, 3, 
-    218, 177, 8, 3, 218, 175, 8, 3, 218, 179, 8, 3, 218, 178, 8, 3, 218, 170, 
-    8, 3, 218, 169, 8, 3, 218, 174, 8, 3, 218, 173, 8, 3, 218, 171, 8, 3, 
-    218, 172, 8, 3, 210, 77, 8, 3, 210, 76, 8, 3, 210, 82, 8, 3, 210, 79, 8, 
-    3, 210, 59, 8, 3, 210, 61, 8, 3, 210, 60, 8, 3, 210, 64, 8, 3, 210, 63, 
-    8, 3, 210, 67, 8, 3, 210, 65, 8, 3, 210, 71, 8, 3, 210, 70, 8, 3, 210, 
-    74, 8, 3, 210, 72, 8, 3, 210, 55, 8, 3, 210, 54, 8, 3, 210, 62, 8, 3, 
-    210, 58, 8, 3, 210, 56, 8, 3, 210, 57, 8, 3, 210, 47, 8, 3, 210, 46, 8, 
-    3, 210, 51, 8, 3, 210, 50, 8, 3, 210, 48, 8, 3, 210, 49, 8, 3, 250, 136, 
-    8, 3, 250, 133, 8, 3, 250, 157, 8, 3, 250, 144, 8, 3, 250, 65, 8, 3, 250, 
-    64, 8, 3, 250, 67, 8, 3, 250, 66, 8, 3, 250, 79, 8, 3, 250, 78, 8, 3, 
-    250, 86, 8, 3, 250, 81, 8, 3, 250, 115, 8, 3, 250, 113, 8, 3, 250, 131, 
-    8, 3, 250, 121, 8, 3, 250, 59, 8, 3, 250, 69, 8, 3, 250, 63, 8, 3, 250, 
-    60, 8, 3, 250, 62, 8, 3, 250, 53, 8, 3, 250, 52, 8, 3, 250, 57, 8, 3, 
-    250, 56, 8, 3, 250, 54, 8, 3, 250, 55, 8, 3, 222, 175, 8, 3, 222, 179, 8, 
-    3, 222, 158, 8, 3, 222, 159, 8, 3, 222, 162, 8, 3, 222, 161, 8, 3, 222, 
-    165, 8, 3, 222, 163, 8, 3, 222, 169, 8, 3, 222, 168, 8, 3, 222, 174, 8, 
-    3, 222, 170, 8, 3, 222, 154, 8, 3, 222, 152, 8, 3, 222, 160, 8, 3, 222, 
-    157, 8, 3, 222, 155, 8, 3, 222, 156, 8, 3, 222, 147, 8, 3, 222, 146, 8, 
-    3, 222, 151, 8, 3, 222, 150, 8, 3, 222, 148, 8, 3, 222, 149, 8, 3, 228, 
-    34, 8, 3, 228, 33, 8, 3, 228, 36, 8, 3, 228, 35, 8, 3, 228, 26, 8, 3, 
-    228, 28, 8, 3, 228, 27, 8, 3, 228, 30, 8, 3, 228, 29, 8, 3, 228, 32, 8, 
-    3, 228, 31, 8, 3, 228, 21, 8, 3, 228, 20, 8, 3, 228, 25, 8, 3, 228, 24, 
-    8, 3, 228, 22, 8, 3, 228, 23, 8, 3, 228, 15, 8, 3, 228, 14, 8, 3, 228, 
-    19, 8, 3, 228, 18, 8, 3, 228, 16, 8, 3, 228, 17, 8, 3, 220, 72, 8, 3, 
-    220, 67, 8, 3, 220, 102, 8, 3, 220, 83, 8, 3, 219, 215, 8, 3, 219, 217, 
-    8, 3, 219, 216, 8, 3, 219, 236, 8, 3, 219, 233, 8, 3, 220, 7, 8, 3, 219, 
-    254, 8, 3, 220, 42, 8, 3, 220, 35, 8, 3, 220, 63, 8, 3, 220, 50, 8, 3, 
-    219, 211, 8, 3, 219, 209, 8, 3, 219, 225, 8, 3, 219, 214, 8, 3, 219, 212, 
-    8, 3, 219, 213, 8, 3, 219, 194, 8, 3, 219, 193, 8, 3, 219, 200, 8, 3, 
-    219, 197, 8, 3, 219, 195, 8, 3, 219, 196, 8, 3, 223, 141, 8, 3, 223, 135, 
-    8, 3, 205, 8, 3, 223, 147, 8, 3, 222, 120, 8, 3, 222, 122, 8, 3, 222, 
-    121, 8, 3, 222, 188, 8, 3, 222, 181, 8, 3, 222, 211, 8, 3, 222, 192, 8, 
-    3, 223, 43, 8, 3, 223, 128, 8, 3, 223, 81, 8, 3, 222, 113, 8, 3, 222, 
-    110, 8, 3, 222, 140, 8, 3, 222, 119, 8, 3, 222, 115, 8, 3, 222, 116, 8, 
-    3, 222, 95, 8, 3, 222, 94, 8, 3, 222, 100, 8, 3, 222, 98, 8, 3, 222, 96, 
-    8, 3, 222, 97, 8, 3, 235, 98, 8, 3, 235, 97, 8, 3, 235, 108, 8, 3, 235, 
-    99, 8, 3, 235, 104, 8, 3, 235, 103, 8, 3, 235, 106, 8, 3, 235, 105, 8, 3, 
-    235, 41, 8, 3, 235, 40, 8, 3, 235, 43, 8, 3, 235, 42, 8, 3, 235, 56, 8, 
-    3, 235, 54, 8, 3, 235, 68, 8, 3, 235, 58, 8, 3, 235, 34, 8, 3, 235, 32, 
-    8, 3, 235, 51, 8, 3, 235, 39, 8, 3, 235, 36, 8, 3, 235, 37, 8, 3, 235, 
-    26, 8, 3, 235, 25, 8, 3, 235, 30, 8, 3, 235, 29, 8, 3, 235, 27, 8, 3, 
-    235, 28, 8, 3, 224, 46, 8, 3, 224, 44, 8, 3, 224, 53, 8, 3, 224, 47, 8, 
-    3, 224, 50, 8, 3, 224, 49, 8, 3, 224, 52, 8, 3, 224, 51, 8, 3, 223, 255, 
-    8, 3, 223, 252, 8, 3, 224, 1, 8, 3, 224, 0, 8, 3, 224, 33, 8, 3, 224, 32, 
-    8, 3, 224, 42, 8, 3, 224, 36, 8, 3, 223, 247, 8, 3, 223, 243, 8, 3, 224, 
-    30, 8, 3, 223, 251, 8, 3, 223, 249, 8, 3, 223, 250, 8, 3, 223, 227, 8, 3, 
-    223, 225, 8, 3, 223, 237, 8, 3, 223, 230, 8, 3, 223, 228, 8, 3, 223, 229, 
-    8, 3, 235, 87, 8, 3, 235, 86, 8, 3, 235, 93, 8, 3, 235, 88, 8, 3, 235, 
-    90, 8, 3, 235, 89, 8, 3, 235, 92, 8, 3, 235, 91, 8, 3, 235, 78, 8, 3, 
-    235, 80, 8, 3, 235, 79, 8, 3, 235, 83, 8, 3, 235, 82, 8, 3, 235, 85, 8, 
-    3, 235, 84, 8, 3, 235, 74, 8, 3, 235, 73, 8, 3, 235, 81, 8, 3, 235, 77, 
-    8, 3, 235, 75, 8, 3, 235, 76, 8, 3, 235, 70, 8, 3, 235, 69, 8, 3, 235, 
-    72, 8, 3, 235, 71, 8, 3, 228, 162, 8, 3, 228, 161, 8, 3, 228, 169, 8, 3, 
-    228, 163, 8, 3, 228, 165, 8, 3, 228, 164, 8, 3, 228, 168, 8, 3, 228, 166, 
-    8, 3, 228, 151, 8, 3, 228, 152, 8, 3, 228, 157, 8, 3, 228, 156, 8, 3, 
-    228, 160, 8, 3, 228, 158, 8, 3, 228, 146, 8, 3, 228, 155, 8, 3, 228, 150, 
-    8, 3, 228, 147, 8, 3, 228, 148, 8, 3, 228, 141, 8, 3, 228, 140, 8, 3, 
-    228, 145, 8, 3, 228, 144, 8, 3, 228, 142, 8, 3, 228, 143, 8, 3, 227, 137, 
-    8, 3, 227, 136, 8, 3, 227, 148, 8, 3, 227, 141, 8, 3, 227, 145, 8, 3, 
-    227, 144, 8, 3, 227, 147, 8, 3, 227, 146, 8, 3, 227, 124, 8, 3, 227, 126, 
-    8, 3, 227, 125, 8, 3, 227, 130, 8, 3, 227, 129, 8, 3, 227, 134, 8, 3, 
-    227, 131, 8, 3, 227, 122, 8, 3, 227, 120, 8, 3, 227, 128, 8, 3, 227, 123, 
-    8, 3, 211, 150, 8, 3, 211, 149, 8, 3, 211, 157, 8, 3, 211, 152, 8, 3, 
-    211, 154, 8, 3, 211, 153, 8, 3, 211, 156, 8, 3, 211, 155, 8, 3, 211, 139, 
-    8, 3, 211, 140, 8, 3, 211, 144, 8, 3, 211, 143, 8, 3, 211, 148, 8, 3, 
-    211, 146, 8, 3, 211, 121, 8, 3, 211, 119, 8, 3, 211, 131, 8, 3, 211, 124, 
-    8, 3, 211, 122, 8, 3, 211, 123, 8, 3, 210, 250, 8, 3, 210, 248, 8, 3, 
-    211, 8, 8, 3, 210, 251, 8, 3, 211, 2, 8, 3, 211, 1, 8, 3, 211, 5, 8, 3, 
-    211, 3, 8, 3, 210, 191, 8, 3, 210, 190, 8, 3, 210, 194, 8, 3, 210, 192, 
-    8, 3, 210, 224, 8, 3, 210, 221, 8, 3, 210, 244, 8, 3, 210, 228, 8, 3, 
-    210, 182, 8, 3, 210, 178, 8, 3, 210, 212, 8, 3, 210, 189, 8, 3, 210, 185, 
-    8, 3, 210, 186, 8, 3, 210, 162, 8, 3, 210, 161, 8, 3, 210, 169, 8, 3, 
-    210, 165, 8, 3, 210, 163, 8, 3, 210, 164, 8, 34, 224, 33, 8, 34, 232, 
-    241, 8, 34, 234, 61, 8, 34, 227, 141, 8, 34, 249, 69, 8, 34, 218, 192, 8, 
-    34, 243, 12, 8, 34, 243, 44, 8, 34, 230, 230, 8, 34, 240, 180, 8, 34, 
-    232, 56, 8, 34, 252, 83, 8, 34, 230, 126, 8, 34, 210, 244, 8, 34, 224, 
-    121, 8, 34, 240, 174, 8, 34, 217, 46, 8, 34, 243, 135, 8, 34, 210, 5, 8, 
-    34, 249, 63, 8, 34, 248, 95, 8, 34, 251, 98, 8, 34, 243, 8, 8, 34, 227, 
-    131, 8, 34, 215, 118, 8, 34, 226, 175, 8, 34, 235, 74, 8, 34, 210, 19, 8, 
-    34, 224, 100, 8, 34, 241, 108, 8, 34, 210, 250, 8, 34, 212, 112, 8, 34, 
-    219, 200, 8, 34, 213, 244, 8, 34, 210, 116, 8, 34, 235, 68, 8, 34, 227, 
-    96, 8, 34, 235, 72, 8, 34, 242, 154, 8, 34, 235, 92, 8, 34, 211, 227, 8, 
-    34, 246, 78, 8, 34, 219, 213, 8, 34, 232, 236, 8, 34, 249, 73, 8, 34, 
-    249, 105, 8, 34, 250, 37, 8, 34, 240, 177, 8, 34, 220, 72, 8, 34, 210, 4, 
-    8, 34, 219, 254, 8, 34, 250, 131, 8, 34, 209, 231, 8, 34, 229, 173, 8, 
-    34, 234, 182, 232, 196, 1, 252, 191, 232, 196, 1, 190, 232, 196, 1, 225, 
-    147, 232, 196, 1, 248, 221, 232, 196, 1, 217, 105, 232, 196, 1, 216, 208, 
-    232, 196, 1, 243, 135, 232, 196, 1, 176, 232, 196, 1, 234, 132, 232, 196, 
-    1, 235, 141, 232, 196, 1, 251, 33, 232, 196, 1, 250, 157, 232, 196, 1, 
-    246, 38, 232, 196, 1, 215, 183, 232, 196, 1, 215, 175, 232, 196, 1, 184, 
-    232, 196, 1, 197, 232, 196, 1, 233, 135, 232, 196, 1, 206, 232, 196, 1, 
-    210, 82, 232, 196, 1, 210, 116, 232, 196, 1, 229, 77, 232, 196, 1, 162, 
-    232, 196, 1, 211, 165, 232, 196, 1, 241, 189, 232, 196, 1, 244, 196, 232, 
-    196, 1, 212, 65, 232, 196, 1, 220, 102, 232, 196, 1, 191, 232, 196, 1, 
-    242, 249, 232, 196, 1, 61, 232, 196, 1, 254, 243, 232, 196, 1, 75, 232, 
-    196, 1, 245, 55, 232, 196, 1, 73, 232, 196, 1, 76, 232, 196, 1, 70, 232, 
-    196, 1, 214, 214, 232, 196, 1, 214, 208, 232, 196, 1, 226, 234, 232, 196, 
-    1, 138, 230, 32, 216, 117, 232, 196, 1, 138, 229, 229, 225, 16, 232, 196, 
-    1, 138, 230, 32, 249, 72, 232, 196, 1, 138, 230, 32, 251, 205, 232, 196, 
-    1, 138, 230, 32, 197, 232, 196, 1, 138, 230, 32, 235, 115, 232, 196, 224, 
-    141, 249, 219, 232, 196, 224, 141, 243, 229, 218, 129, 41, 3, 245, 209, 
-    41, 3, 245, 205, 41, 3, 241, 220, 41, 3, 212, 17, 41, 3, 212, 16, 41, 3, 
-    225, 211, 41, 3, 252, 13, 41, 3, 252, 66, 41, 3, 231, 116, 41, 3, 233, 
-    247, 41, 3, 231, 6, 41, 3, 243, 75, 41, 3, 244, 147, 41, 3, 213, 250, 41, 
-    3, 217, 11, 41, 3, 216, 194, 41, 3, 248, 16, 41, 3, 248, 13, 41, 3, 233, 
-    50, 41, 3, 223, 108, 41, 3, 248, 77, 41, 3, 229, 139, 41, 3, 221, 170, 
-    41, 3, 220, 61, 41, 3, 210, 92, 41, 3, 210, 73, 41, 3, 250, 182, 41, 3, 
-    235, 124, 41, 3, 228, 176, 41, 3, 211, 44, 41, 3, 234, 181, 41, 3, 229, 
-    51, 41, 3, 243, 55, 41, 3, 231, 80, 41, 3, 229, 103, 41, 3, 227, 155, 41, 
-    3, 73, 41, 3, 235, 255, 41, 3, 241, 180, 41, 3, 241, 160, 41, 3, 211, 
-    250, 41, 3, 211, 241, 41, 3, 225, 108, 41, 3, 252, 11, 41, 3, 252, 6, 41, 
-    3, 231, 109, 41, 3, 233, 244, 41, 3, 231, 3, 41, 3, 243, 71, 41, 3, 244, 
-    121, 41, 3, 213, 176, 41, 3, 216, 117, 41, 3, 216, 175, 41, 3, 248, 8, 
-    41, 3, 248, 12, 41, 3, 232, 241, 41, 3, 223, 35, 41, 3, 248, 3, 41, 3, 
-    229, 133, 41, 3, 219, 191, 41, 3, 220, 32, 41, 3, 210, 44, 41, 3, 210, 
-    69, 41, 3, 250, 51, 41, 3, 235, 108, 41, 3, 228, 169, 41, 3, 211, 8, 41, 
-    3, 234, 92, 41, 3, 229, 43, 41, 3, 242, 214, 41, 3, 230, 230, 41, 3, 228, 
-    233, 41, 3, 227, 148, 41, 3, 61, 41, 3, 254, 123, 41, 3, 229, 72, 41, 3, 
-    162, 41, 3, 242, 18, 41, 3, 212, 65, 41, 3, 212, 55, 41, 3, 190, 41, 3, 
-    252, 18, 41, 3, 252, 191, 41, 3, 231, 124, 41, 3, 233, 251, 41, 3, 233, 
-    250, 41, 3, 231, 10, 41, 3, 243, 79, 41, 3, 244, 196, 41, 3, 214, 27, 41, 
-    3, 217, 105, 41, 3, 216, 208, 41, 3, 248, 25, 41, 3, 248, 15, 41, 3, 233, 
-    135, 41, 3, 205, 41, 3, 248, 221, 41, 3, 229, 148, 41, 3, 206, 41, 3, 
-    220, 102, 41, 3, 210, 116, 41, 3, 210, 82, 41, 3, 251, 33, 41, 3, 235, 
-    141, 41, 3, 228, 185, 41, 3, 191, 41, 3, 176, 41, 3, 234, 234, 41, 3, 
-    229, 56, 41, 3, 243, 135, 41, 3, 184, 41, 3, 197, 41, 3, 227, 165, 41, 3, 
-    226, 183, 41, 3, 226, 179, 41, 3, 241, 53, 41, 3, 211, 215, 41, 3, 211, 
-    211, 41, 3, 224, 249, 41, 3, 252, 9, 41, 3, 251, 193, 41, 3, 231, 104, 
-    41, 3, 233, 242, 41, 3, 230, 255, 41, 3, 243, 67, 41, 3, 244, 34, 41, 3, 
-    213, 127, 41, 3, 216, 17, 41, 3, 216, 153, 41, 3, 248, 6, 41, 3, 248, 10, 
-    41, 3, 232, 127, 41, 3, 222, 197, 41, 3, 247, 125, 41, 3, 229, 120, 41, 
-    3, 219, 40, 41, 3, 220, 1, 41, 3, 210, 21, 41, 3, 210, 66, 41, 3, 249, 
-    174, 41, 3, 235, 59, 41, 3, 228, 159, 41, 3, 210, 229, 41, 3, 234, 10, 
-    41, 3, 229, 41, 41, 3, 242, 164, 41, 3, 230, 132, 41, 3, 228, 64, 41, 3, 
-    227, 132, 41, 3, 70, 41, 3, 214, 190, 41, 3, 240, 222, 41, 3, 240, 212, 
-    41, 3, 211, 195, 41, 3, 211, 189, 41, 3, 224, 150, 41, 3, 252, 8, 41, 3, 
-    251, 125, 41, 3, 231, 103, 41, 3, 233, 240, 41, 3, 230, 254, 41, 3, 243, 
-    66, 41, 3, 243, 234, 41, 3, 212, 116, 41, 3, 215, 118, 41, 3, 216, 136, 
-    41, 3, 248, 4, 41, 3, 248, 9, 41, 3, 232, 98, 41, 3, 222, 140, 41, 3, 
-    246, 78, 41, 3, 229, 115, 41, 3, 218, 83, 41, 3, 219, 225, 41, 3, 210, 
-    13, 41, 3, 210, 62, 41, 3, 249, 112, 41, 3, 235, 51, 41, 3, 228, 155, 41, 
-    3, 210, 212, 41, 3, 233, 217, 41, 3, 229, 40, 41, 3, 242, 113, 41, 3, 
-    230, 102, 41, 3, 227, 237, 41, 3, 227, 128, 41, 3, 76, 41, 3, 226, 196, 
-    41, 3, 229, 0, 41, 3, 241, 68, 41, 3, 241, 56, 41, 3, 211, 227, 41, 3, 
-    211, 216, 41, 3, 225, 16, 41, 3, 252, 10, 41, 3, 251, 205, 41, 3, 231, 
-    105, 41, 3, 233, 243, 41, 3, 231, 1, 41, 3, 243, 69, 41, 3, 243, 68, 41, 
-    3, 244, 43, 41, 3, 213, 138, 41, 3, 111, 41, 3, 216, 156, 41, 3, 248, 7, 
-    41, 3, 248, 11, 41, 3, 232, 156, 41, 3, 222, 211, 41, 3, 247, 145, 41, 3, 
-    229, 124, 41, 3, 219, 58, 41, 3, 220, 7, 41, 3, 210, 23, 41, 3, 210, 67, 
-    41, 3, 249, 238, 41, 3, 235, 68, 41, 3, 228, 160, 41, 3, 210, 244, 41, 3, 
-    234, 28, 41, 3, 229, 42, 41, 3, 242, 174, 41, 3, 230, 161, 41, 3, 228, 
-    74, 41, 3, 227, 134, 41, 3, 75, 41, 3, 245, 150, 41, 3, 229, 61, 41, 3, 
-    241, 238, 41, 3, 241, 209, 41, 3, 212, 22, 41, 3, 212, 12, 41, 3, 225, 
-    221, 41, 3, 252, 14, 41, 3, 252, 75, 41, 3, 231, 117, 41, 3, 233, 248, 
-    41, 3, 233, 246, 41, 3, 231, 7, 41, 3, 243, 76, 41, 3, 243, 74, 41, 3, 
-    244, 154, 41, 3, 213, 255, 41, 3, 217, 22, 41, 3, 216, 195, 41, 3, 248, 
-    17, 41, 3, 248, 14, 41, 3, 233, 58, 41, 3, 223, 128, 41, 3, 248, 90, 41, 
-    3, 229, 140, 41, 3, 221, 181, 41, 3, 220, 63, 41, 3, 210, 94, 41, 3, 210, 
-    74, 41, 3, 250, 190, 41, 3, 235, 126, 41, 3, 228, 178, 41, 3, 211, 47, 
-    41, 3, 234, 182, 41, 3, 229, 52, 41, 3, 229, 48, 41, 3, 243, 62, 41, 3, 
-    243, 51, 41, 3, 231, 91, 41, 3, 229, 107, 41, 3, 227, 156, 41, 3, 229, 
-    79, 41, 3, 233, 22, 41, 249, 219, 41, 243, 229, 218, 129, 41, 224, 13, 
-    78, 41, 3, 229, 123, 244, 196, 41, 3, 229, 123, 176, 41, 3, 229, 123, 
-    219, 40, 41, 16, 244, 144, 41, 16, 234, 180, 41, 16, 216, 81, 41, 16, 
-    228, 208, 41, 16, 252, 147, 41, 16, 244, 195, 41, 16, 217, 101, 41, 16, 
-    248, 176, 41, 16, 247, 124, 41, 16, 233, 206, 41, 16, 216, 21, 41, 16, 
-    247, 144, 41, 16, 235, 60, 41, 21, 210, 86, 41, 21, 110, 41, 21, 105, 41, 
-    21, 158, 41, 21, 161, 41, 21, 189, 41, 21, 194, 41, 21, 198, 41, 21, 195, 
-    41, 21, 200, 41, 3, 229, 123, 184, 41, 3, 229, 123, 247, 145, 33, 6, 1, 
-    210, 90, 33, 4, 1, 210, 90, 33, 6, 1, 246, 34, 33, 4, 1, 246, 34, 33, 6, 
-    1, 223, 49, 246, 36, 33, 4, 1, 223, 49, 246, 36, 33, 6, 1, 235, 185, 33, 
-    4, 1, 235, 185, 33, 6, 1, 247, 161, 33, 4, 1, 247, 161, 33, 6, 1, 230, 
-    140, 214, 205, 33, 4, 1, 230, 140, 214, 205, 33, 6, 1, 251, 136, 226, 
-    201, 33, 4, 1, 251, 136, 226, 201, 33, 6, 1, 229, 87, 211, 31, 33, 4, 1, 
-    229, 87, 211, 31, 33, 6, 1, 211, 28, 2, 252, 185, 211, 31, 33, 4, 1, 211, 
-    28, 2, 252, 185, 211, 31, 33, 6, 1, 235, 183, 211, 59, 33, 4, 1, 235, 
-    183, 211, 59, 33, 6, 1, 223, 49, 210, 212, 33, 4, 1, 223, 49, 210, 212, 
-    33, 6, 1, 235, 183, 61, 33, 4, 1, 235, 183, 61, 33, 6, 1, 250, 0, 232, 
-    192, 210, 183, 33, 4, 1, 250, 0, 232, 192, 210, 183, 33, 6, 1, 251, 214, 
-    210, 183, 33, 4, 1, 251, 214, 210, 183, 33, 6, 1, 235, 183, 250, 0, 232, 
-    192, 210, 183, 33, 4, 1, 235, 183, 250, 0, 232, 192, 210, 183, 33, 6, 1, 
-    210, 246, 33, 4, 1, 210, 246, 33, 6, 1, 223, 49, 215, 178, 33, 4, 1, 223, 
-    49, 215, 178, 33, 6, 1, 219, 52, 248, 90, 33, 4, 1, 219, 52, 248, 90, 33, 
-    6, 1, 219, 52, 245, 174, 33, 4, 1, 219, 52, 245, 174, 33, 6, 1, 219, 52, 
-    245, 159, 33, 4, 1, 219, 52, 245, 159, 33, 6, 1, 230, 144, 76, 33, 4, 1, 
-    230, 144, 76, 33, 6, 1, 251, 240, 76, 33, 4, 1, 251, 240, 76, 33, 6, 1, 
-    52, 230, 144, 76, 33, 4, 1, 52, 230, 144, 76, 33, 1, 230, 86, 76, 38, 33, 
-    212, 100, 38, 33, 216, 248, 230, 191, 50, 38, 33, 240, 211, 230, 191, 50, 
-    38, 33, 216, 148, 230, 191, 50, 219, 93, 253, 216, 38, 33, 1, 214, 202, 
-    236, 60, 38, 33, 1, 73, 38, 33, 1, 211, 8, 38, 33, 1, 70, 38, 33, 1, 242, 
-    3, 50, 38, 33, 1, 211, 27, 38, 33, 1, 219, 52, 50, 38, 33, 1, 226, 201, 
-    38, 33, 234, 192, 38, 33, 225, 227, 33, 234, 192, 33, 225, 227, 33, 6, 1, 
-    246, 46, 33, 4, 1, 246, 46, 33, 6, 1, 246, 27, 33, 4, 1, 246, 27, 33, 6, 
-    1, 210, 52, 33, 4, 1, 210, 52, 33, 6, 1, 250, 206, 33, 4, 1, 250, 206, 
-    33, 6, 1, 246, 25, 33, 4, 1, 246, 25, 33, 6, 1, 217, 23, 2, 230, 224, 
-    103, 33, 4, 1, 217, 23, 2, 230, 224, 103, 33, 6, 1, 215, 78, 33, 4, 1, 
-    215, 78, 33, 6, 1, 215, 160, 33, 4, 1, 215, 160, 33, 6, 1, 215, 164, 33, 
-    4, 1, 215, 164, 33, 6, 1, 217, 28, 33, 4, 1, 217, 28, 33, 6, 1, 240, 198, 
-    33, 4, 1, 240, 198, 33, 6, 1, 219, 206, 33, 4, 1, 219, 206, 38, 33, 1, 
-    235, 183, 75, 20, 1, 61, 20, 1, 176, 20, 1, 70, 20, 1, 233, 217, 20, 1, 
-    245, 209, 20, 1, 223, 108, 20, 1, 217, 86, 20, 1, 76, 20, 1, 227, 148, 
-    20, 1, 73, 20, 1, 233, 135, 20, 1, 190, 20, 1, 222, 239, 20, 1, 223, 29, 
-    20, 1, 233, 49, 20, 1, 231, 79, 20, 1, 217, 101, 20, 1, 229, 146, 20, 1, 
-    228, 183, 20, 1, 193, 20, 1, 218, 4, 20, 1, 230, 102, 20, 1, 220, 27, 20, 
-    1, 219, 191, 20, 1, 220, 37, 20, 1, 220, 123, 20, 1, 233, 155, 20, 1, 
-    234, 156, 20, 1, 227, 209, 20, 1, 227, 237, 20, 1, 228, 154, 20, 1, 210, 
-    226, 20, 1, 219, 225, 20, 1, 210, 187, 20, 1, 191, 20, 1, 228, 9, 20, 1, 
-    234, 142, 20, 1, 225, 151, 20, 1, 228, 176, 20, 1, 227, 246, 20, 1, 224, 
-    144, 20, 1, 211, 192, 20, 1, 225, 211, 20, 1, 244, 147, 20, 1, 222, 140, 
-    20, 1, 232, 98, 20, 1, 230, 230, 20, 1, 228, 233, 20, 1, 223, 51, 20, 1, 
-    223, 171, 20, 1, 234, 165, 20, 1, 229, 7, 20, 1, 229, 56, 20, 1, 229, 77, 
-    20, 1, 220, 7, 20, 1, 224, 147, 20, 1, 243, 234, 20, 1, 244, 37, 20, 1, 
-    212, 65, 20, 1, 197, 20, 1, 232, 241, 20, 1, 225, 108, 20, 1, 232, 119, 
-    20, 1, 234, 28, 20, 1, 231, 114, 20, 1, 223, 83, 20, 1, 231, 58, 20, 1, 
-    184, 20, 1, 216, 117, 20, 1, 234, 92, 20, 1, 230, 161, 20, 1, 231, 122, 
-    20, 1, 216, 230, 20, 1, 233, 251, 20, 1, 216, 247, 20, 1, 227, 238, 20, 
-    1, 221, 251, 20, 1, 244, 192, 20, 1, 233, 253, 20, 1, 234, 24, 20, 38, 
-    164, 234, 5, 20, 38, 164, 215, 110, 20, 228, 182, 20, 243, 229, 218, 129, 
-    20, 249, 226, 20, 249, 219, 20, 220, 150, 20, 224, 13, 78, 58, 1, 250, 
-    96, 138, 210, 254, 225, 61, 58, 1, 250, 96, 138, 211, 70, 225, 61, 58, 1, 
-    250, 96, 138, 210, 254, 220, 84, 58, 1, 250, 96, 138, 211, 70, 220, 84, 
-    58, 1, 250, 96, 138, 210, 254, 224, 30, 58, 1, 250, 96, 138, 211, 70, 
-    224, 30, 58, 1, 250, 96, 138, 210, 254, 222, 140, 58, 1, 250, 96, 138, 
-    211, 70, 222, 140, 58, 1, 245, 20, 246, 118, 138, 130, 58, 1, 125, 246, 
-    118, 138, 130, 58, 1, 230, 225, 246, 118, 138, 130, 58, 1, 121, 246, 118, 
-    138, 130, 58, 1, 245, 19, 246, 118, 138, 130, 58, 1, 245, 20, 246, 118, 
-    233, 39, 138, 130, 58, 1, 125, 246, 118, 233, 39, 138, 130, 58, 1, 230, 
-    225, 246, 118, 233, 39, 138, 130, 58, 1, 121, 246, 118, 233, 39, 138, 
-    130, 58, 1, 245, 19, 246, 118, 233, 39, 138, 130, 58, 1, 245, 20, 233, 
-    39, 138, 130, 58, 1, 125, 233, 39, 138, 130, 58, 1, 230, 225, 233, 39, 
-    138, 130, 58, 1, 121, 233, 39, 138, 130, 58, 1, 245, 19, 233, 39, 138, 
-    130, 58, 1, 59, 67, 130, 58, 1, 59, 219, 95, 58, 1, 59, 203, 130, 58, 1, 
-    232, 108, 44, 249, 161, 254, 109, 58, 1, 223, 157, 120, 74, 58, 1, 223, 
-    157, 124, 74, 58, 1, 223, 157, 245, 31, 78, 58, 1, 223, 157, 235, 193, 
-    245, 31, 78, 58, 1, 121, 235, 193, 245, 31, 78, 58, 1, 218, 111, 22, 125, 
-    216, 30, 58, 1, 218, 111, 22, 121, 216, 30, 7, 6, 1, 245, 199, 254, 170, 
-    7, 4, 1, 245, 199, 254, 170, 7, 6, 1, 245, 199, 254, 196, 7, 4, 1, 245, 
-    199, 254, 196, 7, 6, 1, 241, 207, 7, 4, 1, 241, 207, 7, 6, 1, 215, 40, 7, 
-    4, 1, 215, 40, 7, 6, 1, 215, 229, 7, 4, 1, 215, 229, 7, 6, 1, 249, 110, 
-    7, 4, 1, 249, 110, 7, 6, 1, 249, 111, 2, 249, 219, 7, 4, 1, 249, 111, 2, 
-    249, 219, 7, 1, 4, 6, 245, 6, 7, 1, 4, 6, 222, 91, 7, 6, 1, 255, 73, 7, 
-    4, 1, 255, 73, 7, 6, 1, 254, 73, 7, 4, 1, 254, 73, 7, 6, 1, 253, 192, 7, 
-    4, 1, 253, 192, 7, 6, 1, 253, 176, 7, 4, 1, 253, 176, 7, 6, 1, 253, 177, 
-    2, 203, 130, 7, 4, 1, 253, 177, 2, 203, 130, 7, 6, 1, 253, 167, 7, 4, 1, 
-    253, 167, 7, 6, 1, 223, 49, 251, 67, 2, 247, 120, 7, 4, 1, 223, 49, 251, 
-    67, 2, 247, 120, 7, 6, 1, 235, 24, 2, 91, 7, 4, 1, 235, 24, 2, 91, 7, 6, 
-    1, 235, 24, 2, 247, 255, 91, 7, 4, 1, 235, 24, 2, 247, 255, 91, 7, 6, 1, 
-    235, 24, 2, 218, 103, 22, 247, 255, 91, 7, 4, 1, 235, 24, 2, 218, 103, 
-    22, 247, 255, 91, 7, 6, 1, 251, 135, 156, 7, 4, 1, 251, 135, 156, 7, 6, 
-    1, 233, 149, 2, 125, 91, 7, 4, 1, 233, 149, 2, 125, 91, 7, 6, 1, 144, 2, 
-    199, 218, 103, 226, 120, 7, 4, 1, 144, 2, 199, 218, 103, 226, 120, 7, 6, 
-    1, 144, 2, 232, 123, 7, 4, 1, 144, 2, 232, 123, 7, 6, 1, 226, 183, 7, 4, 
-    1, 226, 183, 7, 6, 1, 226, 106, 2, 218, 103, 216, 139, 248, 39, 7, 4, 1, 
-    226, 106, 2, 218, 103, 216, 139, 248, 39, 7, 6, 1, 226, 106, 2, 244, 53, 
-    7, 4, 1, 226, 106, 2, 244, 53, 7, 6, 1, 226, 106, 2, 218, 229, 217, 77, 
-    7, 4, 1, 226, 106, 2, 218, 229, 217, 77, 7, 6, 1, 224, 97, 2, 218, 103, 
-    216, 139, 248, 39, 7, 4, 1, 224, 97, 2, 218, 103, 216, 139, 248, 39, 7, 
-    6, 1, 224, 97, 2, 247, 255, 91, 7, 4, 1, 224, 97, 2, 247, 255, 91, 7, 6, 
-    1, 223, 224, 222, 186, 7, 4, 1, 223, 224, 222, 186, 7, 6, 1, 222, 130, 
-    222, 186, 7, 4, 1, 222, 130, 222, 186, 7, 6, 1, 214, 106, 2, 247, 255, 
-    91, 7, 4, 1, 214, 106, 2, 247, 255, 91, 7, 6, 1, 212, 106, 7, 4, 1, 212, 
-    106, 7, 6, 1, 213, 145, 210, 159, 7, 4, 1, 213, 145, 210, 159, 7, 6, 1, 
-    216, 152, 2, 91, 7, 4, 1, 216, 152, 2, 91, 7, 6, 1, 216, 152, 2, 218, 
-    103, 216, 139, 248, 39, 7, 4, 1, 216, 152, 2, 218, 103, 216, 139, 248, 
-    39, 7, 6, 1, 213, 245, 7, 4, 1, 213, 245, 7, 6, 1, 245, 65, 7, 4, 1, 245, 
-    65, 7, 6, 1, 235, 171, 7, 4, 1, 235, 171, 7, 6, 1, 249, 207, 7, 4, 1, 
-    249, 207, 58, 1, 214, 133, 7, 4, 1, 246, 69, 7, 4, 1, 232, 84, 7, 4, 1, 
-    230, 80, 7, 4, 1, 227, 201, 7, 4, 1, 222, 129, 7, 1, 4, 6, 222, 129, 7, 
-    4, 1, 215, 108, 7, 4, 1, 214, 197, 7, 6, 1, 235, 213, 249, 60, 7, 4, 1, 
-    235, 213, 249, 60, 7, 6, 1, 235, 213, 245, 6, 7, 4, 1, 235, 213, 245, 6, 
-    7, 6, 1, 235, 213, 243, 202, 7, 6, 1, 215, 94, 235, 213, 243, 202, 7, 4, 
-    1, 215, 94, 235, 213, 243, 202, 7, 6, 1, 215, 94, 156, 7, 4, 1, 215, 94, 
-    156, 7, 6, 1, 235, 213, 153, 7, 4, 1, 235, 213, 153, 7, 6, 1, 235, 213, 
-    222, 91, 7, 4, 1, 235, 213, 222, 91, 7, 6, 1, 235, 213, 217, 152, 7, 4, 
-    1, 235, 213, 217, 152, 58, 1, 121, 250, 31, 255, 14, 58, 1, 249, 226, 58, 
-    1, 219, 251, 245, 98, 50, 7, 6, 1, 221, 255, 7, 4, 1, 221, 255, 7, 6, 1, 
-    215, 94, 242, 60, 7, 4, 1, 233, 149, 2, 223, 55, 241, 52, 22, 252, 41, 7, 
-    6, 1, 230, 26, 2, 248, 39, 7, 4, 1, 230, 26, 2, 248, 39, 7, 6, 1, 251, 
-    67, 2, 130, 7, 4, 1, 251, 67, 2, 130, 7, 6, 1, 243, 203, 2, 226, 248, 91, 
-    7, 4, 1, 243, 203, 2, 226, 248, 91, 7, 6, 1, 235, 24, 2, 226, 248, 91, 7, 
-    4, 1, 235, 24, 2, 226, 248, 91, 7, 6, 1, 230, 26, 2, 226, 248, 91, 7, 4, 
-    1, 230, 26, 2, 226, 248, 91, 7, 6, 1, 223, 224, 2, 226, 248, 91, 7, 4, 1, 
-    223, 224, 2, 226, 248, 91, 7, 6, 1, 222, 92, 2, 226, 248, 91, 7, 4, 1, 
-    222, 92, 2, 226, 248, 91, 7, 6, 1, 242, 61, 2, 103, 58, 1, 6, 242, 61, 2, 
-    91, 58, 1, 4, 27, 226, 234, 7, 1, 4, 6, 215, 94, 193, 7, 245, 103, 1, 
-    223, 49, 245, 6, 7, 245, 103, 1, 223, 49, 226, 105, 7, 245, 103, 1, 235, 
-    193, 193, 7, 245, 103, 1, 240, 154, 232, 129, 7, 245, 103, 1, 254, 23, 
-    193, 217, 230, 229, 214, 1, 61, 217, 230, 229, 214, 1, 73, 217, 230, 229, 
-    214, 5, 246, 48, 217, 230, 229, 214, 1, 70, 217, 230, 229, 214, 1, 75, 
-    217, 230, 229, 214, 1, 76, 217, 230, 229, 214, 5, 241, 253, 217, 230, 
-    229, 214, 1, 234, 28, 217, 230, 229, 214, 1, 234, 105, 217, 230, 229, 
-    214, 1, 242, 174, 217, 230, 229, 214, 1, 242, 224, 217, 230, 229, 214, 5, 
-    254, 75, 217, 230, 229, 214, 1, 249, 238, 217, 230, 229, 214, 1, 250, 86, 
-    217, 230, 229, 214, 1, 235, 68, 217, 230, 229, 214, 1, 235, 109, 217, 
-    230, 229, 214, 1, 215, 133, 217, 230, 229, 214, 1, 215, 139, 217, 230, 
-    229, 214, 1, 248, 105, 217, 230, 229, 214, 1, 248, 114, 217, 230, 229, 
-    214, 1, 111, 217, 230, 229, 214, 1, 216, 156, 217, 230, 229, 214, 1, 247, 
-    145, 217, 230, 229, 214, 1, 248, 7, 217, 230, 229, 214, 1, 228, 74, 217, 
-    230, 229, 214, 1, 225, 16, 217, 230, 229, 214, 1, 225, 121, 217, 230, 
-    229, 214, 1, 251, 205, 217, 230, 229, 214, 1, 252, 10, 217, 230, 229, 
-    214, 1, 230, 161, 217, 230, 229, 214, 1, 222, 211, 217, 230, 229, 214, 1, 
-    232, 156, 217, 230, 229, 214, 1, 222, 165, 217, 230, 229, 214, 1, 219, 
-    58, 217, 230, 229, 214, 1, 241, 68, 217, 230, 229, 214, 25, 5, 61, 217, 
-    230, 229, 214, 25, 5, 73, 217, 230, 229, 214, 25, 5, 70, 217, 230, 229, 
-    214, 25, 5, 75, 217, 230, 229, 214, 25, 5, 226, 183, 217, 230, 229, 214, 
-    225, 12, 231, 158, 217, 230, 229, 214, 225, 12, 231, 157, 217, 230, 229, 
-    214, 225, 12, 231, 156, 217, 230, 229, 214, 225, 12, 231, 155, 228, 56, 
-    235, 240, 244, 2, 123, 224, 21, 228, 56, 235, 240, 244, 2, 123, 242, 27, 
-    228, 56, 235, 240, 244, 2, 134, 224, 19, 228, 56, 235, 240, 244, 2, 123, 
-    219, 117, 228, 56, 235, 240, 244, 2, 123, 245, 188, 228, 56, 235, 240, 
-    244, 2, 134, 219, 116, 228, 56, 235, 240, 224, 22, 78, 228, 56, 235, 240, 
-    225, 40, 78, 228, 56, 235, 240, 222, 118, 78, 228, 56, 235, 240, 224, 23, 
-    78, 225, 144, 1, 176, 225, 144, 1, 234, 132, 225, 144, 1, 243, 135, 225, 
-    144, 1, 229, 77, 225, 144, 1, 251, 33, 225, 144, 1, 250, 157, 225, 144, 
-    1, 235, 141, 225, 144, 1, 227, 165, 225, 144, 1, 217, 105, 225, 144, 1, 
-    216, 208, 225, 144, 1, 248, 221, 225, 144, 1, 197, 225, 144, 1, 190, 225, 
-    144, 1, 225, 147, 225, 144, 1, 252, 191, 225, 144, 1, 184, 225, 144, 1, 
-    215, 183, 225, 144, 1, 215, 175, 225, 144, 1, 246, 38, 225, 144, 1, 212, 
-    65, 225, 144, 1, 210, 82, 225, 144, 1, 210, 116, 225, 144, 1, 4, 61, 225, 
-    144, 1, 191, 225, 144, 1, 205, 225, 144, 1, 233, 135, 225, 144, 1, 220, 
-    102, 225, 144, 1, 206, 225, 144, 1, 162, 225, 144, 1, 61, 225, 144, 1, 
-    73, 225, 144, 1, 70, 225, 144, 1, 75, 225, 144, 1, 76, 225, 144, 1, 224, 
-    88, 225, 144, 1, 211, 165, 225, 144, 1, 244, 196, 225, 144, 1, 243, 29, 
-    225, 144, 1, 245, 209, 225, 144, 218, 73, 1, 212, 65, 225, 144, 218, 73, 
-    1, 191, 225, 144, 1, 215, 156, 225, 144, 1, 215, 144, 225, 144, 1, 248, 
-    135, 225, 144, 1, 228, 110, 225, 144, 1, 254, 141, 191, 225, 144, 1, 213, 
-    134, 220, 102, 225, 144, 1, 213, 135, 162, 225, 144, 1, 253, 223, 244, 
-    196, 225, 144, 218, 73, 1, 205, 225, 144, 218, 25, 1, 205, 225, 144, 1, 
-    250, 255, 225, 144, 219, 155, 241, 236, 78, 225, 144, 52, 241, 236, 78, 
-    225, 144, 164, 220, 95, 225, 144, 164, 52, 220, 95, 179, 5, 254, 75, 179, 
-    5, 213, 147, 179, 1, 61, 179, 1, 255, 73, 179, 1, 73, 179, 1, 236, 33, 
-    179, 1, 70, 179, 1, 214, 118, 179, 1, 149, 153, 179, 1, 149, 222, 180, 
-    179, 1, 149, 156, 179, 1, 149, 232, 185, 179, 1, 75, 179, 1, 245, 209, 
-    179, 1, 254, 201, 179, 1, 76, 179, 1, 226, 183, 179, 1, 253, 192, 179, 1, 
-    176, 179, 1, 234, 132, 179, 1, 243, 135, 179, 1, 242, 249, 179, 1, 229, 
-    77, 179, 1, 251, 33, 179, 1, 250, 157, 179, 1, 235, 141, 179, 1, 235, 
-    114, 179, 1, 227, 165, 179, 1, 215, 156, 179, 1, 215, 144, 179, 1, 248, 
-    135, 179, 1, 248, 119, 179, 1, 228, 110, 179, 1, 217, 105, 179, 1, 216, 
-    208, 179, 1, 248, 221, 179, 1, 248, 25, 179, 1, 197, 179, 1, 190, 179, 1, 
-    225, 147, 179, 1, 252, 191, 179, 1, 252, 18, 179, 1, 184, 179, 1, 191, 
-    179, 1, 205, 179, 1, 233, 135, 179, 1, 214, 27, 179, 1, 220, 102, 179, 1, 
-    218, 223, 179, 1, 206, 179, 1, 162, 179, 1, 232, 184, 179, 116, 5, 242, 
-    44, 179, 25, 5, 255, 73, 179, 25, 5, 73, 179, 25, 5, 236, 33, 179, 25, 5, 
+    210, 203, 24, 1, 210, 204, 24, 1, 210, 207, 24, 1, 254, 35, 24, 1, 254, 
+    29, 109, 254, 100, 232, 204, 78, 109, 254, 100, 223, 51, 78, 109, 254, 
+    100, 123, 78, 109, 254, 100, 113, 78, 109, 254, 100, 134, 78, 109, 254, 
+    100, 244, 12, 78, 109, 254, 100, 216, 15, 78, 109, 254, 100, 230, 225, 
+    78, 109, 254, 100, 251, 176, 78, 109, 254, 100, 244, 93, 78, 109, 254, 
+    100, 221, 177, 78, 109, 254, 100, 216, 170, 78, 109, 254, 100, 244, 5, 
+    78, 109, 254, 100, 241, 225, 78, 109, 254, 100, 245, 225, 78, 109, 254, 
+    100, 231, 187, 78, 251, 185, 1, 251, 126, 251, 185, 1, 210, 44, 251, 185, 
+    1, 235, 109, 251, 185, 1, 242, 114, 251, 185, 1, 245, 210, 251, 185, 1, 
+    245, 136, 251, 185, 1, 226, 184, 251, 185, 1, 226, 188, 251, 185, 1, 235, 
+    180, 251, 185, 1, 254, 102, 251, 185, 1, 235, 225, 251, 185, 1, 214, 168, 
+    251, 185, 1, 236, 17, 251, 185, 1, 229, 58, 251, 185, 1, 254, 196, 251, 
+    185, 1, 253, 188, 251, 185, 1, 254, 137, 251, 185, 1, 226, 205, 251, 185, 
+    1, 226, 190, 251, 185, 1, 235, 222, 251, 185, 40, 1, 226, 106, 251, 185, 
+    40, 1, 217, 153, 251, 185, 40, 1, 235, 24, 251, 185, 40, 1, 242, 61, 251, 
+    185, 1, 242, 251, 251, 185, 1, 233, 0, 251, 185, 1, 209, 250, 9, 218, 
+    104, 217, 153, 9, 218, 104, 212, 4, 9, 218, 104, 211, 158, 9, 218, 104, 
+    251, 80, 9, 218, 104, 217, 255, 9, 218, 104, 240, 159, 9, 218, 104, 240, 
+    163, 9, 218, 104, 240, 232, 9, 218, 104, 240, 160, 9, 218, 104, 217, 156, 
+    9, 218, 104, 240, 162, 9, 218, 104, 240, 158, 9, 218, 104, 240, 230, 9, 
+    218, 104, 240, 161, 9, 218, 104, 240, 157, 9, 218, 104, 230, 26, 9, 218, 
+    104, 242, 61, 9, 218, 104, 222, 92, 9, 218, 104, 226, 106, 9, 218, 104, 
+    219, 22, 9, 218, 104, 249, 61, 9, 218, 104, 240, 164, 9, 218, 104, 241, 
+    191, 9, 218, 104, 217, 165, 9, 218, 104, 217, 234, 9, 218, 104, 218, 169, 
+    9, 218, 104, 220, 111, 9, 218, 104, 225, 225, 9, 218, 104, 224, 99, 9, 
+    218, 104, 216, 44, 9, 218, 104, 217, 155, 9, 218, 104, 217, 245, 9, 218, 
+    104, 240, 171, 9, 218, 104, 240, 156, 9, 218, 104, 225, 150, 9, 218, 104, 
+    224, 97, 56, 1, 4, 233, 218, 56, 1, 4, 219, 192, 56, 1, 4, 218, 84, 56, 
+    1, 4, 111, 56, 1, 4, 227, 238, 56, 1, 4, 162, 56, 1, 4, 241, 181, 56, 1, 
+    4, 240, 223, 56, 1, 4, 241, 239, 56, 1, 4, 241, 69, 56, 1, 4, 230, 103, 
+    56, 1, 4, 205, 56, 1, 4, 223, 36, 56, 1, 4, 222, 141, 56, 1, 4, 223, 129, 
+    56, 1, 4, 222, 212, 88, 24, 234, 59, 88, 24, 228, 227, 88, 24, 216, 102, 
+    88, 24, 223, 27, 88, 24, 230, 218, 88, 24, 225, 96, 88, 24, 219, 149, 88, 
+    24, 236, 57, 88, 24, 250, 47, 88, 24, 250, 107, 88, 24, 234, 111, 88, 24, 
+    216, 174, 88, 24, 225, 132, 88, 24, 241, 173, 88, 24, 234, 60, 61, 88, 
+    24, 228, 228, 61, 88, 24, 216, 103, 61, 88, 24, 223, 28, 61, 88, 24, 230, 
+    219, 61, 88, 24, 225, 97, 61, 88, 24, 219, 150, 61, 88, 24, 236, 58, 61, 
+    88, 24, 250, 48, 61, 88, 24, 250, 108, 61, 88, 24, 234, 112, 61, 88, 24, 
+    216, 175, 61, 88, 24, 225, 133, 61, 88, 24, 241, 174, 61, 88, 24, 250, 
+    48, 70, 88, 234, 4, 135, 226, 218, 88, 234, 4, 135, 144, 240, 223, 88, 
+    154, 110, 88, 154, 105, 88, 154, 158, 88, 154, 161, 88, 154, 189, 88, 
+    154, 194, 88, 154, 198, 88, 154, 195, 88, 154, 200, 88, 154, 216, 248, 
+    88, 154, 230, 129, 88, 154, 244, 97, 88, 154, 212, 40, 88, 154, 211, 214, 
+    88, 154, 231, 40, 88, 154, 245, 224, 88, 154, 218, 38, 88, 154, 218, 133, 
+    88, 154, 241, 245, 88, 154, 219, 55, 88, 154, 229, 205, 88, 154, 219, 5, 
+    88, 154, 244, 103, 88, 154, 249, 201, 88, 154, 233, 126, 88, 154, 223, 
+    72, 88, 154, 251, 16, 88, 154, 218, 88, 88, 154, 218, 21, 88, 154, 245, 
+    128, 88, 154, 223, 64, 88, 154, 254, 151, 88, 154, 244, 129, 88, 154, 
+    223, 62, 88, 154, 220, 157, 88, 154, 223, 128, 37, 154, 224, 13, 37, 154, 
+    234, 81, 37, 154, 221, 199, 37, 154, 234, 0, 37, 54, 216, 249, 226, 198, 
+    85, 218, 235, 37, 54, 215, 74, 226, 198, 85, 218, 235, 37, 54, 216, 164, 
+    226, 198, 85, 218, 235, 37, 54, 244, 17, 226, 198, 85, 218, 235, 37, 54, 
+    244, 116, 226, 198, 85, 218, 235, 37, 54, 219, 113, 226, 198, 85, 218, 
+    235, 37, 54, 220, 118, 226, 198, 85, 218, 235, 37, 54, 245, 186, 226, 
+    198, 85, 218, 235, 225, 252, 50, 37, 54, 215, 74, 110, 37, 54, 215, 74, 
+    105, 37, 54, 215, 74, 158, 37, 54, 215, 74, 161, 37, 54, 215, 74, 189, 
+    37, 54, 215, 74, 194, 37, 54, 215, 74, 198, 37, 54, 215, 74, 195, 37, 54, 
+    215, 74, 200, 37, 54, 216, 163, 37, 54, 216, 164, 110, 37, 54, 216, 164, 
+    105, 37, 54, 216, 164, 158, 37, 54, 216, 164, 161, 37, 54, 216, 164, 189, 
+    37, 24, 234, 59, 37, 24, 228, 227, 37, 24, 216, 102, 37, 24, 223, 27, 37, 
+    24, 230, 218, 37, 24, 225, 96, 37, 24, 219, 149, 37, 24, 236, 57, 37, 24, 
+    250, 47, 37, 24, 250, 107, 37, 24, 234, 111, 37, 24, 216, 174, 37, 24, 
+    225, 132, 37, 24, 241, 173, 37, 24, 234, 60, 61, 37, 24, 228, 228, 61, 
+    37, 24, 216, 103, 61, 37, 24, 223, 28, 61, 37, 24, 230, 219, 61, 37, 24, 
+    225, 97, 61, 37, 24, 219, 150, 61, 37, 24, 236, 58, 61, 37, 24, 250, 48, 
+    61, 37, 24, 250, 108, 61, 37, 24, 234, 112, 61, 37, 24, 216, 175, 61, 37, 
+    24, 225, 133, 61, 37, 24, 241, 174, 61, 37, 234, 4, 135, 250, 149, 37, 
+    234, 4, 135, 235, 48, 37, 24, 236, 58, 70, 234, 4, 218, 160, 87, 37, 154, 
+    110, 37, 154, 105, 37, 154, 158, 37, 154, 161, 37, 154, 189, 37, 154, 
+    194, 37, 154, 198, 37, 154, 195, 37, 154, 200, 37, 154, 216, 248, 37, 
+    154, 230, 129, 37, 154, 244, 97, 37, 154, 212, 40, 37, 154, 211, 214, 37, 
+    154, 231, 40, 37, 154, 245, 224, 37, 154, 218, 38, 37, 154, 218, 133, 37, 
+    154, 241, 245, 37, 154, 219, 55, 37, 154, 229, 205, 37, 154, 219, 5, 37, 
+    154, 244, 103, 37, 154, 249, 201, 37, 154, 233, 126, 37, 154, 221, 175, 
+    37, 154, 231, 190, 37, 154, 244, 138, 37, 154, 218, 50, 37, 154, 245, 35, 
+    37, 154, 224, 188, 37, 154, 253, 197, 37, 154, 235, 160, 37, 154, 223, 
+    62, 37, 154, 249, 165, 37, 154, 249, 156, 37, 154, 241, 166, 37, 154, 
+    250, 175, 37, 154, 232, 111, 37, 154, 233, 47, 37, 154, 222, 252, 37, 
+    154, 231, 84, 37, 154, 223, 88, 37, 154, 218, 88, 37, 154, 218, 21, 37, 
+    154, 245, 128, 37, 154, 223, 64, 37, 154, 254, 151, 37, 154, 228, 213, 
+    37, 54, 216, 164, 194, 37, 54, 216, 164, 198, 37, 54, 216, 164, 195, 37, 
+    54, 216, 164, 200, 37, 54, 244, 16, 37, 54, 244, 17, 110, 37, 54, 244, 
+    17, 105, 37, 54, 244, 17, 158, 37, 54, 244, 17, 161, 37, 54, 244, 17, 
+    189, 37, 54, 244, 17, 194, 37, 54, 244, 17, 198, 37, 54, 244, 17, 195, 
+    37, 54, 244, 17, 200, 37, 54, 244, 115, 109, 217, 4, 16, 31, 235, 134, 
+    109, 217, 4, 16, 31, 244, 149, 109, 217, 4, 16, 31, 231, 161, 109, 217, 
+    4, 16, 31, 254, 48, 109, 217, 4, 16, 31, 231, 133, 109, 217, 4, 16, 31, 
+    235, 46, 109, 217, 4, 16, 31, 235, 47, 109, 217, 4, 16, 31, 253, 189, 
+    109, 217, 4, 16, 31, 220, 137, 109, 217, 4, 16, 31, 226, 240, 109, 217, 
+    4, 16, 31, 228, 41, 109, 217, 4, 16, 31, 248, 86, 42, 241, 191, 42, 245, 
+    89, 42, 245, 44, 232, 220, 232, 241, 50, 37, 56, 61, 37, 56, 73, 37, 56, 
+    70, 37, 56, 75, 37, 56, 76, 37, 56, 176, 37, 56, 234, 93, 37, 56, 233, 
+    218, 37, 56, 234, 183, 37, 56, 234, 29, 37, 56, 206, 37, 56, 219, 192, 
+    37, 56, 218, 84, 37, 56, 221, 182, 37, 56, 219, 59, 37, 56, 217, 106, 37, 
+    56, 216, 118, 37, 56, 215, 119, 37, 56, 217, 23, 37, 56, 111, 37, 56, 
+    197, 37, 56, 228, 234, 37, 56, 227, 238, 37, 56, 229, 108, 37, 56, 228, 
+    75, 37, 56, 162, 37, 56, 241, 181, 37, 56, 240, 223, 37, 56, 241, 239, 
+    37, 56, 241, 69, 37, 56, 185, 37, 56, 230, 231, 37, 56, 230, 103, 37, 56, 
+    231, 92, 37, 56, 230, 162, 37, 56, 191, 37, 56, 210, 212, 37, 56, 210, 
+    244, 37, 56, 205, 37, 56, 223, 36, 37, 56, 222, 141, 37, 56, 223, 129, 
+    37, 56, 222, 212, 37, 56, 212, 65, 37, 56, 211, 250, 37, 56, 212, 22, 37, 
+    56, 211, 227, 42, 254, 72, 42, 253, 240, 42, 254, 96, 42, 255, 32, 42, 
+    235, 227, 42, 235, 197, 42, 214, 166, 42, 245, 67, 42, 245, 207, 42, 226, 
+    187, 42, 226, 181, 42, 234, 246, 42, 234, 215, 42, 234, 212, 42, 243, 93, 
+    42, 243, 102, 42, 242, 205, 42, 242, 201, 42, 233, 151, 42, 242, 194, 42, 
+    234, 73, 42, 234, 72, 42, 234, 71, 42, 234, 70, 42, 242, 87, 42, 242, 86, 
+    42, 233, 194, 42, 233, 196, 42, 234, 179, 42, 234, 2, 42, 234, 9, 42, 
+    222, 17, 42, 221, 238, 42, 219, 130, 42, 220, 142, 42, 220, 141, 42, 248, 
+    219, 42, 248, 37, 42, 247, 122, 42, 216, 33, 42, 229, 201, 42, 228, 42, 
+    42, 242, 33, 42, 226, 85, 42, 226, 84, 42, 252, 189, 42, 225, 106, 42, 
+    225, 70, 42, 225, 71, 42, 251, 235, 42, 240, 222, 42, 240, 218, 42, 251, 
+    92, 42, 240, 205, 42, 241, 216, 42, 225, 160, 42, 225, 195, 42, 241, 199, 
+    42, 225, 192, 42, 225, 208, 42, 252, 62, 42, 225, 7, 42, 251, 181, 42, 
+    241, 57, 42, 224, 251, 42, 241, 49, 42, 241, 51, 42, 231, 202, 42, 231, 
+    198, 42, 231, 207, 42, 231, 151, 42, 231, 176, 42, 230, 198, 42, 230, 
+    177, 42, 230, 176, 42, 231, 75, 42, 231, 72, 42, 231, 76, 42, 211, 102, 
+    42, 211, 100, 42, 210, 201, 42, 222, 227, 42, 222, 231, 42, 222, 118, 42, 
+    222, 112, 42, 223, 86, 42, 223, 83, 42, 212, 38, 109, 217, 4, 16, 31, 
+    240, 240, 210, 86, 109, 217, 4, 16, 31, 240, 240, 110, 109, 217, 4, 16, 
+    31, 240, 240, 105, 109, 217, 4, 16, 31, 240, 240, 158, 109, 217, 4, 16, 
+    31, 240, 240, 161, 109, 217, 4, 16, 31, 240, 240, 189, 109, 217, 4, 16, 
+    31, 240, 240, 194, 109, 217, 4, 16, 31, 240, 240, 198, 109, 217, 4, 16, 
+    31, 240, 240, 195, 109, 217, 4, 16, 31, 240, 240, 200, 109, 217, 4, 16, 
+    31, 240, 240, 216, 248, 109, 217, 4, 16, 31, 240, 240, 245, 168, 109, 
+    217, 4, 16, 31, 240, 240, 215, 76, 109, 217, 4, 16, 31, 240, 240, 216, 
+    165, 109, 217, 4, 16, 31, 240, 240, 244, 6, 109, 217, 4, 16, 31, 240, 
+    240, 244, 119, 109, 217, 4, 16, 31, 240, 240, 219, 120, 109, 217, 4, 16, 
+    31, 240, 240, 220, 120, 109, 217, 4, 16, 31, 240, 240, 245, 191, 109, 
+    217, 4, 16, 31, 240, 240, 228, 198, 109, 217, 4, 16, 31, 240, 240, 215, 
+    73, 109, 217, 4, 16, 31, 240, 240, 215, 67, 109, 217, 4, 16, 31, 240, 
+    240, 215, 63, 109, 217, 4, 16, 31, 240, 240, 215, 64, 109, 217, 4, 16, 
+    31, 240, 240, 215, 69, 42, 240, 231, 42, 248, 222, 42, 253, 193, 42, 130, 
+    42, 226, 126, 42, 225, 226, 42, 247, 148, 42, 247, 149, 218, 234, 42, 
+    247, 149, 249, 109, 42, 235, 157, 42, 245, 92, 229, 206, 241, 217, 42, 
+    245, 92, 229, 206, 217, 175, 42, 245, 92, 229, 206, 217, 75, 42, 245, 92, 
+    229, 206, 231, 71, 42, 249, 158, 42, 226, 91, 254, 126, 42, 197, 42, 230, 
+    104, 61, 42, 185, 42, 176, 42, 234, 186, 42, 231, 130, 42, 243, 81, 42, 
+    251, 19, 42, 234, 185, 42, 225, 151, 42, 229, 82, 42, 230, 104, 245, 7, 
+    42, 230, 104, 243, 203, 42, 231, 16, 42, 234, 135, 42, 240, 164, 42, 234, 
+    95, 42, 230, 233, 42, 242, 217, 42, 216, 120, 42, 230, 104, 156, 42, 230, 
+    170, 42, 247, 158, 42, 234, 41, 42, 244, 46, 42, 228, 113, 42, 230, 104, 
+    193, 42, 230, 167, 42, 249, 240, 42, 234, 35, 42, 230, 168, 218, 234, 42, 
+    249, 241, 218, 234, 42, 232, 51, 218, 234, 42, 234, 36, 218, 234, 42, 
+    230, 168, 249, 109, 42, 249, 241, 249, 109, 42, 232, 51, 249, 109, 42, 
+    234, 36, 249, 109, 42, 232, 51, 117, 222, 92, 42, 232, 51, 117, 222, 93, 
+    218, 234, 42, 190, 42, 233, 252, 42, 230, 106, 42, 242, 152, 42, 223, 
+    177, 42, 223, 178, 117, 222, 92, 42, 223, 178, 117, 222, 93, 218, 234, 
+    42, 224, 163, 42, 228, 14, 42, 230, 104, 222, 92, 42, 230, 105, 42, 224, 
+    117, 42, 227, 177, 42, 230, 104, 214, 105, 42, 230, 50, 42, 233, 186, 42, 
+    230, 51, 231, 75, 42, 224, 116, 42, 227, 176, 42, 230, 104, 212, 98, 42, 
+    230, 44, 42, 233, 184, 42, 230, 45, 231, 75, 42, 235, 25, 226, 221, 42, 
+    232, 51, 226, 221, 42, 254, 137, 42, 251, 161, 42, 250, 215, 42, 250, 
+    192, 42, 251, 68, 117, 234, 135, 42, 249, 239, 42, 248, 143, 42, 242, 73, 
+    42, 162, 42, 240, 232, 42, 236, 0, 42, 234, 48, 42, 234, 36, 250, 251, 
+    42, 233, 220, 42, 232, 160, 42, 232, 159, 42, 232, 148, 42, 232, 64, 42, 
+    231, 131, 219, 80, 42, 230, 197, 42, 230, 153, 42, 225, 149, 42, 225, 20, 
+    42, 224, 220, 42, 224, 218, 42, 218, 228, 42, 218, 3, 42, 212, 24, 42, 
+    214, 106, 117, 193, 42, 115, 117, 193, 109, 217, 4, 16, 31, 248, 147, 
+    110, 109, 217, 4, 16, 31, 248, 147, 105, 109, 217, 4, 16, 31, 248, 147, 
+    158, 109, 217, 4, 16, 31, 248, 147, 161, 109, 217, 4, 16, 31, 248, 147, 
+    189, 109, 217, 4, 16, 31, 248, 147, 194, 109, 217, 4, 16, 31, 248, 147, 
+    198, 109, 217, 4, 16, 31, 248, 147, 195, 109, 217, 4, 16, 31, 248, 147, 
+    200, 109, 217, 4, 16, 31, 248, 147, 216, 248, 109, 217, 4, 16, 31, 248, 
+    147, 245, 168, 109, 217, 4, 16, 31, 248, 147, 215, 76, 109, 217, 4, 16, 
+    31, 248, 147, 216, 165, 109, 217, 4, 16, 31, 248, 147, 244, 6, 109, 217, 
+    4, 16, 31, 248, 147, 244, 119, 109, 217, 4, 16, 31, 248, 147, 219, 120, 
+    109, 217, 4, 16, 31, 248, 147, 220, 120, 109, 217, 4, 16, 31, 248, 147, 
+    245, 191, 109, 217, 4, 16, 31, 248, 147, 228, 198, 109, 217, 4, 16, 31, 
+    248, 147, 215, 73, 109, 217, 4, 16, 31, 248, 147, 215, 67, 109, 217, 4, 
+    16, 31, 248, 147, 215, 63, 109, 217, 4, 16, 31, 248, 147, 215, 64, 109, 
+    217, 4, 16, 31, 248, 147, 215, 69, 109, 217, 4, 16, 31, 248, 147, 215, 
+    70, 109, 217, 4, 16, 31, 248, 147, 215, 65, 109, 217, 4, 16, 31, 248, 
+    147, 215, 66, 109, 217, 4, 16, 31, 248, 147, 215, 72, 109, 217, 4, 16, 
+    31, 248, 147, 215, 68, 109, 217, 4, 16, 31, 248, 147, 216, 163, 109, 217, 
+    4, 16, 31, 248, 147, 216, 162, 42, 243, 119, 241, 193, 31, 216, 197, 249, 
+    141, 241, 224, 241, 193, 31, 216, 197, 223, 123, 245, 224, 241, 193, 31, 
+    247, 232, 253, 208, 216, 197, 252, 57, 241, 193, 31, 210, 223, 244, 39, 
+    241, 193, 31, 212, 59, 241, 193, 31, 249, 204, 241, 193, 31, 216, 197, 
+    254, 4, 241, 193, 31, 241, 61, 216, 39, 241, 193, 31, 4, 217, 62, 241, 
+    193, 31, 215, 238, 241, 193, 31, 225, 220, 241, 193, 31, 218, 159, 241, 
+    193, 31, 244, 140, 241, 193, 31, 242, 133, 224, 241, 241, 193, 31, 230, 
+    156, 241, 193, 31, 245, 127, 241, 193, 31, 244, 40, 241, 193, 31, 211, 
+    207, 226, 198, 216, 197, 248, 87, 241, 193, 31, 254, 52, 241, 193, 31, 
+    249, 186, 241, 193, 31, 251, 228, 216, 139, 241, 193, 31, 242, 150, 241, 
+    193, 31, 218, 246, 254, 71, 241, 193, 31, 223, 54, 241, 193, 31, 235, 
+    221, 241, 193, 31, 242, 133, 217, 62, 241, 193, 31, 230, 112, 249, 160, 
+    241, 193, 31, 242, 133, 224, 198, 241, 193, 31, 216, 197, 255, 19, 212, 
+    40, 241, 193, 31, 216, 197, 250, 9, 244, 97, 241, 193, 31, 235, 234, 241, 
+    193, 31, 246, 58, 241, 193, 31, 223, 57, 241, 193, 31, 242, 133, 224, 
+    225, 241, 193, 31, 224, 178, 241, 193, 31, 248, 162, 64, 216, 197, 232, 
+    231, 241, 193, 31, 216, 197, 244, 175, 241, 193, 31, 226, 164, 241, 193, 
+    31, 226, 245, 241, 193, 31, 248, 60, 241, 193, 31, 248, 80, 241, 193, 31, 
+    235, 248, 241, 193, 31, 251, 150, 241, 193, 31, 249, 222, 216, 43, 231, 
+    77, 241, 193, 31, 243, 88, 216, 39, 241, 193, 31, 224, 126, 214, 154, 
+    241, 193, 31, 226, 163, 241, 193, 31, 216, 197, 212, 13, 241, 193, 31, 
+    223, 46, 241, 193, 31, 216, 197, 250, 221, 241, 193, 31, 216, 197, 254, 
+    0, 216, 134, 241, 193, 31, 216, 197, 234, 180, 218, 135, 230, 116, 241, 
+    193, 31, 248, 33, 241, 193, 31, 216, 197, 231, 153, 231, 203, 241, 193, 
+    31, 255, 20, 241, 193, 31, 216, 197, 212, 54, 241, 193, 31, 216, 197, 
+    243, 48, 211, 239, 241, 193, 31, 216, 197, 235, 53, 233, 108, 241, 193, 
+    31, 247, 185, 241, 193, 31, 232, 221, 241, 193, 31, 235, 224, 215, 188, 
+    241, 193, 31, 4, 224, 198, 241, 193, 31, 254, 218, 249, 213, 241, 193, 
+    31, 252, 60, 249, 213, 8, 3, 235, 161, 8, 3, 235, 154, 8, 3, 73, 8, 3, 
+    235, 183, 8, 3, 236, 59, 8, 3, 236, 42, 8, 3, 236, 61, 8, 3, 236, 60, 8, 
+    3, 253, 207, 8, 3, 253, 170, 8, 3, 61, 8, 3, 254, 73, 8, 3, 214, 164, 8, 
+    3, 214, 167, 8, 3, 214, 165, 8, 3, 226, 141, 8, 3, 226, 115, 8, 3, 76, 8, 
+    3, 226, 176, 8, 3, 245, 36, 8, 3, 75, 8, 3, 211, 195, 8, 3, 251, 229, 8, 
+    3, 251, 226, 8, 3, 252, 7, 8, 3, 251, 239, 8, 3, 251, 252, 8, 3, 251, 
+    251, 8, 3, 251, 254, 8, 3, 251, 253, 8, 3, 252, 122, 8, 3, 252, 114, 8, 
+    3, 252, 192, 8, 3, 252, 143, 8, 3, 251, 102, 8, 3, 251, 106, 8, 3, 251, 
+    103, 8, 3, 251, 180, 8, 3, 251, 164, 8, 3, 251, 206, 8, 3, 251, 186, 8, 
+    3, 252, 22, 8, 3, 252, 76, 8, 3, 252, 34, 8, 3, 251, 88, 8, 3, 251, 85, 
+    8, 3, 251, 126, 8, 3, 251, 101, 8, 3, 251, 95, 8, 3, 251, 99, 8, 3, 251, 
+    73, 8, 3, 251, 71, 8, 3, 251, 78, 8, 3, 251, 76, 8, 3, 251, 74, 8, 3, 
+    251, 75, 8, 3, 225, 50, 8, 3, 225, 46, 8, 3, 225, 109, 8, 3, 225, 60, 8, 
+    3, 225, 76, 8, 3, 225, 103, 8, 3, 225, 99, 8, 3, 225, 241, 8, 3, 225, 
+    231, 8, 3, 190, 8, 3, 226, 22, 8, 3, 224, 136, 8, 3, 224, 138, 8, 3, 224, 
+    137, 8, 3, 224, 234, 8, 3, 224, 223, 8, 3, 225, 17, 8, 3, 224, 246, 8, 3, 
+    224, 122, 8, 3, 224, 118, 8, 3, 224, 151, 8, 3, 224, 135, 8, 3, 224, 127, 
+    8, 3, 224, 133, 8, 3, 224, 101, 8, 3, 224, 100, 8, 3, 224, 105, 8, 3, 
+    224, 104, 8, 3, 224, 102, 8, 3, 224, 103, 8, 3, 252, 97, 8, 3, 252, 96, 
+    8, 3, 252, 103, 8, 3, 252, 98, 8, 3, 252, 100, 8, 3, 252, 99, 8, 3, 252, 
+    102, 8, 3, 252, 101, 8, 3, 252, 109, 8, 3, 252, 108, 8, 3, 252, 112, 8, 
+    3, 252, 110, 8, 3, 252, 88, 8, 3, 252, 90, 8, 3, 252, 89, 8, 3, 252, 93, 
+    8, 3, 252, 92, 8, 3, 252, 95, 8, 3, 252, 94, 8, 3, 252, 104, 8, 3, 252, 
+    107, 8, 3, 252, 105, 8, 3, 252, 84, 8, 3, 252, 83, 8, 3, 252, 91, 8, 3, 
+    252, 87, 8, 3, 252, 85, 8, 3, 252, 86, 8, 3, 252, 80, 8, 3, 252, 79, 8, 
+    3, 252, 82, 8, 3, 252, 81, 8, 3, 229, 170, 8, 3, 229, 169, 8, 3, 229, 
+    175, 8, 3, 229, 171, 8, 3, 229, 172, 8, 3, 229, 174, 8, 3, 229, 173, 8, 
+    3, 229, 178, 8, 3, 229, 177, 8, 3, 229, 180, 8, 3, 229, 179, 8, 3, 229, 
+    166, 8, 3, 229, 165, 8, 3, 229, 168, 8, 3, 229, 167, 8, 3, 229, 159, 8, 
+    3, 229, 158, 8, 3, 229, 163, 8, 3, 229, 162, 8, 3, 229, 160, 8, 3, 229, 
+    161, 8, 3, 229, 153, 8, 3, 229, 152, 8, 3, 229, 157, 8, 3, 229, 156, 8, 
+    3, 229, 154, 8, 3, 229, 155, 8, 3, 241, 111, 8, 3, 241, 110, 8, 3, 241, 
+    116, 8, 3, 241, 112, 8, 3, 241, 113, 8, 3, 241, 115, 8, 3, 241, 114, 8, 
+    3, 241, 119, 8, 3, 241, 118, 8, 3, 241, 121, 8, 3, 241, 120, 8, 3, 241, 
+    102, 8, 3, 241, 104, 8, 3, 241, 103, 8, 3, 241, 107, 8, 3, 241, 106, 8, 
+    3, 241, 109, 8, 3, 241, 108, 8, 3, 241, 98, 8, 3, 241, 97, 8, 3, 241, 
+    105, 8, 3, 241, 101, 8, 3, 241, 99, 8, 3, 241, 100, 8, 3, 241, 92, 8, 3, 
+    241, 96, 8, 3, 241, 95, 8, 3, 241, 93, 8, 3, 241, 94, 8, 3, 230, 173, 8, 
+    3, 230, 172, 8, 3, 230, 231, 8, 3, 230, 179, 8, 3, 230, 204, 8, 3, 230, 
+    222, 8, 3, 230, 220, 8, 3, 231, 140, 8, 3, 231, 135, 8, 3, 185, 8, 3, 
+    231, 173, 8, 3, 230, 75, 8, 3, 230, 74, 8, 3, 230, 78, 8, 3, 230, 76, 8, 
+    3, 230, 122, 8, 3, 230, 108, 8, 3, 230, 162, 8, 3, 230, 127, 8, 3, 231, 
+    27, 8, 3, 231, 92, 8, 3, 230, 56, 8, 3, 230, 52, 8, 3, 230, 103, 8, 3, 
+    230, 71, 8, 3, 230, 64, 8, 3, 230, 69, 8, 3, 230, 29, 8, 3, 230, 28, 8, 
+    3, 230, 34, 8, 3, 230, 31, 8, 3, 244, 84, 8, 3, 244, 79, 8, 3, 244, 122, 
+    8, 3, 244, 99, 8, 3, 244, 168, 8, 3, 244, 159, 8, 3, 244, 197, 8, 3, 244, 
+    171, 8, 3, 244, 4, 8, 3, 244, 44, 8, 3, 244, 28, 8, 3, 243, 219, 8, 3, 
+    243, 218, 8, 3, 243, 235, 8, 3, 243, 224, 8, 3, 243, 222, 8, 3, 243, 223, 
+    8, 3, 243, 206, 8, 3, 243, 205, 8, 3, 243, 209, 8, 3, 243, 207, 8, 3, 
+    213, 144, 8, 3, 213, 139, 8, 3, 213, 176, 8, 3, 213, 153, 8, 3, 213, 166, 
+    8, 3, 213, 163, 8, 3, 213, 168, 8, 3, 213, 167, 8, 3, 214, 7, 8, 3, 214, 
+    2, 8, 3, 214, 27, 8, 3, 214, 18, 8, 3, 213, 125, 8, 3, 213, 121, 8, 3, 
+    213, 138, 8, 3, 213, 126, 8, 3, 213, 178, 8, 3, 213, 244, 8, 3, 212, 110, 
+    8, 3, 212, 108, 8, 3, 212, 116, 8, 3, 212, 113, 8, 3, 212, 111, 8, 3, 
+    212, 112, 8, 3, 212, 102, 8, 3, 212, 101, 8, 3, 212, 106, 8, 3, 212, 105, 
+    8, 3, 212, 103, 8, 3, 212, 104, 8, 3, 247, 179, 8, 3, 247, 167, 8, 3, 
+    248, 4, 8, 3, 247, 204, 8, 3, 247, 237, 8, 3, 247, 241, 8, 3, 247, 240, 
+    8, 3, 248, 153, 8, 3, 248, 148, 8, 3, 248, 222, 8, 3, 248, 173, 8, 3, 
+    246, 63, 8, 3, 246, 64, 8, 3, 247, 121, 8, 3, 246, 103, 8, 3, 247, 146, 
+    8, 3, 247, 123, 8, 3, 248, 31, 8, 3, 248, 91, 8, 3, 248, 46, 8, 3, 246, 
+    54, 8, 3, 246, 52, 8, 3, 246, 79, 8, 3, 246, 62, 8, 3, 246, 57, 8, 3, 
+    246, 60, 8, 3, 216, 68, 8, 3, 216, 62, 8, 3, 216, 118, 8, 3, 216, 77, 8, 
+    3, 216, 110, 8, 3, 216, 112, 8, 3, 216, 111, 8, 3, 217, 47, 8, 3, 217, 
+    34, 8, 3, 217, 106, 8, 3, 217, 55, 8, 3, 215, 103, 8, 3, 215, 102, 8, 3, 
+    215, 105, 8, 3, 215, 104, 8, 3, 216, 6, 8, 3, 216, 2, 8, 3, 111, 8, 3, 
+    216, 14, 8, 3, 216, 214, 8, 3, 217, 23, 8, 3, 216, 238, 8, 3, 215, 88, 8, 
+    3, 215, 83, 8, 3, 215, 119, 8, 3, 215, 101, 8, 3, 215, 89, 8, 3, 215, 99, 
+    8, 3, 248, 108, 8, 3, 248, 107, 8, 3, 248, 113, 8, 3, 248, 109, 8, 3, 
+    248, 110, 8, 3, 248, 112, 8, 3, 248, 111, 8, 3, 248, 129, 8, 3, 248, 128, 
+    8, 3, 248, 136, 8, 3, 248, 130, 8, 3, 248, 98, 8, 3, 248, 100, 8, 3, 248, 
+    99, 8, 3, 248, 103, 8, 3, 248, 102, 8, 3, 248, 106, 8, 3, 248, 104, 8, 3, 
+    248, 121, 8, 3, 248, 124, 8, 3, 248, 122, 8, 3, 248, 94, 8, 3, 248, 93, 
+    8, 3, 248, 101, 8, 3, 248, 97, 8, 3, 248, 95, 8, 3, 248, 96, 8, 3, 229, 
+    127, 8, 3, 229, 126, 8, 3, 229, 134, 8, 3, 229, 129, 8, 3, 229, 130, 8, 
+    3, 229, 131, 8, 3, 229, 143, 8, 3, 229, 142, 8, 3, 229, 149, 8, 3, 229, 
+    144, 8, 3, 229, 119, 8, 3, 229, 118, 8, 3, 229, 125, 8, 3, 229, 120, 8, 
+    3, 229, 135, 8, 3, 229, 141, 8, 3, 229, 139, 8, 3, 229, 111, 8, 3, 229, 
+    110, 8, 3, 229, 116, 8, 3, 229, 114, 8, 3, 229, 112, 8, 3, 229, 113, 8, 
+    3, 241, 78, 8, 3, 241, 77, 8, 3, 241, 84, 8, 3, 241, 79, 8, 3, 241, 81, 
+    8, 3, 241, 80, 8, 3, 241, 83, 8, 3, 241, 82, 8, 3, 241, 89, 8, 3, 241, 
+    88, 8, 3, 241, 91, 8, 3, 241, 90, 8, 3, 241, 72, 8, 3, 241, 73, 8, 3, 
+    241, 75, 8, 3, 241, 74, 8, 3, 241, 76, 8, 3, 241, 85, 8, 3, 241, 87, 8, 
+    3, 241, 86, 8, 3, 241, 71, 8, 3, 228, 190, 8, 3, 228, 188, 8, 3, 228, 
+    234, 8, 3, 228, 193, 8, 3, 228, 216, 8, 3, 228, 230, 8, 3, 228, 229, 8, 
+    3, 229, 184, 8, 3, 197, 8, 3, 229, 198, 8, 3, 227, 187, 8, 3, 227, 189, 
+    8, 3, 227, 188, 8, 3, 228, 52, 8, 3, 228, 39, 8, 3, 228, 75, 8, 3, 228, 
+    61, 8, 3, 229, 84, 8, 3, 229, 108, 8, 3, 229, 95, 8, 3, 227, 182, 8, 3, 
+    227, 178, 8, 3, 227, 238, 8, 3, 227, 186, 8, 3, 227, 184, 8, 3, 227, 185, 
+    8, 3, 241, 142, 8, 3, 241, 141, 8, 3, 241, 147, 8, 3, 241, 143, 8, 3, 
+    241, 144, 8, 3, 241, 146, 8, 3, 241, 145, 8, 3, 241, 152, 8, 3, 241, 151, 
+    8, 3, 241, 154, 8, 3, 241, 153, 8, 3, 241, 134, 8, 3, 241, 136, 8, 3, 
+    241, 135, 8, 3, 241, 138, 8, 3, 241, 140, 8, 3, 241, 139, 8, 3, 241, 148, 
+    8, 3, 241, 150, 8, 3, 241, 149, 8, 3, 241, 130, 8, 3, 241, 129, 8, 3, 
+    241, 137, 8, 3, 241, 133, 8, 3, 241, 131, 8, 3, 241, 132, 8, 3, 241, 124, 
+    8, 3, 241, 123, 8, 3, 241, 128, 8, 3, 241, 127, 8, 3, 241, 125, 8, 3, 
+    241, 126, 8, 3, 232, 196, 8, 3, 232, 190, 8, 3, 232, 242, 8, 3, 232, 203, 
+    8, 3, 232, 234, 8, 3, 232, 233, 8, 3, 232, 237, 8, 3, 232, 235, 8, 3, 
+    233, 80, 8, 3, 233, 70, 8, 3, 233, 136, 8, 3, 233, 89, 8, 3, 232, 80, 8, 
+    3, 232, 79, 8, 3, 232, 82, 8, 3, 232, 81, 8, 3, 232, 117, 8, 3, 232, 107, 
+    8, 3, 232, 157, 8, 3, 232, 121, 8, 3, 233, 3, 8, 3, 233, 59, 8, 3, 233, 
+    18, 8, 3, 232, 75, 8, 3, 232, 73, 8, 3, 232, 99, 8, 3, 232, 78, 8, 3, 
+    232, 76, 8, 3, 232, 77, 8, 3, 232, 55, 8, 3, 232, 54, 8, 3, 232, 63, 8, 
+    3, 232, 58, 8, 3, 232, 56, 8, 3, 232, 57, 8, 3, 242, 190, 8, 3, 242, 189, 
+    8, 3, 242, 215, 8, 3, 242, 200, 8, 3, 242, 207, 8, 3, 242, 206, 8, 3, 
+    242, 209, 8, 3, 242, 208, 8, 3, 243, 90, 8, 3, 243, 85, 8, 3, 243, 136, 
+    8, 3, 243, 100, 8, 3, 242, 92, 8, 3, 242, 91, 8, 3, 242, 94, 8, 3, 242, 
+    93, 8, 3, 242, 155, 8, 3, 242, 153, 8, 3, 242, 175, 8, 3, 242, 163, 8, 3, 
+    243, 34, 8, 3, 243, 32, 8, 3, 243, 63, 8, 3, 243, 45, 8, 3, 242, 82, 8, 
+    3, 242, 81, 8, 3, 242, 114, 8, 3, 242, 90, 8, 3, 242, 83, 8, 3, 242, 89, 
+    8, 3, 234, 62, 8, 3, 234, 61, 8, 3, 234, 93, 8, 3, 234, 76, 8, 3, 234, 
+    86, 8, 3, 234, 89, 8, 3, 234, 87, 8, 3, 234, 203, 8, 3, 234, 191, 8, 3, 
+    176, 8, 3, 234, 229, 8, 3, 233, 201, 8, 3, 233, 206, 8, 3, 233, 203, 8, 
+    3, 234, 1, 8, 3, 233, 253, 8, 3, 234, 29, 8, 3, 234, 8, 8, 3, 234, 157, 
+    8, 3, 234, 141, 8, 3, 234, 183, 8, 3, 234, 160, 8, 3, 233, 190, 8, 3, 
+    233, 187, 8, 3, 233, 218, 8, 3, 233, 200, 8, 3, 233, 193, 8, 3, 233, 197, 
+    8, 3, 243, 16, 8, 3, 243, 15, 8, 3, 243, 20, 8, 3, 243, 17, 8, 3, 243, 
+    19, 8, 3, 243, 18, 8, 3, 243, 27, 8, 3, 243, 26, 8, 3, 243, 30, 8, 3, 
+    243, 28, 8, 3, 243, 7, 8, 3, 243, 6, 8, 3, 243, 9, 8, 3, 243, 8, 8, 3, 
+    243, 12, 8, 3, 243, 11, 8, 3, 243, 14, 8, 3, 243, 13, 8, 3, 243, 22, 8, 
+    3, 243, 21, 8, 3, 243, 25, 8, 3, 243, 23, 8, 3, 243, 2, 8, 3, 243, 1, 8, 
+    3, 243, 10, 8, 3, 243, 5, 8, 3, 243, 3, 8, 3, 243, 4, 8, 3, 230, 250, 8, 
+    3, 230, 251, 8, 3, 231, 13, 8, 3, 231, 12, 8, 3, 231, 15, 8, 3, 231, 14, 
+    8, 3, 230, 241, 8, 3, 230, 243, 8, 3, 230, 242, 8, 3, 230, 246, 8, 3, 
+    230, 245, 8, 3, 230, 248, 8, 3, 230, 247, 8, 3, 230, 252, 8, 3, 230, 254, 
+    8, 3, 230, 253, 8, 3, 230, 237, 8, 3, 230, 236, 8, 3, 230, 244, 8, 3, 
+    230, 240, 8, 3, 230, 238, 8, 3, 230, 239, 8, 3, 240, 181, 8, 3, 240, 180, 
+    8, 3, 240, 187, 8, 3, 240, 182, 8, 3, 240, 184, 8, 3, 240, 183, 8, 3, 
+    240, 186, 8, 3, 240, 185, 8, 3, 240, 192, 8, 3, 240, 191, 8, 3, 240, 194, 
+    8, 3, 240, 193, 8, 3, 240, 173, 8, 3, 240, 172, 8, 3, 240, 175, 8, 3, 
+    240, 174, 8, 3, 240, 177, 8, 3, 240, 176, 8, 3, 240, 179, 8, 3, 240, 178, 
+    8, 3, 240, 188, 8, 3, 240, 190, 8, 3, 240, 189, 8, 3, 229, 25, 8, 3, 229, 
+    27, 8, 3, 229, 26, 8, 3, 229, 68, 8, 3, 229, 66, 8, 3, 229, 78, 8, 3, 
+    229, 71, 8, 3, 228, 244, 8, 3, 228, 243, 8, 3, 228, 245, 8, 3, 228, 253, 
+    8, 3, 228, 250, 8, 3, 229, 5, 8, 3, 228, 255, 8, 3, 229, 59, 8, 3, 229, 
+    65, 8, 3, 229, 61, 8, 3, 241, 157, 8, 3, 241, 167, 8, 3, 241, 176, 8, 3, 
+    241, 252, 8, 3, 241, 244, 8, 3, 162, 8, 3, 242, 7, 8, 3, 240, 207, 8, 3, 
+    240, 206, 8, 3, 240, 209, 8, 3, 240, 208, 8, 3, 240, 243, 8, 3, 240, 234, 
+    8, 3, 241, 69, 8, 3, 241, 48, 8, 3, 241, 195, 8, 3, 241, 239, 8, 3, 241, 
+    207, 8, 3, 212, 43, 8, 3, 212, 28, 8, 3, 212, 65, 8, 3, 212, 51, 8, 3, 
+    211, 185, 8, 3, 211, 187, 8, 3, 211, 186, 8, 3, 211, 203, 8, 3, 211, 227, 
+    8, 3, 211, 210, 8, 3, 212, 5, 8, 3, 212, 22, 8, 3, 212, 10, 8, 3, 210, 
+    30, 8, 3, 210, 29, 8, 3, 210, 44, 8, 3, 210, 32, 8, 3, 210, 37, 8, 3, 
+    210, 39, 8, 3, 210, 38, 8, 3, 210, 102, 8, 3, 210, 99, 8, 3, 210, 116, 8, 
+    3, 210, 105, 8, 3, 210, 6, 8, 3, 210, 8, 8, 3, 210, 7, 8, 3, 210, 19, 8, 
+    3, 210, 18, 8, 3, 210, 23, 8, 3, 210, 20, 8, 3, 210, 84, 8, 3, 210, 94, 
+    8, 3, 210, 88, 8, 3, 210, 2, 8, 3, 210, 1, 8, 3, 210, 13, 8, 3, 210, 5, 
+    8, 3, 210, 3, 8, 3, 210, 4, 8, 3, 209, 245, 8, 3, 209, 244, 8, 3, 209, 
+    250, 8, 3, 209, 248, 8, 3, 209, 246, 8, 3, 209, 247, 8, 3, 250, 29, 8, 3, 
+    250, 25, 8, 3, 250, 52, 8, 3, 250, 38, 8, 3, 250, 49, 8, 3, 250, 43, 8, 
+    3, 250, 51, 8, 3, 250, 50, 8, 3, 250, 225, 8, 3, 250, 218, 8, 3, 251, 34, 
+    8, 3, 250, 252, 8, 3, 249, 105, 8, 3, 249, 107, 8, 3, 249, 106, 8, 3, 
+    249, 154, 8, 3, 249, 145, 8, 3, 249, 239, 8, 3, 249, 170, 8, 3, 250, 161, 
+    8, 3, 250, 191, 8, 3, 250, 166, 8, 3, 249, 85, 8, 3, 249, 83, 8, 3, 249, 
+    113, 8, 3, 249, 103, 8, 3, 249, 90, 8, 3, 249, 102, 8, 3, 249, 64, 8, 3, 
+    249, 63, 8, 3, 249, 74, 8, 3, 249, 70, 8, 3, 249, 65, 8, 3, 249, 67, 8, 
+    3, 209, 228, 8, 3, 209, 227, 8, 3, 209, 234, 8, 3, 209, 229, 8, 3, 209, 
+    231, 8, 3, 209, 230, 8, 3, 209, 233, 8, 3, 209, 232, 8, 3, 209, 240, 8, 
+    3, 209, 239, 8, 3, 209, 243, 8, 3, 209, 241, 8, 3, 209, 224, 8, 3, 209, 
+    226, 8, 3, 209, 225, 8, 3, 209, 235, 8, 3, 209, 238, 8, 3, 209, 236, 8, 
+    3, 209, 217, 8, 3, 209, 221, 8, 3, 209, 220, 8, 3, 209, 218, 8, 3, 209, 
+    219, 8, 3, 209, 211, 8, 3, 209, 210, 8, 3, 209, 216, 8, 3, 209, 214, 8, 
+    3, 209, 212, 8, 3, 209, 213, 8, 3, 227, 105, 8, 3, 227, 104, 8, 3, 227, 
+    110, 8, 3, 227, 106, 8, 3, 227, 107, 8, 3, 227, 109, 8, 3, 227, 108, 8, 
+    3, 227, 115, 8, 3, 227, 114, 8, 3, 227, 118, 8, 3, 227, 117, 8, 3, 227, 
+    98, 8, 3, 227, 99, 8, 3, 227, 102, 8, 3, 227, 103, 8, 3, 227, 111, 8, 3, 
+    227, 113, 8, 3, 227, 93, 8, 3, 227, 101, 8, 3, 227, 97, 8, 3, 227, 94, 8, 
+    3, 227, 95, 8, 3, 227, 88, 8, 3, 227, 87, 8, 3, 227, 92, 8, 3, 227, 91, 
+    8, 3, 227, 89, 8, 3, 227, 90, 8, 3, 219, 128, 8, 3, 194, 8, 3, 219, 192, 
+    8, 3, 219, 131, 8, 3, 219, 184, 8, 3, 219, 187, 8, 3, 219, 185, 8, 3, 
+    221, 227, 8, 3, 221, 215, 8, 3, 206, 8, 3, 221, 235, 8, 3, 218, 29, 8, 3, 
+    218, 31, 8, 3, 218, 30, 8, 3, 219, 35, 8, 3, 219, 24, 8, 3, 219, 59, 8, 
+    3, 219, 39, 8, 3, 220, 115, 8, 3, 221, 182, 8, 3, 220, 140, 8, 3, 218, 6, 
+    8, 3, 218, 4, 8, 3, 218, 84, 8, 3, 218, 28, 8, 3, 218, 10, 8, 3, 218, 18, 
+    8, 3, 217, 167, 8, 3, 217, 166, 8, 3, 217, 233, 8, 3, 217, 174, 8, 3, 
+    217, 169, 8, 3, 217, 173, 8, 3, 218, 187, 8, 3, 218, 186, 8, 3, 218, 193, 
+    8, 3, 218, 188, 8, 3, 218, 190, 8, 3, 218, 192, 8, 3, 218, 191, 8, 3, 
+    218, 201, 8, 3, 218, 199, 8, 3, 218, 224, 8, 3, 218, 202, 8, 3, 218, 182, 
+    8, 3, 218, 181, 8, 3, 218, 185, 8, 3, 218, 183, 8, 3, 218, 195, 8, 3, 
+    218, 198, 8, 3, 218, 196, 8, 3, 218, 178, 8, 3, 218, 176, 8, 3, 218, 180, 
+    8, 3, 218, 179, 8, 3, 218, 171, 8, 3, 218, 170, 8, 3, 218, 175, 8, 3, 
+    218, 174, 8, 3, 218, 172, 8, 3, 218, 173, 8, 3, 210, 77, 8, 3, 210, 76, 
+    8, 3, 210, 82, 8, 3, 210, 79, 8, 3, 210, 59, 8, 3, 210, 61, 8, 3, 210, 
+    60, 8, 3, 210, 64, 8, 3, 210, 63, 8, 3, 210, 67, 8, 3, 210, 65, 8, 3, 
+    210, 71, 8, 3, 210, 70, 8, 3, 210, 74, 8, 3, 210, 72, 8, 3, 210, 55, 8, 
+    3, 210, 54, 8, 3, 210, 62, 8, 3, 210, 58, 8, 3, 210, 56, 8, 3, 210, 57, 
+    8, 3, 210, 47, 8, 3, 210, 46, 8, 3, 210, 51, 8, 3, 210, 50, 8, 3, 210, 
+    48, 8, 3, 210, 49, 8, 3, 250, 137, 8, 3, 250, 134, 8, 3, 250, 158, 8, 3, 
+    250, 145, 8, 3, 250, 66, 8, 3, 250, 65, 8, 3, 250, 68, 8, 3, 250, 67, 8, 
+    3, 250, 80, 8, 3, 250, 79, 8, 3, 250, 87, 8, 3, 250, 82, 8, 3, 250, 116, 
+    8, 3, 250, 114, 8, 3, 250, 132, 8, 3, 250, 122, 8, 3, 250, 60, 8, 3, 250, 
+    70, 8, 3, 250, 64, 8, 3, 250, 61, 8, 3, 250, 63, 8, 3, 250, 54, 8, 3, 
+    250, 53, 8, 3, 250, 58, 8, 3, 250, 57, 8, 3, 250, 55, 8, 3, 250, 56, 8, 
+    3, 222, 176, 8, 3, 222, 180, 8, 3, 222, 159, 8, 3, 222, 160, 8, 3, 222, 
+    163, 8, 3, 222, 162, 8, 3, 222, 166, 8, 3, 222, 164, 8, 3, 222, 170, 8, 
+    3, 222, 169, 8, 3, 222, 175, 8, 3, 222, 171, 8, 3, 222, 155, 8, 3, 222, 
+    153, 8, 3, 222, 161, 8, 3, 222, 158, 8, 3, 222, 156, 8, 3, 222, 157, 8, 
+    3, 222, 148, 8, 3, 222, 147, 8, 3, 222, 152, 8, 3, 222, 151, 8, 3, 222, 
+    149, 8, 3, 222, 150, 8, 3, 228, 35, 8, 3, 228, 34, 8, 3, 228, 37, 8, 3, 
+    228, 36, 8, 3, 228, 27, 8, 3, 228, 29, 8, 3, 228, 28, 8, 3, 228, 31, 8, 
+    3, 228, 30, 8, 3, 228, 33, 8, 3, 228, 32, 8, 3, 228, 22, 8, 3, 228, 21, 
+    8, 3, 228, 26, 8, 3, 228, 25, 8, 3, 228, 23, 8, 3, 228, 24, 8, 3, 228, 
+    16, 8, 3, 228, 15, 8, 3, 228, 20, 8, 3, 228, 19, 8, 3, 228, 17, 8, 3, 
+    228, 18, 8, 3, 220, 73, 8, 3, 220, 68, 8, 3, 220, 103, 8, 3, 220, 84, 8, 
+    3, 219, 216, 8, 3, 219, 218, 8, 3, 219, 217, 8, 3, 219, 237, 8, 3, 219, 
+    234, 8, 3, 220, 8, 8, 3, 219, 255, 8, 3, 220, 43, 8, 3, 220, 36, 8, 3, 
+    220, 64, 8, 3, 220, 51, 8, 3, 219, 212, 8, 3, 219, 210, 8, 3, 219, 226, 
+    8, 3, 219, 215, 8, 3, 219, 213, 8, 3, 219, 214, 8, 3, 219, 195, 8, 3, 
+    219, 194, 8, 3, 219, 201, 8, 3, 219, 198, 8, 3, 219, 196, 8, 3, 219, 197, 
+    8, 3, 223, 142, 8, 3, 223, 136, 8, 3, 205, 8, 3, 223, 148, 8, 3, 222, 
+    121, 8, 3, 222, 123, 8, 3, 222, 122, 8, 3, 222, 189, 8, 3, 222, 182, 8, 
+    3, 222, 212, 8, 3, 222, 193, 8, 3, 223, 44, 8, 3, 223, 129, 8, 3, 223, 
+    82, 8, 3, 222, 114, 8, 3, 222, 111, 8, 3, 222, 141, 8, 3, 222, 120, 8, 3, 
+    222, 116, 8, 3, 222, 117, 8, 3, 222, 96, 8, 3, 222, 95, 8, 3, 222, 101, 
+    8, 3, 222, 99, 8, 3, 222, 97, 8, 3, 222, 98, 8, 3, 235, 99, 8, 3, 235, 
+    98, 8, 3, 235, 109, 8, 3, 235, 100, 8, 3, 235, 105, 8, 3, 235, 104, 8, 3, 
+    235, 107, 8, 3, 235, 106, 8, 3, 235, 42, 8, 3, 235, 41, 8, 3, 235, 44, 8, 
+    3, 235, 43, 8, 3, 235, 57, 8, 3, 235, 55, 8, 3, 235, 69, 8, 3, 235, 59, 
+    8, 3, 235, 35, 8, 3, 235, 33, 8, 3, 235, 52, 8, 3, 235, 40, 8, 3, 235, 
+    37, 8, 3, 235, 38, 8, 3, 235, 27, 8, 3, 235, 26, 8, 3, 235, 31, 8, 3, 
+    235, 30, 8, 3, 235, 28, 8, 3, 235, 29, 8, 3, 224, 47, 8, 3, 224, 45, 8, 
+    3, 224, 54, 8, 3, 224, 48, 8, 3, 224, 51, 8, 3, 224, 50, 8, 3, 224, 53, 
+    8, 3, 224, 52, 8, 3, 224, 0, 8, 3, 223, 253, 8, 3, 224, 2, 8, 3, 224, 1, 
+    8, 3, 224, 34, 8, 3, 224, 33, 8, 3, 224, 43, 8, 3, 224, 37, 8, 3, 223, 
+    248, 8, 3, 223, 244, 8, 3, 224, 31, 8, 3, 223, 252, 8, 3, 223, 250, 8, 3, 
+    223, 251, 8, 3, 223, 228, 8, 3, 223, 226, 8, 3, 223, 238, 8, 3, 223, 231, 
+    8, 3, 223, 229, 8, 3, 223, 230, 8, 3, 235, 88, 8, 3, 235, 87, 8, 3, 235, 
+    94, 8, 3, 235, 89, 8, 3, 235, 91, 8, 3, 235, 90, 8, 3, 235, 93, 8, 3, 
+    235, 92, 8, 3, 235, 79, 8, 3, 235, 81, 8, 3, 235, 80, 8, 3, 235, 84, 8, 
+    3, 235, 83, 8, 3, 235, 86, 8, 3, 235, 85, 8, 3, 235, 75, 8, 3, 235, 74, 
+    8, 3, 235, 82, 8, 3, 235, 78, 8, 3, 235, 76, 8, 3, 235, 77, 8, 3, 235, 
+    71, 8, 3, 235, 70, 8, 3, 235, 73, 8, 3, 235, 72, 8, 3, 228, 163, 8, 3, 
+    228, 162, 8, 3, 228, 170, 8, 3, 228, 164, 8, 3, 228, 166, 8, 3, 228, 165, 
+    8, 3, 228, 169, 8, 3, 228, 167, 8, 3, 228, 152, 8, 3, 228, 153, 8, 3, 
+    228, 158, 8, 3, 228, 157, 8, 3, 228, 161, 8, 3, 228, 159, 8, 3, 228, 147, 
+    8, 3, 228, 156, 8, 3, 228, 151, 8, 3, 228, 148, 8, 3, 228, 149, 8, 3, 
+    228, 142, 8, 3, 228, 141, 8, 3, 228, 146, 8, 3, 228, 145, 8, 3, 228, 143, 
+    8, 3, 228, 144, 8, 3, 227, 138, 8, 3, 227, 137, 8, 3, 227, 149, 8, 3, 
+    227, 142, 8, 3, 227, 146, 8, 3, 227, 145, 8, 3, 227, 148, 8, 3, 227, 147, 
+    8, 3, 227, 125, 8, 3, 227, 127, 8, 3, 227, 126, 8, 3, 227, 131, 8, 3, 
+    227, 130, 8, 3, 227, 135, 8, 3, 227, 132, 8, 3, 227, 123, 8, 3, 227, 121, 
+    8, 3, 227, 129, 8, 3, 227, 124, 8, 3, 211, 150, 8, 3, 211, 149, 8, 3, 
+    211, 157, 8, 3, 211, 152, 8, 3, 211, 154, 8, 3, 211, 153, 8, 3, 211, 156, 
+    8, 3, 211, 155, 8, 3, 211, 139, 8, 3, 211, 140, 8, 3, 211, 144, 8, 3, 
+    211, 143, 8, 3, 211, 148, 8, 3, 211, 146, 8, 3, 211, 121, 8, 3, 211, 119, 
+    8, 3, 211, 131, 8, 3, 211, 124, 8, 3, 211, 122, 8, 3, 211, 123, 8, 3, 
+    210, 250, 8, 3, 210, 248, 8, 3, 211, 8, 8, 3, 210, 251, 8, 3, 211, 2, 8, 
+    3, 211, 1, 8, 3, 211, 5, 8, 3, 211, 3, 8, 3, 210, 191, 8, 3, 210, 190, 8, 
+    3, 210, 194, 8, 3, 210, 192, 8, 3, 210, 224, 8, 3, 210, 221, 8, 3, 210, 
+    244, 8, 3, 210, 228, 8, 3, 210, 182, 8, 3, 210, 178, 8, 3, 210, 212, 8, 
+    3, 210, 189, 8, 3, 210, 185, 8, 3, 210, 186, 8, 3, 210, 162, 8, 3, 210, 
+    161, 8, 3, 210, 169, 8, 3, 210, 165, 8, 3, 210, 163, 8, 3, 210, 164, 8, 
+    34, 224, 34, 8, 34, 232, 242, 8, 34, 234, 62, 8, 34, 227, 142, 8, 34, 
+    249, 70, 8, 34, 218, 193, 8, 34, 243, 13, 8, 34, 243, 45, 8, 34, 230, 
+    231, 8, 34, 240, 181, 8, 34, 232, 57, 8, 34, 252, 84, 8, 34, 230, 127, 8, 
+    34, 210, 244, 8, 34, 224, 122, 8, 34, 240, 175, 8, 34, 217, 47, 8, 34, 
+    243, 136, 8, 34, 210, 5, 8, 34, 249, 64, 8, 34, 248, 96, 8, 34, 251, 99, 
+    8, 34, 243, 9, 8, 34, 227, 132, 8, 34, 215, 119, 8, 34, 226, 176, 8, 34, 
+    235, 75, 8, 34, 210, 19, 8, 34, 224, 101, 8, 34, 241, 109, 8, 34, 210, 
+    250, 8, 34, 212, 112, 8, 34, 219, 201, 8, 34, 213, 244, 8, 34, 210, 116, 
+    8, 34, 235, 69, 8, 34, 227, 97, 8, 34, 235, 73, 8, 34, 242, 155, 8, 34, 
+    235, 93, 8, 34, 211, 227, 8, 34, 246, 79, 8, 34, 219, 214, 8, 34, 232, 
+    237, 8, 34, 249, 74, 8, 34, 249, 106, 8, 34, 250, 38, 8, 34, 240, 178, 8, 
+    34, 220, 73, 8, 34, 210, 4, 8, 34, 219, 255, 8, 34, 250, 132, 8, 34, 209, 
+    231, 8, 34, 229, 174, 8, 34, 234, 183, 232, 197, 1, 252, 192, 232, 197, 
+    1, 190, 232, 197, 1, 225, 148, 232, 197, 1, 248, 222, 232, 197, 1, 217, 
+    106, 232, 197, 1, 216, 209, 232, 197, 1, 243, 136, 232, 197, 1, 176, 232, 
+    197, 1, 234, 133, 232, 197, 1, 235, 142, 232, 197, 1, 251, 34, 232, 197, 
+    1, 250, 158, 232, 197, 1, 246, 39, 232, 197, 1, 215, 184, 232, 197, 1, 
+    215, 176, 232, 197, 1, 185, 232, 197, 1, 197, 232, 197, 1, 233, 136, 232, 
+    197, 1, 206, 232, 197, 1, 210, 82, 232, 197, 1, 210, 116, 232, 197, 1, 
+    229, 78, 232, 197, 1, 162, 232, 197, 1, 211, 165, 232, 197, 1, 241, 190, 
+    232, 197, 1, 244, 197, 232, 197, 1, 212, 65, 232, 197, 1, 220, 103, 232, 
+    197, 1, 191, 232, 197, 1, 242, 250, 232, 197, 1, 61, 232, 197, 1, 254, 
+    244, 232, 197, 1, 75, 232, 197, 1, 245, 56, 232, 197, 1, 73, 232, 197, 1, 
+    76, 232, 197, 1, 70, 232, 197, 1, 214, 214, 232, 197, 1, 214, 208, 232, 
+    197, 1, 226, 235, 232, 197, 1, 138, 230, 33, 216, 118, 232, 197, 1, 138, 
+    229, 230, 225, 17, 232, 197, 1, 138, 230, 33, 249, 73, 232, 197, 1, 138, 
+    230, 33, 251, 206, 232, 197, 1, 138, 230, 33, 197, 232, 197, 1, 138, 230, 
+    33, 235, 116, 232, 197, 224, 142, 249, 220, 232, 197, 224, 142, 243, 230, 
+    218, 130, 41, 3, 245, 210, 41, 3, 245, 206, 41, 3, 241, 221, 41, 3, 212, 
+    17, 41, 3, 212, 16, 41, 3, 225, 212, 41, 3, 252, 14, 41, 3, 252, 67, 41, 
+    3, 231, 117, 41, 3, 233, 248, 41, 3, 231, 7, 41, 3, 243, 76, 41, 3, 244, 
+    148, 41, 3, 213, 250, 41, 3, 217, 12, 41, 3, 216, 195, 41, 3, 248, 17, 
+    41, 3, 248, 14, 41, 3, 233, 51, 41, 3, 223, 109, 41, 3, 248, 78, 41, 3, 
+    229, 140, 41, 3, 221, 171, 41, 3, 220, 62, 41, 3, 210, 92, 41, 3, 210, 
+    73, 41, 3, 250, 183, 41, 3, 235, 125, 41, 3, 228, 177, 41, 3, 211, 44, 
+    41, 3, 234, 182, 41, 3, 229, 52, 41, 3, 243, 56, 41, 3, 231, 81, 41, 3, 
+    229, 104, 41, 3, 227, 156, 41, 3, 73, 41, 3, 236, 0, 41, 3, 241, 181, 41, 
+    3, 241, 161, 41, 3, 211, 250, 41, 3, 211, 241, 41, 3, 225, 109, 41, 3, 
+    252, 12, 41, 3, 252, 7, 41, 3, 231, 110, 41, 3, 233, 245, 41, 3, 231, 4, 
+    41, 3, 243, 72, 41, 3, 244, 122, 41, 3, 213, 176, 41, 3, 216, 118, 41, 3, 
+    216, 176, 41, 3, 248, 9, 41, 3, 248, 13, 41, 3, 232, 242, 41, 3, 223, 36, 
+    41, 3, 248, 4, 41, 3, 229, 134, 41, 3, 219, 192, 41, 3, 220, 33, 41, 3, 
+    210, 44, 41, 3, 210, 69, 41, 3, 250, 52, 41, 3, 235, 109, 41, 3, 228, 
+    170, 41, 3, 211, 8, 41, 3, 234, 93, 41, 3, 229, 44, 41, 3, 242, 215, 41, 
+    3, 230, 231, 41, 3, 228, 234, 41, 3, 227, 149, 41, 3, 61, 41, 3, 254, 
+    124, 41, 3, 229, 73, 41, 3, 162, 41, 3, 242, 19, 41, 3, 212, 65, 41, 3, 
+    212, 55, 41, 3, 190, 41, 3, 252, 19, 41, 3, 252, 192, 41, 3, 231, 125, 
+    41, 3, 233, 252, 41, 3, 233, 251, 41, 3, 231, 11, 41, 3, 243, 80, 41, 3, 
+    244, 197, 41, 3, 214, 27, 41, 3, 217, 106, 41, 3, 216, 209, 41, 3, 248, 
+    26, 41, 3, 248, 16, 41, 3, 233, 136, 41, 3, 205, 41, 3, 248, 222, 41, 3, 
+    229, 149, 41, 3, 206, 41, 3, 220, 103, 41, 3, 210, 116, 41, 3, 210, 82, 
+    41, 3, 251, 34, 41, 3, 235, 142, 41, 3, 228, 186, 41, 3, 191, 41, 3, 176, 
+    41, 3, 234, 235, 41, 3, 229, 57, 41, 3, 243, 136, 41, 3, 185, 41, 3, 197, 
+    41, 3, 227, 166, 41, 3, 226, 184, 41, 3, 226, 180, 41, 3, 241, 54, 41, 3, 
+    211, 215, 41, 3, 211, 211, 41, 3, 224, 250, 41, 3, 252, 10, 41, 3, 251, 
+    194, 41, 3, 231, 105, 41, 3, 233, 243, 41, 3, 231, 0, 41, 3, 243, 68, 41, 
+    3, 244, 35, 41, 3, 213, 127, 41, 3, 216, 18, 41, 3, 216, 154, 41, 3, 248, 
+    7, 41, 3, 248, 11, 41, 3, 232, 128, 41, 3, 222, 198, 41, 3, 247, 126, 41, 
+    3, 229, 121, 41, 3, 219, 41, 41, 3, 220, 2, 41, 3, 210, 21, 41, 3, 210, 
+    66, 41, 3, 249, 175, 41, 3, 235, 60, 41, 3, 228, 160, 41, 3, 210, 229, 
+    41, 3, 234, 11, 41, 3, 229, 42, 41, 3, 242, 165, 41, 3, 230, 133, 41, 3, 
+    228, 65, 41, 3, 227, 133, 41, 3, 70, 41, 3, 214, 190, 41, 3, 240, 223, 
+    41, 3, 240, 213, 41, 3, 211, 195, 41, 3, 211, 189, 41, 3, 224, 151, 41, 
+    3, 252, 9, 41, 3, 251, 126, 41, 3, 231, 104, 41, 3, 233, 241, 41, 3, 230, 
+    255, 41, 3, 243, 67, 41, 3, 243, 235, 41, 3, 212, 116, 41, 3, 215, 119, 
+    41, 3, 216, 137, 41, 3, 248, 5, 41, 3, 248, 10, 41, 3, 232, 99, 41, 3, 
+    222, 141, 41, 3, 246, 79, 41, 3, 229, 116, 41, 3, 218, 84, 41, 3, 219, 
+    226, 41, 3, 210, 13, 41, 3, 210, 62, 41, 3, 249, 113, 41, 3, 235, 52, 41, 
+    3, 228, 156, 41, 3, 210, 212, 41, 3, 233, 218, 41, 3, 229, 41, 41, 3, 
+    242, 114, 41, 3, 230, 103, 41, 3, 227, 238, 41, 3, 227, 129, 41, 3, 76, 
+    41, 3, 226, 197, 41, 3, 229, 1, 41, 3, 241, 69, 41, 3, 241, 57, 41, 3, 
+    211, 227, 41, 3, 211, 216, 41, 3, 225, 17, 41, 3, 252, 11, 41, 3, 251, 
+    206, 41, 3, 231, 106, 41, 3, 233, 244, 41, 3, 231, 2, 41, 3, 243, 70, 41, 
+    3, 243, 69, 41, 3, 244, 44, 41, 3, 213, 138, 41, 3, 111, 41, 3, 216, 157, 
+    41, 3, 248, 8, 41, 3, 248, 12, 41, 3, 232, 157, 41, 3, 222, 212, 41, 3, 
+    247, 146, 41, 3, 229, 125, 41, 3, 219, 59, 41, 3, 220, 8, 41, 3, 210, 23, 
+    41, 3, 210, 67, 41, 3, 249, 239, 41, 3, 235, 69, 41, 3, 228, 161, 41, 3, 
+    210, 244, 41, 3, 234, 29, 41, 3, 229, 43, 41, 3, 242, 175, 41, 3, 230, 
+    162, 41, 3, 228, 75, 41, 3, 227, 135, 41, 3, 75, 41, 3, 245, 151, 41, 3, 
+    229, 62, 41, 3, 241, 239, 41, 3, 241, 210, 41, 3, 212, 22, 41, 3, 212, 
+    12, 41, 3, 225, 222, 41, 3, 252, 15, 41, 3, 252, 76, 41, 3, 231, 118, 41, 
+    3, 233, 249, 41, 3, 233, 247, 41, 3, 231, 8, 41, 3, 243, 77, 41, 3, 243, 
+    75, 41, 3, 244, 155, 41, 3, 213, 255, 41, 3, 217, 23, 41, 3, 216, 196, 
+    41, 3, 248, 18, 41, 3, 248, 15, 41, 3, 233, 59, 41, 3, 223, 129, 41, 3, 
+    248, 91, 41, 3, 229, 141, 41, 3, 221, 182, 41, 3, 220, 64, 41, 3, 210, 
+    94, 41, 3, 210, 74, 41, 3, 250, 191, 41, 3, 235, 127, 41, 3, 228, 179, 
+    41, 3, 211, 47, 41, 3, 234, 183, 41, 3, 229, 53, 41, 3, 229, 49, 41, 3, 
+    243, 63, 41, 3, 243, 52, 41, 3, 231, 92, 41, 3, 229, 108, 41, 3, 227, 
+    157, 41, 3, 229, 80, 41, 3, 233, 23, 41, 249, 220, 41, 243, 230, 218, 
+    130, 41, 224, 14, 78, 41, 3, 229, 124, 244, 197, 41, 3, 229, 124, 176, 
+    41, 3, 229, 124, 219, 41, 41, 16, 244, 145, 41, 16, 234, 181, 41, 16, 
+    216, 82, 41, 16, 228, 209, 41, 16, 252, 148, 41, 16, 244, 196, 41, 16, 
+    217, 102, 41, 16, 248, 177, 41, 16, 247, 125, 41, 16, 233, 207, 41, 16, 
+    216, 22, 41, 16, 247, 145, 41, 16, 235, 61, 41, 21, 210, 86, 41, 21, 110, 
+    41, 21, 105, 41, 21, 158, 41, 21, 161, 41, 21, 189, 41, 21, 194, 41, 21, 
+    198, 41, 21, 195, 41, 21, 200, 41, 3, 229, 124, 185, 41, 3, 229, 124, 
+    247, 146, 33, 6, 1, 210, 90, 33, 4, 1, 210, 90, 33, 6, 1, 246, 35, 33, 4, 
+    1, 246, 35, 33, 6, 1, 223, 50, 246, 37, 33, 4, 1, 223, 50, 246, 37, 33, 
+    6, 1, 235, 186, 33, 4, 1, 235, 186, 33, 6, 1, 247, 162, 33, 4, 1, 247, 
+    162, 33, 6, 1, 230, 141, 214, 205, 33, 4, 1, 230, 141, 214, 205, 33, 6, 
+    1, 251, 137, 226, 202, 33, 4, 1, 251, 137, 226, 202, 33, 6, 1, 229, 88, 
+    211, 31, 33, 4, 1, 229, 88, 211, 31, 33, 6, 1, 211, 28, 2, 252, 186, 211, 
+    31, 33, 4, 1, 211, 28, 2, 252, 186, 211, 31, 33, 6, 1, 235, 184, 211, 59, 
+    33, 4, 1, 235, 184, 211, 59, 33, 6, 1, 223, 50, 210, 212, 33, 4, 1, 223, 
+    50, 210, 212, 33, 6, 1, 235, 184, 61, 33, 4, 1, 235, 184, 61, 33, 6, 1, 
+    250, 1, 232, 193, 210, 183, 33, 4, 1, 250, 1, 232, 193, 210, 183, 33, 6, 
+    1, 251, 215, 210, 183, 33, 4, 1, 251, 215, 210, 183, 33, 6, 1, 235, 184, 
+    250, 1, 232, 193, 210, 183, 33, 4, 1, 235, 184, 250, 1, 232, 193, 210, 
+    183, 33, 6, 1, 210, 246, 33, 4, 1, 210, 246, 33, 6, 1, 223, 50, 215, 179, 
+    33, 4, 1, 223, 50, 215, 179, 33, 6, 1, 219, 53, 248, 91, 33, 4, 1, 219, 
+    53, 248, 91, 33, 6, 1, 219, 53, 245, 175, 33, 4, 1, 219, 53, 245, 175, 
+    33, 6, 1, 219, 53, 245, 160, 33, 4, 1, 219, 53, 245, 160, 33, 6, 1, 230, 
+    145, 76, 33, 4, 1, 230, 145, 76, 33, 6, 1, 251, 241, 76, 33, 4, 1, 251, 
+    241, 76, 33, 6, 1, 52, 230, 145, 76, 33, 4, 1, 52, 230, 145, 76, 33, 1, 
+    230, 87, 76, 38, 33, 212, 100, 38, 33, 216, 249, 230, 192, 50, 38, 33, 
+    240, 212, 230, 192, 50, 38, 33, 216, 149, 230, 192, 50, 219, 94, 253, 
+    217, 38, 33, 1, 214, 202, 236, 61, 38, 33, 1, 73, 38, 33, 1, 211, 8, 38, 
+    33, 1, 70, 38, 33, 1, 242, 4, 50, 38, 33, 1, 211, 27, 38, 33, 1, 219, 53, 
+    50, 38, 33, 1, 226, 202, 38, 33, 234, 193, 38, 33, 225, 228, 33, 234, 
+    193, 33, 225, 228, 33, 6, 1, 246, 47, 33, 4, 1, 246, 47, 33, 6, 1, 246, 
+    28, 33, 4, 1, 246, 28, 33, 6, 1, 210, 52, 33, 4, 1, 210, 52, 33, 6, 1, 
+    250, 207, 33, 4, 1, 250, 207, 33, 6, 1, 246, 26, 33, 4, 1, 246, 26, 33, 
+    6, 1, 217, 24, 2, 230, 225, 103, 33, 4, 1, 217, 24, 2, 230, 225, 103, 33, 
+    6, 1, 215, 78, 33, 4, 1, 215, 78, 33, 6, 1, 215, 161, 33, 4, 1, 215, 161, 
+    33, 6, 1, 215, 165, 33, 4, 1, 215, 165, 33, 6, 1, 217, 29, 33, 4, 1, 217, 
+    29, 33, 6, 1, 240, 199, 33, 4, 1, 240, 199, 33, 6, 1, 219, 207, 33, 4, 1, 
+    219, 207, 38, 33, 1, 235, 184, 75, 20, 1, 61, 20, 1, 176, 20, 1, 70, 20, 
+    1, 233, 218, 20, 1, 245, 210, 20, 1, 223, 109, 20, 1, 217, 87, 20, 1, 76, 
+    20, 1, 227, 149, 20, 1, 73, 20, 1, 233, 136, 20, 1, 190, 20, 1, 222, 240, 
+    20, 1, 223, 30, 20, 1, 233, 50, 20, 1, 231, 80, 20, 1, 217, 102, 20, 1, 
+    229, 147, 20, 1, 228, 184, 20, 1, 193, 20, 1, 218, 5, 20, 1, 230, 103, 
+    20, 1, 220, 28, 20, 1, 219, 192, 20, 1, 220, 38, 20, 1, 220, 124, 20, 1, 
+    233, 156, 20, 1, 234, 157, 20, 1, 227, 210, 20, 1, 227, 238, 20, 1, 228, 
+    155, 20, 1, 210, 226, 20, 1, 219, 226, 20, 1, 210, 187, 20, 1, 191, 20, 
+    1, 228, 10, 20, 1, 234, 143, 20, 1, 225, 152, 20, 1, 228, 177, 20, 1, 
+    227, 247, 20, 1, 224, 145, 20, 1, 211, 192, 20, 1, 225, 212, 20, 1, 244, 
+    148, 20, 1, 222, 141, 20, 1, 232, 99, 20, 1, 230, 231, 20, 1, 228, 234, 
+    20, 1, 223, 52, 20, 1, 223, 172, 20, 1, 234, 166, 20, 1, 229, 8, 20, 1, 
+    229, 57, 20, 1, 229, 78, 20, 1, 220, 8, 20, 1, 224, 148, 20, 1, 243, 235, 
+    20, 1, 244, 38, 20, 1, 212, 65, 20, 1, 197, 20, 1, 232, 242, 20, 1, 225, 
+    109, 20, 1, 232, 120, 20, 1, 234, 29, 20, 1, 231, 115, 20, 1, 223, 84, 
+    20, 1, 231, 59, 20, 1, 185, 20, 1, 216, 118, 20, 1, 234, 93, 20, 1, 230, 
+    162, 20, 1, 231, 123, 20, 1, 216, 231, 20, 1, 233, 252, 20, 1, 216, 248, 
+    20, 1, 227, 239, 20, 1, 221, 252, 20, 1, 244, 193, 20, 1, 233, 254, 20, 
+    1, 234, 25, 20, 38, 164, 234, 6, 20, 38, 164, 215, 111, 20, 228, 183, 20, 
+    243, 230, 218, 130, 20, 249, 227, 20, 249, 220, 20, 220, 151, 20, 224, 
+    14, 78, 58, 1, 250, 97, 138, 210, 254, 225, 62, 58, 1, 250, 97, 138, 211, 
+    70, 225, 62, 58, 1, 250, 97, 138, 210, 254, 220, 85, 58, 1, 250, 97, 138, 
+    211, 70, 220, 85, 58, 1, 250, 97, 138, 210, 254, 224, 31, 58, 1, 250, 97, 
+    138, 211, 70, 224, 31, 58, 1, 250, 97, 138, 210, 254, 222, 141, 58, 1, 
+    250, 97, 138, 211, 70, 222, 141, 58, 1, 245, 21, 246, 119, 138, 130, 58, 
+    1, 125, 246, 119, 138, 130, 58, 1, 230, 226, 246, 119, 138, 130, 58, 1, 
+    121, 246, 119, 138, 130, 58, 1, 245, 20, 246, 119, 138, 130, 58, 1, 245, 
+    21, 246, 119, 233, 40, 138, 130, 58, 1, 125, 246, 119, 233, 40, 138, 130, 
+    58, 1, 230, 226, 246, 119, 233, 40, 138, 130, 58, 1, 121, 246, 119, 233, 
+    40, 138, 130, 58, 1, 245, 20, 246, 119, 233, 40, 138, 130, 58, 1, 245, 
+    21, 233, 40, 138, 130, 58, 1, 125, 233, 40, 138, 130, 58, 1, 230, 226, 
+    233, 40, 138, 130, 58, 1, 121, 233, 40, 138, 130, 58, 1, 245, 20, 233, 
+    40, 138, 130, 58, 1, 59, 67, 130, 58, 1, 59, 219, 96, 58, 1, 59, 203, 
+    130, 58, 1, 232, 109, 44, 249, 162, 254, 110, 58, 1, 223, 158, 120, 74, 
+    58, 1, 223, 158, 124, 74, 58, 1, 223, 158, 245, 32, 78, 58, 1, 223, 158, 
+    235, 194, 245, 32, 78, 58, 1, 121, 235, 194, 245, 32, 78, 58, 1, 218, 
+    112, 22, 125, 216, 31, 58, 1, 218, 112, 22, 121, 216, 31, 7, 6, 1, 245, 
+    200, 254, 171, 7, 4, 1, 245, 200, 254, 171, 7, 6, 1, 245, 200, 254, 197, 
+    7, 4, 1, 245, 200, 254, 197, 7, 6, 1, 241, 208, 7, 4, 1, 241, 208, 7, 6, 
+    1, 215, 40, 7, 4, 1, 215, 40, 7, 6, 1, 215, 230, 7, 4, 1, 215, 230, 7, 6, 
+    1, 249, 111, 7, 4, 1, 249, 111, 7, 6, 1, 249, 112, 2, 249, 220, 7, 4, 1, 
+    249, 112, 2, 249, 220, 7, 1, 4, 6, 245, 7, 7, 1, 4, 6, 222, 92, 7, 6, 1, 
+    255, 74, 7, 4, 1, 255, 74, 7, 6, 1, 254, 74, 7, 4, 1, 254, 74, 7, 6, 1, 
+    253, 193, 7, 4, 1, 253, 193, 7, 6, 1, 253, 177, 7, 4, 1, 253, 177, 7, 6, 
+    1, 253, 178, 2, 203, 130, 7, 4, 1, 253, 178, 2, 203, 130, 7, 6, 1, 253, 
+    168, 7, 4, 1, 253, 168, 7, 6, 1, 223, 50, 251, 68, 2, 247, 121, 7, 4, 1, 
+    223, 50, 251, 68, 2, 247, 121, 7, 6, 1, 235, 25, 2, 91, 7, 4, 1, 235, 25, 
+    2, 91, 7, 6, 1, 235, 25, 2, 248, 0, 91, 7, 4, 1, 235, 25, 2, 248, 0, 91, 
+    7, 6, 1, 235, 25, 2, 218, 104, 22, 248, 0, 91, 7, 4, 1, 235, 25, 2, 218, 
+    104, 22, 248, 0, 91, 7, 6, 1, 251, 136, 156, 7, 4, 1, 251, 136, 156, 7, 
+    6, 1, 233, 150, 2, 125, 91, 7, 4, 1, 233, 150, 2, 125, 91, 7, 6, 1, 144, 
+    2, 199, 218, 104, 226, 121, 7, 4, 1, 144, 2, 199, 218, 104, 226, 121, 7, 
+    6, 1, 144, 2, 232, 124, 7, 4, 1, 144, 2, 232, 124, 7, 6, 1, 226, 184, 7, 
+    4, 1, 226, 184, 7, 6, 1, 226, 107, 2, 218, 104, 216, 140, 248, 40, 7, 4, 
+    1, 226, 107, 2, 218, 104, 216, 140, 248, 40, 7, 6, 1, 226, 107, 2, 244, 
+    54, 7, 4, 1, 226, 107, 2, 244, 54, 7, 6, 1, 226, 107, 2, 218, 230, 217, 
+    78, 7, 4, 1, 226, 107, 2, 218, 230, 217, 78, 7, 6, 1, 224, 98, 2, 218, 
+    104, 216, 140, 248, 40, 7, 4, 1, 224, 98, 2, 218, 104, 216, 140, 248, 40, 
+    7, 6, 1, 224, 98, 2, 248, 0, 91, 7, 4, 1, 224, 98, 2, 248, 0, 91, 7, 6, 
+    1, 223, 225, 222, 187, 7, 4, 1, 223, 225, 222, 187, 7, 6, 1, 222, 131, 
+    222, 187, 7, 4, 1, 222, 131, 222, 187, 7, 6, 1, 214, 106, 2, 248, 0, 91, 
+    7, 4, 1, 214, 106, 2, 248, 0, 91, 7, 6, 1, 212, 106, 7, 4, 1, 212, 106, 
+    7, 6, 1, 213, 145, 210, 159, 7, 4, 1, 213, 145, 210, 159, 7, 6, 1, 216, 
+    153, 2, 91, 7, 4, 1, 216, 153, 2, 91, 7, 6, 1, 216, 153, 2, 218, 104, 
+    216, 140, 248, 40, 7, 4, 1, 216, 153, 2, 218, 104, 216, 140, 248, 40, 7, 
+    6, 1, 213, 245, 7, 4, 1, 213, 245, 7, 6, 1, 245, 66, 7, 4, 1, 245, 66, 7, 
+    6, 1, 235, 172, 7, 4, 1, 235, 172, 7, 6, 1, 249, 208, 7, 4, 1, 249, 208, 
+    58, 1, 214, 133, 7, 4, 1, 246, 70, 7, 4, 1, 232, 85, 7, 4, 1, 230, 81, 7, 
+    4, 1, 227, 202, 7, 4, 1, 222, 130, 7, 1, 4, 6, 222, 130, 7, 4, 1, 215, 
+    109, 7, 4, 1, 214, 197, 7, 6, 1, 235, 214, 249, 61, 7, 4, 1, 235, 214, 
+    249, 61, 7, 6, 1, 235, 214, 245, 7, 7, 4, 1, 235, 214, 245, 7, 7, 6, 1, 
+    235, 214, 243, 203, 7, 6, 1, 215, 94, 235, 214, 243, 203, 7, 4, 1, 215, 
+    94, 235, 214, 243, 203, 7, 6, 1, 215, 94, 156, 7, 4, 1, 215, 94, 156, 7, 
+    6, 1, 235, 214, 153, 7, 4, 1, 235, 214, 153, 7, 6, 1, 235, 214, 222, 92, 
+    7, 4, 1, 235, 214, 222, 92, 7, 6, 1, 235, 214, 217, 153, 7, 4, 1, 235, 
+    214, 217, 153, 58, 1, 121, 250, 32, 255, 15, 58, 1, 249, 227, 58, 1, 219, 
+    252, 245, 99, 50, 7, 6, 1, 222, 0, 7, 4, 1, 222, 0, 7, 6, 1, 215, 94, 
+    242, 61, 7, 4, 1, 233, 150, 2, 223, 56, 241, 53, 22, 252, 42, 7, 6, 1, 
+    230, 27, 2, 248, 40, 7, 4, 1, 230, 27, 2, 248, 40, 7, 6, 1, 251, 68, 2, 
+    130, 7, 4, 1, 251, 68, 2, 130, 7, 6, 1, 243, 204, 2, 226, 249, 91, 7, 4, 
+    1, 243, 204, 2, 226, 249, 91, 7, 6, 1, 235, 25, 2, 226, 249, 91, 7, 4, 1, 
+    235, 25, 2, 226, 249, 91, 7, 6, 1, 230, 27, 2, 226, 249, 91, 7, 4, 1, 
+    230, 27, 2, 226, 249, 91, 7, 6, 1, 223, 225, 2, 226, 249, 91, 7, 4, 1, 
+    223, 225, 2, 226, 249, 91, 7, 6, 1, 222, 93, 2, 226, 249, 91, 7, 4, 1, 
+    222, 93, 2, 226, 249, 91, 7, 6, 1, 242, 62, 2, 103, 58, 1, 6, 242, 62, 2, 
+    91, 58, 1, 4, 27, 226, 235, 7, 1, 4, 6, 215, 94, 193, 7, 245, 104, 1, 
+    223, 50, 245, 7, 7, 245, 104, 1, 223, 50, 226, 106, 7, 245, 104, 1, 235, 
+    194, 193, 7, 245, 104, 1, 240, 155, 232, 130, 7, 245, 104, 1, 254, 24, 
+    193, 217, 231, 229, 215, 1, 61, 217, 231, 229, 215, 1, 73, 217, 231, 229, 
+    215, 5, 246, 49, 217, 231, 229, 215, 1, 70, 217, 231, 229, 215, 1, 75, 
+    217, 231, 229, 215, 1, 76, 217, 231, 229, 215, 5, 241, 254, 217, 231, 
+    229, 215, 1, 234, 29, 217, 231, 229, 215, 1, 234, 106, 217, 231, 229, 
+    215, 1, 242, 175, 217, 231, 229, 215, 1, 242, 225, 217, 231, 229, 215, 5, 
+    254, 76, 217, 231, 229, 215, 1, 249, 239, 217, 231, 229, 215, 1, 250, 87, 
+    217, 231, 229, 215, 1, 235, 69, 217, 231, 229, 215, 1, 235, 110, 217, 
+    231, 229, 215, 1, 215, 134, 217, 231, 229, 215, 1, 215, 140, 217, 231, 
+    229, 215, 1, 248, 106, 217, 231, 229, 215, 1, 248, 115, 217, 231, 229, 
+    215, 1, 111, 217, 231, 229, 215, 1, 216, 157, 217, 231, 229, 215, 1, 247, 
+    146, 217, 231, 229, 215, 1, 248, 8, 217, 231, 229, 215, 1, 228, 75, 217, 
+    231, 229, 215, 1, 225, 17, 217, 231, 229, 215, 1, 225, 122, 217, 231, 
+    229, 215, 1, 251, 206, 217, 231, 229, 215, 1, 252, 11, 217, 231, 229, 
+    215, 1, 230, 162, 217, 231, 229, 215, 1, 222, 212, 217, 231, 229, 215, 1, 
+    232, 157, 217, 231, 229, 215, 1, 222, 166, 217, 231, 229, 215, 1, 219, 
+    59, 217, 231, 229, 215, 1, 241, 69, 217, 231, 229, 215, 25, 5, 61, 217, 
+    231, 229, 215, 25, 5, 73, 217, 231, 229, 215, 25, 5, 70, 217, 231, 229, 
+    215, 25, 5, 75, 217, 231, 229, 215, 25, 5, 226, 184, 217, 231, 229, 215, 
+    225, 13, 231, 159, 217, 231, 229, 215, 225, 13, 231, 158, 217, 231, 229, 
+    215, 225, 13, 231, 157, 217, 231, 229, 215, 225, 13, 231, 156, 228, 57, 
+    235, 241, 244, 3, 123, 224, 22, 228, 57, 235, 241, 244, 3, 123, 242, 28, 
+    228, 57, 235, 241, 244, 3, 134, 224, 20, 228, 57, 235, 241, 244, 3, 123, 
+    219, 118, 228, 57, 235, 241, 244, 3, 123, 245, 189, 228, 57, 235, 241, 
+    244, 3, 134, 219, 117, 228, 57, 235, 241, 224, 23, 78, 228, 57, 235, 241, 
+    225, 41, 78, 228, 57, 235, 241, 222, 119, 78, 228, 57, 235, 241, 224, 24, 
+    78, 225, 145, 1, 176, 225, 145, 1, 234, 133, 225, 145, 1, 243, 136, 225, 
+    145, 1, 229, 78, 225, 145, 1, 251, 34, 225, 145, 1, 250, 158, 225, 145, 
+    1, 235, 142, 225, 145, 1, 227, 166, 225, 145, 1, 217, 106, 225, 145, 1, 
+    216, 209, 225, 145, 1, 248, 222, 225, 145, 1, 197, 225, 145, 1, 190, 225, 
+    145, 1, 225, 148, 225, 145, 1, 252, 192, 225, 145, 1, 185, 225, 145, 1, 
+    215, 184, 225, 145, 1, 215, 176, 225, 145, 1, 246, 39, 225, 145, 1, 212, 
+    65, 225, 145, 1, 210, 82, 225, 145, 1, 210, 116, 225, 145, 1, 4, 61, 225, 
+    145, 1, 191, 225, 145, 1, 205, 225, 145, 1, 233, 136, 225, 145, 1, 220, 
+    103, 225, 145, 1, 206, 225, 145, 1, 162, 225, 145, 1, 61, 225, 145, 1, 
+    73, 225, 145, 1, 70, 225, 145, 1, 75, 225, 145, 1, 76, 225, 145, 1, 224, 
+    89, 225, 145, 1, 211, 165, 225, 145, 1, 244, 197, 225, 145, 1, 243, 30, 
+    225, 145, 1, 245, 210, 225, 145, 218, 74, 1, 212, 65, 225, 145, 218, 74, 
+    1, 191, 225, 145, 1, 215, 157, 225, 145, 1, 215, 145, 225, 145, 1, 248, 
+    136, 225, 145, 1, 228, 111, 225, 145, 1, 254, 142, 191, 225, 145, 1, 213, 
+    134, 220, 103, 225, 145, 1, 213, 135, 162, 225, 145, 1, 253, 224, 244, 
+    197, 225, 145, 218, 74, 1, 205, 225, 145, 218, 26, 1, 205, 225, 145, 1, 
+    251, 0, 225, 145, 219, 156, 241, 237, 78, 225, 145, 52, 241, 237, 78, 
+    225, 145, 164, 220, 96, 225, 145, 164, 52, 220, 96, 179, 5, 254, 76, 179, 
+    5, 213, 147, 179, 1, 61, 179, 1, 255, 74, 179, 1, 73, 179, 1, 236, 34, 
+    179, 1, 70, 179, 1, 214, 118, 179, 1, 149, 153, 179, 1, 149, 222, 181, 
+    179, 1, 149, 156, 179, 1, 149, 232, 186, 179, 1, 75, 179, 1, 245, 210, 
+    179, 1, 254, 202, 179, 1, 76, 179, 1, 226, 184, 179, 1, 253, 193, 179, 1, 
+    176, 179, 1, 234, 133, 179, 1, 243, 136, 179, 1, 242, 250, 179, 1, 229, 
+    78, 179, 1, 251, 34, 179, 1, 250, 158, 179, 1, 235, 142, 179, 1, 235, 
+    115, 179, 1, 227, 166, 179, 1, 215, 157, 179, 1, 215, 145, 179, 1, 248, 
+    136, 179, 1, 248, 120, 179, 1, 228, 111, 179, 1, 217, 106, 179, 1, 216, 
+    209, 179, 1, 248, 222, 179, 1, 248, 26, 179, 1, 197, 179, 1, 190, 179, 1, 
+    225, 148, 179, 1, 252, 192, 179, 1, 252, 19, 179, 1, 185, 179, 1, 191, 
+    179, 1, 205, 179, 1, 233, 136, 179, 1, 214, 27, 179, 1, 220, 103, 179, 1, 
+    218, 224, 179, 1, 206, 179, 1, 162, 179, 1, 232, 185, 179, 116, 5, 242, 
+    45, 179, 25, 5, 255, 74, 179, 25, 5, 73, 179, 25, 5, 236, 34, 179, 25, 5, 
     70, 179, 25, 5, 214, 118, 179, 25, 5, 149, 153, 179, 25, 5, 149, 222, 
-    180, 179, 25, 5, 149, 156, 179, 25, 5, 149, 232, 185, 179, 25, 5, 75, 
-    179, 25, 5, 245, 209, 179, 25, 5, 254, 201, 179, 25, 5, 76, 179, 25, 5, 
-    226, 183, 179, 25, 5, 253, 192, 179, 5, 213, 152, 179, 248, 178, 179, 52, 
-    248, 178, 179, 21, 210, 86, 179, 21, 110, 179, 21, 105, 179, 21, 158, 
+    181, 179, 25, 5, 149, 156, 179, 25, 5, 149, 232, 186, 179, 25, 5, 75, 
+    179, 25, 5, 245, 210, 179, 25, 5, 254, 202, 179, 25, 5, 76, 179, 25, 5, 
+    226, 184, 179, 25, 5, 253, 193, 179, 5, 213, 152, 179, 248, 179, 179, 52, 
+    248, 179, 179, 21, 210, 86, 179, 21, 110, 179, 21, 105, 179, 21, 158, 
     179, 21, 161, 179, 21, 189, 179, 21, 194, 179, 21, 198, 179, 21, 195, 
     179, 21, 200, 38, 84, 21, 210, 86, 38, 84, 21, 110, 38, 84, 21, 105, 38, 
     84, 21, 158, 38, 84, 21, 161, 38, 84, 21, 189, 38, 84, 21, 194, 38, 84, 
     21, 198, 38, 84, 21, 195, 38, 84, 21, 200, 38, 84, 1, 61, 38, 84, 1, 70, 
     38, 84, 1, 176, 38, 84, 1, 197, 38, 84, 1, 190, 38, 84, 1, 205, 38, 84, 
-    1, 213, 176, 38, 84, 5, 253, 175, 84, 5, 219, 17, 250, 255, 84, 5, 251, 
-    0, 213, 152, 84, 5, 52, 251, 0, 213, 152, 84, 5, 251, 0, 105, 84, 5, 251, 
-    0, 158, 84, 5, 251, 0, 253, 175, 84, 5, 224, 124, 84, 243, 100, 244, 103, 
-    84, 250, 238, 84, 241, 230, 234, 188, 232, 242, 21, 210, 86, 234, 188, 
-    232, 242, 21, 110, 234, 188, 232, 242, 21, 105, 234, 188, 232, 242, 21, 
-    158, 234, 188, 232, 242, 21, 161, 234, 188, 232, 242, 21, 189, 234, 188, 
-    232, 242, 21, 194, 234, 188, 232, 242, 21, 198, 234, 188, 232, 242, 21, 
-    195, 234, 188, 232, 242, 21, 200, 234, 188, 232, 242, 1, 176, 234, 188, 
-    232, 242, 1, 234, 132, 234, 188, 232, 242, 1, 243, 135, 234, 188, 232, 
-    242, 1, 229, 77, 234, 188, 232, 242, 1, 206, 234, 188, 232, 242, 1, 220, 
-    102, 234, 188, 232, 242, 1, 210, 116, 234, 188, 232, 242, 1, 227, 165, 
-    234, 188, 232, 242, 1, 217, 105, 234, 188, 232, 242, 1, 240, 226, 234, 
-    188, 232, 242, 1, 197, 234, 188, 232, 242, 1, 190, 234, 188, 232, 242, 1, 
-    225, 147, 234, 188, 232, 242, 1, 184, 234, 188, 232, 242, 1, 248, 221, 
-    234, 188, 232, 242, 1, 252, 191, 234, 188, 232, 242, 1, 205, 234, 188, 
-    232, 242, 1, 191, 234, 188, 232, 242, 1, 233, 135, 234, 188, 232, 242, 1, 
-    212, 65, 234, 188, 232, 242, 1, 216, 208, 234, 188, 232, 242, 1, 162, 
-    234, 188, 232, 242, 1, 214, 27, 234, 188, 232, 242, 1, 251, 33, 234, 188, 
-    232, 242, 1, 61, 234, 188, 232, 242, 1, 226, 234, 234, 188, 232, 242, 1, 
-    73, 234, 188, 232, 242, 1, 226, 183, 234, 188, 232, 242, 25, 214, 214, 
-    234, 188, 232, 242, 25, 75, 234, 188, 232, 242, 25, 70, 234, 188, 232, 
-    242, 25, 245, 209, 234, 188, 232, 242, 25, 76, 234, 188, 232, 242, 138, 
-    225, 30, 234, 188, 232, 242, 138, 251, 12, 234, 188, 232, 242, 138, 251, 
-    13, 225, 30, 234, 188, 232, 242, 5, 249, 77, 234, 188, 232, 242, 5, 219, 
-    199, 223, 93, 1, 176, 223, 93, 1, 243, 135, 223, 93, 1, 229, 77, 223, 93, 
-    1, 217, 105, 223, 93, 1, 248, 221, 223, 93, 1, 197, 223, 93, 1, 190, 223, 
-    93, 1, 252, 191, 223, 93, 1, 184, 223, 93, 1, 251, 33, 223, 93, 1, 235, 
-    141, 223, 93, 1, 227, 165, 223, 93, 1, 206, 223, 93, 1, 205, 223, 93, 1, 
-    233, 135, 223, 93, 1, 191, 223, 93, 1, 212, 65, 223, 93, 1, 162, 223, 93, 
-    1, 231, 124, 223, 93, 1, 229, 56, 223, 93, 1, 229, 148, 223, 93, 1, 227, 
-    135, 223, 93, 1, 61, 223, 93, 25, 5, 73, 223, 93, 25, 5, 70, 223, 93, 25, 
-    5, 75, 223, 93, 25, 5, 254, 201, 223, 93, 25, 5, 76, 223, 93, 25, 5, 253, 
-    192, 223, 93, 25, 5, 245, 55, 223, 93, 25, 5, 245, 233, 223, 93, 116, 5, 
-    229, 79, 223, 93, 116, 5, 230, 25, 223, 93, 116, 5, 153, 223, 93, 116, 5, 
-    242, 60, 223, 93, 213, 152, 223, 93, 221, 173, 78, 24, 100, 216, 97, 24, 
-    100, 216, 96, 24, 100, 216, 94, 24, 100, 216, 99, 24, 100, 223, 21, 24, 
-    100, 223, 5, 24, 100, 223, 0, 24, 100, 223, 2, 24, 100, 223, 18, 24, 100, 
-    223, 11, 24, 100, 223, 4, 24, 100, 223, 23, 24, 100, 223, 6, 24, 100, 
-    223, 25, 24, 100, 223, 22, 24, 100, 230, 213, 24, 100, 230, 204, 24, 100, 
-    230, 207, 24, 100, 225, 80, 24, 100, 225, 91, 24, 100, 225, 92, 24, 100, 
-    218, 207, 24, 100, 236, 46, 24, 100, 236, 53, 24, 100, 218, 218, 24, 100, 
-    218, 205, 24, 100, 225, 130, 24, 100, 241, 167, 24, 100, 218, 202, 155, 
-    5, 226, 27, 155, 5, 250, 187, 155, 5, 233, 66, 155, 5, 211, 243, 155, 1, 
-    61, 155, 1, 240, 154, 234, 191, 155, 1, 73, 155, 1, 236, 33, 155, 1, 70, 
-    155, 1, 226, 90, 250, 163, 155, 1, 229, 78, 233, 28, 155, 1, 229, 78, 
-    233, 29, 223, 142, 155, 1, 75, 155, 1, 254, 201, 155, 1, 76, 155, 1, 176, 
-    155, 1, 235, 13, 221, 228, 155, 1, 235, 13, 230, 66, 155, 1, 243, 135, 
-    155, 1, 243, 136, 230, 66, 155, 1, 229, 77, 155, 1, 251, 33, 155, 1, 251, 
-    34, 230, 66, 155, 1, 235, 141, 155, 1, 227, 166, 230, 66, 155, 1, 235, 
-    142, 231, 207, 155, 1, 227, 165, 155, 1, 215, 156, 155, 1, 215, 157, 231, 
-    207, 155, 1, 248, 135, 155, 1, 248, 136, 231, 207, 155, 1, 229, 229, 230, 
-    66, 155, 1, 217, 105, 155, 1, 217, 106, 230, 66, 155, 1, 248, 221, 155, 
-    1, 248, 222, 231, 207, 155, 1, 197, 155, 1, 190, 155, 1, 226, 90, 230, 
-    66, 155, 1, 252, 191, 155, 1, 252, 192, 230, 66, 155, 1, 184, 155, 1, 
-    191, 155, 1, 205, 155, 1, 223, 188, 254, 210, 155, 1, 233, 135, 155, 1, 
-    212, 65, 155, 1, 222, 34, 230, 66, 155, 1, 222, 34, 231, 207, 155, 1, 
-    206, 155, 1, 162, 155, 5, 250, 188, 216, 250, 155, 25, 5, 217, 47, 155, 
-    25, 5, 216, 35, 155, 25, 5, 211, 190, 155, 25, 5, 211, 191, 231, 69, 155, 
-    25, 5, 218, 47, 155, 25, 5, 218, 48, 231, 57, 155, 25, 5, 217, 65, 155, 
-    25, 5, 247, 194, 230, 65, 155, 25, 5, 225, 184, 155, 116, 5, 234, 158, 
-    155, 116, 5, 225, 196, 155, 116, 5, 251, 19, 155, 226, 40, 155, 43, 223, 
-    69, 155, 44, 223, 69, 155, 226, 79, 254, 117, 155, 226, 79, 231, 224, 
-    155, 226, 79, 232, 88, 155, 226, 79, 211, 238, 155, 226, 79, 226, 41, 
-    155, 226, 79, 232, 205, 155, 226, 79, 232, 82, 155, 226, 79, 254, 249, 
-    155, 226, 79, 254, 250, 254, 249, 155, 226, 79, 225, 51, 155, 215, 94, 
-    226, 79, 225, 51, 155, 226, 36, 155, 21, 210, 86, 155, 21, 110, 155, 21, 
+    1, 213, 176, 38, 84, 5, 253, 176, 84, 5, 219, 18, 251, 0, 84, 5, 251, 1, 
+    213, 152, 84, 5, 52, 251, 1, 213, 152, 84, 5, 251, 1, 105, 84, 5, 251, 1, 
+    158, 84, 5, 251, 1, 253, 176, 84, 5, 224, 125, 84, 243, 101, 244, 104, 
+    84, 250, 239, 84, 241, 231, 234, 189, 232, 243, 21, 210, 86, 234, 189, 
+    232, 243, 21, 110, 234, 189, 232, 243, 21, 105, 234, 189, 232, 243, 21, 
+    158, 234, 189, 232, 243, 21, 161, 234, 189, 232, 243, 21, 189, 234, 189, 
+    232, 243, 21, 194, 234, 189, 232, 243, 21, 198, 234, 189, 232, 243, 21, 
+    195, 234, 189, 232, 243, 21, 200, 234, 189, 232, 243, 1, 176, 234, 189, 
+    232, 243, 1, 234, 133, 234, 189, 232, 243, 1, 243, 136, 234, 189, 232, 
+    243, 1, 229, 78, 234, 189, 232, 243, 1, 206, 234, 189, 232, 243, 1, 220, 
+    103, 234, 189, 232, 243, 1, 210, 116, 234, 189, 232, 243, 1, 227, 166, 
+    234, 189, 232, 243, 1, 217, 106, 234, 189, 232, 243, 1, 240, 227, 234, 
+    189, 232, 243, 1, 197, 234, 189, 232, 243, 1, 190, 234, 189, 232, 243, 1, 
+    225, 148, 234, 189, 232, 243, 1, 185, 234, 189, 232, 243, 1, 248, 222, 
+    234, 189, 232, 243, 1, 252, 192, 234, 189, 232, 243, 1, 205, 234, 189, 
+    232, 243, 1, 191, 234, 189, 232, 243, 1, 233, 136, 234, 189, 232, 243, 1, 
+    212, 65, 234, 189, 232, 243, 1, 216, 209, 234, 189, 232, 243, 1, 162, 
+    234, 189, 232, 243, 1, 214, 27, 234, 189, 232, 243, 1, 251, 34, 234, 189, 
+    232, 243, 1, 61, 234, 189, 232, 243, 1, 226, 235, 234, 189, 232, 243, 1, 
+    73, 234, 189, 232, 243, 1, 226, 184, 234, 189, 232, 243, 25, 214, 214, 
+    234, 189, 232, 243, 25, 75, 234, 189, 232, 243, 25, 70, 234, 189, 232, 
+    243, 25, 245, 210, 234, 189, 232, 243, 25, 76, 234, 189, 232, 243, 138, 
+    225, 31, 234, 189, 232, 243, 138, 251, 13, 234, 189, 232, 243, 138, 251, 
+    14, 225, 31, 234, 189, 232, 243, 5, 249, 78, 234, 189, 232, 243, 5, 219, 
+    200, 223, 94, 1, 176, 223, 94, 1, 243, 136, 223, 94, 1, 229, 78, 223, 94, 
+    1, 217, 106, 223, 94, 1, 248, 222, 223, 94, 1, 197, 223, 94, 1, 190, 223, 
+    94, 1, 252, 192, 223, 94, 1, 185, 223, 94, 1, 251, 34, 223, 94, 1, 235, 
+    142, 223, 94, 1, 227, 166, 223, 94, 1, 206, 223, 94, 1, 205, 223, 94, 1, 
+    233, 136, 223, 94, 1, 191, 223, 94, 1, 212, 65, 223, 94, 1, 162, 223, 94, 
+    1, 231, 125, 223, 94, 1, 229, 57, 223, 94, 1, 229, 149, 223, 94, 1, 227, 
+    136, 223, 94, 1, 61, 223, 94, 25, 5, 73, 223, 94, 25, 5, 70, 223, 94, 25, 
+    5, 75, 223, 94, 25, 5, 254, 202, 223, 94, 25, 5, 76, 223, 94, 25, 5, 253, 
+    193, 223, 94, 25, 5, 245, 56, 223, 94, 25, 5, 245, 234, 223, 94, 116, 5, 
+    229, 80, 223, 94, 116, 5, 230, 26, 223, 94, 116, 5, 153, 223, 94, 116, 5, 
+    242, 61, 223, 94, 213, 152, 223, 94, 221, 174, 78, 24, 100, 216, 98, 24, 
+    100, 216, 97, 24, 100, 216, 95, 24, 100, 216, 100, 24, 100, 223, 22, 24, 
+    100, 223, 6, 24, 100, 223, 1, 24, 100, 223, 3, 24, 100, 223, 19, 24, 100, 
+    223, 12, 24, 100, 223, 5, 24, 100, 223, 24, 24, 100, 223, 7, 24, 100, 
+    223, 26, 24, 100, 223, 23, 24, 100, 230, 214, 24, 100, 230, 205, 24, 100, 
+    230, 208, 24, 100, 225, 81, 24, 100, 225, 92, 24, 100, 225, 93, 24, 100, 
+    218, 208, 24, 100, 236, 47, 24, 100, 236, 54, 24, 100, 218, 219, 24, 100, 
+    218, 206, 24, 100, 225, 131, 24, 100, 241, 168, 24, 100, 218, 203, 155, 
+    5, 226, 28, 155, 5, 250, 188, 155, 5, 233, 67, 155, 5, 211, 243, 155, 1, 
+    61, 155, 1, 240, 155, 234, 192, 155, 1, 73, 155, 1, 236, 34, 155, 1, 70, 
+    155, 1, 226, 91, 250, 164, 155, 1, 229, 79, 233, 29, 155, 1, 229, 79, 
+    233, 30, 223, 143, 155, 1, 75, 155, 1, 254, 202, 155, 1, 76, 155, 1, 176, 
+    155, 1, 235, 14, 221, 229, 155, 1, 235, 14, 230, 67, 155, 1, 243, 136, 
+    155, 1, 243, 137, 230, 67, 155, 1, 229, 78, 155, 1, 251, 34, 155, 1, 251, 
+    35, 230, 67, 155, 1, 235, 142, 155, 1, 227, 167, 230, 67, 155, 1, 235, 
+    143, 231, 208, 155, 1, 227, 166, 155, 1, 215, 157, 155, 1, 215, 158, 231, 
+    208, 155, 1, 248, 136, 155, 1, 248, 137, 231, 208, 155, 1, 229, 230, 230, 
+    67, 155, 1, 217, 106, 155, 1, 217, 107, 230, 67, 155, 1, 248, 222, 155, 
+    1, 248, 223, 231, 208, 155, 1, 197, 155, 1, 190, 155, 1, 226, 91, 230, 
+    67, 155, 1, 252, 192, 155, 1, 252, 193, 230, 67, 155, 1, 185, 155, 1, 
+    191, 155, 1, 205, 155, 1, 223, 189, 254, 211, 155, 1, 233, 136, 155, 1, 
+    212, 65, 155, 1, 222, 35, 230, 67, 155, 1, 222, 35, 231, 208, 155, 1, 
+    206, 155, 1, 162, 155, 5, 250, 189, 216, 251, 155, 25, 5, 217, 48, 155, 
+    25, 5, 216, 36, 155, 25, 5, 211, 190, 155, 25, 5, 211, 191, 231, 70, 155, 
+    25, 5, 218, 48, 155, 25, 5, 218, 49, 231, 58, 155, 25, 5, 217, 66, 155, 
+    25, 5, 247, 195, 230, 66, 155, 25, 5, 225, 185, 155, 116, 5, 234, 159, 
+    155, 116, 5, 225, 197, 155, 116, 5, 251, 20, 155, 226, 41, 155, 43, 223, 
+    70, 155, 44, 223, 70, 155, 226, 80, 254, 118, 155, 226, 80, 231, 225, 
+    155, 226, 80, 232, 89, 155, 226, 80, 211, 238, 155, 226, 80, 226, 42, 
+    155, 226, 80, 232, 206, 155, 226, 80, 232, 83, 155, 226, 80, 254, 250, 
+    155, 226, 80, 254, 251, 254, 250, 155, 226, 80, 225, 52, 155, 215, 94, 
+    226, 80, 225, 52, 155, 226, 37, 155, 21, 210, 86, 155, 21, 110, 155, 21, 
     105, 155, 21, 158, 155, 21, 161, 155, 21, 189, 155, 21, 194, 155, 21, 
-    198, 155, 21, 195, 155, 21, 200, 155, 226, 79, 216, 69, 215, 106, 155, 
-    226, 79, 235, 167, 172, 1, 61, 172, 1, 73, 172, 1, 70, 172, 1, 75, 172, 
-    1, 254, 201, 172, 1, 76, 172, 1, 176, 172, 1, 234, 132, 172, 1, 243, 135, 
-    172, 1, 242, 249, 172, 1, 228, 245, 172, 1, 229, 77, 172, 1, 250, 157, 
-    172, 1, 250, 112, 172, 1, 235, 141, 172, 1, 235, 114, 172, 1, 228, 235, 
-    172, 1, 228, 237, 172, 1, 228, 236, 172, 1, 217, 105, 172, 1, 216, 208, 
-    172, 1, 248, 221, 172, 1, 248, 25, 172, 1, 227, 207, 172, 1, 197, 172, 1, 
-    248, 135, 172, 1, 190, 172, 1, 224, 220, 172, 1, 225, 147, 172, 1, 252, 
-    191, 172, 1, 252, 18, 172, 1, 230, 95, 172, 1, 184, 172, 1, 252, 111, 
-    172, 1, 191, 172, 1, 205, 172, 1, 233, 135, 172, 1, 214, 27, 172, 1, 218, 
-    223, 172, 1, 206, 172, 1, 162, 172, 25, 5, 255, 73, 172, 25, 5, 73, 172, 
-    25, 5, 236, 33, 172, 25, 5, 245, 195, 172, 25, 5, 70, 172, 25, 5, 226, 
-    234, 172, 25, 5, 76, 172, 25, 5, 254, 201, 172, 25, 5, 253, 192, 172, 25, 
-    5, 214, 214, 172, 116, 5, 191, 172, 116, 5, 205, 172, 116, 5, 233, 135, 
-    172, 116, 5, 212, 65, 172, 1, 40, 235, 23, 172, 1, 40, 243, 202, 172, 1, 
-    40, 229, 79, 172, 116, 5, 40, 229, 79, 172, 1, 40, 250, 158, 172, 1, 40, 
-    217, 152, 172, 1, 40, 230, 25, 172, 1, 40, 226, 105, 172, 1, 40, 211, 
-    117, 172, 1, 40, 153, 172, 1, 40, 156, 172, 1, 40, 218, 226, 172, 116, 5, 
-    40, 193, 172, 116, 5, 40, 242, 60, 172, 21, 210, 86, 172, 21, 110, 172, 
+    198, 155, 21, 195, 155, 21, 200, 155, 226, 80, 216, 70, 215, 107, 155, 
+    226, 80, 235, 168, 172, 1, 61, 172, 1, 73, 172, 1, 70, 172, 1, 75, 172, 
+    1, 254, 202, 172, 1, 76, 172, 1, 176, 172, 1, 234, 133, 172, 1, 243, 136, 
+    172, 1, 242, 250, 172, 1, 228, 246, 172, 1, 229, 78, 172, 1, 250, 158, 
+    172, 1, 250, 113, 172, 1, 235, 142, 172, 1, 235, 115, 172, 1, 228, 236, 
+    172, 1, 228, 238, 172, 1, 228, 237, 172, 1, 217, 106, 172, 1, 216, 209, 
+    172, 1, 248, 222, 172, 1, 248, 26, 172, 1, 227, 208, 172, 1, 197, 172, 1, 
+    248, 136, 172, 1, 190, 172, 1, 224, 221, 172, 1, 225, 148, 172, 1, 252, 
+    192, 172, 1, 252, 19, 172, 1, 230, 96, 172, 1, 185, 172, 1, 252, 112, 
+    172, 1, 191, 172, 1, 205, 172, 1, 233, 136, 172, 1, 214, 27, 172, 1, 218, 
+    224, 172, 1, 206, 172, 1, 162, 172, 25, 5, 255, 74, 172, 25, 5, 73, 172, 
+    25, 5, 236, 34, 172, 25, 5, 245, 196, 172, 25, 5, 70, 172, 25, 5, 226, 
+    235, 172, 25, 5, 76, 172, 25, 5, 254, 202, 172, 25, 5, 253, 193, 172, 25, 
+    5, 214, 214, 172, 116, 5, 191, 172, 116, 5, 205, 172, 116, 5, 233, 136, 
+    172, 116, 5, 212, 65, 172, 1, 40, 235, 24, 172, 1, 40, 243, 203, 172, 1, 
+    40, 229, 80, 172, 116, 5, 40, 229, 80, 172, 1, 40, 250, 159, 172, 1, 40, 
+    217, 153, 172, 1, 40, 230, 26, 172, 1, 40, 226, 106, 172, 1, 40, 211, 
+    117, 172, 1, 40, 153, 172, 1, 40, 156, 172, 1, 40, 218, 227, 172, 116, 5, 
+    40, 193, 172, 116, 5, 40, 242, 61, 172, 21, 210, 86, 172, 21, 110, 172, 
     21, 105, 172, 21, 158, 172, 21, 161, 172, 21, 189, 172, 21, 194, 172, 21, 
-    198, 172, 21, 195, 172, 21, 200, 172, 224, 141, 218, 251, 172, 224, 141, 
-    248, 178, 172, 224, 141, 52, 248, 178, 172, 224, 141, 215, 211, 248, 178, 
-    68, 1, 234, 126, 243, 135, 68, 1, 234, 126, 251, 33, 68, 1, 234, 126, 
-    250, 157, 68, 1, 234, 126, 235, 141, 68, 1, 234, 126, 235, 114, 68, 1, 
-    234, 126, 227, 165, 68, 1, 234, 126, 215, 156, 68, 1, 234, 126, 215, 144, 
-    68, 1, 234, 126, 248, 135, 68, 1, 234, 126, 248, 119, 68, 1, 234, 126, 
-    248, 25, 68, 1, 234, 126, 197, 68, 1, 234, 126, 206, 68, 1, 234, 126, 
-    162, 68, 1, 234, 126, 241, 189, 68, 1, 234, 126, 244, 196, 68, 58, 1, 
-    234, 126, 223, 109, 68, 1, 234, 126, 211, 165, 68, 1, 234, 126, 210, 116, 
-    68, 1, 234, 126, 205, 68, 232, 145, 234, 126, 226, 253, 68, 232, 145, 
-    234, 126, 224, 43, 68, 232, 145, 234, 126, 241, 121, 68, 16, 254, 190, 
-    245, 30, 68, 16, 254, 190, 110, 68, 16, 254, 190, 105, 68, 1, 254, 190, 
-    205, 68, 5, 226, 23, 234, 213, 216, 30, 39, 208, 1, 121, 234, 28, 39, 
-    208, 1, 125, 234, 28, 39, 208, 1, 121, 234, 105, 39, 208, 1, 125, 234, 
-    105, 39, 208, 1, 121, 234, 114, 39, 208, 1, 125, 234, 114, 39, 208, 1, 
-    121, 242, 174, 39, 208, 1, 125, 242, 174, 39, 208, 1, 121, 229, 4, 39, 
-    208, 1, 125, 229, 4, 39, 208, 1, 121, 249, 238, 39, 208, 1, 125, 249, 
-    238, 39, 208, 1, 121, 250, 86, 39, 208, 1, 125, 250, 86, 39, 208, 1, 121, 
-    219, 58, 39, 208, 1, 125, 219, 58, 39, 208, 1, 121, 227, 134, 39, 208, 1, 
-    125, 227, 134, 39, 208, 1, 121, 247, 145, 39, 208, 1, 125, 247, 145, 39, 
-    208, 1, 121, 111, 39, 208, 1, 125, 111, 39, 208, 1, 121, 216, 156, 39, 
-    208, 1, 125, 216, 156, 39, 208, 1, 121, 228, 74, 39, 208, 1, 125, 228, 
-    74, 39, 208, 1, 121, 251, 205, 39, 208, 1, 125, 251, 205, 39, 208, 1, 
-    121, 225, 16, 39, 208, 1, 125, 225, 16, 39, 208, 1, 121, 225, 121, 39, 
-    208, 1, 125, 225, 121, 39, 208, 1, 121, 244, 43, 39, 208, 1, 125, 244, 
-    43, 39, 208, 1, 121, 230, 161, 39, 208, 1, 125, 230, 161, 39, 208, 1, 
-    121, 210, 244, 39, 208, 1, 125, 210, 244, 39, 208, 1, 121, 222, 211, 39, 
-    208, 1, 125, 222, 211, 39, 208, 1, 121, 232, 156, 39, 208, 1, 125, 232, 
-    156, 39, 208, 1, 121, 213, 138, 39, 208, 1, 125, 213, 138, 39, 208, 1, 
-    121, 241, 68, 39, 208, 1, 125, 241, 68, 39, 208, 1, 121, 76, 39, 208, 1, 
-    125, 76, 39, 208, 231, 204, 234, 230, 39, 208, 25, 255, 73, 39, 208, 25, 
+    198, 172, 21, 195, 172, 21, 200, 172, 224, 142, 218, 252, 172, 224, 142, 
+    248, 179, 172, 224, 142, 52, 248, 179, 172, 224, 142, 215, 212, 248, 179, 
+    68, 1, 234, 127, 243, 136, 68, 1, 234, 127, 251, 34, 68, 1, 234, 127, 
+    250, 158, 68, 1, 234, 127, 235, 142, 68, 1, 234, 127, 235, 115, 68, 1, 
+    234, 127, 227, 166, 68, 1, 234, 127, 215, 157, 68, 1, 234, 127, 215, 145, 
+    68, 1, 234, 127, 248, 136, 68, 1, 234, 127, 248, 120, 68, 1, 234, 127, 
+    248, 26, 68, 1, 234, 127, 197, 68, 1, 234, 127, 206, 68, 1, 234, 127, 
+    162, 68, 1, 234, 127, 241, 190, 68, 1, 234, 127, 244, 197, 68, 58, 1, 
+    234, 127, 223, 110, 68, 1, 234, 127, 211, 165, 68, 1, 234, 127, 210, 116, 
+    68, 1, 234, 127, 205, 68, 232, 146, 234, 127, 226, 254, 68, 232, 146, 
+    234, 127, 224, 44, 68, 232, 146, 234, 127, 241, 122, 68, 16, 254, 191, 
+    245, 31, 68, 16, 254, 191, 110, 68, 16, 254, 191, 105, 68, 1, 254, 191, 
+    205, 68, 5, 226, 24, 234, 214, 216, 31, 39, 208, 1, 121, 234, 29, 39, 
+    208, 1, 125, 234, 29, 39, 208, 1, 121, 234, 106, 39, 208, 1, 125, 234, 
+    106, 39, 208, 1, 121, 234, 115, 39, 208, 1, 125, 234, 115, 39, 208, 1, 
+    121, 242, 175, 39, 208, 1, 125, 242, 175, 39, 208, 1, 121, 229, 5, 39, 
+    208, 1, 125, 229, 5, 39, 208, 1, 121, 249, 239, 39, 208, 1, 125, 249, 
+    239, 39, 208, 1, 121, 250, 87, 39, 208, 1, 125, 250, 87, 39, 208, 1, 121, 
+    219, 59, 39, 208, 1, 125, 219, 59, 39, 208, 1, 121, 227, 135, 39, 208, 1, 
+    125, 227, 135, 39, 208, 1, 121, 247, 146, 39, 208, 1, 125, 247, 146, 39, 
+    208, 1, 121, 111, 39, 208, 1, 125, 111, 39, 208, 1, 121, 216, 157, 39, 
+    208, 1, 125, 216, 157, 39, 208, 1, 121, 228, 75, 39, 208, 1, 125, 228, 
+    75, 39, 208, 1, 121, 251, 206, 39, 208, 1, 125, 251, 206, 39, 208, 1, 
+    121, 225, 17, 39, 208, 1, 125, 225, 17, 39, 208, 1, 121, 225, 122, 39, 
+    208, 1, 125, 225, 122, 39, 208, 1, 121, 244, 44, 39, 208, 1, 125, 244, 
+    44, 39, 208, 1, 121, 230, 162, 39, 208, 1, 125, 230, 162, 39, 208, 1, 
+    121, 210, 244, 39, 208, 1, 125, 210, 244, 39, 208, 1, 121, 222, 212, 39, 
+    208, 1, 125, 222, 212, 39, 208, 1, 121, 232, 157, 39, 208, 1, 125, 232, 
+    157, 39, 208, 1, 121, 213, 138, 39, 208, 1, 125, 213, 138, 39, 208, 1, 
+    121, 241, 69, 39, 208, 1, 125, 241, 69, 39, 208, 1, 121, 76, 39, 208, 1, 
+    125, 76, 39, 208, 231, 205, 234, 231, 39, 208, 25, 255, 74, 39, 208, 25, 
     73, 39, 208, 25, 214, 214, 39, 208, 25, 70, 39, 208, 25, 75, 39, 208, 25, 
-    76, 39, 208, 231, 204, 234, 108, 39, 208, 25, 240, 119, 39, 208, 25, 214, 
-    213, 39, 208, 25, 214, 229, 39, 208, 25, 253, 190, 39, 208, 25, 253, 167, 
-    39, 208, 25, 254, 123, 39, 208, 25, 254, 136, 39, 208, 138, 231, 204, 
-    245, 180, 39, 208, 138, 231, 204, 227, 206, 39, 208, 138, 231, 204, 216, 
-    156, 39, 208, 138, 231, 204, 219, 42, 39, 208, 16, 234, 13, 39, 208, 16, 
-    227, 206, 39, 208, 16, 221, 253, 39, 208, 16, 241, 69, 241, 64, 39, 208, 
-    16, 234, 22, 234, 21, 186, 185, 1, 75, 186, 185, 1, 76, 186, 185, 1, 250, 
-    157, 186, 185, 1, 227, 165, 186, 185, 1, 215, 156, 186, 185, 1, 215, 144, 
-    186, 185, 1, 248, 135, 186, 185, 1, 248, 119, 186, 185, 1, 228, 110, 186, 
-    185, 1, 220, 102, 186, 185, 1, 218, 223, 186, 185, 25, 5, 236, 33, 186, 
-    185, 25, 5, 214, 118, 186, 185, 25, 5, 255, 37, 186, 185, 25, 5, 253, 
-    192, 186, 185, 25, 5, 255, 30, 186, 185, 250, 125, 186, 185, 254, 206, 
-    234, 98, 186, 185, 254, 103, 186, 185, 3, 223, 74, 78, 186, 185, 211, 
-    209, 223, 74, 78, 186, 185, 25, 5, 213, 147, 186, 185, 213, 152, 29, 3, 
-    215, 137, 29, 3, 215, 140, 29, 3, 215, 143, 29, 3, 215, 141, 29, 3, 215, 
-    142, 29, 3, 215, 139, 29, 3, 248, 113, 29, 3, 248, 115, 29, 3, 248, 118, 
-    29, 3, 248, 116, 29, 3, 248, 117, 29, 3, 248, 114, 29, 3, 246, 28, 29, 3, 
-    246, 31, 29, 3, 246, 37, 29, 3, 246, 35, 29, 3, 246, 36, 29, 3, 246, 29, 
-    29, 3, 250, 204, 29, 3, 250, 198, 29, 3, 250, 200, 29, 3, 250, 203, 29, 
-    3, 250, 201, 29, 3, 250, 202, 29, 3, 250, 199, 29, 3, 252, 111, 29, 3, 
-    252, 90, 29, 3, 252, 102, 29, 3, 252, 110, 29, 3, 252, 105, 29, 3, 252, 
-    106, 29, 3, 252, 94, 186, 185, 1, 234, 19, 186, 185, 1, 221, 253, 186, 
-    185, 1, 233, 109, 186, 185, 1, 230, 172, 186, 185, 1, 190, 186, 185, 1, 
-    197, 186, 185, 1, 250, 102, 186, 185, 1, 216, 90, 186, 185, 1, 234, 101, 
-    186, 185, 1, 228, 250, 186, 185, 1, 216, 150, 186, 185, 1, 212, 60, 186, 
-    185, 1, 211, 69, 186, 185, 1, 240, 216, 186, 185, 1, 214, 190, 186, 185, 
-    1, 73, 186, 185, 1, 225, 142, 186, 185, 1, 253, 202, 186, 185, 1, 242, 
-    167, 186, 185, 1, 235, 112, 186, 185, 1, 223, 166, 186, 185, 1, 252, 191, 
-    186, 185, 1, 235, 100, 186, 185, 1, 247, 219, 186, 185, 1, 242, 221, 186, 
-    185, 1, 248, 5, 186, 185, 1, 252, 16, 186, 185, 1, 234, 20, 232, 128, 
-    186, 185, 1, 233, 110, 232, 128, 186, 185, 1, 230, 173, 232, 128, 186, 
-    185, 1, 226, 90, 232, 128, 186, 185, 1, 229, 229, 232, 128, 186, 185, 1, 
-    216, 91, 232, 128, 186, 185, 1, 228, 251, 232, 128, 186, 185, 1, 240, 
-    154, 232, 128, 186, 185, 25, 5, 226, 195, 186, 185, 25, 5, 235, 253, 186, 
-    185, 25, 5, 254, 122, 186, 185, 25, 5, 211, 38, 186, 185, 25, 5, 219, 32, 
-    186, 185, 25, 5, 214, 187, 186, 185, 25, 5, 250, 123, 186, 185, 25, 5, 
-    227, 191, 186, 185, 250, 124, 186, 185, 232, 85, 235, 150, 186, 185, 254, 
-    46, 235, 150, 186, 185, 21, 210, 86, 186, 185, 21, 110, 186, 185, 21, 
-    105, 186, 185, 21, 158, 186, 185, 21, 161, 186, 185, 21, 189, 186, 185, 
-    21, 194, 186, 185, 21, 198, 186, 185, 21, 195, 186, 185, 21, 200, 24, 
-    143, 227, 77, 24, 143, 227, 82, 24, 143, 210, 243, 24, 143, 210, 242, 24, 
+    76, 39, 208, 231, 205, 234, 109, 39, 208, 25, 240, 120, 39, 208, 25, 214, 
+    213, 39, 208, 25, 214, 229, 39, 208, 25, 253, 191, 39, 208, 25, 253, 168, 
+    39, 208, 25, 254, 124, 39, 208, 25, 254, 137, 39, 208, 138, 231, 205, 
+    245, 181, 39, 208, 138, 231, 205, 227, 207, 39, 208, 138, 231, 205, 216, 
+    157, 39, 208, 138, 231, 205, 219, 43, 39, 208, 16, 234, 14, 39, 208, 16, 
+    227, 207, 39, 208, 16, 221, 254, 39, 208, 16, 241, 70, 241, 65, 39, 208, 
+    16, 234, 23, 234, 22, 187, 186, 1, 75, 187, 186, 1, 76, 187, 186, 1, 250, 
+    158, 187, 186, 1, 227, 166, 187, 186, 1, 215, 157, 187, 186, 1, 215, 145, 
+    187, 186, 1, 248, 136, 187, 186, 1, 248, 120, 187, 186, 1, 228, 111, 187, 
+    186, 1, 220, 103, 187, 186, 1, 218, 224, 187, 186, 25, 5, 236, 34, 187, 
+    186, 25, 5, 214, 118, 187, 186, 25, 5, 255, 38, 187, 186, 25, 5, 253, 
+    193, 187, 186, 25, 5, 255, 31, 187, 186, 250, 126, 187, 186, 254, 207, 
+    234, 99, 187, 186, 254, 104, 187, 186, 3, 223, 75, 78, 187, 186, 211, 
+    209, 223, 75, 78, 187, 186, 25, 5, 213, 147, 187, 186, 213, 152, 29, 3, 
+    215, 138, 29, 3, 215, 141, 29, 3, 215, 144, 29, 3, 215, 142, 29, 3, 215, 
+    143, 29, 3, 215, 140, 29, 3, 248, 114, 29, 3, 248, 116, 29, 3, 248, 119, 
+    29, 3, 248, 117, 29, 3, 248, 118, 29, 3, 248, 115, 29, 3, 246, 29, 29, 3, 
+    246, 32, 29, 3, 246, 38, 29, 3, 246, 36, 29, 3, 246, 37, 29, 3, 246, 30, 
+    29, 3, 250, 205, 29, 3, 250, 199, 29, 3, 250, 201, 29, 3, 250, 204, 29, 
+    3, 250, 202, 29, 3, 250, 203, 29, 3, 250, 200, 29, 3, 252, 112, 29, 3, 
+    252, 91, 29, 3, 252, 103, 29, 3, 252, 111, 29, 3, 252, 106, 29, 3, 252, 
+    107, 29, 3, 252, 95, 187, 186, 1, 234, 20, 187, 186, 1, 221, 254, 187, 
+    186, 1, 233, 110, 187, 186, 1, 230, 173, 187, 186, 1, 190, 187, 186, 1, 
+    197, 187, 186, 1, 250, 103, 187, 186, 1, 216, 91, 187, 186, 1, 234, 102, 
+    187, 186, 1, 228, 251, 187, 186, 1, 216, 151, 187, 186, 1, 212, 60, 187, 
+    186, 1, 211, 69, 187, 186, 1, 240, 217, 187, 186, 1, 214, 190, 187, 186, 
+    1, 73, 187, 186, 1, 225, 143, 187, 186, 1, 253, 203, 187, 186, 1, 242, 
+    168, 187, 186, 1, 235, 113, 187, 186, 1, 223, 167, 187, 186, 1, 252, 192, 
+    187, 186, 1, 235, 101, 187, 186, 1, 247, 220, 187, 186, 1, 242, 222, 187, 
+    186, 1, 248, 6, 187, 186, 1, 252, 17, 187, 186, 1, 234, 21, 232, 129, 
+    187, 186, 1, 233, 111, 232, 129, 187, 186, 1, 230, 174, 232, 129, 187, 
+    186, 1, 226, 91, 232, 129, 187, 186, 1, 229, 230, 232, 129, 187, 186, 1, 
+    216, 92, 232, 129, 187, 186, 1, 228, 252, 232, 129, 187, 186, 1, 240, 
+    155, 232, 129, 187, 186, 25, 5, 226, 196, 187, 186, 25, 5, 235, 254, 187, 
+    186, 25, 5, 254, 123, 187, 186, 25, 5, 211, 38, 187, 186, 25, 5, 219, 33, 
+    187, 186, 25, 5, 214, 187, 187, 186, 25, 5, 250, 124, 187, 186, 25, 5, 
+    227, 192, 187, 186, 250, 125, 187, 186, 232, 86, 235, 151, 187, 186, 254, 
+    47, 235, 151, 187, 186, 21, 210, 86, 187, 186, 21, 110, 187, 186, 21, 
+    105, 187, 186, 21, 158, 187, 186, 21, 161, 187, 186, 21, 189, 187, 186, 
+    21, 194, 187, 186, 21, 198, 187, 186, 21, 195, 187, 186, 21, 200, 24, 
+    143, 227, 78, 24, 143, 227, 83, 24, 143, 210, 243, 24, 143, 210, 242, 24, 
     143, 210, 241, 24, 143, 215, 23, 24, 143, 215, 26, 24, 143, 210, 210, 24, 
-    143, 210, 206, 24, 143, 245, 54, 24, 143, 245, 52, 24, 143, 245, 53, 24, 
-    143, 245, 50, 24, 143, 240, 144, 24, 143, 240, 143, 24, 143, 240, 141, 
-    24, 143, 240, 142, 24, 143, 240, 147, 24, 143, 240, 140, 24, 143, 240, 
-    139, 24, 143, 240, 149, 24, 143, 254, 33, 24, 143, 254, 32, 24, 90, 228, 
-    219, 24, 90, 228, 225, 24, 90, 218, 204, 24, 90, 218, 203, 24, 90, 216, 
-    96, 24, 90, 216, 94, 24, 90, 216, 93, 24, 90, 216, 99, 24, 90, 216, 100, 
-    24, 90, 216, 92, 24, 90, 223, 5, 24, 90, 223, 20, 24, 90, 218, 210, 24, 
-    90, 223, 17, 24, 90, 223, 7, 24, 90, 223, 9, 24, 90, 222, 252, 24, 90, 
-    222, 253, 24, 90, 234, 218, 24, 90, 230, 212, 24, 90, 230, 206, 24, 90, 
-    218, 214, 24, 90, 230, 209, 24, 90, 230, 215, 24, 90, 225, 76, 24, 90, 
-    225, 85, 24, 90, 225, 89, 24, 90, 218, 212, 24, 90, 225, 79, 24, 90, 225, 
-    93, 24, 90, 225, 94, 24, 90, 219, 140, 24, 90, 219, 143, 24, 90, 218, 
-    208, 24, 90, 218, 206, 24, 90, 219, 138, 24, 90, 219, 146, 24, 90, 219, 
-    147, 24, 90, 219, 132, 24, 90, 219, 145, 24, 90, 226, 30, 24, 90, 226, 
-    31, 24, 90, 211, 24, 24, 90, 211, 25, 24, 90, 250, 44, 24, 90, 250, 43, 
-    24, 90, 218, 219, 24, 90, 225, 128, 24, 90, 225, 127, 9, 14, 238, 24, 9, 
-    14, 238, 23, 9, 14, 238, 22, 9, 14, 238, 21, 9, 14, 238, 20, 9, 14, 238, 
-    19, 9, 14, 238, 18, 9, 14, 238, 17, 9, 14, 238, 16, 9, 14, 238, 15, 9, 
-    14, 238, 14, 9, 14, 238, 13, 9, 14, 238, 12, 9, 14, 238, 11, 9, 14, 238, 
-    10, 9, 14, 238, 9, 9, 14, 238, 8, 9, 14, 238, 7, 9, 14, 238, 6, 9, 14, 
-    238, 5, 9, 14, 238, 4, 9, 14, 238, 3, 9, 14, 238, 2, 9, 14, 238, 1, 9, 
-    14, 238, 0, 9, 14, 237, 255, 9, 14, 237, 254, 9, 14, 237, 253, 9, 14, 
-    237, 252, 9, 14, 237, 251, 9, 14, 237, 250, 9, 14, 237, 249, 9, 14, 237, 
-    248, 9, 14, 237, 247, 9, 14, 237, 246, 9, 14, 237, 245, 9, 14, 237, 244, 
-    9, 14, 237, 243, 9, 14, 237, 242, 9, 14, 237, 241, 9, 14, 237, 240, 9, 
-    14, 237, 239, 9, 14, 237, 238, 9, 14, 237, 237, 9, 14, 237, 236, 9, 14, 
-    237, 235, 9, 14, 237, 234, 9, 14, 237, 233, 9, 14, 237, 232, 9, 14, 237, 
-    231, 9, 14, 237, 230, 9, 14, 237, 229, 9, 14, 237, 228, 9, 14, 237, 227, 
-    9, 14, 237, 226, 9, 14, 237, 225, 9, 14, 237, 224, 9, 14, 237, 223, 9, 
-    14, 237, 222, 9, 14, 237, 221, 9, 14, 237, 220, 9, 14, 237, 219, 9, 14, 
-    237, 218, 9, 14, 237, 217, 9, 14, 237, 216, 9, 14, 237, 215, 9, 14, 237, 
-    214, 9, 14, 237, 213, 9, 14, 237, 212, 9, 14, 237, 211, 9, 14, 237, 210, 
-    9, 14, 237, 209, 9, 14, 237, 208, 9, 14, 237, 207, 9, 14, 237, 206, 9, 
-    14, 237, 205, 9, 14, 237, 204, 9, 14, 237, 203, 9, 14, 237, 202, 9, 14, 
-    237, 201, 9, 14, 237, 200, 9, 14, 237, 199, 9, 14, 237, 198, 9, 14, 237, 
-    197, 9, 14, 237, 196, 9, 14, 237, 195, 9, 14, 237, 194, 9, 14, 237, 193, 
-    9, 14, 237, 192, 9, 14, 237, 191, 9, 14, 237, 190, 9, 14, 237, 189, 9, 
-    14, 237, 188, 9, 14, 237, 187, 9, 14, 237, 186, 9, 14, 237, 185, 9, 14, 
-    237, 184, 9, 14, 237, 183, 9, 14, 237, 182, 9, 14, 237, 181, 9, 14, 237, 
-    180, 9, 14, 237, 179, 9, 14, 237, 178, 9, 14, 237, 177, 9, 14, 237, 176, 
-    9, 14, 237, 175, 9, 14, 237, 174, 9, 14, 237, 173, 9, 14, 237, 172, 9, 
-    14, 237, 171, 9, 14, 237, 170, 9, 14, 237, 169, 9, 14, 237, 168, 9, 14, 
-    237, 167, 9, 14, 237, 166, 9, 14, 237, 165, 9, 14, 237, 164, 9, 14, 237, 
-    163, 9, 14, 237, 162, 9, 14, 237, 161, 9, 14, 237, 160, 9, 14, 237, 159, 
-    9, 14, 237, 158, 9, 14, 237, 157, 9, 14, 237, 156, 9, 14, 237, 155, 9, 
-    14, 237, 154, 9, 14, 237, 153, 9, 14, 237, 152, 9, 14, 237, 151, 9, 14, 
-    237, 150, 9, 14, 237, 149, 9, 14, 237, 148, 9, 14, 237, 147, 9, 14, 237, 
-    146, 9, 14, 237, 145, 9, 14, 237, 144, 9, 14, 237, 143, 9, 14, 237, 142, 
-    9, 14, 237, 141, 9, 14, 237, 140, 9, 14, 237, 139, 9, 14, 237, 138, 9, 
-    14, 237, 137, 9, 14, 237, 136, 9, 14, 237, 135, 9, 14, 237, 134, 9, 14, 
-    237, 133, 9, 14, 237, 132, 9, 14, 237, 131, 9, 14, 237, 130, 9, 14, 237, 
-    129, 9, 14, 237, 128, 9, 14, 237, 127, 9, 14, 237, 126, 9, 14, 237, 125, 
-    9, 14, 237, 124, 9, 14, 237, 123, 9, 14, 237, 122, 9, 14, 237, 121, 9, 
-    14, 237, 120, 9, 14, 237, 119, 9, 14, 237, 118, 9, 14, 237, 117, 9, 14, 
-    237, 116, 9, 14, 237, 115, 9, 14, 237, 114, 9, 14, 237, 113, 9, 14, 237, 
-    112, 9, 14, 237, 111, 9, 14, 237, 110, 9, 14, 237, 109, 9, 14, 237, 108, 
-    9, 14, 237, 107, 9, 14, 237, 106, 9, 14, 237, 105, 9, 14, 237, 104, 9, 
-    14, 237, 103, 9, 14, 237, 102, 9, 14, 237, 101, 9, 14, 237, 100, 9, 14, 
-    237, 99, 9, 14, 237, 98, 9, 14, 237, 97, 9, 14, 237, 96, 9, 14, 237, 95, 
-    9, 14, 237, 94, 9, 14, 237, 93, 9, 14, 237, 92, 9, 14, 237, 91, 9, 14, 
-    237, 90, 9, 14, 237, 89, 9, 14, 237, 88, 9, 14, 237, 87, 9, 14, 237, 86, 
-    9, 14, 237, 85, 9, 14, 237, 84, 9, 14, 237, 83, 9, 14, 237, 82, 9, 14, 
-    237, 81, 9, 14, 237, 80, 9, 14, 237, 79, 9, 14, 237, 78, 9, 14, 237, 77, 
-    9, 14, 237, 76, 9, 14, 237, 75, 9, 14, 237, 74, 9, 14, 237, 73, 9, 14, 
-    237, 72, 9, 14, 237, 71, 9, 14, 237, 70, 9, 14, 237, 69, 9, 14, 237, 68, 
-    9, 14, 237, 67, 9, 14, 237, 66, 9, 14, 237, 65, 9, 14, 237, 64, 9, 14, 
-    237, 63, 9, 14, 237, 62, 9, 14, 237, 61, 9, 14, 237, 60, 9, 14, 237, 59, 
-    9, 14, 237, 58, 9, 14, 237, 57, 9, 14, 237, 56, 9, 14, 237, 55, 9, 14, 
-    237, 54, 9, 14, 237, 53, 9, 14, 237, 52, 9, 14, 237, 51, 9, 14, 237, 50, 
-    9, 14, 237, 49, 9, 14, 237, 48, 9, 14, 237, 47, 9, 14, 237, 46, 9, 14, 
-    237, 45, 9, 14, 237, 44, 9, 14, 237, 43, 9, 14, 237, 42, 9, 14, 237, 41, 
-    9, 14, 237, 40, 9, 14, 237, 39, 9, 14, 237, 38, 9, 14, 237, 37, 9, 14, 
-    237, 36, 9, 14, 237, 35, 9, 14, 237, 34, 9, 14, 237, 33, 9, 14, 237, 32, 
-    9, 14, 237, 31, 9, 14, 237, 30, 9, 14, 237, 29, 9, 14, 237, 28, 9, 14, 
-    237, 27, 9, 14, 237, 26, 9, 14, 237, 25, 9, 14, 237, 24, 9, 14, 237, 23, 
-    9, 14, 237, 22, 9, 14, 237, 21, 9, 14, 237, 20, 9, 14, 237, 19, 9, 14, 
-    237, 18, 9, 14, 237, 17, 9, 14, 237, 16, 9, 14, 237, 15, 9, 14, 237, 14, 
-    9, 14, 237, 13, 9, 14, 237, 12, 9, 14, 237, 11, 9, 14, 237, 10, 9, 14, 
-    237, 9, 9, 14, 237, 8, 9, 14, 237, 7, 9, 14, 237, 6, 9, 14, 237, 5, 9, 
-    14, 237, 4, 9, 14, 237, 3, 9, 14, 237, 2, 9, 14, 237, 1, 9, 14, 237, 0, 
-    9, 14, 236, 255, 9, 14, 236, 254, 9, 14, 236, 253, 9, 14, 236, 252, 9, 
-    14, 236, 251, 9, 14, 236, 250, 9, 14, 236, 249, 9, 14, 236, 248, 9, 14, 
-    236, 247, 9, 14, 236, 246, 9, 14, 236, 245, 9, 14, 236, 244, 9, 14, 236, 
-    243, 9, 14, 236, 242, 9, 14, 236, 241, 9, 14, 236, 240, 9, 14, 236, 239, 
-    9, 14, 236, 238, 9, 14, 236, 237, 9, 14, 236, 236, 9, 14, 236, 235, 9, 
-    14, 236, 234, 9, 14, 236, 233, 9, 14, 236, 232, 9, 14, 236, 231, 9, 14, 
-    236, 230, 9, 14, 236, 229, 9, 14, 236, 228, 9, 14, 236, 227, 9, 14, 236, 
-    226, 9, 14, 236, 225, 9, 14, 236, 224, 9, 14, 236, 223, 9, 14, 236, 222, 
-    9, 14, 236, 221, 9, 14, 236, 220, 9, 14, 236, 219, 9, 14, 236, 218, 9, 
-    14, 236, 217, 9, 14, 236, 216, 9, 14, 236, 215, 9, 14, 236, 214, 9, 14, 
-    236, 213, 9, 14, 236, 212, 9, 14, 236, 211, 9, 14, 236, 210, 9, 14, 236, 
-    209, 9, 14, 236, 208, 9, 14, 236, 207, 9, 14, 236, 206, 9, 14, 236, 205, 
-    9, 14, 236, 204, 9, 14, 236, 203, 9, 14, 236, 202, 9, 14, 236, 201, 9, 
-    14, 236, 200, 9, 14, 236, 199, 9, 14, 236, 198, 9, 14, 236, 197, 9, 14, 
-    236, 196, 9, 14, 236, 195, 9, 14, 236, 194, 9, 14, 236, 193, 9, 14, 236, 
-    192, 9, 14, 236, 191, 9, 14, 236, 190, 9, 14, 236, 189, 9, 14, 236, 188, 
-    9, 14, 236, 187, 9, 14, 236, 186, 9, 14, 236, 185, 9, 14, 236, 184, 9, 
-    14, 236, 183, 9, 14, 236, 182, 9, 14, 236, 181, 9, 14, 236, 180, 9, 14, 
-    236, 179, 9, 14, 236, 178, 9, 14, 236, 177, 9, 14, 236, 176, 9, 14, 236, 
-    175, 9, 14, 236, 174, 9, 14, 236, 173, 9, 14, 236, 172, 9, 14, 236, 171, 
-    9, 14, 236, 170, 9, 14, 236, 169, 9, 14, 236, 168, 9, 14, 236, 167, 9, 
-    14, 236, 166, 9, 14, 236, 165, 9, 14, 236, 164, 9, 14, 236, 163, 9, 14, 
-    236, 162, 9, 14, 236, 161, 9, 14, 236, 160, 9, 14, 236, 159, 9, 14, 236, 
-    158, 9, 14, 236, 157, 9, 14, 236, 156, 9, 14, 236, 155, 9, 14, 236, 154, 
-    9, 14, 236, 153, 9, 14, 236, 152, 9, 14, 236, 151, 9, 14, 236, 150, 9, 
-    14, 236, 149, 9, 14, 236, 148, 9, 14, 236, 147, 9, 14, 236, 146, 9, 14, 
-    236, 145, 9, 14, 236, 144, 9, 14, 236, 143, 9, 14, 236, 142, 9, 14, 236, 
-    141, 9, 14, 236, 140, 9, 14, 236, 139, 9, 14, 236, 138, 9, 14, 236, 137, 
-    9, 14, 236, 136, 9, 14, 236, 135, 9, 14, 236, 134, 9, 14, 236, 133, 9, 
-    14, 236, 132, 9, 14, 236, 131, 9, 14, 236, 130, 9, 14, 236, 129, 9, 14, 
-    236, 128, 9, 14, 236, 127, 9, 14, 236, 126, 9, 14, 236, 125, 9, 14, 236, 
-    124, 9, 14, 236, 123, 9, 14, 236, 122, 9, 14, 236, 121, 9, 14, 236, 120, 
-    9, 14, 236, 119, 9, 14, 236, 118, 9, 14, 236, 117, 9, 14, 236, 116, 9, 
-    14, 236, 115, 9, 14, 236, 114, 9, 14, 236, 113, 9, 14, 236, 112, 9, 14, 
-    236, 111, 9, 14, 236, 110, 9, 14, 236, 109, 9, 14, 236, 108, 9, 14, 236, 
-    107, 9, 14, 236, 106, 9, 14, 236, 105, 9, 14, 236, 104, 9, 14, 236, 103, 
-    9, 14, 236, 102, 9, 14, 236, 101, 9, 14, 236, 100, 9, 14, 236, 99, 9, 14, 
-    236, 98, 9, 14, 236, 97, 9, 14, 236, 96, 9, 14, 236, 95, 9, 14, 236, 94, 
-    9, 14, 236, 93, 9, 14, 236, 92, 9, 14, 236, 91, 9, 14, 236, 90, 9, 14, 
-    236, 89, 9, 14, 236, 88, 9, 14, 236, 87, 9, 14, 236, 86, 9, 14, 236, 85, 
-    9, 14, 236, 84, 9, 14, 236, 83, 9, 14, 236, 82, 9, 14, 236, 81, 9, 14, 
-    236, 80, 9, 14, 236, 79, 9, 14, 236, 78, 9, 14, 236, 77, 9, 14, 236, 76, 
-    9, 14, 236, 75, 9, 14, 236, 74, 9, 14, 236, 73, 9, 14, 236, 72, 9, 14, 
-    236, 71, 9, 14, 236, 70, 9, 14, 236, 69, 9, 14, 236, 68, 9, 14, 236, 67, 
-    9, 14, 236, 66, 9, 14, 236, 65, 7, 4, 27, 244, 125, 7, 4, 27, 244, 121, 
-    7, 4, 27, 244, 76, 7, 4, 27, 244, 124, 7, 4, 27, 244, 123, 7, 4, 27, 199, 
-    222, 92, 217, 152, 7, 4, 27, 218, 168, 150, 4, 27, 231, 59, 228, 39, 150, 
-    4, 27, 231, 59, 245, 213, 150, 4, 27, 231, 59, 235, 227, 150, 4, 27, 213, 
-    180, 228, 39, 150, 4, 27, 231, 59, 211, 160, 94, 1, 210, 234, 2, 241, 
-    158, 94, 225, 11, 235, 50, 214, 11, 94, 27, 211, 6, 210, 234, 210, 234, 
-    225, 239, 94, 1, 254, 139, 253, 162, 94, 1, 211, 247, 254, 170, 94, 1, 
-    211, 247, 248, 189, 94, 1, 211, 247, 241, 238, 94, 1, 211, 247, 234, 250, 
-    94, 1, 211, 247, 233, 94, 94, 1, 211, 247, 40, 231, 65, 94, 1, 211, 247, 
-    223, 67, 94, 1, 211, 247, 217, 38, 94, 1, 254, 139, 96, 50, 94, 1, 220, 
-    21, 2, 220, 21, 247, 120, 94, 1, 220, 21, 2, 219, 159, 247, 120, 94, 1, 
-    220, 21, 2, 248, 208, 22, 220, 21, 247, 120, 94, 1, 220, 21, 2, 248, 208, 
-    22, 219, 159, 247, 120, 94, 1, 112, 2, 225, 239, 94, 1, 112, 2, 224, 76, 
-    94, 1, 112, 2, 231, 171, 94, 1, 252, 29, 2, 248, 207, 94, 1, 242, 202, 2, 
-    248, 207, 94, 1, 248, 190, 2, 248, 207, 94, 1, 241, 239, 2, 231, 171, 94, 
-    1, 214, 4, 2, 248, 207, 94, 1, 210, 98, 2, 248, 207, 94, 1, 216, 231, 2, 
-    248, 207, 94, 1, 210, 234, 2, 248, 207, 94, 1, 40, 234, 251, 2, 248, 207, 
-    94, 1, 234, 251, 2, 248, 207, 94, 1, 233, 95, 2, 248, 207, 94, 1, 231, 
-    66, 2, 248, 207, 94, 1, 227, 195, 2, 248, 207, 94, 1, 221, 250, 2, 248, 
-    207, 94, 1, 40, 225, 222, 2, 248, 207, 94, 1, 225, 222, 2, 248, 207, 94, 
-    1, 215, 180, 2, 248, 207, 94, 1, 224, 40, 2, 248, 207, 94, 1, 223, 68, 2, 
-    248, 207, 94, 1, 220, 21, 2, 248, 207, 94, 1, 217, 39, 2, 248, 207, 94, 
-    1, 214, 4, 2, 241, 61, 94, 1, 252, 29, 2, 223, 169, 94, 1, 234, 251, 2, 
-    223, 169, 94, 1, 225, 222, 2, 223, 169, 94, 27, 112, 233, 94, 10, 1, 112, 
-    212, 47, 53, 17, 10, 1, 112, 212, 47, 40, 17, 10, 1, 252, 65, 53, 17, 10, 
-    1, 252, 65, 40, 17, 10, 1, 252, 65, 65, 17, 10, 1, 252, 65, 147, 17, 10, 
-    1, 225, 206, 53, 17, 10, 1, 225, 206, 40, 17, 10, 1, 225, 206, 65, 17, 
-    10, 1, 225, 206, 147, 17, 10, 1, 252, 53, 53, 17, 10, 1, 252, 53, 40, 17, 
-    10, 1, 252, 53, 65, 17, 10, 1, 252, 53, 147, 17, 10, 1, 215, 147, 53, 17, 
-    10, 1, 215, 147, 40, 17, 10, 1, 215, 147, 65, 17, 10, 1, 215, 147, 147, 
-    17, 10, 1, 217, 6, 53, 17, 10, 1, 217, 6, 40, 17, 10, 1, 217, 6, 65, 17, 
-    10, 1, 217, 6, 147, 17, 10, 1, 215, 149, 53, 17, 10, 1, 215, 149, 40, 17, 
-    10, 1, 215, 149, 65, 17, 10, 1, 215, 149, 147, 17, 10, 1, 213, 249, 53, 
+    143, 210, 206, 24, 143, 245, 55, 24, 143, 245, 53, 24, 143, 245, 54, 24, 
+    143, 245, 51, 24, 143, 240, 145, 24, 143, 240, 144, 24, 143, 240, 142, 
+    24, 143, 240, 143, 24, 143, 240, 148, 24, 143, 240, 141, 24, 143, 240, 
+    140, 24, 143, 240, 150, 24, 143, 254, 34, 24, 143, 254, 33, 24, 90, 228, 
+    220, 24, 90, 228, 226, 24, 90, 218, 205, 24, 90, 218, 204, 24, 90, 216, 
+    97, 24, 90, 216, 95, 24, 90, 216, 94, 24, 90, 216, 100, 24, 90, 216, 101, 
+    24, 90, 216, 93, 24, 90, 223, 6, 24, 90, 223, 21, 24, 90, 218, 211, 24, 
+    90, 223, 18, 24, 90, 223, 8, 24, 90, 223, 10, 24, 90, 222, 253, 24, 90, 
+    222, 254, 24, 90, 234, 219, 24, 90, 230, 213, 24, 90, 230, 207, 24, 90, 
+    218, 215, 24, 90, 230, 210, 24, 90, 230, 216, 24, 90, 225, 77, 24, 90, 
+    225, 86, 24, 90, 225, 90, 24, 90, 218, 213, 24, 90, 225, 80, 24, 90, 225, 
+    94, 24, 90, 225, 95, 24, 90, 219, 141, 24, 90, 219, 144, 24, 90, 218, 
+    209, 24, 90, 218, 207, 24, 90, 219, 139, 24, 90, 219, 147, 24, 90, 219, 
+    148, 24, 90, 219, 133, 24, 90, 219, 146, 24, 90, 226, 31, 24, 90, 226, 
+    32, 24, 90, 211, 24, 24, 90, 211, 25, 24, 90, 250, 45, 24, 90, 250, 44, 
+    24, 90, 218, 220, 24, 90, 225, 129, 24, 90, 225, 128, 9, 14, 238, 25, 9, 
+    14, 238, 24, 9, 14, 238, 23, 9, 14, 238, 22, 9, 14, 238, 21, 9, 14, 238, 
+    20, 9, 14, 238, 19, 9, 14, 238, 18, 9, 14, 238, 17, 9, 14, 238, 16, 9, 
+    14, 238, 15, 9, 14, 238, 14, 9, 14, 238, 13, 9, 14, 238, 12, 9, 14, 238, 
+    11, 9, 14, 238, 10, 9, 14, 238, 9, 9, 14, 238, 8, 9, 14, 238, 7, 9, 14, 
+    238, 6, 9, 14, 238, 5, 9, 14, 238, 4, 9, 14, 238, 3, 9, 14, 238, 2, 9, 
+    14, 238, 1, 9, 14, 238, 0, 9, 14, 237, 255, 9, 14, 237, 254, 9, 14, 237, 
+    253, 9, 14, 237, 252, 9, 14, 237, 251, 9, 14, 237, 250, 9, 14, 237, 249, 
+    9, 14, 237, 248, 9, 14, 237, 247, 9, 14, 237, 246, 9, 14, 237, 245, 9, 
+    14, 237, 244, 9, 14, 237, 243, 9, 14, 237, 242, 9, 14, 237, 241, 9, 14, 
+    237, 240, 9, 14, 237, 239, 9, 14, 237, 238, 9, 14, 237, 237, 9, 14, 237, 
+    236, 9, 14, 237, 235, 9, 14, 237, 234, 9, 14, 237, 233, 9, 14, 237, 232, 
+    9, 14, 237, 231, 9, 14, 237, 230, 9, 14, 237, 229, 9, 14, 237, 228, 9, 
+    14, 237, 227, 9, 14, 237, 226, 9, 14, 237, 225, 9, 14, 237, 224, 9, 14, 
+    237, 223, 9, 14, 237, 222, 9, 14, 237, 221, 9, 14, 237, 220, 9, 14, 237, 
+    219, 9, 14, 237, 218, 9, 14, 237, 217, 9, 14, 237, 216, 9, 14, 237, 215, 
+    9, 14, 237, 214, 9, 14, 237, 213, 9, 14, 237, 212, 9, 14, 237, 211, 9, 
+    14, 237, 210, 9, 14, 237, 209, 9, 14, 237, 208, 9, 14, 237, 207, 9, 14, 
+    237, 206, 9, 14, 237, 205, 9, 14, 237, 204, 9, 14, 237, 203, 9, 14, 237, 
+    202, 9, 14, 237, 201, 9, 14, 237, 200, 9, 14, 237, 199, 9, 14, 237, 198, 
+    9, 14, 237, 197, 9, 14, 237, 196, 9, 14, 237, 195, 9, 14, 237, 194, 9, 
+    14, 237, 193, 9, 14, 237, 192, 9, 14, 237, 191, 9, 14, 237, 190, 9, 14, 
+    237, 189, 9, 14, 237, 188, 9, 14, 237, 187, 9, 14, 237, 186, 9, 14, 237, 
+    185, 9, 14, 237, 184, 9, 14, 237, 183, 9, 14, 237, 182, 9, 14, 237, 181, 
+    9, 14, 237, 180, 9, 14, 237, 179, 9, 14, 237, 178, 9, 14, 237, 177, 9, 
+    14, 237, 176, 9, 14, 237, 175, 9, 14, 237, 174, 9, 14, 237, 173, 9, 14, 
+    237, 172, 9, 14, 237, 171, 9, 14, 237, 170, 9, 14, 237, 169, 9, 14, 237, 
+    168, 9, 14, 237, 167, 9, 14, 237, 166, 9, 14, 237, 165, 9, 14, 237, 164, 
+    9, 14, 237, 163, 9, 14, 237, 162, 9, 14, 237, 161, 9, 14, 237, 160, 9, 
+    14, 237, 159, 9, 14, 237, 158, 9, 14, 237, 157, 9, 14, 237, 156, 9, 14, 
+    237, 155, 9, 14, 237, 154, 9, 14, 237, 153, 9, 14, 237, 152, 9, 14, 237, 
+    151, 9, 14, 237, 150, 9, 14, 237, 149, 9, 14, 237, 148, 9, 14, 237, 147, 
+    9, 14, 237, 146, 9, 14, 237, 145, 9, 14, 237, 144, 9, 14, 237, 143, 9, 
+    14, 237, 142, 9, 14, 237, 141, 9, 14, 237, 140, 9, 14, 237, 139, 9, 14, 
+    237, 138, 9, 14, 237, 137, 9, 14, 237, 136, 9, 14, 237, 135, 9, 14, 237, 
+    134, 9, 14, 237, 133, 9, 14, 237, 132, 9, 14, 237, 131, 9, 14, 237, 130, 
+    9, 14, 237, 129, 9, 14, 237, 128, 9, 14, 237, 127, 9, 14, 237, 126, 9, 
+    14, 237, 125, 9, 14, 237, 124, 9, 14, 237, 123, 9, 14, 237, 122, 9, 14, 
+    237, 121, 9, 14, 237, 120, 9, 14, 237, 119, 9, 14, 237, 118, 9, 14, 237, 
+    117, 9, 14, 237, 116, 9, 14, 237, 115, 9, 14, 237, 114, 9, 14, 237, 113, 
+    9, 14, 237, 112, 9, 14, 237, 111, 9, 14, 237, 110, 9, 14, 237, 109, 9, 
+    14, 237, 108, 9, 14, 237, 107, 9, 14, 237, 106, 9, 14, 237, 105, 9, 14, 
+    237, 104, 9, 14, 237, 103, 9, 14, 237, 102, 9, 14, 237, 101, 9, 14, 237, 
+    100, 9, 14, 237, 99, 9, 14, 237, 98, 9, 14, 237, 97, 9, 14, 237, 96, 9, 
+    14, 237, 95, 9, 14, 237, 94, 9, 14, 237, 93, 9, 14, 237, 92, 9, 14, 237, 
+    91, 9, 14, 237, 90, 9, 14, 237, 89, 9, 14, 237, 88, 9, 14, 237, 87, 9, 
+    14, 237, 86, 9, 14, 237, 85, 9, 14, 237, 84, 9, 14, 237, 83, 9, 14, 237, 
+    82, 9, 14, 237, 81, 9, 14, 237, 80, 9, 14, 237, 79, 9, 14, 237, 78, 9, 
+    14, 237, 77, 9, 14, 237, 76, 9, 14, 237, 75, 9, 14, 237, 74, 9, 14, 237, 
+    73, 9, 14, 237, 72, 9, 14, 237, 71, 9, 14, 237, 70, 9, 14, 237, 69, 9, 
+    14, 237, 68, 9, 14, 237, 67, 9, 14, 237, 66, 9, 14, 237, 65, 9, 14, 237, 
+    64, 9, 14, 237, 63, 9, 14, 237, 62, 9, 14, 237, 61, 9, 14, 237, 60, 9, 
+    14, 237, 59, 9, 14, 237, 58, 9, 14, 237, 57, 9, 14, 237, 56, 9, 14, 237, 
+    55, 9, 14, 237, 54, 9, 14, 237, 53, 9, 14, 237, 52, 9, 14, 237, 51, 9, 
+    14, 237, 50, 9, 14, 237, 49, 9, 14, 237, 48, 9, 14, 237, 47, 9, 14, 237, 
+    46, 9, 14, 237, 45, 9, 14, 237, 44, 9, 14, 237, 43, 9, 14, 237, 42, 9, 
+    14, 237, 41, 9, 14, 237, 40, 9, 14, 237, 39, 9, 14, 237, 38, 9, 14, 237, 
+    37, 9, 14, 237, 36, 9, 14, 237, 35, 9, 14, 237, 34, 9, 14, 237, 33, 9, 
+    14, 237, 32, 9, 14, 237, 31, 9, 14, 237, 30, 9, 14, 237, 29, 9, 14, 237, 
+    28, 9, 14, 237, 27, 9, 14, 237, 26, 9, 14, 237, 25, 9, 14, 237, 24, 9, 
+    14, 237, 23, 9, 14, 237, 22, 9, 14, 237, 21, 9, 14, 237, 20, 9, 14, 237, 
+    19, 9, 14, 237, 18, 9, 14, 237, 17, 9, 14, 237, 16, 9, 14, 237, 15, 9, 
+    14, 237, 14, 9, 14, 237, 13, 9, 14, 237, 12, 9, 14, 237, 11, 9, 14, 237, 
+    10, 9, 14, 237, 9, 9, 14, 237, 8, 9, 14, 237, 7, 9, 14, 237, 6, 9, 14, 
+    237, 5, 9, 14, 237, 4, 9, 14, 237, 3, 9, 14, 237, 2, 9, 14, 237, 1, 9, 
+    14, 237, 0, 9, 14, 236, 255, 9, 14, 236, 254, 9, 14, 236, 253, 9, 14, 
+    236, 252, 9, 14, 236, 251, 9, 14, 236, 250, 9, 14, 236, 249, 9, 14, 236, 
+    248, 9, 14, 236, 247, 9, 14, 236, 246, 9, 14, 236, 245, 9, 14, 236, 244, 
+    9, 14, 236, 243, 9, 14, 236, 242, 9, 14, 236, 241, 9, 14, 236, 240, 9, 
+    14, 236, 239, 9, 14, 236, 238, 9, 14, 236, 237, 9, 14, 236, 236, 9, 14, 
+    236, 235, 9, 14, 236, 234, 9, 14, 236, 233, 9, 14, 236, 232, 9, 14, 236, 
+    231, 9, 14, 236, 230, 9, 14, 236, 229, 9, 14, 236, 228, 9, 14, 236, 227, 
+    9, 14, 236, 226, 9, 14, 236, 225, 9, 14, 236, 224, 9, 14, 236, 223, 9, 
+    14, 236, 222, 9, 14, 236, 221, 9, 14, 236, 220, 9, 14, 236, 219, 9, 14, 
+    236, 218, 9, 14, 236, 217, 9, 14, 236, 216, 9, 14, 236, 215, 9, 14, 236, 
+    214, 9, 14, 236, 213, 9, 14, 236, 212, 9, 14, 236, 211, 9, 14, 236, 210, 
+    9, 14, 236, 209, 9, 14, 236, 208, 9, 14, 236, 207, 9, 14, 236, 206, 9, 
+    14, 236, 205, 9, 14, 236, 204, 9, 14, 236, 203, 9, 14, 236, 202, 9, 14, 
+    236, 201, 9, 14, 236, 200, 9, 14, 236, 199, 9, 14, 236, 198, 9, 14, 236, 
+    197, 9, 14, 236, 196, 9, 14, 236, 195, 9, 14, 236, 194, 9, 14, 236, 193, 
+    9, 14, 236, 192, 9, 14, 236, 191, 9, 14, 236, 190, 9, 14, 236, 189, 9, 
+    14, 236, 188, 9, 14, 236, 187, 9, 14, 236, 186, 9, 14, 236, 185, 9, 14, 
+    236, 184, 9, 14, 236, 183, 9, 14, 236, 182, 9, 14, 236, 181, 9, 14, 236, 
+    180, 9, 14, 236, 179, 9, 14, 236, 178, 9, 14, 236, 177, 9, 14, 236, 176, 
+    9, 14, 236, 175, 9, 14, 236, 174, 9, 14, 236, 173, 9, 14, 236, 172, 9, 
+    14, 236, 171, 9, 14, 236, 170, 9, 14, 236, 169, 9, 14, 236, 168, 9, 14, 
+    236, 167, 9, 14, 236, 166, 9, 14, 236, 165, 9, 14, 236, 164, 9, 14, 236, 
+    163, 9, 14, 236, 162, 9, 14, 236, 161, 9, 14, 236, 160, 9, 14, 236, 159, 
+    9, 14, 236, 158, 9, 14, 236, 157, 9, 14, 236, 156, 9, 14, 236, 155, 9, 
+    14, 236, 154, 9, 14, 236, 153, 9, 14, 236, 152, 9, 14, 236, 151, 9, 14, 
+    236, 150, 9, 14, 236, 149, 9, 14, 236, 148, 9, 14, 236, 147, 9, 14, 236, 
+    146, 9, 14, 236, 145, 9, 14, 236, 144, 9, 14, 236, 143, 9, 14, 236, 142, 
+    9, 14, 236, 141, 9, 14, 236, 140, 9, 14, 236, 139, 9, 14, 236, 138, 9, 
+    14, 236, 137, 9, 14, 236, 136, 9, 14, 236, 135, 9, 14, 236, 134, 9, 14, 
+    236, 133, 9, 14, 236, 132, 9, 14, 236, 131, 9, 14, 236, 130, 9, 14, 236, 
+    129, 9, 14, 236, 128, 9, 14, 236, 127, 9, 14, 236, 126, 9, 14, 236, 125, 
+    9, 14, 236, 124, 9, 14, 236, 123, 9, 14, 236, 122, 9, 14, 236, 121, 9, 
+    14, 236, 120, 9, 14, 236, 119, 9, 14, 236, 118, 9, 14, 236, 117, 9, 14, 
+    236, 116, 9, 14, 236, 115, 9, 14, 236, 114, 9, 14, 236, 113, 9, 14, 236, 
+    112, 9, 14, 236, 111, 9, 14, 236, 110, 9, 14, 236, 109, 9, 14, 236, 108, 
+    9, 14, 236, 107, 9, 14, 236, 106, 9, 14, 236, 105, 9, 14, 236, 104, 9, 
+    14, 236, 103, 9, 14, 236, 102, 9, 14, 236, 101, 9, 14, 236, 100, 9, 14, 
+    236, 99, 9, 14, 236, 98, 9, 14, 236, 97, 9, 14, 236, 96, 9, 14, 236, 95, 
+    9, 14, 236, 94, 9, 14, 236, 93, 9, 14, 236, 92, 9, 14, 236, 91, 9, 14, 
+    236, 90, 9, 14, 236, 89, 9, 14, 236, 88, 9, 14, 236, 87, 9, 14, 236, 86, 
+    9, 14, 236, 85, 9, 14, 236, 84, 9, 14, 236, 83, 9, 14, 236, 82, 9, 14, 
+    236, 81, 9, 14, 236, 80, 9, 14, 236, 79, 9, 14, 236, 78, 9, 14, 236, 77, 
+    9, 14, 236, 76, 9, 14, 236, 75, 9, 14, 236, 74, 9, 14, 236, 73, 9, 14, 
+    236, 72, 9, 14, 236, 71, 9, 14, 236, 70, 9, 14, 236, 69, 9, 14, 236, 68, 
+    9, 14, 236, 67, 9, 14, 236, 66, 7, 4, 27, 244, 126, 7, 4, 27, 244, 122, 
+    7, 4, 27, 244, 77, 7, 4, 27, 244, 125, 7, 4, 27, 244, 124, 7, 4, 27, 199, 
+    222, 93, 217, 153, 7, 4, 27, 218, 169, 150, 4, 27, 231, 60, 228, 40, 150, 
+    4, 27, 231, 60, 245, 214, 150, 4, 27, 231, 60, 235, 228, 150, 4, 27, 213, 
+    180, 228, 40, 150, 4, 27, 231, 60, 211, 160, 94, 1, 210, 234, 2, 241, 
+    159, 94, 225, 12, 235, 51, 214, 11, 94, 27, 211, 6, 210, 234, 210, 234, 
+    225, 240, 94, 1, 254, 140, 253, 163, 94, 1, 211, 247, 254, 171, 94, 1, 
+    211, 247, 248, 190, 94, 1, 211, 247, 241, 239, 94, 1, 211, 247, 234, 251, 
+    94, 1, 211, 247, 233, 95, 94, 1, 211, 247, 40, 231, 66, 94, 1, 211, 247, 
+    223, 68, 94, 1, 211, 247, 217, 39, 94, 1, 254, 140, 96, 50, 94, 1, 220, 
+    22, 2, 220, 22, 247, 121, 94, 1, 220, 22, 2, 219, 160, 247, 121, 94, 1, 
+    220, 22, 2, 248, 209, 22, 220, 22, 247, 121, 94, 1, 220, 22, 2, 248, 209, 
+    22, 219, 160, 247, 121, 94, 1, 112, 2, 225, 240, 94, 1, 112, 2, 224, 77, 
+    94, 1, 112, 2, 231, 172, 94, 1, 252, 30, 2, 248, 208, 94, 1, 242, 203, 2, 
+    248, 208, 94, 1, 248, 191, 2, 248, 208, 94, 1, 241, 240, 2, 231, 172, 94, 
+    1, 214, 4, 2, 248, 208, 94, 1, 210, 98, 2, 248, 208, 94, 1, 216, 232, 2, 
+    248, 208, 94, 1, 210, 234, 2, 248, 208, 94, 1, 40, 234, 252, 2, 248, 208, 
+    94, 1, 234, 252, 2, 248, 208, 94, 1, 233, 96, 2, 248, 208, 94, 1, 231, 
+    67, 2, 248, 208, 94, 1, 227, 196, 2, 248, 208, 94, 1, 221, 251, 2, 248, 
+    208, 94, 1, 40, 225, 223, 2, 248, 208, 94, 1, 225, 223, 2, 248, 208, 94, 
+    1, 215, 181, 2, 248, 208, 94, 1, 224, 41, 2, 248, 208, 94, 1, 223, 69, 2, 
+    248, 208, 94, 1, 220, 22, 2, 248, 208, 94, 1, 217, 40, 2, 248, 208, 94, 
+    1, 214, 4, 2, 241, 62, 94, 1, 252, 30, 2, 223, 170, 94, 1, 234, 252, 2, 
+    223, 170, 94, 1, 225, 223, 2, 223, 170, 94, 27, 112, 233, 95, 10, 1, 112, 
+    212, 47, 53, 17, 10, 1, 112, 212, 47, 40, 17, 10, 1, 252, 66, 53, 17, 10, 
+    1, 252, 66, 40, 17, 10, 1, 252, 66, 65, 17, 10, 1, 252, 66, 147, 17, 10, 
+    1, 225, 207, 53, 17, 10, 1, 225, 207, 40, 17, 10, 1, 225, 207, 65, 17, 
+    10, 1, 225, 207, 147, 17, 10, 1, 252, 54, 53, 17, 10, 1, 252, 54, 40, 17, 
+    10, 1, 252, 54, 65, 17, 10, 1, 252, 54, 147, 17, 10, 1, 215, 148, 53, 17, 
+    10, 1, 215, 148, 40, 17, 10, 1, 215, 148, 65, 17, 10, 1, 215, 148, 147, 
+    17, 10, 1, 217, 7, 53, 17, 10, 1, 217, 7, 40, 17, 10, 1, 217, 7, 65, 17, 
+    10, 1, 217, 7, 147, 17, 10, 1, 215, 150, 53, 17, 10, 1, 215, 150, 40, 17, 
+    10, 1, 215, 150, 65, 17, 10, 1, 215, 150, 147, 17, 10, 1, 213, 249, 53, 
     17, 10, 1, 213, 249, 40, 17, 10, 1, 213, 249, 65, 17, 10, 1, 213, 249, 
-    147, 17, 10, 1, 225, 204, 53, 17, 10, 1, 225, 204, 40, 17, 10, 1, 225, 
-    204, 65, 17, 10, 1, 225, 204, 147, 17, 10, 1, 246, 44, 53, 17, 10, 1, 
-    246, 44, 40, 17, 10, 1, 246, 44, 65, 17, 10, 1, 246, 44, 147, 17, 10, 1, 
-    227, 154, 53, 17, 10, 1, 227, 154, 40, 17, 10, 1, 227, 154, 65, 17, 10, 
-    1, 227, 154, 147, 17, 10, 1, 217, 27, 53, 17, 10, 1, 217, 27, 40, 17, 10, 
-    1, 217, 27, 65, 17, 10, 1, 217, 27, 147, 17, 10, 1, 217, 25, 53, 17, 10, 
-    1, 217, 25, 40, 17, 10, 1, 217, 25, 65, 17, 10, 1, 217, 25, 147, 17, 10, 
-    1, 248, 133, 53, 17, 10, 1, 248, 133, 40, 17, 10, 1, 248, 202, 53, 17, 
-    10, 1, 248, 202, 40, 17, 10, 1, 246, 71, 53, 17, 10, 1, 246, 71, 40, 17, 
-    10, 1, 248, 131, 53, 17, 10, 1, 248, 131, 40, 17, 10, 1, 235, 121, 53, 
-    17, 10, 1, 235, 121, 40, 17, 10, 1, 222, 172, 53, 17, 10, 1, 222, 172, 
-    40, 17, 10, 1, 234, 175, 53, 17, 10, 1, 234, 175, 40, 17, 10, 1, 234, 
-    175, 65, 17, 10, 1, 234, 175, 147, 17, 10, 1, 243, 123, 53, 17, 10, 1, 
-    243, 123, 40, 17, 10, 1, 243, 123, 65, 17, 10, 1, 243, 123, 147, 17, 10, 
-    1, 242, 102, 53, 17, 10, 1, 242, 102, 40, 17, 10, 1, 242, 102, 65, 17, 
-    10, 1, 242, 102, 147, 17, 10, 1, 229, 3, 53, 17, 10, 1, 229, 3, 40, 17, 
-    10, 1, 229, 3, 65, 17, 10, 1, 229, 3, 147, 17, 10, 1, 228, 63, 242, 219, 
-    53, 17, 10, 1, 228, 63, 242, 219, 40, 17, 10, 1, 222, 215, 53, 17, 10, 1, 
-    222, 215, 40, 17, 10, 1, 222, 215, 65, 17, 10, 1, 222, 215, 147, 17, 10, 
-    1, 241, 219, 2, 79, 77, 53, 17, 10, 1, 241, 219, 2, 79, 77, 40, 17, 10, 
-    1, 241, 219, 242, 172, 53, 17, 10, 1, 241, 219, 242, 172, 40, 17, 10, 1, 
-    241, 219, 242, 172, 65, 17, 10, 1, 241, 219, 242, 172, 147, 17, 10, 1, 
-    241, 219, 247, 142, 53, 17, 10, 1, 241, 219, 247, 142, 40, 17, 10, 1, 
-    241, 219, 247, 142, 65, 17, 10, 1, 241, 219, 247, 142, 147, 17, 10, 1, 
-    79, 252, 133, 53, 17, 10, 1, 79, 252, 133, 40, 17, 10, 1, 79, 252, 133, 
-    2, 202, 77, 53, 17, 10, 1, 79, 252, 133, 2, 202, 77, 40, 17, 10, 16, 59, 
+    147, 17, 10, 1, 225, 205, 53, 17, 10, 1, 225, 205, 40, 17, 10, 1, 225, 
+    205, 65, 17, 10, 1, 225, 205, 147, 17, 10, 1, 246, 45, 53, 17, 10, 1, 
+    246, 45, 40, 17, 10, 1, 246, 45, 65, 17, 10, 1, 246, 45, 147, 17, 10, 1, 
+    227, 155, 53, 17, 10, 1, 227, 155, 40, 17, 10, 1, 227, 155, 65, 17, 10, 
+    1, 227, 155, 147, 17, 10, 1, 217, 28, 53, 17, 10, 1, 217, 28, 40, 17, 10, 
+    1, 217, 28, 65, 17, 10, 1, 217, 28, 147, 17, 10, 1, 217, 26, 53, 17, 10, 
+    1, 217, 26, 40, 17, 10, 1, 217, 26, 65, 17, 10, 1, 217, 26, 147, 17, 10, 
+    1, 248, 134, 53, 17, 10, 1, 248, 134, 40, 17, 10, 1, 248, 203, 53, 17, 
+    10, 1, 248, 203, 40, 17, 10, 1, 246, 72, 53, 17, 10, 1, 246, 72, 40, 17, 
+    10, 1, 248, 132, 53, 17, 10, 1, 248, 132, 40, 17, 10, 1, 235, 122, 53, 
+    17, 10, 1, 235, 122, 40, 17, 10, 1, 222, 173, 53, 17, 10, 1, 222, 173, 
+    40, 17, 10, 1, 234, 176, 53, 17, 10, 1, 234, 176, 40, 17, 10, 1, 234, 
+    176, 65, 17, 10, 1, 234, 176, 147, 17, 10, 1, 243, 124, 53, 17, 10, 1, 
+    243, 124, 40, 17, 10, 1, 243, 124, 65, 17, 10, 1, 243, 124, 147, 17, 10, 
+    1, 242, 103, 53, 17, 10, 1, 242, 103, 40, 17, 10, 1, 242, 103, 65, 17, 
+    10, 1, 242, 103, 147, 17, 10, 1, 229, 4, 53, 17, 10, 1, 229, 4, 40, 17, 
+    10, 1, 229, 4, 65, 17, 10, 1, 229, 4, 147, 17, 10, 1, 228, 64, 242, 220, 
+    53, 17, 10, 1, 228, 64, 242, 220, 40, 17, 10, 1, 222, 216, 53, 17, 10, 1, 
+    222, 216, 40, 17, 10, 1, 222, 216, 65, 17, 10, 1, 222, 216, 147, 17, 10, 
+    1, 241, 220, 2, 79, 77, 53, 17, 10, 1, 241, 220, 2, 79, 77, 40, 17, 10, 
+    1, 241, 220, 242, 173, 53, 17, 10, 1, 241, 220, 242, 173, 40, 17, 10, 1, 
+    241, 220, 242, 173, 65, 17, 10, 1, 241, 220, 242, 173, 147, 17, 10, 1, 
+    241, 220, 247, 143, 53, 17, 10, 1, 241, 220, 247, 143, 40, 17, 10, 1, 
+    241, 220, 247, 143, 65, 17, 10, 1, 241, 220, 247, 143, 147, 17, 10, 1, 
+    79, 252, 134, 53, 17, 10, 1, 79, 252, 134, 40, 17, 10, 1, 79, 252, 134, 
+    2, 202, 77, 53, 17, 10, 1, 79, 252, 134, 2, 202, 77, 40, 17, 10, 16, 59, 
     48, 10, 16, 59, 51, 10, 16, 113, 170, 48, 10, 16, 113, 170, 51, 10, 16, 
-    134, 170, 48, 10, 16, 134, 170, 51, 10, 16, 134, 170, 225, 7, 246, 104, 
-    48, 10, 16, 134, 170, 225, 7, 246, 104, 51, 10, 16, 244, 11, 170, 48, 10, 
-    16, 244, 11, 170, 51, 10, 16, 52, 67, 252, 141, 51, 10, 16, 113, 170, 
-    213, 189, 48, 10, 16, 113, 170, 213, 189, 51, 10, 16, 222, 233, 10, 16, 
-    4, 217, 81, 48, 10, 16, 4, 217, 81, 51, 10, 1, 229, 80, 53, 17, 10, 1, 
-    229, 80, 40, 17, 10, 1, 229, 80, 65, 17, 10, 1, 229, 80, 147, 17, 10, 1, 
-    104, 53, 17, 10, 1, 104, 40, 17, 10, 1, 226, 235, 53, 17, 10, 1, 226, 
-    235, 40, 17, 10, 1, 210, 213, 53, 17, 10, 1, 210, 213, 40, 17, 10, 1, 
+    134, 170, 48, 10, 16, 134, 170, 51, 10, 16, 134, 170, 225, 8, 246, 105, 
+    48, 10, 16, 134, 170, 225, 8, 246, 105, 51, 10, 16, 244, 12, 170, 48, 10, 
+    16, 244, 12, 170, 51, 10, 16, 52, 67, 252, 142, 51, 10, 16, 113, 170, 
+    213, 189, 48, 10, 16, 113, 170, 213, 189, 51, 10, 16, 222, 234, 10, 16, 
+    4, 217, 82, 48, 10, 16, 4, 217, 82, 51, 10, 1, 229, 81, 53, 17, 10, 1, 
+    229, 81, 40, 17, 10, 1, 229, 81, 65, 17, 10, 1, 229, 81, 147, 17, 10, 1, 
+    104, 53, 17, 10, 1, 104, 40, 17, 10, 1, 226, 236, 53, 17, 10, 1, 226, 
+    236, 40, 17, 10, 1, 210, 213, 53, 17, 10, 1, 210, 213, 40, 17, 10, 1, 
     104, 2, 202, 77, 53, 17, 10, 1, 214, 0, 53, 17, 10, 1, 214, 0, 40, 17, 
-    10, 1, 234, 73, 226, 235, 53, 17, 10, 1, 234, 73, 226, 235, 40, 17, 10, 
-    1, 234, 73, 210, 213, 53, 17, 10, 1, 234, 73, 210, 213, 40, 17, 10, 1, 
+    10, 1, 234, 74, 226, 236, 53, 17, 10, 1, 234, 74, 226, 236, 40, 17, 10, 
+    1, 234, 74, 210, 213, 53, 17, 10, 1, 234, 74, 210, 213, 40, 17, 10, 1, 
     160, 53, 17, 10, 1, 160, 40, 17, 10, 1, 160, 65, 17, 10, 1, 160, 147, 17, 
-    10, 1, 214, 207, 234, 186, 234, 73, 112, 231, 193, 65, 17, 10, 1, 214, 
-    207, 234, 186, 234, 73, 112, 231, 193, 147, 17, 10, 27, 79, 2, 202, 77, 
+    10, 1, 214, 207, 234, 187, 234, 74, 112, 231, 194, 65, 17, 10, 1, 214, 
+    207, 234, 187, 234, 74, 112, 231, 194, 147, 17, 10, 27, 79, 2, 202, 77, 
     2, 112, 53, 17, 10, 27, 79, 2, 202, 77, 2, 112, 40, 17, 10, 27, 79, 2, 
-    202, 77, 2, 254, 244, 53, 17, 10, 27, 79, 2, 202, 77, 2, 254, 244, 40, 
+    202, 77, 2, 254, 245, 53, 17, 10, 27, 79, 2, 202, 77, 2, 254, 245, 40, 
     17, 10, 27, 79, 2, 202, 77, 2, 212, 31, 53, 17, 10, 27, 79, 2, 202, 77, 
     2, 212, 31, 40, 17, 10, 27, 79, 2, 202, 77, 2, 104, 53, 17, 10, 27, 79, 
-    2, 202, 77, 2, 104, 40, 17, 10, 27, 79, 2, 202, 77, 2, 226, 235, 53, 17, 
-    10, 27, 79, 2, 202, 77, 2, 226, 235, 40, 17, 10, 27, 79, 2, 202, 77, 2, 
+    2, 202, 77, 2, 104, 40, 17, 10, 27, 79, 2, 202, 77, 2, 226, 236, 53, 17, 
+    10, 27, 79, 2, 202, 77, 2, 226, 236, 40, 17, 10, 27, 79, 2, 202, 77, 2, 
     210, 213, 53, 17, 10, 27, 79, 2, 202, 77, 2, 210, 213, 40, 17, 10, 27, 
     79, 2, 202, 77, 2, 160, 53, 17, 10, 27, 79, 2, 202, 77, 2, 160, 40, 17, 
-    10, 27, 79, 2, 202, 77, 2, 160, 65, 17, 10, 27, 214, 207, 234, 73, 79, 2, 
-    202, 77, 2, 112, 231, 193, 53, 17, 10, 27, 214, 207, 234, 73, 79, 2, 202, 
-    77, 2, 112, 231, 193, 40, 17, 10, 27, 214, 207, 234, 73, 79, 2, 202, 77, 
-    2, 112, 231, 193, 65, 17, 10, 1, 244, 168, 79, 53, 17, 10, 1, 244, 168, 
-    79, 40, 17, 10, 1, 244, 168, 79, 65, 17, 10, 1, 244, 168, 79, 147, 17, 
+    10, 27, 79, 2, 202, 77, 2, 160, 65, 17, 10, 27, 214, 207, 234, 74, 79, 2, 
+    202, 77, 2, 112, 231, 194, 53, 17, 10, 27, 214, 207, 234, 74, 79, 2, 202, 
+    77, 2, 112, 231, 194, 40, 17, 10, 27, 214, 207, 234, 74, 79, 2, 202, 77, 
+    2, 112, 231, 194, 65, 17, 10, 1, 244, 169, 79, 53, 17, 10, 1, 244, 169, 
+    79, 40, 17, 10, 1, 244, 169, 79, 65, 17, 10, 1, 244, 169, 79, 147, 17, 
     10, 27, 79, 2, 202, 77, 2, 151, 53, 17, 10, 27, 79, 2, 202, 77, 2, 122, 
     53, 17, 10, 27, 79, 2, 202, 77, 2, 66, 53, 17, 10, 27, 79, 2, 202, 77, 2, 
-    112, 231, 193, 53, 17, 10, 27, 79, 2, 202, 77, 2, 79, 53, 17, 10, 27, 
-    252, 55, 2, 151, 53, 17, 10, 27, 252, 55, 2, 122, 53, 17, 10, 27, 252, 
-    55, 2, 234, 130, 53, 17, 10, 27, 252, 55, 2, 66, 53, 17, 10, 27, 252, 55, 
-    2, 112, 231, 193, 53, 17, 10, 27, 252, 55, 2, 79, 53, 17, 10, 27, 217, 8, 
-    2, 151, 53, 17, 10, 27, 217, 8, 2, 122, 53, 17, 10, 27, 217, 8, 2, 234, 
-    130, 53, 17, 10, 27, 217, 8, 2, 66, 53, 17, 10, 27, 217, 8, 2, 112, 231, 
-    193, 53, 17, 10, 27, 217, 8, 2, 79, 53, 17, 10, 27, 216, 193, 2, 151, 53, 
-    17, 10, 27, 216, 193, 2, 66, 53, 17, 10, 27, 216, 193, 2, 112, 231, 193, 
-    53, 17, 10, 27, 216, 193, 2, 79, 53, 17, 10, 27, 151, 2, 122, 53, 17, 10, 
+    112, 231, 194, 53, 17, 10, 27, 79, 2, 202, 77, 2, 79, 53, 17, 10, 27, 
+    252, 56, 2, 151, 53, 17, 10, 27, 252, 56, 2, 122, 53, 17, 10, 27, 252, 
+    56, 2, 234, 131, 53, 17, 10, 27, 252, 56, 2, 66, 53, 17, 10, 27, 252, 56, 
+    2, 112, 231, 194, 53, 17, 10, 27, 252, 56, 2, 79, 53, 17, 10, 27, 217, 9, 
+    2, 151, 53, 17, 10, 27, 217, 9, 2, 122, 53, 17, 10, 27, 217, 9, 2, 234, 
+    131, 53, 17, 10, 27, 217, 9, 2, 66, 53, 17, 10, 27, 217, 9, 2, 112, 231, 
+    194, 53, 17, 10, 27, 217, 9, 2, 79, 53, 17, 10, 27, 216, 194, 2, 151, 53, 
+    17, 10, 27, 216, 194, 2, 66, 53, 17, 10, 27, 216, 194, 2, 112, 231, 194, 
+    53, 17, 10, 27, 216, 194, 2, 79, 53, 17, 10, 27, 151, 2, 122, 53, 17, 10, 
     27, 151, 2, 66, 53, 17, 10, 27, 122, 2, 151, 53, 17, 10, 27, 122, 2, 66, 
-    53, 17, 10, 27, 234, 130, 2, 151, 53, 17, 10, 27, 234, 130, 2, 122, 53, 
-    17, 10, 27, 234, 130, 2, 66, 53, 17, 10, 27, 221, 167, 2, 151, 53, 17, 
-    10, 27, 221, 167, 2, 122, 53, 17, 10, 27, 221, 167, 2, 234, 130, 53, 17, 
-    10, 27, 221, 167, 2, 66, 53, 17, 10, 27, 222, 27, 2, 122, 53, 17, 10, 27, 
-    222, 27, 2, 66, 53, 17, 10, 27, 248, 217, 2, 151, 53, 17, 10, 27, 248, 
-    217, 2, 122, 53, 17, 10, 27, 248, 217, 2, 234, 130, 53, 17, 10, 27, 248, 
-    217, 2, 66, 53, 17, 10, 27, 217, 81, 2, 122, 53, 17, 10, 27, 217, 81, 2, 
-    66, 53, 17, 10, 27, 210, 112, 2, 66, 53, 17, 10, 27, 254, 197, 2, 151, 
-    53, 17, 10, 27, 254, 197, 2, 66, 53, 17, 10, 27, 242, 245, 2, 151, 53, 
-    17, 10, 27, 242, 245, 2, 66, 53, 17, 10, 27, 244, 143, 2, 151, 53, 17, 
-    10, 27, 244, 143, 2, 122, 53, 17, 10, 27, 244, 143, 2, 234, 130, 53, 17, 
-    10, 27, 244, 143, 2, 66, 53, 17, 10, 27, 244, 143, 2, 112, 231, 193, 53, 
-    17, 10, 27, 244, 143, 2, 79, 53, 17, 10, 27, 224, 82, 2, 122, 53, 17, 10, 
-    27, 224, 82, 2, 66, 53, 17, 10, 27, 224, 82, 2, 112, 231, 193, 53, 17, 
-    10, 27, 224, 82, 2, 79, 53, 17, 10, 27, 234, 251, 2, 112, 53, 17, 10, 27, 
-    234, 251, 2, 151, 53, 17, 10, 27, 234, 251, 2, 122, 53, 17, 10, 27, 234, 
-    251, 2, 234, 130, 53, 17, 10, 27, 234, 251, 2, 233, 103, 53, 17, 10, 27, 
-    234, 251, 2, 66, 53, 17, 10, 27, 234, 251, 2, 112, 231, 193, 53, 17, 10, 
-    27, 234, 251, 2, 79, 53, 17, 10, 27, 233, 103, 2, 151, 53, 17, 10, 27, 
-    233, 103, 2, 122, 53, 17, 10, 27, 233, 103, 2, 234, 130, 53, 17, 10, 27, 
-    233, 103, 2, 66, 53, 17, 10, 27, 233, 103, 2, 112, 231, 193, 53, 17, 10, 
-    27, 233, 103, 2, 79, 53, 17, 10, 27, 66, 2, 151, 53, 17, 10, 27, 66, 2, 
-    122, 53, 17, 10, 27, 66, 2, 234, 130, 53, 17, 10, 27, 66, 2, 66, 53, 17, 
-    10, 27, 66, 2, 112, 231, 193, 53, 17, 10, 27, 66, 2, 79, 53, 17, 10, 27, 
-    228, 63, 2, 151, 53, 17, 10, 27, 228, 63, 2, 122, 53, 17, 10, 27, 228, 
-    63, 2, 234, 130, 53, 17, 10, 27, 228, 63, 2, 66, 53, 17, 10, 27, 228, 63, 
-    2, 112, 231, 193, 53, 17, 10, 27, 228, 63, 2, 79, 53, 17, 10, 27, 241, 
-    219, 2, 151, 53, 17, 10, 27, 241, 219, 2, 66, 53, 17, 10, 27, 241, 219, 
-    2, 112, 231, 193, 53, 17, 10, 27, 241, 219, 2, 79, 53, 17, 10, 27, 79, 2, 
-    151, 53, 17, 10, 27, 79, 2, 122, 53, 17, 10, 27, 79, 2, 234, 130, 53, 17, 
-    10, 27, 79, 2, 66, 53, 17, 10, 27, 79, 2, 112, 231, 193, 53, 17, 10, 27, 
-    79, 2, 79, 53, 17, 10, 27, 216, 203, 2, 218, 23, 112, 53, 17, 10, 27, 
-    223, 96, 2, 218, 23, 112, 53, 17, 10, 27, 112, 231, 193, 2, 218, 23, 112, 
-    53, 17, 10, 27, 220, 94, 2, 248, 183, 53, 17, 10, 27, 220, 94, 2, 234, 
-    204, 53, 17, 10, 27, 220, 94, 2, 244, 166, 53, 17, 10, 27, 220, 94, 2, 
-    248, 185, 53, 17, 10, 27, 220, 94, 2, 234, 206, 53, 17, 10, 27, 220, 94, 
-    2, 218, 23, 112, 53, 17, 10, 27, 79, 2, 202, 77, 2, 223, 96, 40, 17, 10, 
+    53, 17, 10, 27, 234, 131, 2, 151, 53, 17, 10, 27, 234, 131, 2, 122, 53, 
+    17, 10, 27, 234, 131, 2, 66, 53, 17, 10, 27, 221, 168, 2, 151, 53, 17, 
+    10, 27, 221, 168, 2, 122, 53, 17, 10, 27, 221, 168, 2, 234, 131, 53, 17, 
+    10, 27, 221, 168, 2, 66, 53, 17, 10, 27, 222, 28, 2, 122, 53, 17, 10, 27, 
+    222, 28, 2, 66, 53, 17, 10, 27, 248, 218, 2, 151, 53, 17, 10, 27, 248, 
+    218, 2, 122, 53, 17, 10, 27, 248, 218, 2, 234, 131, 53, 17, 10, 27, 248, 
+    218, 2, 66, 53, 17, 10, 27, 217, 82, 2, 122, 53, 17, 10, 27, 217, 82, 2, 
+    66, 53, 17, 10, 27, 210, 112, 2, 66, 53, 17, 10, 27, 254, 198, 2, 151, 
+    53, 17, 10, 27, 254, 198, 2, 66, 53, 17, 10, 27, 242, 246, 2, 151, 53, 
+    17, 10, 27, 242, 246, 2, 66, 53, 17, 10, 27, 244, 144, 2, 151, 53, 17, 
+    10, 27, 244, 144, 2, 122, 53, 17, 10, 27, 244, 144, 2, 234, 131, 53, 17, 
+    10, 27, 244, 144, 2, 66, 53, 17, 10, 27, 244, 144, 2, 112, 231, 194, 53, 
+    17, 10, 27, 244, 144, 2, 79, 53, 17, 10, 27, 224, 83, 2, 122, 53, 17, 10, 
+    27, 224, 83, 2, 66, 53, 17, 10, 27, 224, 83, 2, 112, 231, 194, 53, 17, 
+    10, 27, 224, 83, 2, 79, 53, 17, 10, 27, 234, 252, 2, 112, 53, 17, 10, 27, 
+    234, 252, 2, 151, 53, 17, 10, 27, 234, 252, 2, 122, 53, 17, 10, 27, 234, 
+    252, 2, 234, 131, 53, 17, 10, 27, 234, 252, 2, 233, 104, 53, 17, 10, 27, 
+    234, 252, 2, 66, 53, 17, 10, 27, 234, 252, 2, 112, 231, 194, 53, 17, 10, 
+    27, 234, 252, 2, 79, 53, 17, 10, 27, 233, 104, 2, 151, 53, 17, 10, 27, 
+    233, 104, 2, 122, 53, 17, 10, 27, 233, 104, 2, 234, 131, 53, 17, 10, 27, 
+    233, 104, 2, 66, 53, 17, 10, 27, 233, 104, 2, 112, 231, 194, 53, 17, 10, 
+    27, 233, 104, 2, 79, 53, 17, 10, 27, 66, 2, 151, 53, 17, 10, 27, 66, 2, 
+    122, 53, 17, 10, 27, 66, 2, 234, 131, 53, 17, 10, 27, 66, 2, 66, 53, 17, 
+    10, 27, 66, 2, 112, 231, 194, 53, 17, 10, 27, 66, 2, 79, 53, 17, 10, 27, 
+    228, 64, 2, 151, 53, 17, 10, 27, 228, 64, 2, 122, 53, 17, 10, 27, 228, 
+    64, 2, 234, 131, 53, 17, 10, 27, 228, 64, 2, 66, 53, 17, 10, 27, 228, 64, 
+    2, 112, 231, 194, 53, 17, 10, 27, 228, 64, 2, 79, 53, 17, 10, 27, 241, 
+    220, 2, 151, 53, 17, 10, 27, 241, 220, 2, 66, 53, 17, 10, 27, 241, 220, 
+    2, 112, 231, 194, 53, 17, 10, 27, 241, 220, 2, 79, 53, 17, 10, 27, 79, 2, 
+    151, 53, 17, 10, 27, 79, 2, 122, 53, 17, 10, 27, 79, 2, 234, 131, 53, 17, 
+    10, 27, 79, 2, 66, 53, 17, 10, 27, 79, 2, 112, 231, 194, 53, 17, 10, 27, 
+    79, 2, 79, 53, 17, 10, 27, 216, 204, 2, 218, 24, 112, 53, 17, 10, 27, 
+    223, 97, 2, 218, 24, 112, 53, 17, 10, 27, 112, 231, 194, 2, 218, 24, 112, 
+    53, 17, 10, 27, 220, 95, 2, 248, 184, 53, 17, 10, 27, 220, 95, 2, 234, 
+    205, 53, 17, 10, 27, 220, 95, 2, 244, 167, 53, 17, 10, 27, 220, 95, 2, 
+    248, 186, 53, 17, 10, 27, 220, 95, 2, 234, 207, 53, 17, 10, 27, 220, 95, 
+    2, 218, 24, 112, 53, 17, 10, 27, 79, 2, 202, 77, 2, 223, 97, 40, 17, 10, 
     27, 79, 2, 202, 77, 2, 210, 109, 40, 17, 10, 27, 79, 2, 202, 77, 2, 66, 
-    40, 17, 10, 27, 79, 2, 202, 77, 2, 228, 63, 40, 17, 10, 27, 79, 2, 202, 
-    77, 2, 112, 231, 193, 40, 17, 10, 27, 79, 2, 202, 77, 2, 79, 40, 17, 10, 
-    27, 252, 55, 2, 223, 96, 40, 17, 10, 27, 252, 55, 2, 210, 109, 40, 17, 
-    10, 27, 252, 55, 2, 66, 40, 17, 10, 27, 252, 55, 2, 228, 63, 40, 17, 10, 
-    27, 252, 55, 2, 112, 231, 193, 40, 17, 10, 27, 252, 55, 2, 79, 40, 17, 
-    10, 27, 217, 8, 2, 223, 96, 40, 17, 10, 27, 217, 8, 2, 210, 109, 40, 17, 
-    10, 27, 217, 8, 2, 66, 40, 17, 10, 27, 217, 8, 2, 228, 63, 40, 17, 10, 
-    27, 217, 8, 2, 112, 231, 193, 40, 17, 10, 27, 217, 8, 2, 79, 40, 17, 10, 
-    27, 216, 193, 2, 223, 96, 40, 17, 10, 27, 216, 193, 2, 210, 109, 40, 17, 
-    10, 27, 216, 193, 2, 66, 40, 17, 10, 27, 216, 193, 2, 228, 63, 40, 17, 
-    10, 27, 216, 193, 2, 112, 231, 193, 40, 17, 10, 27, 216, 193, 2, 79, 40, 
-    17, 10, 27, 244, 143, 2, 112, 231, 193, 40, 17, 10, 27, 244, 143, 2, 79, 
-    40, 17, 10, 27, 224, 82, 2, 112, 231, 193, 40, 17, 10, 27, 224, 82, 2, 
-    79, 40, 17, 10, 27, 234, 251, 2, 112, 40, 17, 10, 27, 234, 251, 2, 233, 
-    103, 40, 17, 10, 27, 234, 251, 2, 66, 40, 17, 10, 27, 234, 251, 2, 112, 
-    231, 193, 40, 17, 10, 27, 234, 251, 2, 79, 40, 17, 10, 27, 233, 103, 2, 
-    66, 40, 17, 10, 27, 233, 103, 2, 112, 231, 193, 40, 17, 10, 27, 233, 103, 
+    40, 17, 10, 27, 79, 2, 202, 77, 2, 228, 64, 40, 17, 10, 27, 79, 2, 202, 
+    77, 2, 112, 231, 194, 40, 17, 10, 27, 79, 2, 202, 77, 2, 79, 40, 17, 10, 
+    27, 252, 56, 2, 223, 97, 40, 17, 10, 27, 252, 56, 2, 210, 109, 40, 17, 
+    10, 27, 252, 56, 2, 66, 40, 17, 10, 27, 252, 56, 2, 228, 64, 40, 17, 10, 
+    27, 252, 56, 2, 112, 231, 194, 40, 17, 10, 27, 252, 56, 2, 79, 40, 17, 
+    10, 27, 217, 9, 2, 223, 97, 40, 17, 10, 27, 217, 9, 2, 210, 109, 40, 17, 
+    10, 27, 217, 9, 2, 66, 40, 17, 10, 27, 217, 9, 2, 228, 64, 40, 17, 10, 
+    27, 217, 9, 2, 112, 231, 194, 40, 17, 10, 27, 217, 9, 2, 79, 40, 17, 10, 
+    27, 216, 194, 2, 223, 97, 40, 17, 10, 27, 216, 194, 2, 210, 109, 40, 17, 
+    10, 27, 216, 194, 2, 66, 40, 17, 10, 27, 216, 194, 2, 228, 64, 40, 17, 
+    10, 27, 216, 194, 2, 112, 231, 194, 40, 17, 10, 27, 216, 194, 2, 79, 40, 
+    17, 10, 27, 244, 144, 2, 112, 231, 194, 40, 17, 10, 27, 244, 144, 2, 79, 
+    40, 17, 10, 27, 224, 83, 2, 112, 231, 194, 40, 17, 10, 27, 224, 83, 2, 
+    79, 40, 17, 10, 27, 234, 252, 2, 112, 40, 17, 10, 27, 234, 252, 2, 233, 
+    104, 40, 17, 10, 27, 234, 252, 2, 66, 40, 17, 10, 27, 234, 252, 2, 112, 
+    231, 194, 40, 17, 10, 27, 234, 252, 2, 79, 40, 17, 10, 27, 233, 104, 2, 
+    66, 40, 17, 10, 27, 233, 104, 2, 112, 231, 194, 40, 17, 10, 27, 233, 104, 
     2, 79, 40, 17, 10, 27, 66, 2, 112, 40, 17, 10, 27, 66, 2, 66, 40, 17, 10, 
-    27, 228, 63, 2, 223, 96, 40, 17, 10, 27, 228, 63, 2, 210, 109, 40, 17, 
-    10, 27, 228, 63, 2, 66, 40, 17, 10, 27, 228, 63, 2, 228, 63, 40, 17, 10, 
-    27, 228, 63, 2, 112, 231, 193, 40, 17, 10, 27, 228, 63, 2, 79, 40, 17, 
-    10, 27, 112, 231, 193, 2, 218, 23, 112, 40, 17, 10, 27, 79, 2, 223, 96, 
+    27, 228, 64, 2, 223, 97, 40, 17, 10, 27, 228, 64, 2, 210, 109, 40, 17, 
+    10, 27, 228, 64, 2, 66, 40, 17, 10, 27, 228, 64, 2, 228, 64, 40, 17, 10, 
+    27, 228, 64, 2, 112, 231, 194, 40, 17, 10, 27, 228, 64, 2, 79, 40, 17, 
+    10, 27, 112, 231, 194, 2, 218, 24, 112, 40, 17, 10, 27, 79, 2, 223, 97, 
     40, 17, 10, 27, 79, 2, 210, 109, 40, 17, 10, 27, 79, 2, 66, 40, 17, 10, 
-    27, 79, 2, 228, 63, 40, 17, 10, 27, 79, 2, 112, 231, 193, 40, 17, 10, 27, 
+    27, 79, 2, 228, 64, 40, 17, 10, 27, 79, 2, 112, 231, 194, 40, 17, 10, 27, 
     79, 2, 79, 40, 17, 10, 27, 79, 2, 202, 77, 2, 151, 65, 17, 10, 27, 79, 2, 
-    202, 77, 2, 122, 65, 17, 10, 27, 79, 2, 202, 77, 2, 234, 130, 65, 17, 10, 
-    27, 79, 2, 202, 77, 2, 66, 65, 17, 10, 27, 79, 2, 202, 77, 2, 241, 219, 
-    65, 17, 10, 27, 252, 55, 2, 151, 65, 17, 10, 27, 252, 55, 2, 122, 65, 17, 
-    10, 27, 252, 55, 2, 234, 130, 65, 17, 10, 27, 252, 55, 2, 66, 65, 17, 10, 
-    27, 252, 55, 2, 241, 219, 65, 17, 10, 27, 217, 8, 2, 151, 65, 17, 10, 27, 
-    217, 8, 2, 122, 65, 17, 10, 27, 217, 8, 2, 234, 130, 65, 17, 10, 27, 217, 
-    8, 2, 66, 65, 17, 10, 27, 217, 8, 2, 241, 219, 65, 17, 10, 27, 216, 193, 
+    202, 77, 2, 122, 65, 17, 10, 27, 79, 2, 202, 77, 2, 234, 131, 65, 17, 10, 
+    27, 79, 2, 202, 77, 2, 66, 65, 17, 10, 27, 79, 2, 202, 77, 2, 241, 220, 
+    65, 17, 10, 27, 252, 56, 2, 151, 65, 17, 10, 27, 252, 56, 2, 122, 65, 17, 
+    10, 27, 252, 56, 2, 234, 131, 65, 17, 10, 27, 252, 56, 2, 66, 65, 17, 10, 
+    27, 252, 56, 2, 241, 220, 65, 17, 10, 27, 217, 9, 2, 151, 65, 17, 10, 27, 
+    217, 9, 2, 122, 65, 17, 10, 27, 217, 9, 2, 234, 131, 65, 17, 10, 27, 217, 
+    9, 2, 66, 65, 17, 10, 27, 217, 9, 2, 241, 220, 65, 17, 10, 27, 216, 194, 
     2, 66, 65, 17, 10, 27, 151, 2, 122, 65, 17, 10, 27, 151, 2, 66, 65, 17, 
     10, 27, 122, 2, 151, 65, 17, 10, 27, 122, 2, 66, 65, 17, 10, 27, 234, 
-    130, 2, 151, 65, 17, 10, 27, 234, 130, 2, 66, 65, 17, 10, 27, 221, 167, 
-    2, 151, 65, 17, 10, 27, 221, 167, 2, 122, 65, 17, 10, 27, 221, 167, 2, 
-    234, 130, 65, 17, 10, 27, 221, 167, 2, 66, 65, 17, 10, 27, 222, 27, 2, 
-    122, 65, 17, 10, 27, 222, 27, 2, 234, 130, 65, 17, 10, 27, 222, 27, 2, 
-    66, 65, 17, 10, 27, 248, 217, 2, 151, 65, 17, 10, 27, 248, 217, 2, 122, 
-    65, 17, 10, 27, 248, 217, 2, 234, 130, 65, 17, 10, 27, 248, 217, 2, 66, 
-    65, 17, 10, 27, 217, 81, 2, 122, 65, 17, 10, 27, 210, 112, 2, 66, 65, 17, 
-    10, 27, 254, 197, 2, 151, 65, 17, 10, 27, 254, 197, 2, 66, 65, 17, 10, 
-    27, 242, 245, 2, 151, 65, 17, 10, 27, 242, 245, 2, 66, 65, 17, 10, 27, 
-    244, 143, 2, 151, 65, 17, 10, 27, 244, 143, 2, 122, 65, 17, 10, 27, 244, 
-    143, 2, 234, 130, 65, 17, 10, 27, 244, 143, 2, 66, 65, 17, 10, 27, 224, 
-    82, 2, 122, 65, 17, 10, 27, 224, 82, 2, 66, 65, 17, 10, 27, 234, 251, 2, 
-    151, 65, 17, 10, 27, 234, 251, 2, 122, 65, 17, 10, 27, 234, 251, 2, 234, 
-    130, 65, 17, 10, 27, 234, 251, 2, 233, 103, 65, 17, 10, 27, 234, 251, 2, 
-    66, 65, 17, 10, 27, 233, 103, 2, 151, 65, 17, 10, 27, 233, 103, 2, 122, 
-    65, 17, 10, 27, 233, 103, 2, 234, 130, 65, 17, 10, 27, 233, 103, 2, 66, 
-    65, 17, 10, 27, 233, 103, 2, 241, 219, 65, 17, 10, 27, 66, 2, 151, 65, 
-    17, 10, 27, 66, 2, 122, 65, 17, 10, 27, 66, 2, 234, 130, 65, 17, 10, 27, 
-    66, 2, 66, 65, 17, 10, 27, 228, 63, 2, 151, 65, 17, 10, 27, 228, 63, 2, 
-    122, 65, 17, 10, 27, 228, 63, 2, 234, 130, 65, 17, 10, 27, 228, 63, 2, 
-    66, 65, 17, 10, 27, 228, 63, 2, 241, 219, 65, 17, 10, 27, 241, 219, 2, 
-    151, 65, 17, 10, 27, 241, 219, 2, 66, 65, 17, 10, 27, 241, 219, 2, 218, 
-    23, 112, 65, 17, 10, 27, 79, 2, 151, 65, 17, 10, 27, 79, 2, 122, 65, 17, 
-    10, 27, 79, 2, 234, 130, 65, 17, 10, 27, 79, 2, 66, 65, 17, 10, 27, 79, 
-    2, 241, 219, 65, 17, 10, 27, 79, 2, 202, 77, 2, 66, 147, 17, 10, 27, 79, 
-    2, 202, 77, 2, 241, 219, 147, 17, 10, 27, 252, 55, 2, 66, 147, 17, 10, 
-    27, 252, 55, 2, 241, 219, 147, 17, 10, 27, 217, 8, 2, 66, 147, 17, 10, 
-    27, 217, 8, 2, 241, 219, 147, 17, 10, 27, 216, 193, 2, 66, 147, 17, 10, 
-    27, 216, 193, 2, 241, 219, 147, 17, 10, 27, 221, 167, 2, 66, 147, 17, 10, 
-    27, 221, 167, 2, 241, 219, 147, 17, 10, 27, 220, 60, 2, 66, 147, 17, 10, 
-    27, 220, 60, 2, 241, 219, 147, 17, 10, 27, 234, 251, 2, 233, 103, 147, 
-    17, 10, 27, 234, 251, 2, 66, 147, 17, 10, 27, 233, 103, 2, 66, 147, 17, 
-    10, 27, 228, 63, 2, 66, 147, 17, 10, 27, 228, 63, 2, 241, 219, 147, 17, 
-    10, 27, 79, 2, 66, 147, 17, 10, 27, 79, 2, 241, 219, 147, 17, 10, 27, 
-    220, 94, 2, 244, 166, 147, 17, 10, 27, 220, 94, 2, 248, 185, 147, 17, 10, 
-    27, 220, 94, 2, 234, 206, 147, 17, 10, 27, 217, 81, 2, 112, 231, 193, 53, 
-    17, 10, 27, 217, 81, 2, 79, 53, 17, 10, 27, 254, 197, 2, 112, 231, 193, 
-    53, 17, 10, 27, 254, 197, 2, 79, 53, 17, 10, 27, 242, 245, 2, 112, 231, 
-    193, 53, 17, 10, 27, 242, 245, 2, 79, 53, 17, 10, 27, 221, 167, 2, 112, 
-    231, 193, 53, 17, 10, 27, 221, 167, 2, 79, 53, 17, 10, 27, 220, 60, 2, 
-    112, 231, 193, 53, 17, 10, 27, 220, 60, 2, 79, 53, 17, 10, 27, 122, 2, 
-    112, 231, 193, 53, 17, 10, 27, 122, 2, 79, 53, 17, 10, 27, 151, 2, 112, 
-    231, 193, 53, 17, 10, 27, 151, 2, 79, 53, 17, 10, 27, 234, 130, 2, 112, 
-    231, 193, 53, 17, 10, 27, 234, 130, 2, 79, 53, 17, 10, 27, 222, 27, 2, 
-    112, 231, 193, 53, 17, 10, 27, 222, 27, 2, 79, 53, 17, 10, 27, 248, 217, 
-    2, 112, 231, 193, 53, 17, 10, 27, 248, 217, 2, 79, 53, 17, 10, 27, 220, 
-    60, 2, 151, 53, 17, 10, 27, 220, 60, 2, 122, 53, 17, 10, 27, 220, 60, 2, 
-    234, 130, 53, 17, 10, 27, 220, 60, 2, 66, 53, 17, 10, 27, 220, 60, 2, 
-    223, 96, 53, 17, 10, 27, 221, 167, 2, 223, 96, 53, 17, 10, 27, 222, 27, 
-    2, 223, 96, 53, 17, 10, 27, 248, 217, 2, 223, 96, 53, 17, 10, 27, 217, 
-    81, 2, 112, 231, 193, 40, 17, 10, 27, 217, 81, 2, 79, 40, 17, 10, 27, 
-    254, 197, 2, 112, 231, 193, 40, 17, 10, 27, 254, 197, 2, 79, 40, 17, 10, 
-    27, 242, 245, 2, 112, 231, 193, 40, 17, 10, 27, 242, 245, 2, 79, 40, 17, 
-    10, 27, 221, 167, 2, 112, 231, 193, 40, 17, 10, 27, 221, 167, 2, 79, 40, 
-    17, 10, 27, 220, 60, 2, 112, 231, 193, 40, 17, 10, 27, 220, 60, 2, 79, 
-    40, 17, 10, 27, 122, 2, 112, 231, 193, 40, 17, 10, 27, 122, 2, 79, 40, 
-    17, 10, 27, 151, 2, 112, 231, 193, 40, 17, 10, 27, 151, 2, 79, 40, 17, 
-    10, 27, 234, 130, 2, 112, 231, 193, 40, 17, 10, 27, 234, 130, 2, 79, 40, 
-    17, 10, 27, 222, 27, 2, 112, 231, 193, 40, 17, 10, 27, 222, 27, 2, 79, 
-    40, 17, 10, 27, 248, 217, 2, 112, 231, 193, 40, 17, 10, 27, 248, 217, 2, 
-    79, 40, 17, 10, 27, 220, 60, 2, 151, 40, 17, 10, 27, 220, 60, 2, 122, 40, 
-    17, 10, 27, 220, 60, 2, 234, 130, 40, 17, 10, 27, 220, 60, 2, 66, 40, 17, 
-    10, 27, 220, 60, 2, 223, 96, 40, 17, 10, 27, 221, 167, 2, 223, 96, 40, 
-    17, 10, 27, 222, 27, 2, 223, 96, 40, 17, 10, 27, 248, 217, 2, 223, 96, 
-    40, 17, 10, 27, 220, 60, 2, 151, 65, 17, 10, 27, 220, 60, 2, 122, 65, 17, 
-    10, 27, 220, 60, 2, 234, 130, 65, 17, 10, 27, 220, 60, 2, 66, 65, 17, 10, 
-    27, 221, 167, 2, 241, 219, 65, 17, 10, 27, 220, 60, 2, 241, 219, 65, 17, 
-    10, 27, 217, 81, 2, 66, 65, 17, 10, 27, 221, 167, 2, 151, 147, 17, 10, 
-    27, 221, 167, 2, 122, 147, 17, 10, 27, 221, 167, 2, 234, 130, 147, 17, 
-    10, 27, 220, 60, 2, 151, 147, 17, 10, 27, 220, 60, 2, 122, 147, 17, 10, 
-    27, 220, 60, 2, 234, 130, 147, 17, 10, 27, 217, 81, 2, 66, 147, 17, 10, 
-    27, 210, 112, 2, 66, 147, 17, 10, 27, 112, 2, 244, 164, 40, 17, 10, 27, 
-    112, 2, 244, 164, 53, 17, 226, 146, 43, 226, 3, 226, 146, 44, 226, 3, 10, 
-    27, 217, 8, 2, 151, 2, 66, 65, 17, 10, 27, 217, 8, 2, 122, 2, 151, 40, 
-    17, 10, 27, 217, 8, 2, 122, 2, 151, 65, 17, 10, 27, 217, 8, 2, 122, 2, 
-    66, 65, 17, 10, 27, 217, 8, 2, 234, 130, 2, 66, 65, 17, 10, 27, 217, 8, 
-    2, 66, 2, 151, 65, 17, 10, 27, 217, 8, 2, 66, 2, 122, 65, 17, 10, 27, 
-    217, 8, 2, 66, 2, 234, 130, 65, 17, 10, 27, 151, 2, 66, 2, 122, 40, 17, 
+    131, 2, 151, 65, 17, 10, 27, 234, 131, 2, 66, 65, 17, 10, 27, 221, 168, 
+    2, 151, 65, 17, 10, 27, 221, 168, 2, 122, 65, 17, 10, 27, 221, 168, 2, 
+    234, 131, 65, 17, 10, 27, 221, 168, 2, 66, 65, 17, 10, 27, 222, 28, 2, 
+    122, 65, 17, 10, 27, 222, 28, 2, 234, 131, 65, 17, 10, 27, 222, 28, 2, 
+    66, 65, 17, 10, 27, 248, 218, 2, 151, 65, 17, 10, 27, 248, 218, 2, 122, 
+    65, 17, 10, 27, 248, 218, 2, 234, 131, 65, 17, 10, 27, 248, 218, 2, 66, 
+    65, 17, 10, 27, 217, 82, 2, 122, 65, 17, 10, 27, 210, 112, 2, 66, 65, 17, 
+    10, 27, 254, 198, 2, 151, 65, 17, 10, 27, 254, 198, 2, 66, 65, 17, 10, 
+    27, 242, 246, 2, 151, 65, 17, 10, 27, 242, 246, 2, 66, 65, 17, 10, 27, 
+    244, 144, 2, 151, 65, 17, 10, 27, 244, 144, 2, 122, 65, 17, 10, 27, 244, 
+    144, 2, 234, 131, 65, 17, 10, 27, 244, 144, 2, 66, 65, 17, 10, 27, 224, 
+    83, 2, 122, 65, 17, 10, 27, 224, 83, 2, 66, 65, 17, 10, 27, 234, 252, 2, 
+    151, 65, 17, 10, 27, 234, 252, 2, 122, 65, 17, 10, 27, 234, 252, 2, 234, 
+    131, 65, 17, 10, 27, 234, 252, 2, 233, 104, 65, 17, 10, 27, 234, 252, 2, 
+    66, 65, 17, 10, 27, 233, 104, 2, 151, 65, 17, 10, 27, 233, 104, 2, 122, 
+    65, 17, 10, 27, 233, 104, 2, 234, 131, 65, 17, 10, 27, 233, 104, 2, 66, 
+    65, 17, 10, 27, 233, 104, 2, 241, 220, 65, 17, 10, 27, 66, 2, 151, 65, 
+    17, 10, 27, 66, 2, 122, 65, 17, 10, 27, 66, 2, 234, 131, 65, 17, 10, 27, 
+    66, 2, 66, 65, 17, 10, 27, 228, 64, 2, 151, 65, 17, 10, 27, 228, 64, 2, 
+    122, 65, 17, 10, 27, 228, 64, 2, 234, 131, 65, 17, 10, 27, 228, 64, 2, 
+    66, 65, 17, 10, 27, 228, 64, 2, 241, 220, 65, 17, 10, 27, 241, 220, 2, 
+    151, 65, 17, 10, 27, 241, 220, 2, 66, 65, 17, 10, 27, 241, 220, 2, 218, 
+    24, 112, 65, 17, 10, 27, 79, 2, 151, 65, 17, 10, 27, 79, 2, 122, 65, 17, 
+    10, 27, 79, 2, 234, 131, 65, 17, 10, 27, 79, 2, 66, 65, 17, 10, 27, 79, 
+    2, 241, 220, 65, 17, 10, 27, 79, 2, 202, 77, 2, 66, 147, 17, 10, 27, 79, 
+    2, 202, 77, 2, 241, 220, 147, 17, 10, 27, 252, 56, 2, 66, 147, 17, 10, 
+    27, 252, 56, 2, 241, 220, 147, 17, 10, 27, 217, 9, 2, 66, 147, 17, 10, 
+    27, 217, 9, 2, 241, 220, 147, 17, 10, 27, 216, 194, 2, 66, 147, 17, 10, 
+    27, 216, 194, 2, 241, 220, 147, 17, 10, 27, 221, 168, 2, 66, 147, 17, 10, 
+    27, 221, 168, 2, 241, 220, 147, 17, 10, 27, 220, 61, 2, 66, 147, 17, 10, 
+    27, 220, 61, 2, 241, 220, 147, 17, 10, 27, 234, 252, 2, 233, 104, 147, 
+    17, 10, 27, 234, 252, 2, 66, 147, 17, 10, 27, 233, 104, 2, 66, 147, 17, 
+    10, 27, 228, 64, 2, 66, 147, 17, 10, 27, 228, 64, 2, 241, 220, 147, 17, 
+    10, 27, 79, 2, 66, 147, 17, 10, 27, 79, 2, 241, 220, 147, 17, 10, 27, 
+    220, 95, 2, 244, 167, 147, 17, 10, 27, 220, 95, 2, 248, 186, 147, 17, 10, 
+    27, 220, 95, 2, 234, 207, 147, 17, 10, 27, 217, 82, 2, 112, 231, 194, 53, 
+    17, 10, 27, 217, 82, 2, 79, 53, 17, 10, 27, 254, 198, 2, 112, 231, 194, 
+    53, 17, 10, 27, 254, 198, 2, 79, 53, 17, 10, 27, 242, 246, 2, 112, 231, 
+    194, 53, 17, 10, 27, 242, 246, 2, 79, 53, 17, 10, 27, 221, 168, 2, 112, 
+    231, 194, 53, 17, 10, 27, 221, 168, 2, 79, 53, 17, 10, 27, 220, 61, 2, 
+    112, 231, 194, 53, 17, 10, 27, 220, 61, 2, 79, 53, 17, 10, 27, 122, 2, 
+    112, 231, 194, 53, 17, 10, 27, 122, 2, 79, 53, 17, 10, 27, 151, 2, 112, 
+    231, 194, 53, 17, 10, 27, 151, 2, 79, 53, 17, 10, 27, 234, 131, 2, 112, 
+    231, 194, 53, 17, 10, 27, 234, 131, 2, 79, 53, 17, 10, 27, 222, 28, 2, 
+    112, 231, 194, 53, 17, 10, 27, 222, 28, 2, 79, 53, 17, 10, 27, 248, 218, 
+    2, 112, 231, 194, 53, 17, 10, 27, 248, 218, 2, 79, 53, 17, 10, 27, 220, 
+    61, 2, 151, 53, 17, 10, 27, 220, 61, 2, 122, 53, 17, 10, 27, 220, 61, 2, 
+    234, 131, 53, 17, 10, 27, 220, 61, 2, 66, 53, 17, 10, 27, 220, 61, 2, 
+    223, 97, 53, 17, 10, 27, 221, 168, 2, 223, 97, 53, 17, 10, 27, 222, 28, 
+    2, 223, 97, 53, 17, 10, 27, 248, 218, 2, 223, 97, 53, 17, 10, 27, 217, 
+    82, 2, 112, 231, 194, 40, 17, 10, 27, 217, 82, 2, 79, 40, 17, 10, 27, 
+    254, 198, 2, 112, 231, 194, 40, 17, 10, 27, 254, 198, 2, 79, 40, 17, 10, 
+    27, 242, 246, 2, 112, 231, 194, 40, 17, 10, 27, 242, 246, 2, 79, 40, 17, 
+    10, 27, 221, 168, 2, 112, 231, 194, 40, 17, 10, 27, 221, 168, 2, 79, 40, 
+    17, 10, 27, 220, 61, 2, 112, 231, 194, 40, 17, 10, 27, 220, 61, 2, 79, 
+    40, 17, 10, 27, 122, 2, 112, 231, 194, 40, 17, 10, 27, 122, 2, 79, 40, 
+    17, 10, 27, 151, 2, 112, 231, 194, 40, 17, 10, 27, 151, 2, 79, 40, 17, 
+    10, 27, 234, 131, 2, 112, 231, 194, 40, 17, 10, 27, 234, 131, 2, 79, 40, 
+    17, 10, 27, 222, 28, 2, 112, 231, 194, 40, 17, 10, 27, 222, 28, 2, 79, 
+    40, 17, 10, 27, 248, 218, 2, 112, 231, 194, 40, 17, 10, 27, 248, 218, 2, 
+    79, 40, 17, 10, 27, 220, 61, 2, 151, 40, 17, 10, 27, 220, 61, 2, 122, 40, 
+    17, 10, 27, 220, 61, 2, 234, 131, 40, 17, 10, 27, 220, 61, 2, 66, 40, 17, 
+    10, 27, 220, 61, 2, 223, 97, 40, 17, 10, 27, 221, 168, 2, 223, 97, 40, 
+    17, 10, 27, 222, 28, 2, 223, 97, 40, 17, 10, 27, 248, 218, 2, 223, 97, 
+    40, 17, 10, 27, 220, 61, 2, 151, 65, 17, 10, 27, 220, 61, 2, 122, 65, 17, 
+    10, 27, 220, 61, 2, 234, 131, 65, 17, 10, 27, 220, 61, 2, 66, 65, 17, 10, 
+    27, 221, 168, 2, 241, 220, 65, 17, 10, 27, 220, 61, 2, 241, 220, 65, 17, 
+    10, 27, 217, 82, 2, 66, 65, 17, 10, 27, 221, 168, 2, 151, 147, 17, 10, 
+    27, 221, 168, 2, 122, 147, 17, 10, 27, 221, 168, 2, 234, 131, 147, 17, 
+    10, 27, 220, 61, 2, 151, 147, 17, 10, 27, 220, 61, 2, 122, 147, 17, 10, 
+    27, 220, 61, 2, 234, 131, 147, 17, 10, 27, 217, 82, 2, 66, 147, 17, 10, 
+    27, 210, 112, 2, 66, 147, 17, 10, 27, 112, 2, 244, 165, 40, 17, 10, 27, 
+    112, 2, 244, 165, 53, 17, 226, 147, 43, 226, 4, 226, 147, 44, 226, 4, 10, 
+    27, 217, 9, 2, 151, 2, 66, 65, 17, 10, 27, 217, 9, 2, 122, 2, 151, 40, 
+    17, 10, 27, 217, 9, 2, 122, 2, 151, 65, 17, 10, 27, 217, 9, 2, 122, 2, 
+    66, 65, 17, 10, 27, 217, 9, 2, 234, 131, 2, 66, 65, 17, 10, 27, 217, 9, 
+    2, 66, 2, 151, 65, 17, 10, 27, 217, 9, 2, 66, 2, 122, 65, 17, 10, 27, 
+    217, 9, 2, 66, 2, 234, 131, 65, 17, 10, 27, 151, 2, 66, 2, 122, 40, 17, 
     10, 27, 151, 2, 66, 2, 122, 65, 17, 10, 27, 122, 2, 66, 2, 79, 40, 17, 
-    10, 27, 122, 2, 66, 2, 112, 231, 193, 40, 17, 10, 27, 221, 167, 2, 122, 
-    2, 151, 65, 17, 10, 27, 221, 167, 2, 151, 2, 122, 65, 17, 10, 27, 221, 
-    167, 2, 151, 2, 112, 231, 193, 40, 17, 10, 27, 221, 167, 2, 66, 2, 122, 
-    40, 17, 10, 27, 221, 167, 2, 66, 2, 122, 65, 17, 10, 27, 221, 167, 2, 66, 
-    2, 151, 65, 17, 10, 27, 221, 167, 2, 66, 2, 66, 40, 17, 10, 27, 221, 167, 
-    2, 66, 2, 66, 65, 17, 10, 27, 222, 27, 2, 122, 2, 122, 40, 17, 10, 27, 
-    222, 27, 2, 122, 2, 122, 65, 17, 10, 27, 222, 27, 2, 66, 2, 66, 40, 17, 
-    10, 27, 220, 60, 2, 122, 2, 66, 40, 17, 10, 27, 220, 60, 2, 122, 2, 66, 
-    65, 17, 10, 27, 220, 60, 2, 151, 2, 79, 40, 17, 10, 27, 220, 60, 2, 66, 
-    2, 234, 130, 40, 17, 10, 27, 220, 60, 2, 66, 2, 234, 130, 65, 17, 10, 27, 
-    220, 60, 2, 66, 2, 66, 40, 17, 10, 27, 220, 60, 2, 66, 2, 66, 65, 17, 10, 
-    27, 248, 217, 2, 122, 2, 112, 231, 193, 40, 17, 10, 27, 248, 217, 2, 234, 
-    130, 2, 66, 40, 17, 10, 27, 248, 217, 2, 234, 130, 2, 66, 65, 17, 10, 27, 
-    217, 81, 2, 66, 2, 122, 40, 17, 10, 27, 217, 81, 2, 66, 2, 122, 65, 17, 
-    10, 27, 217, 81, 2, 66, 2, 66, 65, 17, 10, 27, 217, 81, 2, 66, 2, 79, 40, 
-    17, 10, 27, 254, 197, 2, 151, 2, 66, 40, 17, 10, 27, 254, 197, 2, 66, 2, 
-    66, 40, 17, 10, 27, 254, 197, 2, 66, 2, 66, 65, 17, 10, 27, 254, 197, 2, 
-    66, 2, 112, 231, 193, 40, 17, 10, 27, 242, 245, 2, 66, 2, 66, 40, 17, 10, 
-    27, 242, 245, 2, 66, 2, 79, 40, 17, 10, 27, 242, 245, 2, 66, 2, 112, 231, 
-    193, 40, 17, 10, 27, 244, 143, 2, 234, 130, 2, 66, 40, 17, 10, 27, 244, 
-    143, 2, 234, 130, 2, 66, 65, 17, 10, 27, 224, 82, 2, 66, 2, 122, 40, 17, 
-    10, 27, 224, 82, 2, 66, 2, 66, 40, 17, 10, 27, 233, 103, 2, 122, 2, 66, 
-    40, 17, 10, 27, 233, 103, 2, 122, 2, 79, 40, 17, 10, 27, 233, 103, 2, 
-    122, 2, 112, 231, 193, 40, 17, 10, 27, 233, 103, 2, 151, 2, 151, 65, 17, 
-    10, 27, 233, 103, 2, 151, 2, 151, 40, 17, 10, 27, 233, 103, 2, 234, 130, 
-    2, 66, 40, 17, 10, 27, 233, 103, 2, 234, 130, 2, 66, 65, 17, 10, 27, 233, 
-    103, 2, 66, 2, 122, 40, 17, 10, 27, 233, 103, 2, 66, 2, 122, 65, 17, 10, 
+    10, 27, 122, 2, 66, 2, 112, 231, 194, 40, 17, 10, 27, 221, 168, 2, 122, 
+    2, 151, 65, 17, 10, 27, 221, 168, 2, 151, 2, 122, 65, 17, 10, 27, 221, 
+    168, 2, 151, 2, 112, 231, 194, 40, 17, 10, 27, 221, 168, 2, 66, 2, 122, 
+    40, 17, 10, 27, 221, 168, 2, 66, 2, 122, 65, 17, 10, 27, 221, 168, 2, 66, 
+    2, 151, 65, 17, 10, 27, 221, 168, 2, 66, 2, 66, 40, 17, 10, 27, 221, 168, 
+    2, 66, 2, 66, 65, 17, 10, 27, 222, 28, 2, 122, 2, 122, 40, 17, 10, 27, 
+    222, 28, 2, 122, 2, 122, 65, 17, 10, 27, 222, 28, 2, 66, 2, 66, 40, 17, 
+    10, 27, 220, 61, 2, 122, 2, 66, 40, 17, 10, 27, 220, 61, 2, 122, 2, 66, 
+    65, 17, 10, 27, 220, 61, 2, 151, 2, 79, 40, 17, 10, 27, 220, 61, 2, 66, 
+    2, 234, 131, 40, 17, 10, 27, 220, 61, 2, 66, 2, 234, 131, 65, 17, 10, 27, 
+    220, 61, 2, 66, 2, 66, 40, 17, 10, 27, 220, 61, 2, 66, 2, 66, 65, 17, 10, 
+    27, 248, 218, 2, 122, 2, 112, 231, 194, 40, 17, 10, 27, 248, 218, 2, 234, 
+    131, 2, 66, 40, 17, 10, 27, 248, 218, 2, 234, 131, 2, 66, 65, 17, 10, 27, 
+    217, 82, 2, 66, 2, 122, 40, 17, 10, 27, 217, 82, 2, 66, 2, 122, 65, 17, 
+    10, 27, 217, 82, 2, 66, 2, 66, 65, 17, 10, 27, 217, 82, 2, 66, 2, 79, 40, 
+    17, 10, 27, 254, 198, 2, 151, 2, 66, 40, 17, 10, 27, 254, 198, 2, 66, 2, 
+    66, 40, 17, 10, 27, 254, 198, 2, 66, 2, 66, 65, 17, 10, 27, 254, 198, 2, 
+    66, 2, 112, 231, 194, 40, 17, 10, 27, 242, 246, 2, 66, 2, 66, 40, 17, 10, 
+    27, 242, 246, 2, 66, 2, 79, 40, 17, 10, 27, 242, 246, 2, 66, 2, 112, 231, 
+    194, 40, 17, 10, 27, 244, 144, 2, 234, 131, 2, 66, 40, 17, 10, 27, 244, 
+    144, 2, 234, 131, 2, 66, 65, 17, 10, 27, 224, 83, 2, 66, 2, 122, 40, 17, 
+    10, 27, 224, 83, 2, 66, 2, 66, 40, 17, 10, 27, 233, 104, 2, 122, 2, 66, 
+    40, 17, 10, 27, 233, 104, 2, 122, 2, 79, 40, 17, 10, 27, 233, 104, 2, 
+    122, 2, 112, 231, 194, 40, 17, 10, 27, 233, 104, 2, 151, 2, 151, 65, 17, 
+    10, 27, 233, 104, 2, 151, 2, 151, 40, 17, 10, 27, 233, 104, 2, 234, 131, 
+    2, 66, 40, 17, 10, 27, 233, 104, 2, 234, 131, 2, 66, 65, 17, 10, 27, 233, 
+    104, 2, 66, 2, 122, 40, 17, 10, 27, 233, 104, 2, 66, 2, 122, 65, 17, 10, 
     27, 66, 2, 122, 2, 151, 65, 17, 10, 27, 66, 2, 122, 2, 66, 65, 17, 10, 
     27, 66, 2, 122, 2, 79, 40, 17, 10, 27, 66, 2, 151, 2, 122, 65, 17, 10, 
-    27, 66, 2, 151, 2, 66, 65, 17, 10, 27, 66, 2, 234, 130, 2, 151, 65, 17, 
-    10, 27, 66, 2, 234, 130, 2, 66, 65, 17, 10, 27, 66, 2, 151, 2, 234, 130, 
-    65, 17, 10, 27, 241, 219, 2, 66, 2, 151, 65, 17, 10, 27, 241, 219, 2, 66, 
-    2, 66, 65, 17, 10, 27, 228, 63, 2, 122, 2, 66, 65, 17, 10, 27, 228, 63, 
-    2, 122, 2, 112, 231, 193, 40, 17, 10, 27, 228, 63, 2, 151, 2, 66, 40, 17, 
-    10, 27, 228, 63, 2, 151, 2, 66, 65, 17, 10, 27, 228, 63, 2, 151, 2, 112, 
-    231, 193, 40, 17, 10, 27, 228, 63, 2, 66, 2, 79, 40, 17, 10, 27, 228, 63, 
-    2, 66, 2, 112, 231, 193, 40, 17, 10, 27, 79, 2, 66, 2, 66, 40, 17, 10, 
-    27, 79, 2, 66, 2, 66, 65, 17, 10, 27, 252, 55, 2, 234, 130, 2, 79, 40, 
-    17, 10, 27, 217, 8, 2, 151, 2, 79, 40, 17, 10, 27, 217, 8, 2, 151, 2, 
-    112, 231, 193, 40, 17, 10, 27, 217, 8, 2, 234, 130, 2, 79, 40, 17, 10, 
-    27, 217, 8, 2, 234, 130, 2, 112, 231, 193, 40, 17, 10, 27, 217, 8, 2, 66, 
-    2, 79, 40, 17, 10, 27, 217, 8, 2, 66, 2, 112, 231, 193, 40, 17, 10, 27, 
-    151, 2, 66, 2, 79, 40, 17, 10, 27, 151, 2, 122, 2, 112, 231, 193, 40, 17, 
-    10, 27, 151, 2, 66, 2, 112, 231, 193, 40, 17, 10, 27, 221, 167, 2, 234, 
-    130, 2, 112, 231, 193, 40, 17, 10, 27, 222, 27, 2, 122, 2, 79, 40, 17, 
-    10, 27, 220, 60, 2, 122, 2, 79, 40, 17, 10, 27, 248, 217, 2, 122, 2, 79, 
-    40, 17, 10, 27, 233, 103, 2, 151, 2, 79, 40, 17, 10, 27, 233, 103, 2, 66, 
+    27, 66, 2, 151, 2, 66, 65, 17, 10, 27, 66, 2, 234, 131, 2, 151, 65, 17, 
+    10, 27, 66, 2, 234, 131, 2, 66, 65, 17, 10, 27, 66, 2, 151, 2, 234, 131, 
+    65, 17, 10, 27, 241, 220, 2, 66, 2, 151, 65, 17, 10, 27, 241, 220, 2, 66, 
+    2, 66, 65, 17, 10, 27, 228, 64, 2, 122, 2, 66, 65, 17, 10, 27, 228, 64, 
+    2, 122, 2, 112, 231, 194, 40, 17, 10, 27, 228, 64, 2, 151, 2, 66, 40, 17, 
+    10, 27, 228, 64, 2, 151, 2, 66, 65, 17, 10, 27, 228, 64, 2, 151, 2, 112, 
+    231, 194, 40, 17, 10, 27, 228, 64, 2, 66, 2, 79, 40, 17, 10, 27, 228, 64, 
+    2, 66, 2, 112, 231, 194, 40, 17, 10, 27, 79, 2, 66, 2, 66, 40, 17, 10, 
+    27, 79, 2, 66, 2, 66, 65, 17, 10, 27, 252, 56, 2, 234, 131, 2, 79, 40, 
+    17, 10, 27, 217, 9, 2, 151, 2, 79, 40, 17, 10, 27, 217, 9, 2, 151, 2, 
+    112, 231, 194, 40, 17, 10, 27, 217, 9, 2, 234, 131, 2, 79, 40, 17, 10, 
+    27, 217, 9, 2, 234, 131, 2, 112, 231, 194, 40, 17, 10, 27, 217, 9, 2, 66, 
+    2, 79, 40, 17, 10, 27, 217, 9, 2, 66, 2, 112, 231, 194, 40, 17, 10, 27, 
+    151, 2, 66, 2, 79, 40, 17, 10, 27, 151, 2, 122, 2, 112, 231, 194, 40, 17, 
+    10, 27, 151, 2, 66, 2, 112, 231, 194, 40, 17, 10, 27, 221, 168, 2, 234, 
+    131, 2, 112, 231, 194, 40, 17, 10, 27, 222, 28, 2, 122, 2, 79, 40, 17, 
+    10, 27, 220, 61, 2, 122, 2, 79, 40, 17, 10, 27, 248, 218, 2, 122, 2, 79, 
+    40, 17, 10, 27, 233, 104, 2, 151, 2, 79, 40, 17, 10, 27, 233, 104, 2, 66, 
     2, 79, 40, 17, 10, 27, 79, 2, 122, 2, 79, 40, 17, 10, 27, 79, 2, 151, 2, 
     79, 40, 17, 10, 27, 79, 2, 66, 2, 79, 40, 17, 10, 27, 66, 2, 66, 2, 79, 
-    40, 17, 10, 27, 224, 82, 2, 66, 2, 79, 40, 17, 10, 27, 228, 63, 2, 122, 
-    2, 79, 40, 17, 10, 27, 224, 82, 2, 66, 2, 122, 65, 17, 10, 27, 233, 103, 
-    2, 122, 2, 66, 65, 17, 10, 27, 254, 197, 2, 66, 2, 79, 40, 17, 10, 27, 
-    234, 251, 2, 66, 2, 79, 40, 17, 10, 27, 228, 63, 2, 151, 2, 122, 65, 17, 
-    10, 27, 66, 2, 234, 130, 2, 79, 40, 17, 10, 27, 233, 103, 2, 151, 2, 66, 
-    65, 17, 10, 27, 234, 251, 2, 66, 2, 66, 40, 17, 10, 27, 233, 103, 2, 151, 
-    2, 66, 40, 17, 10, 27, 228, 63, 2, 151, 2, 122, 40, 17, 10, 27, 151, 2, 
+    40, 17, 10, 27, 224, 83, 2, 66, 2, 79, 40, 17, 10, 27, 228, 64, 2, 122, 
+    2, 79, 40, 17, 10, 27, 224, 83, 2, 66, 2, 122, 65, 17, 10, 27, 233, 104, 
+    2, 122, 2, 66, 65, 17, 10, 27, 254, 198, 2, 66, 2, 79, 40, 17, 10, 27, 
+    234, 252, 2, 66, 2, 79, 40, 17, 10, 27, 228, 64, 2, 151, 2, 122, 65, 17, 
+    10, 27, 66, 2, 234, 131, 2, 79, 40, 17, 10, 27, 233, 104, 2, 151, 2, 66, 
+    65, 17, 10, 27, 234, 252, 2, 66, 2, 66, 40, 17, 10, 27, 233, 104, 2, 151, 
+    2, 66, 40, 17, 10, 27, 228, 64, 2, 151, 2, 122, 40, 17, 10, 27, 151, 2, 
     122, 2, 79, 40, 17, 10, 27, 122, 2, 151, 2, 79, 40, 17, 10, 27, 66, 2, 
-    151, 2, 79, 40, 17, 10, 27, 244, 143, 2, 66, 2, 79, 40, 17, 10, 27, 252, 
-    55, 2, 122, 2, 79, 40, 17, 10, 27, 234, 251, 2, 66, 2, 66, 65, 17, 10, 
-    27, 254, 197, 2, 151, 2, 66, 65, 17, 10, 27, 222, 27, 2, 66, 2, 66, 65, 
-    17, 10, 27, 221, 167, 2, 234, 130, 2, 79, 40, 17, 10, 27, 228, 63, 2, 
-    151, 2, 79, 40, 17, 10, 27, 222, 4, 214, 128, 253, 238, 234, 4, 218, 130, 
-    5, 53, 17, 10, 27, 224, 78, 214, 128, 253, 238, 234, 4, 218, 130, 5, 53, 
-    17, 10, 27, 254, 153, 53, 17, 10, 27, 254, 183, 53, 17, 10, 27, 230, 153, 
-    53, 17, 10, 27, 222, 5, 53, 17, 10, 27, 223, 143, 53, 17, 10, 27, 254, 
-    172, 53, 17, 10, 27, 212, 49, 53, 17, 10, 27, 222, 4, 53, 17, 10, 27, 
-    222, 3, 254, 172, 212, 48, 10, 27, 235, 134, 223, 34, 50, 10, 27, 251, 
-    230, 254, 39, 254, 40, 45, 221, 156, 45, 221, 45, 45, 220, 233, 45, 220, 
-    222, 45, 220, 211, 45, 220, 200, 45, 220, 189, 45, 220, 178, 45, 220, 
-    167, 45, 221, 155, 45, 221, 144, 45, 221, 133, 45, 221, 122, 45, 221, 
-    111, 45, 221, 100, 45, 221, 89, 224, 194, 244, 20, 31, 67, 249, 219, 224, 
-    194, 244, 20, 31, 67, 109, 249, 219, 224, 194, 244, 20, 31, 67, 109, 243, 
-    229, 218, 129, 224, 194, 244, 20, 31, 67, 249, 226, 224, 194, 244, 20, 
-    31, 67, 220, 150, 224, 194, 244, 20, 31, 67, 245, 31, 78, 224, 194, 244, 
-    20, 31, 67, 224, 13, 78, 224, 194, 244, 20, 31, 67, 43, 71, 233, 20, 127, 
-    224, 194, 244, 20, 31, 67, 44, 71, 233, 20, 251, 156, 224, 194, 244, 20, 
-    31, 67, 203, 245, 163, 38, 27, 43, 242, 27, 38, 27, 44, 242, 27, 38, 52, 
-    216, 89, 43, 242, 27, 38, 52, 216, 89, 44, 242, 27, 38, 231, 233, 43, 
-    242, 27, 38, 231, 233, 44, 242, 27, 38, 249, 197, 231, 232, 224, 194, 
-    244, 20, 31, 67, 113, 59, 233, 56, 224, 194, 244, 20, 31, 67, 245, 160, 
-    248, 156, 224, 194, 244, 20, 31, 67, 245, 151, 248, 156, 224, 194, 244, 
-    20, 31, 67, 121, 232, 213, 224, 194, 244, 20, 31, 67, 212, 32, 121, 232, 
-    213, 224, 194, 244, 20, 31, 67, 43, 226, 3, 224, 194, 244, 20, 31, 67, 
-    44, 226, 3, 224, 194, 244, 20, 31, 67, 43, 249, 99, 127, 224, 194, 244, 
-    20, 31, 67, 44, 249, 99, 127, 224, 194, 244, 20, 31, 67, 43, 216, 6, 220, 
-    53, 127, 224, 194, 244, 20, 31, 67, 44, 216, 6, 220, 53, 127, 224, 194, 
-    244, 20, 31, 67, 43, 85, 233, 20, 127, 224, 194, 244, 20, 31, 67, 44, 85, 
-    233, 20, 127, 224, 194, 244, 20, 31, 67, 43, 52, 254, 110, 127, 224, 194, 
-    244, 20, 31, 67, 44, 52, 254, 110, 127, 224, 194, 244, 20, 31, 67, 43, 
-    254, 110, 127, 224, 194, 244, 20, 31, 67, 44, 254, 110, 127, 224, 194, 
-    244, 20, 31, 67, 43, 249, 161, 127, 224, 194, 244, 20, 31, 67, 44, 249, 
-    161, 127, 224, 194, 244, 20, 31, 67, 43, 71, 249, 161, 127, 224, 194, 
-    244, 20, 31, 67, 44, 71, 249, 161, 127, 220, 131, 247, 120, 71, 220, 131, 
-    247, 120, 224, 194, 244, 20, 31, 67, 43, 42, 127, 224, 194, 244, 20, 31, 
-    67, 44, 42, 127, 248, 155, 226, 119, 250, 172, 226, 119, 212, 32, 226, 
-    119, 52, 212, 32, 226, 119, 248, 155, 121, 232, 213, 250, 172, 121, 232, 
-    213, 212, 32, 121, 232, 213, 4, 249, 219, 4, 109, 249, 219, 4, 243, 229, 
-    218, 129, 4, 220, 150, 4, 249, 226, 4, 224, 13, 78, 4, 245, 31, 78, 4, 
-    245, 160, 248, 156, 4, 43, 226, 3, 4, 44, 226, 3, 4, 43, 249, 99, 127, 4, 
-    44, 249, 99, 127, 4, 43, 216, 6, 220, 53, 127, 4, 44, 216, 6, 220, 53, 
-    127, 4, 54, 50, 4, 254, 126, 4, 253, 216, 4, 96, 50, 4, 240, 167, 4, 233, 
-    15, 50, 4, 242, 130, 50, 4, 245, 98, 50, 4, 223, 50, 219, 46, 4, 247, 
-    132, 50, 4, 225, 182, 50, 4, 249, 217, 253, 206, 10, 244, 164, 53, 17, 
-    10, 217, 44, 2, 244, 164, 48, 10, 248, 183, 53, 17, 10, 217, 78, 244, 1, 
-    10, 234, 204, 53, 17, 10, 244, 166, 53, 17, 10, 244, 166, 147, 17, 10, 
-    248, 185, 53, 17, 10, 248, 185, 147, 17, 10, 234, 206, 53, 17, 10, 234, 
-    206, 147, 17, 10, 220, 94, 53, 17, 10, 220, 94, 147, 17, 10, 218, 46, 53, 
-    17, 10, 218, 46, 147, 17, 10, 1, 202, 53, 17, 10, 1, 112, 2, 231, 228, 
-    77, 53, 17, 10, 1, 112, 2, 231, 228, 77, 40, 17, 10, 1, 112, 2, 202, 77, 
-    53, 17, 10, 1, 112, 2, 202, 77, 40, 17, 10, 1, 212, 31, 2, 202, 77, 53, 
-    17, 10, 1, 212, 31, 2, 202, 77, 40, 17, 10, 1, 112, 2, 202, 252, 43, 53, 
-    17, 10, 1, 112, 2, 202, 252, 43, 40, 17, 10, 1, 79, 2, 202, 77, 53, 17, 
-    10, 1, 79, 2, 202, 77, 40, 17, 10, 1, 79, 2, 202, 77, 65, 17, 10, 1, 79, 
-    2, 202, 77, 147, 17, 10, 1, 112, 53, 17, 10, 1, 112, 40, 17, 10, 1, 252, 
-    55, 53, 17, 10, 1, 252, 55, 40, 17, 10, 1, 252, 55, 65, 17, 10, 1, 252, 
-    55, 147, 17, 10, 1, 217, 8, 231, 165, 53, 17, 10, 1, 217, 8, 231, 165, 
-    40, 17, 10, 1, 217, 8, 53, 17, 10, 1, 217, 8, 40, 17, 10, 1, 217, 8, 65, 
-    17, 10, 1, 217, 8, 147, 17, 10, 1, 216, 193, 53, 17, 10, 1, 216, 193, 40, 
-    17, 10, 1, 216, 193, 65, 17, 10, 1, 216, 193, 147, 17, 10, 1, 151, 53, 
-    17, 10, 1, 151, 40, 17, 10, 1, 151, 65, 17, 10, 1, 151, 147, 17, 10, 1, 
-    122, 53, 17, 10, 1, 122, 40, 17, 10, 1, 122, 65, 17, 10, 1, 122, 147, 17, 
-    10, 1, 234, 130, 53, 17, 10, 1, 234, 130, 40, 17, 10, 1, 234, 130, 65, 
-    17, 10, 1, 234, 130, 147, 17, 10, 1, 248, 196, 53, 17, 10, 1, 248, 196, 
-    40, 17, 10, 1, 216, 203, 53, 17, 10, 1, 216, 203, 40, 17, 10, 1, 223, 96, 
-    53, 17, 10, 1, 223, 96, 40, 17, 10, 1, 210, 109, 53, 17, 10, 1, 210, 109, 
-    40, 17, 10, 1, 221, 167, 53, 17, 10, 1, 221, 167, 40, 17, 10, 1, 221, 
-    167, 65, 17, 10, 1, 221, 167, 147, 17, 10, 1, 220, 60, 53, 17, 10, 1, 
-    220, 60, 40, 17, 10, 1, 220, 60, 65, 17, 10, 1, 220, 60, 147, 17, 10, 1, 
-    222, 27, 53, 17, 10, 1, 222, 27, 40, 17, 10, 1, 222, 27, 65, 17, 10, 1, 
-    222, 27, 147, 17, 10, 1, 248, 217, 53, 17, 10, 1, 248, 217, 40, 17, 10, 
-    1, 248, 217, 65, 17, 10, 1, 248, 217, 147, 17, 10, 1, 217, 81, 53, 17, 
-    10, 1, 217, 81, 40, 17, 10, 1, 217, 81, 65, 17, 10, 1, 217, 81, 147, 17, 
-    10, 1, 210, 112, 53, 17, 10, 1, 210, 112, 40, 17, 10, 1, 210, 112, 65, 
-    17, 10, 1, 210, 112, 147, 17, 10, 1, 254, 197, 53, 17, 10, 1, 254, 197, 
-    40, 17, 10, 1, 254, 197, 65, 17, 10, 1, 254, 197, 147, 17, 10, 1, 242, 
-    245, 53, 17, 10, 1, 242, 245, 40, 17, 10, 1, 242, 245, 65, 17, 10, 1, 
-    242, 245, 147, 17, 10, 1, 244, 143, 53, 17, 10, 1, 244, 143, 40, 17, 10, 
-    1, 244, 143, 65, 17, 10, 1, 244, 143, 147, 17, 10, 1, 224, 82, 53, 17, 
-    10, 1, 224, 82, 40, 17, 10, 1, 224, 82, 65, 17, 10, 1, 224, 82, 147, 17, 
-    10, 1, 234, 251, 53, 17, 10, 1, 234, 251, 40, 17, 10, 1, 234, 251, 65, 
-    17, 10, 1, 234, 251, 147, 17, 10, 1, 233, 103, 53, 17, 10, 1, 233, 103, 
-    40, 17, 10, 1, 233, 103, 65, 17, 10, 1, 233, 103, 147, 17, 10, 1, 66, 53, 
-    17, 10, 1, 66, 40, 17, 10, 1, 66, 65, 17, 10, 1, 66, 147, 17, 10, 1, 228, 
-    63, 53, 17, 10, 1, 228, 63, 40, 17, 10, 1, 228, 63, 65, 17, 10, 1, 228, 
-    63, 147, 17, 10, 1, 241, 219, 53, 17, 10, 1, 241, 219, 40, 17, 10, 1, 
-    241, 219, 65, 17, 10, 1, 241, 219, 147, 17, 10, 1, 212, 31, 53, 17, 10, 
-    1, 212, 31, 40, 17, 10, 1, 112, 231, 193, 53, 17, 10, 1, 112, 231, 193, 
-    40, 17, 10, 1, 79, 53, 17, 10, 1, 79, 40, 17, 10, 1, 79, 65, 17, 10, 1, 
-    79, 147, 17, 10, 27, 233, 103, 2, 112, 2, 231, 228, 77, 53, 17, 10, 27, 
-    233, 103, 2, 112, 2, 231, 228, 77, 40, 17, 10, 27, 233, 103, 2, 112, 2, 
-    202, 77, 53, 17, 10, 27, 233, 103, 2, 112, 2, 202, 77, 40, 17, 10, 27, 
-    233, 103, 2, 112, 2, 202, 252, 43, 53, 17, 10, 27, 233, 103, 2, 112, 2, 
-    202, 252, 43, 40, 17, 10, 27, 233, 103, 2, 112, 53, 17, 10, 27, 233, 103, 
-    2, 112, 40, 17, 210, 87, 211, 245, 228, 73, 219, 18, 126, 245, 31, 78, 
-    126, 223, 254, 78, 126, 54, 50, 126, 247, 132, 50, 126, 225, 182, 50, 
-    126, 254, 126, 126, 254, 57, 126, 43, 226, 3, 126, 44, 226, 3, 126, 253, 
-    216, 126, 96, 50, 126, 249, 219, 126, 240, 167, 126, 243, 229, 218, 129, 
-    126, 219, 46, 126, 21, 210, 86, 126, 21, 110, 126, 21, 105, 126, 21, 158, 
-    126, 21, 161, 126, 21, 189, 126, 21, 194, 126, 21, 198, 126, 21, 195, 
-    126, 21, 200, 126, 249, 226, 126, 220, 150, 126, 233, 15, 50, 126, 245, 
-    98, 50, 126, 242, 130, 50, 126, 224, 13, 78, 126, 249, 217, 253, 206, 
-    126, 7, 6, 1, 61, 126, 7, 6, 1, 253, 158, 126, 7, 6, 1, 251, 66, 126, 7, 
-    6, 1, 249, 60, 126, 7, 6, 1, 75, 126, 7, 6, 1, 245, 6, 126, 7, 6, 1, 243, 
-    202, 126, 7, 6, 1, 242, 60, 126, 7, 6, 1, 73, 126, 7, 6, 1, 235, 144, 
-    126, 7, 6, 1, 235, 23, 126, 7, 6, 1, 156, 126, 7, 6, 1, 193, 126, 7, 6, 
-    1, 230, 25, 126, 7, 6, 1, 76, 126, 7, 6, 1, 226, 105, 126, 7, 6, 1, 224, 
-    96, 126, 7, 6, 1, 153, 126, 7, 6, 1, 222, 91, 126, 7, 6, 1, 217, 152, 
-    126, 7, 6, 1, 70, 126, 7, 6, 1, 214, 105, 126, 7, 6, 1, 212, 98, 126, 7, 
-    6, 1, 211, 178, 126, 7, 6, 1, 211, 117, 126, 7, 6, 1, 210, 159, 126, 43, 
-    42, 127, 126, 223, 50, 219, 46, 126, 44, 42, 127, 126, 250, 31, 255, 14, 
-    126, 121, 232, 213, 126, 242, 137, 255, 14, 126, 7, 4, 1, 61, 126, 7, 4, 
-    1, 253, 158, 126, 7, 4, 1, 251, 66, 126, 7, 4, 1, 249, 60, 126, 7, 4, 1, 
-    75, 126, 7, 4, 1, 245, 6, 126, 7, 4, 1, 243, 202, 126, 7, 4, 1, 242, 60, 
-    126, 7, 4, 1, 73, 126, 7, 4, 1, 235, 144, 126, 7, 4, 1, 235, 23, 126, 7, 
-    4, 1, 156, 126, 7, 4, 1, 193, 126, 7, 4, 1, 230, 25, 126, 7, 4, 1, 76, 
-    126, 7, 4, 1, 226, 105, 126, 7, 4, 1, 224, 96, 126, 7, 4, 1, 153, 126, 7, 
-    4, 1, 222, 91, 126, 7, 4, 1, 217, 152, 126, 7, 4, 1, 70, 126, 7, 4, 1, 
-    214, 105, 126, 7, 4, 1, 212, 98, 126, 7, 4, 1, 211, 178, 126, 7, 4, 1, 
-    211, 117, 126, 7, 4, 1, 210, 159, 126, 43, 249, 99, 127, 126, 67, 232, 
-    213, 126, 44, 249, 99, 127, 126, 182, 126, 43, 71, 226, 3, 126, 44, 71, 
-    226, 3, 101, 109, 243, 229, 218, 129, 101, 43, 249, 161, 127, 101, 44, 
-    249, 161, 127, 101, 109, 249, 219, 101, 56, 230, 224, 247, 120, 101, 56, 
-    1, 211, 227, 101, 56, 1, 4, 61, 101, 56, 1, 4, 73, 101, 56, 1, 4, 70, 
-    101, 56, 1, 4, 75, 101, 56, 1, 4, 76, 101, 56, 1, 4, 191, 101, 56, 1, 4, 
-    210, 212, 101, 56, 1, 4, 210, 244, 101, 56, 1, 4, 215, 118, 101, 234, 
-    201, 224, 173, 219, 31, 78, 101, 56, 1, 61, 101, 56, 1, 73, 101, 56, 1, 
-    70, 101, 56, 1, 75, 101, 56, 1, 76, 101, 56, 1, 176, 101, 56, 1, 234, 92, 
-    101, 56, 1, 233, 217, 101, 56, 1, 234, 182, 101, 56, 1, 234, 28, 101, 56, 
-    1, 206, 101, 56, 1, 219, 191, 101, 56, 1, 218, 83, 101, 56, 1, 221, 181, 
-    101, 56, 1, 219, 58, 101, 56, 1, 217, 105, 101, 56, 1, 216, 117, 101, 56, 
-    1, 215, 118, 101, 56, 1, 217, 22, 101, 56, 1, 111, 101, 56, 1, 197, 101, 
-    56, 1, 228, 233, 101, 56, 1, 227, 237, 101, 56, 1, 229, 107, 101, 56, 1, 
-    228, 74, 101, 56, 1, 162, 101, 56, 1, 241, 180, 101, 56, 1, 240, 222, 
-    101, 56, 1, 241, 238, 101, 56, 1, 241, 68, 101, 56, 1, 184, 101, 56, 1, 
-    230, 230, 101, 56, 1, 230, 102, 101, 56, 1, 231, 91, 101, 56, 1, 230, 
-    161, 101, 56, 1, 191, 101, 56, 1, 210, 212, 101, 56, 1, 210, 244, 101, 
-    56, 1, 205, 101, 56, 1, 223, 35, 101, 56, 1, 222, 140, 101, 56, 1, 223, 
-    128, 101, 56, 1, 222, 211, 101, 56, 1, 212, 65, 101, 56, 1, 230, 25, 101, 
-    56, 213, 135, 219, 31, 78, 101, 56, 220, 155, 219, 31, 78, 101, 24, 244, 
-    103, 101, 24, 1, 234, 58, 101, 24, 1, 218, 215, 101, 24, 1, 234, 51, 101, 
-    24, 1, 228, 226, 101, 24, 1, 228, 224, 101, 24, 1, 228, 223, 101, 24, 1, 
-    216, 101, 101, 24, 1, 218, 204, 101, 24, 1, 223, 26, 101, 24, 1, 223, 21, 
-    101, 24, 1, 223, 18, 101, 24, 1, 223, 11, 101, 24, 1, 223, 6, 101, 24, 1, 
-    223, 1, 101, 24, 1, 223, 12, 101, 24, 1, 223, 24, 101, 24, 1, 230, 217, 
-    101, 24, 1, 225, 95, 101, 24, 1, 218, 212, 101, 24, 1, 225, 84, 101, 24, 
-    1, 219, 148, 101, 24, 1, 218, 209, 101, 24, 1, 236, 56, 101, 24, 1, 250, 
-    46, 101, 24, 1, 218, 219, 101, 24, 1, 250, 106, 101, 24, 1, 234, 110, 
-    101, 24, 1, 216, 173, 101, 24, 1, 225, 131, 101, 24, 1, 241, 172, 101, 
-    24, 1, 61, 101, 24, 1, 254, 243, 101, 24, 1, 191, 101, 24, 1, 211, 92, 
-    101, 24, 1, 245, 117, 101, 24, 1, 75, 101, 24, 1, 211, 36, 101, 24, 1, 
-    211, 47, 101, 24, 1, 76, 101, 24, 1, 212, 65, 101, 24, 1, 212, 62, 101, 
-    24, 1, 226, 234, 101, 24, 1, 210, 244, 101, 24, 1, 70, 101, 24, 1, 212, 
-    11, 101, 24, 1, 212, 22, 101, 24, 1, 211, 250, 101, 24, 1, 210, 212, 101, 
-    24, 1, 245, 55, 101, 24, 1, 211, 8, 101, 24, 1, 73, 126, 250, 176, 50, 
-    126, 224, 228, 50, 126, 228, 52, 50, 126, 231, 232, 126, 251, 135, 130, 
-    126, 211, 40, 50, 126, 211, 217, 50, 101, 244, 18, 192, 213, 239, 101, 
-    140, 74, 101, 214, 153, 74, 101, 97, 74, 101, 246, 104, 74, 101, 85, 218, 
-    234, 101, 71, 250, 35, 235, 204, 254, 99, 254, 120, 235, 204, 254, 99, 
-    220, 137, 235, 204, 254, 99, 216, 236, 226, 249, 223, 72, 250, 142, 223, 
-    72, 250, 142, 62, 57, 3, 253, 142, 61, 62, 57, 3, 253, 111, 75, 62, 57, 
-    3, 253, 120, 73, 62, 57, 3, 253, 88, 76, 62, 57, 3, 253, 138, 70, 62, 57, 
-    3, 253, 157, 248, 221, 62, 57, 3, 253, 104, 248, 90, 62, 57, 3, 253, 144, 
-    248, 3, 62, 57, 3, 253, 134, 247, 145, 62, 57, 3, 253, 98, 246, 78, 62, 
-    57, 3, 253, 92, 235, 141, 62, 57, 3, 253, 103, 235, 126, 62, 57, 3, 253, 
-    113, 235, 68, 62, 57, 3, 253, 84, 235, 51, 62, 57, 3, 253, 72, 176, 62, 
-    57, 3, 253, 105, 234, 182, 62, 57, 3, 253, 82, 234, 92, 62, 57, 3, 253, 
-    79, 234, 28, 62, 57, 3, 253, 68, 233, 217, 62, 57, 3, 253, 69, 184, 62, 
-    57, 3, 253, 135, 231, 91, 62, 57, 3, 253, 76, 230, 230, 62, 57, 3, 253, 
-    133, 230, 161, 62, 57, 3, 253, 125, 230, 102, 62, 57, 3, 253, 146, 197, 
-    62, 57, 3, 253, 124, 229, 107, 62, 57, 3, 253, 118, 228, 233, 62, 57, 3, 
-    253, 97, 228, 74, 62, 57, 3, 253, 94, 227, 237, 62, 57, 3, 253, 153, 190, 
-    62, 57, 3, 253, 77, 225, 221, 62, 57, 3, 253, 110, 225, 108, 62, 57, 3, 
-    253, 137, 225, 16, 62, 57, 3, 253, 99, 224, 150, 62, 57, 3, 253, 132, 
-    224, 88, 62, 57, 3, 253, 71, 224, 69, 62, 57, 3, 253, 127, 224, 53, 62, 
-    57, 3, 253, 116, 224, 42, 62, 57, 3, 253, 89, 205, 62, 57, 3, 253, 121, 
-    223, 128, 62, 57, 3, 253, 96, 223, 35, 62, 57, 3, 253, 155, 222, 211, 62, 
-    57, 3, 253, 122, 222, 140, 62, 57, 3, 253, 117, 206, 62, 57, 3, 253, 140, 
-    221, 181, 62, 57, 3, 253, 108, 219, 191, 62, 57, 3, 253, 136, 219, 58, 
-    62, 57, 3, 253, 91, 218, 83, 62, 57, 3, 253, 90, 217, 105, 62, 57, 3, 
-    253, 151, 217, 22, 62, 57, 3, 253, 112, 216, 117, 62, 57, 3, 253, 149, 
-    111, 62, 57, 3, 253, 80, 215, 118, 62, 57, 3, 253, 95, 212, 65, 62, 57, 
-    3, 253, 74, 212, 22, 62, 57, 3, 253, 109, 211, 250, 62, 57, 3, 253, 107, 
-    211, 227, 62, 57, 3, 253, 131, 210, 116, 62, 57, 3, 253, 75, 210, 94, 62, 
-    57, 3, 253, 128, 210, 23, 62, 57, 3, 253, 123, 255, 75, 62, 57, 3, 253, 
-    106, 255, 74, 62, 57, 3, 253, 65, 253, 192, 62, 57, 3, 253, 78, 246, 46, 
-    62, 57, 3, 253, 61, 246, 45, 62, 57, 3, 253, 101, 227, 174, 62, 57, 3, 
-    253, 119, 224, 148, 62, 57, 3, 253, 87, 224, 152, 62, 57, 3, 253, 73, 
-    223, 186, 62, 57, 3, 253, 115, 223, 185, 62, 57, 3, 253, 81, 222, 210, 
-    62, 57, 3, 253, 83, 217, 102, 62, 57, 3, 253, 63, 215, 78, 62, 57, 3, 
-    253, 60, 105, 62, 57, 16, 253, 130, 62, 57, 16, 253, 129, 62, 57, 16, 
-    253, 126, 62, 57, 16, 253, 114, 62, 57, 16, 253, 102, 62, 57, 16, 253, 
-    100, 62, 57, 16, 253, 93, 62, 57, 16, 253, 86, 62, 57, 16, 253, 85, 62, 
-    57, 16, 253, 70, 62, 57, 16, 253, 67, 62, 57, 16, 253, 66, 62, 57, 16, 
-    253, 64, 62, 57, 16, 253, 62, 62, 57, 106, 253, 59, 231, 185, 62, 57, 
-    106, 253, 58, 211, 221, 62, 57, 106, 253, 57, 248, 74, 62, 57, 106, 253, 
-    56, 245, 95, 62, 57, 106, 253, 55, 231, 159, 62, 57, 106, 253, 54, 218, 
-    162, 62, 57, 106, 253, 53, 245, 37, 62, 57, 106, 253, 52, 223, 153, 62, 
-    57, 106, 253, 51, 220, 62, 62, 57, 106, 253, 50, 241, 237, 62, 57, 106, 
-    253, 49, 219, 25, 62, 57, 106, 253, 48, 251, 203, 62, 57, 106, 253, 47, 
-    249, 145, 62, 57, 106, 253, 46, 251, 115, 62, 57, 106, 253, 45, 212, 2, 
-    62, 57, 106, 253, 44, 252, 136, 62, 57, 106, 253, 43, 226, 205, 62, 57, 
-    106, 253, 42, 218, 254, 62, 57, 106, 253, 41, 249, 68, 62, 57, 230, 142, 
-    253, 40, 234, 224, 62, 57, 230, 142, 253, 39, 234, 232, 62, 57, 106, 253, 
-    38, 226, 218, 62, 57, 106, 253, 37, 211, 236, 62, 57, 106, 253, 36, 62, 
-    57, 230, 142, 253, 35, 254, 17, 62, 57, 230, 142, 253, 34, 231, 52, 62, 
-    57, 106, 253, 33, 251, 134, 62, 57, 106, 253, 32, 242, 166, 62, 57, 106, 
-    253, 31, 62, 57, 106, 253, 30, 211, 212, 62, 57, 106, 253, 29, 62, 57, 
-    106, 253, 28, 62, 57, 106, 253, 27, 240, 248, 62, 57, 106, 253, 26, 62, 
-    57, 106, 253, 25, 62, 57, 106, 253, 24, 62, 57, 230, 142, 253, 22, 215, 
-    92, 62, 57, 106, 253, 21, 62, 57, 106, 253, 20, 62, 57, 106, 253, 19, 
-    249, 250, 62, 57, 106, 253, 18, 62, 57, 106, 253, 17, 62, 57, 106, 253, 
-    16, 243, 93, 62, 57, 106, 253, 15, 254, 4, 62, 57, 106, 253, 14, 62, 57, 
-    106, 253, 13, 62, 57, 106, 253, 12, 62, 57, 106, 253, 11, 62, 57, 106, 
-    253, 10, 62, 57, 106, 253, 9, 62, 57, 106, 253, 8, 62, 57, 106, 253, 7, 
-    62, 57, 106, 253, 6, 62, 57, 106, 253, 5, 230, 134, 62, 57, 106, 253, 4, 
-    62, 57, 106, 253, 3, 215, 235, 62, 57, 106, 253, 2, 62, 57, 106, 253, 1, 
-    62, 57, 106, 253, 0, 62, 57, 106, 252, 255, 62, 57, 106, 252, 254, 62, 
-    57, 106, 252, 253, 62, 57, 106, 252, 252, 62, 57, 106, 252, 251, 62, 57, 
-    106, 252, 250, 62, 57, 106, 252, 249, 62, 57, 106, 252, 248, 62, 57, 106, 
-    252, 247, 241, 211, 62, 57, 106, 252, 226, 244, 28, 62, 57, 106, 252, 
-    223, 252, 116, 62, 57, 106, 252, 218, 219, 5, 62, 57, 106, 252, 217, 74, 
-    62, 57, 106, 252, 216, 62, 57, 106, 252, 215, 217, 236, 62, 57, 106, 252, 
-    214, 62, 57, 106, 252, 213, 62, 57, 106, 252, 212, 211, 254, 250, 139, 
-    62, 57, 106, 252, 211, 250, 139, 62, 57, 106, 252, 210, 250, 140, 243, 
-    255, 62, 57, 106, 252, 209, 212, 0, 62, 57, 106, 252, 208, 62, 57, 106, 
-    252, 207, 62, 57, 230, 142, 252, 206, 247, 198, 62, 57, 106, 252, 205, 
-    62, 57, 106, 252, 204, 62, 57, 106, 252, 202, 62, 57, 106, 252, 201, 62, 
-    57, 106, 252, 200, 62, 57, 106, 252, 199, 248, 159, 62, 57, 106, 252, 
-    198, 62, 57, 106, 252, 197, 62, 57, 106, 252, 196, 62, 57, 106, 252, 195, 
-    62, 57, 106, 252, 194, 62, 57, 106, 213, 186, 253, 23, 62, 57, 106, 213, 
-    186, 252, 246, 62, 57, 106, 213, 186, 252, 245, 62, 57, 106, 213, 186, 
-    252, 244, 62, 57, 106, 213, 186, 252, 243, 62, 57, 106, 213, 186, 252, 
-    242, 62, 57, 106, 213, 186, 252, 241, 62, 57, 106, 213, 186, 252, 240, 
-    62, 57, 106, 213, 186, 252, 239, 62, 57, 106, 213, 186, 252, 238, 62, 57, 
-    106, 213, 186, 252, 237, 62, 57, 106, 213, 186, 252, 236, 62, 57, 106, 
-    213, 186, 252, 235, 62, 57, 106, 213, 186, 252, 234, 62, 57, 106, 213, 
-    186, 252, 233, 62, 57, 106, 213, 186, 252, 232, 62, 57, 106, 213, 186, 
-    252, 231, 62, 57, 106, 213, 186, 252, 230, 62, 57, 106, 213, 186, 252, 
-    229, 62, 57, 106, 213, 186, 252, 228, 62, 57, 106, 213, 186, 252, 227, 
-    62, 57, 106, 213, 186, 252, 225, 62, 57, 106, 213, 186, 252, 224, 62, 57, 
-    106, 213, 186, 252, 222, 62, 57, 106, 213, 186, 252, 221, 62, 57, 106, 
-    213, 186, 252, 220, 62, 57, 106, 213, 186, 252, 219, 62, 57, 106, 213, 
-    186, 252, 203, 62, 57, 106, 213, 186, 252, 193, 254, 236, 211, 209, 220, 
-    138, 232, 213, 254, 236, 211, 209, 220, 138, 247, 120, 254, 236, 250, 
-    130, 78, 254, 236, 54, 110, 254, 236, 54, 105, 254, 236, 54, 158, 254, 
-    236, 54, 161, 254, 236, 54, 189, 254, 236, 54, 194, 254, 236, 54, 198, 
-    254, 236, 54, 195, 254, 236, 54, 200, 254, 236, 54, 216, 247, 254, 236, 
-    54, 215, 73, 254, 236, 54, 216, 162, 254, 236, 54, 244, 15, 254, 236, 54, 
-    244, 114, 254, 236, 54, 219, 111, 254, 236, 54, 220, 116, 254, 236, 54, 
-    245, 184, 254, 236, 54, 228, 195, 254, 236, 54, 123, 240, 210, 254, 236, 
-    54, 113, 240, 210, 254, 236, 54, 134, 240, 210, 254, 236, 54, 244, 11, 
-    240, 210, 254, 236, 54, 244, 81, 240, 210, 254, 236, 54, 219, 125, 240, 
-    210, 254, 236, 54, 220, 122, 240, 210, 254, 236, 54, 245, 193, 240, 210, 
-    254, 236, 54, 228, 200, 240, 210, 254, 236, 54, 123, 216, 147, 254, 236, 
-    54, 113, 216, 147, 254, 236, 54, 134, 216, 147, 254, 236, 54, 244, 11, 
-    216, 147, 254, 236, 54, 244, 81, 216, 147, 254, 236, 54, 219, 125, 216, 
-    147, 254, 236, 54, 220, 122, 216, 147, 254, 236, 54, 245, 193, 216, 147, 
-    254, 236, 54, 228, 200, 216, 147, 254, 236, 54, 216, 248, 216, 147, 254, 
-    236, 54, 215, 74, 216, 147, 254, 236, 54, 216, 163, 216, 147, 254, 236, 
-    54, 244, 16, 216, 147, 254, 236, 54, 244, 115, 216, 147, 254, 236, 54, 
-    219, 112, 216, 147, 254, 236, 54, 220, 117, 216, 147, 254, 236, 54, 245, 
-    185, 216, 147, 254, 236, 54, 228, 196, 216, 147, 254, 236, 212, 14, 252, 
-    128, 214, 173, 254, 236, 212, 14, 244, 92, 218, 59, 254, 236, 212, 14, 
-    221, 176, 218, 59, 254, 236, 212, 14, 216, 169, 218, 59, 254, 236, 212, 
-    14, 244, 4, 218, 59, 254, 236, 246, 81, 231, 90, 244, 92, 218, 59, 254, 
-    236, 232, 199, 231, 90, 244, 92, 218, 59, 254, 236, 231, 90, 221, 176, 
-    218, 59, 254, 236, 231, 90, 216, 169, 218, 59, 26, 255, 6, 253, 194, 123, 
-    224, 21, 26, 255, 6, 253, 194, 123, 242, 27, 26, 255, 6, 253, 194, 123, 
-    246, 100, 26, 255, 6, 253, 194, 189, 26, 255, 6, 253, 194, 244, 114, 26, 
-    255, 6, 253, 194, 244, 81, 240, 210, 26, 255, 6, 253, 194, 244, 81, 216, 
-    147, 26, 255, 6, 253, 194, 244, 115, 216, 147, 26, 255, 6, 253, 194, 244, 
-    81, 217, 67, 26, 255, 6, 253, 194, 216, 248, 217, 67, 26, 255, 6, 253, 
-    194, 244, 115, 217, 67, 26, 255, 6, 253, 194, 123, 240, 211, 217, 67, 26, 
-    255, 6, 253, 194, 244, 81, 240, 211, 217, 67, 26, 255, 6, 253, 194, 123, 
-    216, 148, 217, 67, 26, 255, 6, 253, 194, 244, 81, 216, 148, 217, 67, 26, 
-    255, 6, 253, 194, 244, 81, 218, 150, 26, 255, 6, 253, 194, 216, 248, 218, 
-    150, 26, 255, 6, 253, 194, 244, 115, 218, 150, 26, 255, 6, 253, 194, 123, 
-    240, 211, 218, 150, 26, 255, 6, 253, 194, 244, 81, 240, 211, 218, 150, 
-    26, 255, 6, 253, 194, 123, 216, 148, 218, 150, 26, 255, 6, 253, 194, 216, 
-    248, 216, 148, 218, 150, 26, 255, 6, 253, 194, 244, 115, 216, 148, 218, 
-    150, 26, 255, 6, 253, 194, 216, 248, 230, 164, 26, 255, 6, 241, 205, 123, 
-    225, 31, 26, 255, 6, 216, 181, 110, 26, 255, 6, 241, 201, 110, 26, 255, 
-    6, 245, 104, 105, 26, 255, 6, 216, 181, 105, 26, 255, 6, 249, 65, 113, 
-    246, 99, 26, 255, 6, 245, 104, 113, 246, 99, 26, 255, 6, 215, 203, 189, 
-    26, 255, 6, 215, 203, 216, 247, 26, 255, 6, 215, 203, 216, 248, 254, 141, 
-    17, 26, 255, 6, 241, 201, 216, 247, 26, 255, 6, 231, 41, 216, 247, 26, 
-    255, 6, 216, 181, 216, 247, 26, 255, 6, 216, 181, 216, 162, 26, 255, 6, 
-    215, 203, 244, 114, 26, 255, 6, 215, 203, 244, 115, 254, 141, 17, 26, 
-    255, 6, 241, 201, 244, 114, 26, 255, 6, 216, 181, 244, 114, 26, 255, 6, 
-    216, 181, 123, 240, 210, 26, 255, 6, 216, 181, 134, 240, 210, 26, 255, 6, 
-    245, 104, 244, 81, 240, 210, 26, 255, 6, 215, 203, 244, 81, 240, 210, 26, 
-    255, 6, 216, 181, 244, 81, 240, 210, 26, 255, 6, 250, 227, 244, 81, 240, 
-    210, 26, 255, 6, 229, 182, 244, 81, 240, 210, 26, 255, 6, 216, 181, 123, 
-    216, 147, 26, 255, 6, 216, 181, 244, 81, 216, 147, 26, 255, 6, 248, 57, 
-    244, 81, 230, 164, 26, 255, 6, 218, 118, 244, 115, 230, 164, 26, 123, 
-    163, 50, 26, 123, 163, 5, 254, 141, 17, 26, 113, 216, 167, 50, 26, 134, 
-    224, 20, 50, 26, 211, 45, 50, 26, 217, 68, 50, 26, 246, 101, 50, 26, 226, 
-    246, 50, 26, 113, 226, 245, 50, 26, 134, 226, 245, 50, 26, 244, 11, 226, 
-    245, 50, 26, 244, 81, 226, 245, 50, 26, 231, 35, 50, 26, 233, 157, 252, 
-    128, 50, 26, 232, 194, 50, 26, 226, 131, 50, 26, 211, 159, 50, 26, 253, 
-    243, 50, 26, 254, 0, 50, 26, 242, 144, 50, 26, 215, 186, 252, 128, 50, 
-    26, 210, 87, 50, 222, 198, 220, 113, 50, 222, 198, 214, 185, 50, 222, 
-    198, 220, 142, 50, 222, 198, 220, 111, 50, 222, 198, 247, 213, 220, 111, 
-    50, 222, 198, 219, 168, 50, 222, 198, 248, 53, 50, 222, 198, 224, 6, 50, 
-    222, 198, 220, 129, 50, 222, 198, 246, 60, 50, 222, 198, 253, 238, 50, 
-    222, 198, 250, 171, 50, 225, 143, 247, 191, 5, 225, 213, 225, 143, 247, 
-    191, 5, 225, 24, 241, 235, 225, 143, 247, 191, 5, 217, 45, 241, 235, 225, 
-    143, 247, 191, 5, 250, 247, 225, 143, 247, 191, 5, 250, 101, 225, 143, 
-    247, 191, 5, 211, 221, 225, 143, 247, 191, 5, 241, 211, 225, 143, 247, 
-    191, 5, 243, 85, 225, 143, 247, 191, 5, 216, 116, 225, 143, 247, 191, 5, 
-    74, 225, 143, 247, 191, 5, 251, 169, 225, 143, 247, 191, 5, 220, 29, 225, 
-    143, 247, 191, 5, 249, 244, 225, 143, 247, 191, 5, 231, 184, 225, 143, 
-    247, 191, 5, 231, 136, 225, 143, 247, 191, 5, 221, 216, 225, 143, 247, 
-    191, 5, 232, 237, 225, 143, 247, 191, 5, 251, 188, 225, 143, 247, 191, 5, 
-    250, 231, 225, 35, 225, 143, 247, 191, 5, 247, 133, 225, 143, 247, 191, 
-    5, 249, 223, 225, 143, 247, 191, 5, 219, 87, 225, 143, 247, 191, 5, 249, 
-    224, 225, 143, 247, 191, 5, 252, 63, 225, 143, 247, 191, 5, 220, 16, 225, 
-    143, 247, 191, 5, 240, 248, 225, 143, 247, 191, 5, 241, 178, 225, 143, 
-    247, 191, 5, 251, 112, 233, 36, 225, 143, 247, 191, 5, 250, 224, 225, 
-    143, 247, 191, 5, 223, 153, 225, 143, 247, 191, 5, 245, 230, 225, 143, 
-    247, 191, 5, 246, 107, 225, 143, 247, 191, 5, 215, 105, 225, 143, 247, 
-    191, 5, 252, 66, 225, 143, 247, 191, 5, 225, 36, 215, 235, 225, 143, 247, 
-    191, 5, 213, 159, 225, 143, 247, 191, 5, 226, 18, 225, 143, 247, 191, 5, 
-    222, 190, 225, 143, 247, 191, 5, 232, 224, 225, 143, 247, 191, 5, 226, 
-    115, 252, 184, 225, 143, 247, 191, 5, 244, 48, 225, 143, 247, 191, 5, 
-    242, 138, 225, 143, 247, 191, 5, 218, 119, 225, 143, 247, 191, 5, 4, 253, 
-    168, 225, 143, 247, 191, 5, 212, 32, 252, 148, 225, 143, 247, 191, 5, 38, 
-    226, 248, 91, 232, 60, 1, 61, 232, 60, 1, 75, 232, 60, 1, 253, 158, 232, 
-    60, 1, 252, 19, 232, 60, 1, 243, 202, 232, 60, 1, 249, 60, 232, 60, 1, 
-    73, 232, 60, 1, 212, 98, 232, 60, 1, 210, 159, 232, 60, 1, 216, 210, 232, 
-    60, 1, 235, 144, 232, 60, 1, 235, 23, 232, 60, 1, 224, 96, 232, 60, 1, 
-    156, 232, 60, 1, 193, 232, 60, 1, 230, 25, 232, 60, 1, 230, 166, 232, 60, 
-    1, 228, 111, 232, 60, 1, 70, 232, 60, 1, 226, 105, 232, 60, 1, 234, 47, 
-    232, 60, 1, 153, 232, 60, 1, 222, 91, 232, 60, 1, 217, 152, 232, 60, 1, 
-    215, 159, 232, 60, 1, 254, 123, 232, 60, 1, 245, 150, 232, 60, 1, 242, 
-    60, 232, 60, 1, 211, 178, 250, 237, 1, 61, 250, 237, 1, 226, 91, 250, 
-    237, 1, 249, 60, 250, 237, 1, 156, 250, 237, 1, 214, 116, 250, 237, 1, 
-    153, 250, 237, 1, 233, 62, 250, 237, 1, 255, 75, 250, 237, 1, 224, 96, 
-    250, 237, 1, 253, 158, 250, 237, 1, 193, 250, 237, 1, 76, 250, 237, 1, 
-    248, 223, 250, 237, 1, 217, 152, 250, 237, 1, 220, 104, 250, 237, 1, 220, 
-    103, 250, 237, 1, 222, 91, 250, 237, 1, 251, 65, 250, 237, 1, 70, 250, 
-    237, 1, 228, 111, 250, 237, 1, 211, 178, 250, 237, 1, 230, 25, 250, 237, 
-    1, 215, 158, 250, 237, 1, 226, 105, 250, 237, 1, 218, 226, 250, 237, 1, 
-    73, 250, 237, 1, 75, 250, 237, 1, 214, 113, 250, 237, 1, 235, 23, 250, 
-    237, 1, 235, 14, 250, 237, 1, 229, 150, 250, 237, 1, 214, 118, 250, 237, 
-    1, 243, 202, 250, 237, 1, 243, 137, 250, 237, 1, 218, 168, 250, 237, 1, 
-    218, 167, 250, 237, 1, 229, 79, 250, 237, 1, 236, 33, 250, 237, 1, 251, 
-    64, 250, 237, 1, 215, 159, 250, 237, 1, 214, 115, 250, 237, 1, 222, 180, 
-    250, 237, 1, 231, 129, 250, 237, 1, 231, 128, 250, 237, 1, 231, 127, 250, 
-    237, 1, 231, 126, 250, 237, 1, 233, 61, 250, 237, 1, 245, 234, 250, 237, 
-    1, 214, 114, 55, 32, 1, 61, 55, 32, 1, 252, 75, 55, 32, 1, 234, 182, 55, 
-    32, 1, 248, 90, 55, 32, 1, 75, 55, 32, 1, 213, 255, 55, 32, 1, 210, 94, 
-    55, 32, 1, 241, 238, 55, 32, 1, 216, 195, 55, 32, 1, 73, 55, 32, 1, 176, 
-    55, 32, 1, 245, 174, 55, 32, 1, 245, 159, 55, 32, 1, 245, 150, 55, 32, 1, 
-    245, 75, 55, 32, 1, 76, 55, 32, 1, 225, 221, 55, 32, 1, 220, 63, 55, 32, 
-    1, 233, 217, 55, 32, 1, 245, 92, 55, 32, 1, 245, 82, 55, 32, 1, 217, 22, 
-    55, 32, 1, 70, 55, 32, 1, 245, 177, 55, 32, 1, 225, 136, 55, 32, 1, 234, 
-    119, 55, 32, 1, 245, 202, 55, 32, 1, 245, 84, 55, 32, 1, 250, 131, 55, 
-    32, 1, 236, 33, 55, 32, 1, 214, 118, 55, 32, 227, 198, 110, 55, 32, 227, 
-    198, 189, 55, 32, 227, 198, 216, 247, 55, 32, 227, 198, 244, 114, 242, 
-    153, 1, 254, 204, 242, 153, 1, 252, 163, 242, 153, 1, 242, 211, 242, 153, 
-    1, 248, 204, 242, 153, 1, 254, 200, 242, 153, 1, 224, 79, 242, 153, 1, 
-    235, 155, 242, 153, 1, 242, 39, 242, 153, 1, 216, 158, 242, 153, 1, 245, 
-    183, 242, 153, 1, 233, 190, 242, 153, 1, 233, 113, 242, 153, 1, 231, 179, 
-    242, 153, 1, 229, 184, 242, 153, 1, 235, 119, 242, 153, 1, 214, 136, 242, 
-    153, 1, 226, 69, 242, 153, 1, 228, 195, 242, 153, 1, 223, 165, 242, 153, 
-    1, 221, 218, 242, 153, 1, 217, 4, 242, 153, 1, 211, 234, 242, 153, 1, 
-    244, 178, 242, 153, 1, 236, 37, 242, 153, 1, 240, 199, 242, 153, 1, 226, 
-    139, 242, 153, 1, 228, 200, 240, 210, 214, 209, 1, 254, 147, 214, 209, 1, 
-    252, 26, 214, 209, 1, 243, 108, 214, 209, 1, 234, 132, 214, 209, 1, 248, 
-    54, 214, 209, 1, 241, 68, 214, 209, 1, 211, 227, 214, 209, 1, 210, 85, 
-    214, 209, 1, 240, 241, 214, 209, 1, 216, 230, 214, 209, 1, 210, 233, 214, 
-    209, 1, 234, 250, 214, 209, 1, 220, 20, 214, 209, 1, 233, 98, 214, 209, 
-    1, 231, 65, 214, 209, 1, 248, 21, 214, 209, 1, 227, 194, 214, 209, 1, 
-    210, 13, 214, 209, 1, 221, 248, 214, 209, 1, 254, 196, 214, 209, 1, 224, 
-    150, 214, 209, 1, 222, 25, 214, 209, 1, 224, 35, 214, 209, 1, 223, 144, 
-    214, 209, 1, 216, 199, 214, 209, 1, 242, 244, 214, 209, 1, 111, 214, 209, 
-    1, 73, 214, 209, 1, 70, 214, 209, 1, 218, 179, 214, 209, 211, 209, 247, 
-    172, 55, 225, 169, 5, 61, 55, 225, 169, 5, 73, 55, 225, 169, 5, 70, 55, 
-    225, 169, 5, 176, 55, 225, 169, 5, 233, 217, 55, 225, 169, 5, 243, 135, 
-    55, 225, 169, 5, 242, 113, 55, 225, 169, 5, 211, 165, 55, 225, 169, 5, 
-    251, 33, 55, 225, 169, 5, 235, 141, 55, 225, 169, 5, 235, 108, 55, 225, 
-    169, 5, 217, 105, 55, 225, 169, 5, 215, 118, 55, 225, 169, 5, 248, 221, 
-    55, 225, 169, 5, 248, 3, 55, 225, 169, 5, 246, 78, 55, 225, 169, 5, 216, 
-    208, 55, 225, 169, 5, 190, 55, 225, 169, 5, 252, 191, 55, 225, 169, 5, 
-    244, 196, 55, 225, 169, 5, 197, 55, 225, 169, 5, 227, 237, 55, 225, 169, 
-    5, 184, 55, 225, 169, 5, 230, 230, 55, 225, 169, 5, 230, 102, 55, 225, 
-    169, 5, 191, 55, 225, 169, 5, 214, 27, 55, 225, 169, 5, 213, 176, 55, 
-    225, 169, 5, 205, 55, 225, 169, 5, 222, 140, 55, 225, 169, 5, 233, 135, 
-    55, 225, 169, 5, 206, 55, 225, 169, 5, 210, 116, 55, 225, 169, 5, 220, 
-    102, 55, 225, 169, 5, 218, 223, 55, 225, 169, 5, 162, 55, 225, 169, 5, 
-    253, 186, 55, 225, 169, 5, 253, 185, 55, 225, 169, 5, 253, 184, 55, 225, 
-    169, 5, 211, 142, 55, 225, 169, 5, 248, 200, 55, 225, 169, 5, 248, 199, 
-    55, 225, 169, 5, 252, 170, 55, 225, 169, 5, 251, 85, 55, 225, 169, 211, 
-    209, 247, 172, 55, 225, 169, 54, 110, 55, 225, 169, 54, 105, 55, 225, 
-    169, 54, 216, 247, 55, 225, 169, 54, 215, 73, 55, 225, 169, 54, 240, 210, 
+    151, 2, 79, 40, 17, 10, 27, 244, 144, 2, 66, 2, 79, 40, 17, 10, 27, 252, 
+    56, 2, 122, 2, 79, 40, 17, 10, 27, 234, 252, 2, 66, 2, 66, 65, 17, 10, 
+    27, 254, 198, 2, 151, 2, 66, 65, 17, 10, 27, 222, 28, 2, 66, 2, 66, 65, 
+    17, 10, 27, 221, 168, 2, 234, 131, 2, 79, 40, 17, 10, 27, 228, 64, 2, 
+    151, 2, 79, 40, 17, 10, 27, 222, 5, 214, 128, 253, 239, 234, 5, 218, 131, 
+    5, 53, 17, 10, 27, 224, 79, 214, 128, 253, 239, 234, 5, 218, 131, 5, 53, 
+    17, 10, 27, 254, 154, 53, 17, 10, 27, 254, 184, 53, 17, 10, 27, 230, 154, 
+    53, 17, 10, 27, 222, 6, 53, 17, 10, 27, 223, 144, 53, 17, 10, 27, 254, 
+    173, 53, 17, 10, 27, 212, 49, 53, 17, 10, 27, 222, 5, 53, 17, 10, 27, 
+    222, 4, 254, 173, 212, 48, 10, 27, 235, 135, 223, 35, 50, 10, 27, 251, 
+    231, 254, 40, 254, 41, 45, 221, 157, 45, 221, 46, 45, 220, 234, 45, 220, 
+    223, 45, 220, 212, 45, 220, 201, 45, 220, 190, 45, 220, 179, 45, 220, 
+    168, 45, 221, 156, 45, 221, 145, 45, 221, 134, 45, 221, 123, 45, 221, 
+    112, 45, 221, 101, 45, 221, 90, 224, 195, 244, 21, 31, 67, 249, 220, 224, 
+    195, 244, 21, 31, 67, 109, 249, 220, 224, 195, 244, 21, 31, 67, 109, 243, 
+    230, 218, 130, 224, 195, 244, 21, 31, 67, 249, 227, 224, 195, 244, 21, 
+    31, 67, 220, 151, 224, 195, 244, 21, 31, 67, 245, 32, 78, 224, 195, 244, 
+    21, 31, 67, 224, 14, 78, 224, 195, 244, 21, 31, 67, 43, 71, 233, 21, 127, 
+    224, 195, 244, 21, 31, 67, 44, 71, 233, 21, 251, 157, 224, 195, 244, 21, 
+    31, 67, 203, 245, 164, 38, 27, 43, 242, 28, 38, 27, 44, 242, 28, 38, 52, 
+    216, 90, 43, 242, 28, 38, 52, 216, 90, 44, 242, 28, 38, 231, 234, 43, 
+    242, 28, 38, 231, 234, 44, 242, 28, 38, 249, 198, 231, 233, 224, 195, 
+    244, 21, 31, 67, 113, 59, 233, 57, 224, 195, 244, 21, 31, 67, 245, 161, 
+    248, 157, 224, 195, 244, 21, 31, 67, 245, 152, 248, 157, 224, 195, 244, 
+    21, 31, 67, 121, 232, 214, 224, 195, 244, 21, 31, 67, 212, 32, 121, 232, 
+    214, 224, 195, 244, 21, 31, 67, 43, 226, 4, 224, 195, 244, 21, 31, 67, 
+    44, 226, 4, 224, 195, 244, 21, 31, 67, 43, 249, 100, 127, 224, 195, 244, 
+    21, 31, 67, 44, 249, 100, 127, 224, 195, 244, 21, 31, 67, 43, 216, 7, 
+    220, 54, 127, 224, 195, 244, 21, 31, 67, 44, 216, 7, 220, 54, 127, 224, 
+    195, 244, 21, 31, 67, 43, 85, 233, 21, 127, 224, 195, 244, 21, 31, 67, 
+    44, 85, 233, 21, 127, 224, 195, 244, 21, 31, 67, 43, 52, 254, 111, 127, 
+    224, 195, 244, 21, 31, 67, 44, 52, 254, 111, 127, 224, 195, 244, 21, 31, 
+    67, 43, 254, 111, 127, 224, 195, 244, 21, 31, 67, 44, 254, 111, 127, 224, 
+    195, 244, 21, 31, 67, 43, 249, 162, 127, 224, 195, 244, 21, 31, 67, 44, 
+    249, 162, 127, 224, 195, 244, 21, 31, 67, 43, 71, 249, 162, 127, 224, 
+    195, 244, 21, 31, 67, 44, 71, 249, 162, 127, 220, 132, 247, 121, 71, 220, 
+    132, 247, 121, 224, 195, 244, 21, 31, 67, 43, 42, 127, 224, 195, 244, 21, 
+    31, 67, 44, 42, 127, 248, 156, 226, 120, 250, 173, 226, 120, 212, 32, 
+    226, 120, 52, 212, 32, 226, 120, 248, 156, 121, 232, 214, 250, 173, 121, 
+    232, 214, 212, 32, 121, 232, 214, 4, 249, 220, 4, 109, 249, 220, 4, 243, 
+    230, 218, 130, 4, 220, 151, 4, 249, 227, 4, 224, 14, 78, 4, 245, 32, 78, 
+    4, 245, 161, 248, 157, 4, 43, 226, 4, 4, 44, 226, 4, 4, 43, 249, 100, 
+    127, 4, 44, 249, 100, 127, 4, 43, 216, 7, 220, 54, 127, 4, 44, 216, 7, 
+    220, 54, 127, 4, 54, 50, 4, 254, 127, 4, 253, 217, 4, 96, 50, 4, 240, 
+    168, 4, 233, 16, 50, 4, 242, 131, 50, 4, 245, 99, 50, 4, 223, 51, 219, 
+    47, 4, 247, 133, 50, 4, 225, 183, 50, 4, 249, 218, 253, 207, 10, 244, 
+    165, 53, 17, 10, 217, 45, 2, 244, 165, 48, 10, 248, 184, 53, 17, 10, 217, 
+    79, 244, 2, 10, 234, 205, 53, 17, 10, 244, 167, 53, 17, 10, 244, 167, 
+    147, 17, 10, 248, 186, 53, 17, 10, 248, 186, 147, 17, 10, 234, 207, 53, 
+    17, 10, 234, 207, 147, 17, 10, 220, 95, 53, 17, 10, 220, 95, 147, 17, 10, 
+    218, 47, 53, 17, 10, 218, 47, 147, 17, 10, 1, 202, 53, 17, 10, 1, 112, 2, 
+    231, 229, 77, 53, 17, 10, 1, 112, 2, 231, 229, 77, 40, 17, 10, 1, 112, 2, 
+    202, 77, 53, 17, 10, 1, 112, 2, 202, 77, 40, 17, 10, 1, 212, 31, 2, 202, 
+    77, 53, 17, 10, 1, 212, 31, 2, 202, 77, 40, 17, 10, 1, 112, 2, 202, 252, 
+    44, 53, 17, 10, 1, 112, 2, 202, 252, 44, 40, 17, 10, 1, 79, 2, 202, 77, 
+    53, 17, 10, 1, 79, 2, 202, 77, 40, 17, 10, 1, 79, 2, 202, 77, 65, 17, 10, 
+    1, 79, 2, 202, 77, 147, 17, 10, 1, 112, 53, 17, 10, 1, 112, 40, 17, 10, 
+    1, 252, 56, 53, 17, 10, 1, 252, 56, 40, 17, 10, 1, 252, 56, 65, 17, 10, 
+    1, 252, 56, 147, 17, 10, 1, 217, 9, 231, 166, 53, 17, 10, 1, 217, 9, 231, 
+    166, 40, 17, 10, 1, 217, 9, 53, 17, 10, 1, 217, 9, 40, 17, 10, 1, 217, 9, 
+    65, 17, 10, 1, 217, 9, 147, 17, 10, 1, 216, 194, 53, 17, 10, 1, 216, 194, 
+    40, 17, 10, 1, 216, 194, 65, 17, 10, 1, 216, 194, 147, 17, 10, 1, 151, 
+    53, 17, 10, 1, 151, 40, 17, 10, 1, 151, 65, 17, 10, 1, 151, 147, 17, 10, 
+    1, 122, 53, 17, 10, 1, 122, 40, 17, 10, 1, 122, 65, 17, 10, 1, 122, 147, 
+    17, 10, 1, 234, 131, 53, 17, 10, 1, 234, 131, 40, 17, 10, 1, 234, 131, 
+    65, 17, 10, 1, 234, 131, 147, 17, 10, 1, 248, 197, 53, 17, 10, 1, 248, 
+    197, 40, 17, 10, 1, 216, 204, 53, 17, 10, 1, 216, 204, 40, 17, 10, 1, 
+    223, 97, 53, 17, 10, 1, 223, 97, 40, 17, 10, 1, 210, 109, 53, 17, 10, 1, 
+    210, 109, 40, 17, 10, 1, 221, 168, 53, 17, 10, 1, 221, 168, 40, 17, 10, 
+    1, 221, 168, 65, 17, 10, 1, 221, 168, 147, 17, 10, 1, 220, 61, 53, 17, 
+    10, 1, 220, 61, 40, 17, 10, 1, 220, 61, 65, 17, 10, 1, 220, 61, 147, 17, 
+    10, 1, 222, 28, 53, 17, 10, 1, 222, 28, 40, 17, 10, 1, 222, 28, 65, 17, 
+    10, 1, 222, 28, 147, 17, 10, 1, 248, 218, 53, 17, 10, 1, 248, 218, 40, 
+    17, 10, 1, 248, 218, 65, 17, 10, 1, 248, 218, 147, 17, 10, 1, 217, 82, 
+    53, 17, 10, 1, 217, 82, 40, 17, 10, 1, 217, 82, 65, 17, 10, 1, 217, 82, 
+    147, 17, 10, 1, 210, 112, 53, 17, 10, 1, 210, 112, 40, 17, 10, 1, 210, 
+    112, 65, 17, 10, 1, 210, 112, 147, 17, 10, 1, 254, 198, 53, 17, 10, 1, 
+    254, 198, 40, 17, 10, 1, 254, 198, 65, 17, 10, 1, 254, 198, 147, 17, 10, 
+    1, 242, 246, 53, 17, 10, 1, 242, 246, 40, 17, 10, 1, 242, 246, 65, 17, 
+    10, 1, 242, 246, 147, 17, 10, 1, 244, 144, 53, 17, 10, 1, 244, 144, 40, 
+    17, 10, 1, 244, 144, 65, 17, 10, 1, 244, 144, 147, 17, 10, 1, 224, 83, 
+    53, 17, 10, 1, 224, 83, 40, 17, 10, 1, 224, 83, 65, 17, 10, 1, 224, 83, 
+    147, 17, 10, 1, 234, 252, 53, 17, 10, 1, 234, 252, 40, 17, 10, 1, 234, 
+    252, 65, 17, 10, 1, 234, 252, 147, 17, 10, 1, 233, 104, 53, 17, 10, 1, 
+    233, 104, 40, 17, 10, 1, 233, 104, 65, 17, 10, 1, 233, 104, 147, 17, 10, 
+    1, 66, 53, 17, 10, 1, 66, 40, 17, 10, 1, 66, 65, 17, 10, 1, 66, 147, 17, 
+    10, 1, 228, 64, 53, 17, 10, 1, 228, 64, 40, 17, 10, 1, 228, 64, 65, 17, 
+    10, 1, 228, 64, 147, 17, 10, 1, 241, 220, 53, 17, 10, 1, 241, 220, 40, 
+    17, 10, 1, 241, 220, 65, 17, 10, 1, 241, 220, 147, 17, 10, 1, 212, 31, 
+    53, 17, 10, 1, 212, 31, 40, 17, 10, 1, 112, 231, 194, 53, 17, 10, 1, 112, 
+    231, 194, 40, 17, 10, 1, 79, 53, 17, 10, 1, 79, 40, 17, 10, 1, 79, 65, 
+    17, 10, 1, 79, 147, 17, 10, 27, 233, 104, 2, 112, 2, 231, 229, 77, 53, 
+    17, 10, 27, 233, 104, 2, 112, 2, 231, 229, 77, 40, 17, 10, 27, 233, 104, 
+    2, 112, 2, 202, 77, 53, 17, 10, 27, 233, 104, 2, 112, 2, 202, 77, 40, 17, 
+    10, 27, 233, 104, 2, 112, 2, 202, 252, 44, 53, 17, 10, 27, 233, 104, 2, 
+    112, 2, 202, 252, 44, 40, 17, 10, 27, 233, 104, 2, 112, 53, 17, 10, 27, 
+    233, 104, 2, 112, 40, 17, 210, 87, 211, 245, 228, 74, 219, 19, 126, 245, 
+    32, 78, 126, 223, 255, 78, 126, 54, 50, 126, 247, 133, 50, 126, 225, 183, 
+    50, 126, 254, 127, 126, 254, 58, 126, 43, 226, 4, 126, 44, 226, 4, 126, 
+    253, 217, 126, 96, 50, 126, 249, 220, 126, 240, 168, 126, 243, 230, 218, 
+    130, 126, 219, 47, 126, 21, 210, 86, 126, 21, 110, 126, 21, 105, 126, 21, 
+    158, 126, 21, 161, 126, 21, 189, 126, 21, 194, 126, 21, 198, 126, 21, 
+    195, 126, 21, 200, 126, 249, 227, 126, 220, 151, 126, 233, 16, 50, 126, 
+    245, 99, 50, 126, 242, 131, 50, 126, 224, 14, 78, 126, 249, 218, 253, 
+    207, 126, 7, 6, 1, 61, 126, 7, 6, 1, 253, 159, 126, 7, 6, 1, 251, 67, 
+    126, 7, 6, 1, 249, 61, 126, 7, 6, 1, 75, 126, 7, 6, 1, 245, 7, 126, 7, 6, 
+    1, 243, 203, 126, 7, 6, 1, 242, 61, 126, 7, 6, 1, 73, 126, 7, 6, 1, 235, 
+    145, 126, 7, 6, 1, 235, 24, 126, 7, 6, 1, 156, 126, 7, 6, 1, 193, 126, 7, 
+    6, 1, 230, 26, 126, 7, 6, 1, 76, 126, 7, 6, 1, 226, 106, 126, 7, 6, 1, 
+    224, 97, 126, 7, 6, 1, 153, 126, 7, 6, 1, 222, 92, 126, 7, 6, 1, 217, 
+    153, 126, 7, 6, 1, 70, 126, 7, 6, 1, 214, 105, 126, 7, 6, 1, 212, 98, 
+    126, 7, 6, 1, 211, 178, 126, 7, 6, 1, 211, 117, 126, 7, 6, 1, 210, 159, 
+    126, 43, 42, 127, 126, 223, 51, 219, 47, 126, 44, 42, 127, 126, 250, 32, 
+    255, 15, 126, 121, 232, 214, 126, 242, 138, 255, 15, 126, 7, 4, 1, 61, 
+    126, 7, 4, 1, 253, 159, 126, 7, 4, 1, 251, 67, 126, 7, 4, 1, 249, 61, 
+    126, 7, 4, 1, 75, 126, 7, 4, 1, 245, 7, 126, 7, 4, 1, 243, 203, 126, 7, 
+    4, 1, 242, 61, 126, 7, 4, 1, 73, 126, 7, 4, 1, 235, 145, 126, 7, 4, 1, 
+    235, 24, 126, 7, 4, 1, 156, 126, 7, 4, 1, 193, 126, 7, 4, 1, 230, 26, 
+    126, 7, 4, 1, 76, 126, 7, 4, 1, 226, 106, 126, 7, 4, 1, 224, 97, 126, 7, 
+    4, 1, 153, 126, 7, 4, 1, 222, 92, 126, 7, 4, 1, 217, 153, 126, 7, 4, 1, 
+    70, 126, 7, 4, 1, 214, 105, 126, 7, 4, 1, 212, 98, 126, 7, 4, 1, 211, 
+    178, 126, 7, 4, 1, 211, 117, 126, 7, 4, 1, 210, 159, 126, 43, 249, 100, 
+    127, 126, 67, 232, 214, 126, 44, 249, 100, 127, 126, 183, 126, 43, 71, 
+    226, 4, 126, 44, 71, 226, 4, 101, 109, 243, 230, 218, 130, 101, 43, 249, 
+    162, 127, 101, 44, 249, 162, 127, 101, 109, 249, 220, 101, 56, 230, 225, 
+    247, 121, 101, 56, 1, 211, 227, 101, 56, 1, 4, 61, 101, 56, 1, 4, 73, 
+    101, 56, 1, 4, 70, 101, 56, 1, 4, 75, 101, 56, 1, 4, 76, 101, 56, 1, 4, 
+    191, 101, 56, 1, 4, 210, 212, 101, 56, 1, 4, 210, 244, 101, 56, 1, 4, 
+    215, 119, 101, 234, 202, 224, 174, 219, 32, 78, 101, 56, 1, 61, 101, 56, 
+    1, 73, 101, 56, 1, 70, 101, 56, 1, 75, 101, 56, 1, 76, 101, 56, 1, 176, 
+    101, 56, 1, 234, 93, 101, 56, 1, 233, 218, 101, 56, 1, 234, 183, 101, 56, 
+    1, 234, 29, 101, 56, 1, 206, 101, 56, 1, 219, 192, 101, 56, 1, 218, 84, 
+    101, 56, 1, 221, 182, 101, 56, 1, 219, 59, 101, 56, 1, 217, 106, 101, 56, 
+    1, 216, 118, 101, 56, 1, 215, 119, 101, 56, 1, 217, 23, 101, 56, 1, 111, 
+    101, 56, 1, 197, 101, 56, 1, 228, 234, 101, 56, 1, 227, 238, 101, 56, 1, 
+    229, 108, 101, 56, 1, 228, 75, 101, 56, 1, 162, 101, 56, 1, 241, 181, 
+    101, 56, 1, 240, 223, 101, 56, 1, 241, 239, 101, 56, 1, 241, 69, 101, 56, 
+    1, 185, 101, 56, 1, 230, 231, 101, 56, 1, 230, 103, 101, 56, 1, 231, 92, 
+    101, 56, 1, 230, 162, 101, 56, 1, 191, 101, 56, 1, 210, 212, 101, 56, 1, 
+    210, 244, 101, 56, 1, 205, 101, 56, 1, 223, 36, 101, 56, 1, 222, 141, 
+    101, 56, 1, 223, 129, 101, 56, 1, 222, 212, 101, 56, 1, 212, 65, 101, 56, 
+    1, 230, 26, 101, 56, 213, 135, 219, 32, 78, 101, 56, 220, 156, 219, 32, 
+    78, 101, 24, 244, 104, 101, 24, 1, 234, 59, 101, 24, 1, 218, 216, 101, 
+    24, 1, 234, 52, 101, 24, 1, 228, 227, 101, 24, 1, 228, 225, 101, 24, 1, 
+    228, 224, 101, 24, 1, 216, 102, 101, 24, 1, 218, 205, 101, 24, 1, 223, 
+    27, 101, 24, 1, 223, 22, 101, 24, 1, 223, 19, 101, 24, 1, 223, 12, 101, 
+    24, 1, 223, 7, 101, 24, 1, 223, 2, 101, 24, 1, 223, 13, 101, 24, 1, 223, 
+    25, 101, 24, 1, 230, 218, 101, 24, 1, 225, 96, 101, 24, 1, 218, 213, 101, 
+    24, 1, 225, 85, 101, 24, 1, 219, 149, 101, 24, 1, 218, 210, 101, 24, 1, 
+    236, 57, 101, 24, 1, 250, 47, 101, 24, 1, 218, 220, 101, 24, 1, 250, 107, 
+    101, 24, 1, 234, 111, 101, 24, 1, 216, 174, 101, 24, 1, 225, 132, 101, 
+    24, 1, 241, 173, 101, 24, 1, 61, 101, 24, 1, 254, 244, 101, 24, 1, 191, 
+    101, 24, 1, 211, 92, 101, 24, 1, 245, 118, 101, 24, 1, 75, 101, 24, 1, 
+    211, 36, 101, 24, 1, 211, 47, 101, 24, 1, 76, 101, 24, 1, 212, 65, 101, 
+    24, 1, 212, 62, 101, 24, 1, 226, 235, 101, 24, 1, 210, 244, 101, 24, 1, 
+    70, 101, 24, 1, 212, 11, 101, 24, 1, 212, 22, 101, 24, 1, 211, 250, 101, 
+    24, 1, 210, 212, 101, 24, 1, 245, 56, 101, 24, 1, 211, 8, 101, 24, 1, 73, 
+    126, 250, 177, 50, 126, 224, 229, 50, 126, 228, 53, 50, 126, 231, 233, 
+    126, 251, 136, 130, 126, 211, 40, 50, 126, 211, 217, 50, 101, 244, 19, 
+    192, 213, 239, 101, 140, 74, 101, 214, 153, 74, 101, 97, 74, 101, 246, 
+    105, 74, 101, 85, 218, 235, 101, 71, 250, 36, 235, 205, 254, 100, 254, 
+    121, 235, 205, 254, 100, 220, 138, 235, 205, 254, 100, 216, 237, 226, 
+    250, 223, 73, 250, 143, 223, 73, 250, 143, 62, 57, 3, 253, 143, 61, 62, 
+    57, 3, 253, 112, 75, 62, 57, 3, 253, 121, 73, 62, 57, 3, 253, 89, 76, 62, 
+    57, 3, 253, 139, 70, 62, 57, 3, 253, 158, 248, 222, 62, 57, 3, 253, 105, 
+    248, 91, 62, 57, 3, 253, 145, 248, 4, 62, 57, 3, 253, 135, 247, 146, 62, 
+    57, 3, 253, 99, 246, 79, 62, 57, 3, 253, 93, 235, 142, 62, 57, 3, 253, 
+    104, 235, 127, 62, 57, 3, 253, 114, 235, 69, 62, 57, 3, 253, 85, 235, 52, 
+    62, 57, 3, 253, 73, 176, 62, 57, 3, 253, 106, 234, 183, 62, 57, 3, 253, 
+    83, 234, 93, 62, 57, 3, 253, 80, 234, 29, 62, 57, 3, 253, 69, 233, 218, 
+    62, 57, 3, 253, 70, 185, 62, 57, 3, 253, 136, 231, 92, 62, 57, 3, 253, 
+    77, 230, 231, 62, 57, 3, 253, 134, 230, 162, 62, 57, 3, 253, 126, 230, 
+    103, 62, 57, 3, 253, 147, 197, 62, 57, 3, 253, 125, 229, 108, 62, 57, 3, 
+    253, 119, 228, 234, 62, 57, 3, 253, 98, 228, 75, 62, 57, 3, 253, 95, 227, 
+    238, 62, 57, 3, 253, 154, 190, 62, 57, 3, 253, 78, 225, 222, 62, 57, 3, 
+    253, 111, 225, 109, 62, 57, 3, 253, 138, 225, 17, 62, 57, 3, 253, 100, 
+    224, 151, 62, 57, 3, 253, 133, 224, 89, 62, 57, 3, 253, 72, 224, 70, 62, 
+    57, 3, 253, 128, 224, 54, 62, 57, 3, 253, 117, 224, 43, 62, 57, 3, 253, 
+    90, 205, 62, 57, 3, 253, 122, 223, 129, 62, 57, 3, 253, 97, 223, 36, 62, 
+    57, 3, 253, 156, 222, 212, 62, 57, 3, 253, 123, 222, 141, 62, 57, 3, 253, 
+    118, 206, 62, 57, 3, 253, 141, 221, 182, 62, 57, 3, 253, 109, 219, 192, 
+    62, 57, 3, 253, 137, 219, 59, 62, 57, 3, 253, 92, 218, 84, 62, 57, 3, 
+    253, 91, 217, 106, 62, 57, 3, 253, 152, 217, 23, 62, 57, 3, 253, 113, 
+    216, 118, 62, 57, 3, 253, 150, 111, 62, 57, 3, 253, 81, 215, 119, 62, 57, 
+    3, 253, 96, 212, 65, 62, 57, 3, 253, 75, 212, 22, 62, 57, 3, 253, 110, 
+    211, 250, 62, 57, 3, 253, 108, 211, 227, 62, 57, 3, 253, 132, 210, 116, 
+    62, 57, 3, 253, 76, 210, 94, 62, 57, 3, 253, 129, 210, 23, 62, 57, 3, 
+    253, 124, 255, 76, 62, 57, 3, 253, 107, 255, 75, 62, 57, 3, 253, 66, 253, 
+    193, 62, 57, 3, 253, 79, 246, 47, 62, 57, 3, 253, 62, 246, 46, 62, 57, 3, 
+    253, 102, 227, 175, 62, 57, 3, 253, 120, 224, 149, 62, 57, 3, 253, 88, 
+    224, 153, 62, 57, 3, 253, 74, 223, 187, 62, 57, 3, 253, 116, 223, 186, 
+    62, 57, 3, 253, 82, 222, 211, 62, 57, 3, 253, 84, 217, 103, 62, 57, 3, 
+    253, 64, 215, 78, 62, 57, 3, 253, 61, 105, 62, 57, 16, 253, 131, 62, 57, 
+    16, 253, 130, 62, 57, 16, 253, 127, 62, 57, 16, 253, 115, 62, 57, 16, 
+    253, 103, 62, 57, 16, 253, 101, 62, 57, 16, 253, 94, 62, 57, 16, 253, 87, 
+    62, 57, 16, 253, 86, 62, 57, 16, 253, 71, 62, 57, 16, 253, 68, 62, 57, 
+    16, 253, 67, 62, 57, 16, 253, 65, 62, 57, 16, 253, 63, 62, 57, 106, 253, 
+    60, 231, 186, 62, 57, 106, 253, 59, 211, 221, 62, 57, 106, 253, 58, 248, 
+    75, 62, 57, 106, 253, 57, 245, 96, 62, 57, 106, 253, 56, 231, 160, 62, 
+    57, 106, 253, 55, 218, 163, 62, 57, 106, 253, 54, 245, 38, 62, 57, 106, 
+    253, 53, 223, 154, 62, 57, 106, 253, 52, 220, 63, 62, 57, 106, 253, 51, 
+    241, 238, 62, 57, 106, 253, 50, 219, 26, 62, 57, 106, 253, 49, 251, 204, 
+    62, 57, 106, 253, 48, 249, 146, 62, 57, 106, 253, 47, 251, 116, 62, 57, 
+    106, 253, 46, 212, 2, 62, 57, 106, 253, 45, 252, 137, 62, 57, 106, 253, 
+    44, 226, 206, 62, 57, 106, 253, 43, 218, 255, 62, 57, 106, 253, 42, 249, 
+    69, 62, 57, 230, 143, 253, 41, 234, 225, 62, 57, 230, 143, 253, 40, 234, 
+    233, 62, 57, 106, 253, 39, 226, 219, 62, 57, 106, 253, 38, 211, 236, 62, 
+    57, 106, 253, 37, 62, 57, 230, 143, 253, 36, 254, 18, 62, 57, 230, 143, 
+    253, 35, 231, 53, 62, 57, 106, 253, 34, 251, 135, 62, 57, 106, 253, 33, 
+    242, 167, 62, 57, 106, 253, 32, 62, 57, 106, 253, 31, 211, 212, 62, 57, 
+    106, 253, 30, 62, 57, 106, 253, 29, 62, 57, 106, 253, 28, 240, 249, 62, 
+    57, 106, 253, 27, 62, 57, 106, 253, 26, 62, 57, 106, 253, 25, 62, 57, 
+    230, 143, 253, 23, 215, 92, 62, 57, 106, 253, 22, 62, 57, 106, 253, 21, 
+    62, 57, 106, 253, 20, 249, 251, 62, 57, 106, 253, 19, 62, 57, 106, 253, 
+    18, 62, 57, 106, 253, 17, 243, 94, 62, 57, 106, 253, 16, 254, 5, 62, 57, 
+    106, 253, 15, 62, 57, 106, 253, 14, 62, 57, 106, 253, 13, 62, 57, 106, 
+    253, 12, 62, 57, 106, 253, 11, 62, 57, 106, 253, 10, 62, 57, 106, 253, 9, 
+    62, 57, 106, 253, 8, 62, 57, 106, 253, 7, 62, 57, 106, 253, 6, 230, 135, 
+    62, 57, 106, 253, 5, 62, 57, 106, 253, 4, 215, 236, 62, 57, 106, 253, 3, 
+    62, 57, 106, 253, 2, 62, 57, 106, 253, 1, 62, 57, 106, 253, 0, 62, 57, 
+    106, 252, 255, 62, 57, 106, 252, 254, 62, 57, 106, 252, 253, 62, 57, 106, 
+    252, 252, 62, 57, 106, 252, 251, 62, 57, 106, 252, 250, 62, 57, 106, 252, 
+    249, 62, 57, 106, 252, 248, 241, 212, 62, 57, 106, 252, 227, 244, 29, 62, 
+    57, 106, 252, 224, 252, 117, 62, 57, 106, 252, 219, 219, 6, 62, 57, 106, 
+    252, 218, 74, 62, 57, 106, 252, 217, 62, 57, 106, 252, 216, 217, 237, 62, 
+    57, 106, 252, 215, 62, 57, 106, 252, 214, 62, 57, 106, 252, 213, 211, 
+    254, 250, 140, 62, 57, 106, 252, 212, 250, 140, 62, 57, 106, 252, 211, 
+    250, 141, 244, 0, 62, 57, 106, 252, 210, 212, 0, 62, 57, 106, 252, 209, 
+    62, 57, 106, 252, 208, 62, 57, 230, 143, 252, 207, 247, 199, 62, 57, 106, 
+    252, 206, 62, 57, 106, 252, 205, 62, 57, 106, 252, 203, 62, 57, 106, 252, 
+    202, 62, 57, 106, 252, 201, 62, 57, 106, 252, 200, 248, 160, 62, 57, 106, 
+    252, 199, 62, 57, 106, 252, 198, 62, 57, 106, 252, 197, 62, 57, 106, 252, 
+    196, 62, 57, 106, 252, 195, 62, 57, 106, 213, 186, 253, 24, 62, 57, 106, 
+    213, 186, 252, 247, 62, 57, 106, 213, 186, 252, 246, 62, 57, 106, 213, 
+    186, 252, 245, 62, 57, 106, 213, 186, 252, 244, 62, 57, 106, 213, 186, 
+    252, 243, 62, 57, 106, 213, 186, 252, 242, 62, 57, 106, 213, 186, 252, 
+    241, 62, 57, 106, 213, 186, 252, 240, 62, 57, 106, 213, 186, 252, 239, 
+    62, 57, 106, 213, 186, 252, 238, 62, 57, 106, 213, 186, 252, 237, 62, 57, 
+    106, 213, 186, 252, 236, 62, 57, 106, 213, 186, 252, 235, 62, 57, 106, 
+    213, 186, 252, 234, 62, 57, 106, 213, 186, 252, 233, 62, 57, 106, 213, 
+    186, 252, 232, 62, 57, 106, 213, 186, 252, 231, 62, 57, 106, 213, 186, 
+    252, 230, 62, 57, 106, 213, 186, 252, 229, 62, 57, 106, 213, 186, 252, 
+    228, 62, 57, 106, 213, 186, 252, 226, 62, 57, 106, 213, 186, 252, 225, 
+    62, 57, 106, 213, 186, 252, 223, 62, 57, 106, 213, 186, 252, 222, 62, 57, 
+    106, 213, 186, 252, 221, 62, 57, 106, 213, 186, 252, 220, 62, 57, 106, 
+    213, 186, 252, 204, 62, 57, 106, 213, 186, 252, 194, 254, 237, 211, 209, 
+    220, 139, 232, 214, 254, 237, 211, 209, 220, 139, 247, 121, 254, 237, 
+    250, 131, 78, 254, 237, 54, 110, 254, 237, 54, 105, 254, 237, 54, 158, 
+    254, 237, 54, 161, 254, 237, 54, 189, 254, 237, 54, 194, 254, 237, 54, 
+    198, 254, 237, 54, 195, 254, 237, 54, 200, 254, 237, 54, 216, 248, 254, 
+    237, 54, 215, 73, 254, 237, 54, 216, 163, 254, 237, 54, 244, 16, 254, 
+    237, 54, 244, 115, 254, 237, 54, 219, 112, 254, 237, 54, 220, 117, 254, 
+    237, 54, 245, 185, 254, 237, 54, 228, 196, 254, 237, 54, 123, 240, 211, 
+    254, 237, 54, 113, 240, 211, 254, 237, 54, 134, 240, 211, 254, 237, 54, 
+    244, 12, 240, 211, 254, 237, 54, 244, 82, 240, 211, 254, 237, 54, 219, 
+    126, 240, 211, 254, 237, 54, 220, 123, 240, 211, 254, 237, 54, 245, 194, 
+    240, 211, 254, 237, 54, 228, 201, 240, 211, 254, 237, 54, 123, 216, 148, 
+    254, 237, 54, 113, 216, 148, 254, 237, 54, 134, 216, 148, 254, 237, 54, 
+    244, 12, 216, 148, 254, 237, 54, 244, 82, 216, 148, 254, 237, 54, 219, 
+    126, 216, 148, 254, 237, 54, 220, 123, 216, 148, 254, 237, 54, 245, 194, 
+    216, 148, 254, 237, 54, 228, 201, 216, 148, 254, 237, 54, 216, 249, 216, 
+    148, 254, 237, 54, 215, 74, 216, 148, 254, 237, 54, 216, 164, 216, 148, 
+    254, 237, 54, 244, 17, 216, 148, 254, 237, 54, 244, 116, 216, 148, 254, 
+    237, 54, 219, 113, 216, 148, 254, 237, 54, 220, 118, 216, 148, 254, 237, 
+    54, 245, 186, 216, 148, 254, 237, 54, 228, 197, 216, 148, 254, 237, 212, 
+    14, 252, 129, 214, 173, 254, 237, 212, 14, 244, 93, 218, 60, 254, 237, 
+    212, 14, 221, 177, 218, 60, 254, 237, 212, 14, 216, 170, 218, 60, 254, 
+    237, 212, 14, 244, 5, 218, 60, 254, 237, 246, 82, 231, 91, 244, 93, 218, 
+    60, 254, 237, 232, 200, 231, 91, 244, 93, 218, 60, 254, 237, 231, 91, 
+    221, 177, 218, 60, 254, 237, 231, 91, 216, 170, 218, 60, 26, 255, 7, 253, 
+    195, 123, 224, 22, 26, 255, 7, 253, 195, 123, 242, 28, 26, 255, 7, 253, 
+    195, 123, 246, 101, 26, 255, 7, 253, 195, 189, 26, 255, 7, 253, 195, 244, 
+    115, 26, 255, 7, 253, 195, 244, 82, 240, 211, 26, 255, 7, 253, 195, 244, 
+    82, 216, 148, 26, 255, 7, 253, 195, 244, 116, 216, 148, 26, 255, 7, 253, 
+    195, 244, 82, 217, 68, 26, 255, 7, 253, 195, 216, 249, 217, 68, 26, 255, 
+    7, 253, 195, 244, 116, 217, 68, 26, 255, 7, 253, 195, 123, 240, 212, 217, 
+    68, 26, 255, 7, 253, 195, 244, 82, 240, 212, 217, 68, 26, 255, 7, 253, 
+    195, 123, 216, 149, 217, 68, 26, 255, 7, 253, 195, 244, 82, 216, 149, 
+    217, 68, 26, 255, 7, 253, 195, 244, 82, 218, 151, 26, 255, 7, 253, 195, 
+    216, 249, 218, 151, 26, 255, 7, 253, 195, 244, 116, 218, 151, 26, 255, 7, 
+    253, 195, 123, 240, 212, 218, 151, 26, 255, 7, 253, 195, 244, 82, 240, 
+    212, 218, 151, 26, 255, 7, 253, 195, 123, 216, 149, 218, 151, 26, 255, 7, 
+    253, 195, 216, 249, 216, 149, 218, 151, 26, 255, 7, 253, 195, 244, 116, 
+    216, 149, 218, 151, 26, 255, 7, 253, 195, 216, 249, 230, 165, 26, 255, 7, 
+    241, 206, 123, 225, 32, 26, 255, 7, 216, 182, 110, 26, 255, 7, 241, 202, 
+    110, 26, 255, 7, 245, 105, 105, 26, 255, 7, 216, 182, 105, 26, 255, 7, 
+    249, 66, 113, 246, 100, 26, 255, 7, 245, 105, 113, 246, 100, 26, 255, 7, 
+    215, 204, 189, 26, 255, 7, 215, 204, 216, 248, 26, 255, 7, 215, 204, 216, 
+    249, 254, 142, 17, 26, 255, 7, 241, 202, 216, 248, 26, 255, 7, 231, 42, 
+    216, 248, 26, 255, 7, 216, 182, 216, 248, 26, 255, 7, 216, 182, 216, 163, 
+    26, 255, 7, 215, 204, 244, 115, 26, 255, 7, 215, 204, 244, 116, 254, 142, 
+    17, 26, 255, 7, 241, 202, 244, 115, 26, 255, 7, 216, 182, 244, 115, 26, 
+    255, 7, 216, 182, 123, 240, 211, 26, 255, 7, 216, 182, 134, 240, 211, 26, 
+    255, 7, 245, 105, 244, 82, 240, 211, 26, 255, 7, 215, 204, 244, 82, 240, 
+    211, 26, 255, 7, 216, 182, 244, 82, 240, 211, 26, 255, 7, 250, 228, 244, 
+    82, 240, 211, 26, 255, 7, 229, 183, 244, 82, 240, 211, 26, 255, 7, 216, 
+    182, 123, 216, 148, 26, 255, 7, 216, 182, 244, 82, 216, 148, 26, 255, 7, 
+    248, 58, 244, 82, 230, 165, 26, 255, 7, 218, 119, 244, 116, 230, 165, 26, 
+    123, 163, 50, 26, 123, 163, 5, 254, 142, 17, 26, 113, 216, 168, 50, 26, 
+    134, 224, 21, 50, 26, 211, 45, 50, 26, 217, 69, 50, 26, 246, 102, 50, 26, 
+    226, 247, 50, 26, 113, 226, 246, 50, 26, 134, 226, 246, 50, 26, 244, 12, 
+    226, 246, 50, 26, 244, 82, 226, 246, 50, 26, 231, 36, 50, 26, 233, 158, 
+    252, 129, 50, 26, 232, 195, 50, 26, 226, 132, 50, 26, 211, 159, 50, 26, 
+    253, 244, 50, 26, 254, 1, 50, 26, 242, 145, 50, 26, 215, 187, 252, 129, 
+    50, 26, 210, 87, 50, 222, 199, 220, 114, 50, 222, 199, 214, 185, 50, 222, 
+    199, 220, 143, 50, 222, 199, 220, 112, 50, 222, 199, 247, 214, 220, 112, 
+    50, 222, 199, 219, 169, 50, 222, 199, 248, 54, 50, 222, 199, 224, 7, 50, 
+    222, 199, 220, 130, 50, 222, 199, 246, 61, 50, 222, 199, 253, 239, 50, 
+    222, 199, 250, 172, 50, 225, 144, 247, 192, 5, 225, 214, 225, 144, 247, 
+    192, 5, 225, 25, 241, 236, 225, 144, 247, 192, 5, 217, 46, 241, 236, 225, 
+    144, 247, 192, 5, 250, 248, 225, 144, 247, 192, 5, 250, 102, 225, 144, 
+    247, 192, 5, 211, 221, 225, 144, 247, 192, 5, 241, 212, 225, 144, 247, 
+    192, 5, 243, 86, 225, 144, 247, 192, 5, 216, 117, 225, 144, 247, 192, 5, 
+    74, 225, 144, 247, 192, 5, 251, 170, 225, 144, 247, 192, 5, 220, 30, 225, 
+    144, 247, 192, 5, 249, 245, 225, 144, 247, 192, 5, 231, 185, 225, 144, 
+    247, 192, 5, 231, 137, 225, 144, 247, 192, 5, 221, 217, 225, 144, 247, 
+    192, 5, 232, 238, 225, 144, 247, 192, 5, 251, 189, 225, 144, 247, 192, 5, 
+    250, 232, 225, 36, 225, 144, 247, 192, 5, 247, 134, 225, 144, 247, 192, 
+    5, 249, 224, 225, 144, 247, 192, 5, 219, 88, 225, 144, 247, 192, 5, 249, 
+    225, 225, 144, 247, 192, 5, 252, 64, 225, 144, 247, 192, 5, 220, 17, 225, 
+    144, 247, 192, 5, 240, 249, 225, 144, 247, 192, 5, 241, 179, 225, 144, 
+    247, 192, 5, 251, 113, 233, 37, 225, 144, 247, 192, 5, 250, 225, 225, 
+    144, 247, 192, 5, 223, 154, 225, 144, 247, 192, 5, 245, 231, 225, 144, 
+    247, 192, 5, 246, 108, 225, 144, 247, 192, 5, 215, 106, 225, 144, 247, 
+    192, 5, 252, 67, 225, 144, 247, 192, 5, 225, 37, 215, 236, 225, 144, 247, 
+    192, 5, 213, 159, 225, 144, 247, 192, 5, 226, 19, 225, 144, 247, 192, 5, 
+    222, 191, 225, 144, 247, 192, 5, 232, 225, 225, 144, 247, 192, 5, 226, 
+    116, 252, 185, 225, 144, 247, 192, 5, 244, 49, 225, 144, 247, 192, 5, 
+    242, 139, 225, 144, 247, 192, 5, 218, 120, 225, 144, 247, 192, 5, 4, 253, 
+    169, 225, 144, 247, 192, 5, 212, 32, 252, 149, 225, 144, 247, 192, 5, 38, 
+    226, 249, 91, 232, 61, 1, 61, 232, 61, 1, 75, 232, 61, 1, 253, 159, 232, 
+    61, 1, 252, 20, 232, 61, 1, 243, 203, 232, 61, 1, 249, 61, 232, 61, 1, 
+    73, 232, 61, 1, 212, 98, 232, 61, 1, 210, 159, 232, 61, 1, 216, 211, 232, 
+    61, 1, 235, 145, 232, 61, 1, 235, 24, 232, 61, 1, 224, 97, 232, 61, 1, 
+    156, 232, 61, 1, 193, 232, 61, 1, 230, 26, 232, 61, 1, 230, 167, 232, 61, 
+    1, 228, 112, 232, 61, 1, 70, 232, 61, 1, 226, 106, 232, 61, 1, 234, 48, 
+    232, 61, 1, 153, 232, 61, 1, 222, 92, 232, 61, 1, 217, 153, 232, 61, 1, 
+    215, 160, 232, 61, 1, 254, 124, 232, 61, 1, 245, 151, 232, 61, 1, 242, 
+    61, 232, 61, 1, 211, 178, 250, 238, 1, 61, 250, 238, 1, 226, 92, 250, 
+    238, 1, 249, 61, 250, 238, 1, 156, 250, 238, 1, 214, 116, 250, 238, 1, 
+    153, 250, 238, 1, 233, 63, 250, 238, 1, 255, 76, 250, 238, 1, 224, 97, 
+    250, 238, 1, 253, 159, 250, 238, 1, 193, 250, 238, 1, 76, 250, 238, 1, 
+    248, 224, 250, 238, 1, 217, 153, 250, 238, 1, 220, 105, 250, 238, 1, 220, 
+    104, 250, 238, 1, 222, 92, 250, 238, 1, 251, 66, 250, 238, 1, 70, 250, 
+    238, 1, 228, 112, 250, 238, 1, 211, 178, 250, 238, 1, 230, 26, 250, 238, 
+    1, 215, 159, 250, 238, 1, 226, 106, 250, 238, 1, 218, 227, 250, 238, 1, 
+    73, 250, 238, 1, 75, 250, 238, 1, 214, 113, 250, 238, 1, 235, 24, 250, 
+    238, 1, 235, 15, 250, 238, 1, 229, 151, 250, 238, 1, 214, 118, 250, 238, 
+    1, 243, 203, 250, 238, 1, 243, 138, 250, 238, 1, 218, 169, 250, 238, 1, 
+    218, 168, 250, 238, 1, 229, 80, 250, 238, 1, 236, 34, 250, 238, 1, 251, 
+    65, 250, 238, 1, 215, 160, 250, 238, 1, 214, 115, 250, 238, 1, 222, 181, 
+    250, 238, 1, 231, 130, 250, 238, 1, 231, 129, 250, 238, 1, 231, 128, 250, 
+    238, 1, 231, 127, 250, 238, 1, 233, 62, 250, 238, 1, 245, 235, 250, 238, 
+    1, 214, 114, 55, 32, 1, 61, 55, 32, 1, 252, 76, 55, 32, 1, 234, 183, 55, 
+    32, 1, 248, 91, 55, 32, 1, 75, 55, 32, 1, 213, 255, 55, 32, 1, 210, 94, 
+    55, 32, 1, 241, 239, 55, 32, 1, 216, 196, 55, 32, 1, 73, 55, 32, 1, 176, 
+    55, 32, 1, 245, 175, 55, 32, 1, 245, 160, 55, 32, 1, 245, 151, 55, 32, 1, 
+    245, 76, 55, 32, 1, 76, 55, 32, 1, 225, 222, 55, 32, 1, 220, 64, 55, 32, 
+    1, 233, 218, 55, 32, 1, 245, 93, 55, 32, 1, 245, 83, 55, 32, 1, 217, 23, 
+    55, 32, 1, 70, 55, 32, 1, 245, 178, 55, 32, 1, 225, 137, 55, 32, 1, 234, 
+    120, 55, 32, 1, 245, 203, 55, 32, 1, 245, 85, 55, 32, 1, 250, 132, 55, 
+    32, 1, 236, 34, 55, 32, 1, 214, 118, 55, 32, 227, 199, 110, 55, 32, 227, 
+    199, 189, 55, 32, 227, 199, 216, 248, 55, 32, 227, 199, 244, 115, 242, 
+    154, 1, 254, 205, 242, 154, 1, 252, 164, 242, 154, 1, 242, 212, 242, 154, 
+    1, 248, 205, 242, 154, 1, 254, 201, 242, 154, 1, 224, 80, 242, 154, 1, 
+    235, 156, 242, 154, 1, 242, 40, 242, 154, 1, 216, 159, 242, 154, 1, 245, 
+    184, 242, 154, 1, 233, 191, 242, 154, 1, 233, 114, 242, 154, 1, 231, 180, 
+    242, 154, 1, 229, 185, 242, 154, 1, 235, 120, 242, 154, 1, 214, 136, 242, 
+    154, 1, 226, 70, 242, 154, 1, 228, 196, 242, 154, 1, 223, 166, 242, 154, 
+    1, 221, 219, 242, 154, 1, 217, 5, 242, 154, 1, 211, 234, 242, 154, 1, 
+    244, 179, 242, 154, 1, 236, 38, 242, 154, 1, 240, 200, 242, 154, 1, 226, 
+    140, 242, 154, 1, 228, 201, 240, 211, 214, 209, 1, 254, 148, 214, 209, 1, 
+    252, 27, 214, 209, 1, 243, 109, 214, 209, 1, 234, 133, 214, 209, 1, 248, 
+    55, 214, 209, 1, 241, 69, 214, 209, 1, 211, 227, 214, 209, 1, 210, 85, 
+    214, 209, 1, 240, 242, 214, 209, 1, 216, 231, 214, 209, 1, 210, 233, 214, 
+    209, 1, 234, 251, 214, 209, 1, 220, 21, 214, 209, 1, 233, 99, 214, 209, 
+    1, 231, 66, 214, 209, 1, 248, 22, 214, 209, 1, 227, 195, 214, 209, 1, 
+    210, 13, 214, 209, 1, 221, 249, 214, 209, 1, 254, 197, 214, 209, 1, 224, 
+    151, 214, 209, 1, 222, 26, 214, 209, 1, 224, 36, 214, 209, 1, 223, 145, 
+    214, 209, 1, 216, 200, 214, 209, 1, 242, 245, 214, 209, 1, 111, 214, 209, 
+    1, 73, 214, 209, 1, 70, 214, 209, 1, 218, 180, 214, 209, 211, 209, 247, 
+    173, 55, 225, 170, 5, 61, 55, 225, 170, 5, 73, 55, 225, 170, 5, 70, 55, 
+    225, 170, 5, 176, 55, 225, 170, 5, 233, 218, 55, 225, 170, 5, 243, 136, 
+    55, 225, 170, 5, 242, 114, 55, 225, 170, 5, 211, 165, 55, 225, 170, 5, 
+    251, 34, 55, 225, 170, 5, 235, 142, 55, 225, 170, 5, 235, 109, 55, 225, 
+    170, 5, 217, 106, 55, 225, 170, 5, 215, 119, 55, 225, 170, 5, 248, 222, 
+    55, 225, 170, 5, 248, 4, 55, 225, 170, 5, 246, 79, 55, 225, 170, 5, 216, 
+    209, 55, 225, 170, 5, 190, 55, 225, 170, 5, 252, 192, 55, 225, 170, 5, 
+    244, 197, 55, 225, 170, 5, 197, 55, 225, 170, 5, 227, 238, 55, 225, 170, 
+    5, 185, 55, 225, 170, 5, 230, 231, 55, 225, 170, 5, 230, 103, 55, 225, 
+    170, 5, 191, 55, 225, 170, 5, 214, 27, 55, 225, 170, 5, 213, 176, 55, 
+    225, 170, 5, 205, 55, 225, 170, 5, 222, 141, 55, 225, 170, 5, 233, 136, 
+    55, 225, 170, 5, 206, 55, 225, 170, 5, 210, 116, 55, 225, 170, 5, 220, 
+    103, 55, 225, 170, 5, 218, 224, 55, 225, 170, 5, 162, 55, 225, 170, 5, 
+    253, 187, 55, 225, 170, 5, 253, 186, 55, 225, 170, 5, 253, 185, 55, 225, 
+    170, 5, 211, 142, 55, 225, 170, 5, 248, 201, 55, 225, 170, 5, 248, 200, 
+    55, 225, 170, 5, 252, 171, 55, 225, 170, 5, 251, 86, 55, 225, 170, 211, 
+    209, 247, 173, 55, 225, 170, 54, 110, 55, 225, 170, 54, 105, 55, 225, 
+    170, 54, 216, 248, 55, 225, 170, 54, 215, 73, 55, 225, 170, 54, 240, 211, 
     181, 6, 1, 199, 73, 181, 6, 1, 199, 75, 181, 6, 1, 199, 61, 181, 6, 1, 
-    199, 254, 209, 181, 6, 1, 199, 76, 181, 6, 1, 199, 226, 183, 181, 6, 1, 
-    219, 251, 73, 181, 6, 1, 219, 251, 75, 181, 6, 1, 219, 251, 61, 181, 6, 
-    1, 219, 251, 254, 209, 181, 6, 1, 219, 251, 76, 181, 6, 1, 219, 251, 226, 
-    183, 181, 6, 1, 253, 167, 181, 6, 1, 226, 116, 181, 6, 1, 211, 195, 181, 
-    6, 1, 211, 44, 181, 6, 1, 242, 60, 181, 6, 1, 225, 211, 181, 6, 1, 252, 
-    66, 181, 6, 1, 217, 11, 181, 6, 1, 248, 77, 181, 6, 1, 250, 128, 181, 6, 
-    1, 235, 124, 181, 6, 1, 234, 189, 181, 6, 1, 243, 83, 181, 6, 1, 245, 
-    202, 181, 6, 1, 213, 250, 181, 6, 1, 245, 59, 181, 6, 1, 216, 194, 181, 
-    6, 1, 245, 82, 181, 6, 1, 210, 92, 181, 6, 1, 245, 75, 181, 6, 1, 210, 
-    73, 181, 6, 1, 245, 92, 181, 6, 1, 245, 174, 181, 6, 1, 245, 159, 181, 6, 
-    1, 245, 150, 181, 6, 1, 245, 138, 181, 6, 1, 226, 219, 181, 6, 1, 245, 
-    38, 181, 4, 1, 199, 73, 181, 4, 1, 199, 75, 181, 4, 1, 199, 61, 181, 4, 
-    1, 199, 254, 209, 181, 4, 1, 199, 76, 181, 4, 1, 199, 226, 183, 181, 4, 
-    1, 219, 251, 73, 181, 4, 1, 219, 251, 75, 181, 4, 1, 219, 251, 61, 181, 
-    4, 1, 219, 251, 254, 209, 181, 4, 1, 219, 251, 76, 181, 4, 1, 219, 251, 
-    226, 183, 181, 4, 1, 253, 167, 181, 4, 1, 226, 116, 181, 4, 1, 211, 195, 
-    181, 4, 1, 211, 44, 181, 4, 1, 242, 60, 181, 4, 1, 225, 211, 181, 4, 1, 
-    252, 66, 181, 4, 1, 217, 11, 181, 4, 1, 248, 77, 181, 4, 1, 250, 128, 
-    181, 4, 1, 235, 124, 181, 4, 1, 234, 189, 181, 4, 1, 243, 83, 181, 4, 1, 
-    245, 202, 181, 4, 1, 213, 250, 181, 4, 1, 245, 59, 181, 4, 1, 216, 194, 
-    181, 4, 1, 245, 82, 181, 4, 1, 210, 92, 181, 4, 1, 245, 75, 181, 4, 1, 
-    210, 73, 181, 4, 1, 245, 92, 181, 4, 1, 245, 174, 181, 4, 1, 245, 159, 
-    181, 4, 1, 245, 150, 181, 4, 1, 245, 138, 181, 4, 1, 226, 219, 181, 4, 1, 
-    245, 38, 220, 69, 1, 225, 209, 220, 69, 1, 216, 5, 220, 69, 1, 234, 91, 
-    220, 69, 1, 244, 147, 220, 69, 1, 216, 172, 220, 69, 1, 219, 58, 220, 69, 
-    1, 218, 14, 220, 69, 1, 250, 61, 220, 69, 1, 211, 46, 220, 69, 1, 240, 
-    209, 220, 69, 1, 252, 5, 220, 69, 1, 248, 89, 220, 69, 1, 243, 121, 220, 
-    69, 1, 213, 123, 220, 69, 1, 216, 176, 220, 69, 1, 210, 21, 220, 69, 1, 
-    231, 89, 220, 69, 1, 235, 49, 220, 69, 1, 211, 225, 220, 69, 1, 242, 48, 
-    220, 69, 1, 232, 142, 220, 69, 1, 230, 189, 220, 69, 1, 236, 40, 220, 69, 
-    1, 245, 201, 220, 69, 1, 253, 231, 220, 69, 1, 254, 247, 220, 69, 1, 226, 
-    196, 220, 69, 1, 211, 212, 220, 69, 1, 226, 130, 220, 69, 1, 254, 209, 
-    220, 69, 1, 222, 208, 220, 69, 1, 227, 194, 220, 69, 1, 245, 217, 220, 
-    69, 1, 254, 214, 220, 69, 1, 240, 111, 220, 69, 1, 214, 163, 220, 69, 1, 
-    226, 254, 220, 69, 1, 226, 176, 220, 69, 1, 226, 218, 220, 69, 1, 253, 
-    170, 220, 69, 1, 254, 19, 220, 69, 1, 226, 158, 220, 69, 1, 254, 192, 
-    220, 69, 1, 245, 86, 220, 69, 1, 253, 253, 220, 69, 1, 245, 227, 220, 69, 
-    1, 240, 118, 220, 69, 1, 211, 13, 226, 141, 1, 254, 170, 226, 141, 1, 
-    252, 191, 226, 141, 1, 217, 105, 226, 141, 1, 235, 141, 226, 141, 1, 211, 
-    165, 226, 141, 1, 234, 132, 226, 141, 1, 248, 76, 226, 141, 1, 205, 226, 
-    141, 1, 206, 226, 141, 1, 220, 26, 226, 141, 1, 248, 25, 226, 141, 1, 
-    250, 215, 226, 141, 1, 243, 135, 226, 141, 1, 244, 196, 226, 141, 1, 224, 
-    86, 226, 141, 1, 235, 9, 226, 141, 1, 233, 130, 226, 141, 1, 230, 200, 
-    226, 141, 1, 227, 178, 226, 141, 1, 212, 30, 226, 141, 1, 162, 226, 141, 
-    1, 191, 226, 141, 1, 61, 226, 141, 1, 75, 226, 141, 1, 73, 226, 141, 1, 
-    76, 226, 141, 1, 70, 226, 141, 1, 255, 73, 226, 141, 1, 245, 209, 226, 
-    141, 1, 226, 183, 226, 141, 21, 210, 86, 226, 141, 21, 110, 226, 141, 21, 
-    105, 226, 141, 21, 158, 226, 141, 21, 161, 226, 141, 21, 189, 226, 141, 
-    21, 194, 226, 141, 21, 198, 226, 141, 21, 195, 226, 141, 21, 200, 249, 
-    67, 3, 61, 249, 67, 3, 75, 249, 67, 3, 73, 249, 67, 3, 76, 249, 67, 3, 
-    70, 249, 67, 3, 235, 141, 249, 67, 3, 235, 68, 249, 67, 3, 176, 249, 67, 
-    3, 234, 182, 249, 67, 3, 234, 92, 249, 67, 3, 234, 28, 249, 67, 3, 233, 
-    217, 249, 67, 3, 233, 135, 249, 67, 3, 233, 58, 249, 67, 3, 232, 241, 
-    249, 67, 3, 232, 156, 249, 67, 3, 232, 98, 249, 67, 3, 184, 249, 67, 3, 
-    231, 91, 249, 67, 3, 230, 230, 249, 67, 3, 230, 161, 249, 67, 3, 230, 
-    102, 249, 67, 3, 197, 249, 67, 3, 229, 107, 249, 67, 3, 228, 233, 249, 
-    67, 3, 228, 74, 249, 67, 3, 227, 237, 249, 67, 3, 190, 249, 67, 3, 225, 
-    221, 249, 67, 3, 225, 108, 249, 67, 3, 225, 16, 249, 67, 3, 224, 150, 
-    249, 67, 3, 205, 249, 67, 3, 223, 128, 249, 67, 3, 223, 35, 249, 67, 3, 
-    222, 211, 249, 67, 3, 222, 140, 249, 67, 3, 206, 249, 67, 3, 221, 181, 
-    249, 67, 3, 219, 191, 249, 67, 3, 219, 58, 249, 67, 3, 218, 83, 249, 67, 
-    3, 217, 105, 249, 67, 3, 217, 22, 249, 67, 3, 216, 117, 249, 67, 3, 111, 
-    249, 67, 3, 215, 118, 249, 67, 3, 212, 65, 249, 67, 3, 212, 22, 249, 67, 
-    3, 211, 250, 249, 67, 3, 211, 227, 249, 67, 3, 211, 165, 249, 67, 3, 211, 
-    162, 249, 67, 3, 210, 116, 249, 67, 3, 210, 23, 236, 1, 254, 27, 1, 254, 
-    168, 236, 1, 254, 27, 1, 252, 25, 236, 1, 254, 27, 1, 242, 201, 236, 1, 
-    254, 27, 1, 248, 188, 236, 1, 254, 27, 1, 241, 238, 236, 1, 254, 27, 1, 
-    212, 30, 236, 1, 254, 27, 1, 210, 97, 236, 1, 254, 27, 1, 241, 195, 236, 
-    1, 254, 27, 1, 216, 226, 236, 1, 254, 27, 1, 210, 232, 236, 1, 254, 27, 
-    1, 234, 225, 236, 1, 254, 27, 1, 233, 93, 236, 1, 254, 27, 1, 231, 65, 
-    236, 1, 254, 27, 1, 227, 194, 236, 1, 254, 27, 1, 221, 249, 236, 1, 254, 
-    27, 1, 253, 162, 236, 1, 254, 27, 1, 225, 221, 236, 1, 254, 27, 1, 222, 
-    24, 236, 1, 254, 27, 1, 224, 34, 236, 1, 254, 27, 1, 223, 67, 236, 1, 
-    254, 27, 1, 220, 20, 236, 1, 254, 27, 1, 217, 36, 236, 1, 254, 27, 221, 
-    173, 50, 236, 1, 254, 27, 54, 110, 236, 1, 254, 27, 54, 105, 236, 1, 254, 
-    27, 54, 158, 236, 1, 254, 27, 54, 216, 247, 236, 1, 254, 27, 54, 215, 73, 
-    236, 1, 254, 27, 54, 123, 240, 210, 236, 1, 254, 27, 54, 123, 216, 147, 
-    236, 1, 254, 27, 54, 216, 248, 216, 147, 225, 119, 1, 254, 165, 225, 119, 
-    1, 252, 28, 225, 119, 1, 243, 109, 225, 119, 1, 248, 56, 225, 119, 1, 
-    241, 238, 225, 119, 1, 212, 37, 225, 119, 1, 210, 110, 225, 119, 1, 241, 
-    197, 225, 119, 1, 216, 230, 225, 119, 1, 210, 233, 225, 119, 1, 234, 250, 
-    225, 119, 1, 233, 99, 225, 119, 1, 231, 65, 225, 119, 1, 227, 194, 225, 
-    119, 1, 220, 144, 225, 119, 1, 254, 196, 225, 119, 1, 225, 221, 225, 119, 
-    1, 222, 25, 225, 119, 1, 224, 39, 225, 119, 1, 222, 189, 225, 119, 1, 
-    220, 20, 225, 119, 1, 217, 41, 225, 119, 54, 110, 225, 119, 54, 216, 247, 
-    225, 119, 54, 215, 73, 225, 119, 54, 123, 240, 210, 225, 119, 54, 105, 
-    225, 119, 54, 158, 225, 119, 211, 209, 220, 137, 232, 59, 1, 61, 232, 59, 
-    1, 253, 158, 232, 59, 1, 243, 202, 232, 59, 1, 249, 60, 232, 59, 1, 75, 
-    232, 59, 1, 214, 105, 232, 59, 1, 73, 232, 59, 1, 211, 117, 232, 59, 1, 
-    235, 23, 232, 59, 1, 156, 232, 59, 1, 193, 232, 59, 1, 230, 25, 232, 59, 
-    1, 76, 232, 59, 1, 153, 232, 59, 1, 218, 226, 232, 59, 1, 217, 152, 232, 
-    59, 1, 70, 232, 59, 1, 245, 6, 232, 59, 1, 224, 96, 232, 59, 1, 222, 91, 
-    232, 59, 1, 215, 159, 232, 59, 1, 254, 123, 232, 59, 1, 245, 150, 232, 
-    59, 1, 232, 62, 232, 59, 1, 228, 111, 232, 59, 1, 251, 66, 232, 59, 215, 
-    222, 78, 231, 48, 241, 174, 1, 61, 231, 48, 241, 174, 1, 75, 231, 48, 
-    241, 174, 1, 73, 231, 48, 241, 174, 1, 76, 231, 48, 241, 174, 1, 191, 
-    231, 48, 241, 174, 1, 212, 65, 231, 48, 241, 174, 1, 252, 191, 231, 48, 
-    241, 174, 1, 252, 190, 231, 48, 241, 174, 1, 190, 231, 48, 241, 174, 1, 
-    184, 231, 48, 241, 174, 1, 197, 231, 48, 241, 174, 1, 229, 228, 231, 48, 
-    241, 174, 1, 229, 107, 231, 48, 241, 174, 1, 229, 106, 231, 48, 241, 174, 
-    1, 205, 231, 48, 241, 174, 1, 223, 187, 231, 48, 241, 174, 1, 233, 135, 
-    231, 48, 241, 174, 1, 234, 132, 231, 48, 241, 174, 1, 241, 189, 231, 48, 
-    241, 174, 1, 206, 231, 48, 241, 174, 1, 222, 33, 231, 48, 241, 174, 1, 
-    221, 181, 231, 48, 241, 174, 1, 176, 231, 48, 241, 174, 1, 224, 88, 231, 
-    48, 241, 174, 1, 217, 105, 231, 48, 241, 174, 1, 217, 104, 231, 48, 241, 
-    174, 1, 217, 22, 231, 48, 241, 174, 1, 217, 21, 231, 48, 241, 174, 1, 
-    111, 231, 48, 241, 174, 1, 248, 221, 231, 48, 241, 174, 16, 213, 170, 
-    231, 48, 241, 174, 16, 213, 169, 231, 48, 249, 94, 1, 61, 231, 48, 249, 
-    94, 1, 75, 231, 48, 249, 94, 1, 73, 231, 48, 249, 94, 1, 76, 231, 48, 
-    249, 94, 1, 191, 231, 48, 249, 94, 1, 212, 65, 231, 48, 249, 94, 1, 252, 
-    191, 231, 48, 249, 94, 1, 190, 231, 48, 249, 94, 1, 184, 231, 48, 249, 
-    94, 1, 197, 231, 48, 249, 94, 1, 229, 107, 231, 48, 249, 94, 1, 205, 231, 
-    48, 249, 94, 1, 233, 135, 231, 48, 249, 94, 1, 234, 132, 231, 48, 249, 
-    94, 1, 241, 189, 231, 48, 249, 94, 1, 206, 231, 48, 249, 94, 1, 254, 23, 
-    206, 231, 48, 249, 94, 1, 221, 181, 231, 48, 249, 94, 1, 176, 231, 48, 
-    249, 94, 1, 224, 88, 231, 48, 249, 94, 1, 217, 105, 231, 48, 249, 94, 1, 
-    217, 22, 231, 48, 249, 94, 1, 111, 231, 48, 249, 94, 1, 248, 221, 231, 
-    48, 249, 94, 232, 145, 222, 217, 231, 48, 249, 94, 232, 145, 236, 6, 234, 
-    120, 1, 61, 234, 120, 25, 5, 73, 234, 120, 25, 5, 70, 234, 120, 25, 5, 
-    149, 153, 234, 120, 25, 5, 75, 234, 120, 25, 5, 76, 234, 120, 25, 233, 
-    23, 78, 234, 120, 5, 52, 222, 234, 51, 234, 120, 5, 254, 75, 234, 120, 5, 
-    213, 147, 234, 120, 1, 176, 234, 120, 1, 234, 132, 234, 120, 1, 243, 135, 
-    234, 120, 1, 242, 249, 234, 120, 1, 251, 33, 234, 120, 1, 250, 157, 234, 
-    120, 1, 235, 141, 234, 120, 1, 227, 165, 234, 120, 1, 215, 156, 234, 120, 
-    1, 215, 144, 234, 120, 1, 248, 135, 234, 120, 1, 248, 119, 234, 120, 1, 
-    228, 110, 234, 120, 1, 217, 105, 234, 120, 1, 216, 208, 234, 120, 1, 248, 
-    221, 234, 120, 1, 248, 25, 234, 120, 1, 197, 234, 120, 1, 190, 234, 120, 
-    1, 225, 147, 234, 120, 1, 252, 191, 234, 120, 1, 252, 18, 234, 120, 1, 
-    184, 234, 120, 1, 191, 234, 120, 1, 205, 234, 120, 1, 233, 135, 234, 120, 
-    1, 214, 27, 234, 120, 1, 220, 102, 234, 120, 1, 218, 223, 234, 120, 1, 
-    206, 234, 120, 1, 210, 116, 234, 120, 1, 162, 234, 120, 1, 234, 46, 234, 
-    120, 1, 215, 124, 234, 120, 5, 252, 141, 48, 234, 120, 5, 250, 221, 234, 
-    120, 5, 59, 51, 234, 120, 213, 152, 234, 120, 21, 110, 234, 120, 21, 105, 
-    234, 120, 21, 158, 234, 120, 21, 161, 234, 120, 54, 216, 247, 234, 120, 
-    54, 215, 73, 234, 120, 54, 123, 240, 210, 234, 120, 54, 123, 216, 147, 
-    234, 120, 224, 141, 247, 120, 234, 120, 224, 141, 4, 250, 35, 234, 120, 
-    224, 141, 250, 35, 234, 120, 224, 141, 249, 137, 130, 234, 120, 224, 141, 
-    231, 180, 234, 120, 224, 141, 232, 115, 234, 120, 224, 141, 248, 178, 
-    234, 120, 224, 141, 52, 248, 178, 234, 120, 224, 141, 232, 207, 55, 219, 
-    28, 254, 38, 1, 241, 238, 55, 219, 28, 254, 38, 1, 233, 93, 55, 219, 28, 
-    254, 38, 1, 241, 195, 55, 219, 28, 254, 38, 1, 231, 65, 55, 219, 28, 254, 
-    38, 1, 224, 34, 55, 219, 28, 254, 38, 1, 212, 30, 55, 219, 28, 254, 38, 
-    1, 220, 20, 55, 219, 28, 254, 38, 1, 223, 67, 55, 219, 28, 254, 38, 1, 
-    252, 25, 55, 219, 28, 254, 38, 1, 217, 36, 55, 219, 28, 254, 38, 1, 221, 
-    226, 55, 219, 28, 254, 38, 1, 234, 225, 55, 219, 28, 254, 38, 1, 227, 
-    194, 55, 219, 28, 254, 38, 1, 234, 116, 55, 219, 28, 254, 38, 1, 222, 24, 
-    55, 219, 28, 254, 38, 1, 221, 249, 55, 219, 28, 254, 38, 1, 244, 154, 55, 
-    219, 28, 254, 38, 1, 254, 170, 55, 219, 28, 254, 38, 1, 253, 161, 55, 
-    219, 28, 254, 38, 1, 248, 22, 55, 219, 28, 254, 38, 1, 242, 201, 55, 219, 
-    28, 254, 38, 1, 248, 188, 55, 219, 28, 254, 38, 1, 242, 238, 55, 219, 28, 
-    254, 38, 1, 216, 226, 55, 219, 28, 254, 38, 1, 210, 96, 55, 219, 28, 254, 
-    38, 1, 248, 19, 55, 219, 28, 254, 38, 1, 210, 232, 55, 219, 28, 254, 38, 
-    1, 216, 197, 55, 219, 28, 254, 38, 1, 216, 178, 55, 219, 28, 254, 38, 54, 
-    110, 55, 219, 28, 254, 38, 54, 244, 114, 55, 219, 28, 254, 38, 132, 235, 
-    238, 253, 172, 1, 61, 253, 172, 1, 255, 73, 253, 172, 1, 254, 73, 253, 
-    172, 1, 255, 32, 253, 172, 1, 254, 123, 253, 172, 1, 255, 33, 253, 172, 
-    1, 254, 243, 253, 172, 1, 254, 239, 253, 172, 1, 75, 253, 172, 1, 245, 
-    209, 253, 172, 1, 76, 253, 172, 1, 226, 183, 253, 172, 1, 73, 253, 172, 
-    1, 236, 33, 253, 172, 1, 70, 253, 172, 1, 214, 118, 253, 172, 1, 234, 
-    182, 253, 172, 1, 211, 162, 253, 172, 1, 211, 128, 253, 172, 1, 211, 137, 
-    253, 172, 1, 243, 62, 253, 172, 1, 243, 24, 253, 172, 1, 242, 236, 253, 
-    172, 1, 250, 190, 253, 172, 1, 235, 126, 253, 172, 1, 217, 22, 253, 172, 
-    1, 216, 195, 253, 172, 1, 248, 90, 253, 172, 1, 248, 17, 253, 172, 1, 
-    215, 151, 253, 172, 1, 225, 221, 253, 172, 1, 244, 154, 253, 172, 1, 252, 
-    75, 253, 172, 1, 252, 14, 253, 172, 1, 229, 64, 253, 172, 1, 228, 239, 
-    253, 172, 1, 228, 240, 253, 172, 1, 229, 107, 253, 172, 1, 227, 156, 253, 
-    172, 1, 228, 105, 253, 172, 1, 231, 91, 253, 172, 1, 241, 116, 253, 172, 
-    1, 210, 166, 253, 172, 1, 211, 47, 253, 172, 1, 213, 255, 253, 172, 1, 
-    223, 128, 253, 172, 1, 233, 58, 253, 172, 1, 221, 181, 253, 172, 1, 210, 
-    94, 253, 172, 1, 220, 63, 253, 172, 1, 210, 74, 253, 172, 1, 219, 198, 
-    253, 172, 1, 218, 193, 253, 172, 1, 241, 238, 253, 172, 255, 21, 78, 216, 
-    79, 113, 170, 117, 123, 59, 224, 140, 4, 113, 170, 117, 123, 59, 224, 
-    140, 233, 85, 113, 170, 117, 123, 59, 224, 140, 233, 85, 123, 59, 117, 
-    113, 170, 224, 140, 233, 85, 113, 222, 232, 117, 123, 222, 234, 224, 140, 
-    233, 85, 123, 222, 234, 117, 113, 222, 232, 224, 140, 235, 218, 225, 254, 
-    1, 254, 168, 235, 218, 225, 254, 1, 252, 25, 235, 218, 225, 254, 1, 242, 
-    201, 235, 218, 225, 254, 1, 248, 188, 235, 218, 225, 254, 1, 241, 238, 
-    235, 218, 225, 254, 1, 212, 30, 235, 218, 225, 254, 1, 210, 97, 235, 218, 
-    225, 254, 1, 241, 195, 235, 218, 225, 254, 1, 216, 226, 235, 218, 225, 
-    254, 1, 210, 232, 235, 218, 225, 254, 1, 234, 225, 235, 218, 225, 254, 1, 
-    233, 93, 235, 218, 225, 254, 1, 231, 65, 235, 218, 225, 254, 1, 227, 194, 
-    235, 218, 225, 254, 1, 221, 249, 235, 218, 225, 254, 1, 253, 162, 235, 
-    218, 225, 254, 1, 225, 221, 235, 218, 225, 254, 1, 222, 24, 235, 218, 
-    225, 254, 1, 224, 34, 235, 218, 225, 254, 1, 223, 67, 235, 218, 225, 254, 
-    1, 220, 20, 235, 218, 225, 254, 1, 217, 36, 235, 218, 225, 254, 54, 110, 
-    235, 218, 225, 254, 54, 105, 235, 218, 225, 254, 54, 158, 235, 218, 225, 
-    254, 54, 161, 235, 218, 225, 254, 54, 216, 247, 235, 218, 225, 254, 54, 
-    215, 73, 235, 218, 225, 254, 54, 123, 240, 210, 235, 218, 225, 254, 54, 
-    123, 216, 147, 235, 218, 226, 72, 1, 254, 168, 235, 218, 226, 72, 1, 252, 
-    25, 235, 218, 226, 72, 1, 242, 201, 235, 218, 226, 72, 1, 248, 188, 235, 
-    218, 226, 72, 1, 241, 238, 235, 218, 226, 72, 1, 212, 29, 235, 218, 226, 
-    72, 1, 210, 97, 235, 218, 226, 72, 1, 241, 195, 235, 218, 226, 72, 1, 
-    216, 226, 235, 218, 226, 72, 1, 210, 232, 235, 218, 226, 72, 1, 234, 225, 
-    235, 218, 226, 72, 1, 233, 93, 235, 218, 226, 72, 1, 231, 64, 235, 218, 
-    226, 72, 1, 227, 194, 235, 218, 226, 72, 1, 221, 249, 235, 218, 226, 72, 
-    1, 225, 221, 235, 218, 226, 72, 1, 222, 24, 235, 218, 226, 72, 1, 220, 
-    20, 235, 218, 226, 72, 1, 217, 36, 235, 218, 226, 72, 54, 110, 235, 218, 
-    226, 72, 54, 105, 235, 218, 226, 72, 54, 158, 235, 218, 226, 72, 54, 161, 
-    235, 218, 226, 72, 54, 216, 247, 235, 218, 226, 72, 54, 215, 73, 235, 
-    218, 226, 72, 54, 123, 240, 210, 235, 218, 226, 72, 54, 123, 216, 147, 
-    55, 201, 1, 226, 149, 61, 55, 201, 1, 211, 37, 61, 55, 201, 1, 211, 37, 
-    254, 243, 55, 201, 1, 226, 149, 73, 55, 201, 1, 211, 37, 73, 55, 201, 1, 
-    211, 37, 75, 55, 201, 1, 226, 149, 76, 55, 201, 1, 226, 149, 226, 234, 
-    55, 201, 1, 211, 37, 226, 234, 55, 201, 1, 226, 149, 255, 25, 55, 201, 1, 
-    211, 37, 255, 25, 55, 201, 1, 226, 149, 254, 242, 55, 201, 1, 211, 37, 
-    254, 242, 55, 201, 1, 226, 149, 254, 216, 55, 201, 1, 211, 37, 254, 216, 
-    55, 201, 1, 226, 149, 254, 237, 55, 201, 1, 211, 37, 254, 237, 55, 201, 
-    1, 226, 149, 254, 255, 55, 201, 1, 211, 37, 254, 255, 55, 201, 1, 226, 
-    149, 254, 241, 55, 201, 1, 226, 149, 245, 12, 55, 201, 1, 211, 37, 245, 
-    12, 55, 201, 1, 226, 149, 253, 167, 55, 201, 1, 211, 37, 253, 167, 55, 
-    201, 1, 226, 149, 254, 224, 55, 201, 1, 211, 37, 254, 224, 55, 201, 1, 
-    226, 149, 254, 235, 55, 201, 1, 211, 37, 254, 235, 55, 201, 1, 226, 149, 
-    226, 233, 55, 201, 1, 211, 37, 226, 233, 55, 201, 1, 226, 149, 254, 178, 
-    55, 201, 1, 211, 37, 254, 178, 55, 201, 1, 226, 149, 254, 234, 55, 201, 
-    1, 226, 149, 245, 161, 55, 201, 1, 226, 149, 245, 159, 55, 201, 1, 226, 
-    149, 254, 123, 55, 201, 1, 226, 149, 254, 232, 55, 201, 1, 211, 37, 254, 
-    232, 55, 201, 1, 226, 149, 245, 131, 55, 201, 1, 211, 37, 245, 131, 55, 
-    201, 1, 226, 149, 245, 147, 55, 201, 1, 211, 37, 245, 147, 55, 201, 1, 
-    226, 149, 245, 118, 55, 201, 1, 211, 37, 245, 118, 55, 201, 1, 211, 37, 
-    254, 115, 55, 201, 1, 226, 149, 245, 138, 55, 201, 1, 211, 37, 254, 231, 
-    55, 201, 1, 226, 149, 245, 108, 55, 201, 1, 226, 149, 226, 175, 55, 201, 
-    1, 226, 149, 240, 113, 55, 201, 1, 226, 149, 245, 215, 55, 201, 1, 211, 
-    37, 245, 215, 55, 201, 1, 226, 149, 254, 45, 55, 201, 1, 211, 37, 254, 
-    45, 55, 201, 1, 226, 149, 235, 181, 55, 201, 1, 211, 37, 235, 181, 55, 
-    201, 1, 226, 149, 226, 159, 55, 201, 1, 211, 37, 226, 159, 55, 201, 1, 
-    226, 149, 254, 41, 55, 201, 1, 211, 37, 254, 41, 55, 201, 1, 226, 149, 
-    254, 230, 55, 201, 1, 226, 149, 253, 237, 55, 201, 1, 226, 149, 254, 228, 
-    55, 201, 1, 226, 149, 253, 231, 55, 201, 1, 211, 37, 253, 231, 55, 201, 
-    1, 226, 149, 245, 75, 55, 201, 1, 211, 37, 245, 75, 55, 201, 1, 226, 149, 
-    253, 206, 55, 201, 1, 211, 37, 253, 206, 55, 201, 1, 226, 149, 254, 225, 
-    55, 201, 1, 211, 37, 254, 225, 55, 201, 1, 226, 149, 226, 140, 55, 201, 
-    1, 226, 149, 252, 125, 222, 127, 21, 110, 222, 127, 21, 105, 222, 127, 
-    21, 158, 222, 127, 21, 161, 222, 127, 21, 189, 222, 127, 21, 194, 222, 
-    127, 21, 198, 222, 127, 21, 195, 222, 127, 21, 200, 222, 127, 54, 216, 
-    247, 222, 127, 54, 215, 73, 222, 127, 54, 216, 162, 222, 127, 54, 244, 
-    15, 222, 127, 54, 244, 114, 222, 127, 54, 219, 111, 222, 127, 54, 220, 
-    116, 222, 127, 54, 245, 184, 222, 127, 54, 228, 195, 222, 127, 54, 123, 
-    240, 210, 222, 127, 54, 113, 240, 210, 222, 127, 54, 134, 240, 210, 222, 
-    127, 54, 244, 11, 240, 210, 222, 127, 54, 244, 81, 240, 210, 222, 127, 
-    54, 219, 125, 240, 210, 222, 127, 54, 220, 122, 240, 210, 222, 127, 54, 
-    245, 193, 240, 210, 222, 127, 54, 228, 200, 240, 210, 222, 127, 244, 2, 
-    123, 242, 27, 222, 127, 244, 2, 123, 224, 21, 222, 127, 244, 2, 123, 216, 
-    168, 222, 127, 244, 2, 113, 216, 166, 118, 5, 250, 255, 118, 5, 254, 75, 
-    118, 5, 213, 147, 118, 5, 235, 102, 118, 5, 214, 161, 118, 1, 61, 118, 1, 
-    255, 73, 118, 1, 73, 118, 1, 236, 33, 118, 1, 70, 118, 1, 214, 118, 118, 
-    1, 149, 153, 118, 1, 149, 222, 180, 118, 1, 149, 156, 118, 1, 149, 232, 
-    185, 118, 1, 75, 118, 1, 254, 201, 118, 1, 76, 118, 1, 253, 192, 118, 1, 
-    176, 118, 1, 234, 132, 118, 1, 243, 135, 118, 1, 242, 249, 118, 1, 229, 
-    77, 118, 1, 251, 33, 118, 1, 250, 157, 118, 1, 235, 141, 118, 1, 235, 
-    114, 118, 1, 227, 165, 118, 1, 215, 156, 118, 1, 215, 144, 118, 1, 248, 
-    135, 118, 1, 248, 119, 118, 1, 228, 110, 118, 1, 217, 105, 118, 1, 216, 
-    208, 118, 1, 248, 221, 118, 1, 248, 25, 118, 1, 197, 118, 1, 190, 118, 1, 
-    225, 147, 118, 1, 252, 191, 118, 1, 252, 18, 118, 1, 184, 118, 1, 191, 
-    118, 1, 205, 118, 1, 233, 135, 118, 1, 214, 27, 118, 1, 220, 102, 118, 1, 
-    218, 223, 118, 1, 206, 118, 1, 162, 118, 1, 232, 184, 118, 1, 55, 36, 
-    232, 175, 118, 1, 55, 36, 222, 179, 118, 1, 55, 36, 228, 92, 118, 25, 5, 
-    255, 73, 118, 25, 5, 252, 15, 255, 73, 118, 25, 5, 73, 118, 25, 5, 236, 
-    33, 118, 25, 5, 70, 118, 25, 5, 214, 118, 118, 25, 5, 149, 153, 118, 25, 
-    5, 149, 222, 180, 118, 25, 5, 149, 156, 118, 25, 5, 149, 232, 185, 118, 
-    25, 5, 75, 118, 25, 5, 254, 201, 118, 25, 5, 76, 118, 25, 5, 253, 192, 
-    118, 213, 152, 118, 248, 178, 118, 52, 248, 178, 118, 224, 141, 247, 120, 
-    118, 224, 141, 52, 247, 120, 118, 224, 141, 232, 213, 118, 224, 141, 249, 
-    137, 130, 118, 224, 141, 232, 115, 118, 54, 110, 118, 54, 105, 118, 54, 
+    199, 254, 210, 181, 6, 1, 199, 76, 181, 6, 1, 199, 226, 184, 181, 6, 1, 
+    219, 252, 73, 181, 6, 1, 219, 252, 75, 181, 6, 1, 219, 252, 61, 181, 6, 
+    1, 219, 252, 254, 210, 181, 6, 1, 219, 252, 76, 181, 6, 1, 219, 252, 226, 
+    184, 181, 6, 1, 253, 168, 181, 6, 1, 226, 117, 181, 6, 1, 211, 195, 181, 
+    6, 1, 211, 44, 181, 6, 1, 242, 61, 181, 6, 1, 225, 212, 181, 6, 1, 252, 
+    67, 181, 6, 1, 217, 12, 181, 6, 1, 248, 78, 181, 6, 1, 250, 129, 181, 6, 
+    1, 235, 125, 181, 6, 1, 234, 190, 181, 6, 1, 243, 84, 181, 6, 1, 245, 
+    203, 181, 6, 1, 213, 250, 181, 6, 1, 245, 60, 181, 6, 1, 216, 195, 181, 
+    6, 1, 245, 83, 181, 6, 1, 210, 92, 181, 6, 1, 245, 76, 181, 6, 1, 210, 
+    73, 181, 6, 1, 245, 93, 181, 6, 1, 245, 175, 181, 6, 1, 245, 160, 181, 6, 
+    1, 245, 151, 181, 6, 1, 245, 139, 181, 6, 1, 226, 220, 181, 6, 1, 245, 
+    39, 181, 4, 1, 199, 73, 181, 4, 1, 199, 75, 181, 4, 1, 199, 61, 181, 4, 
+    1, 199, 254, 210, 181, 4, 1, 199, 76, 181, 4, 1, 199, 226, 184, 181, 4, 
+    1, 219, 252, 73, 181, 4, 1, 219, 252, 75, 181, 4, 1, 219, 252, 61, 181, 
+    4, 1, 219, 252, 254, 210, 181, 4, 1, 219, 252, 76, 181, 4, 1, 219, 252, 
+    226, 184, 181, 4, 1, 253, 168, 181, 4, 1, 226, 117, 181, 4, 1, 211, 195, 
+    181, 4, 1, 211, 44, 181, 4, 1, 242, 61, 181, 4, 1, 225, 212, 181, 4, 1, 
+    252, 67, 181, 4, 1, 217, 12, 181, 4, 1, 248, 78, 181, 4, 1, 250, 129, 
+    181, 4, 1, 235, 125, 181, 4, 1, 234, 190, 181, 4, 1, 243, 84, 181, 4, 1, 
+    245, 203, 181, 4, 1, 213, 250, 181, 4, 1, 245, 60, 181, 4, 1, 216, 195, 
+    181, 4, 1, 245, 83, 181, 4, 1, 210, 92, 181, 4, 1, 245, 76, 181, 4, 1, 
+    210, 73, 181, 4, 1, 245, 93, 181, 4, 1, 245, 175, 181, 4, 1, 245, 160, 
+    181, 4, 1, 245, 151, 181, 4, 1, 245, 139, 181, 4, 1, 226, 220, 181, 4, 1, 
+    245, 39, 220, 70, 1, 225, 210, 220, 70, 1, 216, 6, 220, 70, 1, 234, 92, 
+    220, 70, 1, 244, 148, 220, 70, 1, 216, 173, 220, 70, 1, 219, 59, 220, 70, 
+    1, 218, 15, 220, 70, 1, 250, 62, 220, 70, 1, 211, 46, 220, 70, 1, 240, 
+    210, 220, 70, 1, 252, 6, 220, 70, 1, 248, 90, 220, 70, 1, 243, 122, 220, 
+    70, 1, 213, 123, 220, 70, 1, 216, 177, 220, 70, 1, 210, 21, 220, 70, 1, 
+    231, 90, 220, 70, 1, 235, 50, 220, 70, 1, 211, 225, 220, 70, 1, 242, 49, 
+    220, 70, 1, 232, 143, 220, 70, 1, 230, 190, 220, 70, 1, 236, 41, 220, 70, 
+    1, 245, 202, 220, 70, 1, 253, 232, 220, 70, 1, 254, 248, 220, 70, 1, 226, 
+    197, 220, 70, 1, 211, 212, 220, 70, 1, 226, 131, 220, 70, 1, 254, 210, 
+    220, 70, 1, 222, 209, 220, 70, 1, 227, 195, 220, 70, 1, 245, 218, 220, 
+    70, 1, 254, 215, 220, 70, 1, 240, 112, 220, 70, 1, 214, 163, 220, 70, 1, 
+    226, 255, 220, 70, 1, 226, 177, 220, 70, 1, 226, 219, 220, 70, 1, 253, 
+    171, 220, 70, 1, 254, 20, 220, 70, 1, 226, 159, 220, 70, 1, 254, 193, 
+    220, 70, 1, 245, 87, 220, 70, 1, 253, 254, 220, 70, 1, 245, 228, 220, 70, 
+    1, 240, 119, 220, 70, 1, 211, 13, 226, 142, 1, 254, 171, 226, 142, 1, 
+    252, 192, 226, 142, 1, 217, 106, 226, 142, 1, 235, 142, 226, 142, 1, 211, 
+    165, 226, 142, 1, 234, 133, 226, 142, 1, 248, 77, 226, 142, 1, 205, 226, 
+    142, 1, 206, 226, 142, 1, 220, 27, 226, 142, 1, 248, 26, 226, 142, 1, 
+    250, 216, 226, 142, 1, 243, 136, 226, 142, 1, 244, 197, 226, 142, 1, 224, 
+    87, 226, 142, 1, 235, 10, 226, 142, 1, 233, 131, 226, 142, 1, 230, 201, 
+    226, 142, 1, 227, 179, 226, 142, 1, 212, 30, 226, 142, 1, 162, 226, 142, 
+    1, 191, 226, 142, 1, 61, 226, 142, 1, 75, 226, 142, 1, 73, 226, 142, 1, 
+    76, 226, 142, 1, 70, 226, 142, 1, 255, 74, 226, 142, 1, 245, 210, 226, 
+    142, 1, 226, 184, 226, 142, 21, 210, 86, 226, 142, 21, 110, 226, 142, 21, 
+    105, 226, 142, 21, 158, 226, 142, 21, 161, 226, 142, 21, 189, 226, 142, 
+    21, 194, 226, 142, 21, 198, 226, 142, 21, 195, 226, 142, 21, 200, 249, 
+    68, 3, 61, 249, 68, 3, 75, 249, 68, 3, 73, 249, 68, 3, 76, 249, 68, 3, 
+    70, 249, 68, 3, 235, 142, 249, 68, 3, 235, 69, 249, 68, 3, 176, 249, 68, 
+    3, 234, 183, 249, 68, 3, 234, 93, 249, 68, 3, 234, 29, 249, 68, 3, 233, 
+    218, 249, 68, 3, 233, 136, 249, 68, 3, 233, 59, 249, 68, 3, 232, 242, 
+    249, 68, 3, 232, 157, 249, 68, 3, 232, 99, 249, 68, 3, 185, 249, 68, 3, 
+    231, 92, 249, 68, 3, 230, 231, 249, 68, 3, 230, 162, 249, 68, 3, 230, 
+    103, 249, 68, 3, 197, 249, 68, 3, 229, 108, 249, 68, 3, 228, 234, 249, 
+    68, 3, 228, 75, 249, 68, 3, 227, 238, 249, 68, 3, 190, 249, 68, 3, 225, 
+    222, 249, 68, 3, 225, 109, 249, 68, 3, 225, 17, 249, 68, 3, 224, 151, 
+    249, 68, 3, 205, 249, 68, 3, 223, 129, 249, 68, 3, 223, 36, 249, 68, 3, 
+    222, 212, 249, 68, 3, 222, 141, 249, 68, 3, 206, 249, 68, 3, 221, 182, 
+    249, 68, 3, 219, 192, 249, 68, 3, 219, 59, 249, 68, 3, 218, 84, 249, 68, 
+    3, 217, 106, 249, 68, 3, 217, 23, 249, 68, 3, 216, 118, 249, 68, 3, 111, 
+    249, 68, 3, 215, 119, 249, 68, 3, 212, 65, 249, 68, 3, 212, 22, 249, 68, 
+    3, 211, 250, 249, 68, 3, 211, 227, 249, 68, 3, 211, 165, 249, 68, 3, 211, 
+    162, 249, 68, 3, 210, 116, 249, 68, 3, 210, 23, 236, 2, 254, 28, 1, 254, 
+    169, 236, 2, 254, 28, 1, 252, 26, 236, 2, 254, 28, 1, 242, 202, 236, 2, 
+    254, 28, 1, 248, 189, 236, 2, 254, 28, 1, 241, 239, 236, 2, 254, 28, 1, 
+    212, 30, 236, 2, 254, 28, 1, 210, 97, 236, 2, 254, 28, 1, 241, 196, 236, 
+    2, 254, 28, 1, 216, 227, 236, 2, 254, 28, 1, 210, 232, 236, 2, 254, 28, 
+    1, 234, 226, 236, 2, 254, 28, 1, 233, 94, 236, 2, 254, 28, 1, 231, 66, 
+    236, 2, 254, 28, 1, 227, 195, 236, 2, 254, 28, 1, 221, 250, 236, 2, 254, 
+    28, 1, 253, 163, 236, 2, 254, 28, 1, 225, 222, 236, 2, 254, 28, 1, 222, 
+    25, 236, 2, 254, 28, 1, 224, 35, 236, 2, 254, 28, 1, 223, 68, 236, 2, 
+    254, 28, 1, 220, 21, 236, 2, 254, 28, 1, 217, 37, 236, 2, 254, 28, 221, 
+    174, 50, 236, 2, 254, 28, 54, 110, 236, 2, 254, 28, 54, 105, 236, 2, 254, 
+    28, 54, 158, 236, 2, 254, 28, 54, 216, 248, 236, 2, 254, 28, 54, 215, 73, 
+    236, 2, 254, 28, 54, 123, 240, 211, 236, 2, 254, 28, 54, 123, 216, 148, 
+    236, 2, 254, 28, 54, 216, 249, 216, 148, 225, 120, 1, 254, 166, 225, 120, 
+    1, 252, 29, 225, 120, 1, 243, 110, 225, 120, 1, 248, 57, 225, 120, 1, 
+    241, 239, 225, 120, 1, 212, 37, 225, 120, 1, 210, 110, 225, 120, 1, 241, 
+    198, 225, 120, 1, 216, 231, 225, 120, 1, 210, 233, 225, 120, 1, 234, 251, 
+    225, 120, 1, 233, 100, 225, 120, 1, 231, 66, 225, 120, 1, 227, 195, 225, 
+    120, 1, 220, 145, 225, 120, 1, 254, 197, 225, 120, 1, 225, 222, 225, 120, 
+    1, 222, 26, 225, 120, 1, 224, 40, 225, 120, 1, 222, 190, 225, 120, 1, 
+    220, 21, 225, 120, 1, 217, 42, 225, 120, 54, 110, 225, 120, 54, 216, 248, 
+    225, 120, 54, 215, 73, 225, 120, 54, 123, 240, 211, 225, 120, 54, 105, 
+    225, 120, 54, 158, 225, 120, 211, 209, 220, 138, 232, 60, 1, 61, 232, 60, 
+    1, 253, 159, 232, 60, 1, 243, 203, 232, 60, 1, 249, 61, 232, 60, 1, 75, 
+    232, 60, 1, 214, 105, 232, 60, 1, 73, 232, 60, 1, 211, 117, 232, 60, 1, 
+    235, 24, 232, 60, 1, 156, 232, 60, 1, 193, 232, 60, 1, 230, 26, 232, 60, 
+    1, 76, 232, 60, 1, 153, 232, 60, 1, 218, 227, 232, 60, 1, 217, 153, 232, 
+    60, 1, 70, 232, 60, 1, 245, 7, 232, 60, 1, 224, 97, 232, 60, 1, 222, 92, 
+    232, 60, 1, 215, 160, 232, 60, 1, 254, 124, 232, 60, 1, 245, 151, 232, 
+    60, 1, 232, 63, 232, 60, 1, 228, 112, 232, 60, 1, 251, 67, 232, 60, 215, 
+    223, 78, 231, 49, 241, 175, 1, 61, 231, 49, 241, 175, 1, 75, 231, 49, 
+    241, 175, 1, 73, 231, 49, 241, 175, 1, 76, 231, 49, 241, 175, 1, 191, 
+    231, 49, 241, 175, 1, 212, 65, 231, 49, 241, 175, 1, 252, 192, 231, 49, 
+    241, 175, 1, 252, 191, 231, 49, 241, 175, 1, 190, 231, 49, 241, 175, 1, 
+    185, 231, 49, 241, 175, 1, 197, 231, 49, 241, 175, 1, 229, 229, 231, 49, 
+    241, 175, 1, 229, 108, 231, 49, 241, 175, 1, 229, 107, 231, 49, 241, 175, 
+    1, 205, 231, 49, 241, 175, 1, 223, 188, 231, 49, 241, 175, 1, 233, 136, 
+    231, 49, 241, 175, 1, 234, 133, 231, 49, 241, 175, 1, 241, 190, 231, 49, 
+    241, 175, 1, 206, 231, 49, 241, 175, 1, 222, 34, 231, 49, 241, 175, 1, 
+    221, 182, 231, 49, 241, 175, 1, 176, 231, 49, 241, 175, 1, 224, 89, 231, 
+    49, 241, 175, 1, 217, 106, 231, 49, 241, 175, 1, 217, 105, 231, 49, 241, 
+    175, 1, 217, 23, 231, 49, 241, 175, 1, 217, 22, 231, 49, 241, 175, 1, 
+    111, 231, 49, 241, 175, 1, 248, 222, 231, 49, 241, 175, 16, 213, 170, 
+    231, 49, 241, 175, 16, 213, 169, 231, 49, 249, 95, 1, 61, 231, 49, 249, 
+    95, 1, 75, 231, 49, 249, 95, 1, 73, 231, 49, 249, 95, 1, 76, 231, 49, 
+    249, 95, 1, 191, 231, 49, 249, 95, 1, 212, 65, 231, 49, 249, 95, 1, 252, 
+    192, 231, 49, 249, 95, 1, 190, 231, 49, 249, 95, 1, 185, 231, 49, 249, 
+    95, 1, 197, 231, 49, 249, 95, 1, 229, 108, 231, 49, 249, 95, 1, 205, 231, 
+    49, 249, 95, 1, 233, 136, 231, 49, 249, 95, 1, 234, 133, 231, 49, 249, 
+    95, 1, 241, 190, 231, 49, 249, 95, 1, 206, 231, 49, 249, 95, 1, 254, 24, 
+    206, 231, 49, 249, 95, 1, 221, 182, 231, 49, 249, 95, 1, 176, 231, 49, 
+    249, 95, 1, 224, 89, 231, 49, 249, 95, 1, 217, 106, 231, 49, 249, 95, 1, 
+    217, 23, 231, 49, 249, 95, 1, 111, 231, 49, 249, 95, 1, 248, 222, 231, 
+    49, 249, 95, 232, 146, 222, 218, 231, 49, 249, 95, 232, 146, 236, 7, 234, 
+    121, 1, 61, 234, 121, 25, 5, 73, 234, 121, 25, 5, 70, 234, 121, 25, 5, 
+    149, 153, 234, 121, 25, 5, 75, 234, 121, 25, 5, 76, 234, 121, 25, 233, 
+    24, 78, 234, 121, 5, 52, 222, 235, 51, 234, 121, 5, 254, 76, 234, 121, 5, 
+    213, 147, 234, 121, 1, 176, 234, 121, 1, 234, 133, 234, 121, 1, 243, 136, 
+    234, 121, 1, 242, 250, 234, 121, 1, 251, 34, 234, 121, 1, 250, 158, 234, 
+    121, 1, 235, 142, 234, 121, 1, 227, 166, 234, 121, 1, 215, 157, 234, 121, 
+    1, 215, 145, 234, 121, 1, 248, 136, 234, 121, 1, 248, 120, 234, 121, 1, 
+    228, 111, 234, 121, 1, 217, 106, 234, 121, 1, 216, 209, 234, 121, 1, 248, 
+    222, 234, 121, 1, 248, 26, 234, 121, 1, 197, 234, 121, 1, 190, 234, 121, 
+    1, 225, 148, 234, 121, 1, 252, 192, 234, 121, 1, 252, 19, 234, 121, 1, 
+    185, 234, 121, 1, 191, 234, 121, 1, 205, 234, 121, 1, 233, 136, 234, 121, 
+    1, 214, 27, 234, 121, 1, 220, 103, 234, 121, 1, 218, 224, 234, 121, 1, 
+    206, 234, 121, 1, 210, 116, 234, 121, 1, 162, 234, 121, 1, 234, 47, 234, 
+    121, 1, 215, 125, 234, 121, 5, 252, 142, 48, 234, 121, 5, 250, 222, 234, 
+    121, 5, 59, 51, 234, 121, 213, 152, 234, 121, 21, 110, 234, 121, 21, 105, 
+    234, 121, 21, 158, 234, 121, 21, 161, 234, 121, 54, 216, 248, 234, 121, 
+    54, 215, 73, 234, 121, 54, 123, 240, 211, 234, 121, 54, 123, 216, 148, 
+    234, 121, 224, 142, 247, 121, 234, 121, 224, 142, 4, 250, 36, 234, 121, 
+    224, 142, 250, 36, 234, 121, 224, 142, 249, 138, 130, 234, 121, 224, 142, 
+    231, 181, 234, 121, 224, 142, 232, 116, 234, 121, 224, 142, 248, 179, 
+    234, 121, 224, 142, 52, 248, 179, 234, 121, 224, 142, 232, 208, 55, 219, 
+    29, 254, 39, 1, 241, 239, 55, 219, 29, 254, 39, 1, 233, 94, 55, 219, 29, 
+    254, 39, 1, 241, 196, 55, 219, 29, 254, 39, 1, 231, 66, 55, 219, 29, 254, 
+    39, 1, 224, 35, 55, 219, 29, 254, 39, 1, 212, 30, 55, 219, 29, 254, 39, 
+    1, 220, 21, 55, 219, 29, 254, 39, 1, 223, 68, 55, 219, 29, 254, 39, 1, 
+    252, 26, 55, 219, 29, 254, 39, 1, 217, 37, 55, 219, 29, 254, 39, 1, 221, 
+    227, 55, 219, 29, 254, 39, 1, 234, 226, 55, 219, 29, 254, 39, 1, 227, 
+    195, 55, 219, 29, 254, 39, 1, 234, 117, 55, 219, 29, 254, 39, 1, 222, 25, 
+    55, 219, 29, 254, 39, 1, 221, 250, 55, 219, 29, 254, 39, 1, 244, 155, 55, 
+    219, 29, 254, 39, 1, 254, 171, 55, 219, 29, 254, 39, 1, 253, 162, 55, 
+    219, 29, 254, 39, 1, 248, 23, 55, 219, 29, 254, 39, 1, 242, 202, 55, 219, 
+    29, 254, 39, 1, 248, 189, 55, 219, 29, 254, 39, 1, 242, 239, 55, 219, 29, 
+    254, 39, 1, 216, 227, 55, 219, 29, 254, 39, 1, 210, 96, 55, 219, 29, 254, 
+    39, 1, 248, 20, 55, 219, 29, 254, 39, 1, 210, 232, 55, 219, 29, 254, 39, 
+    1, 216, 198, 55, 219, 29, 254, 39, 1, 216, 179, 55, 219, 29, 254, 39, 54, 
+    110, 55, 219, 29, 254, 39, 54, 244, 115, 55, 219, 29, 254, 39, 132, 235, 
+    239, 253, 173, 1, 61, 253, 173, 1, 255, 74, 253, 173, 1, 254, 74, 253, 
+    173, 1, 255, 33, 253, 173, 1, 254, 124, 253, 173, 1, 255, 34, 253, 173, 
+    1, 254, 244, 253, 173, 1, 254, 240, 253, 173, 1, 75, 253, 173, 1, 245, 
+    210, 253, 173, 1, 76, 253, 173, 1, 226, 184, 253, 173, 1, 73, 253, 173, 
+    1, 236, 34, 253, 173, 1, 70, 253, 173, 1, 214, 118, 253, 173, 1, 234, 
+    183, 253, 173, 1, 211, 162, 253, 173, 1, 211, 128, 253, 173, 1, 211, 137, 
+    253, 173, 1, 243, 63, 253, 173, 1, 243, 25, 253, 173, 1, 242, 237, 253, 
+    173, 1, 250, 191, 253, 173, 1, 235, 127, 253, 173, 1, 217, 23, 253, 173, 
+    1, 216, 196, 253, 173, 1, 248, 91, 253, 173, 1, 248, 18, 253, 173, 1, 
+    215, 152, 253, 173, 1, 225, 222, 253, 173, 1, 244, 155, 253, 173, 1, 252, 
+    76, 253, 173, 1, 252, 15, 253, 173, 1, 229, 65, 253, 173, 1, 228, 240, 
+    253, 173, 1, 228, 241, 253, 173, 1, 229, 108, 253, 173, 1, 227, 157, 253, 
+    173, 1, 228, 106, 253, 173, 1, 231, 92, 253, 173, 1, 241, 117, 253, 173, 
+    1, 210, 166, 253, 173, 1, 211, 47, 253, 173, 1, 213, 255, 253, 173, 1, 
+    223, 129, 253, 173, 1, 233, 59, 253, 173, 1, 221, 182, 253, 173, 1, 210, 
+    94, 253, 173, 1, 220, 64, 253, 173, 1, 210, 74, 253, 173, 1, 219, 199, 
+    253, 173, 1, 218, 194, 253, 173, 1, 241, 239, 253, 173, 255, 22, 78, 216, 
+    80, 113, 170, 117, 123, 59, 224, 141, 4, 113, 170, 117, 123, 59, 224, 
+    141, 233, 86, 113, 170, 117, 123, 59, 224, 141, 233, 86, 123, 59, 117, 
+    113, 170, 224, 141, 233, 86, 113, 222, 233, 117, 123, 222, 235, 224, 141, 
+    233, 86, 123, 222, 235, 117, 113, 222, 233, 224, 141, 235, 219, 225, 255, 
+    1, 254, 169, 235, 219, 225, 255, 1, 252, 26, 235, 219, 225, 255, 1, 242, 
+    202, 235, 219, 225, 255, 1, 248, 189, 235, 219, 225, 255, 1, 241, 239, 
+    235, 219, 225, 255, 1, 212, 30, 235, 219, 225, 255, 1, 210, 97, 235, 219, 
+    225, 255, 1, 241, 196, 235, 219, 225, 255, 1, 216, 227, 235, 219, 225, 
+    255, 1, 210, 232, 235, 219, 225, 255, 1, 234, 226, 235, 219, 225, 255, 1, 
+    233, 94, 235, 219, 225, 255, 1, 231, 66, 235, 219, 225, 255, 1, 227, 195, 
+    235, 219, 225, 255, 1, 221, 250, 235, 219, 225, 255, 1, 253, 163, 235, 
+    219, 225, 255, 1, 225, 222, 235, 219, 225, 255, 1, 222, 25, 235, 219, 
+    225, 255, 1, 224, 35, 235, 219, 225, 255, 1, 223, 68, 235, 219, 225, 255, 
+    1, 220, 21, 235, 219, 225, 255, 1, 217, 37, 235, 219, 225, 255, 54, 110, 
+    235, 219, 225, 255, 54, 105, 235, 219, 225, 255, 54, 158, 235, 219, 225, 
+    255, 54, 161, 235, 219, 225, 255, 54, 216, 248, 235, 219, 225, 255, 54, 
+    215, 73, 235, 219, 225, 255, 54, 123, 240, 211, 235, 219, 225, 255, 54, 
+    123, 216, 148, 235, 219, 226, 73, 1, 254, 169, 235, 219, 226, 73, 1, 252, 
+    26, 235, 219, 226, 73, 1, 242, 202, 235, 219, 226, 73, 1, 248, 189, 235, 
+    219, 226, 73, 1, 241, 239, 235, 219, 226, 73, 1, 212, 29, 235, 219, 226, 
+    73, 1, 210, 97, 235, 219, 226, 73, 1, 241, 196, 235, 219, 226, 73, 1, 
+    216, 227, 235, 219, 226, 73, 1, 210, 232, 235, 219, 226, 73, 1, 234, 226, 
+    235, 219, 226, 73, 1, 233, 94, 235, 219, 226, 73, 1, 231, 65, 235, 219, 
+    226, 73, 1, 227, 195, 235, 219, 226, 73, 1, 221, 250, 235, 219, 226, 73, 
+    1, 225, 222, 235, 219, 226, 73, 1, 222, 25, 235, 219, 226, 73, 1, 220, 
+    21, 235, 219, 226, 73, 1, 217, 37, 235, 219, 226, 73, 54, 110, 235, 219, 
+    226, 73, 54, 105, 235, 219, 226, 73, 54, 158, 235, 219, 226, 73, 54, 161, 
+    235, 219, 226, 73, 54, 216, 248, 235, 219, 226, 73, 54, 215, 73, 235, 
+    219, 226, 73, 54, 123, 240, 211, 235, 219, 226, 73, 54, 123, 216, 148, 
+    55, 201, 1, 226, 150, 61, 55, 201, 1, 211, 37, 61, 55, 201, 1, 211, 37, 
+    254, 244, 55, 201, 1, 226, 150, 73, 55, 201, 1, 211, 37, 73, 55, 201, 1, 
+    211, 37, 75, 55, 201, 1, 226, 150, 76, 55, 201, 1, 226, 150, 226, 235, 
+    55, 201, 1, 211, 37, 226, 235, 55, 201, 1, 226, 150, 255, 26, 55, 201, 1, 
+    211, 37, 255, 26, 55, 201, 1, 226, 150, 254, 243, 55, 201, 1, 211, 37, 
+    254, 243, 55, 201, 1, 226, 150, 254, 217, 55, 201, 1, 211, 37, 254, 217, 
+    55, 201, 1, 226, 150, 254, 238, 55, 201, 1, 211, 37, 254, 238, 55, 201, 
+    1, 226, 150, 255, 0, 55, 201, 1, 211, 37, 255, 0, 55, 201, 1, 226, 150, 
+    254, 242, 55, 201, 1, 226, 150, 245, 13, 55, 201, 1, 211, 37, 245, 13, 
+    55, 201, 1, 226, 150, 253, 168, 55, 201, 1, 211, 37, 253, 168, 55, 201, 
+    1, 226, 150, 254, 225, 55, 201, 1, 211, 37, 254, 225, 55, 201, 1, 226, 
+    150, 254, 236, 55, 201, 1, 211, 37, 254, 236, 55, 201, 1, 226, 150, 226, 
+    234, 55, 201, 1, 211, 37, 226, 234, 55, 201, 1, 226, 150, 254, 179, 55, 
+    201, 1, 211, 37, 254, 179, 55, 201, 1, 226, 150, 254, 235, 55, 201, 1, 
+    226, 150, 245, 162, 55, 201, 1, 226, 150, 245, 160, 55, 201, 1, 226, 150, 
+    254, 124, 55, 201, 1, 226, 150, 254, 233, 55, 201, 1, 211, 37, 254, 233, 
+    55, 201, 1, 226, 150, 245, 132, 55, 201, 1, 211, 37, 245, 132, 55, 201, 
+    1, 226, 150, 245, 148, 55, 201, 1, 211, 37, 245, 148, 55, 201, 1, 226, 
+    150, 245, 119, 55, 201, 1, 211, 37, 245, 119, 55, 201, 1, 211, 37, 254, 
+    116, 55, 201, 1, 226, 150, 245, 139, 55, 201, 1, 211, 37, 254, 232, 55, 
+    201, 1, 226, 150, 245, 109, 55, 201, 1, 226, 150, 226, 176, 55, 201, 1, 
+    226, 150, 240, 114, 55, 201, 1, 226, 150, 245, 216, 55, 201, 1, 211, 37, 
+    245, 216, 55, 201, 1, 226, 150, 254, 46, 55, 201, 1, 211, 37, 254, 46, 
+    55, 201, 1, 226, 150, 235, 182, 55, 201, 1, 211, 37, 235, 182, 55, 201, 
+    1, 226, 150, 226, 160, 55, 201, 1, 211, 37, 226, 160, 55, 201, 1, 226, 
+    150, 254, 42, 55, 201, 1, 211, 37, 254, 42, 55, 201, 1, 226, 150, 254, 
+    231, 55, 201, 1, 226, 150, 253, 238, 55, 201, 1, 226, 150, 254, 229, 55, 
+    201, 1, 226, 150, 253, 232, 55, 201, 1, 211, 37, 253, 232, 55, 201, 1, 
+    226, 150, 245, 76, 55, 201, 1, 211, 37, 245, 76, 55, 201, 1, 226, 150, 
+    253, 207, 55, 201, 1, 211, 37, 253, 207, 55, 201, 1, 226, 150, 254, 226, 
+    55, 201, 1, 211, 37, 254, 226, 55, 201, 1, 226, 150, 226, 141, 55, 201, 
+    1, 226, 150, 252, 126, 222, 128, 21, 110, 222, 128, 21, 105, 222, 128, 
+    21, 158, 222, 128, 21, 161, 222, 128, 21, 189, 222, 128, 21, 194, 222, 
+    128, 21, 198, 222, 128, 21, 195, 222, 128, 21, 200, 222, 128, 54, 216, 
+    248, 222, 128, 54, 215, 73, 222, 128, 54, 216, 163, 222, 128, 54, 244, 
+    16, 222, 128, 54, 244, 115, 222, 128, 54, 219, 112, 222, 128, 54, 220, 
+    117, 222, 128, 54, 245, 185, 222, 128, 54, 228, 196, 222, 128, 54, 123, 
+    240, 211, 222, 128, 54, 113, 240, 211, 222, 128, 54, 134, 240, 211, 222, 
+    128, 54, 244, 12, 240, 211, 222, 128, 54, 244, 82, 240, 211, 222, 128, 
+    54, 219, 126, 240, 211, 222, 128, 54, 220, 123, 240, 211, 222, 128, 54, 
+    245, 194, 240, 211, 222, 128, 54, 228, 201, 240, 211, 222, 128, 244, 3, 
+    123, 242, 28, 222, 128, 244, 3, 123, 224, 22, 222, 128, 244, 3, 123, 216, 
+    169, 222, 128, 244, 3, 113, 216, 167, 118, 5, 251, 0, 118, 5, 254, 76, 
+    118, 5, 213, 147, 118, 5, 235, 103, 118, 5, 214, 161, 118, 1, 61, 118, 1, 
+    255, 74, 118, 1, 73, 118, 1, 236, 34, 118, 1, 70, 118, 1, 214, 118, 118, 
+    1, 149, 153, 118, 1, 149, 222, 181, 118, 1, 149, 156, 118, 1, 149, 232, 
+    186, 118, 1, 75, 118, 1, 254, 202, 118, 1, 76, 118, 1, 253, 193, 118, 1, 
+    176, 118, 1, 234, 133, 118, 1, 243, 136, 118, 1, 242, 250, 118, 1, 229, 
+    78, 118, 1, 251, 34, 118, 1, 250, 158, 118, 1, 235, 142, 118, 1, 235, 
+    115, 118, 1, 227, 166, 118, 1, 215, 157, 118, 1, 215, 145, 118, 1, 248, 
+    136, 118, 1, 248, 120, 118, 1, 228, 111, 118, 1, 217, 106, 118, 1, 216, 
+    209, 118, 1, 248, 222, 118, 1, 248, 26, 118, 1, 197, 118, 1, 190, 118, 1, 
+    225, 148, 118, 1, 252, 192, 118, 1, 252, 19, 118, 1, 185, 118, 1, 191, 
+    118, 1, 205, 118, 1, 233, 136, 118, 1, 214, 27, 118, 1, 220, 103, 118, 1, 
+    218, 224, 118, 1, 206, 118, 1, 162, 118, 1, 232, 185, 118, 1, 55, 36, 
+    232, 176, 118, 1, 55, 36, 222, 180, 118, 1, 55, 36, 228, 93, 118, 25, 5, 
+    255, 74, 118, 25, 5, 252, 16, 255, 74, 118, 25, 5, 73, 118, 25, 5, 236, 
+    34, 118, 25, 5, 70, 118, 25, 5, 214, 118, 118, 25, 5, 149, 153, 118, 25, 
+    5, 149, 222, 181, 118, 25, 5, 149, 156, 118, 25, 5, 149, 232, 186, 118, 
+    25, 5, 75, 118, 25, 5, 254, 202, 118, 25, 5, 76, 118, 25, 5, 253, 193, 
+    118, 213, 152, 118, 248, 179, 118, 52, 248, 179, 118, 224, 142, 247, 121, 
+    118, 224, 142, 52, 247, 121, 118, 224, 142, 232, 214, 118, 224, 142, 249, 
+    138, 130, 118, 224, 142, 232, 116, 118, 54, 110, 118, 54, 105, 118, 54, 
     158, 118, 54, 161, 118, 54, 189, 118, 54, 194, 118, 54, 198, 118, 54, 
-    195, 118, 54, 200, 118, 54, 216, 247, 118, 54, 215, 73, 118, 54, 216, 
-    162, 118, 54, 244, 15, 118, 54, 244, 114, 118, 54, 219, 111, 118, 54, 
-    220, 116, 118, 54, 245, 184, 118, 54, 228, 195, 118, 54, 123, 240, 210, 
-    118, 54, 123, 216, 147, 118, 21, 210, 86, 118, 21, 110, 118, 21, 105, 
+    195, 118, 54, 200, 118, 54, 216, 248, 118, 54, 215, 73, 118, 54, 216, 
+    163, 118, 54, 244, 16, 118, 54, 244, 115, 118, 54, 219, 112, 118, 54, 
+    220, 117, 118, 54, 245, 185, 118, 54, 228, 196, 118, 54, 123, 240, 211, 
+    118, 54, 123, 216, 148, 118, 21, 210, 86, 118, 21, 110, 118, 21, 105, 
     118, 21, 158, 118, 21, 161, 118, 21, 189, 118, 21, 194, 118, 21, 198, 
-    118, 21, 195, 118, 21, 200, 234, 244, 5, 250, 255, 234, 244, 5, 254, 75, 
-    234, 244, 5, 213, 147, 234, 244, 1, 61, 234, 244, 1, 255, 73, 234, 244, 
-    1, 73, 234, 244, 1, 236, 33, 234, 244, 1, 70, 234, 244, 1, 214, 118, 234, 
-    244, 1, 75, 234, 244, 1, 254, 201, 234, 244, 1, 76, 234, 244, 1, 253, 
-    192, 234, 244, 1, 176, 234, 244, 1, 234, 132, 234, 244, 1, 243, 135, 234, 
-    244, 1, 242, 249, 234, 244, 1, 229, 77, 234, 244, 1, 251, 33, 234, 244, 
-    1, 250, 157, 234, 244, 1, 235, 141, 234, 244, 1, 235, 114, 234, 244, 1, 
-    227, 165, 234, 244, 1, 215, 156, 234, 244, 1, 215, 144, 234, 244, 1, 248, 
-    135, 234, 244, 1, 248, 124, 234, 244, 1, 248, 119, 234, 244, 1, 223, 39, 
-    234, 244, 1, 228, 110, 234, 244, 1, 217, 105, 234, 244, 1, 216, 208, 234, 
-    244, 1, 248, 221, 234, 244, 1, 248, 25, 234, 244, 1, 197, 234, 244, 1, 
-    190, 234, 244, 1, 225, 147, 234, 244, 1, 252, 191, 234, 244, 1, 252, 18, 
-    234, 244, 1, 184, 234, 244, 1, 191, 234, 244, 1, 205, 234, 244, 1, 233, 
-    135, 234, 244, 1, 214, 27, 234, 244, 1, 220, 102, 234, 244, 1, 218, 223, 
-    234, 244, 1, 206, 234, 244, 1, 162, 234, 244, 25, 5, 255, 73, 234, 244, 
-    25, 5, 73, 234, 244, 25, 5, 236, 33, 234, 244, 25, 5, 70, 234, 244, 25, 
-    5, 214, 118, 234, 244, 25, 5, 75, 234, 244, 25, 5, 254, 201, 234, 244, 
-    25, 5, 76, 234, 244, 25, 5, 253, 192, 234, 244, 5, 213, 152, 234, 244, 5, 
-    227, 205, 234, 244, 255, 21, 50, 234, 244, 245, 121, 50, 234, 244, 54, 
-    50, 234, 244, 221, 173, 78, 234, 244, 52, 221, 173, 78, 234, 244, 248, 
-    178, 234, 244, 52, 248, 178, 219, 36, 219, 44, 1, 222, 18, 219, 36, 219, 
-    44, 1, 217, 80, 219, 36, 219, 44, 1, 252, 168, 219, 36, 219, 44, 1, 251, 
-    23, 219, 36, 219, 44, 1, 248, 203, 219, 36, 219, 44, 1, 243, 120, 219, 
-    36, 219, 44, 1, 231, 210, 219, 36, 219, 44, 1, 229, 74, 219, 36, 219, 44, 
-    1, 233, 112, 219, 36, 219, 44, 1, 229, 213, 219, 36, 219, 44, 1, 214, 24, 
-    219, 36, 219, 44, 1, 226, 73, 219, 36, 219, 44, 1, 211, 84, 219, 36, 219, 
-    44, 1, 223, 168, 219, 36, 219, 44, 1, 242, 37, 219, 36, 219, 44, 1, 234, 
-    248, 219, 36, 219, 44, 1, 235, 136, 219, 36, 219, 44, 1, 227, 162, 219, 
-    36, 219, 44, 1, 254, 209, 219, 36, 219, 44, 1, 245, 207, 219, 36, 219, 
-    44, 1, 236, 34, 219, 36, 219, 44, 1, 214, 208, 219, 36, 219, 44, 1, 226, 
-    222, 219, 36, 219, 44, 1, 245, 197, 219, 36, 219, 44, 1, 231, 223, 219, 
-    36, 219, 44, 21, 210, 86, 219, 36, 219, 44, 21, 110, 219, 36, 219, 44, 
-    21, 105, 219, 36, 219, 44, 21, 158, 219, 36, 219, 44, 21, 161, 219, 36, 
-    219, 44, 21, 189, 219, 36, 219, 44, 21, 194, 219, 36, 219, 44, 21, 198, 
-    219, 36, 219, 44, 21, 195, 219, 36, 219, 44, 21, 200, 250, 151, 5, 250, 
-    255, 250, 151, 5, 254, 75, 250, 151, 5, 213, 147, 250, 151, 1, 255, 73, 
-    250, 151, 1, 73, 250, 151, 1, 70, 250, 151, 1, 75, 250, 151, 1, 235, 10, 
-    250, 151, 1, 234, 131, 250, 151, 1, 243, 132, 250, 151, 1, 242, 248, 250, 
-    151, 1, 229, 76, 250, 151, 1, 251, 32, 250, 151, 1, 250, 156, 250, 151, 
-    1, 235, 140, 250, 151, 1, 235, 113, 250, 151, 1, 227, 164, 250, 151, 1, 
-    215, 155, 250, 151, 1, 215, 143, 250, 151, 1, 248, 134, 250, 151, 1, 248, 
-    118, 250, 151, 1, 228, 109, 250, 151, 1, 217, 101, 250, 151, 1, 216, 207, 
-    250, 151, 1, 248, 220, 250, 151, 1, 248, 24, 250, 151, 1, 229, 225, 250, 
-    151, 1, 226, 89, 250, 151, 1, 225, 146, 250, 151, 1, 252, 189, 250, 151, 
-    1, 252, 17, 250, 151, 1, 231, 237, 250, 151, 1, 210, 167, 250, 151, 1, 
-    211, 103, 250, 151, 1, 223, 184, 250, 151, 1, 233, 134, 250, 151, 1, 212, 
-    64, 250, 151, 1, 222, 31, 250, 151, 1, 242, 46, 250, 151, 25, 5, 61, 250, 
-    151, 25, 5, 73, 250, 151, 25, 5, 236, 33, 250, 151, 25, 5, 70, 250, 151, 
-    25, 5, 214, 118, 250, 151, 25, 5, 75, 250, 151, 25, 5, 254, 201, 250, 
-    151, 25, 5, 76, 250, 151, 25, 5, 253, 192, 250, 151, 25, 5, 226, 219, 
-    250, 151, 144, 78, 250, 151, 253, 193, 78, 250, 151, 213, 152, 250, 151, 
-    231, 235, 250, 151, 21, 210, 86, 250, 151, 21, 110, 250, 151, 21, 105, 
-    250, 151, 21, 158, 250, 151, 21, 161, 250, 151, 21, 189, 250, 151, 21, 
-    194, 250, 151, 21, 198, 250, 151, 21, 195, 250, 151, 21, 200, 250, 151, 
-    221, 173, 78, 250, 151, 248, 178, 250, 151, 52, 248, 178, 250, 151, 224, 
-    13, 78, 174, 5, 250, 255, 174, 5, 254, 75, 174, 5, 213, 147, 174, 1, 61, 
-    174, 1, 255, 73, 174, 1, 73, 174, 1, 236, 33, 174, 1, 70, 174, 1, 214, 
-    118, 174, 1, 149, 153, 174, 1, 149, 222, 180, 174, 1, 149, 156, 174, 1, 
-    149, 232, 185, 174, 1, 75, 174, 1, 254, 201, 174, 1, 76, 174, 1, 253, 
-    192, 174, 1, 176, 174, 1, 234, 132, 174, 1, 243, 135, 174, 1, 242, 249, 
-    174, 1, 229, 77, 174, 1, 251, 33, 174, 1, 250, 157, 174, 1, 235, 141, 
-    174, 1, 235, 114, 174, 1, 227, 165, 174, 1, 215, 156, 174, 1, 215, 144, 
-    174, 1, 248, 135, 174, 1, 248, 119, 174, 1, 228, 110, 174, 1, 217, 105, 
-    174, 1, 216, 208, 174, 1, 248, 221, 174, 1, 248, 25, 174, 1, 197, 174, 1, 
-    190, 174, 1, 225, 147, 174, 1, 252, 191, 174, 1, 252, 18, 174, 1, 184, 
-    174, 1, 191, 174, 1, 205, 174, 1, 233, 135, 174, 1, 232, 184, 174, 1, 
-    214, 27, 174, 1, 220, 102, 174, 1, 218, 223, 174, 1, 206, 174, 1, 162, 
-    174, 25, 5, 255, 73, 174, 25, 5, 73, 174, 25, 5, 236, 33, 174, 25, 5, 70, 
-    174, 25, 5, 214, 118, 174, 25, 5, 149, 153, 174, 25, 5, 149, 222, 180, 
-    174, 25, 5, 149, 156, 174, 25, 5, 149, 232, 185, 174, 25, 5, 75, 174, 25, 
-    5, 254, 201, 174, 25, 5, 76, 174, 25, 5, 253, 192, 174, 5, 213, 152, 174, 
-    5, 253, 175, 174, 5, 235, 102, 174, 5, 214, 161, 174, 226, 204, 174, 248, 
-    178, 174, 52, 248, 178, 174, 255, 21, 50, 174, 220, 137, 174, 21, 210, 
+    118, 21, 195, 118, 21, 200, 234, 245, 5, 251, 0, 234, 245, 5, 254, 76, 
+    234, 245, 5, 213, 147, 234, 245, 1, 61, 234, 245, 1, 255, 74, 234, 245, 
+    1, 73, 234, 245, 1, 236, 34, 234, 245, 1, 70, 234, 245, 1, 214, 118, 234, 
+    245, 1, 75, 234, 245, 1, 254, 202, 234, 245, 1, 76, 234, 245, 1, 253, 
+    193, 234, 245, 1, 176, 234, 245, 1, 234, 133, 234, 245, 1, 243, 136, 234, 
+    245, 1, 242, 250, 234, 245, 1, 229, 78, 234, 245, 1, 251, 34, 234, 245, 
+    1, 250, 158, 234, 245, 1, 235, 142, 234, 245, 1, 235, 115, 234, 245, 1, 
+    227, 166, 234, 245, 1, 215, 157, 234, 245, 1, 215, 145, 234, 245, 1, 248, 
+    136, 234, 245, 1, 248, 125, 234, 245, 1, 248, 120, 234, 245, 1, 223, 40, 
+    234, 245, 1, 228, 111, 234, 245, 1, 217, 106, 234, 245, 1, 216, 209, 234, 
+    245, 1, 248, 222, 234, 245, 1, 248, 26, 234, 245, 1, 197, 234, 245, 1, 
+    190, 234, 245, 1, 225, 148, 234, 245, 1, 252, 192, 234, 245, 1, 252, 19, 
+    234, 245, 1, 185, 234, 245, 1, 191, 234, 245, 1, 205, 234, 245, 1, 233, 
+    136, 234, 245, 1, 214, 27, 234, 245, 1, 220, 103, 234, 245, 1, 218, 224, 
+    234, 245, 1, 206, 234, 245, 1, 162, 234, 245, 25, 5, 255, 74, 234, 245, 
+    25, 5, 73, 234, 245, 25, 5, 236, 34, 234, 245, 25, 5, 70, 234, 245, 25, 
+    5, 214, 118, 234, 245, 25, 5, 75, 234, 245, 25, 5, 254, 202, 234, 245, 
+    25, 5, 76, 234, 245, 25, 5, 253, 193, 234, 245, 5, 213, 152, 234, 245, 5, 
+    227, 206, 234, 245, 255, 22, 50, 234, 245, 245, 122, 50, 234, 245, 54, 
+    50, 234, 245, 221, 174, 78, 234, 245, 52, 221, 174, 78, 234, 245, 248, 
+    179, 234, 245, 52, 248, 179, 219, 37, 219, 45, 1, 222, 19, 219, 37, 219, 
+    45, 1, 217, 81, 219, 37, 219, 45, 1, 252, 169, 219, 37, 219, 45, 1, 251, 
+    24, 219, 37, 219, 45, 1, 248, 204, 219, 37, 219, 45, 1, 243, 121, 219, 
+    37, 219, 45, 1, 231, 211, 219, 37, 219, 45, 1, 229, 75, 219, 37, 219, 45, 
+    1, 233, 113, 219, 37, 219, 45, 1, 229, 214, 219, 37, 219, 45, 1, 214, 24, 
+    219, 37, 219, 45, 1, 226, 74, 219, 37, 219, 45, 1, 211, 84, 219, 37, 219, 
+    45, 1, 223, 169, 219, 37, 219, 45, 1, 242, 38, 219, 37, 219, 45, 1, 234, 
+    249, 219, 37, 219, 45, 1, 235, 137, 219, 37, 219, 45, 1, 227, 163, 219, 
+    37, 219, 45, 1, 254, 210, 219, 37, 219, 45, 1, 245, 208, 219, 37, 219, 
+    45, 1, 236, 35, 219, 37, 219, 45, 1, 214, 208, 219, 37, 219, 45, 1, 226, 
+    223, 219, 37, 219, 45, 1, 245, 198, 219, 37, 219, 45, 1, 231, 224, 219, 
+    37, 219, 45, 21, 210, 86, 219, 37, 219, 45, 21, 110, 219, 37, 219, 45, 
+    21, 105, 219, 37, 219, 45, 21, 158, 219, 37, 219, 45, 21, 161, 219, 37, 
+    219, 45, 21, 189, 219, 37, 219, 45, 21, 194, 219, 37, 219, 45, 21, 198, 
+    219, 37, 219, 45, 21, 195, 219, 37, 219, 45, 21, 200, 250, 152, 5, 251, 
+    0, 250, 152, 5, 254, 76, 250, 152, 5, 213, 147, 250, 152, 1, 255, 74, 
+    250, 152, 1, 73, 250, 152, 1, 70, 250, 152, 1, 75, 250, 152, 1, 235, 11, 
+    250, 152, 1, 234, 132, 250, 152, 1, 243, 133, 250, 152, 1, 242, 249, 250, 
+    152, 1, 229, 77, 250, 152, 1, 251, 33, 250, 152, 1, 250, 157, 250, 152, 
+    1, 235, 141, 250, 152, 1, 235, 114, 250, 152, 1, 227, 165, 250, 152, 1, 
+    215, 156, 250, 152, 1, 215, 144, 250, 152, 1, 248, 135, 250, 152, 1, 248, 
+    119, 250, 152, 1, 228, 110, 250, 152, 1, 217, 102, 250, 152, 1, 216, 208, 
+    250, 152, 1, 248, 221, 250, 152, 1, 248, 25, 250, 152, 1, 229, 226, 250, 
+    152, 1, 226, 90, 250, 152, 1, 225, 147, 250, 152, 1, 252, 190, 250, 152, 
+    1, 252, 18, 250, 152, 1, 231, 238, 250, 152, 1, 210, 167, 250, 152, 1, 
+    211, 103, 250, 152, 1, 223, 185, 250, 152, 1, 233, 135, 250, 152, 1, 212, 
+    64, 250, 152, 1, 222, 32, 250, 152, 1, 242, 47, 250, 152, 25, 5, 61, 250, 
+    152, 25, 5, 73, 250, 152, 25, 5, 236, 34, 250, 152, 25, 5, 70, 250, 152, 
+    25, 5, 214, 118, 250, 152, 25, 5, 75, 250, 152, 25, 5, 254, 202, 250, 
+    152, 25, 5, 76, 250, 152, 25, 5, 253, 193, 250, 152, 25, 5, 226, 220, 
+    250, 152, 144, 78, 250, 152, 253, 194, 78, 250, 152, 213, 152, 250, 152, 
+    231, 236, 250, 152, 21, 210, 86, 250, 152, 21, 110, 250, 152, 21, 105, 
+    250, 152, 21, 158, 250, 152, 21, 161, 250, 152, 21, 189, 250, 152, 21, 
+    194, 250, 152, 21, 198, 250, 152, 21, 195, 250, 152, 21, 200, 250, 152, 
+    221, 174, 78, 250, 152, 248, 179, 250, 152, 52, 248, 179, 250, 152, 224, 
+    14, 78, 174, 5, 251, 0, 174, 5, 254, 76, 174, 5, 213, 147, 174, 1, 61, 
+    174, 1, 255, 74, 174, 1, 73, 174, 1, 236, 34, 174, 1, 70, 174, 1, 214, 
+    118, 174, 1, 149, 153, 174, 1, 149, 222, 181, 174, 1, 149, 156, 174, 1, 
+    149, 232, 186, 174, 1, 75, 174, 1, 254, 202, 174, 1, 76, 174, 1, 253, 
+    193, 174, 1, 176, 174, 1, 234, 133, 174, 1, 243, 136, 174, 1, 242, 250, 
+    174, 1, 229, 78, 174, 1, 251, 34, 174, 1, 250, 158, 174, 1, 235, 142, 
+    174, 1, 235, 115, 174, 1, 227, 166, 174, 1, 215, 157, 174, 1, 215, 145, 
+    174, 1, 248, 136, 174, 1, 248, 120, 174, 1, 228, 111, 174, 1, 217, 106, 
+    174, 1, 216, 209, 174, 1, 248, 222, 174, 1, 248, 26, 174, 1, 197, 174, 1, 
+    190, 174, 1, 225, 148, 174, 1, 252, 192, 174, 1, 252, 19, 174, 1, 185, 
+    174, 1, 191, 174, 1, 205, 174, 1, 233, 136, 174, 1, 232, 185, 174, 1, 
+    214, 27, 174, 1, 220, 103, 174, 1, 218, 224, 174, 1, 206, 174, 1, 162, 
+    174, 25, 5, 255, 74, 174, 25, 5, 73, 174, 25, 5, 236, 34, 174, 25, 5, 70, 
+    174, 25, 5, 214, 118, 174, 25, 5, 149, 153, 174, 25, 5, 149, 222, 181, 
+    174, 25, 5, 149, 156, 174, 25, 5, 149, 232, 186, 174, 25, 5, 75, 174, 25, 
+    5, 254, 202, 174, 25, 5, 76, 174, 25, 5, 253, 193, 174, 5, 213, 152, 174, 
+    5, 253, 176, 174, 5, 235, 103, 174, 5, 214, 161, 174, 226, 205, 174, 248, 
+    179, 174, 52, 248, 179, 174, 255, 22, 50, 174, 220, 138, 174, 21, 210, 
     86, 174, 21, 110, 174, 21, 105, 174, 21, 158, 174, 21, 161, 174, 21, 189, 
-    174, 21, 194, 174, 21, 198, 174, 21, 195, 174, 21, 200, 217, 69, 1, 61, 
-    217, 69, 1, 255, 73, 217, 69, 1, 73, 217, 69, 1, 236, 33, 217, 69, 1, 70, 
-    217, 69, 1, 214, 118, 217, 69, 1, 75, 217, 69, 1, 254, 201, 217, 69, 1, 
-    76, 217, 69, 1, 253, 192, 217, 69, 1, 176, 217, 69, 1, 234, 132, 217, 69, 
-    1, 243, 135, 217, 69, 1, 242, 249, 217, 69, 1, 229, 77, 217, 69, 1, 251, 
-    33, 217, 69, 1, 250, 157, 217, 69, 1, 235, 141, 217, 69, 1, 235, 114, 
-    217, 69, 1, 227, 165, 217, 69, 1, 215, 156, 217, 69, 1, 215, 144, 217, 
-    69, 1, 248, 135, 217, 69, 1, 248, 119, 217, 69, 1, 228, 110, 217, 69, 1, 
-    217, 105, 217, 69, 1, 216, 208, 217, 69, 1, 248, 221, 217, 69, 1, 248, 
-    25, 217, 69, 1, 197, 217, 69, 1, 190, 217, 69, 1, 225, 147, 217, 69, 1, 
-    252, 191, 217, 69, 1, 252, 18, 217, 69, 1, 184, 217, 69, 1, 191, 217, 69, 
-    1, 205, 217, 69, 1, 233, 135, 217, 69, 1, 214, 27, 217, 69, 1, 220, 102, 
-    217, 69, 1, 206, 217, 69, 1, 162, 217, 69, 1, 222, 179, 217, 69, 5, 254, 
-    75, 217, 69, 5, 213, 147, 217, 69, 25, 5, 255, 73, 217, 69, 25, 5, 73, 
-    217, 69, 25, 5, 236, 33, 217, 69, 25, 5, 70, 217, 69, 25, 5, 214, 118, 
-    217, 69, 25, 5, 75, 217, 69, 25, 5, 254, 201, 217, 69, 25, 5, 76, 217, 
-    69, 25, 5, 253, 192, 217, 69, 5, 213, 152, 217, 69, 5, 227, 205, 217, 69, 
-    21, 210, 86, 217, 69, 21, 110, 217, 69, 21, 105, 217, 69, 21, 158, 217, 
-    69, 21, 161, 217, 69, 21, 189, 217, 69, 21, 194, 217, 69, 21, 198, 217, 
-    69, 21, 195, 217, 69, 21, 200, 15, 5, 61, 15, 5, 115, 30, 61, 15, 5, 115, 
-    30, 252, 176, 15, 5, 115, 30, 243, 105, 216, 239, 15, 5, 115, 30, 162, 
-    15, 5, 115, 30, 236, 35, 15, 5, 115, 30, 233, 116, 242, 94, 15, 5, 115, 
-    30, 230, 61, 15, 5, 115, 30, 222, 21, 15, 5, 255, 75, 15, 5, 255, 25, 15, 
-    5, 255, 26, 30, 253, 229, 15, 5, 255, 26, 30, 246, 67, 242, 94, 15, 5, 
-    255, 26, 30, 243, 118, 15, 5, 255, 26, 30, 243, 105, 216, 239, 15, 5, 
-    255, 26, 30, 162, 15, 5, 255, 26, 30, 236, 36, 242, 94, 15, 5, 255, 26, 
-    30, 236, 9, 15, 5, 255, 26, 30, 233, 117, 15, 5, 255, 26, 30, 220, 48, 
-    15, 5, 255, 26, 30, 104, 96, 104, 96, 70, 15, 5, 255, 26, 242, 94, 15, 5, 
-    255, 23, 15, 5, 255, 24, 30, 252, 160, 15, 5, 255, 24, 30, 243, 105, 216, 
-    239, 15, 5, 255, 24, 30, 231, 92, 96, 245, 150, 15, 5, 255, 24, 30, 220, 
-    100, 15, 5, 255, 24, 30, 217, 72, 15, 5, 254, 255, 15, 5, 254, 186, 15, 
-    5, 254, 187, 30, 245, 87, 15, 5, 254, 187, 30, 220, 10, 96, 242, 190, 15, 
-    5, 254, 178, 15, 5, 254, 179, 30, 254, 178, 15, 5, 254, 179, 30, 247, 
-    216, 15, 5, 254, 179, 30, 242, 190, 15, 5, 254, 179, 30, 162, 15, 5, 254, 
-    179, 30, 234, 255, 15, 5, 254, 179, 30, 234, 92, 15, 5, 254, 179, 30, 
-    220, 63, 15, 5, 254, 179, 30, 214, 126, 15, 5, 254, 175, 15, 5, 254, 168, 
-    15, 5, 254, 132, 15, 5, 254, 133, 30, 220, 63, 15, 5, 254, 123, 15, 5, 
-    254, 124, 117, 254, 123, 15, 5, 254, 124, 134, 216, 85, 15, 5, 254, 124, 
-    96, 229, 217, 226, 164, 254, 124, 96, 229, 216, 15, 5, 254, 124, 96, 229, 
-    217, 218, 233, 15, 5, 254, 94, 15, 5, 254, 67, 15, 5, 254, 35, 15, 5, 
-    254, 36, 30, 233, 196, 15, 5, 254, 8, 15, 5, 253, 236, 15, 5, 253, 231, 
-    15, 5, 253, 232, 210, 40, 216, 239, 15, 5, 253, 232, 235, 3, 216, 239, 
-    15, 5, 253, 232, 117, 253, 232, 215, 114, 117, 215, 114, 215, 114, 117, 
-    215, 114, 226, 21, 15, 5, 253, 232, 117, 253, 232, 117, 253, 231, 15, 5, 
-    253, 232, 117, 253, 232, 117, 253, 232, 249, 125, 253, 232, 117, 253, 
-    232, 117, 253, 231, 15, 5, 253, 229, 15, 5, 253, 226, 15, 5, 252, 191, 
-    15, 5, 252, 176, 15, 5, 252, 171, 15, 5, 252, 167, 15, 5, 252, 161, 15, 
-    5, 252, 162, 117, 252, 161, 15, 5, 252, 160, 15, 5, 130, 15, 5, 252, 140, 
-    15, 5, 252, 6, 15, 5, 252, 7, 30, 61, 15, 5, 252, 7, 30, 243, 96, 15, 5, 
-    252, 7, 30, 236, 36, 242, 94, 15, 5, 251, 125, 15, 5, 251, 126, 117, 251, 
-    126, 255, 25, 15, 5, 251, 126, 117, 251, 126, 214, 190, 15, 5, 251, 126, 
-    249, 125, 251, 125, 15, 5, 251, 109, 15, 5, 251, 110, 117, 251, 109, 15, 
-    5, 251, 98, 15, 5, 251, 97, 15, 5, 248, 221, 15, 5, 248, 212, 15, 5, 248, 
-    213, 234, 66, 30, 115, 96, 231, 147, 15, 5, 248, 213, 234, 66, 30, 254, 
-    132, 15, 5, 248, 213, 234, 66, 30, 252, 160, 15, 5, 248, 213, 234, 66, 
-    30, 252, 6, 15, 5, 248, 213, 234, 66, 30, 243, 135, 15, 5, 248, 213, 234, 
-    66, 30, 243, 136, 96, 231, 147, 15, 5, 248, 213, 234, 66, 30, 242, 214, 
-    15, 5, 248, 213, 234, 66, 30, 242, 197, 15, 5, 248, 213, 234, 66, 30, 
-    242, 103, 15, 5, 248, 213, 234, 66, 30, 162, 15, 5, 248, 213, 234, 66, 
-    30, 235, 179, 15, 5, 248, 213, 234, 66, 30, 235, 180, 96, 232, 98, 15, 5, 
-    248, 213, 234, 66, 30, 234, 242, 15, 5, 248, 213, 234, 66, 30, 233, 135, 
-    15, 5, 248, 213, 234, 66, 30, 232, 98, 15, 5, 248, 213, 234, 66, 30, 232, 
-    99, 96, 231, 146, 15, 5, 248, 213, 234, 66, 30, 232, 84, 15, 5, 248, 213, 
-    234, 66, 30, 229, 107, 15, 5, 248, 213, 234, 66, 30, 226, 22, 96, 226, 
-    21, 15, 5, 248, 213, 234, 66, 30, 219, 191, 15, 5, 248, 213, 234, 66, 30, 
-    217, 72, 15, 5, 248, 213, 234, 66, 30, 214, 231, 96, 242, 197, 15, 5, 
-    248, 213, 234, 66, 30, 214, 126, 15, 5, 248, 187, 15, 5, 248, 166, 15, 5, 
-    248, 165, 15, 5, 248, 164, 15, 5, 248, 3, 15, 5, 247, 242, 15, 5, 247, 
-    217, 15, 5, 247, 218, 30, 220, 63, 15, 5, 247, 216, 15, 5, 247, 206, 15, 
-    5, 247, 207, 234, 208, 104, 242, 95, 247, 187, 15, 5, 247, 187, 15, 5, 
-    246, 78, 15, 5, 246, 79, 117, 246, 78, 15, 5, 246, 79, 242, 94, 15, 5, 
-    246, 79, 220, 45, 15, 5, 246, 76, 15, 5, 246, 77, 30, 245, 72, 15, 5, 
-    246, 75, 15, 5, 246, 74, 15, 5, 246, 73, 15, 5, 246, 72, 15, 5, 246, 68, 
-    15, 5, 246, 66, 15, 5, 246, 67, 242, 94, 15, 5, 246, 67, 242, 95, 242, 
-    94, 15, 5, 246, 65, 15, 5, 246, 58, 15, 5, 75, 15, 5, 160, 30, 226, 21, 
-    15, 5, 160, 117, 160, 227, 195, 117, 227, 194, 15, 5, 245, 234, 15, 5, 
-    245, 235, 30, 115, 96, 242, 49, 96, 248, 221, 15, 5, 245, 235, 30, 243, 
-    96, 15, 5, 245, 235, 30, 230, 230, 15, 5, 245, 235, 30, 222, 8, 15, 5, 
-    245, 235, 30, 220, 63, 15, 5, 245, 235, 30, 70, 15, 5, 245, 211, 15, 5, 
-    245, 200, 15, 5, 245, 174, 15, 5, 245, 150, 15, 5, 245, 151, 30, 243, 
-    104, 15, 5, 245, 151, 30, 243, 105, 216, 239, 15, 5, 245, 151, 30, 231, 
-    91, 15, 5, 245, 151, 249, 125, 245, 150, 15, 5, 245, 151, 226, 164, 245, 
-    150, 15, 5, 245, 151, 218, 233, 15, 5, 245, 89, 15, 5, 245, 87, 15, 5, 
-    245, 72, 15, 5, 245, 10, 15, 5, 245, 11, 30, 61, 15, 5, 245, 11, 30, 115, 
-    96, 233, 104, 15, 5, 245, 11, 30, 115, 96, 233, 105, 30, 233, 104, 15, 5, 
-    245, 11, 30, 254, 123, 15, 5, 245, 11, 30, 252, 176, 15, 5, 245, 11, 30, 
-    246, 67, 242, 94, 15, 5, 245, 11, 30, 246, 67, 242, 95, 242, 94, 15, 5, 
-    245, 11, 30, 162, 15, 5, 245, 11, 30, 242, 49, 242, 94, 15, 5, 245, 11, 
-    30, 236, 36, 242, 94, 15, 5, 245, 11, 30, 234, 207, 15, 5, 245, 11, 30, 
-    234, 208, 218, 233, 15, 5, 245, 11, 30, 233, 215, 15, 5, 245, 11, 30, 
-    233, 135, 15, 5, 245, 11, 30, 233, 105, 30, 233, 104, 15, 5, 245, 11, 30, 
-    232, 241, 15, 5, 245, 11, 30, 232, 98, 15, 5, 245, 11, 30, 214, 230, 15, 
-    5, 245, 11, 30, 214, 219, 15, 5, 243, 135, 15, 5, 243, 136, 242, 94, 15, 
-    5, 243, 133, 15, 5, 243, 134, 30, 115, 96, 248, 222, 96, 162, 15, 5, 243, 
-    134, 30, 115, 96, 162, 15, 5, 243, 134, 30, 115, 96, 236, 35, 15, 5, 243, 
-    134, 30, 255, 24, 216, 240, 96, 217, 93, 15, 5, 243, 134, 30, 254, 123, 
-    15, 5, 243, 134, 30, 253, 231, 15, 5, 243, 134, 30, 253, 230, 96, 243, 
-    118, 15, 5, 243, 134, 30, 252, 176, 15, 5, 243, 134, 30, 252, 141, 96, 
-    205, 15, 5, 243, 134, 30, 251, 98, 15, 5, 243, 134, 30, 251, 99, 96, 205, 
-    15, 5, 243, 134, 30, 248, 221, 15, 5, 243, 134, 30, 248, 3, 15, 5, 243, 
-    134, 30, 247, 218, 30, 220, 63, 15, 5, 243, 134, 30, 246, 76, 15, 5, 243, 
-    134, 30, 245, 174, 15, 5, 243, 134, 30, 245, 175, 96, 233, 135, 15, 5, 
-    243, 134, 30, 245, 150, 15, 5, 243, 134, 30, 245, 151, 30, 243, 105, 216, 
-    239, 15, 5, 243, 134, 30, 243, 105, 216, 239, 15, 5, 243, 134, 30, 243, 
-    96, 15, 5, 243, 134, 30, 242, 214, 15, 5, 243, 134, 30, 242, 212, 15, 5, 
-    243, 134, 30, 242, 213, 96, 61, 15, 5, 243, 134, 30, 242, 198, 96, 218, 
-    83, 15, 5, 243, 134, 30, 242, 49, 96, 232, 99, 96, 245, 72, 15, 5, 243, 
-    134, 30, 242, 30, 15, 5, 243, 134, 30, 242, 31, 96, 233, 135, 15, 5, 243, 
-    134, 30, 241, 181, 96, 232, 241, 15, 5, 243, 134, 30, 240, 218, 15, 5, 
-    243, 134, 30, 236, 36, 242, 94, 15, 5, 243, 134, 30, 235, 166, 96, 240, 
-    223, 96, 253, 231, 15, 5, 243, 134, 30, 234, 242, 15, 5, 243, 134, 30, 
-    234, 207, 15, 5, 243, 134, 30, 234, 89, 15, 5, 243, 134, 30, 234, 90, 96, 
-    233, 104, 15, 5, 243, 134, 30, 233, 216, 96, 254, 123, 15, 5, 243, 134, 
-    30, 233, 135, 15, 5, 243, 134, 30, 231, 92, 96, 245, 150, 15, 5, 243, 
-    134, 30, 230, 230, 15, 5, 243, 134, 30, 227, 194, 15, 5, 243, 134, 30, 
-    227, 195, 117, 227, 194, 15, 5, 243, 134, 30, 190, 15, 5, 243, 134, 30, 
-    222, 8, 15, 5, 243, 134, 30, 221, 231, 15, 5, 243, 134, 30, 220, 63, 15, 
-    5, 243, 134, 30, 220, 64, 96, 215, 98, 15, 5, 243, 134, 30, 220, 30, 15, 
-    5, 243, 134, 30, 218, 43, 15, 5, 243, 134, 30, 217, 72, 15, 5, 243, 134, 
-    30, 70, 15, 5, 243, 134, 30, 214, 219, 15, 5, 243, 134, 30, 214, 220, 96, 
-    246, 78, 15, 5, 243, 134, 117, 243, 133, 15, 5, 243, 128, 15, 5, 243, 
-    129, 249, 125, 243, 128, 15, 5, 243, 126, 15, 5, 243, 127, 117, 243, 127, 
-    243, 97, 117, 243, 96, 15, 5, 243, 118, 15, 5, 243, 119, 243, 127, 117, 
-    243, 127, 243, 97, 117, 243, 96, 15, 5, 243, 117, 15, 5, 243, 115, 15, 5, 
-    243, 106, 15, 5, 243, 104, 15, 5, 243, 105, 216, 239, 15, 5, 243, 105, 
-    117, 243, 104, 15, 5, 243, 105, 249, 125, 243, 104, 15, 5, 243, 96, 15, 
-    5, 243, 95, 15, 5, 243, 90, 15, 5, 243, 36, 15, 5, 243, 37, 30, 233, 196, 
-    15, 5, 242, 214, 15, 5, 242, 215, 30, 75, 15, 5, 242, 215, 30, 70, 15, 5, 
-    242, 215, 249, 125, 242, 214, 15, 5, 242, 212, 15, 5, 242, 213, 117, 242, 
-    212, 15, 5, 242, 213, 249, 125, 242, 212, 15, 5, 242, 209, 15, 5, 242, 
-    197, 15, 5, 242, 198, 242, 94, 15, 5, 242, 195, 15, 5, 242, 196, 30, 115, 
-    96, 236, 35, 15, 5, 242, 196, 30, 243, 105, 216, 239, 15, 5, 242, 196, 
-    30, 236, 35, 15, 5, 242, 196, 30, 232, 99, 96, 236, 35, 15, 5, 242, 196, 
-    30, 190, 15, 5, 242, 192, 15, 5, 242, 190, 15, 5, 242, 191, 249, 125, 
-    242, 190, 15, 5, 242, 191, 30, 252, 176, 15, 5, 242, 191, 30, 217, 72, 
-    15, 5, 242, 191, 216, 239, 15, 5, 242, 113, 15, 5, 242, 114, 249, 125, 
-    242, 113, 15, 5, 242, 111, 15, 5, 242, 112, 30, 234, 242, 15, 5, 242, 
-    112, 30, 234, 243, 30, 236, 36, 242, 94, 15, 5, 242, 112, 30, 227, 194, 
-    15, 5, 242, 112, 30, 222, 9, 96, 215, 113, 15, 5, 242, 112, 242, 94, 15, 
-    5, 242, 103, 15, 5, 242, 104, 30, 115, 96, 233, 196, 15, 5, 242, 104, 30, 
-    233, 196, 15, 5, 242, 104, 117, 242, 104, 232, 91, 15, 5, 242, 98, 15, 5, 
-    242, 96, 15, 5, 242, 97, 30, 220, 63, 15, 5, 242, 88, 15, 5, 242, 87, 15, 
-    5, 242, 84, 15, 5, 242, 83, 15, 5, 162, 15, 5, 242, 49, 216, 239, 15, 5, 
-    242, 49, 242, 94, 15, 5, 242, 30, 15, 5, 241, 180, 15, 5, 241, 181, 30, 
-    253, 231, 15, 5, 241, 181, 30, 253, 229, 15, 5, 241, 181, 30, 252, 176, 
-    15, 5, 241, 181, 30, 247, 187, 15, 5, 241, 181, 30, 243, 126, 15, 5, 241, 
-    181, 30, 234, 81, 15, 5, 241, 181, 30, 227, 194, 15, 5, 241, 181, 30, 
-    220, 63, 15, 5, 241, 181, 30, 70, 15, 5, 240, 222, 15, 5, 240, 218, 15, 
-    5, 240, 219, 30, 254, 123, 15, 5, 240, 219, 30, 242, 30, 15, 5, 240, 219, 
-    30, 234, 207, 15, 5, 240, 219, 30, 232, 197, 15, 5, 240, 219, 30, 214, 
-    219, 15, 5, 240, 215, 15, 5, 73, 15, 5, 240, 154, 61, 15, 5, 240, 115, 
-    15, 5, 236, 63, 15, 5, 236, 64, 117, 236, 64, 251, 98, 15, 5, 236, 64, 
-    117, 236, 64, 218, 233, 15, 5, 236, 38, 15, 5, 236, 35, 15, 5, 236, 36, 
-    247, 242, 15, 5, 236, 36, 223, 35, 15, 5, 236, 36, 117, 236, 36, 220, 14, 
-    117, 220, 14, 214, 220, 117, 214, 219, 15, 5, 236, 36, 242, 94, 15, 5, 
-    236, 27, 15, 5, 236, 28, 30, 243, 105, 216, 239, 15, 5, 236, 26, 15, 5, 
-    236, 16, 15, 5, 236, 17, 30, 217, 72, 15, 5, 236, 17, 249, 125, 236, 16, 
-    15, 5, 236, 17, 226, 164, 236, 16, 15, 5, 236, 17, 218, 233, 15, 5, 236, 
-    9, 15, 5, 235, 255, 15, 5, 235, 179, 15, 5, 235, 165, 15, 5, 176, 15, 5, 
-    235, 13, 30, 61, 15, 5, 235, 13, 30, 254, 255, 15, 5, 235, 13, 30, 255, 
-    0, 96, 233, 215, 15, 5, 235, 13, 30, 253, 229, 15, 5, 235, 13, 30, 252, 
-    176, 15, 5, 235, 13, 30, 252, 160, 15, 5, 235, 13, 30, 130, 15, 5, 235, 
-    13, 30, 252, 6, 15, 5, 235, 13, 30, 245, 87, 15, 5, 235, 13, 30, 245, 72, 
-    15, 5, 235, 13, 30, 243, 135, 15, 5, 235, 13, 30, 243, 118, 15, 5, 235, 
-    13, 30, 243, 105, 216, 239, 15, 5, 235, 13, 30, 243, 96, 15, 5, 235, 13, 
-    30, 243, 97, 96, 220, 101, 96, 61, 15, 5, 235, 13, 30, 242, 214, 15, 5, 
-    235, 13, 30, 242, 197, 15, 5, 235, 13, 30, 242, 191, 96, 221, 231, 15, 5, 
-    235, 13, 30, 242, 191, 249, 125, 242, 190, 15, 5, 235, 13, 30, 242, 113, 
-    15, 5, 235, 13, 30, 242, 87, 15, 5, 235, 13, 30, 236, 35, 15, 5, 235, 13, 
-    30, 236, 16, 15, 5, 235, 13, 30, 234, 242, 15, 5, 235, 13, 30, 234, 92, 
-    15, 5, 235, 13, 30, 234, 89, 15, 5, 235, 13, 30, 232, 241, 15, 5, 235, 
-    13, 30, 232, 98, 15, 5, 235, 13, 30, 231, 91, 15, 5, 235, 13, 30, 231, 
-    92, 96, 246, 78, 15, 5, 235, 13, 30, 231, 92, 96, 242, 214, 15, 5, 235, 
-    13, 30, 231, 92, 96, 217, 22, 15, 5, 235, 13, 30, 230, 230, 15, 5, 235, 
-    13, 30, 230, 231, 96, 227, 189, 15, 5, 235, 13, 30, 229, 107, 15, 5, 235, 
-    13, 30, 227, 194, 15, 5, 235, 13, 30, 225, 108, 15, 5, 235, 13, 30, 222, 
-    140, 15, 5, 235, 13, 30, 206, 15, 5, 235, 13, 30, 221, 231, 15, 5, 235, 
-    13, 30, 220, 102, 15, 5, 235, 13, 30, 220, 63, 15, 5, 235, 13, 30, 220, 
-    30, 15, 5, 235, 13, 30, 219, 225, 15, 5, 235, 13, 30, 219, 182, 15, 5, 
-    235, 13, 30, 218, 51, 15, 5, 235, 13, 30, 217, 50, 15, 5, 235, 13, 30, 
-    70, 15, 5, 235, 13, 30, 214, 230, 15, 5, 235, 13, 30, 214, 219, 15, 5, 
-    235, 13, 30, 214, 193, 30, 190, 15, 5, 235, 13, 30, 214, 126, 15, 5, 235, 
-    13, 30, 210, 44, 15, 5, 235, 11, 15, 5, 235, 12, 249, 125, 235, 11, 15, 
-    5, 235, 4, 15, 5, 235, 1, 15, 5, 234, 255, 15, 5, 234, 254, 15, 5, 234, 
-    252, 15, 5, 234, 253, 117, 234, 252, 15, 5, 234, 242, 15, 5, 234, 243, 
-    30, 236, 36, 242, 94, 15, 5, 234, 238, 15, 5, 234, 239, 30, 252, 176, 15, 
-    5, 234, 239, 249, 125, 234, 238, 15, 5, 234, 236, 15, 5, 234, 235, 15, 5, 
-    234, 207, 15, 5, 234, 208, 233, 118, 30, 104, 117, 233, 118, 30, 70, 15, 
-    5, 234, 208, 117, 234, 208, 233, 118, 30, 104, 117, 233, 118, 30, 70, 15, 
-    5, 234, 157, 15, 5, 234, 92, 15, 5, 234, 93, 30, 252, 176, 15, 5, 234, 
-    93, 30, 70, 15, 5, 234, 93, 30, 214, 219, 15, 5, 234, 89, 15, 5, 234, 81, 
-    15, 5, 234, 68, 15, 5, 234, 67, 15, 5, 234, 65, 15, 5, 234, 66, 117, 234, 
-    65, 15, 5, 233, 217, 15, 5, 233, 218, 117, 241, 181, 30, 253, 230, 233, 
-    218, 117, 241, 181, 30, 253, 229, 15, 5, 233, 215, 15, 5, 233, 213, 15, 
-    5, 233, 214, 214, 12, 17, 15, 5, 233, 212, 15, 5, 233, 209, 15, 5, 233, 
-    210, 242, 94, 15, 5, 233, 208, 15, 5, 233, 196, 15, 5, 233, 197, 226, 
-    164, 233, 196, 15, 5, 233, 191, 15, 5, 233, 172, 15, 5, 233, 135, 15, 5, 
-    233, 117, 15, 5, 233, 118, 30, 61, 15, 5, 233, 118, 30, 115, 96, 248, 
-    222, 96, 162, 15, 5, 233, 118, 30, 115, 96, 243, 96, 15, 5, 233, 118, 30, 
-    115, 96, 233, 104, 15, 5, 233, 118, 30, 254, 178, 15, 5, 233, 118, 30, 
-    254, 123, 15, 5, 233, 118, 30, 253, 232, 210, 40, 216, 239, 15, 5, 233, 
-    118, 30, 252, 176, 15, 5, 233, 118, 30, 252, 6, 15, 5, 233, 118, 30, 248, 
-    166, 15, 5, 233, 118, 30, 245, 150, 15, 5, 233, 118, 30, 243, 135, 15, 5, 
-    233, 118, 30, 243, 96, 15, 5, 233, 118, 30, 242, 103, 15, 5, 233, 118, 
-    30, 242, 104, 96, 242, 103, 15, 5, 233, 118, 30, 162, 15, 5, 233, 118, 
-    30, 242, 30, 15, 5, 233, 118, 30, 241, 181, 30, 227, 194, 15, 5, 233, 
-    118, 30, 236, 36, 242, 94, 15, 5, 233, 118, 30, 236, 16, 15, 5, 233, 118, 
-    30, 236, 17, 96, 162, 15, 5, 233, 118, 30, 236, 17, 96, 232, 98, 15, 5, 
-    233, 118, 30, 234, 92, 15, 5, 233, 118, 30, 234, 81, 15, 5, 233, 118, 30, 
-    233, 215, 15, 5, 233, 118, 30, 233, 209, 15, 5, 233, 118, 30, 233, 210, 
-    96, 241, 181, 96, 61, 15, 5, 233, 118, 30, 233, 117, 15, 5, 233, 118, 30, 
-    232, 197, 15, 5, 233, 118, 30, 232, 98, 15, 5, 233, 118, 30, 232, 86, 15, 
-    5, 233, 118, 30, 231, 91, 15, 5, 233, 118, 30, 231, 92, 96, 245, 150, 15, 
-    5, 233, 118, 30, 230, 61, 15, 5, 233, 118, 30, 229, 107, 15, 5, 233, 118, 
-    30, 220, 64, 96, 218, 43, 15, 5, 233, 118, 30, 220, 10, 96, 242, 191, 96, 
-    245, 87, 15, 5, 233, 118, 30, 220, 10, 96, 242, 191, 216, 239, 15, 5, 
-    233, 118, 30, 219, 223, 15, 5, 233, 118, 30, 219, 224, 96, 219, 223, 15, 
-    5, 233, 118, 30, 218, 43, 15, 5, 233, 118, 30, 217, 84, 15, 5, 233, 118, 
-    30, 217, 72, 15, 5, 233, 118, 30, 217, 23, 96, 115, 96, 218, 84, 96, 197, 
-    15, 5, 233, 118, 30, 70, 15, 5, 233, 118, 30, 104, 96, 61, 15, 5, 233, 
-    118, 30, 104, 96, 104, 96, 70, 15, 5, 233, 118, 30, 214, 231, 96, 253, 
-    231, 15, 5, 233, 118, 30, 214, 219, 15, 5, 233, 118, 30, 214, 126, 15, 5, 
-    233, 118, 218, 233, 15, 5, 233, 115, 15, 5, 233, 116, 30, 220, 63, 15, 5, 
-    233, 116, 30, 220, 64, 96, 218, 43, 15, 5, 233, 116, 242, 94, 15, 5, 233, 
-    116, 242, 95, 117, 233, 116, 242, 95, 220, 63, 15, 5, 233, 111, 15, 5, 
-    233, 104, 15, 5, 233, 105, 30, 233, 104, 15, 5, 233, 102, 15, 5, 233, 
-    103, 30, 233, 196, 15, 5, 233, 103, 30, 233, 197, 96, 222, 140, 15, 5, 
-    232, 241, 15, 5, 232, 226, 15, 5, 232, 216, 15, 5, 232, 197, 15, 5, 232, 
-    98, 15, 5, 232, 99, 30, 252, 176, 15, 5, 232, 96, 15, 5, 232, 97, 30, 
-    254, 178, 15, 5, 232, 97, 30, 252, 176, 15, 5, 232, 97, 30, 245, 72, 15, 
-    5, 232, 97, 30, 245, 73, 216, 239, 15, 5, 232, 97, 30, 243, 105, 216, 
-    239, 15, 5, 232, 97, 30, 241, 181, 30, 252, 176, 15, 5, 232, 97, 30, 236, 
-    16, 15, 5, 232, 97, 30, 235, 1, 15, 5, 232, 97, 30, 234, 255, 15, 5, 232, 
-    97, 30, 235, 0, 96, 253, 231, 15, 5, 232, 97, 30, 234, 92, 15, 5, 232, 
-    97, 30, 233, 136, 96, 253, 231, 15, 5, 232, 97, 30, 233, 117, 15, 5, 232, 
-    97, 30, 231, 92, 96, 245, 150, 15, 5, 232, 97, 30, 229, 107, 15, 5, 232, 
-    97, 30, 227, 237, 15, 5, 232, 97, 30, 219, 192, 96, 253, 231, 15, 5, 232, 
-    97, 30, 219, 174, 96, 251, 125, 15, 5, 232, 97, 30, 215, 113, 15, 5, 232, 
-    97, 216, 239, 15, 5, 232, 97, 249, 125, 232, 96, 15, 5, 232, 97, 226, 
-    164, 232, 96, 15, 5, 232, 97, 218, 233, 15, 5, 232, 97, 220, 45, 15, 5, 
-    232, 95, 15, 5, 232, 91, 15, 5, 232, 92, 117, 232, 91, 15, 5, 232, 92, 
-    226, 164, 232, 91, 15, 5, 232, 92, 220, 45, 15, 5, 232, 89, 15, 5, 232, 
-    86, 15, 5, 232, 84, 15, 5, 232, 85, 117, 232, 84, 15, 5, 232, 85, 117, 
-    232, 85, 243, 97, 117, 243, 96, 15, 5, 184, 15, 5, 231, 239, 30, 217, 72, 
-    15, 5, 231, 239, 242, 94, 15, 5, 231, 238, 15, 5, 231, 210, 15, 5, 231, 
-    166, 15, 5, 231, 147, 15, 5, 231, 146, 15, 5, 231, 91, 15, 5, 231, 47, 
-    15, 5, 230, 230, 15, 5, 230, 188, 15, 5, 230, 102, 15, 5, 230, 103, 117, 
-    230, 102, 15, 5, 230, 93, 15, 5, 230, 94, 242, 94, 15, 5, 230, 78, 15, 5, 
-    230, 64, 15, 5, 230, 61, 15, 5, 230, 62, 30, 61, 15, 5, 230, 62, 30, 233, 
-    196, 15, 5, 230, 62, 30, 210, 116, 15, 5, 230, 62, 117, 230, 61, 15, 5, 
-    230, 62, 117, 230, 62, 30, 115, 96, 197, 15, 5, 230, 62, 249, 125, 230, 
-    61, 15, 5, 230, 59, 15, 5, 230, 60, 30, 61, 15, 5, 230, 60, 30, 115, 96, 
-    248, 3, 15, 5, 230, 60, 30, 248, 3, 15, 5, 230, 60, 242, 94, 15, 5, 197, 
-    15, 5, 229, 227, 15, 5, 229, 216, 15, 5, 229, 217, 235, 192, 15, 5, 229, 
-    217, 30, 219, 226, 216, 239, 15, 5, 229, 217, 226, 164, 229, 216, 15, 5, 
-    229, 215, 15, 5, 229, 208, 227, 180, 15, 5, 229, 207, 15, 5, 229, 206, 
-    15, 5, 229, 107, 15, 5, 229, 108, 30, 61, 15, 5, 229, 108, 30, 214, 219, 
-    15, 5, 229, 108, 220, 45, 15, 5, 228, 233, 15, 5, 228, 234, 30, 75, 15, 
-    5, 228, 232, 15, 5, 228, 203, 15, 5, 228, 204, 30, 243, 105, 216, 239, 
-    15, 5, 228, 204, 30, 243, 97, 96, 243, 105, 216, 239, 15, 5, 228, 201, 
-    15, 5, 228, 202, 30, 254, 123, 15, 5, 228, 202, 30, 253, 231, 15, 5, 228, 
-    202, 30, 253, 232, 96, 253, 231, 15, 5, 228, 202, 30, 242, 103, 15, 5, 
-    228, 202, 30, 231, 92, 96, 243, 105, 216, 239, 15, 5, 228, 202, 30, 229, 
-    107, 15, 5, 228, 202, 30, 227, 194, 15, 5, 228, 202, 30, 220, 63, 15, 5, 
-    228, 202, 30, 220, 64, 96, 115, 254, 123, 15, 5, 228, 202, 30, 220, 64, 
-    96, 253, 231, 15, 5, 228, 202, 30, 220, 64, 96, 253, 232, 96, 253, 231, 
-    15, 5, 228, 202, 30, 214, 231, 96, 253, 231, 15, 5, 228, 202, 30, 214, 
-    126, 15, 5, 228, 190, 15, 5, 227, 237, 15, 5, 227, 210, 15, 5, 227, 194, 
-    15, 5, 227, 195, 233, 116, 30, 243, 96, 15, 5, 227, 195, 233, 116, 30, 
-    231, 147, 15, 5, 227, 195, 233, 116, 30, 222, 8, 15, 5, 227, 195, 233, 
-    116, 30, 222, 9, 117, 227, 195, 233, 116, 30, 222, 8, 15, 5, 227, 195, 
-    233, 116, 30, 214, 126, 15, 5, 227, 195, 216, 239, 15, 5, 227, 195, 117, 
-    227, 194, 15, 5, 227, 195, 249, 125, 227, 194, 15, 5, 227, 195, 249, 125, 
-    227, 195, 233, 116, 117, 233, 115, 15, 5, 227, 189, 15, 5, 227, 190, 255, 
-    24, 30, 253, 226, 15, 5, 227, 190, 255, 24, 30, 252, 6, 15, 5, 227, 190, 
-    255, 24, 30, 246, 74, 15, 5, 227, 190, 255, 24, 30, 242, 103, 15, 5, 227, 
-    190, 255, 24, 30, 236, 36, 242, 94, 15, 5, 227, 190, 255, 24, 30, 234, 
-    255, 15, 5, 227, 190, 255, 24, 30, 233, 135, 15, 5, 227, 190, 255, 24, 
-    30, 229, 107, 15, 5, 227, 190, 255, 24, 30, 219, 171, 15, 5, 227, 190, 
-    255, 24, 30, 214, 230, 15, 5, 227, 190, 234, 66, 30, 252, 6, 15, 5, 227, 
-    190, 234, 66, 30, 252, 7, 70, 15, 5, 190, 15, 5, 226, 80, 15, 5, 226, 47, 
-    15, 5, 226, 21, 15, 5, 225, 161, 15, 5, 225, 108, 15, 5, 225, 109, 30, 
-    61, 15, 5, 225, 109, 30, 255, 25, 15, 5, 225, 109, 30, 252, 6, 15, 5, 
-    225, 109, 30, 251, 125, 15, 5, 225, 109, 30, 75, 15, 5, 225, 109, 30, 73, 
-    15, 5, 225, 109, 30, 240, 115, 15, 5, 225, 109, 30, 70, 15, 5, 225, 109, 
-    30, 214, 230, 15, 5, 225, 109, 249, 125, 225, 108, 15, 5, 225, 53, 15, 5, 
-    225, 54, 30, 234, 238, 15, 5, 225, 54, 30, 214, 219, 15, 5, 225, 54, 30, 
-    210, 116, 15, 5, 225, 54, 226, 164, 225, 53, 15, 5, 205, 15, 5, 223, 182, 
-    15, 5, 223, 35, 15, 5, 222, 140, 15, 5, 206, 15, 5, 222, 22, 227, 180, 
-    15, 5, 222, 21, 15, 5, 222, 22, 30, 61, 15, 5, 222, 22, 30, 246, 78, 15, 
-    5, 222, 22, 30, 246, 76, 15, 5, 222, 22, 30, 162, 15, 5, 222, 22, 30, 
-    234, 242, 15, 5, 222, 22, 30, 233, 196, 15, 5, 222, 22, 30, 232, 84, 15, 
-    5, 222, 22, 30, 230, 230, 15, 5, 222, 22, 30, 227, 194, 15, 5, 222, 22, 
-    30, 222, 8, 15, 5, 222, 22, 30, 220, 30, 15, 5, 222, 22, 30, 217, 93, 15, 
-    5, 222, 22, 30, 214, 230, 15, 5, 222, 22, 30, 214, 225, 15, 5, 222, 22, 
-    30, 214, 197, 15, 5, 222, 22, 30, 214, 150, 15, 5, 222, 22, 30, 214, 126, 
-    15, 5, 222, 22, 117, 222, 21, 15, 5, 222, 22, 242, 94, 15, 5, 222, 8, 15, 
-    5, 222, 9, 233, 118, 30, 253, 229, 15, 5, 221, 239, 15, 5, 221, 231, 15, 
-    5, 220, 102, 15, 5, 220, 100, 15, 5, 220, 101, 30, 61, 15, 5, 220, 101, 
-    30, 252, 176, 15, 5, 220, 101, 30, 242, 190, 15, 5, 220, 101, 30, 229, 
-    107, 15, 5, 220, 101, 30, 219, 223, 15, 5, 220, 101, 30, 215, 98, 15, 5, 
-    220, 101, 30, 70, 15, 5, 220, 101, 30, 104, 96, 61, 15, 5, 220, 99, 15, 
-    5, 220, 97, 15, 5, 220, 78, 15, 5, 220, 63, 15, 5, 220, 64, 240, 222, 15, 
-    5, 220, 64, 117, 220, 64, 243, 127, 117, 243, 127, 243, 97, 117, 243, 96, 
-    15, 5, 220, 64, 117, 220, 64, 217, 94, 117, 217, 94, 243, 97, 117, 243, 
-    96, 15, 5, 220, 56, 15, 5, 220, 51, 15, 5, 220, 48, 15, 5, 220, 47, 15, 
-    5, 220, 44, 15, 5, 220, 30, 15, 5, 220, 31, 30, 61, 15, 5, 220, 31, 30, 
-    236, 16, 15, 5, 220, 24, 15, 5, 220, 25, 30, 61, 15, 5, 220, 25, 30, 252, 
-    161, 15, 5, 220, 25, 30, 251, 109, 15, 5, 220, 25, 30, 247, 206, 15, 5, 
-    220, 25, 30, 243, 96, 15, 5, 220, 25, 30, 236, 35, 15, 5, 220, 25, 30, 
-    236, 36, 242, 94, 15, 5, 220, 25, 30, 233, 191, 15, 5, 220, 25, 30, 232, 
-    86, 15, 5, 220, 25, 30, 230, 93, 15, 5, 220, 25, 30, 222, 8, 15, 5, 220, 
-    18, 15, 5, 220, 13, 15, 5, 220, 14, 216, 239, 15, 5, 220, 14, 117, 220, 
-    14, 251, 99, 117, 251, 98, 15, 5, 220, 9, 15, 5, 219, 225, 15, 5, 219, 
-    226, 117, 235, 193, 219, 225, 15, 5, 219, 223, 15, 5, 219, 222, 15, 5, 
-    219, 191, 15, 5, 219, 192, 242, 94, 15, 5, 219, 182, 15, 5, 219, 180, 15, 
-    5, 219, 181, 117, 219, 181, 219, 223, 15, 5, 219, 173, 15, 5, 219, 171, 
-    15, 5, 218, 83, 15, 5, 218, 84, 117, 218, 83, 15, 5, 218, 54, 15, 5, 218, 
-    53, 15, 5, 218, 51, 15, 5, 218, 43, 15, 5, 218, 42, 15, 5, 218, 17, 15, 
-    5, 218, 16, 15, 5, 217, 105, 15, 5, 217, 106, 253, 216, 15, 5, 217, 106, 
-    30, 241, 180, 15, 5, 217, 106, 30, 230, 230, 15, 5, 217, 106, 242, 94, 
-    15, 5, 217, 93, 15, 5, 217, 94, 117, 217, 94, 228, 234, 117, 228, 234, 
-    247, 188, 117, 247, 187, 15, 5, 217, 94, 218, 233, 15, 5, 217, 84, 15, 5, 
-    129, 30, 252, 6, 15, 5, 129, 30, 242, 103, 15, 5, 129, 30, 220, 63, 15, 
-    5, 129, 30, 219, 225, 15, 5, 129, 30, 215, 113, 15, 5, 129, 30, 214, 219, 
-    15, 5, 217, 72, 15, 5, 217, 50, 15, 5, 217, 22, 15, 5, 217, 23, 242, 94, 
-    15, 5, 216, 117, 15, 5, 216, 118, 216, 239, 15, 5, 216, 90, 15, 5, 216, 
-    72, 15, 5, 216, 73, 30, 217, 72, 15, 5, 216, 73, 117, 216, 72, 15, 5, 
-    216, 73, 117, 216, 73, 243, 127, 117, 243, 127, 243, 97, 117, 243, 96, 
-    15, 5, 215, 118, 15, 5, 215, 113, 15, 5, 215, 111, 15, 5, 215, 108, 15, 
-    5, 215, 98, 15, 5, 215, 99, 117, 215, 99, 210, 117, 117, 210, 116, 15, 5, 
-    70, 15, 5, 104, 242, 103, 15, 5, 104, 104, 70, 15, 5, 104, 117, 104, 226, 
-    90, 117, 226, 90, 243, 97, 117, 243, 96, 15, 5, 104, 117, 104, 218, 18, 
-    117, 218, 17, 15, 5, 104, 117, 104, 104, 223, 49, 117, 104, 223, 48, 15, 
-    5, 214, 230, 15, 5, 214, 225, 15, 5, 214, 219, 15, 5, 214, 220, 233, 191, 
-    15, 5, 214, 220, 30, 252, 176, 15, 5, 214, 220, 30, 230, 230, 15, 5, 214, 
-    220, 30, 104, 96, 104, 96, 70, 15, 5, 214, 220, 30, 104, 96, 104, 96, 
-    104, 242, 94, 15, 5, 214, 220, 242, 94, 15, 5, 214, 220, 220, 45, 15, 5, 
-    214, 220, 220, 46, 30, 252, 176, 15, 5, 214, 215, 15, 5, 214, 197, 15, 5, 
-    214, 198, 30, 233, 117, 15, 5, 214, 198, 30, 231, 92, 96, 248, 221, 15, 
-    5, 214, 198, 30, 220, 100, 15, 5, 214, 198, 30, 70, 15, 5, 214, 196, 15, 
-    5, 214, 192, 15, 5, 214, 193, 30, 234, 207, 15, 5, 214, 193, 30, 190, 15, 
-    5, 214, 190, 15, 5, 214, 191, 242, 94, 15, 5, 214, 150, 15, 5, 214, 151, 
-    249, 125, 214, 150, 15, 5, 214, 151, 220, 45, 15, 5, 214, 148, 15, 5, 
-    214, 149, 30, 115, 96, 162, 15, 5, 214, 149, 30, 115, 96, 197, 15, 5, 
-    214, 149, 30, 254, 178, 15, 5, 214, 149, 30, 162, 15, 5, 214, 149, 30, 
-    227, 194, 15, 5, 214, 149, 30, 214, 230, 15, 5, 214, 149, 30, 214, 231, 
-    96, 253, 231, 15, 5, 214, 149, 30, 214, 231, 96, 252, 6, 15, 5, 214, 147, 
-    15, 5, 214, 144, 15, 5, 214, 143, 15, 5, 214, 139, 15, 5, 214, 140, 30, 
-    61, 15, 5, 214, 140, 30, 253, 226, 15, 5, 214, 140, 30, 130, 15, 5, 214, 
-    140, 30, 246, 68, 15, 5, 214, 140, 30, 243, 135, 15, 5, 214, 140, 30, 
-    243, 118, 15, 5, 214, 140, 30, 243, 105, 216, 239, 15, 5, 214, 140, 30, 
-    243, 96, 15, 5, 214, 140, 30, 242, 113, 15, 5, 214, 140, 30, 162, 15, 5, 
-    214, 140, 30, 236, 35, 15, 5, 214, 140, 30, 236, 16, 15, 5, 214, 140, 30, 
-    235, 165, 15, 5, 214, 140, 30, 234, 92, 15, 5, 214, 140, 30, 232, 84, 15, 
-    5, 214, 140, 30, 230, 188, 15, 5, 214, 140, 30, 190, 15, 5, 214, 140, 30, 
-    220, 63, 15, 5, 214, 140, 30, 219, 180, 15, 5, 214, 140, 30, 215, 118, 
-    15, 5, 214, 140, 30, 104, 96, 242, 103, 15, 5, 214, 140, 30, 214, 219, 
+    174, 21, 194, 174, 21, 198, 174, 21, 195, 174, 21, 200, 217, 70, 1, 61, 
+    217, 70, 1, 255, 74, 217, 70, 1, 73, 217, 70, 1, 236, 34, 217, 70, 1, 70, 
+    217, 70, 1, 214, 118, 217, 70, 1, 75, 217, 70, 1, 254, 202, 217, 70, 1, 
+    76, 217, 70, 1, 253, 193, 217, 70, 1, 176, 217, 70, 1, 234, 133, 217, 70, 
+    1, 243, 136, 217, 70, 1, 242, 250, 217, 70, 1, 229, 78, 217, 70, 1, 251, 
+    34, 217, 70, 1, 250, 158, 217, 70, 1, 235, 142, 217, 70, 1, 235, 115, 
+    217, 70, 1, 227, 166, 217, 70, 1, 215, 157, 217, 70, 1, 215, 145, 217, 
+    70, 1, 248, 136, 217, 70, 1, 248, 120, 217, 70, 1, 228, 111, 217, 70, 1, 
+    217, 106, 217, 70, 1, 216, 209, 217, 70, 1, 248, 222, 217, 70, 1, 248, 
+    26, 217, 70, 1, 197, 217, 70, 1, 190, 217, 70, 1, 225, 148, 217, 70, 1, 
+    252, 192, 217, 70, 1, 252, 19, 217, 70, 1, 185, 217, 70, 1, 191, 217, 70, 
+    1, 205, 217, 70, 1, 233, 136, 217, 70, 1, 214, 27, 217, 70, 1, 220, 103, 
+    217, 70, 1, 206, 217, 70, 1, 162, 217, 70, 1, 222, 180, 217, 70, 5, 254, 
+    76, 217, 70, 5, 213, 147, 217, 70, 25, 5, 255, 74, 217, 70, 25, 5, 73, 
+    217, 70, 25, 5, 236, 34, 217, 70, 25, 5, 70, 217, 70, 25, 5, 214, 118, 
+    217, 70, 25, 5, 75, 217, 70, 25, 5, 254, 202, 217, 70, 25, 5, 76, 217, 
+    70, 25, 5, 253, 193, 217, 70, 5, 213, 152, 217, 70, 5, 227, 206, 217, 70, 
+    21, 210, 86, 217, 70, 21, 110, 217, 70, 21, 105, 217, 70, 21, 158, 217, 
+    70, 21, 161, 217, 70, 21, 189, 217, 70, 21, 194, 217, 70, 21, 198, 217, 
+    70, 21, 195, 217, 70, 21, 200, 15, 5, 61, 15, 5, 115, 30, 61, 15, 5, 115, 
+    30, 252, 177, 15, 5, 115, 30, 243, 106, 216, 240, 15, 5, 115, 30, 162, 
+    15, 5, 115, 30, 236, 36, 15, 5, 115, 30, 233, 117, 242, 95, 15, 5, 115, 
+    30, 230, 62, 15, 5, 115, 30, 222, 22, 15, 5, 255, 76, 15, 5, 255, 26, 15, 
+    5, 255, 27, 30, 253, 230, 15, 5, 255, 27, 30, 246, 68, 242, 95, 15, 5, 
+    255, 27, 30, 243, 119, 15, 5, 255, 27, 30, 243, 106, 216, 240, 15, 5, 
+    255, 27, 30, 162, 15, 5, 255, 27, 30, 236, 37, 242, 95, 15, 5, 255, 27, 
+    30, 236, 10, 15, 5, 255, 27, 30, 233, 118, 15, 5, 255, 27, 30, 220, 49, 
+    15, 5, 255, 27, 30, 104, 96, 104, 96, 70, 15, 5, 255, 27, 242, 95, 15, 5, 
+    255, 24, 15, 5, 255, 25, 30, 252, 161, 15, 5, 255, 25, 30, 243, 106, 216, 
+    240, 15, 5, 255, 25, 30, 231, 93, 96, 245, 151, 15, 5, 255, 25, 30, 220, 
+    101, 15, 5, 255, 25, 30, 217, 73, 15, 5, 255, 0, 15, 5, 254, 187, 15, 5, 
+    254, 188, 30, 245, 88, 15, 5, 254, 188, 30, 220, 11, 96, 242, 191, 15, 5, 
+    254, 179, 15, 5, 254, 180, 30, 254, 179, 15, 5, 254, 180, 30, 247, 217, 
+    15, 5, 254, 180, 30, 242, 191, 15, 5, 254, 180, 30, 162, 15, 5, 254, 180, 
+    30, 235, 0, 15, 5, 254, 180, 30, 234, 93, 15, 5, 254, 180, 30, 220, 64, 
+    15, 5, 254, 180, 30, 214, 126, 15, 5, 254, 176, 15, 5, 254, 169, 15, 5, 
+    254, 133, 15, 5, 254, 134, 30, 220, 64, 15, 5, 254, 124, 15, 5, 254, 125, 
+    117, 254, 124, 15, 5, 254, 125, 134, 216, 86, 15, 5, 254, 125, 96, 229, 
+    218, 226, 165, 254, 125, 96, 229, 217, 15, 5, 254, 125, 96, 229, 218, 
+    218, 234, 15, 5, 254, 95, 15, 5, 254, 68, 15, 5, 254, 36, 15, 5, 254, 37, 
+    30, 233, 197, 15, 5, 254, 9, 15, 5, 253, 237, 15, 5, 253, 232, 15, 5, 
+    253, 233, 210, 40, 216, 240, 15, 5, 253, 233, 235, 4, 216, 240, 15, 5, 
+    253, 233, 117, 253, 233, 215, 115, 117, 215, 115, 215, 115, 117, 215, 
+    115, 226, 22, 15, 5, 253, 233, 117, 253, 233, 117, 253, 232, 15, 5, 253, 
+    233, 117, 253, 233, 117, 253, 233, 249, 126, 253, 233, 117, 253, 233, 
+    117, 253, 232, 15, 5, 253, 230, 15, 5, 253, 227, 15, 5, 252, 192, 15, 5, 
+    252, 177, 15, 5, 252, 172, 15, 5, 252, 168, 15, 5, 252, 162, 15, 5, 252, 
+    163, 117, 252, 162, 15, 5, 252, 161, 15, 5, 130, 15, 5, 252, 141, 15, 5, 
+    252, 7, 15, 5, 252, 8, 30, 61, 15, 5, 252, 8, 30, 243, 97, 15, 5, 252, 8, 
+    30, 236, 37, 242, 95, 15, 5, 251, 126, 15, 5, 251, 127, 117, 251, 127, 
+    255, 26, 15, 5, 251, 127, 117, 251, 127, 214, 190, 15, 5, 251, 127, 249, 
+    126, 251, 126, 15, 5, 251, 110, 15, 5, 251, 111, 117, 251, 110, 15, 5, 
+    251, 99, 15, 5, 251, 98, 15, 5, 248, 222, 15, 5, 248, 213, 15, 5, 248, 
+    214, 234, 67, 30, 115, 96, 231, 148, 15, 5, 248, 214, 234, 67, 30, 254, 
+    133, 15, 5, 248, 214, 234, 67, 30, 252, 161, 15, 5, 248, 214, 234, 67, 
+    30, 252, 7, 15, 5, 248, 214, 234, 67, 30, 243, 136, 15, 5, 248, 214, 234, 
+    67, 30, 243, 137, 96, 231, 148, 15, 5, 248, 214, 234, 67, 30, 242, 215, 
+    15, 5, 248, 214, 234, 67, 30, 242, 198, 15, 5, 248, 214, 234, 67, 30, 
+    242, 104, 15, 5, 248, 214, 234, 67, 30, 162, 15, 5, 248, 214, 234, 67, 
+    30, 235, 180, 15, 5, 248, 214, 234, 67, 30, 235, 181, 96, 232, 99, 15, 5, 
+    248, 214, 234, 67, 30, 234, 243, 15, 5, 248, 214, 234, 67, 30, 233, 136, 
+    15, 5, 248, 214, 234, 67, 30, 232, 99, 15, 5, 248, 214, 234, 67, 30, 232, 
+    100, 96, 231, 147, 15, 5, 248, 214, 234, 67, 30, 232, 85, 15, 5, 248, 
+    214, 234, 67, 30, 229, 108, 15, 5, 248, 214, 234, 67, 30, 226, 23, 96, 
+    226, 22, 15, 5, 248, 214, 234, 67, 30, 219, 192, 15, 5, 248, 214, 234, 
+    67, 30, 217, 73, 15, 5, 248, 214, 234, 67, 30, 214, 231, 96, 242, 198, 
+    15, 5, 248, 214, 234, 67, 30, 214, 126, 15, 5, 248, 188, 15, 5, 248, 167, 
+    15, 5, 248, 166, 15, 5, 248, 165, 15, 5, 248, 4, 15, 5, 247, 243, 15, 5, 
+    247, 218, 15, 5, 247, 219, 30, 220, 64, 15, 5, 247, 217, 15, 5, 247, 207, 
+    15, 5, 247, 208, 234, 209, 104, 242, 96, 247, 188, 15, 5, 247, 188, 15, 
+    5, 246, 79, 15, 5, 246, 80, 117, 246, 79, 15, 5, 246, 80, 242, 95, 15, 5, 
+    246, 80, 220, 46, 15, 5, 246, 77, 15, 5, 246, 78, 30, 245, 73, 15, 5, 
+    246, 76, 15, 5, 246, 75, 15, 5, 246, 74, 15, 5, 246, 73, 15, 5, 246, 69, 
+    15, 5, 246, 67, 15, 5, 246, 68, 242, 95, 15, 5, 246, 68, 242, 96, 242, 
+    95, 15, 5, 246, 66, 15, 5, 246, 59, 15, 5, 75, 15, 5, 160, 30, 226, 22, 
+    15, 5, 160, 117, 160, 227, 196, 117, 227, 195, 15, 5, 245, 235, 15, 5, 
+    245, 236, 30, 115, 96, 242, 50, 96, 248, 222, 15, 5, 245, 236, 30, 243, 
+    97, 15, 5, 245, 236, 30, 230, 231, 15, 5, 245, 236, 30, 222, 9, 15, 5, 
+    245, 236, 30, 220, 64, 15, 5, 245, 236, 30, 70, 15, 5, 245, 212, 15, 5, 
+    245, 201, 15, 5, 245, 175, 15, 5, 245, 151, 15, 5, 245, 152, 30, 243, 
+    105, 15, 5, 245, 152, 30, 243, 106, 216, 240, 15, 5, 245, 152, 30, 231, 
+    92, 15, 5, 245, 152, 249, 126, 245, 151, 15, 5, 245, 152, 226, 165, 245, 
+    151, 15, 5, 245, 152, 218, 234, 15, 5, 245, 90, 15, 5, 245, 88, 15, 5, 
+    245, 73, 15, 5, 245, 11, 15, 5, 245, 12, 30, 61, 15, 5, 245, 12, 30, 115, 
+    96, 233, 105, 15, 5, 245, 12, 30, 115, 96, 233, 106, 30, 233, 105, 15, 5, 
+    245, 12, 30, 254, 124, 15, 5, 245, 12, 30, 252, 177, 15, 5, 245, 12, 30, 
+    246, 68, 242, 95, 15, 5, 245, 12, 30, 246, 68, 242, 96, 242, 95, 15, 5, 
+    245, 12, 30, 162, 15, 5, 245, 12, 30, 242, 50, 242, 95, 15, 5, 245, 12, 
+    30, 236, 37, 242, 95, 15, 5, 245, 12, 30, 234, 208, 15, 5, 245, 12, 30, 
+    234, 209, 218, 234, 15, 5, 245, 12, 30, 233, 216, 15, 5, 245, 12, 30, 
+    233, 136, 15, 5, 245, 12, 30, 233, 106, 30, 233, 105, 15, 5, 245, 12, 30, 
+    232, 242, 15, 5, 245, 12, 30, 232, 99, 15, 5, 245, 12, 30, 214, 230, 15, 
+    5, 245, 12, 30, 214, 219, 15, 5, 243, 136, 15, 5, 243, 137, 242, 95, 15, 
+    5, 243, 134, 15, 5, 243, 135, 30, 115, 96, 248, 223, 96, 162, 15, 5, 243, 
+    135, 30, 115, 96, 162, 15, 5, 243, 135, 30, 115, 96, 236, 36, 15, 5, 243, 
+    135, 30, 255, 25, 216, 241, 96, 217, 94, 15, 5, 243, 135, 30, 254, 124, 
+    15, 5, 243, 135, 30, 253, 232, 15, 5, 243, 135, 30, 253, 231, 96, 243, 
+    119, 15, 5, 243, 135, 30, 252, 177, 15, 5, 243, 135, 30, 252, 142, 96, 
+    205, 15, 5, 243, 135, 30, 251, 99, 15, 5, 243, 135, 30, 251, 100, 96, 
+    205, 15, 5, 243, 135, 30, 248, 222, 15, 5, 243, 135, 30, 248, 4, 15, 5, 
+    243, 135, 30, 247, 219, 30, 220, 64, 15, 5, 243, 135, 30, 246, 77, 15, 5, 
+    243, 135, 30, 245, 175, 15, 5, 243, 135, 30, 245, 176, 96, 233, 136, 15, 
+    5, 243, 135, 30, 245, 151, 15, 5, 243, 135, 30, 245, 152, 30, 243, 106, 
+    216, 240, 15, 5, 243, 135, 30, 243, 106, 216, 240, 15, 5, 243, 135, 30, 
+    243, 97, 15, 5, 243, 135, 30, 242, 215, 15, 5, 243, 135, 30, 242, 213, 
+    15, 5, 243, 135, 30, 242, 214, 96, 61, 15, 5, 243, 135, 30, 242, 199, 96, 
+    218, 84, 15, 5, 243, 135, 30, 242, 50, 96, 232, 100, 96, 245, 73, 15, 5, 
+    243, 135, 30, 242, 31, 15, 5, 243, 135, 30, 242, 32, 96, 233, 136, 15, 5, 
+    243, 135, 30, 241, 182, 96, 232, 242, 15, 5, 243, 135, 30, 240, 219, 15, 
+    5, 243, 135, 30, 236, 37, 242, 95, 15, 5, 243, 135, 30, 235, 167, 96, 
+    240, 224, 96, 253, 232, 15, 5, 243, 135, 30, 234, 243, 15, 5, 243, 135, 
+    30, 234, 208, 15, 5, 243, 135, 30, 234, 90, 15, 5, 243, 135, 30, 234, 91, 
+    96, 233, 105, 15, 5, 243, 135, 30, 233, 217, 96, 254, 124, 15, 5, 243, 
+    135, 30, 233, 136, 15, 5, 243, 135, 30, 231, 93, 96, 245, 151, 15, 5, 
+    243, 135, 30, 230, 231, 15, 5, 243, 135, 30, 227, 195, 15, 5, 243, 135, 
+    30, 227, 196, 117, 227, 195, 15, 5, 243, 135, 30, 190, 15, 5, 243, 135, 
+    30, 222, 9, 15, 5, 243, 135, 30, 221, 232, 15, 5, 243, 135, 30, 220, 64, 
+    15, 5, 243, 135, 30, 220, 65, 96, 215, 99, 15, 5, 243, 135, 30, 220, 31, 
+    15, 5, 243, 135, 30, 218, 44, 15, 5, 243, 135, 30, 217, 73, 15, 5, 243, 
+    135, 30, 70, 15, 5, 243, 135, 30, 214, 219, 15, 5, 243, 135, 30, 214, 
+    220, 96, 246, 79, 15, 5, 243, 135, 117, 243, 134, 15, 5, 243, 129, 15, 5, 
+    243, 130, 249, 126, 243, 129, 15, 5, 243, 127, 15, 5, 243, 128, 117, 243, 
+    128, 243, 98, 117, 243, 97, 15, 5, 243, 119, 15, 5, 243, 120, 243, 128, 
+    117, 243, 128, 243, 98, 117, 243, 97, 15, 5, 243, 118, 15, 5, 243, 116, 
+    15, 5, 243, 107, 15, 5, 243, 105, 15, 5, 243, 106, 216, 240, 15, 5, 243, 
+    106, 117, 243, 105, 15, 5, 243, 106, 249, 126, 243, 105, 15, 5, 243, 97, 
+    15, 5, 243, 96, 15, 5, 243, 91, 15, 5, 243, 37, 15, 5, 243, 38, 30, 233, 
+    197, 15, 5, 242, 215, 15, 5, 242, 216, 30, 75, 15, 5, 242, 216, 30, 70, 
+    15, 5, 242, 216, 249, 126, 242, 215, 15, 5, 242, 213, 15, 5, 242, 214, 
+    117, 242, 213, 15, 5, 242, 214, 249, 126, 242, 213, 15, 5, 242, 210, 15, 
+    5, 242, 198, 15, 5, 242, 199, 242, 95, 15, 5, 242, 196, 15, 5, 242, 197, 
+    30, 115, 96, 236, 36, 15, 5, 242, 197, 30, 243, 106, 216, 240, 15, 5, 
+    242, 197, 30, 236, 36, 15, 5, 242, 197, 30, 232, 100, 96, 236, 36, 15, 5, 
+    242, 197, 30, 190, 15, 5, 242, 193, 15, 5, 242, 191, 15, 5, 242, 192, 
+    249, 126, 242, 191, 15, 5, 242, 192, 30, 252, 177, 15, 5, 242, 192, 30, 
+    217, 73, 15, 5, 242, 192, 216, 240, 15, 5, 242, 114, 15, 5, 242, 115, 
+    249, 126, 242, 114, 15, 5, 242, 112, 15, 5, 242, 113, 30, 234, 243, 15, 
+    5, 242, 113, 30, 234, 244, 30, 236, 37, 242, 95, 15, 5, 242, 113, 30, 
+    227, 195, 15, 5, 242, 113, 30, 222, 10, 96, 215, 114, 15, 5, 242, 113, 
+    242, 95, 15, 5, 242, 104, 15, 5, 242, 105, 30, 115, 96, 233, 197, 15, 5, 
+    242, 105, 30, 233, 197, 15, 5, 242, 105, 117, 242, 105, 232, 92, 15, 5, 
+    242, 99, 15, 5, 242, 97, 15, 5, 242, 98, 30, 220, 64, 15, 5, 242, 89, 15, 
+    5, 242, 88, 15, 5, 242, 85, 15, 5, 242, 84, 15, 5, 162, 15, 5, 242, 50, 
+    216, 240, 15, 5, 242, 50, 242, 95, 15, 5, 242, 31, 15, 5, 241, 181, 15, 
+    5, 241, 182, 30, 253, 232, 15, 5, 241, 182, 30, 253, 230, 15, 5, 241, 
+    182, 30, 252, 177, 15, 5, 241, 182, 30, 247, 188, 15, 5, 241, 182, 30, 
+    243, 127, 15, 5, 241, 182, 30, 234, 82, 15, 5, 241, 182, 30, 227, 195, 
+    15, 5, 241, 182, 30, 220, 64, 15, 5, 241, 182, 30, 70, 15, 5, 240, 223, 
+    15, 5, 240, 219, 15, 5, 240, 220, 30, 254, 124, 15, 5, 240, 220, 30, 242, 
+    31, 15, 5, 240, 220, 30, 234, 208, 15, 5, 240, 220, 30, 232, 198, 15, 5, 
+    240, 220, 30, 214, 219, 15, 5, 240, 216, 15, 5, 73, 15, 5, 240, 155, 61, 
+    15, 5, 240, 116, 15, 5, 236, 64, 15, 5, 236, 65, 117, 236, 65, 251, 99, 
+    15, 5, 236, 65, 117, 236, 65, 218, 234, 15, 5, 236, 39, 15, 5, 236, 36, 
+    15, 5, 236, 37, 247, 243, 15, 5, 236, 37, 223, 36, 15, 5, 236, 37, 117, 
+    236, 37, 220, 15, 117, 220, 15, 214, 220, 117, 214, 219, 15, 5, 236, 37, 
+    242, 95, 15, 5, 236, 28, 15, 5, 236, 29, 30, 243, 106, 216, 240, 15, 5, 
+    236, 27, 15, 5, 236, 17, 15, 5, 236, 18, 30, 217, 73, 15, 5, 236, 18, 
+    249, 126, 236, 17, 15, 5, 236, 18, 226, 165, 236, 17, 15, 5, 236, 18, 
+    218, 234, 15, 5, 236, 10, 15, 5, 236, 0, 15, 5, 235, 180, 15, 5, 235, 
+    166, 15, 5, 176, 15, 5, 235, 14, 30, 61, 15, 5, 235, 14, 30, 255, 0, 15, 
+    5, 235, 14, 30, 255, 1, 96, 233, 216, 15, 5, 235, 14, 30, 253, 230, 15, 
+    5, 235, 14, 30, 252, 177, 15, 5, 235, 14, 30, 252, 161, 15, 5, 235, 14, 
+    30, 130, 15, 5, 235, 14, 30, 252, 7, 15, 5, 235, 14, 30, 245, 88, 15, 5, 
+    235, 14, 30, 245, 73, 15, 5, 235, 14, 30, 243, 136, 15, 5, 235, 14, 30, 
+    243, 119, 15, 5, 235, 14, 30, 243, 106, 216, 240, 15, 5, 235, 14, 30, 
+    243, 97, 15, 5, 235, 14, 30, 243, 98, 96, 220, 102, 96, 61, 15, 5, 235, 
+    14, 30, 242, 215, 15, 5, 235, 14, 30, 242, 198, 15, 5, 235, 14, 30, 242, 
+    192, 96, 221, 232, 15, 5, 235, 14, 30, 242, 192, 249, 126, 242, 191, 15, 
+    5, 235, 14, 30, 242, 114, 15, 5, 235, 14, 30, 242, 88, 15, 5, 235, 14, 
+    30, 236, 36, 15, 5, 235, 14, 30, 236, 17, 15, 5, 235, 14, 30, 234, 243, 
+    15, 5, 235, 14, 30, 234, 93, 15, 5, 235, 14, 30, 234, 90, 15, 5, 235, 14, 
+    30, 232, 242, 15, 5, 235, 14, 30, 232, 99, 15, 5, 235, 14, 30, 231, 92, 
+    15, 5, 235, 14, 30, 231, 93, 96, 246, 79, 15, 5, 235, 14, 30, 231, 93, 
+    96, 242, 215, 15, 5, 235, 14, 30, 231, 93, 96, 217, 23, 15, 5, 235, 14, 
+    30, 230, 231, 15, 5, 235, 14, 30, 230, 232, 96, 227, 190, 15, 5, 235, 14, 
+    30, 229, 108, 15, 5, 235, 14, 30, 227, 195, 15, 5, 235, 14, 30, 225, 109, 
+    15, 5, 235, 14, 30, 222, 141, 15, 5, 235, 14, 30, 206, 15, 5, 235, 14, 
+    30, 221, 232, 15, 5, 235, 14, 30, 220, 103, 15, 5, 235, 14, 30, 220, 64, 
+    15, 5, 235, 14, 30, 220, 31, 15, 5, 235, 14, 30, 219, 226, 15, 5, 235, 
+    14, 30, 219, 183, 15, 5, 235, 14, 30, 218, 52, 15, 5, 235, 14, 30, 217, 
+    51, 15, 5, 235, 14, 30, 70, 15, 5, 235, 14, 30, 214, 230, 15, 5, 235, 14, 
+    30, 214, 219, 15, 5, 235, 14, 30, 214, 193, 30, 190, 15, 5, 235, 14, 30, 
+    214, 126, 15, 5, 235, 14, 30, 210, 44, 15, 5, 235, 12, 15, 5, 235, 13, 
+    249, 126, 235, 12, 15, 5, 235, 5, 15, 5, 235, 2, 15, 5, 235, 0, 15, 5, 
+    234, 255, 15, 5, 234, 253, 15, 5, 234, 254, 117, 234, 253, 15, 5, 234, 
+    243, 15, 5, 234, 244, 30, 236, 37, 242, 95, 15, 5, 234, 239, 15, 5, 234, 
+    240, 30, 252, 177, 15, 5, 234, 240, 249, 126, 234, 239, 15, 5, 234, 237, 
+    15, 5, 234, 236, 15, 5, 234, 208, 15, 5, 234, 209, 233, 119, 30, 104, 
+    117, 233, 119, 30, 70, 15, 5, 234, 209, 117, 234, 209, 233, 119, 30, 104, 
+    117, 233, 119, 30, 70, 15, 5, 234, 158, 15, 5, 234, 93, 15, 5, 234, 94, 
+    30, 252, 177, 15, 5, 234, 94, 30, 70, 15, 5, 234, 94, 30, 214, 219, 15, 
+    5, 234, 90, 15, 5, 234, 82, 15, 5, 234, 69, 15, 5, 234, 68, 15, 5, 234, 
+    66, 15, 5, 234, 67, 117, 234, 66, 15, 5, 233, 218, 15, 5, 233, 219, 117, 
+    241, 182, 30, 253, 231, 233, 219, 117, 241, 182, 30, 253, 230, 15, 5, 
+    233, 216, 15, 5, 233, 214, 15, 5, 233, 215, 214, 12, 17, 15, 5, 233, 213, 
+    15, 5, 233, 210, 15, 5, 233, 211, 242, 95, 15, 5, 233, 209, 15, 5, 233, 
+    197, 15, 5, 233, 198, 226, 165, 233, 197, 15, 5, 233, 192, 15, 5, 233, 
+    173, 15, 5, 233, 136, 15, 5, 233, 118, 15, 5, 233, 119, 30, 61, 15, 5, 
+    233, 119, 30, 115, 96, 248, 223, 96, 162, 15, 5, 233, 119, 30, 115, 96, 
+    243, 97, 15, 5, 233, 119, 30, 115, 96, 233, 105, 15, 5, 233, 119, 30, 
+    254, 179, 15, 5, 233, 119, 30, 254, 124, 15, 5, 233, 119, 30, 253, 233, 
+    210, 40, 216, 240, 15, 5, 233, 119, 30, 252, 177, 15, 5, 233, 119, 30, 
+    252, 7, 15, 5, 233, 119, 30, 248, 167, 15, 5, 233, 119, 30, 245, 151, 15, 
+    5, 233, 119, 30, 243, 136, 15, 5, 233, 119, 30, 243, 97, 15, 5, 233, 119, 
+    30, 242, 104, 15, 5, 233, 119, 30, 242, 105, 96, 242, 104, 15, 5, 233, 
+    119, 30, 162, 15, 5, 233, 119, 30, 242, 31, 15, 5, 233, 119, 30, 241, 
+    182, 30, 227, 195, 15, 5, 233, 119, 30, 236, 37, 242, 95, 15, 5, 233, 
+    119, 30, 236, 17, 15, 5, 233, 119, 30, 236, 18, 96, 162, 15, 5, 233, 119, 
+    30, 236, 18, 96, 232, 99, 15, 5, 233, 119, 30, 234, 93, 15, 5, 233, 119, 
+    30, 234, 82, 15, 5, 233, 119, 30, 233, 216, 15, 5, 233, 119, 30, 233, 
+    210, 15, 5, 233, 119, 30, 233, 211, 96, 241, 182, 96, 61, 15, 5, 233, 
+    119, 30, 233, 118, 15, 5, 233, 119, 30, 232, 198, 15, 5, 233, 119, 30, 
+    232, 99, 15, 5, 233, 119, 30, 232, 87, 15, 5, 233, 119, 30, 231, 92, 15, 
+    5, 233, 119, 30, 231, 93, 96, 245, 151, 15, 5, 233, 119, 30, 230, 62, 15, 
+    5, 233, 119, 30, 229, 108, 15, 5, 233, 119, 30, 220, 65, 96, 218, 44, 15, 
+    5, 233, 119, 30, 220, 11, 96, 242, 192, 96, 245, 88, 15, 5, 233, 119, 30, 
+    220, 11, 96, 242, 192, 216, 240, 15, 5, 233, 119, 30, 219, 224, 15, 5, 
+    233, 119, 30, 219, 225, 96, 219, 224, 15, 5, 233, 119, 30, 218, 44, 15, 
+    5, 233, 119, 30, 217, 85, 15, 5, 233, 119, 30, 217, 73, 15, 5, 233, 119, 
+    30, 217, 24, 96, 115, 96, 218, 85, 96, 197, 15, 5, 233, 119, 30, 70, 15, 
+    5, 233, 119, 30, 104, 96, 61, 15, 5, 233, 119, 30, 104, 96, 104, 96, 70, 
+    15, 5, 233, 119, 30, 214, 231, 96, 253, 232, 15, 5, 233, 119, 30, 214, 
+    219, 15, 5, 233, 119, 30, 214, 126, 15, 5, 233, 119, 218, 234, 15, 5, 
+    233, 116, 15, 5, 233, 117, 30, 220, 64, 15, 5, 233, 117, 30, 220, 65, 96, 
+    218, 44, 15, 5, 233, 117, 242, 95, 15, 5, 233, 117, 242, 96, 117, 233, 
+    117, 242, 96, 220, 64, 15, 5, 233, 112, 15, 5, 233, 105, 15, 5, 233, 106, 
+    30, 233, 105, 15, 5, 233, 103, 15, 5, 233, 104, 30, 233, 197, 15, 5, 233, 
+    104, 30, 233, 198, 96, 222, 141, 15, 5, 232, 242, 15, 5, 232, 227, 15, 5, 
+    232, 217, 15, 5, 232, 198, 15, 5, 232, 99, 15, 5, 232, 100, 30, 252, 177, 
+    15, 5, 232, 97, 15, 5, 232, 98, 30, 254, 179, 15, 5, 232, 98, 30, 252, 
+    177, 15, 5, 232, 98, 30, 245, 73, 15, 5, 232, 98, 30, 245, 74, 216, 240, 
+    15, 5, 232, 98, 30, 243, 106, 216, 240, 15, 5, 232, 98, 30, 241, 182, 30, 
+    252, 177, 15, 5, 232, 98, 30, 236, 17, 15, 5, 232, 98, 30, 235, 2, 15, 5, 
+    232, 98, 30, 235, 0, 15, 5, 232, 98, 30, 235, 1, 96, 253, 232, 15, 5, 
+    232, 98, 30, 234, 93, 15, 5, 232, 98, 30, 233, 137, 96, 253, 232, 15, 5, 
+    232, 98, 30, 233, 118, 15, 5, 232, 98, 30, 231, 93, 96, 245, 151, 15, 5, 
+    232, 98, 30, 229, 108, 15, 5, 232, 98, 30, 227, 238, 15, 5, 232, 98, 30, 
+    219, 193, 96, 253, 232, 15, 5, 232, 98, 30, 219, 175, 96, 251, 126, 15, 
+    5, 232, 98, 30, 215, 114, 15, 5, 232, 98, 216, 240, 15, 5, 232, 98, 249, 
+    126, 232, 97, 15, 5, 232, 98, 226, 165, 232, 97, 15, 5, 232, 98, 218, 
+    234, 15, 5, 232, 98, 220, 46, 15, 5, 232, 96, 15, 5, 232, 92, 15, 5, 232, 
+    93, 117, 232, 92, 15, 5, 232, 93, 226, 165, 232, 92, 15, 5, 232, 93, 220, 
+    46, 15, 5, 232, 90, 15, 5, 232, 87, 15, 5, 232, 85, 15, 5, 232, 86, 117, 
+    232, 85, 15, 5, 232, 86, 117, 232, 86, 243, 98, 117, 243, 97, 15, 5, 185, 
+    15, 5, 231, 240, 30, 217, 73, 15, 5, 231, 240, 242, 95, 15, 5, 231, 239, 
+    15, 5, 231, 211, 15, 5, 231, 167, 15, 5, 231, 148, 15, 5, 231, 147, 15, 
+    5, 231, 92, 15, 5, 231, 48, 15, 5, 230, 231, 15, 5, 230, 189, 15, 5, 230, 
+    103, 15, 5, 230, 104, 117, 230, 103, 15, 5, 230, 94, 15, 5, 230, 95, 242, 
+    95, 15, 5, 230, 79, 15, 5, 230, 65, 15, 5, 230, 62, 15, 5, 230, 63, 30, 
+    61, 15, 5, 230, 63, 30, 233, 197, 15, 5, 230, 63, 30, 210, 116, 15, 5, 
+    230, 63, 117, 230, 62, 15, 5, 230, 63, 117, 230, 63, 30, 115, 96, 197, 
+    15, 5, 230, 63, 249, 126, 230, 62, 15, 5, 230, 60, 15, 5, 230, 61, 30, 
+    61, 15, 5, 230, 61, 30, 115, 96, 248, 4, 15, 5, 230, 61, 30, 248, 4, 15, 
+    5, 230, 61, 242, 95, 15, 5, 197, 15, 5, 229, 228, 15, 5, 229, 217, 15, 5, 
+    229, 218, 235, 193, 15, 5, 229, 218, 30, 219, 227, 216, 240, 15, 5, 229, 
+    218, 226, 165, 229, 217, 15, 5, 229, 216, 15, 5, 229, 209, 227, 181, 15, 
+    5, 229, 208, 15, 5, 229, 207, 15, 5, 229, 108, 15, 5, 229, 109, 30, 61, 
+    15, 5, 229, 109, 30, 214, 219, 15, 5, 229, 109, 220, 46, 15, 5, 228, 234, 
+    15, 5, 228, 235, 30, 75, 15, 5, 228, 233, 15, 5, 228, 204, 15, 5, 228, 
+    205, 30, 243, 106, 216, 240, 15, 5, 228, 205, 30, 243, 98, 96, 243, 106, 
+    216, 240, 15, 5, 228, 202, 15, 5, 228, 203, 30, 254, 124, 15, 5, 228, 
+    203, 30, 253, 232, 15, 5, 228, 203, 30, 253, 233, 96, 253, 232, 15, 5, 
+    228, 203, 30, 242, 104, 15, 5, 228, 203, 30, 231, 93, 96, 243, 106, 216, 
+    240, 15, 5, 228, 203, 30, 229, 108, 15, 5, 228, 203, 30, 227, 195, 15, 5, 
+    228, 203, 30, 220, 64, 15, 5, 228, 203, 30, 220, 65, 96, 115, 254, 124, 
+    15, 5, 228, 203, 30, 220, 65, 96, 253, 232, 15, 5, 228, 203, 30, 220, 65, 
+    96, 253, 233, 96, 253, 232, 15, 5, 228, 203, 30, 214, 231, 96, 253, 232, 
+    15, 5, 228, 203, 30, 214, 126, 15, 5, 228, 191, 15, 5, 227, 238, 15, 5, 
+    227, 211, 15, 5, 227, 195, 15, 5, 227, 196, 233, 117, 30, 243, 97, 15, 5, 
+    227, 196, 233, 117, 30, 231, 148, 15, 5, 227, 196, 233, 117, 30, 222, 9, 
+    15, 5, 227, 196, 233, 117, 30, 222, 10, 117, 227, 196, 233, 117, 30, 222, 
+    9, 15, 5, 227, 196, 233, 117, 30, 214, 126, 15, 5, 227, 196, 216, 240, 
+    15, 5, 227, 196, 117, 227, 195, 15, 5, 227, 196, 249, 126, 227, 195, 15, 
+    5, 227, 196, 249, 126, 227, 196, 233, 117, 117, 233, 116, 15, 5, 227, 
+    190, 15, 5, 227, 191, 255, 25, 30, 253, 227, 15, 5, 227, 191, 255, 25, 
+    30, 252, 7, 15, 5, 227, 191, 255, 25, 30, 246, 75, 15, 5, 227, 191, 255, 
+    25, 30, 242, 104, 15, 5, 227, 191, 255, 25, 30, 236, 37, 242, 95, 15, 5, 
+    227, 191, 255, 25, 30, 235, 0, 15, 5, 227, 191, 255, 25, 30, 233, 136, 
+    15, 5, 227, 191, 255, 25, 30, 229, 108, 15, 5, 227, 191, 255, 25, 30, 
+    219, 172, 15, 5, 227, 191, 255, 25, 30, 214, 230, 15, 5, 227, 191, 234, 
+    67, 30, 252, 7, 15, 5, 227, 191, 234, 67, 30, 252, 8, 70, 15, 5, 190, 15, 
+    5, 226, 81, 15, 5, 226, 48, 15, 5, 226, 22, 15, 5, 225, 162, 15, 5, 225, 
+    109, 15, 5, 225, 110, 30, 61, 15, 5, 225, 110, 30, 255, 26, 15, 5, 225, 
+    110, 30, 252, 7, 15, 5, 225, 110, 30, 251, 126, 15, 5, 225, 110, 30, 75, 
+    15, 5, 225, 110, 30, 73, 15, 5, 225, 110, 30, 240, 116, 15, 5, 225, 110, 
+    30, 70, 15, 5, 225, 110, 30, 214, 230, 15, 5, 225, 110, 249, 126, 225, 
+    109, 15, 5, 225, 54, 15, 5, 225, 55, 30, 234, 239, 15, 5, 225, 55, 30, 
+    214, 219, 15, 5, 225, 55, 30, 210, 116, 15, 5, 225, 55, 226, 165, 225, 
+    54, 15, 5, 205, 15, 5, 223, 183, 15, 5, 223, 36, 15, 5, 222, 141, 15, 5, 
+    206, 15, 5, 222, 23, 227, 181, 15, 5, 222, 22, 15, 5, 222, 23, 30, 61, 
+    15, 5, 222, 23, 30, 246, 79, 15, 5, 222, 23, 30, 246, 77, 15, 5, 222, 23, 
+    30, 162, 15, 5, 222, 23, 30, 234, 243, 15, 5, 222, 23, 30, 233, 197, 15, 
+    5, 222, 23, 30, 232, 85, 15, 5, 222, 23, 30, 230, 231, 15, 5, 222, 23, 
+    30, 227, 195, 15, 5, 222, 23, 30, 222, 9, 15, 5, 222, 23, 30, 220, 31, 
+    15, 5, 222, 23, 30, 217, 94, 15, 5, 222, 23, 30, 214, 230, 15, 5, 222, 
+    23, 30, 214, 225, 15, 5, 222, 23, 30, 214, 197, 15, 5, 222, 23, 30, 214, 
+    150, 15, 5, 222, 23, 30, 214, 126, 15, 5, 222, 23, 117, 222, 22, 15, 5, 
+    222, 23, 242, 95, 15, 5, 222, 9, 15, 5, 222, 10, 233, 119, 30, 253, 230, 
+    15, 5, 221, 240, 15, 5, 221, 232, 15, 5, 220, 103, 15, 5, 220, 101, 15, 
+    5, 220, 102, 30, 61, 15, 5, 220, 102, 30, 252, 177, 15, 5, 220, 102, 30, 
+    242, 191, 15, 5, 220, 102, 30, 229, 108, 15, 5, 220, 102, 30, 219, 224, 
+    15, 5, 220, 102, 30, 215, 99, 15, 5, 220, 102, 30, 70, 15, 5, 220, 102, 
+    30, 104, 96, 61, 15, 5, 220, 100, 15, 5, 220, 98, 15, 5, 220, 79, 15, 5, 
+    220, 64, 15, 5, 220, 65, 240, 223, 15, 5, 220, 65, 117, 220, 65, 243, 
+    128, 117, 243, 128, 243, 98, 117, 243, 97, 15, 5, 220, 65, 117, 220, 65, 
+    217, 95, 117, 217, 95, 243, 98, 117, 243, 97, 15, 5, 220, 57, 15, 5, 220, 
+    52, 15, 5, 220, 49, 15, 5, 220, 48, 15, 5, 220, 45, 15, 5, 220, 31, 15, 
+    5, 220, 32, 30, 61, 15, 5, 220, 32, 30, 236, 17, 15, 5, 220, 25, 15, 5, 
+    220, 26, 30, 61, 15, 5, 220, 26, 30, 252, 162, 15, 5, 220, 26, 30, 251, 
+    110, 15, 5, 220, 26, 30, 247, 207, 15, 5, 220, 26, 30, 243, 97, 15, 5, 
+    220, 26, 30, 236, 36, 15, 5, 220, 26, 30, 236, 37, 242, 95, 15, 5, 220, 
+    26, 30, 233, 192, 15, 5, 220, 26, 30, 232, 87, 15, 5, 220, 26, 30, 230, 
+    94, 15, 5, 220, 26, 30, 222, 9, 15, 5, 220, 19, 15, 5, 220, 14, 15, 5, 
+    220, 15, 216, 240, 15, 5, 220, 15, 117, 220, 15, 251, 100, 117, 251, 99, 
+    15, 5, 220, 10, 15, 5, 219, 226, 15, 5, 219, 227, 117, 235, 194, 219, 
+    226, 15, 5, 219, 224, 15, 5, 219, 223, 15, 5, 219, 192, 15, 5, 219, 193, 
+    242, 95, 15, 5, 219, 183, 15, 5, 219, 181, 15, 5, 219, 182, 117, 219, 
+    182, 219, 224, 15, 5, 219, 174, 15, 5, 219, 172, 15, 5, 218, 84, 15, 5, 
+    218, 85, 117, 218, 84, 15, 5, 218, 55, 15, 5, 218, 54, 15, 5, 218, 52, 
+    15, 5, 218, 44, 15, 5, 218, 43, 15, 5, 218, 18, 15, 5, 218, 17, 15, 5, 
+    217, 106, 15, 5, 217, 107, 253, 217, 15, 5, 217, 107, 30, 241, 181, 15, 
+    5, 217, 107, 30, 230, 231, 15, 5, 217, 107, 242, 95, 15, 5, 217, 94, 15, 
+    5, 217, 95, 117, 217, 95, 228, 235, 117, 228, 235, 247, 189, 117, 247, 
+    188, 15, 5, 217, 95, 218, 234, 15, 5, 217, 85, 15, 5, 129, 30, 252, 7, 
+    15, 5, 129, 30, 242, 104, 15, 5, 129, 30, 220, 64, 15, 5, 129, 30, 219, 
+    226, 15, 5, 129, 30, 215, 114, 15, 5, 129, 30, 214, 219, 15, 5, 217, 73, 
+    15, 5, 217, 51, 15, 5, 217, 23, 15, 5, 217, 24, 242, 95, 15, 5, 216, 118, 
+    15, 5, 216, 119, 216, 240, 15, 5, 216, 91, 15, 5, 216, 73, 15, 5, 216, 
+    74, 30, 217, 73, 15, 5, 216, 74, 117, 216, 73, 15, 5, 216, 74, 117, 216, 
+    74, 243, 128, 117, 243, 128, 243, 98, 117, 243, 97, 15, 5, 215, 119, 15, 
+    5, 215, 114, 15, 5, 215, 112, 15, 5, 215, 109, 15, 5, 215, 99, 15, 5, 
+    215, 100, 117, 215, 100, 210, 117, 117, 210, 116, 15, 5, 70, 15, 5, 104, 
+    242, 104, 15, 5, 104, 104, 70, 15, 5, 104, 117, 104, 226, 91, 117, 226, 
+    91, 243, 98, 117, 243, 97, 15, 5, 104, 117, 104, 218, 19, 117, 218, 18, 
+    15, 5, 104, 117, 104, 104, 223, 50, 117, 104, 223, 49, 15, 5, 214, 230, 
+    15, 5, 214, 225, 15, 5, 214, 219, 15, 5, 214, 220, 233, 192, 15, 5, 214, 
+    220, 30, 252, 177, 15, 5, 214, 220, 30, 230, 231, 15, 5, 214, 220, 30, 
+    104, 96, 104, 96, 70, 15, 5, 214, 220, 30, 104, 96, 104, 96, 104, 242, 
+    95, 15, 5, 214, 220, 242, 95, 15, 5, 214, 220, 220, 46, 15, 5, 214, 220, 
+    220, 47, 30, 252, 177, 15, 5, 214, 215, 15, 5, 214, 197, 15, 5, 214, 198, 
+    30, 233, 118, 15, 5, 214, 198, 30, 231, 93, 96, 248, 222, 15, 5, 214, 
+    198, 30, 220, 101, 15, 5, 214, 198, 30, 70, 15, 5, 214, 196, 15, 5, 214, 
+    192, 15, 5, 214, 193, 30, 234, 208, 15, 5, 214, 193, 30, 190, 15, 5, 214, 
+    190, 15, 5, 214, 191, 242, 95, 15, 5, 214, 150, 15, 5, 214, 151, 249, 
+    126, 214, 150, 15, 5, 214, 151, 220, 46, 15, 5, 214, 148, 15, 5, 214, 
+    149, 30, 115, 96, 162, 15, 5, 214, 149, 30, 115, 96, 197, 15, 5, 214, 
+    149, 30, 254, 179, 15, 5, 214, 149, 30, 162, 15, 5, 214, 149, 30, 227, 
+    195, 15, 5, 214, 149, 30, 214, 230, 15, 5, 214, 149, 30, 214, 231, 96, 
+    253, 232, 15, 5, 214, 149, 30, 214, 231, 96, 252, 7, 15, 5, 214, 147, 15, 
+    5, 214, 144, 15, 5, 214, 143, 15, 5, 214, 139, 15, 5, 214, 140, 30, 61, 
+    15, 5, 214, 140, 30, 253, 227, 15, 5, 214, 140, 30, 130, 15, 5, 214, 140, 
+    30, 246, 69, 15, 5, 214, 140, 30, 243, 136, 15, 5, 214, 140, 30, 243, 
+    119, 15, 5, 214, 140, 30, 243, 106, 216, 240, 15, 5, 214, 140, 30, 243, 
+    97, 15, 5, 214, 140, 30, 242, 114, 15, 5, 214, 140, 30, 162, 15, 5, 214, 
+    140, 30, 236, 36, 15, 5, 214, 140, 30, 236, 17, 15, 5, 214, 140, 30, 235, 
+    166, 15, 5, 214, 140, 30, 234, 93, 15, 5, 214, 140, 30, 232, 85, 15, 5, 
+    214, 140, 30, 230, 189, 15, 5, 214, 140, 30, 190, 15, 5, 214, 140, 30, 
+    220, 64, 15, 5, 214, 140, 30, 219, 181, 15, 5, 214, 140, 30, 215, 119, 
+    15, 5, 214, 140, 30, 104, 96, 242, 104, 15, 5, 214, 140, 30, 214, 219, 
     15, 5, 214, 140, 30, 214, 137, 15, 5, 214, 137, 15, 5, 214, 138, 30, 70, 
-    15, 5, 214, 126, 15, 5, 214, 127, 30, 61, 15, 5, 214, 127, 30, 233, 217, 
-    15, 5, 214, 127, 30, 233, 196, 15, 5, 214, 127, 30, 217, 72, 15, 5, 214, 
+    15, 5, 214, 126, 15, 5, 214, 127, 30, 61, 15, 5, 214, 127, 30, 233, 218, 
+    15, 5, 214, 127, 30, 233, 197, 15, 5, 214, 127, 30, 217, 73, 15, 5, 214, 
     122, 15, 5, 214, 125, 15, 5, 214, 123, 15, 5, 214, 119, 15, 5, 214, 108, 
-    15, 5, 214, 109, 30, 234, 207, 15, 5, 214, 107, 15, 5, 210, 116, 15, 5, 
-    210, 117, 216, 239, 15, 5, 210, 117, 92, 30, 233, 196, 15, 5, 210, 113, 
+    15, 5, 214, 109, 30, 234, 208, 15, 5, 214, 107, 15, 5, 210, 116, 15, 5, 
+    210, 117, 216, 240, 15, 5, 210, 117, 92, 30, 233, 197, 15, 5, 210, 113, 
     15, 5, 210, 106, 15, 5, 210, 93, 15, 5, 210, 44, 15, 5, 210, 45, 117, 
-    210, 44, 15, 5, 210, 43, 15, 5, 210, 41, 15, 5, 210, 42, 235, 3, 216, 
-    239, 15, 5, 210, 36, 15, 5, 210, 28, 15, 5, 210, 13, 15, 5, 210, 11, 15, 
+    210, 44, 15, 5, 210, 43, 15, 5, 210, 41, 15, 5, 210, 42, 235, 4, 216, 
+    240, 15, 5, 210, 36, 15, 5, 210, 28, 15, 5, 210, 13, 15, 5, 210, 11, 15, 
     5, 210, 12, 30, 61, 15, 5, 210, 10, 15, 5, 210, 9, 15, 132, 5, 113, 253, 
-    231, 15, 132, 5, 134, 253, 231, 15, 132, 5, 244, 11, 253, 231, 15, 132, 
-    5, 244, 81, 253, 231, 15, 132, 5, 219, 125, 253, 231, 15, 132, 5, 220, 
-    122, 253, 231, 15, 132, 5, 245, 193, 253, 231, 15, 132, 5, 228, 200, 253, 
-    231, 15, 132, 5, 134, 247, 187, 15, 132, 5, 244, 11, 247, 187, 15, 132, 
-    5, 244, 81, 247, 187, 15, 132, 5, 219, 125, 247, 187, 15, 132, 5, 220, 
-    122, 247, 187, 15, 132, 5, 245, 193, 247, 187, 15, 132, 5, 228, 200, 247, 
-    187, 15, 132, 5, 244, 11, 70, 15, 132, 5, 244, 81, 70, 15, 132, 5, 219, 
-    125, 70, 15, 132, 5, 220, 122, 70, 15, 132, 5, 245, 193, 70, 15, 132, 5, 
-    228, 200, 70, 15, 132, 5, 123, 243, 38, 15, 132, 5, 113, 243, 38, 15, 
-    132, 5, 134, 243, 38, 15, 132, 5, 244, 11, 243, 38, 15, 132, 5, 244, 81, 
-    243, 38, 15, 132, 5, 219, 125, 243, 38, 15, 132, 5, 220, 122, 243, 38, 
-    15, 132, 5, 245, 193, 243, 38, 15, 132, 5, 228, 200, 243, 38, 15, 132, 5, 
-    123, 243, 35, 15, 132, 5, 113, 243, 35, 15, 132, 5, 134, 243, 35, 15, 
-    132, 5, 244, 11, 243, 35, 15, 132, 5, 244, 81, 243, 35, 15, 132, 5, 113, 
-    220, 78, 15, 132, 5, 134, 220, 78, 15, 132, 5, 134, 220, 79, 214, 12, 17, 
-    15, 132, 5, 244, 11, 220, 78, 15, 132, 5, 244, 81, 220, 78, 15, 132, 5, 
-    219, 125, 220, 78, 15, 132, 5, 220, 122, 220, 78, 15, 132, 5, 245, 193, 
-    220, 78, 15, 132, 5, 228, 200, 220, 78, 15, 132, 5, 123, 220, 73, 15, 
-    132, 5, 113, 220, 73, 15, 132, 5, 134, 220, 73, 15, 132, 5, 134, 220, 74, 
-    214, 12, 17, 15, 132, 5, 244, 11, 220, 73, 15, 132, 5, 244, 81, 220, 73, 
-    15, 132, 5, 220, 79, 30, 243, 119, 96, 247, 187, 15, 132, 5, 220, 79, 30, 
-    243, 119, 96, 230, 188, 15, 132, 5, 123, 251, 95, 15, 132, 5, 113, 251, 
-    95, 15, 132, 5, 134, 251, 95, 15, 132, 5, 134, 251, 96, 214, 12, 17, 15, 
-    132, 5, 244, 11, 251, 95, 15, 132, 5, 244, 81, 251, 95, 15, 132, 5, 134, 
-    214, 12, 244, 20, 245, 74, 15, 132, 5, 134, 214, 12, 244, 20, 245, 71, 
-    15, 132, 5, 244, 11, 214, 12, 244, 20, 232, 217, 15, 132, 5, 244, 11, 
-    214, 12, 244, 20, 232, 215, 15, 132, 5, 244, 11, 214, 12, 244, 20, 232, 
-    218, 61, 15, 132, 5, 244, 11, 214, 12, 244, 20, 232, 218, 253, 158, 15, 
-    132, 5, 219, 125, 214, 12, 244, 20, 253, 228, 15, 132, 5, 220, 122, 214, 
-    12, 244, 20, 236, 8, 15, 132, 5, 220, 122, 214, 12, 244, 20, 236, 10, 61, 
-    15, 132, 5, 220, 122, 214, 12, 244, 20, 236, 10, 253, 158, 15, 132, 5, 
-    245, 193, 214, 12, 244, 20, 214, 121, 15, 132, 5, 245, 193, 214, 12, 244, 
-    20, 214, 120, 15, 132, 5, 228, 200, 214, 12, 244, 20, 236, 24, 15, 132, 
-    5, 228, 200, 214, 12, 244, 20, 236, 23, 15, 132, 5, 228, 200, 214, 12, 
-    244, 20, 236, 22, 15, 132, 5, 228, 200, 214, 12, 244, 20, 236, 25, 61, 
-    15, 132, 5, 113, 253, 232, 216, 239, 15, 132, 5, 134, 253, 232, 216, 239, 
-    15, 132, 5, 244, 11, 253, 232, 216, 239, 15, 132, 5, 244, 81, 253, 232, 
-    216, 239, 15, 132, 5, 219, 125, 253, 232, 216, 239, 15, 132, 5, 123, 252, 
-    150, 15, 132, 5, 113, 252, 150, 15, 132, 5, 134, 252, 150, 15, 132, 5, 
-    244, 11, 252, 150, 15, 132, 5, 244, 11, 252, 151, 214, 12, 17, 15, 132, 
-    5, 244, 81, 252, 150, 15, 132, 5, 244, 81, 252, 151, 214, 12, 17, 15, 
-    132, 5, 228, 210, 15, 132, 5, 228, 211, 15, 132, 5, 123, 245, 70, 15, 
-    132, 5, 113, 245, 70, 15, 132, 5, 123, 216, 169, 247, 187, 15, 132, 5, 
-    113, 216, 167, 247, 187, 15, 132, 5, 244, 81, 219, 114, 247, 187, 15, 
-    132, 5, 123, 216, 169, 214, 12, 244, 20, 61, 15, 132, 5, 113, 216, 167, 
-    214, 12, 244, 20, 61, 15, 132, 5, 123, 245, 189, 253, 231, 15, 132, 5, 
-    123, 224, 22, 253, 231, 15, 132, 5, 55, 253, 219, 123, 219, 115, 15, 132, 
-    5, 55, 253, 219, 123, 224, 21, 15, 224, 141, 5, 55, 253, 219, 211, 209, 
-    247, 172, 15, 224, 141, 5, 67, 249, 226, 15, 224, 141, 5, 247, 255, 249, 
-    226, 15, 224, 141, 5, 247, 255, 215, 221, 12, 13, 255, 155, 12, 13, 255, 
-    154, 12, 13, 255, 153, 12, 13, 255, 152, 12, 13, 255, 151, 12, 13, 255, 
-    150, 12, 13, 255, 149, 12, 13, 255, 148, 12, 13, 255, 147, 12, 13, 255, 
-    146, 12, 13, 255, 145, 12, 13, 255, 144, 12, 13, 255, 143, 12, 13, 255, 
-    142, 12, 13, 255, 141, 12, 13, 255, 140, 12, 13, 255, 139, 12, 13, 255, 
-    138, 12, 13, 255, 137, 12, 13, 255, 136, 12, 13, 255, 135, 12, 13, 255, 
-    134, 12, 13, 255, 133, 12, 13, 255, 132, 12, 13, 255, 131, 12, 13, 255, 
-    130, 12, 13, 255, 129, 12, 13, 255, 128, 12, 13, 255, 127, 12, 13, 255, 
-    126, 12, 13, 255, 125, 12, 13, 255, 124, 12, 13, 255, 123, 12, 13, 255, 
-    122, 12, 13, 255, 121, 12, 13, 255, 120, 12, 13, 255, 119, 12, 13, 255, 
-    118, 12, 13, 255, 117, 12, 13, 255, 116, 12, 13, 255, 115, 12, 13, 255, 
-    114, 12, 13, 255, 113, 12, 13, 255, 112, 12, 13, 255, 111, 12, 13, 255, 
-    110, 12, 13, 255, 109, 12, 13, 255, 108, 12, 13, 255, 107, 12, 13, 255, 
-    106, 12, 13, 255, 105, 12, 13, 255, 104, 12, 13, 255, 103, 12, 13, 255, 
-    102, 12, 13, 255, 101, 12, 13, 255, 100, 12, 13, 255, 99, 12, 13, 255, 
-    98, 12, 13, 255, 97, 12, 13, 255, 96, 12, 13, 255, 95, 12, 13, 255, 94, 
-    12, 13, 255, 93, 12, 13, 255, 92, 12, 13, 255, 91, 12, 13, 255, 90, 12, 
-    13, 255, 89, 12, 13, 255, 88, 12, 13, 255, 87, 12, 13, 255, 86, 12, 13, 
-    255, 85, 12, 13, 255, 84, 12, 13, 255, 83, 12, 13, 255, 82, 12, 13, 255, 
-    81, 12, 13, 255, 80, 12, 13, 255, 79, 12, 13, 255, 78, 12, 13, 255, 77, 
-    12, 13, 255, 76, 12, 13, 253, 156, 12, 13, 253, 154, 12, 13, 253, 152, 
-    12, 13, 253, 150, 12, 13, 253, 148, 12, 13, 253, 147, 12, 13, 253, 145, 
-    12, 13, 253, 143, 12, 13, 253, 141, 12, 13, 253, 139, 12, 13, 251, 62, 
-    12, 13, 251, 61, 12, 13, 251, 60, 12, 13, 251, 59, 12, 13, 251, 58, 12, 
-    13, 251, 57, 12, 13, 251, 56, 12, 13, 251, 55, 12, 13, 251, 54, 12, 13, 
-    251, 53, 12, 13, 251, 52, 12, 13, 251, 51, 12, 13, 251, 50, 12, 13, 251, 
-    49, 12, 13, 251, 48, 12, 13, 251, 47, 12, 13, 251, 46, 12, 13, 251, 45, 
-    12, 13, 251, 44, 12, 13, 251, 43, 12, 13, 251, 42, 12, 13, 251, 41, 12, 
-    13, 251, 40, 12, 13, 251, 39, 12, 13, 251, 38, 12, 13, 251, 37, 12, 13, 
-    251, 36, 12, 13, 251, 35, 12, 13, 249, 59, 12, 13, 249, 58, 12, 13, 249, 
-    57, 12, 13, 249, 56, 12, 13, 249, 55, 12, 13, 249, 54, 12, 13, 249, 53, 
-    12, 13, 249, 52, 12, 13, 249, 51, 12, 13, 249, 50, 12, 13, 249, 49, 12, 
-    13, 249, 48, 12, 13, 249, 47, 12, 13, 249, 46, 12, 13, 249, 45, 12, 13, 
-    249, 44, 12, 13, 249, 43, 12, 13, 249, 42, 12, 13, 249, 41, 12, 13, 249, 
-    40, 12, 13, 249, 39, 12, 13, 249, 38, 12, 13, 249, 37, 12, 13, 249, 36, 
-    12, 13, 249, 35, 12, 13, 249, 34, 12, 13, 249, 33, 12, 13, 249, 32, 12, 
-    13, 249, 31, 12, 13, 249, 30, 12, 13, 249, 29, 12, 13, 249, 28, 12, 13, 
-    249, 27, 12, 13, 249, 26, 12, 13, 249, 25, 12, 13, 249, 24, 12, 13, 249, 
-    23, 12, 13, 249, 22, 12, 13, 249, 21, 12, 13, 249, 20, 12, 13, 249, 19, 
-    12, 13, 249, 18, 12, 13, 249, 17, 12, 13, 249, 16, 12, 13, 249, 15, 12, 
-    13, 249, 14, 12, 13, 249, 13, 12, 13, 249, 12, 12, 13, 249, 11, 12, 13, 
-    249, 10, 12, 13, 249, 9, 12, 13, 249, 8, 12, 13, 249, 7, 12, 13, 249, 6, 
-    12, 13, 249, 5, 12, 13, 249, 4, 12, 13, 249, 3, 12, 13, 249, 2, 12, 13, 
-    249, 1, 12, 13, 249, 0, 12, 13, 248, 255, 12, 13, 248, 254, 12, 13, 248, 
-    253, 12, 13, 248, 252, 12, 13, 248, 251, 12, 13, 248, 250, 12, 13, 248, 
-    249, 12, 13, 248, 248, 12, 13, 248, 247, 12, 13, 248, 246, 12, 13, 248, 
-    245, 12, 13, 248, 244, 12, 13, 248, 243, 12, 13, 248, 242, 12, 13, 248, 
-    241, 12, 13, 248, 240, 12, 13, 248, 239, 12, 13, 248, 238, 12, 13, 248, 
-    237, 12, 13, 248, 236, 12, 13, 248, 235, 12, 13, 248, 234, 12, 13, 248, 
-    233, 12, 13, 248, 232, 12, 13, 248, 231, 12, 13, 248, 230, 12, 13, 248, 
-    229, 12, 13, 248, 228, 12, 13, 248, 227, 12, 13, 248, 226, 12, 13, 248, 
-    225, 12, 13, 248, 224, 12, 13, 246, 23, 12, 13, 246, 22, 12, 13, 246, 21, 
-    12, 13, 246, 20, 12, 13, 246, 19, 12, 13, 246, 18, 12, 13, 246, 17, 12, 
-    13, 246, 16, 12, 13, 246, 15, 12, 13, 246, 14, 12, 13, 246, 13, 12, 13, 
-    246, 12, 12, 13, 246, 11, 12, 13, 246, 10, 12, 13, 246, 9, 12, 13, 246, 
-    8, 12, 13, 246, 7, 12, 13, 246, 6, 12, 13, 246, 5, 12, 13, 246, 4, 12, 
-    13, 246, 3, 12, 13, 246, 2, 12, 13, 246, 1, 12, 13, 246, 0, 12, 13, 245, 
-    255, 12, 13, 245, 254, 12, 13, 245, 253, 12, 13, 245, 252, 12, 13, 245, 
-    251, 12, 13, 245, 250, 12, 13, 245, 249, 12, 13, 245, 248, 12, 13, 245, 
-    247, 12, 13, 245, 246, 12, 13, 245, 245, 12, 13, 245, 244, 12, 13, 245, 
-    243, 12, 13, 245, 242, 12, 13, 245, 241, 12, 13, 245, 240, 12, 13, 245, 
-    239, 12, 13, 245, 238, 12, 13, 245, 237, 12, 13, 245, 236, 12, 13, 245, 
-    5, 12, 13, 245, 4, 12, 13, 245, 3, 12, 13, 245, 2, 12, 13, 245, 1, 12, 
-    13, 245, 0, 12, 13, 244, 255, 12, 13, 244, 254, 12, 13, 244, 253, 12, 13, 
-    244, 252, 12, 13, 244, 251, 12, 13, 244, 250, 12, 13, 244, 249, 12, 13, 
-    244, 248, 12, 13, 244, 247, 12, 13, 244, 246, 12, 13, 244, 245, 12, 13, 
-    244, 244, 12, 13, 244, 243, 12, 13, 244, 242, 12, 13, 244, 241, 12, 13, 
-    244, 240, 12, 13, 244, 239, 12, 13, 244, 238, 12, 13, 244, 237, 12, 13, 
-    244, 236, 12, 13, 244, 235, 12, 13, 244, 234, 12, 13, 244, 233, 12, 13, 
-    244, 232, 12, 13, 244, 231, 12, 13, 244, 230, 12, 13, 244, 229, 12, 13, 
-    244, 228, 12, 13, 244, 227, 12, 13, 244, 226, 12, 13, 244, 225, 12, 13, 
-    244, 224, 12, 13, 244, 223, 12, 13, 244, 222, 12, 13, 244, 221, 12, 13, 
-    244, 220, 12, 13, 244, 219, 12, 13, 244, 218, 12, 13, 244, 217, 12, 13, 
-    244, 216, 12, 13, 244, 215, 12, 13, 244, 214, 12, 13, 244, 213, 12, 13, 
-    244, 212, 12, 13, 244, 211, 12, 13, 244, 210, 12, 13, 244, 209, 12, 13, 
-    244, 208, 12, 13, 244, 207, 12, 13, 244, 206, 12, 13, 244, 205, 12, 13, 
-    244, 204, 12, 13, 244, 203, 12, 13, 244, 202, 12, 13, 244, 201, 12, 13, 
-    244, 200, 12, 13, 244, 199, 12, 13, 244, 198, 12, 13, 244, 197, 12, 13, 
-    243, 201, 12, 13, 243, 200, 12, 13, 243, 199, 12, 13, 243, 198, 12, 13, 
-    243, 197, 12, 13, 243, 196, 12, 13, 243, 195, 12, 13, 243, 194, 12, 13, 
-    243, 193, 12, 13, 243, 192, 12, 13, 243, 191, 12, 13, 243, 190, 12, 13, 
-    243, 189, 12, 13, 243, 188, 12, 13, 243, 187, 12, 13, 243, 186, 12, 13, 
-    243, 185, 12, 13, 243, 184, 12, 13, 243, 183, 12, 13, 243, 182, 12, 13, 
-    243, 181, 12, 13, 243, 180, 12, 13, 243, 179, 12, 13, 243, 178, 12, 13, 
-    243, 177, 12, 13, 243, 176, 12, 13, 243, 175, 12, 13, 243, 174, 12, 13, 
-    243, 173, 12, 13, 243, 172, 12, 13, 243, 171, 12, 13, 243, 170, 12, 13, 
-    243, 169, 12, 13, 243, 168, 12, 13, 243, 167, 12, 13, 243, 166, 12, 13, 
-    243, 165, 12, 13, 243, 164, 12, 13, 243, 163, 12, 13, 243, 162, 12, 13, 
-    243, 161, 12, 13, 243, 160, 12, 13, 243, 159, 12, 13, 243, 158, 12, 13, 
-    243, 157, 12, 13, 243, 156, 12, 13, 243, 155, 12, 13, 243, 154, 12, 13, 
-    243, 153, 12, 13, 243, 152, 12, 13, 243, 151, 12, 13, 243, 150, 12, 13, 
-    243, 149, 12, 13, 243, 148, 12, 13, 243, 147, 12, 13, 243, 146, 12, 13, 
-    243, 145, 12, 13, 243, 144, 12, 13, 243, 143, 12, 13, 243, 142, 12, 13, 
-    243, 141, 12, 13, 243, 140, 12, 13, 243, 139, 12, 13, 243, 138, 12, 13, 
-    242, 58, 12, 13, 242, 57, 12, 13, 242, 56, 12, 13, 242, 55, 12, 13, 242, 
-    54, 12, 13, 242, 53, 12, 13, 242, 52, 12, 13, 242, 51, 12, 13, 242, 50, 
-    12, 13, 240, 138, 12, 13, 240, 137, 12, 13, 240, 136, 12, 13, 240, 135, 
-    12, 13, 240, 134, 12, 13, 240, 133, 12, 13, 240, 132, 12, 13, 240, 131, 
-    12, 13, 240, 130, 12, 13, 240, 129, 12, 13, 240, 128, 12, 13, 240, 127, 
-    12, 13, 240, 126, 12, 13, 240, 125, 12, 13, 240, 124, 12, 13, 240, 123, 
-    12, 13, 240, 122, 12, 13, 240, 121, 12, 13, 240, 120, 12, 13, 235, 22, 
-    12, 13, 235, 21, 12, 13, 235, 20, 12, 13, 235, 19, 12, 13, 235, 18, 12, 
-    13, 235, 17, 12, 13, 235, 16, 12, 13, 235, 15, 12, 13, 233, 146, 12, 13, 
-    233, 145, 12, 13, 233, 144, 12, 13, 233, 143, 12, 13, 233, 142, 12, 13, 
-    233, 141, 12, 13, 233, 140, 12, 13, 233, 139, 12, 13, 233, 138, 12, 13, 
-    233, 137, 12, 13, 232, 49, 12, 13, 232, 48, 12, 13, 232, 47, 12, 13, 232, 
-    46, 12, 13, 232, 45, 12, 13, 232, 44, 12, 13, 232, 43, 12, 13, 232, 42, 
-    12, 13, 232, 41, 12, 13, 232, 40, 12, 13, 232, 39, 12, 13, 232, 38, 12, 
-    13, 232, 37, 12, 13, 232, 36, 12, 13, 232, 35, 12, 13, 232, 34, 12, 13, 
-    232, 33, 12, 13, 232, 32, 12, 13, 232, 31, 12, 13, 232, 30, 12, 13, 232, 
-    29, 12, 13, 232, 28, 12, 13, 232, 27, 12, 13, 232, 26, 12, 13, 232, 25, 
-    12, 13, 232, 24, 12, 13, 232, 23, 12, 13, 232, 22, 12, 13, 232, 21, 12, 
-    13, 232, 20, 12, 13, 232, 19, 12, 13, 232, 18, 12, 13, 232, 17, 12, 13, 
-    232, 16, 12, 13, 232, 15, 12, 13, 232, 14, 12, 13, 232, 13, 12, 13, 232, 
-    12, 12, 13, 232, 11, 12, 13, 232, 10, 12, 13, 232, 9, 12, 13, 232, 8, 12, 
-    13, 232, 7, 12, 13, 232, 6, 12, 13, 232, 5, 12, 13, 232, 4, 12, 13, 232, 
-    3, 12, 13, 232, 2, 12, 13, 232, 1, 12, 13, 232, 0, 12, 13, 231, 255, 12, 
-    13, 231, 254, 12, 13, 231, 253, 12, 13, 231, 252, 12, 13, 231, 251, 12, 
-    13, 231, 250, 12, 13, 231, 249, 12, 13, 231, 248, 12, 13, 231, 247, 12, 
-    13, 231, 246, 12, 13, 231, 245, 12, 13, 231, 244, 12, 13, 231, 243, 12, 
-    13, 231, 242, 12, 13, 231, 241, 12, 13, 231, 240, 12, 13, 230, 22, 12, 
-    13, 230, 21, 12, 13, 230, 20, 12, 13, 230, 19, 12, 13, 230, 18, 12, 13, 
-    230, 17, 12, 13, 230, 16, 12, 13, 230, 15, 12, 13, 230, 14, 12, 13, 230, 
-    13, 12, 13, 230, 12, 12, 13, 230, 11, 12, 13, 230, 10, 12, 13, 230, 9, 
-    12, 13, 230, 8, 12, 13, 230, 7, 12, 13, 230, 6, 12, 13, 230, 5, 12, 13, 
-    230, 4, 12, 13, 230, 3, 12, 13, 230, 2, 12, 13, 230, 1, 12, 13, 230, 0, 
-    12, 13, 229, 255, 12, 13, 229, 254, 12, 13, 229, 253, 12, 13, 229, 252, 
-    12, 13, 229, 251, 12, 13, 229, 250, 12, 13, 229, 249, 12, 13, 229, 248, 
-    12, 13, 229, 247, 12, 13, 229, 246, 12, 13, 229, 245, 12, 13, 229, 244, 
-    12, 13, 229, 243, 12, 13, 229, 242, 12, 13, 229, 241, 12, 13, 229, 240, 
-    12, 13, 229, 239, 12, 13, 229, 238, 12, 13, 229, 237, 12, 13, 229, 236, 
-    12, 13, 229, 235, 12, 13, 229, 234, 12, 13, 229, 233, 12, 13, 229, 232, 
-    12, 13, 229, 231, 12, 13, 229, 230, 12, 13, 228, 134, 12, 13, 228, 133, 
-    12, 13, 228, 132, 12, 13, 228, 131, 12, 13, 228, 130, 12, 13, 228, 129, 
-    12, 13, 228, 128, 12, 13, 228, 127, 12, 13, 228, 126, 12, 13, 228, 125, 
-    12, 13, 228, 124, 12, 13, 228, 123, 12, 13, 228, 122, 12, 13, 228, 121, 
-    12, 13, 228, 120, 12, 13, 228, 119, 12, 13, 228, 118, 12, 13, 228, 117, 
-    12, 13, 228, 116, 12, 13, 228, 115, 12, 13, 228, 114, 12, 13, 228, 113, 
-    12, 13, 227, 236, 12, 13, 227, 235, 12, 13, 227, 234, 12, 13, 227, 233, 
-    12, 13, 227, 232, 12, 13, 227, 231, 12, 13, 227, 230, 12, 13, 227, 229, 
-    12, 13, 227, 228, 12, 13, 227, 227, 12, 13, 227, 226, 12, 13, 227, 225, 
-    12, 13, 227, 224, 12, 13, 227, 223, 12, 13, 227, 222, 12, 13, 227, 221, 
-    12, 13, 227, 220, 12, 13, 227, 219, 12, 13, 227, 218, 12, 13, 227, 217, 
-    12, 13, 227, 216, 12, 13, 227, 215, 12, 13, 227, 214, 12, 13, 227, 213, 
-    12, 13, 227, 212, 12, 13, 227, 211, 12, 13, 227, 76, 12, 13, 227, 75, 12, 
-    13, 227, 74, 12, 13, 227, 73, 12, 13, 227, 72, 12, 13, 227, 71, 12, 13, 
-    227, 70, 12, 13, 227, 69, 12, 13, 227, 68, 12, 13, 227, 67, 12, 13, 227, 
-    66, 12, 13, 227, 65, 12, 13, 227, 64, 12, 13, 227, 63, 12, 13, 227, 62, 
-    12, 13, 227, 61, 12, 13, 227, 60, 12, 13, 227, 59, 12, 13, 227, 58, 12, 
-    13, 227, 57, 12, 13, 227, 56, 12, 13, 227, 55, 12, 13, 227, 54, 12, 13, 
-    227, 53, 12, 13, 227, 52, 12, 13, 227, 51, 12, 13, 227, 50, 12, 13, 227, 
-    49, 12, 13, 227, 48, 12, 13, 227, 47, 12, 13, 227, 46, 12, 13, 227, 45, 
-    12, 13, 227, 44, 12, 13, 227, 43, 12, 13, 227, 42, 12, 13, 227, 41, 12, 
-    13, 227, 40, 12, 13, 227, 39, 12, 13, 227, 38, 12, 13, 227, 37, 12, 13, 
-    227, 36, 12, 13, 227, 35, 12, 13, 227, 34, 12, 13, 227, 33, 12, 13, 227, 
-    32, 12, 13, 227, 31, 12, 13, 227, 30, 12, 13, 227, 29, 12, 13, 227, 28, 
-    12, 13, 227, 27, 12, 13, 227, 26, 12, 13, 227, 25, 12, 13, 227, 24, 12, 
-    13, 227, 23, 12, 13, 227, 22, 12, 13, 227, 21, 12, 13, 227, 20, 12, 13, 
-    227, 19, 12, 13, 227, 18, 12, 13, 227, 17, 12, 13, 227, 16, 12, 13, 227, 
-    15, 12, 13, 227, 14, 12, 13, 227, 13, 12, 13, 227, 12, 12, 13, 227, 11, 
-    12, 13, 227, 10, 12, 13, 227, 9, 12, 13, 227, 8, 12, 13, 227, 7, 12, 13, 
-    227, 6, 12, 13, 227, 5, 12, 13, 227, 4, 12, 13, 227, 3, 12, 13, 227, 2, 
-    12, 13, 226, 104, 12, 13, 226, 103, 12, 13, 226, 102, 12, 13, 226, 101, 
-    12, 13, 226, 100, 12, 13, 226, 99, 12, 13, 226, 98, 12, 13, 226, 97, 12, 
-    13, 226, 96, 12, 13, 226, 95, 12, 13, 226, 94, 12, 13, 226, 93, 12, 13, 
-    226, 92, 12, 13, 224, 95, 12, 13, 224, 94, 12, 13, 224, 93, 12, 13, 224, 
-    92, 12, 13, 224, 91, 12, 13, 224, 90, 12, 13, 224, 89, 12, 13, 223, 222, 
-    12, 13, 223, 221, 12, 13, 223, 220, 12, 13, 223, 219, 12, 13, 223, 218, 
-    12, 13, 223, 217, 12, 13, 223, 216, 12, 13, 223, 215, 12, 13, 223, 214, 
-    12, 13, 223, 213, 12, 13, 223, 212, 12, 13, 223, 211, 12, 13, 223, 210, 
-    12, 13, 223, 209, 12, 13, 223, 208, 12, 13, 223, 207, 12, 13, 223, 206, 
-    12, 13, 223, 205, 12, 13, 223, 204, 12, 13, 223, 203, 12, 13, 223, 202, 
-    12, 13, 223, 201, 12, 13, 223, 200, 12, 13, 223, 199, 12, 13, 223, 198, 
-    12, 13, 223, 197, 12, 13, 223, 196, 12, 13, 223, 195, 12, 13, 223, 194, 
-    12, 13, 223, 193, 12, 13, 223, 192, 12, 13, 223, 191, 12, 13, 223, 190, 
-    12, 13, 223, 189, 12, 13, 222, 88, 12, 13, 222, 87, 12, 13, 222, 86, 12, 
-    13, 222, 85, 12, 13, 222, 84, 12, 13, 222, 83, 12, 13, 222, 82, 12, 13, 
-    222, 81, 12, 13, 222, 80, 12, 13, 222, 79, 12, 13, 222, 78, 12, 13, 222, 
-    77, 12, 13, 222, 76, 12, 13, 222, 75, 12, 13, 222, 74, 12, 13, 222, 73, 
-    12, 13, 222, 72, 12, 13, 222, 71, 12, 13, 222, 70, 12, 13, 222, 69, 12, 
-    13, 222, 68, 12, 13, 222, 67, 12, 13, 222, 66, 12, 13, 222, 65, 12, 13, 
-    222, 64, 12, 13, 222, 63, 12, 13, 222, 62, 12, 13, 222, 61, 12, 13, 222, 
-    60, 12, 13, 222, 59, 12, 13, 222, 58, 12, 13, 222, 57, 12, 13, 222, 56, 
-    12, 13, 222, 55, 12, 13, 222, 54, 12, 13, 222, 53, 12, 13, 222, 52, 12, 
-    13, 222, 51, 12, 13, 222, 50, 12, 13, 222, 49, 12, 13, 222, 48, 12, 13, 
-    222, 47, 12, 13, 222, 46, 12, 13, 222, 45, 12, 13, 222, 44, 12, 13, 222, 
-    43, 12, 13, 222, 42, 12, 13, 222, 41, 12, 13, 222, 40, 12, 13, 222, 39, 
-    12, 13, 222, 38, 12, 13, 222, 37, 12, 13, 222, 36, 12, 13, 222, 35, 12, 
-    13, 217, 150, 12, 13, 217, 149, 12, 13, 217, 148, 12, 13, 217, 147, 12, 
-    13, 217, 146, 12, 13, 217, 145, 12, 13, 217, 144, 12, 13, 217, 143, 12, 
-    13, 217, 142, 12, 13, 217, 141, 12, 13, 217, 140, 12, 13, 217, 139, 12, 
-    13, 217, 138, 12, 13, 217, 137, 12, 13, 217, 136, 12, 13, 217, 135, 12, 
-    13, 217, 134, 12, 13, 217, 133, 12, 13, 217, 132, 12, 13, 217, 131, 12, 
-    13, 217, 130, 12, 13, 217, 129, 12, 13, 217, 128, 12, 13, 217, 127, 12, 
-    13, 217, 126, 12, 13, 217, 125, 12, 13, 217, 124, 12, 13, 217, 123, 12, 
-    13, 217, 122, 12, 13, 217, 121, 12, 13, 217, 120, 12, 13, 217, 119, 12, 
-    13, 217, 118, 12, 13, 217, 117, 12, 13, 217, 116, 12, 13, 217, 115, 12, 
-    13, 217, 114, 12, 13, 217, 113, 12, 13, 217, 112, 12, 13, 217, 111, 12, 
-    13, 217, 110, 12, 13, 217, 109, 12, 13, 217, 108, 12, 13, 217, 107, 12, 
+    232, 15, 132, 5, 134, 253, 232, 15, 132, 5, 244, 12, 253, 232, 15, 132, 
+    5, 244, 82, 253, 232, 15, 132, 5, 219, 126, 253, 232, 15, 132, 5, 220, 
+    123, 253, 232, 15, 132, 5, 245, 194, 253, 232, 15, 132, 5, 228, 201, 253, 
+    232, 15, 132, 5, 134, 247, 188, 15, 132, 5, 244, 12, 247, 188, 15, 132, 
+    5, 244, 82, 247, 188, 15, 132, 5, 219, 126, 247, 188, 15, 132, 5, 220, 
+    123, 247, 188, 15, 132, 5, 245, 194, 247, 188, 15, 132, 5, 228, 201, 247, 
+    188, 15, 132, 5, 244, 12, 70, 15, 132, 5, 244, 82, 70, 15, 132, 5, 219, 
+    126, 70, 15, 132, 5, 220, 123, 70, 15, 132, 5, 245, 194, 70, 15, 132, 5, 
+    228, 201, 70, 15, 132, 5, 123, 243, 39, 15, 132, 5, 113, 243, 39, 15, 
+    132, 5, 134, 243, 39, 15, 132, 5, 244, 12, 243, 39, 15, 132, 5, 244, 82, 
+    243, 39, 15, 132, 5, 219, 126, 243, 39, 15, 132, 5, 220, 123, 243, 39, 
+    15, 132, 5, 245, 194, 243, 39, 15, 132, 5, 228, 201, 243, 39, 15, 132, 5, 
+    123, 243, 36, 15, 132, 5, 113, 243, 36, 15, 132, 5, 134, 243, 36, 15, 
+    132, 5, 244, 12, 243, 36, 15, 132, 5, 244, 82, 243, 36, 15, 132, 5, 113, 
+    220, 79, 15, 132, 5, 134, 220, 79, 15, 132, 5, 134, 220, 80, 214, 12, 17, 
+    15, 132, 5, 244, 12, 220, 79, 15, 132, 5, 244, 82, 220, 79, 15, 132, 5, 
+    219, 126, 220, 79, 15, 132, 5, 220, 123, 220, 79, 15, 132, 5, 245, 194, 
+    220, 79, 15, 132, 5, 228, 201, 220, 79, 15, 132, 5, 123, 220, 74, 15, 
+    132, 5, 113, 220, 74, 15, 132, 5, 134, 220, 74, 15, 132, 5, 134, 220, 75, 
+    214, 12, 17, 15, 132, 5, 244, 12, 220, 74, 15, 132, 5, 244, 82, 220, 74, 
+    15, 132, 5, 220, 80, 30, 243, 120, 96, 247, 188, 15, 132, 5, 220, 80, 30, 
+    243, 120, 96, 230, 189, 15, 132, 5, 123, 251, 96, 15, 132, 5, 113, 251, 
+    96, 15, 132, 5, 134, 251, 96, 15, 132, 5, 134, 251, 97, 214, 12, 17, 15, 
+    132, 5, 244, 12, 251, 96, 15, 132, 5, 244, 82, 251, 96, 15, 132, 5, 134, 
+    214, 12, 244, 21, 245, 75, 15, 132, 5, 134, 214, 12, 244, 21, 245, 72, 
+    15, 132, 5, 244, 12, 214, 12, 244, 21, 232, 218, 15, 132, 5, 244, 12, 
+    214, 12, 244, 21, 232, 216, 15, 132, 5, 244, 12, 214, 12, 244, 21, 232, 
+    219, 61, 15, 132, 5, 244, 12, 214, 12, 244, 21, 232, 219, 253, 159, 15, 
+    132, 5, 219, 126, 214, 12, 244, 21, 253, 229, 15, 132, 5, 220, 123, 214, 
+    12, 244, 21, 236, 9, 15, 132, 5, 220, 123, 214, 12, 244, 21, 236, 11, 61, 
+    15, 132, 5, 220, 123, 214, 12, 244, 21, 236, 11, 253, 159, 15, 132, 5, 
+    245, 194, 214, 12, 244, 21, 214, 121, 15, 132, 5, 245, 194, 214, 12, 244, 
+    21, 214, 120, 15, 132, 5, 228, 201, 214, 12, 244, 21, 236, 25, 15, 132, 
+    5, 228, 201, 214, 12, 244, 21, 236, 24, 15, 132, 5, 228, 201, 214, 12, 
+    244, 21, 236, 23, 15, 132, 5, 228, 201, 214, 12, 244, 21, 236, 26, 61, 
+    15, 132, 5, 113, 253, 233, 216, 240, 15, 132, 5, 134, 253, 233, 216, 240, 
+    15, 132, 5, 244, 12, 253, 233, 216, 240, 15, 132, 5, 244, 82, 253, 233, 
+    216, 240, 15, 132, 5, 219, 126, 253, 233, 216, 240, 15, 132, 5, 123, 252, 
+    151, 15, 132, 5, 113, 252, 151, 15, 132, 5, 134, 252, 151, 15, 132, 5, 
+    244, 12, 252, 151, 15, 132, 5, 244, 12, 252, 152, 214, 12, 17, 15, 132, 
+    5, 244, 82, 252, 151, 15, 132, 5, 244, 82, 252, 152, 214, 12, 17, 15, 
+    132, 5, 228, 211, 15, 132, 5, 228, 212, 15, 132, 5, 123, 245, 71, 15, 
+    132, 5, 113, 245, 71, 15, 132, 5, 123, 216, 170, 247, 188, 15, 132, 5, 
+    113, 216, 168, 247, 188, 15, 132, 5, 244, 82, 219, 115, 247, 188, 15, 
+    132, 5, 123, 216, 170, 214, 12, 244, 21, 61, 15, 132, 5, 113, 216, 168, 
+    214, 12, 244, 21, 61, 15, 132, 5, 123, 245, 190, 253, 232, 15, 132, 5, 
+    123, 224, 23, 253, 232, 15, 132, 5, 55, 253, 220, 123, 219, 116, 15, 132, 
+    5, 55, 253, 220, 123, 224, 22, 15, 224, 142, 5, 55, 253, 220, 211, 209, 
+    247, 173, 15, 224, 142, 5, 67, 249, 227, 15, 224, 142, 5, 248, 0, 249, 
+    227, 15, 224, 142, 5, 248, 0, 215, 222, 12, 13, 255, 156, 12, 13, 255, 
+    155, 12, 13, 255, 154, 12, 13, 255, 153, 12, 13, 255, 152, 12, 13, 255, 
+    151, 12, 13, 255, 150, 12, 13, 255, 149, 12, 13, 255, 148, 12, 13, 255, 
+    147, 12, 13, 255, 146, 12, 13, 255, 145, 12, 13, 255, 144, 12, 13, 255, 
+    143, 12, 13, 255, 142, 12, 13, 255, 141, 12, 13, 255, 140, 12, 13, 255, 
+    139, 12, 13, 255, 138, 12, 13, 255, 137, 12, 13, 255, 136, 12, 13, 255, 
+    135, 12, 13, 255, 134, 12, 13, 255, 133, 12, 13, 255, 132, 12, 13, 255, 
+    131, 12, 13, 255, 130, 12, 13, 255, 129, 12, 13, 255, 128, 12, 13, 255, 
+    127, 12, 13, 255, 126, 12, 13, 255, 125, 12, 13, 255, 124, 12, 13, 255, 
+    123, 12, 13, 255, 122, 12, 13, 255, 121, 12, 13, 255, 120, 12, 13, 255, 
+    119, 12, 13, 255, 118, 12, 13, 255, 117, 12, 13, 255, 116, 12, 13, 255, 
+    115, 12, 13, 255, 114, 12, 13, 255, 113, 12, 13, 255, 112, 12, 13, 255, 
+    111, 12, 13, 255, 110, 12, 13, 255, 109, 12, 13, 255, 108, 12, 13, 255, 
+    107, 12, 13, 255, 106, 12, 13, 255, 105, 12, 13, 255, 104, 12, 13, 255, 
+    103, 12, 13, 255, 102, 12, 13, 255, 101, 12, 13, 255, 100, 12, 13, 255, 
+    99, 12, 13, 255, 98, 12, 13, 255, 97, 12, 13, 255, 96, 12, 13, 255, 95, 
+    12, 13, 255, 94, 12, 13, 255, 93, 12, 13, 255, 92, 12, 13, 255, 91, 12, 
+    13, 255, 90, 12, 13, 255, 89, 12, 13, 255, 88, 12, 13, 255, 87, 12, 13, 
+    255, 86, 12, 13, 255, 85, 12, 13, 255, 84, 12, 13, 255, 83, 12, 13, 255, 
+    82, 12, 13, 255, 81, 12, 13, 255, 80, 12, 13, 255, 79, 12, 13, 255, 78, 
+    12, 13, 255, 77, 12, 13, 253, 157, 12, 13, 253, 155, 12, 13, 253, 153, 
+    12, 13, 253, 151, 12, 13, 253, 149, 12, 13, 253, 148, 12, 13, 253, 146, 
+    12, 13, 253, 144, 12, 13, 253, 142, 12, 13, 253, 140, 12, 13, 251, 63, 
+    12, 13, 251, 62, 12, 13, 251, 61, 12, 13, 251, 60, 12, 13, 251, 59, 12, 
+    13, 251, 58, 12, 13, 251, 57, 12, 13, 251, 56, 12, 13, 251, 55, 12, 13, 
+    251, 54, 12, 13, 251, 53, 12, 13, 251, 52, 12, 13, 251, 51, 12, 13, 251, 
+    50, 12, 13, 251, 49, 12, 13, 251, 48, 12, 13, 251, 47, 12, 13, 251, 46, 
+    12, 13, 251, 45, 12, 13, 251, 44, 12, 13, 251, 43, 12, 13, 251, 42, 12, 
+    13, 251, 41, 12, 13, 251, 40, 12, 13, 251, 39, 12, 13, 251, 38, 12, 13, 
+    251, 37, 12, 13, 251, 36, 12, 13, 249, 60, 12, 13, 249, 59, 12, 13, 249, 
+    58, 12, 13, 249, 57, 12, 13, 249, 56, 12, 13, 249, 55, 12, 13, 249, 54, 
+    12, 13, 249, 53, 12, 13, 249, 52, 12, 13, 249, 51, 12, 13, 249, 50, 12, 
+    13, 249, 49, 12, 13, 249, 48, 12, 13, 249, 47, 12, 13, 249, 46, 12, 13, 
+    249, 45, 12, 13, 249, 44, 12, 13, 249, 43, 12, 13, 249, 42, 12, 13, 249, 
+    41, 12, 13, 249, 40, 12, 13, 249, 39, 12, 13, 249, 38, 12, 13, 249, 37, 
+    12, 13, 249, 36, 12, 13, 249, 35, 12, 13, 249, 34, 12, 13, 249, 33, 12, 
+    13, 249, 32, 12, 13, 249, 31, 12, 13, 249, 30, 12, 13, 249, 29, 12, 13, 
+    249, 28, 12, 13, 249, 27, 12, 13, 249, 26, 12, 13, 249, 25, 12, 13, 249, 
+    24, 12, 13, 249, 23, 12, 13, 249, 22, 12, 13, 249, 21, 12, 13, 249, 20, 
+    12, 13, 249, 19, 12, 13, 249, 18, 12, 13, 249, 17, 12, 13, 249, 16, 12, 
+    13, 249, 15, 12, 13, 249, 14, 12, 13, 249, 13, 12, 13, 249, 12, 12, 13, 
+    249, 11, 12, 13, 249, 10, 12, 13, 249, 9, 12, 13, 249, 8, 12, 13, 249, 7, 
+    12, 13, 249, 6, 12, 13, 249, 5, 12, 13, 249, 4, 12, 13, 249, 3, 12, 13, 
+    249, 2, 12, 13, 249, 1, 12, 13, 249, 0, 12, 13, 248, 255, 12, 13, 248, 
+    254, 12, 13, 248, 253, 12, 13, 248, 252, 12, 13, 248, 251, 12, 13, 248, 
+    250, 12, 13, 248, 249, 12, 13, 248, 248, 12, 13, 248, 247, 12, 13, 248, 
+    246, 12, 13, 248, 245, 12, 13, 248, 244, 12, 13, 248, 243, 12, 13, 248, 
+    242, 12, 13, 248, 241, 12, 13, 248, 240, 12, 13, 248, 239, 12, 13, 248, 
+    238, 12, 13, 248, 237, 12, 13, 248, 236, 12, 13, 248, 235, 12, 13, 248, 
+    234, 12, 13, 248, 233, 12, 13, 248, 232, 12, 13, 248, 231, 12, 13, 248, 
+    230, 12, 13, 248, 229, 12, 13, 248, 228, 12, 13, 248, 227, 12, 13, 248, 
+    226, 12, 13, 248, 225, 12, 13, 246, 24, 12, 13, 246, 23, 12, 13, 246, 22, 
+    12, 13, 246, 21, 12, 13, 246, 20, 12, 13, 246, 19, 12, 13, 246, 18, 12, 
+    13, 246, 17, 12, 13, 246, 16, 12, 13, 246, 15, 12, 13, 246, 14, 12, 13, 
+    246, 13, 12, 13, 246, 12, 12, 13, 246, 11, 12, 13, 246, 10, 12, 13, 246, 
+    9, 12, 13, 246, 8, 12, 13, 246, 7, 12, 13, 246, 6, 12, 13, 246, 5, 12, 
+    13, 246, 4, 12, 13, 246, 3, 12, 13, 246, 2, 12, 13, 246, 1, 12, 13, 246, 
+    0, 12, 13, 245, 255, 12, 13, 245, 254, 12, 13, 245, 253, 12, 13, 245, 
+    252, 12, 13, 245, 251, 12, 13, 245, 250, 12, 13, 245, 249, 12, 13, 245, 
+    248, 12, 13, 245, 247, 12, 13, 245, 246, 12, 13, 245, 245, 12, 13, 245, 
+    244, 12, 13, 245, 243, 12, 13, 245, 242, 12, 13, 245, 241, 12, 13, 245, 
+    240, 12, 13, 245, 239, 12, 13, 245, 238, 12, 13, 245, 237, 12, 13, 245, 
+    6, 12, 13, 245, 5, 12, 13, 245, 4, 12, 13, 245, 3, 12, 13, 245, 2, 12, 
+    13, 245, 1, 12, 13, 245, 0, 12, 13, 244, 255, 12, 13, 244, 254, 12, 13, 
+    244, 253, 12, 13, 244, 252, 12, 13, 244, 251, 12, 13, 244, 250, 12, 13, 
+    244, 249, 12, 13, 244, 248, 12, 13, 244, 247, 12, 13, 244, 246, 12, 13, 
+    244, 245, 12, 13, 244, 244, 12, 13, 244, 243, 12, 13, 244, 242, 12, 13, 
+    244, 241, 12, 13, 244, 240, 12, 13, 244, 239, 12, 13, 244, 238, 12, 13, 
+    244, 237, 12, 13, 244, 236, 12, 13, 244, 235, 12, 13, 244, 234, 12, 13, 
+    244, 233, 12, 13, 244, 232, 12, 13, 244, 231, 12, 13, 244, 230, 12, 13, 
+    244, 229, 12, 13, 244, 228, 12, 13, 244, 227, 12, 13, 244, 226, 12, 13, 
+    244, 225, 12, 13, 244, 224, 12, 13, 244, 223, 12, 13, 244, 222, 12, 13, 
+    244, 221, 12, 13, 244, 220, 12, 13, 244, 219, 12, 13, 244, 218, 12, 13, 
+    244, 217, 12, 13, 244, 216, 12, 13, 244, 215, 12, 13, 244, 214, 12, 13, 
+    244, 213, 12, 13, 244, 212, 12, 13, 244, 211, 12, 13, 244, 210, 12, 13, 
+    244, 209, 12, 13, 244, 208, 12, 13, 244, 207, 12, 13, 244, 206, 12, 13, 
+    244, 205, 12, 13, 244, 204, 12, 13, 244, 203, 12, 13, 244, 202, 12, 13, 
+    244, 201, 12, 13, 244, 200, 12, 13, 244, 199, 12, 13, 244, 198, 12, 13, 
+    243, 202, 12, 13, 243, 201, 12, 13, 243, 200, 12, 13, 243, 199, 12, 13, 
+    243, 198, 12, 13, 243, 197, 12, 13, 243, 196, 12, 13, 243, 195, 12, 13, 
+    243, 194, 12, 13, 243, 193, 12, 13, 243, 192, 12, 13, 243, 191, 12, 13, 
+    243, 190, 12, 13, 243, 189, 12, 13, 243, 188, 12, 13, 243, 187, 12, 13, 
+    243, 186, 12, 13, 243, 185, 12, 13, 243, 184, 12, 13, 243, 183, 12, 13, 
+    243, 182, 12, 13, 243, 181, 12, 13, 243, 180, 12, 13, 243, 179, 12, 13, 
+    243, 178, 12, 13, 243, 177, 12, 13, 243, 176, 12, 13, 243, 175, 12, 13, 
+    243, 174, 12, 13, 243, 173, 12, 13, 243, 172, 12, 13, 243, 171, 12, 13, 
+    243, 170, 12, 13, 243, 169, 12, 13, 243, 168, 12, 13, 243, 167, 12, 13, 
+    243, 166, 12, 13, 243, 165, 12, 13, 243, 164, 12, 13, 243, 163, 12, 13, 
+    243, 162, 12, 13, 243, 161, 12, 13, 243, 160, 12, 13, 243, 159, 12, 13, 
+    243, 158, 12, 13, 243, 157, 12, 13, 243, 156, 12, 13, 243, 155, 12, 13, 
+    243, 154, 12, 13, 243, 153, 12, 13, 243, 152, 12, 13, 243, 151, 12, 13, 
+    243, 150, 12, 13, 243, 149, 12, 13, 243, 148, 12, 13, 243, 147, 12, 13, 
+    243, 146, 12, 13, 243, 145, 12, 13, 243, 144, 12, 13, 243, 143, 12, 13, 
+    243, 142, 12, 13, 243, 141, 12, 13, 243, 140, 12, 13, 243, 139, 12, 13, 
+    242, 59, 12, 13, 242, 58, 12, 13, 242, 57, 12, 13, 242, 56, 12, 13, 242, 
+    55, 12, 13, 242, 54, 12, 13, 242, 53, 12, 13, 242, 52, 12, 13, 242, 51, 
+    12, 13, 240, 139, 12, 13, 240, 138, 12, 13, 240, 137, 12, 13, 240, 136, 
+    12, 13, 240, 135, 12, 13, 240, 134, 12, 13, 240, 133, 12, 13, 240, 132, 
+    12, 13, 240, 131, 12, 13, 240, 130, 12, 13, 240, 129, 12, 13, 240, 128, 
+    12, 13, 240, 127, 12, 13, 240, 126, 12, 13, 240, 125, 12, 13, 240, 124, 
+    12, 13, 240, 123, 12, 13, 240, 122, 12, 13, 240, 121, 12, 13, 235, 23, 
+    12, 13, 235, 22, 12, 13, 235, 21, 12, 13, 235, 20, 12, 13, 235, 19, 12, 
+    13, 235, 18, 12, 13, 235, 17, 12, 13, 235, 16, 12, 13, 233, 147, 12, 13, 
+    233, 146, 12, 13, 233, 145, 12, 13, 233, 144, 12, 13, 233, 143, 12, 13, 
+    233, 142, 12, 13, 233, 141, 12, 13, 233, 140, 12, 13, 233, 139, 12, 13, 
+    233, 138, 12, 13, 232, 50, 12, 13, 232, 49, 12, 13, 232, 48, 12, 13, 232, 
+    47, 12, 13, 232, 46, 12, 13, 232, 45, 12, 13, 232, 44, 12, 13, 232, 43, 
+    12, 13, 232, 42, 12, 13, 232, 41, 12, 13, 232, 40, 12, 13, 232, 39, 12, 
+    13, 232, 38, 12, 13, 232, 37, 12, 13, 232, 36, 12, 13, 232, 35, 12, 13, 
+    232, 34, 12, 13, 232, 33, 12, 13, 232, 32, 12, 13, 232, 31, 12, 13, 232, 
+    30, 12, 13, 232, 29, 12, 13, 232, 28, 12, 13, 232, 27, 12, 13, 232, 26, 
+    12, 13, 232, 25, 12, 13, 232, 24, 12, 13, 232, 23, 12, 13, 232, 22, 12, 
+    13, 232, 21, 12, 13, 232, 20, 12, 13, 232, 19, 12, 13, 232, 18, 12, 13, 
+    232, 17, 12, 13, 232, 16, 12, 13, 232, 15, 12, 13, 232, 14, 12, 13, 232, 
+    13, 12, 13, 232, 12, 12, 13, 232, 11, 12, 13, 232, 10, 12, 13, 232, 9, 
+    12, 13, 232, 8, 12, 13, 232, 7, 12, 13, 232, 6, 12, 13, 232, 5, 12, 13, 
+    232, 4, 12, 13, 232, 3, 12, 13, 232, 2, 12, 13, 232, 1, 12, 13, 232, 0, 
+    12, 13, 231, 255, 12, 13, 231, 254, 12, 13, 231, 253, 12, 13, 231, 252, 
+    12, 13, 231, 251, 12, 13, 231, 250, 12, 13, 231, 249, 12, 13, 231, 248, 
+    12, 13, 231, 247, 12, 13, 231, 246, 12, 13, 231, 245, 12, 13, 231, 244, 
+    12, 13, 231, 243, 12, 13, 231, 242, 12, 13, 231, 241, 12, 13, 230, 23, 
+    12, 13, 230, 22, 12, 13, 230, 21, 12, 13, 230, 20, 12, 13, 230, 19, 12, 
+    13, 230, 18, 12, 13, 230, 17, 12, 13, 230, 16, 12, 13, 230, 15, 12, 13, 
+    230, 14, 12, 13, 230, 13, 12, 13, 230, 12, 12, 13, 230, 11, 12, 13, 230, 
+    10, 12, 13, 230, 9, 12, 13, 230, 8, 12, 13, 230, 7, 12, 13, 230, 6, 12, 
+    13, 230, 5, 12, 13, 230, 4, 12, 13, 230, 3, 12, 13, 230, 2, 12, 13, 230, 
+    1, 12, 13, 230, 0, 12, 13, 229, 255, 12, 13, 229, 254, 12, 13, 229, 253, 
+    12, 13, 229, 252, 12, 13, 229, 251, 12, 13, 229, 250, 12, 13, 229, 249, 
+    12, 13, 229, 248, 12, 13, 229, 247, 12, 13, 229, 246, 12, 13, 229, 245, 
+    12, 13, 229, 244, 12, 13, 229, 243, 12, 13, 229, 242, 12, 13, 229, 241, 
+    12, 13, 229, 240, 12, 13, 229, 239, 12, 13, 229, 238, 12, 13, 229, 237, 
+    12, 13, 229, 236, 12, 13, 229, 235, 12, 13, 229, 234, 12, 13, 229, 233, 
+    12, 13, 229, 232, 12, 13, 229, 231, 12, 13, 228, 135, 12, 13, 228, 134, 
+    12, 13, 228, 133, 12, 13, 228, 132, 12, 13, 228, 131, 12, 13, 228, 130, 
+    12, 13, 228, 129, 12, 13, 228, 128, 12, 13, 228, 127, 12, 13, 228, 126, 
+    12, 13, 228, 125, 12, 13, 228, 124, 12, 13, 228, 123, 12, 13, 228, 122, 
+    12, 13, 228, 121, 12, 13, 228, 120, 12, 13, 228, 119, 12, 13, 228, 118, 
+    12, 13, 228, 117, 12, 13, 228, 116, 12, 13, 228, 115, 12, 13, 228, 114, 
+    12, 13, 227, 237, 12, 13, 227, 236, 12, 13, 227, 235, 12, 13, 227, 234, 
+    12, 13, 227, 233, 12, 13, 227, 232, 12, 13, 227, 231, 12, 13, 227, 230, 
+    12, 13, 227, 229, 12, 13, 227, 228, 12, 13, 227, 227, 12, 13, 227, 226, 
+    12, 13, 227, 225, 12, 13, 227, 224, 12, 13, 227, 223, 12, 13, 227, 222, 
+    12, 13, 227, 221, 12, 13, 227, 220, 12, 13, 227, 219, 12, 13, 227, 218, 
+    12, 13, 227, 217, 12, 13, 227, 216, 12, 13, 227, 215, 12, 13, 227, 214, 
+    12, 13, 227, 213, 12, 13, 227, 212, 12, 13, 227, 77, 12, 13, 227, 76, 12, 
+    13, 227, 75, 12, 13, 227, 74, 12, 13, 227, 73, 12, 13, 227, 72, 12, 13, 
+    227, 71, 12, 13, 227, 70, 12, 13, 227, 69, 12, 13, 227, 68, 12, 13, 227, 
+    67, 12, 13, 227, 66, 12, 13, 227, 65, 12, 13, 227, 64, 12, 13, 227, 63, 
+    12, 13, 227, 62, 12, 13, 227, 61, 12, 13, 227, 60, 12, 13, 227, 59, 12, 
+    13, 227, 58, 12, 13, 227, 57, 12, 13, 227, 56, 12, 13, 227, 55, 12, 13, 
+    227, 54, 12, 13, 227, 53, 12, 13, 227, 52, 12, 13, 227, 51, 12, 13, 227, 
+    50, 12, 13, 227, 49, 12, 13, 227, 48, 12, 13, 227, 47, 12, 13, 227, 46, 
+    12, 13, 227, 45, 12, 13, 227, 44, 12, 13, 227, 43, 12, 13, 227, 42, 12, 
+    13, 227, 41, 12, 13, 227, 40, 12, 13, 227, 39, 12, 13, 227, 38, 12, 13, 
+    227, 37, 12, 13, 227, 36, 12, 13, 227, 35, 12, 13, 227, 34, 12, 13, 227, 
+    33, 12, 13, 227, 32, 12, 13, 227, 31, 12, 13, 227, 30, 12, 13, 227, 29, 
+    12, 13, 227, 28, 12, 13, 227, 27, 12, 13, 227, 26, 12, 13, 227, 25, 12, 
+    13, 227, 24, 12, 13, 227, 23, 12, 13, 227, 22, 12, 13, 227, 21, 12, 13, 
+    227, 20, 12, 13, 227, 19, 12, 13, 227, 18, 12, 13, 227, 17, 12, 13, 227, 
+    16, 12, 13, 227, 15, 12, 13, 227, 14, 12, 13, 227, 13, 12, 13, 227, 12, 
+    12, 13, 227, 11, 12, 13, 227, 10, 12, 13, 227, 9, 12, 13, 227, 8, 12, 13, 
+    227, 7, 12, 13, 227, 6, 12, 13, 227, 5, 12, 13, 227, 4, 12, 13, 227, 3, 
+    12, 13, 226, 105, 12, 13, 226, 104, 12, 13, 226, 103, 12, 13, 226, 102, 
+    12, 13, 226, 101, 12, 13, 226, 100, 12, 13, 226, 99, 12, 13, 226, 98, 12, 
+    13, 226, 97, 12, 13, 226, 96, 12, 13, 226, 95, 12, 13, 226, 94, 12, 13, 
+    226, 93, 12, 13, 224, 96, 12, 13, 224, 95, 12, 13, 224, 94, 12, 13, 224, 
+    93, 12, 13, 224, 92, 12, 13, 224, 91, 12, 13, 224, 90, 12, 13, 223, 223, 
+    12, 13, 223, 222, 12, 13, 223, 221, 12, 13, 223, 220, 12, 13, 223, 219, 
+    12, 13, 223, 218, 12, 13, 223, 217, 12, 13, 223, 216, 12, 13, 223, 215, 
+    12, 13, 223, 214, 12, 13, 223, 213, 12, 13, 223, 212, 12, 13, 223, 211, 
+    12, 13, 223, 210, 12, 13, 223, 209, 12, 13, 223, 208, 12, 13, 223, 207, 
+    12, 13, 223, 206, 12, 13, 223, 205, 12, 13, 223, 204, 12, 13, 223, 203, 
+    12, 13, 223, 202, 12, 13, 223, 201, 12, 13, 223, 200, 12, 13, 223, 199, 
+    12, 13, 223, 198, 12, 13, 223, 197, 12, 13, 223, 196, 12, 13, 223, 195, 
+    12, 13, 223, 194, 12, 13, 223, 193, 12, 13, 223, 192, 12, 13, 223, 191, 
+    12, 13, 223, 190, 12, 13, 222, 89, 12, 13, 222, 88, 12, 13, 222, 87, 12, 
+    13, 222, 86, 12, 13, 222, 85, 12, 13, 222, 84, 12, 13, 222, 83, 12, 13, 
+    222, 82, 12, 13, 222, 81, 12, 13, 222, 80, 12, 13, 222, 79, 12, 13, 222, 
+    78, 12, 13, 222, 77, 12, 13, 222, 76, 12, 13, 222, 75, 12, 13, 222, 74, 
+    12, 13, 222, 73, 12, 13, 222, 72, 12, 13, 222, 71, 12, 13, 222, 70, 12, 
+    13, 222, 69, 12, 13, 222, 68, 12, 13, 222, 67, 12, 13, 222, 66, 12, 13, 
+    222, 65, 12, 13, 222, 64, 12, 13, 222, 63, 12, 13, 222, 62, 12, 13, 222, 
+    61, 12, 13, 222, 60, 12, 13, 222, 59, 12, 13, 222, 58, 12, 13, 222, 57, 
+    12, 13, 222, 56, 12, 13, 222, 55, 12, 13, 222, 54, 12, 13, 222, 53, 12, 
+    13, 222, 52, 12, 13, 222, 51, 12, 13, 222, 50, 12, 13, 222, 49, 12, 13, 
+    222, 48, 12, 13, 222, 47, 12, 13, 222, 46, 12, 13, 222, 45, 12, 13, 222, 
+    44, 12, 13, 222, 43, 12, 13, 222, 42, 12, 13, 222, 41, 12, 13, 222, 40, 
+    12, 13, 222, 39, 12, 13, 222, 38, 12, 13, 222, 37, 12, 13, 222, 36, 12, 
+    13, 217, 151, 12, 13, 217, 150, 12, 13, 217, 149, 12, 13, 217, 148, 12, 
+    13, 217, 147, 12, 13, 217, 146, 12, 13, 217, 145, 12, 13, 217, 144, 12, 
+    13, 217, 143, 12, 13, 217, 142, 12, 13, 217, 141, 12, 13, 217, 140, 12, 
+    13, 217, 139, 12, 13, 217, 138, 12, 13, 217, 137, 12, 13, 217, 136, 12, 
+    13, 217, 135, 12, 13, 217, 134, 12, 13, 217, 133, 12, 13, 217, 132, 12, 
+    13, 217, 131, 12, 13, 217, 130, 12, 13, 217, 129, 12, 13, 217, 128, 12, 
+    13, 217, 127, 12, 13, 217, 126, 12, 13, 217, 125, 12, 13, 217, 124, 12, 
+    13, 217, 123, 12, 13, 217, 122, 12, 13, 217, 121, 12, 13, 217, 120, 12, 
+    13, 217, 119, 12, 13, 217, 118, 12, 13, 217, 117, 12, 13, 217, 116, 12, 
+    13, 217, 115, 12, 13, 217, 114, 12, 13, 217, 113, 12, 13, 217, 112, 12, 
+    13, 217, 111, 12, 13, 217, 110, 12, 13, 217, 109, 12, 13, 217, 108, 12, 
     13, 215, 22, 12, 13, 215, 21, 12, 13, 215, 20, 12, 13, 215, 19, 12, 13, 
     215, 18, 12, 13, 215, 17, 12, 13, 215, 16, 12, 13, 215, 15, 12, 13, 215, 
     14, 12, 13, 215, 13, 12, 13, 215, 12, 12, 13, 215, 11, 12, 13, 215, 10, 
@@ -12174,1649 +12175,1650 @@
     210, 131, 12, 13, 210, 130, 12, 13, 210, 129, 12, 13, 210, 128, 12, 13, 
     210, 127, 12, 13, 210, 126, 12, 13, 210, 125, 12, 13, 210, 124, 12, 13, 
     210, 123, 12, 13, 210, 122, 12, 13, 210, 121, 12, 13, 210, 120, 12, 13, 
-    210, 119, 12, 13, 210, 118, 12, 13, 255, 72, 12, 13, 255, 71, 12, 13, 
-    255, 70, 12, 13, 255, 69, 12, 13, 255, 68, 12, 13, 255, 67, 12, 13, 255, 
-    66, 12, 13, 255, 65, 12, 13, 255, 64, 12, 13, 255, 63, 12, 13, 255, 62, 
-    12, 13, 255, 61, 12, 13, 255, 60, 12, 13, 255, 59, 12, 13, 255, 58, 12, 
-    13, 255, 57, 12, 13, 255, 56, 12, 13, 255, 55, 12, 13, 255, 54, 12, 13, 
-    255, 53, 12, 13, 255, 52, 12, 13, 255, 51, 12, 13, 255, 50, 12, 13, 255, 
-    49, 12, 13, 255, 48, 12, 13, 255, 47, 12, 13, 255, 46, 12, 13, 255, 45, 
-    12, 13, 255, 44, 12, 13, 255, 43, 12, 13, 255, 42, 12, 13, 255, 41, 12, 
-    13, 255, 40, 12, 13, 255, 39, 20, 1, 167, 229, 12, 231, 16, 20, 1, 167, 
-    243, 70, 244, 36, 20, 1, 167, 224, 251, 231, 17, 225, 57, 20, 1, 167, 
-    224, 251, 231, 17, 225, 58, 20, 1, 167, 229, 226, 231, 16, 20, 1, 167, 
-    219, 221, 20, 1, 167, 216, 66, 231, 16, 20, 1, 167, 227, 118, 231, 16, 
-    20, 1, 167, 220, 19, 226, 90, 228, 169, 20, 1, 167, 224, 251, 226, 90, 
-    228, 170, 225, 57, 20, 1, 167, 224, 251, 226, 90, 228, 170, 225, 58, 20, 
-    1, 167, 231, 218, 20, 1, 167, 215, 119, 231, 219, 20, 1, 167, 229, 71, 
-    20, 1, 167, 231, 215, 20, 1, 167, 231, 176, 20, 1, 167, 230, 48, 20, 1, 
-    167, 220, 124, 20, 1, 167, 227, 241, 20, 1, 167, 234, 149, 20, 1, 167, 
-    228, 138, 20, 1, 167, 218, 4, 20, 1, 167, 229, 11, 20, 1, 167, 233, 87, 
-    20, 1, 167, 233, 12, 233, 189, 20, 1, 167, 227, 248, 231, 24, 20, 1, 167, 
-    231, 222, 20, 1, 167, 225, 246, 20, 1, 167, 242, 231, 20, 1, 167, 226, 
-    50, 20, 1, 167, 230, 151, 229, 45, 20, 1, 167, 227, 99, 231, 27, 20, 1, 
-    167, 104, 210, 188, 229, 220, 20, 1, 167, 242, 232, 20, 1, 167, 227, 248, 
-    227, 249, 20, 1, 167, 219, 128, 20, 1, 167, 231, 9, 20, 1, 167, 231, 30, 
-    20, 1, 167, 230, 130, 20, 1, 167, 234, 249, 20, 1, 167, 226, 90, 233, 47, 
-    20, 1, 167, 229, 149, 233, 47, 20, 1, 167, 225, 158, 20, 1, 167, 231, 
-    216, 20, 1, 167, 228, 207, 20, 1, 167, 224, 134, 20, 1, 167, 215, 116, 
-    20, 1, 167, 232, 94, 20, 1, 167, 219, 41, 20, 1, 167, 216, 216, 20, 1, 
-    167, 231, 213, 20, 1, 167, 234, 156, 20, 1, 167, 229, 145, 20, 1, 167, 
-    233, 201, 20, 1, 167, 230, 131, 20, 1, 167, 219, 218, 20, 1, 167, 232, 
-    138, 20, 1, 167, 244, 93, 20, 1, 167, 222, 199, 20, 1, 167, 233, 241, 20, 
-    1, 167, 219, 37, 20, 1, 167, 231, 173, 225, 99, 20, 1, 167, 220, 12, 20, 
-    1, 167, 227, 247, 20, 1, 167, 219, 253, 228, 2, 210, 196, 20, 1, 167, 
-    227, 138, 230, 148, 20, 1, 167, 226, 85, 20, 1, 167, 228, 139, 20, 1, 
-    167, 214, 170, 20, 1, 167, 229, 48, 20, 1, 167, 231, 212, 20, 1, 167, 
-    228, 181, 20, 1, 167, 231, 119, 20, 1, 167, 227, 151, 20, 1, 167, 216, 
-    220, 20, 1, 167, 219, 34, 20, 1, 167, 226, 86, 20, 1, 167, 228, 6, 20, 1, 
-    167, 231, 220, 20, 1, 167, 227, 148, 20, 1, 167, 234, 216, 20, 1, 167, 
-    228, 9, 20, 1, 167, 213, 250, 20, 1, 167, 232, 98, 20, 1, 167, 229, 98, 
-    20, 1, 167, 229, 196, 20, 1, 167, 231, 118, 20, 1, 225, 138, 228, 4, 20, 
-    1, 225, 138, 215, 119, 231, 217, 20, 1, 225, 138, 219, 185, 20, 1, 225, 
-    138, 220, 128, 215, 118, 20, 1, 225, 138, 232, 140, 227, 244, 20, 1, 225, 
-    138, 231, 125, 231, 221, 20, 1, 225, 138, 234, 87, 20, 1, 225, 138, 211, 
-    15, 20, 1, 225, 138, 231, 120, 20, 1, 225, 138, 234, 237, 20, 1, 225, 
-    138, 225, 208, 20, 1, 225, 138, 211, 89, 233, 47, 20, 1, 225, 138, 233, 
-    103, 228, 2, 227, 160, 20, 1, 225, 138, 227, 242, 220, 38, 20, 1, 225, 
-    138, 229, 116, 228, 184, 20, 1, 225, 138, 242, 229, 20, 1, 225, 138, 225, 
-    49, 20, 1, 225, 138, 215, 119, 228, 0, 20, 1, 225, 138, 220, 43, 228, 
-    179, 20, 1, 225, 138, 220, 39, 20, 1, 225, 138, 231, 17, 216, 219, 20, 1, 
-    225, 138, 231, 107, 231, 121, 20, 1, 225, 138, 227, 149, 227, 244, 20, 1, 
-    225, 138, 234, 145, 20, 1, 225, 138, 242, 230, 20, 1, 225, 138, 234, 141, 
-    20, 1, 225, 138, 233, 129, 20, 1, 225, 138, 225, 249, 20, 1, 225, 138, 
-    213, 182, 20, 1, 225, 138, 229, 13, 230, 46, 20, 1, 225, 138, 229, 47, 
-    231, 103, 20, 1, 225, 138, 211, 193, 20, 1, 225, 138, 222, 11, 20, 1, 
-    225, 138, 217, 97, 20, 1, 225, 138, 231, 29, 20, 1, 225, 138, 229, 32, 
-    20, 1, 225, 138, 229, 33, 233, 84, 20, 1, 225, 138, 231, 19, 20, 1, 225, 
-    138, 218, 52, 20, 1, 225, 138, 231, 111, 20, 1, 225, 138, 230, 133, 20, 
-    1, 225, 138, 227, 163, 20, 1, 225, 138, 224, 138, 20, 1, 225, 138, 231, 
-    28, 229, 49, 20, 1, 225, 138, 244, 126, 20, 1, 225, 138, 231, 98, 20, 1, 
-    225, 138, 244, 147, 20, 1, 225, 138, 234, 153, 20, 1, 225, 138, 231, 239, 
-    228, 173, 20, 1, 225, 138, 231, 239, 228, 149, 20, 1, 225, 138, 233, 11, 
-    20, 1, 225, 138, 229, 55, 20, 1, 225, 138, 228, 11, 20, 1, 225, 138, 184, 
-    20, 1, 225, 138, 234, 74, 20, 1, 225, 138, 229, 1, 20, 1, 137, 229, 12, 
-    231, 219, 20, 1, 137, 227, 117, 20, 1, 137, 210, 196, 20, 1, 137, 212, 
-    53, 20, 1, 137, 229, 48, 20, 1, 137, 229, 137, 20, 1, 137, 229, 19, 20, 
-    1, 137, 242, 239, 20, 1, 137, 231, 115, 20, 1, 137, 243, 77, 20, 1, 137, 
-    227, 140, 230, 170, 231, 31, 20, 1, 137, 227, 240, 231, 106, 20, 1, 137, 
-    231, 112, 20, 1, 137, 225, 55, 20, 1, 137, 229, 122, 20, 1, 137, 231, 
-    123, 251, 29, 20, 1, 137, 234, 143, 20, 1, 137, 242, 240, 20, 1, 137, 
-    234, 150, 20, 1, 137, 210, 213, 230, 76, 20, 1, 137, 227, 111, 20, 1, 
-    137, 231, 100, 20, 1, 137, 228, 10, 20, 1, 137, 231, 106, 20, 1, 137, 
-    211, 16, 20, 1, 137, 233, 249, 20, 1, 137, 235, 10, 20, 1, 137, 220, 123, 
-    20, 1, 137, 229, 131, 20, 1, 137, 217, 95, 20, 1, 137, 228, 153, 20, 1, 
-    137, 216, 66, 210, 198, 20, 1, 137, 218, 79, 20, 1, 137, 229, 39, 227, 
-    160, 20, 1, 137, 213, 181, 20, 1, 137, 229, 199, 20, 1, 137, 231, 239, 
-    234, 152, 20, 1, 137, 227, 249, 20, 1, 137, 229, 34, 20, 1, 137, 233, 88, 
-    20, 1, 137, 231, 108, 20, 1, 137, 231, 8, 20, 1, 137, 227, 243, 20, 1, 
-    137, 216, 215, 20, 1, 137, 229, 36, 20, 1, 137, 243, 233, 20, 1, 137, 
-    229, 136, 20, 1, 137, 228, 12, 20, 1, 137, 228, 8, 20, 1, 137, 251, 107, 
-    20, 1, 137, 213, 183, 20, 1, 137, 231, 113, 20, 1, 137, 222, 140, 20, 1, 
-    137, 228, 183, 20, 1, 137, 233, 102, 20, 1, 137, 216, 64, 20, 1, 137, 
-    227, 250, 229, 1, 20, 1, 137, 228, 175, 20, 1, 137, 234, 156, 20, 1, 137, 
-    229, 40, 20, 1, 137, 231, 212, 20, 1, 137, 231, 101, 20, 1, 137, 232, 98, 
-    20, 1, 137, 233, 189, 20, 1, 137, 228, 181, 20, 1, 137, 229, 1, 20, 1, 
-    137, 211, 184, 20, 1, 137, 229, 37, 20, 1, 137, 227, 253, 20, 1, 137, 
-    227, 245, 20, 1, 137, 233, 203, 228, 139, 20, 1, 137, 227, 251, 20, 1, 
-    137, 229, 144, 20, 1, 137, 231, 239, 228, 0, 20, 1, 137, 211, 103, 20, 1, 
-    137, 229, 143, 20, 1, 137, 219, 220, 20, 1, 137, 220, 126, 20, 1, 137, 
-    231, 109, 20, 1, 137, 231, 219, 20, 1, 137, 231, 119, 20, 1, 137, 234, 
-    144, 20, 1, 137, 231, 110, 20, 1, 137, 234, 148, 20, 1, 137, 231, 123, 
-    225, 103, 20, 1, 137, 210, 179, 20, 1, 137, 228, 171, 20, 1, 137, 230, 
-    220, 20, 1, 137, 230, 100, 20, 1, 137, 220, 15, 20, 1, 137, 234, 166, 
-    233, 70, 20, 1, 137, 234, 166, 244, 160, 20, 1, 137, 229, 69, 20, 1, 137, 
-    229, 196, 20, 1, 137, 232, 200, 20, 1, 137, 225, 65, 20, 1, 137, 225, 
-    199, 20, 1, 137, 216, 230, 20, 1, 107, 231, 99, 20, 1, 107, 212, 51, 20, 
-    1, 107, 228, 169, 20, 1, 107, 231, 16, 20, 1, 107, 228, 167, 20, 1, 107, 
-    232, 235, 20, 1, 107, 228, 172, 20, 1, 107, 228, 7, 20, 1, 107, 229, 54, 
-    20, 1, 107, 227, 160, 20, 1, 107, 211, 194, 20, 1, 107, 229, 9, 20, 1, 
-    107, 220, 61, 20, 1, 107, 229, 20, 20, 1, 107, 234, 151, 20, 1, 107, 216, 
-    217, 20, 1, 107, 220, 41, 20, 1, 107, 228, 180, 20, 1, 107, 218, 52, 20, 
-    1, 107, 234, 156, 20, 1, 107, 211, 91, 20, 1, 107, 233, 204, 20, 1, 107, 
-    221, 234, 20, 1, 107, 231, 21, 20, 1, 107, 229, 135, 20, 1, 107, 231, 
-    188, 20, 1, 107, 231, 27, 20, 1, 107, 220, 125, 20, 1, 107, 211, 39, 20, 
-    1, 107, 228, 174, 20, 1, 107, 234, 147, 231, 102, 20, 1, 107, 229, 16, 
-    20, 1, 107, 215, 118, 20, 1, 107, 242, 248, 20, 1, 107, 229, 6, 20, 1, 
-    107, 244, 127, 20, 1, 107, 229, 139, 20, 1, 107, 231, 0, 20, 1, 107, 233, 
-    5, 20, 1, 107, 229, 121, 20, 1, 107, 230, 147, 20, 1, 107, 231, 4, 20, 1, 
-    107, 224, 118, 20, 1, 107, 231, 2, 20, 1, 107, 231, 18, 20, 1, 107, 232, 
-    84, 20, 1, 107, 227, 255, 20, 1, 107, 231, 122, 20, 1, 107, 233, 180, 20, 
-    1, 107, 227, 151, 20, 1, 107, 216, 220, 20, 1, 107, 219, 34, 20, 1, 107, 
-    210, 179, 20, 1, 107, 234, 148, 20, 1, 107, 223, 170, 20, 1, 107, 217, 
-    10, 20, 1, 107, 229, 17, 20, 1, 107, 231, 23, 20, 1, 107, 227, 254, 20, 
-    1, 107, 234, 146, 20, 1, 107, 225, 59, 20, 1, 107, 225, 152, 20, 1, 107, 
-    227, 127, 20, 1, 107, 233, 11, 20, 1, 107, 229, 55, 20, 1, 107, 231, 20, 
-    20, 1, 107, 229, 29, 20, 1, 107, 210, 193, 20, 1, 107, 226, 21, 20, 1, 
-    107, 210, 192, 20, 1, 107, 229, 144, 20, 1, 107, 227, 244, 20, 1, 107, 
-    218, 81, 20, 1, 107, 233, 208, 20, 1, 107, 229, 44, 20, 1, 107, 229, 14, 
-    20, 1, 107, 215, 102, 20, 1, 107, 231, 31, 20, 1, 107, 233, 198, 20, 1, 
-    107, 227, 252, 20, 1, 107, 216, 218, 20, 1, 107, 231, 214, 20, 1, 107, 
-    229, 53, 20, 1, 107, 233, 4, 20, 1, 107, 229, 35, 20, 1, 107, 228, 1, 20, 
-    1, 107, 228, 153, 20, 1, 107, 242, 233, 20, 1, 107, 233, 217, 20, 1, 107, 
-    223, 84, 226, 209, 20, 1, 107, 217, 86, 20, 1, 107, 216, 10, 20, 1, 107, 
-    227, 148, 20, 1, 107, 222, 239, 20, 1, 107, 233, 49, 20, 1, 107, 231, 79, 
-    20, 1, 107, 193, 20, 1, 107, 218, 4, 20, 1, 107, 230, 102, 20, 1, 107, 
-    220, 27, 20, 1, 107, 220, 37, 20, 1, 107, 233, 155, 20, 1, 107, 227, 237, 
-    20, 1, 107, 219, 225, 20, 1, 107, 227, 246, 20, 1, 107, 225, 211, 20, 1, 
-    107, 228, 233, 20, 1, 107, 219, 252, 20, 1, 107, 224, 133, 20, 1, 107, 
-    230, 46, 20, 1, 107, 232, 119, 20, 1, 107, 223, 84, 230, 96, 20, 1, 107, 
-    216, 117, 20, 1, 107, 227, 238, 20, 1, 107, 231, 123, 198, 20, 1, 107, 
-    221, 232, 20, 1, 107, 244, 195, 20, 1, 82, 229, 143, 20, 1, 82, 216, 16, 
-    20, 1, 82, 231, 112, 20, 1, 82, 233, 88, 20, 1, 82, 213, 128, 20, 1, 82, 
-    232, 125, 20, 1, 82, 226, 89, 20, 1, 82, 219, 45, 20, 1, 82, 223, 145, 
-    20, 1, 82, 228, 3, 20, 1, 82, 229, 114, 20, 1, 82, 224, 147, 20, 1, 82, 
-    217, 62, 20, 1, 82, 229, 22, 20, 1, 82, 233, 245, 20, 1, 82, 211, 187, 
-    20, 1, 82, 221, 170, 20, 1, 82, 229, 45, 20, 1, 82, 226, 86, 20, 1, 82, 
-    216, 17, 20, 1, 82, 233, 202, 20, 1, 82, 232, 139, 20, 1, 82, 228, 6, 20, 
-    1, 82, 228, 254, 20, 1, 82, 231, 220, 20, 1, 82, 229, 15, 20, 1, 82, 228, 
-    253, 20, 1, 82, 228, 5, 20, 1, 82, 222, 237, 20, 1, 82, 228, 171, 20, 1, 
-    82, 225, 210, 20, 1, 82, 222, 31, 20, 1, 82, 229, 30, 20, 1, 82, 231, 10, 
-    20, 1, 82, 242, 227, 20, 1, 82, 229, 18, 20, 1, 82, 228, 182, 20, 1, 82, 
-    231, 172, 20, 1, 82, 232, 121, 20, 1, 82, 229, 50, 20, 1, 82, 229, 127, 
-    20, 1, 82, 217, 85, 227, 244, 20, 1, 82, 220, 127, 20, 1, 82, 224, 143, 
-    20, 1, 82, 229, 147, 219, 51, 20, 1, 82, 229, 38, 227, 160, 20, 1, 82, 
-    211, 4, 20, 1, 82, 242, 228, 20, 1, 82, 215, 117, 20, 1, 82, 211, 19, 20, 
-    1, 82, 225, 16, 20, 1, 82, 215, 107, 20, 1, 82, 234, 154, 20, 1, 82, 218, 
-    80, 20, 1, 82, 216, 219, 20, 1, 82, 213, 184, 20, 1, 82, 212, 6, 20, 1, 
-    82, 233, 132, 20, 1, 82, 224, 150, 20, 1, 82, 217, 96, 20, 1, 82, 242, 
-    247, 20, 1, 82, 229, 59, 20, 1, 82, 220, 40, 20, 1, 82, 231, 5, 20, 1, 
-    82, 231, 116, 20, 1, 82, 227, 115, 20, 1, 82, 228, 136, 20, 1, 82, 243, 
-    73, 20, 1, 82, 215, 108, 20, 1, 82, 233, 211, 20, 1, 82, 211, 67, 20, 1, 
-    82, 227, 149, 250, 16, 20, 1, 82, 210, 250, 20, 1, 82, 231, 22, 20, 1, 
-    82, 229, 132, 20, 1, 82, 225, 100, 20, 1, 82, 210, 197, 20, 1, 82, 233, 
-    6, 20, 1, 82, 243, 233, 20, 1, 82, 243, 72, 20, 1, 82, 229, 8, 20, 1, 82, 
-    234, 156, 20, 1, 82, 231, 223, 20, 1, 82, 229, 21, 20, 1, 82, 242, 234, 
-    20, 1, 82, 244, 196, 20, 1, 82, 227, 239, 20, 1, 82, 225, 153, 20, 1, 82, 
-    211, 17, 20, 1, 82, 229, 46, 20, 1, 82, 227, 149, 252, 23, 20, 1, 82, 
-    227, 95, 20, 1, 82, 224, 247, 20, 1, 82, 230, 220, 20, 1, 82, 243, 231, 
-    20, 1, 82, 229, 220, 20, 1, 82, 230, 100, 20, 1, 82, 242, 233, 20, 1, 82, 
-    243, 235, 73, 20, 1, 82, 230, 47, 20, 1, 82, 224, 146, 20, 1, 82, 229, 
-    10, 20, 1, 82, 233, 189, 20, 1, 82, 225, 97, 20, 1, 82, 227, 247, 20, 1, 
-    82, 211, 18, 20, 1, 82, 229, 31, 20, 1, 82, 226, 90, 225, 187, 20, 1, 82, 
-    243, 235, 251, 15, 20, 1, 82, 244, 37, 20, 1, 82, 228, 176, 20, 1, 82, 
-    61, 20, 1, 82, 216, 10, 20, 1, 82, 76, 20, 1, 82, 73, 20, 1, 82, 233, 86, 
-    20, 1, 82, 226, 90, 225, 23, 20, 1, 82, 217, 101, 20, 1, 82, 217, 51, 20, 
-    1, 82, 229, 147, 230, 34, 240, 234, 20, 1, 82, 220, 15, 20, 1, 82, 211, 
-    14, 20, 1, 82, 228, 247, 20, 1, 82, 210, 202, 20, 1, 82, 210, 227, 217, 
-    240, 20, 1, 82, 210, 227, 249, 147, 20, 1, 82, 210, 187, 20, 1, 82, 210, 
-    195, 20, 1, 82, 234, 142, 20, 1, 82, 225, 151, 20, 1, 82, 228, 177, 245, 
-    102, 20, 1, 82, 224, 144, 20, 1, 82, 211, 192, 20, 1, 82, 244, 147, 20, 
-    1, 82, 213, 250, 20, 1, 82, 232, 98, 20, 1, 82, 230, 230, 20, 1, 82, 223, 
-    51, 20, 1, 82, 223, 171, 20, 1, 82, 228, 246, 20, 1, 82, 229, 77, 20, 1, 
-    82, 220, 7, 20, 1, 82, 219, 252, 20, 1, 82, 243, 235, 223, 86, 20, 1, 82, 
-    197, 20, 1, 82, 225, 108, 20, 1, 82, 232, 119, 20, 1, 82, 234, 28, 20, 1, 
-    82, 231, 58, 20, 1, 82, 184, 20, 1, 82, 231, 169, 20, 1, 82, 216, 221, 
-    20, 1, 82, 234, 92, 20, 1, 82, 230, 150, 20, 1, 82, 216, 247, 20, 1, 82, 
-    244, 169, 20, 1, 82, 242, 223, 20, 1, 225, 137, 176, 20, 1, 225, 137, 70, 
-    20, 1, 225, 137, 233, 217, 20, 1, 225, 137, 245, 209, 20, 1, 225, 137, 
-    223, 108, 20, 1, 225, 137, 217, 86, 20, 1, 225, 137, 227, 148, 20, 1, 
-    225, 137, 233, 135, 20, 1, 225, 137, 222, 239, 20, 1, 225, 137, 223, 29, 
-    20, 1, 225, 137, 231, 79, 20, 1, 225, 137, 217, 101, 20, 1, 225, 137, 
-    229, 146, 20, 1, 225, 137, 228, 183, 20, 1, 225, 137, 193, 20, 1, 225, 
-    137, 218, 4, 20, 1, 225, 137, 220, 27, 20, 1, 225, 137, 219, 191, 20, 1, 
-    225, 137, 220, 123, 20, 1, 225, 137, 233, 155, 20, 1, 225, 137, 234, 156, 
-    20, 1, 225, 137, 227, 209, 20, 1, 225, 137, 227, 237, 20, 1, 225, 137, 
-    228, 154, 20, 1, 225, 137, 210, 226, 20, 1, 225, 137, 219, 225, 20, 1, 
-    225, 137, 191, 20, 1, 225, 137, 228, 9, 20, 1, 225, 137, 225, 151, 20, 1, 
-    225, 137, 227, 246, 20, 1, 225, 137, 211, 192, 20, 1, 225, 137, 225, 211, 
-    20, 1, 225, 137, 222, 140, 20, 1, 225, 137, 228, 233, 20, 1, 225, 137, 
-    223, 51, 20, 1, 225, 137, 234, 165, 20, 1, 225, 137, 229, 7, 20, 1, 225, 
-    137, 229, 56, 20, 1, 225, 137, 220, 7, 20, 1, 225, 137, 224, 147, 20, 1, 
-    225, 137, 244, 37, 20, 1, 225, 137, 212, 65, 20, 1, 225, 137, 232, 241, 
-    20, 1, 225, 137, 232, 119, 20, 1, 225, 137, 234, 28, 20, 1, 225, 137, 
-    231, 114, 20, 1, 225, 137, 223, 83, 20, 1, 225, 137, 184, 20, 1, 225, 
-    137, 230, 161, 20, 1, 225, 137, 231, 122, 20, 1, 225, 137, 216, 230, 20, 
-    1, 225, 137, 233, 251, 20, 1, 225, 137, 221, 251, 20, 1, 225, 137, 212, 
-    115, 95, 1, 190, 95, 1, 252, 191, 95, 1, 8, 190, 95, 1, 225, 42, 95, 1, 
-    184, 95, 1, 230, 233, 95, 1, 254, 23, 184, 95, 1, 244, 196, 95, 1, 214, 
-    27, 95, 1, 213, 177, 95, 1, 217, 105, 95, 1, 248, 221, 95, 1, 8, 215, 
-    156, 95, 1, 8, 217, 105, 95, 1, 215, 156, 95, 1, 248, 135, 95, 1, 197, 
-    95, 1, 228, 237, 95, 1, 8, 228, 110, 95, 1, 254, 23, 197, 95, 1, 228, 
-    110, 95, 1, 228, 96, 95, 1, 233, 135, 95, 1, 232, 61, 95, 1, 232, 254, 
-    95, 1, 232, 243, 95, 1, 216, 56, 95, 1, 247, 153, 95, 1, 216, 48, 95, 1, 
-    247, 152, 95, 1, 176, 95, 1, 243, 135, 95, 1, 8, 176, 95, 1, 224, 88, 95, 
-    1, 224, 66, 95, 1, 229, 77, 95, 1, 229, 28, 95, 1, 254, 23, 229, 77, 95, 
-    1, 162, 95, 1, 211, 165, 95, 1, 242, 249, 95, 1, 242, 226, 95, 1, 215, 
-    165, 95, 1, 246, 26, 95, 1, 227, 165, 95, 1, 227, 150, 95, 1, 215, 175, 
-    95, 1, 246, 33, 95, 1, 8, 215, 175, 95, 1, 8, 246, 33, 95, 1, 223, 106, 
-    215, 175, 95, 1, 220, 102, 95, 1, 218, 223, 95, 1, 210, 82, 95, 1, 210, 
-    14, 95, 1, 215, 183, 95, 1, 246, 38, 95, 1, 8, 215, 183, 95, 1, 206, 95, 
-    1, 210, 116, 95, 1, 210, 15, 95, 1, 209, 243, 95, 1, 209, 223, 95, 1, 
-    254, 23, 209, 243, 95, 1, 209, 215, 95, 1, 209, 222, 95, 1, 212, 65, 95, 
-    1, 254, 209, 95, 1, 241, 189, 95, 1, 229, 192, 95, 5, 253, 222, 95, 5, 
-    223, 106, 213, 133, 95, 5, 223, 106, 253, 222, 95, 25, 5, 61, 95, 25, 5, 
-    255, 73, 95, 25, 5, 254, 205, 95, 25, 5, 254, 123, 95, 25, 5, 254, 115, 
-    95, 25, 5, 76, 95, 25, 5, 226, 183, 95, 25, 5, 211, 227, 95, 25, 5, 212, 
-    98, 95, 25, 5, 75, 95, 25, 5, 245, 150, 95, 25, 5, 245, 138, 95, 25, 5, 
-    226, 232, 95, 25, 5, 73, 95, 25, 5, 240, 119, 95, 25, 5, 240, 118, 95, 
-    25, 5, 240, 117, 95, 25, 5, 235, 189, 95, 25, 5, 236, 60, 95, 25, 5, 236, 
-    33, 95, 25, 5, 235, 156, 95, 25, 5, 235, 231, 95, 25, 5, 70, 95, 25, 5, 
+    210, 119, 12, 13, 210, 118, 12, 13, 255, 73, 12, 13, 255, 72, 12, 13, 
+    255, 71, 12, 13, 255, 70, 12, 13, 255, 69, 12, 13, 255, 68, 12, 13, 255, 
+    67, 12, 13, 255, 66, 12, 13, 255, 65, 12, 13, 255, 64, 12, 13, 255, 63, 
+    12, 13, 255, 62, 12, 13, 255, 61, 12, 13, 255, 60, 12, 13, 255, 59, 12, 
+    13, 255, 58, 12, 13, 255, 57, 12, 13, 255, 56, 12, 13, 255, 55, 12, 13, 
+    255, 54, 12, 13, 255, 53, 12, 13, 255, 52, 12, 13, 255, 51, 12, 13, 255, 
+    50, 12, 13, 255, 49, 12, 13, 255, 48, 12, 13, 255, 47, 12, 13, 255, 46, 
+    12, 13, 255, 45, 12, 13, 255, 44, 12, 13, 255, 43, 12, 13, 255, 42, 12, 
+    13, 255, 41, 12, 13, 255, 40, 20, 1, 167, 229, 13, 231, 17, 20, 1, 167, 
+    243, 71, 244, 37, 20, 1, 167, 224, 252, 231, 18, 225, 58, 20, 1, 167, 
+    224, 252, 231, 18, 225, 59, 20, 1, 167, 229, 227, 231, 17, 20, 1, 167, 
+    219, 222, 20, 1, 167, 216, 67, 231, 17, 20, 1, 167, 227, 119, 231, 17, 
+    20, 1, 167, 220, 20, 226, 91, 228, 170, 20, 1, 167, 224, 252, 226, 91, 
+    228, 171, 225, 58, 20, 1, 167, 224, 252, 226, 91, 228, 171, 225, 59, 20, 
+    1, 167, 231, 219, 20, 1, 167, 215, 120, 231, 220, 20, 1, 167, 229, 72, 
+    20, 1, 167, 231, 216, 20, 1, 167, 231, 177, 20, 1, 167, 230, 49, 20, 1, 
+    167, 220, 125, 20, 1, 167, 227, 242, 20, 1, 167, 234, 150, 20, 1, 167, 
+    228, 139, 20, 1, 167, 218, 5, 20, 1, 167, 229, 12, 20, 1, 167, 233, 88, 
+    20, 1, 167, 233, 13, 233, 190, 20, 1, 167, 227, 249, 231, 25, 20, 1, 167, 
+    231, 223, 20, 1, 167, 225, 247, 20, 1, 167, 242, 232, 20, 1, 167, 226, 
+    51, 20, 1, 167, 230, 152, 229, 46, 20, 1, 167, 227, 100, 231, 28, 20, 1, 
+    167, 104, 210, 188, 229, 221, 20, 1, 167, 242, 233, 20, 1, 167, 227, 249, 
+    227, 250, 20, 1, 167, 219, 129, 20, 1, 167, 231, 10, 20, 1, 167, 231, 31, 
+    20, 1, 167, 230, 131, 20, 1, 167, 234, 250, 20, 1, 167, 226, 91, 233, 48, 
+    20, 1, 167, 229, 150, 233, 48, 20, 1, 167, 225, 159, 20, 1, 167, 231, 
+    217, 20, 1, 167, 228, 208, 20, 1, 167, 224, 135, 20, 1, 167, 215, 117, 
+    20, 1, 167, 232, 95, 20, 1, 167, 219, 42, 20, 1, 167, 216, 217, 20, 1, 
+    167, 231, 214, 20, 1, 167, 234, 157, 20, 1, 167, 229, 146, 20, 1, 167, 
+    233, 202, 20, 1, 167, 230, 132, 20, 1, 167, 219, 219, 20, 1, 167, 232, 
+    139, 20, 1, 167, 244, 94, 20, 1, 167, 222, 200, 20, 1, 167, 233, 242, 20, 
+    1, 167, 219, 38, 20, 1, 167, 231, 174, 225, 100, 20, 1, 167, 220, 13, 20, 
+    1, 167, 227, 248, 20, 1, 167, 219, 254, 228, 3, 210, 196, 20, 1, 167, 
+    227, 139, 230, 149, 20, 1, 167, 226, 86, 20, 1, 167, 228, 140, 20, 1, 
+    167, 214, 170, 20, 1, 167, 229, 49, 20, 1, 167, 231, 213, 20, 1, 167, 
+    228, 182, 20, 1, 167, 231, 120, 20, 1, 167, 227, 152, 20, 1, 167, 216, 
+    221, 20, 1, 167, 219, 35, 20, 1, 167, 226, 87, 20, 1, 167, 228, 7, 20, 1, 
+    167, 231, 221, 20, 1, 167, 227, 149, 20, 1, 167, 234, 217, 20, 1, 167, 
+    228, 10, 20, 1, 167, 213, 250, 20, 1, 167, 232, 99, 20, 1, 167, 229, 99, 
+    20, 1, 167, 229, 197, 20, 1, 167, 231, 119, 20, 1, 225, 139, 228, 5, 20, 
+    1, 225, 139, 215, 120, 231, 218, 20, 1, 225, 139, 219, 186, 20, 1, 225, 
+    139, 220, 129, 215, 119, 20, 1, 225, 139, 232, 141, 227, 245, 20, 1, 225, 
+    139, 231, 126, 231, 222, 20, 1, 225, 139, 234, 88, 20, 1, 225, 139, 211, 
+    15, 20, 1, 225, 139, 231, 121, 20, 1, 225, 139, 234, 238, 20, 1, 225, 
+    139, 225, 209, 20, 1, 225, 139, 211, 89, 233, 48, 20, 1, 225, 139, 233, 
+    104, 228, 3, 227, 161, 20, 1, 225, 139, 227, 243, 220, 39, 20, 1, 225, 
+    139, 229, 117, 228, 185, 20, 1, 225, 139, 242, 230, 20, 1, 225, 139, 225, 
+    50, 20, 1, 225, 139, 215, 120, 228, 1, 20, 1, 225, 139, 220, 44, 228, 
+    180, 20, 1, 225, 139, 220, 40, 20, 1, 225, 139, 231, 18, 216, 220, 20, 1, 
+    225, 139, 231, 108, 231, 122, 20, 1, 225, 139, 227, 150, 227, 245, 20, 1, 
+    225, 139, 234, 146, 20, 1, 225, 139, 242, 231, 20, 1, 225, 139, 234, 142, 
+    20, 1, 225, 139, 233, 130, 20, 1, 225, 139, 225, 250, 20, 1, 225, 139, 
+    213, 182, 20, 1, 225, 139, 229, 14, 230, 47, 20, 1, 225, 139, 229, 48, 
+    231, 104, 20, 1, 225, 139, 211, 193, 20, 1, 225, 139, 222, 12, 20, 1, 
+    225, 139, 217, 98, 20, 1, 225, 139, 231, 30, 20, 1, 225, 139, 229, 33, 
+    20, 1, 225, 139, 229, 34, 233, 85, 20, 1, 225, 139, 231, 20, 20, 1, 225, 
+    139, 218, 53, 20, 1, 225, 139, 231, 112, 20, 1, 225, 139, 230, 134, 20, 
+    1, 225, 139, 227, 164, 20, 1, 225, 139, 224, 139, 20, 1, 225, 139, 231, 
+    29, 229, 50, 20, 1, 225, 139, 244, 127, 20, 1, 225, 139, 231, 99, 20, 1, 
+    225, 139, 244, 148, 20, 1, 225, 139, 234, 154, 20, 1, 225, 139, 231, 240, 
+    228, 174, 20, 1, 225, 139, 231, 240, 228, 150, 20, 1, 225, 139, 233, 12, 
+    20, 1, 225, 139, 229, 56, 20, 1, 225, 139, 228, 12, 20, 1, 225, 139, 185, 
+    20, 1, 225, 139, 234, 75, 20, 1, 225, 139, 229, 2, 20, 1, 137, 229, 13, 
+    231, 220, 20, 1, 137, 227, 118, 20, 1, 137, 210, 196, 20, 1, 137, 212, 
+    53, 20, 1, 137, 229, 49, 20, 1, 137, 229, 138, 20, 1, 137, 229, 20, 20, 
+    1, 137, 242, 240, 20, 1, 137, 231, 116, 20, 1, 137, 243, 78, 20, 1, 137, 
+    227, 141, 230, 171, 231, 32, 20, 1, 137, 227, 241, 231, 107, 20, 1, 137, 
+    231, 113, 20, 1, 137, 225, 56, 20, 1, 137, 229, 123, 20, 1, 137, 231, 
+    124, 251, 30, 20, 1, 137, 234, 144, 20, 1, 137, 242, 241, 20, 1, 137, 
+    234, 151, 20, 1, 137, 210, 213, 230, 77, 20, 1, 137, 227, 112, 20, 1, 
+    137, 231, 101, 20, 1, 137, 228, 11, 20, 1, 137, 231, 107, 20, 1, 137, 
+    211, 16, 20, 1, 137, 233, 250, 20, 1, 137, 235, 11, 20, 1, 137, 220, 124, 
+    20, 1, 137, 229, 132, 20, 1, 137, 217, 96, 20, 1, 137, 228, 154, 20, 1, 
+    137, 216, 67, 210, 198, 20, 1, 137, 218, 80, 20, 1, 137, 229, 40, 227, 
+    161, 20, 1, 137, 213, 181, 20, 1, 137, 229, 200, 20, 1, 137, 231, 240, 
+    234, 153, 20, 1, 137, 227, 250, 20, 1, 137, 229, 35, 20, 1, 137, 233, 89, 
+    20, 1, 137, 231, 109, 20, 1, 137, 231, 9, 20, 1, 137, 227, 244, 20, 1, 
+    137, 216, 216, 20, 1, 137, 229, 37, 20, 1, 137, 243, 234, 20, 1, 137, 
+    229, 137, 20, 1, 137, 228, 13, 20, 1, 137, 228, 9, 20, 1, 137, 251, 108, 
+    20, 1, 137, 213, 183, 20, 1, 137, 231, 114, 20, 1, 137, 222, 141, 20, 1, 
+    137, 228, 184, 20, 1, 137, 233, 103, 20, 1, 137, 216, 65, 20, 1, 137, 
+    227, 251, 229, 2, 20, 1, 137, 228, 176, 20, 1, 137, 234, 157, 20, 1, 137, 
+    229, 41, 20, 1, 137, 231, 213, 20, 1, 137, 231, 102, 20, 1, 137, 232, 99, 
+    20, 1, 137, 233, 190, 20, 1, 137, 228, 182, 20, 1, 137, 229, 2, 20, 1, 
+    137, 211, 184, 20, 1, 137, 229, 38, 20, 1, 137, 227, 254, 20, 1, 137, 
+    227, 246, 20, 1, 137, 233, 204, 228, 140, 20, 1, 137, 227, 252, 20, 1, 
+    137, 229, 145, 20, 1, 137, 231, 240, 228, 1, 20, 1, 137, 211, 103, 20, 1, 
+    137, 229, 144, 20, 1, 137, 219, 221, 20, 1, 137, 220, 127, 20, 1, 137, 
+    231, 110, 20, 1, 137, 231, 220, 20, 1, 137, 231, 120, 20, 1, 137, 234, 
+    145, 20, 1, 137, 231, 111, 20, 1, 137, 234, 149, 20, 1, 137, 231, 124, 
+    225, 104, 20, 1, 137, 210, 179, 20, 1, 137, 228, 172, 20, 1, 137, 230, 
+    221, 20, 1, 137, 230, 101, 20, 1, 137, 220, 16, 20, 1, 137, 234, 167, 
+    233, 71, 20, 1, 137, 234, 167, 244, 161, 20, 1, 137, 229, 70, 20, 1, 137, 
+    229, 197, 20, 1, 137, 232, 201, 20, 1, 137, 225, 66, 20, 1, 137, 225, 
+    200, 20, 1, 137, 216, 231, 20, 1, 107, 231, 100, 20, 1, 107, 212, 51, 20, 
+    1, 107, 228, 170, 20, 1, 107, 231, 17, 20, 1, 107, 228, 168, 20, 1, 107, 
+    232, 236, 20, 1, 107, 228, 173, 20, 1, 107, 228, 8, 20, 1, 107, 229, 55, 
+    20, 1, 107, 227, 161, 20, 1, 107, 211, 194, 20, 1, 107, 229, 10, 20, 1, 
+    107, 220, 62, 20, 1, 107, 229, 21, 20, 1, 107, 234, 152, 20, 1, 107, 216, 
+    218, 20, 1, 107, 220, 42, 20, 1, 107, 228, 181, 20, 1, 107, 218, 53, 20, 
+    1, 107, 234, 157, 20, 1, 107, 211, 91, 20, 1, 107, 233, 205, 20, 1, 107, 
+    221, 235, 20, 1, 107, 231, 22, 20, 1, 107, 229, 136, 20, 1, 107, 231, 
+    189, 20, 1, 107, 231, 28, 20, 1, 107, 220, 126, 20, 1, 107, 211, 39, 20, 
+    1, 107, 228, 175, 20, 1, 107, 234, 148, 231, 103, 20, 1, 107, 229, 17, 
+    20, 1, 107, 215, 119, 20, 1, 107, 242, 249, 20, 1, 107, 229, 7, 20, 1, 
+    107, 244, 128, 20, 1, 107, 229, 140, 20, 1, 107, 231, 1, 20, 1, 107, 233, 
+    6, 20, 1, 107, 229, 122, 20, 1, 107, 230, 148, 20, 1, 107, 231, 5, 20, 1, 
+    107, 224, 119, 20, 1, 107, 231, 3, 20, 1, 107, 231, 19, 20, 1, 107, 232, 
+    85, 20, 1, 107, 228, 0, 20, 1, 107, 231, 123, 20, 1, 107, 233, 181, 20, 
+    1, 107, 227, 152, 20, 1, 107, 216, 221, 20, 1, 107, 219, 35, 20, 1, 107, 
+    210, 179, 20, 1, 107, 234, 149, 20, 1, 107, 223, 171, 20, 1, 107, 217, 
+    11, 20, 1, 107, 229, 18, 20, 1, 107, 231, 24, 20, 1, 107, 227, 255, 20, 
+    1, 107, 234, 147, 20, 1, 107, 225, 60, 20, 1, 107, 225, 153, 20, 1, 107, 
+    227, 128, 20, 1, 107, 233, 12, 20, 1, 107, 229, 56, 20, 1, 107, 231, 21, 
+    20, 1, 107, 229, 30, 20, 1, 107, 210, 193, 20, 1, 107, 226, 22, 20, 1, 
+    107, 210, 192, 20, 1, 107, 229, 145, 20, 1, 107, 227, 245, 20, 1, 107, 
+    218, 82, 20, 1, 107, 233, 209, 20, 1, 107, 229, 45, 20, 1, 107, 229, 15, 
+    20, 1, 107, 215, 103, 20, 1, 107, 231, 32, 20, 1, 107, 233, 199, 20, 1, 
+    107, 227, 253, 20, 1, 107, 216, 219, 20, 1, 107, 231, 215, 20, 1, 107, 
+    229, 54, 20, 1, 107, 233, 5, 20, 1, 107, 229, 36, 20, 1, 107, 228, 2, 20, 
+    1, 107, 228, 154, 20, 1, 107, 242, 234, 20, 1, 107, 233, 218, 20, 1, 107, 
+    223, 85, 226, 210, 20, 1, 107, 217, 87, 20, 1, 107, 216, 11, 20, 1, 107, 
+    227, 149, 20, 1, 107, 222, 240, 20, 1, 107, 233, 50, 20, 1, 107, 231, 80, 
+    20, 1, 107, 193, 20, 1, 107, 218, 5, 20, 1, 107, 230, 103, 20, 1, 107, 
+    220, 28, 20, 1, 107, 220, 38, 20, 1, 107, 233, 156, 20, 1, 107, 227, 238, 
+    20, 1, 107, 219, 226, 20, 1, 107, 227, 247, 20, 1, 107, 225, 212, 20, 1, 
+    107, 228, 234, 20, 1, 107, 219, 253, 20, 1, 107, 224, 134, 20, 1, 107, 
+    230, 47, 20, 1, 107, 232, 120, 20, 1, 107, 223, 85, 230, 97, 20, 1, 107, 
+    216, 118, 20, 1, 107, 227, 239, 20, 1, 107, 231, 124, 198, 20, 1, 107, 
+    221, 233, 20, 1, 107, 244, 196, 20, 1, 82, 229, 144, 20, 1, 82, 216, 17, 
+    20, 1, 82, 231, 113, 20, 1, 82, 233, 89, 20, 1, 82, 213, 128, 20, 1, 82, 
+    232, 126, 20, 1, 82, 226, 90, 20, 1, 82, 219, 46, 20, 1, 82, 223, 146, 
+    20, 1, 82, 228, 4, 20, 1, 82, 229, 115, 20, 1, 82, 224, 148, 20, 1, 82, 
+    217, 63, 20, 1, 82, 229, 23, 20, 1, 82, 233, 246, 20, 1, 82, 211, 187, 
+    20, 1, 82, 221, 171, 20, 1, 82, 229, 46, 20, 1, 82, 226, 87, 20, 1, 82, 
+    216, 18, 20, 1, 82, 233, 203, 20, 1, 82, 232, 140, 20, 1, 82, 228, 7, 20, 
+    1, 82, 228, 255, 20, 1, 82, 231, 221, 20, 1, 82, 229, 16, 20, 1, 82, 228, 
+    254, 20, 1, 82, 228, 6, 20, 1, 82, 222, 238, 20, 1, 82, 228, 172, 20, 1, 
+    82, 225, 211, 20, 1, 82, 222, 32, 20, 1, 82, 229, 31, 20, 1, 82, 231, 11, 
+    20, 1, 82, 242, 228, 20, 1, 82, 229, 19, 20, 1, 82, 228, 183, 20, 1, 82, 
+    231, 173, 20, 1, 82, 232, 122, 20, 1, 82, 229, 51, 20, 1, 82, 229, 128, 
+    20, 1, 82, 217, 86, 227, 245, 20, 1, 82, 220, 128, 20, 1, 82, 224, 144, 
+    20, 1, 82, 229, 148, 219, 52, 20, 1, 82, 229, 39, 227, 161, 20, 1, 82, 
+    211, 4, 20, 1, 82, 242, 229, 20, 1, 82, 215, 118, 20, 1, 82, 211, 19, 20, 
+    1, 82, 225, 17, 20, 1, 82, 215, 108, 20, 1, 82, 234, 155, 20, 1, 82, 218, 
+    81, 20, 1, 82, 216, 220, 20, 1, 82, 213, 184, 20, 1, 82, 212, 6, 20, 1, 
+    82, 233, 133, 20, 1, 82, 224, 151, 20, 1, 82, 217, 97, 20, 1, 82, 242, 
+    248, 20, 1, 82, 229, 60, 20, 1, 82, 220, 41, 20, 1, 82, 231, 6, 20, 1, 
+    82, 231, 117, 20, 1, 82, 227, 116, 20, 1, 82, 228, 137, 20, 1, 82, 243, 
+    74, 20, 1, 82, 215, 109, 20, 1, 82, 233, 212, 20, 1, 82, 211, 67, 20, 1, 
+    82, 227, 150, 250, 17, 20, 1, 82, 210, 250, 20, 1, 82, 231, 23, 20, 1, 
+    82, 229, 133, 20, 1, 82, 225, 101, 20, 1, 82, 210, 197, 20, 1, 82, 233, 
+    7, 20, 1, 82, 243, 234, 20, 1, 82, 243, 73, 20, 1, 82, 229, 9, 20, 1, 82, 
+    234, 157, 20, 1, 82, 231, 224, 20, 1, 82, 229, 22, 20, 1, 82, 242, 235, 
+    20, 1, 82, 244, 197, 20, 1, 82, 227, 240, 20, 1, 82, 225, 154, 20, 1, 82, 
+    211, 17, 20, 1, 82, 229, 47, 20, 1, 82, 227, 150, 252, 24, 20, 1, 82, 
+    227, 96, 20, 1, 82, 224, 248, 20, 1, 82, 230, 221, 20, 1, 82, 243, 232, 
+    20, 1, 82, 229, 221, 20, 1, 82, 230, 101, 20, 1, 82, 242, 234, 20, 1, 82, 
+    243, 236, 73, 20, 1, 82, 230, 48, 20, 1, 82, 224, 147, 20, 1, 82, 229, 
+    11, 20, 1, 82, 233, 190, 20, 1, 82, 225, 98, 20, 1, 82, 227, 248, 20, 1, 
+    82, 211, 18, 20, 1, 82, 229, 32, 20, 1, 82, 226, 91, 225, 188, 20, 1, 82, 
+    243, 236, 251, 16, 20, 1, 82, 244, 38, 20, 1, 82, 228, 177, 20, 1, 82, 
+    61, 20, 1, 82, 216, 11, 20, 1, 82, 76, 20, 1, 82, 73, 20, 1, 82, 233, 87, 
+    20, 1, 82, 226, 91, 225, 24, 20, 1, 82, 217, 102, 20, 1, 82, 217, 52, 20, 
+    1, 82, 229, 148, 230, 35, 240, 235, 20, 1, 82, 220, 16, 20, 1, 82, 211, 
+    14, 20, 1, 82, 228, 248, 20, 1, 82, 210, 202, 20, 1, 82, 210, 227, 217, 
+    241, 20, 1, 82, 210, 227, 249, 148, 20, 1, 82, 210, 187, 20, 1, 82, 210, 
+    195, 20, 1, 82, 234, 143, 20, 1, 82, 225, 152, 20, 1, 82, 228, 178, 245, 
+    103, 20, 1, 82, 224, 145, 20, 1, 82, 211, 192, 20, 1, 82, 244, 148, 20, 
+    1, 82, 213, 250, 20, 1, 82, 232, 99, 20, 1, 82, 230, 231, 20, 1, 82, 223, 
+    52, 20, 1, 82, 223, 172, 20, 1, 82, 228, 247, 20, 1, 82, 229, 78, 20, 1, 
+    82, 220, 8, 20, 1, 82, 219, 253, 20, 1, 82, 243, 236, 223, 87, 20, 1, 82, 
+    197, 20, 1, 82, 225, 109, 20, 1, 82, 232, 120, 20, 1, 82, 234, 29, 20, 1, 
+    82, 231, 59, 20, 1, 82, 185, 20, 1, 82, 231, 170, 20, 1, 82, 216, 222, 
+    20, 1, 82, 234, 93, 20, 1, 82, 230, 151, 20, 1, 82, 216, 248, 20, 1, 82, 
+    244, 170, 20, 1, 82, 242, 224, 20, 1, 225, 138, 176, 20, 1, 225, 138, 70, 
+    20, 1, 225, 138, 233, 218, 20, 1, 225, 138, 245, 210, 20, 1, 225, 138, 
+    223, 109, 20, 1, 225, 138, 217, 87, 20, 1, 225, 138, 227, 149, 20, 1, 
+    225, 138, 233, 136, 20, 1, 225, 138, 222, 240, 20, 1, 225, 138, 223, 30, 
+    20, 1, 225, 138, 231, 80, 20, 1, 225, 138, 217, 102, 20, 1, 225, 138, 
+    229, 147, 20, 1, 225, 138, 228, 184, 20, 1, 225, 138, 193, 20, 1, 225, 
+    138, 218, 5, 20, 1, 225, 138, 220, 28, 20, 1, 225, 138, 219, 192, 20, 1, 
+    225, 138, 220, 124, 20, 1, 225, 138, 233, 156, 20, 1, 225, 138, 234, 157, 
+    20, 1, 225, 138, 227, 210, 20, 1, 225, 138, 227, 238, 20, 1, 225, 138, 
+    228, 155, 20, 1, 225, 138, 210, 226, 20, 1, 225, 138, 219, 226, 20, 1, 
+    225, 138, 191, 20, 1, 225, 138, 228, 10, 20, 1, 225, 138, 225, 152, 20, 
+    1, 225, 138, 227, 247, 20, 1, 225, 138, 211, 192, 20, 1, 225, 138, 225, 
+    212, 20, 1, 225, 138, 222, 141, 20, 1, 225, 138, 228, 234, 20, 1, 225, 
+    138, 223, 52, 20, 1, 225, 138, 234, 166, 20, 1, 225, 138, 229, 8, 20, 1, 
+    225, 138, 229, 57, 20, 1, 225, 138, 220, 8, 20, 1, 225, 138, 224, 148, 
+    20, 1, 225, 138, 244, 38, 20, 1, 225, 138, 212, 65, 20, 1, 225, 138, 232, 
+    242, 20, 1, 225, 138, 232, 120, 20, 1, 225, 138, 234, 29, 20, 1, 225, 
+    138, 231, 115, 20, 1, 225, 138, 223, 84, 20, 1, 225, 138, 185, 20, 1, 
+    225, 138, 230, 162, 20, 1, 225, 138, 231, 123, 20, 1, 225, 138, 216, 231, 
+    20, 1, 225, 138, 233, 252, 20, 1, 225, 138, 221, 252, 20, 1, 225, 138, 
+    212, 115, 95, 1, 190, 95, 1, 252, 192, 95, 1, 8, 190, 95, 1, 225, 43, 95, 
+    1, 185, 95, 1, 230, 234, 95, 1, 254, 24, 185, 95, 1, 244, 197, 95, 1, 
+    214, 27, 95, 1, 213, 177, 95, 1, 217, 106, 95, 1, 248, 222, 95, 1, 8, 
+    215, 157, 95, 1, 8, 217, 106, 95, 1, 215, 157, 95, 1, 248, 136, 95, 1, 
+    197, 95, 1, 228, 238, 95, 1, 8, 228, 111, 95, 1, 254, 24, 197, 95, 1, 
+    228, 111, 95, 1, 228, 97, 95, 1, 233, 136, 95, 1, 232, 62, 95, 1, 232, 
+    255, 95, 1, 232, 244, 95, 1, 216, 57, 95, 1, 247, 154, 95, 1, 216, 49, 
+    95, 1, 247, 153, 95, 1, 176, 95, 1, 243, 136, 95, 1, 8, 176, 95, 1, 224, 
+    89, 95, 1, 224, 67, 95, 1, 229, 78, 95, 1, 229, 29, 95, 1, 254, 24, 229, 
+    78, 95, 1, 162, 95, 1, 211, 165, 95, 1, 242, 250, 95, 1, 242, 227, 95, 1, 
+    215, 166, 95, 1, 246, 27, 95, 1, 227, 166, 95, 1, 227, 151, 95, 1, 215, 
+    176, 95, 1, 246, 34, 95, 1, 8, 215, 176, 95, 1, 8, 246, 34, 95, 1, 223, 
+    107, 215, 176, 95, 1, 220, 103, 95, 1, 218, 224, 95, 1, 210, 82, 95, 1, 
+    210, 14, 95, 1, 215, 184, 95, 1, 246, 39, 95, 1, 8, 215, 184, 95, 1, 206, 
+    95, 1, 210, 116, 95, 1, 210, 15, 95, 1, 209, 243, 95, 1, 209, 223, 95, 1, 
+    254, 24, 209, 243, 95, 1, 209, 215, 95, 1, 209, 222, 95, 1, 212, 65, 95, 
+    1, 254, 210, 95, 1, 241, 190, 95, 1, 229, 193, 95, 5, 253, 223, 95, 5, 
+    223, 107, 213, 133, 95, 5, 223, 107, 253, 223, 95, 25, 5, 61, 95, 25, 5, 
+    255, 74, 95, 25, 5, 254, 206, 95, 25, 5, 254, 124, 95, 25, 5, 254, 116, 
+    95, 25, 5, 76, 95, 25, 5, 226, 184, 95, 25, 5, 211, 227, 95, 25, 5, 212, 
+    98, 95, 25, 5, 75, 95, 25, 5, 245, 151, 95, 25, 5, 245, 139, 95, 25, 5, 
+    226, 233, 95, 25, 5, 73, 95, 25, 5, 240, 120, 95, 25, 5, 240, 119, 95, 
+    25, 5, 240, 118, 95, 25, 5, 235, 190, 95, 25, 5, 236, 61, 95, 25, 5, 236, 
+    34, 95, 25, 5, 235, 157, 95, 25, 5, 235, 232, 95, 25, 5, 70, 95, 25, 5, 
     214, 229, 95, 25, 5, 214, 228, 95, 25, 5, 214, 227, 95, 25, 5, 214, 118, 
     95, 25, 5, 214, 211, 95, 25, 5, 214, 178, 95, 25, 5, 211, 117, 95, 25, 5, 
-    211, 8, 95, 25, 5, 254, 243, 95, 25, 5, 254, 239, 95, 25, 5, 245, 86, 95, 
-    25, 5, 222, 183, 245, 86, 95, 25, 5, 245, 92, 95, 25, 5, 222, 183, 245, 
-    92, 95, 25, 5, 254, 201, 95, 25, 5, 245, 195, 95, 25, 5, 253, 192, 95, 
-    25, 5, 226, 134, 95, 25, 5, 230, 25, 95, 25, 5, 229, 79, 95, 138, 222, 
-    251, 95, 138, 216, 14, 222, 251, 95, 138, 48, 95, 138, 51, 95, 1, 216, 
-    28, 95, 1, 216, 27, 95, 1, 216, 26, 95, 1, 216, 25, 95, 1, 216, 24, 95, 
-    1, 216, 23, 95, 1, 216, 22, 95, 1, 223, 106, 216, 29, 95, 1, 223, 106, 
-    216, 28, 95, 1, 223, 106, 216, 26, 95, 1, 223, 106, 216, 25, 95, 1, 223, 
-    106, 216, 24, 95, 1, 223, 106, 216, 22, 56, 1, 254, 23, 75, 141, 1, 254, 
-    23, 211, 47, 49, 28, 16, 224, 154, 49, 28, 16, 248, 158, 49, 28, 16, 225, 
-    175, 49, 28, 16, 226, 113, 245, 178, 49, 28, 16, 226, 113, 247, 201, 49, 
-    28, 16, 214, 16, 245, 178, 49, 28, 16, 214, 16, 247, 201, 49, 28, 16, 
-    234, 197, 49, 28, 16, 217, 169, 49, 28, 16, 226, 9, 49, 28, 16, 210, 217, 
-    49, 28, 16, 210, 218, 247, 201, 49, 28, 16, 233, 234, 49, 28, 16, 254, 
-    68, 245, 178, 49, 28, 16, 245, 26, 245, 178, 49, 28, 16, 217, 2, 49, 28, 
-    16, 234, 161, 49, 28, 16, 254, 58, 49, 28, 16, 254, 59, 247, 201, 49, 28, 
-    16, 217, 175, 49, 28, 16, 216, 159, 49, 28, 16, 226, 206, 254, 21, 49, 
-    28, 16, 242, 159, 254, 21, 49, 28, 16, 224, 153, 49, 28, 16, 250, 149, 
-    49, 28, 16, 214, 6, 49, 28, 16, 235, 164, 254, 21, 49, 28, 16, 234, 163, 
-    254, 21, 49, 28, 16, 234, 162, 254, 21, 49, 28, 16, 221, 213, 49, 28, 16, 
-    226, 0, 49, 28, 16, 218, 146, 254, 61, 49, 28, 16, 226, 112, 254, 21, 49, 
-    28, 16, 214, 15, 254, 21, 49, 28, 16, 254, 62, 254, 21, 49, 28, 16, 254, 
-    56, 49, 28, 16, 234, 37, 49, 28, 16, 223, 46, 49, 28, 16, 225, 106, 254, 
-    21, 49, 28, 16, 216, 83, 49, 28, 16, 254, 121, 49, 28, 16, 221, 159, 49, 
-    28, 16, 217, 178, 254, 21, 49, 28, 16, 217, 178, 231, 40, 218, 144, 49, 
-    28, 16, 226, 107, 254, 21, 49, 28, 16, 216, 190, 49, 28, 16, 233, 27, 49, 
-    28, 16, 246, 41, 49, 28, 16, 215, 227, 49, 28, 16, 216, 232, 49, 28, 16, 
-    233, 237, 49, 28, 16, 254, 68, 245, 26, 229, 95, 49, 28, 16, 243, 236, 
-    254, 21, 49, 28, 16, 236, 12, 49, 28, 16, 215, 199, 254, 21, 49, 28, 16, 
-    234, 200, 215, 198, 49, 28, 16, 225, 200, 49, 28, 16, 224, 158, 49, 28, 
-    16, 234, 11, 49, 28, 16, 250, 80, 254, 21, 49, 28, 16, 223, 146, 49, 28, 
-    16, 226, 12, 254, 21, 49, 28, 16, 226, 10, 254, 21, 49, 28, 16, 240, 109, 
-    49, 28, 16, 229, 203, 49, 28, 16, 225, 156, 49, 28, 16, 234, 12, 254, 
-    149, 49, 28, 16, 215, 199, 254, 149, 49, 28, 16, 218, 123, 49, 28, 16, 
-    242, 123, 49, 28, 16, 235, 164, 229, 95, 49, 28, 16, 226, 206, 229, 95, 
-    49, 28, 16, 226, 113, 229, 95, 49, 28, 16, 225, 155, 49, 28, 16, 233, 
-    254, 49, 28, 16, 225, 154, 49, 28, 16, 233, 236, 49, 28, 16, 225, 201, 
-    229, 95, 49, 28, 16, 234, 162, 229, 96, 254, 96, 49, 28, 16, 234, 163, 
-    229, 96, 254, 96, 49, 28, 16, 210, 215, 49, 28, 16, 254, 59, 229, 95, 49, 
-    28, 16, 254, 60, 217, 176, 229, 95, 49, 28, 16, 210, 216, 49, 28, 16, 
-    233, 235, 49, 28, 16, 245, 173, 49, 28, 16, 250, 150, 49, 28, 16, 230, 
-    198, 235, 163, 49, 28, 16, 214, 16, 229, 95, 49, 28, 16, 225, 106, 229, 
-    95, 49, 28, 16, 224, 159, 229, 95, 49, 28, 16, 226, 203, 49, 28, 16, 254, 
-    84, 49, 28, 16, 232, 58, 49, 28, 16, 226, 10, 229, 95, 49, 28, 16, 226, 
-    12, 229, 95, 49, 28, 16, 245, 60, 226, 11, 49, 28, 16, 233, 153, 49, 28, 
-    16, 254, 85, 49, 28, 16, 215, 199, 229, 95, 49, 28, 16, 245, 176, 49, 28, 
-    16, 217, 178, 229, 95, 49, 28, 16, 217, 170, 49, 28, 16, 250, 80, 229, 
-    95, 49, 28, 16, 245, 106, 49, 28, 16, 221, 160, 229, 95, 49, 28, 16, 211, 
-    151, 234, 37, 49, 28, 16, 215, 196, 49, 28, 16, 224, 160, 49, 28, 16, 
-    215, 200, 49, 28, 16, 215, 197, 49, 28, 16, 224, 157, 49, 28, 16, 215, 
-    195, 49, 28, 16, 224, 156, 49, 28, 16, 242, 158, 49, 28, 16, 254, 14, 49, 
-    28, 16, 245, 60, 254, 14, 49, 28, 16, 226, 107, 229, 95, 49, 28, 16, 216, 
-    189, 245, 69, 49, 28, 16, 216, 189, 245, 25, 49, 28, 16, 216, 191, 254, 
-    63, 49, 28, 16, 216, 184, 234, 247, 254, 55, 49, 28, 16, 234, 199, 49, 
-    28, 16, 245, 139, 49, 28, 16, 211, 11, 234, 196, 49, 28, 16, 211, 11, 
-    254, 96, 49, 28, 16, 218, 145, 49, 28, 16, 234, 38, 254, 96, 49, 28, 16, 
-    247, 202, 254, 21, 49, 28, 16, 233, 238, 254, 21, 49, 28, 16, 233, 238, 
-    254, 149, 49, 28, 16, 233, 238, 229, 95, 49, 28, 16, 254, 62, 229, 95, 
-    49, 28, 16, 254, 64, 49, 28, 16, 247, 201, 49, 28, 16, 215, 210, 49, 28, 
-    16, 216, 224, 49, 28, 16, 234, 2, 49, 28, 16, 233, 32, 245, 134, 250, 71, 
-    49, 28, 16, 233, 32, 246, 42, 250, 72, 49, 28, 16, 233, 32, 215, 212, 
-    250, 72, 49, 28, 16, 233, 32, 216, 234, 250, 72, 49, 28, 16, 233, 32, 
-    236, 7, 250, 71, 49, 28, 16, 242, 159, 229, 96, 254, 96, 49, 28, 16, 242, 
-    159, 226, 1, 254, 10, 49, 28, 16, 242, 159, 226, 1, 248, 29, 49, 28, 16, 
-    247, 225, 49, 28, 16, 247, 226, 226, 1, 254, 11, 234, 196, 49, 28, 16, 
-    247, 226, 226, 1, 254, 11, 254, 96, 49, 28, 16, 247, 226, 226, 1, 248, 
-    29, 49, 28, 16, 215, 216, 49, 28, 16, 254, 15, 49, 28, 16, 236, 14, 49, 
-    28, 16, 247, 246, 49, 28, 16, 254, 211, 225, 0, 254, 16, 49, 28, 16, 254, 
-    211, 254, 13, 49, 28, 16, 254, 211, 254, 16, 49, 28, 16, 254, 211, 231, 
-    34, 49, 28, 16, 254, 211, 231, 45, 49, 28, 16, 254, 211, 242, 160, 49, 
-    28, 16, 254, 211, 242, 157, 49, 28, 16, 254, 211, 225, 0, 242, 160, 49, 
-    28, 16, 231, 151, 224, 165, 240, 107, 49, 28, 16, 231, 151, 254, 151, 
-    224, 165, 240, 107, 49, 28, 16, 231, 151, 248, 28, 240, 107, 49, 28, 16, 
-    231, 151, 254, 151, 248, 28, 240, 107, 49, 28, 16, 231, 151, 215, 205, 
-    240, 107, 49, 28, 16, 231, 151, 215, 217, 49, 28, 16, 231, 151, 216, 228, 
-    240, 107, 49, 28, 16, 231, 151, 216, 228, 233, 35, 240, 107, 49, 28, 16, 
-    231, 151, 233, 35, 240, 107, 49, 28, 16, 231, 151, 225, 39, 240, 107, 49, 
-    28, 16, 235, 169, 216, 251, 240, 108, 49, 28, 16, 254, 60, 216, 251, 240, 
-    108, 49, 28, 16, 244, 172, 216, 225, 49, 28, 16, 244, 172, 230, 143, 49, 
-    28, 16, 244, 172, 247, 230, 49, 28, 16, 231, 151, 214, 10, 240, 107, 49, 
-    28, 16, 231, 151, 224, 164, 240, 107, 49, 28, 16, 231, 151, 225, 39, 216, 
-    228, 240, 107, 49, 28, 16, 242, 155, 230, 26, 254, 63, 49, 28, 16, 242, 
-    155, 230, 26, 247, 200, 49, 28, 16, 245, 148, 234, 247, 243, 236, 213, 
-    124, 49, 28, 16, 236, 13, 49, 28, 16, 236, 11, 49, 28, 16, 243, 236, 254, 
-    22, 248, 27, 240, 106, 49, 28, 16, 243, 236, 247, 244, 190, 49, 28, 16, 
-    243, 236, 247, 244, 229, 203, 49, 28, 16, 243, 236, 229, 198, 240, 107, 
-    49, 28, 16, 243, 236, 247, 244, 248, 3, 49, 28, 16, 243, 236, 219, 102, 
-    247, 243, 248, 3, 49, 28, 16, 243, 236, 247, 244, 234, 182, 49, 28, 16, 
-    243, 236, 247, 244, 210, 23, 49, 28, 16, 243, 236, 247, 244, 228, 234, 
-    234, 196, 49, 28, 16, 243, 236, 247, 244, 228, 234, 254, 96, 49, 28, 16, 
-    243, 236, 231, 191, 250, 73, 247, 230, 49, 28, 16, 243, 236, 231, 191, 
-    250, 73, 230, 143, 49, 28, 16, 244, 122, 219, 102, 250, 73, 214, 9, 49, 
-    28, 16, 243, 236, 219, 102, 250, 73, 217, 179, 49, 28, 16, 243, 236, 229, 
-    97, 49, 28, 16, 250, 74, 209, 249, 49, 28, 16, 250, 74, 234, 36, 49, 28, 
-    16, 250, 74, 219, 9, 49, 28, 16, 243, 236, 240, 154, 211, 10, 216, 229, 
-    49, 28, 16, 243, 236, 245, 149, 254, 86, 49, 28, 16, 211, 10, 215, 206, 
-    49, 28, 16, 247, 238, 215, 206, 49, 28, 16, 247, 238, 216, 229, 49, 28, 
-    16, 247, 238, 254, 65, 246, 42, 247, 139, 49, 28, 16, 247, 238, 230, 141, 
-    216, 233, 247, 139, 49, 28, 16, 247, 238, 247, 222, 245, 36, 247, 139, 
-    49, 28, 16, 247, 238, 215, 214, 226, 211, 247, 139, 49, 28, 16, 211, 10, 
-    254, 65, 246, 42, 247, 139, 49, 28, 16, 211, 10, 230, 141, 216, 233, 247, 
-    139, 49, 28, 16, 211, 10, 247, 222, 245, 36, 247, 139, 49, 28, 16, 211, 
-    10, 215, 214, 226, 211, 247, 139, 49, 28, 16, 243, 49, 247, 237, 49, 28, 
-    16, 243, 49, 211, 9, 49, 28, 16, 247, 245, 254, 65, 230, 199, 49, 28, 16, 
-    247, 245, 254, 65, 231, 73, 49, 28, 16, 247, 245, 247, 201, 49, 28, 16, 
-    247, 245, 216, 182, 49, 28, 16, 219, 163, 216, 182, 49, 28, 16, 219, 163, 
-    216, 183, 247, 186, 49, 28, 16, 219, 163, 216, 183, 215, 207, 49, 28, 16, 
-    219, 163, 216, 183, 216, 222, 49, 28, 16, 219, 163, 253, 244, 49, 28, 16, 
-    219, 163, 253, 245, 247, 186, 49, 28, 16, 219, 163, 253, 245, 215, 207, 
-    49, 28, 16, 219, 163, 253, 245, 216, 222, 49, 28, 16, 247, 223, 243, 30, 
-    49, 28, 16, 247, 229, 226, 134, 49, 28, 16, 218, 137, 49, 28, 16, 254, 7, 
-    190, 49, 28, 16, 254, 7, 213, 124, 49, 28, 16, 254, 7, 243, 135, 49, 28, 
-    16, 254, 7, 248, 3, 49, 28, 16, 254, 7, 234, 182, 49, 28, 16, 254, 7, 
-    210, 23, 49, 28, 16, 254, 7, 228, 233, 49, 28, 16, 234, 162, 229, 96, 
-    231, 44, 49, 28, 16, 234, 163, 229, 96, 231, 44, 49, 28, 16, 234, 162, 
-    229, 96, 234, 196, 49, 28, 16, 234, 163, 229, 96, 234, 196, 49, 28, 16, 
-    234, 38, 234, 196, 49, 28, 16, 242, 159, 229, 96, 234, 196, 28, 16, 219, 
-    155, 252, 135, 28, 16, 52, 252, 135, 28, 16, 40, 252, 135, 28, 16, 223, 
-    50, 40, 252, 135, 28, 16, 248, 155, 252, 135, 28, 16, 219, 251, 252, 135, 
-    28, 16, 43, 223, 77, 50, 28, 16, 44, 223, 77, 50, 28, 16, 223, 77, 247, 
-    118, 28, 16, 248, 196, 221, 163, 28, 16, 248, 222, 250, 249, 28, 16, 221, 
-    163, 28, 16, 249, 234, 28, 16, 223, 75, 244, 111, 28, 16, 223, 75, 244, 
-    110, 28, 16, 223, 75, 244, 109, 28, 16, 244, 131, 28, 16, 244, 132, 51, 
-    28, 16, 251, 148, 78, 28, 16, 251, 24, 28, 16, 251, 159, 28, 16, 127, 28, 
-    16, 226, 193, 218, 163, 28, 16, 215, 57, 218, 163, 28, 16, 216, 142, 218, 
-    163, 28, 16, 244, 10, 218, 163, 28, 16, 244, 80, 218, 163, 28, 16, 219, 
-    124, 218, 163, 28, 16, 219, 122, 243, 250, 28, 16, 244, 8, 243, 250, 28, 
-    16, 243, 203, 250, 14, 28, 16, 243, 203, 250, 15, 226, 136, 254, 142, 28, 
-    16, 243, 203, 250, 15, 226, 136, 252, 122, 28, 16, 251, 67, 250, 14, 28, 
-    16, 245, 7, 250, 14, 28, 16, 245, 7, 250, 15, 226, 136, 254, 142, 28, 16, 
-    245, 7, 250, 15, 226, 136, 252, 122, 28, 16, 246, 83, 250, 13, 28, 16, 
-    246, 83, 250, 12, 28, 16, 230, 85, 231, 90, 223, 61, 28, 16, 52, 220, 75, 
-    28, 16, 52, 244, 65, 28, 16, 244, 66, 214, 163, 28, 16, 244, 66, 246, 
-    106, 28, 16, 229, 188, 214, 163, 28, 16, 229, 188, 246, 106, 28, 16, 220, 
-    76, 214, 163, 28, 16, 220, 76, 246, 106, 28, 16, 224, 22, 138, 220, 75, 
-    28, 16, 224, 22, 138, 244, 65, 28, 16, 249, 216, 216, 87, 28, 16, 249, 
-    85, 216, 87, 28, 16, 226, 136, 254, 142, 28, 16, 226, 136, 252, 122, 28, 
-    16, 224, 4, 254, 142, 28, 16, 224, 4, 252, 122, 28, 16, 230, 88, 223, 61, 
-    28, 16, 211, 251, 223, 61, 28, 16, 163, 223, 61, 28, 16, 224, 22, 223, 
-    61, 28, 16, 245, 189, 223, 61, 28, 16, 219, 118, 223, 61, 28, 16, 216, 
-    160, 223, 61, 28, 16, 219, 110, 223, 61, 28, 16, 123, 240, 211, 215, 71, 
-    223, 61, 28, 16, 211, 179, 228, 43, 28, 16, 96, 228, 43, 28, 16, 250, 36, 
-    211, 179, 228, 43, 28, 16, 42, 228, 44, 211, 253, 28, 16, 42, 228, 44, 
-    251, 221, 28, 16, 215, 226, 228, 44, 120, 211, 253, 28, 16, 215, 226, 
-    228, 44, 120, 251, 221, 28, 16, 215, 226, 228, 44, 43, 211, 253, 28, 16, 
-    215, 226, 228, 44, 43, 251, 221, 28, 16, 215, 226, 228, 44, 44, 211, 253, 
-    28, 16, 215, 226, 228, 44, 44, 251, 221, 28, 16, 215, 226, 228, 44, 124, 
-    211, 253, 28, 16, 215, 226, 228, 44, 124, 251, 221, 28, 16, 215, 226, 
-    228, 44, 120, 44, 211, 253, 28, 16, 215, 226, 228, 44, 120, 44, 251, 221, 
-    28, 16, 230, 129, 228, 44, 211, 253, 28, 16, 230, 129, 228, 44, 251, 221, 
-    28, 16, 215, 223, 228, 44, 124, 211, 253, 28, 16, 215, 223, 228, 44, 124, 
-    251, 221, 28, 16, 226, 4, 228, 43, 28, 16, 213, 132, 228, 43, 28, 16, 
-    228, 44, 251, 221, 28, 16, 227, 203, 228, 43, 28, 16, 249, 241, 228, 44, 
-    211, 253, 28, 16, 249, 241, 228, 44, 251, 221, 28, 16, 251, 146, 28, 16, 
-    211, 251, 228, 47, 28, 16, 163, 228, 47, 28, 16, 224, 22, 228, 47, 28, 
-    16, 245, 189, 228, 47, 28, 16, 219, 118, 228, 47, 28, 16, 216, 160, 228, 
-    47, 28, 16, 219, 110, 228, 47, 28, 16, 123, 240, 211, 215, 71, 228, 47, 
-    28, 16, 38, 218, 139, 28, 16, 38, 218, 240, 218, 139, 28, 16, 38, 215, 
-    234, 28, 16, 38, 215, 233, 28, 16, 38, 215, 232, 28, 16, 244, 101, 215, 
-    234, 28, 16, 244, 101, 215, 233, 28, 16, 244, 101, 215, 232, 28, 16, 38, 
-    253, 189, 247, 120, 28, 16, 38, 244, 72, 28, 16, 38, 244, 71, 28, 16, 38, 
-    244, 70, 28, 16, 38, 244, 69, 28, 16, 38, 244, 68, 28, 16, 252, 58, 252, 
-    74, 28, 16, 245, 143, 252, 74, 28, 16, 252, 58, 216, 111, 28, 16, 245, 
-    143, 216, 111, 28, 16, 252, 58, 219, 80, 28, 16, 245, 143, 219, 80, 28, 
-    16, 252, 58, 225, 115, 28, 16, 245, 143, 225, 115, 28, 16, 38, 255, 14, 
-    28, 16, 38, 218, 165, 28, 16, 38, 216, 238, 28, 16, 38, 218, 166, 28, 16, 
-    38, 231, 162, 28, 16, 38, 231, 161, 28, 16, 38, 255, 13, 28, 16, 38, 232, 
-    112, 28, 16, 253, 254, 214, 163, 28, 16, 253, 254, 246, 106, 28, 16, 38, 
-    247, 135, 28, 16, 38, 222, 231, 28, 16, 38, 244, 58, 28, 16, 38, 219, 76, 
-    28, 16, 38, 252, 38, 28, 16, 38, 52, 216, 19, 28, 16, 38, 215, 211, 216, 
-    19, 28, 16, 222, 235, 28, 16, 218, 75, 28, 16, 210, 159, 28, 16, 225, 
-    107, 28, 16, 231, 25, 28, 16, 244, 17, 28, 16, 249, 138, 28, 16, 248, 78, 
-    28, 16, 242, 150, 228, 48, 219, 95, 28, 16, 242, 150, 228, 48, 228, 75, 
-    219, 95, 28, 16, 216, 0, 28, 16, 215, 95, 28, 16, 235, 193, 215, 95, 28, 
-    16, 215, 96, 219, 95, 28, 16, 215, 96, 214, 163, 28, 16, 226, 148, 218, 
-    102, 28, 16, 226, 148, 218, 99, 28, 16, 226, 148, 218, 98, 28, 16, 226, 
-    148, 218, 97, 28, 16, 226, 148, 218, 96, 28, 16, 226, 148, 218, 95, 28, 
-    16, 226, 148, 218, 94, 28, 16, 226, 148, 218, 93, 28, 16, 226, 148, 218, 
-    92, 28, 16, 226, 148, 218, 101, 28, 16, 226, 148, 218, 100, 28, 16, 241, 
-    245, 28, 16, 229, 105, 28, 16, 245, 143, 64, 218, 133, 28, 16, 248, 71, 
-    219, 95, 28, 16, 38, 124, 251, 169, 28, 16, 38, 120, 251, 169, 28, 16, 
-    38, 242, 0, 28, 16, 38, 219, 67, 225, 43, 28, 16, 225, 216, 78, 28, 16, 
-    225, 216, 120, 78, 28, 16, 163, 225, 216, 78, 28, 16, 242, 182, 214, 163, 
-    28, 16, 242, 182, 246, 106, 28, 16, 2, 244, 100, 28, 16, 248, 180, 28, 
-    16, 248, 181, 254, 154, 28, 16, 231, 133, 28, 16, 232, 129, 28, 16, 251, 
-    143, 28, 16, 220, 154, 211, 253, 28, 16, 220, 154, 251, 221, 28, 16, 230, 
-    184, 28, 16, 230, 185, 251, 221, 28, 16, 220, 148, 211, 253, 28, 16, 220, 
-    148, 251, 221, 28, 16, 243, 220, 211, 253, 28, 16, 243, 220, 251, 221, 
-    28, 16, 232, 130, 225, 180, 223, 61, 28, 16, 232, 130, 236, 4, 223, 61, 
-    28, 16, 251, 144, 223, 61, 28, 16, 220, 154, 223, 61, 28, 16, 230, 185, 
-    223, 61, 28, 16, 220, 148, 223, 61, 28, 16, 216, 249, 225, 178, 249, 107, 
-    224, 174, 225, 179, 28, 16, 216, 249, 225, 178, 249, 107, 224, 174, 236, 
-    3, 28, 16, 216, 249, 225, 178, 249, 107, 224, 174, 225, 180, 247, 211, 
-    28, 16, 216, 249, 236, 2, 249, 107, 224, 174, 225, 179, 28, 16, 216, 249, 
-    236, 2, 249, 107, 224, 174, 236, 3, 28, 16, 216, 249, 236, 2, 249, 107, 
-    224, 174, 236, 4, 247, 211, 28, 16, 216, 249, 236, 2, 249, 107, 224, 174, 
-    236, 4, 247, 210, 28, 16, 216, 249, 236, 2, 249, 107, 224, 174, 236, 4, 
-    247, 209, 28, 16, 249, 133, 28, 16, 242, 126, 251, 67, 250, 14, 28, 16, 
-    242, 126, 245, 7, 250, 14, 28, 16, 42, 253, 158, 28, 16, 213, 151, 28, 
-    16, 225, 14, 28, 16, 250, 5, 28, 16, 221, 203, 28, 16, 250, 9, 28, 16, 
-    216, 7, 28, 16, 224, 242, 28, 16, 224, 243, 244, 60, 28, 16, 221, 204, 
-    244, 60, 28, 16, 216, 8, 223, 58, 28, 16, 225, 163, 218, 66, 26, 213, 
-    137, 187, 217, 229, 26, 213, 137, 187, 217, 218, 26, 213, 137, 187, 217, 
-    208, 26, 213, 137, 187, 217, 201, 26, 213, 137, 187, 217, 193, 26, 213, 
-    137, 187, 217, 187, 26, 213, 137, 187, 217, 186, 26, 213, 137, 187, 217, 
-    185, 26, 213, 137, 187, 217, 184, 26, 213, 137, 187, 217, 228, 26, 213, 
-    137, 187, 217, 227, 26, 213, 137, 187, 217, 226, 26, 213, 137, 187, 217, 
-    225, 26, 213, 137, 187, 217, 224, 26, 213, 137, 187, 217, 223, 26, 213, 
-    137, 187, 217, 222, 26, 213, 137, 187, 217, 221, 26, 213, 137, 187, 217, 
-    220, 26, 213, 137, 187, 217, 219, 26, 213, 137, 187, 217, 217, 26, 213, 
-    137, 187, 217, 216, 26, 213, 137, 187, 217, 215, 26, 213, 137, 187, 217, 
-    214, 26, 213, 137, 187, 217, 213, 26, 213, 137, 187, 217, 192, 26, 213, 
-    137, 187, 217, 191, 26, 213, 137, 187, 217, 190, 26, 213, 137, 187, 217, 
-    189, 26, 213, 137, 187, 217, 188, 26, 235, 214, 187, 217, 229, 26, 235, 
-    214, 187, 217, 218, 26, 235, 214, 187, 217, 201, 26, 235, 214, 187, 217, 
-    193, 26, 235, 214, 187, 217, 186, 26, 235, 214, 187, 217, 185, 26, 235, 
-    214, 187, 217, 227, 26, 235, 214, 187, 217, 226, 26, 235, 214, 187, 217, 
-    225, 26, 235, 214, 187, 217, 224, 26, 235, 214, 187, 217, 221, 26, 235, 
-    214, 187, 217, 220, 26, 235, 214, 187, 217, 219, 26, 235, 214, 187, 217, 
-    214, 26, 235, 214, 187, 217, 213, 26, 235, 214, 187, 217, 212, 26, 235, 
-    214, 187, 217, 211, 26, 235, 214, 187, 217, 210, 26, 235, 214, 187, 217, 
-    209, 26, 235, 214, 187, 217, 207, 26, 235, 214, 187, 217, 206, 26, 235, 
-    214, 187, 217, 205, 26, 235, 214, 187, 217, 204, 26, 235, 214, 187, 217, 
-    203, 26, 235, 214, 187, 217, 202, 26, 235, 214, 187, 217, 200, 26, 235, 
-    214, 187, 217, 199, 26, 235, 214, 187, 217, 198, 26, 235, 214, 187, 217, 
-    197, 26, 235, 214, 187, 217, 196, 26, 235, 214, 187, 217, 195, 26, 235, 
-    214, 187, 217, 194, 26, 235, 214, 187, 217, 192, 26, 235, 214, 187, 217, 
-    191, 26, 235, 214, 187, 217, 190, 26, 235, 214, 187, 217, 189, 26, 235, 
-    214, 187, 217, 188, 38, 26, 28, 215, 208, 38, 26, 28, 216, 223, 38, 26, 
-    28, 225, 188, 26, 28, 233, 31, 230, 142, 31, 245, 223, 247, 224, 31, 241, 
-    222, 245, 223, 247, 224, 31, 240, 214, 245, 223, 247, 224, 31, 245, 222, 
-    241, 223, 247, 224, 31, 245, 222, 240, 213, 247, 224, 31, 245, 223, 180, 
-    31, 250, 174, 180, 31, 243, 229, 250, 35, 180, 31, 230, 177, 180, 31, 
-    252, 130, 180, 31, 234, 179, 219, 79, 180, 31, 249, 179, 180, 31, 253, 
-    233, 180, 31, 226, 163, 180, 31, 251, 153, 226, 130, 180, 31, 248, 73, 
-    177, 247, 179, 180, 31, 247, 176, 180, 31, 210, 222, 180, 31, 235, 247, 
-    180, 31, 225, 197, 180, 31, 223, 127, 180, 31, 249, 189, 180, 31, 241, 
-    60, 252, 184, 180, 31, 212, 59, 180, 31, 244, 39, 180, 31, 254, 246, 180, 
-    31, 223, 89, 180, 31, 223, 65, 180, 31, 245, 221, 180, 31, 235, 53, 180, 
-    31, 249, 184, 180, 31, 245, 142, 180, 31, 246, 52, 180, 31, 250, 145, 
-    180, 31, 248, 82, 180, 31, 23, 223, 64, 180, 31, 226, 81, 180, 31, 233, 
-    34, 180, 31, 249, 254, 180, 31, 234, 77, 180, 31, 243, 86, 180, 31, 218, 
-    112, 180, 31, 224, 130, 180, 31, 243, 228, 180, 31, 223, 66, 180, 31, 
-    233, 71, 177, 230, 157, 180, 31, 223, 62, 180, 31, 242, 168, 216, 42, 
-    231, 76, 180, 31, 245, 144, 180, 31, 218, 124, 180, 31, 242, 128, 180, 
-    31, 245, 136, 180, 31, 225, 235, 180, 31, 222, 225, 180, 31, 244, 59, 
-    180, 31, 214, 8, 177, 212, 44, 180, 31, 249, 193, 180, 31, 231, 89, 180, 
-    31, 245, 61, 180, 31, 214, 172, 180, 31, 247, 212, 180, 31, 250, 0, 230, 
-    110, 180, 31, 242, 106, 180, 31, 243, 87, 235, 255, 180, 31, 231, 141, 
-    180, 31, 255, 10, 180, 31, 245, 157, 180, 31, 246, 109, 180, 31, 212, 42, 
-    180, 31, 219, 150, 180, 31, 235, 222, 180, 31, 248, 42, 180, 31, 248, 
-    160, 180, 31, 247, 208, 180, 31, 245, 29, 180, 31, 220, 115, 180, 31, 
-    218, 128, 180, 31, 242, 2, 180, 31, 249, 212, 180, 31, 249, 251, 180, 31, 
-    244, 177, 180, 31, 254, 212, 180, 31, 249, 211, 180, 31, 226, 197, 216, 
-    196, 213, 242, 180, 31, 247, 232, 180, 31, 233, 124, 180, 31, 244, 13, 
-    249, 149, 222, 202, 214, 174, 21, 110, 249, 149, 222, 202, 214, 174, 21, 
-    105, 249, 149, 222, 202, 214, 174, 21, 158, 249, 149, 222, 202, 214, 174, 
-    21, 161, 249, 149, 222, 202, 214, 174, 21, 189, 249, 149, 222, 202, 214, 
-    174, 21, 194, 249, 149, 222, 202, 214, 174, 21, 198, 249, 149, 222, 202, 
-    214, 174, 21, 195, 249, 149, 222, 202, 214, 174, 21, 200, 249, 149, 222, 
-    202, 216, 243, 21, 110, 249, 149, 222, 202, 216, 243, 21, 105, 249, 149, 
-    222, 202, 216, 243, 21, 158, 249, 149, 222, 202, 216, 243, 21, 161, 249, 
-    149, 222, 202, 216, 243, 21, 189, 249, 149, 222, 202, 216, 243, 21, 194, 
-    249, 149, 222, 202, 216, 243, 21, 198, 249, 149, 222, 202, 216, 243, 21, 
-    195, 249, 149, 222, 202, 216, 243, 21, 200, 11, 23, 6, 61, 11, 23, 6, 
-    253, 158, 11, 23, 6, 251, 66, 11, 23, 6, 249, 60, 11, 23, 6, 75, 11, 23, 
-    6, 245, 6, 11, 23, 6, 243, 202, 11, 23, 6, 242, 60, 11, 23, 6, 73, 11, 
-    23, 6, 235, 144, 11, 23, 6, 235, 23, 11, 23, 6, 156, 11, 23, 6, 193, 11, 
-    23, 6, 230, 25, 11, 23, 6, 76, 11, 23, 6, 226, 105, 11, 23, 6, 224, 96, 
-    11, 23, 6, 153, 11, 23, 6, 222, 91, 11, 23, 6, 217, 152, 11, 23, 6, 70, 
-    11, 23, 6, 214, 105, 11, 23, 6, 212, 98, 11, 23, 6, 211, 178, 11, 23, 6, 
-    211, 117, 11, 23, 6, 210, 159, 11, 23, 4, 61, 11, 23, 4, 253, 158, 11, 
-    23, 4, 251, 66, 11, 23, 4, 249, 60, 11, 23, 4, 75, 11, 23, 4, 245, 6, 11, 
-    23, 4, 243, 202, 11, 23, 4, 242, 60, 11, 23, 4, 73, 11, 23, 4, 235, 144, 
-    11, 23, 4, 235, 23, 11, 23, 4, 156, 11, 23, 4, 193, 11, 23, 4, 230, 25, 
-    11, 23, 4, 76, 11, 23, 4, 226, 105, 11, 23, 4, 224, 96, 11, 23, 4, 153, 
-    11, 23, 4, 222, 91, 11, 23, 4, 217, 152, 11, 23, 4, 70, 11, 23, 4, 214, 
-    105, 11, 23, 4, 212, 98, 11, 23, 4, 211, 178, 11, 23, 4, 211, 117, 11, 
-    23, 4, 210, 159, 11, 32, 6, 61, 11, 32, 6, 253, 158, 11, 32, 6, 251, 66, 
-    11, 32, 6, 249, 60, 11, 32, 6, 75, 11, 32, 6, 245, 6, 11, 32, 6, 243, 
-    202, 11, 32, 6, 242, 60, 11, 32, 6, 73, 11, 32, 6, 235, 144, 11, 32, 6, 
-    235, 23, 11, 32, 6, 156, 11, 32, 6, 193, 11, 32, 6, 230, 25, 11, 32, 6, 
-    76, 11, 32, 6, 226, 105, 11, 32, 6, 224, 96, 11, 32, 6, 153, 11, 32, 6, 
-    222, 91, 11, 32, 6, 217, 152, 11, 32, 6, 70, 11, 32, 6, 214, 105, 11, 32, 
-    6, 212, 98, 11, 32, 6, 211, 178, 11, 32, 6, 211, 117, 11, 32, 6, 210, 
-    159, 11, 32, 4, 61, 11, 32, 4, 253, 158, 11, 32, 4, 251, 66, 11, 32, 4, 
-    249, 60, 11, 32, 4, 75, 11, 32, 4, 245, 6, 11, 32, 4, 243, 202, 11, 32, 
-    4, 73, 11, 32, 4, 235, 144, 11, 32, 4, 235, 23, 11, 32, 4, 156, 11, 32, 
-    4, 193, 11, 32, 4, 230, 25, 11, 32, 4, 76, 11, 32, 4, 226, 105, 11, 32, 
-    4, 224, 96, 11, 32, 4, 153, 11, 32, 4, 222, 91, 11, 32, 4, 217, 152, 11, 
-    32, 4, 70, 11, 32, 4, 214, 105, 11, 32, 4, 212, 98, 11, 32, 4, 211, 178, 
-    11, 32, 4, 211, 117, 11, 32, 4, 210, 159, 11, 23, 32, 6, 61, 11, 23, 32, 
-    6, 253, 158, 11, 23, 32, 6, 251, 66, 11, 23, 32, 6, 249, 60, 11, 23, 32, 
-    6, 75, 11, 23, 32, 6, 245, 6, 11, 23, 32, 6, 243, 202, 11, 23, 32, 6, 
-    242, 60, 11, 23, 32, 6, 73, 11, 23, 32, 6, 235, 144, 11, 23, 32, 6, 235, 
-    23, 11, 23, 32, 6, 156, 11, 23, 32, 6, 193, 11, 23, 32, 6, 230, 25, 11, 
-    23, 32, 6, 76, 11, 23, 32, 6, 226, 105, 11, 23, 32, 6, 224, 96, 11, 23, 
-    32, 6, 153, 11, 23, 32, 6, 222, 91, 11, 23, 32, 6, 217, 152, 11, 23, 32, 
-    6, 70, 11, 23, 32, 6, 214, 105, 11, 23, 32, 6, 212, 98, 11, 23, 32, 6, 
-    211, 178, 11, 23, 32, 6, 211, 117, 11, 23, 32, 6, 210, 159, 11, 23, 32, 
-    4, 61, 11, 23, 32, 4, 253, 158, 11, 23, 32, 4, 251, 66, 11, 23, 32, 4, 
-    249, 60, 11, 23, 32, 4, 75, 11, 23, 32, 4, 245, 6, 11, 23, 32, 4, 243, 
-    202, 11, 23, 32, 4, 242, 60, 11, 23, 32, 4, 73, 11, 23, 32, 4, 235, 144, 
-    11, 23, 32, 4, 235, 23, 11, 23, 32, 4, 156, 11, 23, 32, 4, 193, 11, 23, 
-    32, 4, 230, 25, 11, 23, 32, 4, 76, 11, 23, 32, 4, 226, 105, 11, 23, 32, 
-    4, 224, 96, 11, 23, 32, 4, 153, 11, 23, 32, 4, 222, 91, 11, 23, 32, 4, 
-    217, 152, 11, 23, 32, 4, 70, 11, 23, 32, 4, 214, 105, 11, 23, 32, 4, 212, 
-    98, 11, 23, 32, 4, 211, 178, 11, 23, 32, 4, 211, 117, 11, 23, 32, 4, 210, 
-    159, 11, 119, 6, 61, 11, 119, 6, 251, 66, 11, 119, 6, 249, 60, 11, 119, 
-    6, 243, 202, 11, 119, 6, 235, 144, 11, 119, 6, 235, 23, 11, 119, 6, 230, 
-    25, 11, 119, 6, 76, 11, 119, 6, 226, 105, 11, 119, 6, 224, 96, 11, 119, 
-    6, 222, 91, 11, 119, 6, 217, 152, 11, 119, 6, 70, 11, 119, 6, 214, 105, 
-    11, 119, 6, 212, 98, 11, 119, 6, 211, 178, 11, 119, 6, 211, 117, 11, 119, 
-    6, 210, 159, 11, 119, 4, 61, 11, 119, 4, 253, 158, 11, 119, 4, 251, 66, 
-    11, 119, 4, 249, 60, 11, 119, 4, 245, 6, 11, 119, 4, 242, 60, 11, 119, 4, 
-    73, 11, 119, 4, 235, 144, 11, 119, 4, 235, 23, 11, 119, 4, 156, 11, 119, 
-    4, 193, 11, 119, 4, 230, 25, 11, 119, 4, 226, 105, 11, 119, 4, 224, 96, 
-    11, 119, 4, 153, 11, 119, 4, 222, 91, 11, 119, 4, 217, 152, 11, 119, 4, 
-    70, 11, 119, 4, 214, 105, 11, 119, 4, 212, 98, 11, 119, 4, 211, 178, 11, 
-    119, 4, 211, 117, 11, 119, 4, 210, 159, 11, 23, 119, 6, 61, 11, 23, 119, 
-    6, 253, 158, 11, 23, 119, 6, 251, 66, 11, 23, 119, 6, 249, 60, 11, 23, 
-    119, 6, 75, 11, 23, 119, 6, 245, 6, 11, 23, 119, 6, 243, 202, 11, 23, 
-    119, 6, 242, 60, 11, 23, 119, 6, 73, 11, 23, 119, 6, 235, 144, 11, 23, 
-    119, 6, 235, 23, 11, 23, 119, 6, 156, 11, 23, 119, 6, 193, 11, 23, 119, 
-    6, 230, 25, 11, 23, 119, 6, 76, 11, 23, 119, 6, 226, 105, 11, 23, 119, 6, 
-    224, 96, 11, 23, 119, 6, 153, 11, 23, 119, 6, 222, 91, 11, 23, 119, 6, 
-    217, 152, 11, 23, 119, 6, 70, 11, 23, 119, 6, 214, 105, 11, 23, 119, 6, 
-    212, 98, 11, 23, 119, 6, 211, 178, 11, 23, 119, 6, 211, 117, 11, 23, 119, 
-    6, 210, 159, 11, 23, 119, 4, 61, 11, 23, 119, 4, 253, 158, 11, 23, 119, 
-    4, 251, 66, 11, 23, 119, 4, 249, 60, 11, 23, 119, 4, 75, 11, 23, 119, 4, 
-    245, 6, 11, 23, 119, 4, 243, 202, 11, 23, 119, 4, 242, 60, 11, 23, 119, 
-    4, 73, 11, 23, 119, 4, 235, 144, 11, 23, 119, 4, 235, 23, 11, 23, 119, 4, 
-    156, 11, 23, 119, 4, 193, 11, 23, 119, 4, 230, 25, 11, 23, 119, 4, 76, 
-    11, 23, 119, 4, 226, 105, 11, 23, 119, 4, 224, 96, 11, 23, 119, 4, 153, 
-    11, 23, 119, 4, 222, 91, 11, 23, 119, 4, 217, 152, 11, 23, 119, 4, 70, 
-    11, 23, 119, 4, 214, 105, 11, 23, 119, 4, 212, 98, 11, 23, 119, 4, 211, 
-    178, 11, 23, 119, 4, 211, 117, 11, 23, 119, 4, 210, 159, 11, 133, 6, 61, 
-    11, 133, 6, 253, 158, 11, 133, 6, 249, 60, 11, 133, 6, 75, 11, 133, 6, 
-    245, 6, 11, 133, 6, 243, 202, 11, 133, 6, 235, 144, 11, 133, 6, 235, 23, 
-    11, 133, 6, 156, 11, 133, 6, 193, 11, 133, 6, 230, 25, 11, 133, 6, 76, 
-    11, 133, 6, 226, 105, 11, 133, 6, 224, 96, 11, 133, 6, 222, 91, 11, 133, 
-    6, 217, 152, 11, 133, 6, 70, 11, 133, 6, 214, 105, 11, 133, 6, 212, 98, 
-    11, 133, 6, 211, 178, 11, 133, 6, 211, 117, 11, 133, 4, 61, 11, 133, 4, 
-    253, 158, 11, 133, 4, 251, 66, 11, 133, 4, 249, 60, 11, 133, 4, 75, 11, 
-    133, 4, 245, 6, 11, 133, 4, 243, 202, 11, 133, 4, 242, 60, 11, 133, 4, 
-    73, 11, 133, 4, 235, 144, 11, 133, 4, 235, 23, 11, 133, 4, 156, 11, 133, 
-    4, 193, 11, 133, 4, 230, 25, 11, 133, 4, 76, 11, 133, 4, 226, 105, 11, 
-    133, 4, 224, 96, 11, 133, 4, 153, 11, 133, 4, 222, 91, 11, 133, 4, 217, 
-    152, 11, 133, 4, 70, 11, 133, 4, 214, 105, 11, 133, 4, 212, 98, 11, 133, 
-    4, 211, 178, 11, 133, 4, 211, 117, 11, 133, 4, 210, 159, 11, 139, 6, 61, 
-    11, 139, 6, 253, 158, 11, 139, 6, 249, 60, 11, 139, 6, 75, 11, 139, 6, 
-    245, 6, 11, 139, 6, 243, 202, 11, 139, 6, 73, 11, 139, 6, 235, 144, 11, 
-    139, 6, 235, 23, 11, 139, 6, 156, 11, 139, 6, 193, 11, 139, 6, 76, 11, 
-    139, 6, 222, 91, 11, 139, 6, 217, 152, 11, 139, 6, 70, 11, 139, 6, 214, 
-    105, 11, 139, 6, 212, 98, 11, 139, 6, 211, 178, 11, 139, 6, 211, 117, 11, 
-    139, 4, 61, 11, 139, 4, 253, 158, 11, 139, 4, 251, 66, 11, 139, 4, 249, 
-    60, 11, 139, 4, 75, 11, 139, 4, 245, 6, 11, 139, 4, 243, 202, 11, 139, 4, 
-    242, 60, 11, 139, 4, 73, 11, 139, 4, 235, 144, 11, 139, 4, 235, 23, 11, 
-    139, 4, 156, 11, 139, 4, 193, 11, 139, 4, 230, 25, 11, 139, 4, 76, 11, 
-    139, 4, 226, 105, 11, 139, 4, 224, 96, 11, 139, 4, 153, 11, 139, 4, 222, 
-    91, 11, 139, 4, 217, 152, 11, 139, 4, 70, 11, 139, 4, 214, 105, 11, 139, 
-    4, 212, 98, 11, 139, 4, 211, 178, 11, 139, 4, 211, 117, 11, 139, 4, 210, 
-    159, 11, 23, 133, 6, 61, 11, 23, 133, 6, 253, 158, 11, 23, 133, 6, 251, 
-    66, 11, 23, 133, 6, 249, 60, 11, 23, 133, 6, 75, 11, 23, 133, 6, 245, 6, 
-    11, 23, 133, 6, 243, 202, 11, 23, 133, 6, 242, 60, 11, 23, 133, 6, 73, 
-    11, 23, 133, 6, 235, 144, 11, 23, 133, 6, 235, 23, 11, 23, 133, 6, 156, 
-    11, 23, 133, 6, 193, 11, 23, 133, 6, 230, 25, 11, 23, 133, 6, 76, 11, 23, 
-    133, 6, 226, 105, 11, 23, 133, 6, 224, 96, 11, 23, 133, 6, 153, 11, 23, 
-    133, 6, 222, 91, 11, 23, 133, 6, 217, 152, 11, 23, 133, 6, 70, 11, 23, 
-    133, 6, 214, 105, 11, 23, 133, 6, 212, 98, 11, 23, 133, 6, 211, 178, 11, 
-    23, 133, 6, 211, 117, 11, 23, 133, 6, 210, 159, 11, 23, 133, 4, 61, 11, 
-    23, 133, 4, 253, 158, 11, 23, 133, 4, 251, 66, 11, 23, 133, 4, 249, 60, 
-    11, 23, 133, 4, 75, 11, 23, 133, 4, 245, 6, 11, 23, 133, 4, 243, 202, 11, 
-    23, 133, 4, 242, 60, 11, 23, 133, 4, 73, 11, 23, 133, 4, 235, 144, 11, 
-    23, 133, 4, 235, 23, 11, 23, 133, 4, 156, 11, 23, 133, 4, 193, 11, 23, 
-    133, 4, 230, 25, 11, 23, 133, 4, 76, 11, 23, 133, 4, 226, 105, 11, 23, 
-    133, 4, 224, 96, 11, 23, 133, 4, 153, 11, 23, 133, 4, 222, 91, 11, 23, 
-    133, 4, 217, 152, 11, 23, 133, 4, 70, 11, 23, 133, 4, 214, 105, 11, 23, 
-    133, 4, 212, 98, 11, 23, 133, 4, 211, 178, 11, 23, 133, 4, 211, 117, 11, 
-    23, 133, 4, 210, 159, 11, 35, 6, 61, 11, 35, 6, 253, 158, 11, 35, 6, 251, 
-    66, 11, 35, 6, 249, 60, 11, 35, 6, 75, 11, 35, 6, 245, 6, 11, 35, 6, 243, 
-    202, 11, 35, 6, 242, 60, 11, 35, 6, 73, 11, 35, 6, 235, 144, 11, 35, 6, 
-    235, 23, 11, 35, 6, 156, 11, 35, 6, 193, 11, 35, 6, 230, 25, 11, 35, 6, 
-    76, 11, 35, 6, 226, 105, 11, 35, 6, 224, 96, 11, 35, 6, 153, 11, 35, 6, 
-    222, 91, 11, 35, 6, 217, 152, 11, 35, 6, 70, 11, 35, 6, 214, 105, 11, 35, 
-    6, 212, 98, 11, 35, 6, 211, 178, 11, 35, 6, 211, 117, 11, 35, 6, 210, 
-    159, 11, 35, 4, 61, 11, 35, 4, 253, 158, 11, 35, 4, 251, 66, 11, 35, 4, 
-    249, 60, 11, 35, 4, 75, 11, 35, 4, 245, 6, 11, 35, 4, 243, 202, 11, 35, 
-    4, 242, 60, 11, 35, 4, 73, 11, 35, 4, 235, 144, 11, 35, 4, 235, 23, 11, 
-    35, 4, 156, 11, 35, 4, 193, 11, 35, 4, 230, 25, 11, 35, 4, 76, 11, 35, 4, 
-    226, 105, 11, 35, 4, 224, 96, 11, 35, 4, 153, 11, 35, 4, 222, 91, 11, 35, 
-    4, 217, 152, 11, 35, 4, 70, 11, 35, 4, 214, 105, 11, 35, 4, 212, 98, 11, 
-    35, 4, 211, 178, 11, 35, 4, 211, 117, 11, 35, 4, 210, 159, 11, 35, 23, 6, 
-    61, 11, 35, 23, 6, 253, 158, 11, 35, 23, 6, 251, 66, 11, 35, 23, 6, 249, 
-    60, 11, 35, 23, 6, 75, 11, 35, 23, 6, 245, 6, 11, 35, 23, 6, 243, 202, 
-    11, 35, 23, 6, 242, 60, 11, 35, 23, 6, 73, 11, 35, 23, 6, 235, 144, 11, 
-    35, 23, 6, 235, 23, 11, 35, 23, 6, 156, 11, 35, 23, 6, 193, 11, 35, 23, 
-    6, 230, 25, 11, 35, 23, 6, 76, 11, 35, 23, 6, 226, 105, 11, 35, 23, 6, 
-    224, 96, 11, 35, 23, 6, 153, 11, 35, 23, 6, 222, 91, 11, 35, 23, 6, 217, 
-    152, 11, 35, 23, 6, 70, 11, 35, 23, 6, 214, 105, 11, 35, 23, 6, 212, 98, 
-    11, 35, 23, 6, 211, 178, 11, 35, 23, 6, 211, 117, 11, 35, 23, 6, 210, 
-    159, 11, 35, 23, 4, 61, 11, 35, 23, 4, 253, 158, 11, 35, 23, 4, 251, 66, 
-    11, 35, 23, 4, 249, 60, 11, 35, 23, 4, 75, 11, 35, 23, 4, 245, 6, 11, 35, 
-    23, 4, 243, 202, 11, 35, 23, 4, 242, 60, 11, 35, 23, 4, 73, 11, 35, 23, 
-    4, 235, 144, 11, 35, 23, 4, 235, 23, 11, 35, 23, 4, 156, 11, 35, 23, 4, 
-    193, 11, 35, 23, 4, 230, 25, 11, 35, 23, 4, 76, 11, 35, 23, 4, 226, 105, 
-    11, 35, 23, 4, 224, 96, 11, 35, 23, 4, 153, 11, 35, 23, 4, 222, 91, 11, 
-    35, 23, 4, 217, 152, 11, 35, 23, 4, 70, 11, 35, 23, 4, 214, 105, 11, 35, 
-    23, 4, 212, 98, 11, 35, 23, 4, 211, 178, 11, 35, 23, 4, 211, 117, 11, 35, 
-    23, 4, 210, 159, 11, 35, 32, 6, 61, 11, 35, 32, 6, 253, 158, 11, 35, 32, 
-    6, 251, 66, 11, 35, 32, 6, 249, 60, 11, 35, 32, 6, 75, 11, 35, 32, 6, 
-    245, 6, 11, 35, 32, 6, 243, 202, 11, 35, 32, 6, 242, 60, 11, 35, 32, 6, 
-    73, 11, 35, 32, 6, 235, 144, 11, 35, 32, 6, 235, 23, 11, 35, 32, 6, 156, 
-    11, 35, 32, 6, 193, 11, 35, 32, 6, 230, 25, 11, 35, 32, 6, 76, 11, 35, 
-    32, 6, 226, 105, 11, 35, 32, 6, 224, 96, 11, 35, 32, 6, 153, 11, 35, 32, 
-    6, 222, 91, 11, 35, 32, 6, 217, 152, 11, 35, 32, 6, 70, 11, 35, 32, 6, 
-    214, 105, 11, 35, 32, 6, 212, 98, 11, 35, 32, 6, 211, 178, 11, 35, 32, 6, 
-    211, 117, 11, 35, 32, 6, 210, 159, 11, 35, 32, 4, 61, 11, 35, 32, 4, 253, 
-    158, 11, 35, 32, 4, 251, 66, 11, 35, 32, 4, 249, 60, 11, 35, 32, 4, 75, 
-    11, 35, 32, 4, 245, 6, 11, 35, 32, 4, 243, 202, 11, 35, 32, 4, 242, 60, 
-    11, 35, 32, 4, 73, 11, 35, 32, 4, 235, 144, 11, 35, 32, 4, 235, 23, 11, 
-    35, 32, 4, 156, 11, 35, 32, 4, 193, 11, 35, 32, 4, 230, 25, 11, 35, 32, 
-    4, 76, 11, 35, 32, 4, 226, 105, 11, 35, 32, 4, 224, 96, 11, 35, 32, 4, 
-    153, 11, 35, 32, 4, 222, 91, 11, 35, 32, 4, 217, 152, 11, 35, 32, 4, 70, 
-    11, 35, 32, 4, 214, 105, 11, 35, 32, 4, 212, 98, 11, 35, 32, 4, 211, 178, 
-    11, 35, 32, 4, 211, 117, 11, 35, 32, 4, 210, 159, 11, 35, 23, 32, 6, 61, 
-    11, 35, 23, 32, 6, 253, 158, 11, 35, 23, 32, 6, 251, 66, 11, 35, 23, 32, 
-    6, 249, 60, 11, 35, 23, 32, 6, 75, 11, 35, 23, 32, 6, 245, 6, 11, 35, 23, 
-    32, 6, 243, 202, 11, 35, 23, 32, 6, 242, 60, 11, 35, 23, 32, 6, 73, 11, 
-    35, 23, 32, 6, 235, 144, 11, 35, 23, 32, 6, 235, 23, 11, 35, 23, 32, 6, 
-    156, 11, 35, 23, 32, 6, 193, 11, 35, 23, 32, 6, 230, 25, 11, 35, 23, 32, 
-    6, 76, 11, 35, 23, 32, 6, 226, 105, 11, 35, 23, 32, 6, 224, 96, 11, 35, 
-    23, 32, 6, 153, 11, 35, 23, 32, 6, 222, 91, 11, 35, 23, 32, 6, 217, 152, 
-    11, 35, 23, 32, 6, 70, 11, 35, 23, 32, 6, 214, 105, 11, 35, 23, 32, 6, 
-    212, 98, 11, 35, 23, 32, 6, 211, 178, 11, 35, 23, 32, 6, 211, 117, 11, 
-    35, 23, 32, 6, 210, 159, 11, 35, 23, 32, 4, 61, 11, 35, 23, 32, 4, 253, 
-    158, 11, 35, 23, 32, 4, 251, 66, 11, 35, 23, 32, 4, 249, 60, 11, 35, 23, 
-    32, 4, 75, 11, 35, 23, 32, 4, 245, 6, 11, 35, 23, 32, 4, 243, 202, 11, 
-    35, 23, 32, 4, 242, 60, 11, 35, 23, 32, 4, 73, 11, 35, 23, 32, 4, 235, 
-    144, 11, 35, 23, 32, 4, 235, 23, 11, 35, 23, 32, 4, 156, 11, 35, 23, 32, 
-    4, 193, 11, 35, 23, 32, 4, 230, 25, 11, 35, 23, 32, 4, 76, 11, 35, 23, 
-    32, 4, 226, 105, 11, 35, 23, 32, 4, 224, 96, 11, 35, 23, 32, 4, 153, 11, 
-    35, 23, 32, 4, 222, 91, 11, 35, 23, 32, 4, 217, 152, 11, 35, 23, 32, 4, 
-    70, 11, 35, 23, 32, 4, 214, 105, 11, 35, 23, 32, 4, 212, 98, 11, 35, 23, 
-    32, 4, 211, 178, 11, 35, 23, 32, 4, 211, 117, 11, 35, 23, 32, 4, 210, 
-    159, 11, 230, 138, 6, 61, 11, 230, 138, 6, 253, 158, 11, 230, 138, 6, 
-    251, 66, 11, 230, 138, 6, 249, 60, 11, 230, 138, 6, 75, 11, 230, 138, 6, 
-    245, 6, 11, 230, 138, 6, 243, 202, 11, 230, 138, 6, 242, 60, 11, 230, 
-    138, 6, 73, 11, 230, 138, 6, 235, 144, 11, 230, 138, 6, 235, 23, 11, 230, 
-    138, 6, 156, 11, 230, 138, 6, 193, 11, 230, 138, 6, 230, 25, 11, 230, 
-    138, 6, 76, 11, 230, 138, 6, 226, 105, 11, 230, 138, 6, 224, 96, 11, 230, 
-    138, 6, 153, 11, 230, 138, 6, 222, 91, 11, 230, 138, 6, 217, 152, 11, 
-    230, 138, 6, 70, 11, 230, 138, 6, 214, 105, 11, 230, 138, 6, 212, 98, 11, 
-    230, 138, 6, 211, 178, 11, 230, 138, 6, 211, 117, 11, 230, 138, 6, 210, 
-    159, 11, 230, 138, 4, 61, 11, 230, 138, 4, 253, 158, 11, 230, 138, 4, 
-    251, 66, 11, 230, 138, 4, 249, 60, 11, 230, 138, 4, 75, 11, 230, 138, 4, 
-    245, 6, 11, 230, 138, 4, 243, 202, 11, 230, 138, 4, 242, 60, 11, 230, 
-    138, 4, 73, 11, 230, 138, 4, 235, 144, 11, 230, 138, 4, 235, 23, 11, 230, 
-    138, 4, 156, 11, 230, 138, 4, 193, 11, 230, 138, 4, 230, 25, 11, 230, 
-    138, 4, 76, 11, 230, 138, 4, 226, 105, 11, 230, 138, 4, 224, 96, 11, 230, 
-    138, 4, 153, 11, 230, 138, 4, 222, 91, 11, 230, 138, 4, 217, 152, 11, 
-    230, 138, 4, 70, 11, 230, 138, 4, 214, 105, 11, 230, 138, 4, 212, 98, 11, 
-    230, 138, 4, 211, 178, 11, 230, 138, 4, 211, 117, 11, 230, 138, 4, 210, 
-    159, 11, 32, 4, 247, 119, 73, 11, 32, 4, 247, 119, 235, 144, 11, 23, 6, 
-    254, 143, 11, 23, 6, 252, 26, 11, 23, 6, 243, 107, 11, 23, 6, 248, 54, 
-    11, 23, 6, 245, 100, 11, 23, 6, 210, 85, 11, 23, 6, 245, 63, 11, 23, 6, 
-    216, 179, 11, 23, 6, 235, 185, 11, 23, 6, 234, 222, 11, 23, 6, 233, 98, 
-    11, 23, 6, 230, 102, 11, 23, 6, 227, 237, 11, 23, 6, 211, 157, 11, 23, 6, 
-    226, 199, 11, 23, 6, 225, 108, 11, 23, 6, 223, 37, 11, 23, 6, 216, 180, 
-    87, 11, 23, 6, 219, 177, 11, 23, 6, 217, 41, 11, 23, 6, 214, 157, 11, 23, 
-    6, 225, 133, 11, 23, 6, 250, 110, 11, 23, 6, 224, 161, 11, 23, 6, 226, 
-    201, 11, 23, 229, 221, 11, 23, 4, 254, 143, 11, 23, 4, 252, 26, 11, 23, 
-    4, 243, 107, 11, 23, 4, 248, 54, 11, 23, 4, 245, 100, 11, 23, 4, 210, 85, 
-    11, 23, 4, 245, 63, 11, 23, 4, 216, 179, 11, 23, 4, 235, 185, 11, 23, 4, 
-    234, 222, 11, 23, 4, 233, 98, 11, 23, 4, 230, 102, 11, 23, 4, 227, 237, 
-    11, 23, 4, 211, 157, 11, 23, 4, 226, 199, 11, 23, 4, 225, 108, 11, 23, 4, 
-    223, 37, 11, 23, 4, 40, 219, 177, 11, 23, 4, 219, 177, 11, 23, 4, 217, 
-    41, 11, 23, 4, 214, 157, 11, 23, 4, 225, 133, 11, 23, 4, 250, 110, 11, 
-    23, 4, 224, 161, 11, 23, 4, 226, 201, 11, 23, 225, 253, 247, 233, 11, 23, 
-    245, 101, 87, 11, 23, 216, 180, 87, 11, 23, 234, 223, 87, 11, 23, 225, 
-    134, 87, 11, 23, 223, 38, 87, 11, 23, 225, 109, 87, 11, 32, 6, 254, 143, 
-    11, 32, 6, 252, 26, 11, 32, 6, 243, 107, 11, 32, 6, 248, 54, 11, 32, 6, 
-    245, 100, 11, 32, 6, 210, 85, 11, 32, 6, 245, 63, 11, 32, 6, 216, 179, 
-    11, 32, 6, 235, 185, 11, 32, 6, 234, 222, 11, 32, 6, 233, 98, 11, 32, 6, 
-    230, 102, 11, 32, 6, 227, 237, 11, 32, 6, 211, 157, 11, 32, 6, 226, 199, 
-    11, 32, 6, 225, 108, 11, 32, 6, 223, 37, 11, 32, 6, 216, 180, 87, 11, 32, 
-    6, 219, 177, 11, 32, 6, 217, 41, 11, 32, 6, 214, 157, 11, 32, 6, 225, 
-    133, 11, 32, 6, 250, 110, 11, 32, 6, 224, 161, 11, 32, 6, 226, 201, 11, 
-    32, 229, 221, 11, 32, 4, 254, 143, 11, 32, 4, 252, 26, 11, 32, 4, 243, 
-    107, 11, 32, 4, 248, 54, 11, 32, 4, 245, 100, 11, 32, 4, 210, 85, 11, 32, 
-    4, 245, 63, 11, 32, 4, 216, 179, 11, 32, 4, 235, 185, 11, 32, 4, 234, 
-    222, 11, 32, 4, 233, 98, 11, 32, 4, 230, 102, 11, 32, 4, 227, 237, 11, 
-    32, 4, 211, 157, 11, 32, 4, 226, 199, 11, 32, 4, 225, 108, 11, 32, 4, 
-    223, 37, 11, 32, 4, 40, 219, 177, 11, 32, 4, 219, 177, 11, 32, 4, 217, 
-    41, 11, 32, 4, 214, 157, 11, 32, 4, 225, 133, 11, 32, 4, 250, 110, 11, 
-    32, 4, 224, 161, 11, 32, 4, 226, 201, 11, 32, 225, 253, 247, 233, 11, 32, 
-    245, 101, 87, 11, 32, 216, 180, 87, 11, 32, 234, 223, 87, 11, 32, 225, 
-    134, 87, 11, 32, 223, 38, 87, 11, 32, 225, 109, 87, 11, 23, 32, 6, 254, 
-    143, 11, 23, 32, 6, 252, 26, 11, 23, 32, 6, 243, 107, 11, 23, 32, 6, 248, 
-    54, 11, 23, 32, 6, 245, 100, 11, 23, 32, 6, 210, 85, 11, 23, 32, 6, 245, 
-    63, 11, 23, 32, 6, 216, 179, 11, 23, 32, 6, 235, 185, 11, 23, 32, 6, 234, 
-    222, 11, 23, 32, 6, 233, 98, 11, 23, 32, 6, 230, 102, 11, 23, 32, 6, 227, 
-    237, 11, 23, 32, 6, 211, 157, 11, 23, 32, 6, 226, 199, 11, 23, 32, 6, 
-    225, 108, 11, 23, 32, 6, 223, 37, 11, 23, 32, 6, 216, 180, 87, 11, 23, 
-    32, 6, 219, 177, 11, 23, 32, 6, 217, 41, 11, 23, 32, 6, 214, 157, 11, 23, 
-    32, 6, 225, 133, 11, 23, 32, 6, 250, 110, 11, 23, 32, 6, 224, 161, 11, 
-    23, 32, 6, 226, 201, 11, 23, 32, 229, 221, 11, 23, 32, 4, 254, 143, 11, 
-    23, 32, 4, 252, 26, 11, 23, 32, 4, 243, 107, 11, 23, 32, 4, 248, 54, 11, 
-    23, 32, 4, 245, 100, 11, 23, 32, 4, 210, 85, 11, 23, 32, 4, 245, 63, 11, 
-    23, 32, 4, 216, 179, 11, 23, 32, 4, 235, 185, 11, 23, 32, 4, 234, 222, 
-    11, 23, 32, 4, 233, 98, 11, 23, 32, 4, 230, 102, 11, 23, 32, 4, 227, 237, 
-    11, 23, 32, 4, 211, 157, 11, 23, 32, 4, 226, 199, 11, 23, 32, 4, 225, 
-    108, 11, 23, 32, 4, 223, 37, 11, 23, 32, 4, 40, 219, 177, 11, 23, 32, 4, 
-    219, 177, 11, 23, 32, 4, 217, 41, 11, 23, 32, 4, 214, 157, 11, 23, 32, 4, 
-    225, 133, 11, 23, 32, 4, 250, 110, 11, 23, 32, 4, 224, 161, 11, 23, 32, 
-    4, 226, 201, 11, 23, 32, 225, 253, 247, 233, 11, 23, 32, 245, 101, 87, 
-    11, 23, 32, 216, 180, 87, 11, 23, 32, 234, 223, 87, 11, 23, 32, 225, 134, 
-    87, 11, 23, 32, 223, 38, 87, 11, 23, 32, 225, 109, 87, 11, 35, 23, 6, 
-    254, 143, 11, 35, 23, 6, 252, 26, 11, 35, 23, 6, 243, 107, 11, 35, 23, 6, 
-    248, 54, 11, 35, 23, 6, 245, 100, 11, 35, 23, 6, 210, 85, 11, 35, 23, 6, 
-    245, 63, 11, 35, 23, 6, 216, 179, 11, 35, 23, 6, 235, 185, 11, 35, 23, 6, 
-    234, 222, 11, 35, 23, 6, 233, 98, 11, 35, 23, 6, 230, 102, 11, 35, 23, 6, 
-    227, 237, 11, 35, 23, 6, 211, 157, 11, 35, 23, 6, 226, 199, 11, 35, 23, 
-    6, 225, 108, 11, 35, 23, 6, 223, 37, 11, 35, 23, 6, 216, 180, 87, 11, 35, 
-    23, 6, 219, 177, 11, 35, 23, 6, 217, 41, 11, 35, 23, 6, 214, 157, 11, 35, 
-    23, 6, 225, 133, 11, 35, 23, 6, 250, 110, 11, 35, 23, 6, 224, 161, 11, 
-    35, 23, 6, 226, 201, 11, 35, 23, 229, 221, 11, 35, 23, 4, 254, 143, 11, 
-    35, 23, 4, 252, 26, 11, 35, 23, 4, 243, 107, 11, 35, 23, 4, 248, 54, 11, 
-    35, 23, 4, 245, 100, 11, 35, 23, 4, 210, 85, 11, 35, 23, 4, 245, 63, 11, 
-    35, 23, 4, 216, 179, 11, 35, 23, 4, 235, 185, 11, 35, 23, 4, 234, 222, 
-    11, 35, 23, 4, 233, 98, 11, 35, 23, 4, 230, 102, 11, 35, 23, 4, 227, 237, 
-    11, 35, 23, 4, 211, 157, 11, 35, 23, 4, 226, 199, 11, 35, 23, 4, 225, 
-    108, 11, 35, 23, 4, 223, 37, 11, 35, 23, 4, 40, 219, 177, 11, 35, 23, 4, 
-    219, 177, 11, 35, 23, 4, 217, 41, 11, 35, 23, 4, 214, 157, 11, 35, 23, 4, 
-    225, 133, 11, 35, 23, 4, 250, 110, 11, 35, 23, 4, 224, 161, 11, 35, 23, 
-    4, 226, 201, 11, 35, 23, 225, 253, 247, 233, 11, 35, 23, 245, 101, 87, 
-    11, 35, 23, 216, 180, 87, 11, 35, 23, 234, 223, 87, 11, 35, 23, 225, 134, 
-    87, 11, 35, 23, 223, 38, 87, 11, 35, 23, 225, 109, 87, 11, 35, 23, 32, 6, 
-    254, 143, 11, 35, 23, 32, 6, 252, 26, 11, 35, 23, 32, 6, 243, 107, 11, 
-    35, 23, 32, 6, 248, 54, 11, 35, 23, 32, 6, 245, 100, 11, 35, 23, 32, 6, 
-    210, 85, 11, 35, 23, 32, 6, 245, 63, 11, 35, 23, 32, 6, 216, 179, 11, 35, 
-    23, 32, 6, 235, 185, 11, 35, 23, 32, 6, 234, 222, 11, 35, 23, 32, 6, 233, 
-    98, 11, 35, 23, 32, 6, 230, 102, 11, 35, 23, 32, 6, 227, 237, 11, 35, 23, 
-    32, 6, 211, 157, 11, 35, 23, 32, 6, 226, 199, 11, 35, 23, 32, 6, 225, 
-    108, 11, 35, 23, 32, 6, 223, 37, 11, 35, 23, 32, 6, 216, 180, 87, 11, 35, 
-    23, 32, 6, 219, 177, 11, 35, 23, 32, 6, 217, 41, 11, 35, 23, 32, 6, 214, 
-    157, 11, 35, 23, 32, 6, 225, 133, 11, 35, 23, 32, 6, 250, 110, 11, 35, 
-    23, 32, 6, 224, 161, 11, 35, 23, 32, 6, 226, 201, 11, 35, 23, 32, 229, 
-    221, 11, 35, 23, 32, 4, 254, 143, 11, 35, 23, 32, 4, 252, 26, 11, 35, 23, 
-    32, 4, 243, 107, 11, 35, 23, 32, 4, 248, 54, 11, 35, 23, 32, 4, 245, 100, 
-    11, 35, 23, 32, 4, 210, 85, 11, 35, 23, 32, 4, 245, 63, 11, 35, 23, 32, 
-    4, 216, 179, 11, 35, 23, 32, 4, 235, 185, 11, 35, 23, 32, 4, 234, 222, 
-    11, 35, 23, 32, 4, 233, 98, 11, 35, 23, 32, 4, 230, 102, 11, 35, 23, 32, 
-    4, 227, 237, 11, 35, 23, 32, 4, 211, 157, 11, 35, 23, 32, 4, 226, 199, 
-    11, 35, 23, 32, 4, 225, 108, 11, 35, 23, 32, 4, 223, 37, 11, 35, 23, 32, 
-    4, 40, 219, 177, 11, 35, 23, 32, 4, 219, 177, 11, 35, 23, 32, 4, 217, 41, 
-    11, 35, 23, 32, 4, 214, 157, 11, 35, 23, 32, 4, 225, 133, 11, 35, 23, 32, 
-    4, 250, 110, 11, 35, 23, 32, 4, 224, 161, 11, 35, 23, 32, 4, 226, 201, 
-    11, 35, 23, 32, 225, 253, 247, 233, 11, 35, 23, 32, 245, 101, 87, 11, 35, 
-    23, 32, 216, 180, 87, 11, 35, 23, 32, 234, 223, 87, 11, 35, 23, 32, 225, 
-    134, 87, 11, 35, 23, 32, 223, 38, 87, 11, 35, 23, 32, 225, 109, 87, 11, 
-    23, 6, 247, 227, 11, 23, 4, 247, 227, 11, 23, 21, 210, 86, 11, 23, 21, 
-    110, 11, 23, 21, 105, 11, 23, 21, 158, 11, 23, 21, 161, 11, 23, 21, 189, 
-    11, 23, 21, 194, 11, 23, 21, 198, 11, 23, 21, 195, 11, 23, 21, 200, 11, 
-    139, 21, 210, 86, 11, 139, 21, 110, 11, 139, 21, 105, 11, 139, 21, 158, 
-    11, 139, 21, 161, 11, 139, 21, 189, 11, 139, 21, 194, 11, 139, 21, 198, 
-    11, 139, 21, 195, 11, 139, 21, 200, 11, 35, 21, 210, 86, 11, 35, 21, 110, 
-    11, 35, 21, 105, 11, 35, 21, 158, 11, 35, 21, 161, 11, 35, 21, 189, 11, 
-    35, 21, 194, 11, 35, 21, 198, 11, 35, 21, 195, 11, 35, 21, 200, 11, 35, 
-    23, 21, 210, 86, 11, 35, 23, 21, 110, 11, 35, 23, 21, 105, 11, 35, 23, 
-    21, 158, 11, 35, 23, 21, 161, 11, 35, 23, 21, 189, 11, 35, 23, 21, 194, 
-    11, 35, 23, 21, 198, 11, 35, 23, 21, 195, 11, 35, 23, 21, 200, 11, 230, 
-    138, 21, 210, 86, 11, 230, 138, 21, 110, 11, 230, 138, 21, 105, 11, 230, 
-    138, 21, 158, 11, 230, 138, 21, 161, 11, 230, 138, 21, 189, 11, 230, 138, 
-    21, 194, 11, 230, 138, 21, 198, 11, 230, 138, 21, 195, 11, 230, 138, 21, 
-    200, 10, 11, 254, 170, 10, 11, 252, 54, 10, 11, 235, 123, 10, 11, 248, 
-    195, 10, 11, 212, 30, 10, 11, 210, 108, 10, 11, 242, 37, 10, 11, 217, 80, 
-    10, 11, 211, 43, 10, 11, 234, 250, 10, 11, 233, 102, 10, 11, 231, 78, 10, 
-    11, 228, 62, 10, 11, 221, 166, 10, 11, 254, 196, 10, 11, 244, 142, 10, 
-    11, 222, 26, 10, 11, 224, 81, 10, 11, 223, 95, 10, 11, 220, 59, 10, 11, 
-    217, 7, 10, 11, 216, 192, 10, 11, 234, 129, 10, 11, 216, 202, 10, 11, 
-    248, 216, 10, 11, 210, 111, 10, 11, 242, 244, 10, 11, 247, 119, 252, 54, 
-    10, 11, 247, 119, 228, 62, 10, 11, 247, 119, 244, 142, 10, 11, 247, 119, 
-    224, 81, 10, 11, 65, 252, 54, 10, 11, 65, 235, 123, 10, 11, 65, 241, 218, 
-    10, 11, 65, 242, 37, 10, 11, 65, 211, 43, 10, 11, 65, 234, 250, 10, 11, 
-    65, 233, 102, 10, 11, 65, 231, 78, 10, 11, 65, 228, 62, 10, 11, 65, 221, 
-    166, 10, 11, 65, 254, 196, 10, 11, 65, 244, 142, 10, 11, 65, 222, 26, 10, 
-    11, 65, 224, 81, 10, 11, 65, 220, 59, 10, 11, 65, 217, 7, 10, 11, 65, 
-    216, 192, 10, 11, 65, 234, 129, 10, 11, 65, 248, 216, 10, 11, 65, 242, 
-    244, 10, 11, 217, 76, 235, 123, 10, 11, 217, 76, 242, 37, 10, 11, 217, 
-    76, 211, 43, 10, 11, 217, 76, 233, 102, 10, 11, 217, 76, 228, 62, 10, 11, 
-    217, 76, 221, 166, 10, 11, 217, 76, 254, 196, 10, 11, 217, 76, 222, 26, 
-    10, 11, 217, 76, 224, 81, 10, 11, 217, 76, 220, 59, 10, 11, 217, 76, 234, 
-    129, 10, 11, 217, 76, 248, 216, 10, 11, 217, 76, 242, 244, 10, 11, 217, 
-    76, 247, 119, 228, 62, 10, 11, 217, 76, 247, 119, 224, 81, 10, 11, 218, 
-    110, 252, 54, 10, 11, 218, 110, 235, 123, 10, 11, 218, 110, 241, 218, 10, 
-    11, 218, 110, 242, 37, 10, 11, 218, 110, 217, 80, 10, 11, 218, 110, 211, 
-    43, 10, 11, 218, 110, 234, 250, 10, 11, 218, 110, 231, 78, 10, 11, 218, 
-    110, 228, 62, 10, 11, 218, 110, 221, 166, 10, 11, 218, 110, 254, 196, 10, 
-    11, 218, 110, 244, 142, 10, 11, 218, 110, 222, 26, 10, 11, 218, 110, 224, 
-    81, 10, 11, 218, 110, 220, 59, 10, 11, 218, 110, 217, 7, 10, 11, 218, 
-    110, 216, 192, 10, 11, 218, 110, 234, 129, 10, 11, 218, 110, 248, 216, 
-    10, 11, 218, 110, 210, 111, 10, 11, 218, 110, 242, 244, 10, 11, 218, 110, 
-    247, 119, 252, 54, 10, 11, 218, 110, 247, 119, 244, 142, 10, 11, 232, 
-    122, 254, 170, 10, 11, 232, 122, 252, 54, 10, 11, 232, 122, 235, 123, 10, 
-    11, 232, 122, 248, 195, 10, 11, 232, 122, 241, 218, 10, 11, 232, 122, 
-    212, 30, 10, 11, 232, 122, 210, 108, 10, 11, 232, 122, 242, 37, 10, 11, 
-    232, 122, 217, 80, 10, 11, 232, 122, 211, 43, 10, 11, 232, 122, 233, 102, 
-    10, 11, 232, 122, 231, 78, 10, 11, 232, 122, 228, 62, 10, 11, 232, 122, 
-    221, 166, 10, 11, 232, 122, 254, 196, 10, 11, 232, 122, 244, 142, 10, 11, 
-    232, 122, 222, 26, 10, 11, 232, 122, 224, 81, 10, 11, 232, 122, 223, 95, 
-    10, 11, 232, 122, 220, 59, 10, 11, 232, 122, 217, 7, 10, 11, 232, 122, 
-    216, 192, 10, 11, 232, 122, 234, 129, 10, 11, 232, 122, 216, 202, 10, 11, 
-    232, 122, 248, 216, 10, 11, 232, 122, 210, 111, 10, 11, 232, 122, 242, 
-    244, 10, 11, 139, 252, 54, 10, 11, 139, 235, 123, 10, 11, 139, 248, 195, 
-    10, 11, 139, 212, 30, 10, 11, 139, 210, 108, 10, 11, 139, 242, 37, 10, 
-    11, 139, 217, 80, 10, 11, 139, 211, 43, 10, 11, 139, 233, 102, 10, 11, 
-    139, 231, 78, 10, 11, 139, 228, 62, 10, 11, 139, 221, 166, 10, 11, 139, 
-    254, 196, 10, 11, 139, 244, 142, 10, 11, 139, 222, 26, 10, 11, 139, 224, 
-    81, 10, 11, 139, 223, 95, 10, 11, 139, 220, 59, 10, 11, 139, 217, 7, 10, 
-    11, 139, 216, 192, 10, 11, 139, 234, 129, 10, 11, 139, 216, 202, 10, 11, 
-    139, 248, 216, 10, 11, 139, 210, 111, 10, 11, 139, 242, 244, 10, 11, 226, 
-    168, 66, 2, 122, 2, 217, 43, 10, 11, 226, 168, 122, 2, 248, 195, 231, 
-    205, 86, 245, 220, 211, 239, 231, 205, 86, 219, 28, 211, 239, 231, 205, 
-    86, 212, 9, 211, 239, 231, 205, 86, 228, 56, 211, 239, 231, 205, 86, 223, 
-    111, 246, 96, 231, 205, 86, 242, 127, 246, 96, 231, 205, 86, 71, 246, 96, 
-    231, 205, 86, 123, 64, 250, 141, 231, 205, 86, 113, 64, 250, 141, 231, 
-    205, 86, 134, 64, 250, 141, 231, 205, 86, 244, 11, 64, 250, 141, 231, 
-    205, 86, 244, 81, 64, 250, 141, 231, 205, 86, 219, 125, 64, 250, 141, 
-    231, 205, 86, 220, 122, 64, 250, 141, 231, 205, 86, 245, 193, 64, 250, 
-    141, 231, 205, 86, 228, 200, 64, 250, 141, 231, 205, 86, 123, 64, 252, 
-    153, 231, 205, 86, 113, 64, 252, 153, 231, 205, 86, 134, 64, 252, 153, 
-    231, 205, 86, 244, 11, 64, 252, 153, 231, 205, 86, 244, 81, 64, 252, 153, 
-    231, 205, 86, 219, 125, 64, 252, 153, 231, 205, 86, 220, 122, 64, 252, 
-    153, 231, 205, 86, 245, 193, 64, 252, 153, 231, 205, 86, 228, 200, 64, 
-    252, 153, 231, 205, 86, 123, 64, 250, 34, 231, 205, 86, 113, 64, 250, 34, 
-    231, 205, 86, 134, 64, 250, 34, 231, 205, 86, 244, 11, 64, 250, 34, 231, 
-    205, 86, 244, 81, 64, 250, 34, 231, 205, 86, 219, 125, 64, 250, 34, 231, 
-    205, 86, 220, 122, 64, 250, 34, 231, 205, 86, 245, 193, 64, 250, 34, 231, 
-    205, 86, 228, 200, 64, 250, 34, 231, 205, 86, 225, 25, 231, 205, 86, 226, 
-    156, 231, 205, 86, 252, 154, 231, 205, 86, 250, 70, 231, 205, 86, 218, 
-    239, 231, 205, 86, 218, 39, 231, 205, 86, 253, 179, 231, 205, 86, 211, 
-    232, 231, 205, 86, 235, 62, 231, 205, 86, 252, 184, 131, 86, 203, 252, 
-    184, 131, 86, 241, 43, 131, 86, 241, 42, 131, 86, 241, 41, 131, 86, 241, 
-    40, 131, 86, 241, 39, 131, 86, 241, 38, 131, 86, 241, 37, 131, 86, 241, 
-    36, 131, 86, 241, 35, 131, 86, 241, 34, 131, 86, 241, 33, 131, 86, 241, 
-    32, 131, 86, 241, 31, 131, 86, 241, 30, 131, 86, 241, 29, 131, 86, 241, 
-    28, 131, 86, 241, 27, 131, 86, 241, 26, 131, 86, 241, 25, 131, 86, 241, 
-    24, 131, 86, 241, 23, 131, 86, 241, 22, 131, 86, 241, 21, 131, 86, 241, 
-    20, 131, 86, 241, 19, 131, 86, 241, 18, 131, 86, 241, 17, 131, 86, 241, 
-    16, 131, 86, 241, 15, 131, 86, 241, 14, 131, 86, 241, 13, 131, 86, 241, 
-    12, 131, 86, 241, 11, 131, 86, 241, 10, 131, 86, 241, 9, 131, 86, 241, 8, 
-    131, 86, 241, 7, 131, 86, 241, 6, 131, 86, 241, 5, 131, 86, 241, 4, 131, 
-    86, 241, 3, 131, 86, 241, 2, 131, 86, 241, 1, 131, 86, 241, 0, 131, 86, 
-    240, 255, 131, 86, 240, 254, 131, 86, 240, 253, 131, 86, 240, 252, 131, 
-    86, 240, 251, 131, 86, 67, 252, 184, 131, 86, 213, 238, 131, 86, 213, 
-    237, 131, 86, 213, 236, 131, 86, 213, 235, 131, 86, 213, 234, 131, 86, 
-    213, 233, 131, 86, 213, 232, 131, 86, 213, 231, 131, 86, 213, 230, 131, 
-    86, 213, 229, 131, 86, 213, 228, 131, 86, 213, 227, 131, 86, 213, 226, 
-    131, 86, 213, 225, 131, 86, 213, 224, 131, 86, 213, 223, 131, 86, 213, 
-    222, 131, 86, 213, 221, 131, 86, 213, 220, 131, 86, 213, 219, 131, 86, 
-    213, 218, 131, 86, 213, 217, 131, 86, 213, 216, 131, 86, 213, 215, 131, 
-    86, 213, 214, 131, 86, 213, 213, 131, 86, 213, 212, 131, 86, 213, 211, 
-    131, 86, 213, 210, 131, 86, 213, 209, 131, 86, 213, 208, 131, 86, 213, 
-    207, 131, 86, 213, 206, 131, 86, 213, 205, 131, 86, 213, 204, 131, 86, 
-    213, 203, 131, 86, 213, 202, 131, 86, 213, 201, 131, 86, 213, 200, 131, 
-    86, 213, 199, 131, 86, 213, 198, 131, 86, 213, 197, 131, 86, 213, 196, 
-    131, 86, 213, 195, 131, 86, 213, 194, 131, 86, 213, 193, 131, 86, 213, 
-    192, 131, 86, 213, 191, 131, 86, 213, 190, 225, 33, 250, 243, 252, 184, 
-    225, 33, 250, 243, 255, 9, 64, 219, 15, 225, 33, 250, 243, 113, 64, 219, 
-    15, 225, 33, 250, 243, 134, 64, 219, 15, 225, 33, 250, 243, 244, 11, 64, 
-    219, 15, 225, 33, 250, 243, 244, 81, 64, 219, 15, 225, 33, 250, 243, 219, 
-    125, 64, 219, 15, 225, 33, 250, 243, 220, 122, 64, 219, 15, 225, 33, 250, 
-    243, 245, 193, 64, 219, 15, 225, 33, 250, 243, 228, 200, 64, 219, 15, 
-    225, 33, 250, 243, 216, 248, 64, 219, 15, 225, 33, 250, 243, 235, 139, 
-    64, 219, 15, 225, 33, 250, 243, 234, 31, 64, 219, 15, 225, 33, 250, 243, 
-    224, 15, 64, 219, 15, 225, 33, 250, 243, 234, 79, 64, 219, 15, 225, 33, 
-    250, 243, 255, 9, 64, 241, 225, 225, 33, 250, 243, 113, 64, 241, 225, 
-    225, 33, 250, 243, 134, 64, 241, 225, 225, 33, 250, 243, 244, 11, 64, 
-    241, 225, 225, 33, 250, 243, 244, 81, 64, 241, 225, 225, 33, 250, 243, 
-    219, 125, 64, 241, 225, 225, 33, 250, 243, 220, 122, 64, 241, 225, 225, 
-    33, 250, 243, 245, 193, 64, 241, 225, 225, 33, 250, 243, 228, 200, 64, 
-    241, 225, 225, 33, 250, 243, 216, 248, 64, 241, 225, 225, 33, 250, 243, 
-    235, 139, 64, 241, 225, 225, 33, 250, 243, 234, 31, 64, 241, 225, 225, 
-    33, 250, 243, 224, 15, 64, 241, 225, 225, 33, 250, 243, 234, 79, 64, 241, 
-    225, 225, 33, 250, 243, 255, 9, 64, 247, 247, 225, 33, 250, 243, 113, 64, 
-    247, 247, 225, 33, 250, 243, 134, 64, 247, 247, 225, 33, 250, 243, 244, 
-    11, 64, 247, 247, 225, 33, 250, 243, 244, 81, 64, 247, 247, 225, 33, 250, 
-    243, 219, 125, 64, 247, 247, 225, 33, 250, 243, 220, 122, 64, 247, 247, 
-    225, 33, 250, 243, 245, 193, 64, 247, 247, 225, 33, 250, 243, 228, 200, 
-    64, 247, 247, 225, 33, 250, 243, 216, 248, 64, 247, 247, 225, 33, 250, 
-    243, 235, 139, 64, 247, 247, 225, 33, 250, 243, 234, 31, 64, 247, 247, 
-    225, 33, 250, 243, 224, 15, 64, 247, 247, 225, 33, 250, 243, 234, 79, 64, 
-    247, 247, 225, 33, 250, 243, 85, 235, 62, 225, 33, 250, 243, 255, 9, 64, 
-    249, 242, 225, 33, 250, 243, 113, 64, 249, 242, 225, 33, 250, 243, 134, 
-    64, 249, 242, 225, 33, 250, 243, 244, 11, 64, 249, 242, 225, 33, 250, 
-    243, 244, 81, 64, 249, 242, 225, 33, 250, 243, 219, 125, 64, 249, 242, 
-    225, 33, 250, 243, 220, 122, 64, 249, 242, 225, 33, 250, 243, 245, 193, 
-    64, 249, 242, 225, 33, 250, 243, 228, 200, 64, 249, 242, 225, 33, 250, 
-    243, 216, 248, 64, 249, 242, 225, 33, 250, 243, 235, 139, 64, 249, 242, 
-    225, 33, 250, 243, 234, 31, 64, 249, 242, 225, 33, 250, 243, 224, 15, 64, 
-    249, 242, 225, 33, 250, 243, 234, 79, 64, 249, 242, 225, 33, 250, 243, 
-    71, 235, 62, 21, 210, 87, 243, 229, 218, 129, 21, 210, 87, 249, 219, 21, 
-    123, 249, 219, 21, 113, 249, 219, 21, 134, 249, 219, 21, 244, 11, 249, 
-    219, 21, 244, 81, 249, 219, 21, 219, 125, 249, 219, 21, 220, 122, 249, 
-    219, 21, 245, 193, 249, 219, 21, 228, 200, 249, 219, 88, 7, 6, 1, 61, 88, 
-    7, 6, 1, 253, 158, 88, 7, 6, 1, 251, 66, 88, 7, 6, 1, 249, 60, 88, 7, 6, 
-    1, 75, 88, 7, 6, 1, 245, 6, 88, 7, 6, 1, 243, 202, 88, 7, 6, 1, 242, 60, 
-    88, 7, 6, 1, 73, 88, 7, 6, 1, 235, 144, 88, 7, 6, 1, 235, 23, 88, 7, 6, 
-    1, 156, 88, 7, 6, 1, 193, 88, 7, 6, 1, 230, 25, 88, 7, 6, 1, 76, 88, 7, 
-    6, 1, 226, 105, 88, 7, 6, 1, 224, 96, 88, 7, 6, 1, 153, 88, 7, 6, 1, 222, 
-    91, 88, 7, 6, 1, 217, 152, 88, 7, 6, 1, 70, 88, 7, 6, 1, 214, 105, 88, 7, 
-    6, 1, 212, 98, 88, 7, 6, 1, 211, 178, 88, 7, 6, 1, 211, 117, 88, 7, 6, 1, 
-    210, 159, 216, 6, 220, 53, 251, 157, 7, 6, 1, 222, 91, 37, 32, 7, 6, 1, 
-    251, 66, 37, 32, 7, 6, 1, 153, 37, 250, 191, 37, 211, 180, 92, 7, 6, 1, 
-    61, 92, 7, 6, 1, 253, 158, 92, 7, 6, 1, 251, 66, 92, 7, 6, 1, 249, 60, 
-    92, 7, 6, 1, 75, 92, 7, 6, 1, 245, 6, 92, 7, 6, 1, 243, 202, 92, 7, 6, 1, 
-    242, 60, 92, 7, 6, 1, 73, 92, 7, 6, 1, 235, 144, 92, 7, 6, 1, 235, 23, 
-    92, 7, 6, 1, 156, 92, 7, 6, 1, 193, 92, 7, 6, 1, 230, 25, 92, 7, 6, 1, 
-    76, 92, 7, 6, 1, 226, 105, 92, 7, 6, 1, 224, 96, 92, 7, 6, 1, 153, 92, 7, 
-    6, 1, 222, 91, 92, 7, 6, 1, 217, 152, 92, 7, 6, 1, 70, 92, 7, 6, 1, 214, 
-    105, 92, 7, 6, 1, 212, 98, 92, 7, 6, 1, 211, 178, 92, 7, 6, 1, 211, 117, 
-    92, 7, 6, 1, 210, 159, 92, 240, 201, 92, 230, 49, 92, 221, 183, 92, 218, 
-    226, 92, 224, 218, 92, 212, 23, 152, 37, 7, 6, 1, 61, 152, 37, 7, 6, 1, 
-    253, 158, 152, 37, 7, 6, 1, 251, 66, 152, 37, 7, 6, 1, 249, 60, 152, 37, 
-    7, 6, 1, 75, 152, 37, 7, 6, 1, 245, 6, 152, 37, 7, 6, 1, 243, 202, 152, 
-    37, 7, 6, 1, 242, 60, 152, 37, 7, 6, 1, 73, 152, 37, 7, 6, 1, 235, 144, 
-    152, 37, 7, 6, 1, 235, 23, 152, 37, 7, 6, 1, 156, 152, 37, 7, 6, 1, 193, 
-    152, 37, 7, 6, 1, 230, 25, 152, 37, 7, 6, 1, 76, 152, 37, 7, 6, 1, 226, 
-    105, 152, 37, 7, 6, 1, 224, 96, 152, 37, 7, 6, 1, 153, 152, 37, 7, 6, 1, 
-    222, 91, 152, 37, 7, 6, 1, 217, 152, 152, 37, 7, 6, 1, 70, 152, 37, 7, 6, 
-    1, 214, 105, 152, 37, 7, 6, 1, 212, 98, 152, 37, 7, 6, 1, 211, 178, 152, 
-    37, 7, 6, 1, 211, 117, 152, 37, 7, 6, 1, 210, 159, 223, 157, 231, 97, 50, 
-    223, 157, 231, 94, 50, 152, 92, 7, 6, 1, 61, 152, 92, 7, 6, 1, 253, 158, 
-    152, 92, 7, 6, 1, 251, 66, 152, 92, 7, 6, 1, 249, 60, 152, 92, 7, 6, 1, 
-    75, 152, 92, 7, 6, 1, 245, 6, 152, 92, 7, 6, 1, 243, 202, 152, 92, 7, 6, 
-    1, 242, 60, 152, 92, 7, 6, 1, 73, 152, 92, 7, 6, 1, 235, 144, 152, 92, 7, 
-    6, 1, 235, 23, 152, 92, 7, 6, 1, 156, 152, 92, 7, 6, 1, 193, 152, 92, 7, 
-    6, 1, 230, 25, 152, 92, 7, 6, 1, 76, 152, 92, 7, 6, 1, 226, 105, 152, 92, 
-    7, 6, 1, 224, 96, 152, 92, 7, 6, 1, 153, 152, 92, 7, 6, 1, 222, 91, 152, 
-    92, 7, 6, 1, 217, 152, 152, 92, 7, 6, 1, 70, 152, 92, 7, 6, 1, 214, 105, 
-    152, 92, 7, 6, 1, 212, 98, 152, 92, 7, 6, 1, 211, 178, 152, 92, 7, 6, 1, 
-    211, 117, 152, 92, 7, 6, 1, 210, 159, 249, 128, 152, 92, 7, 6, 1, 226, 
-    105, 152, 92, 240, 113, 152, 92, 190, 152, 92, 206, 152, 92, 255, 25, 
-    152, 92, 212, 23, 42, 247, 164, 92, 250, 23, 92, 249, 170, 92, 243, 252, 
-    92, 240, 105, 92, 229, 86, 92, 229, 79, 92, 226, 214, 92, 219, 35, 92, 
-    120, 2, 245, 31, 78, 92, 213, 119, 223, 103, 235, 239, 16, 1, 61, 223, 
-    103, 235, 239, 16, 1, 253, 158, 223, 103, 235, 239, 16, 1, 251, 66, 223, 
-    103, 235, 239, 16, 1, 249, 60, 223, 103, 235, 239, 16, 1, 75, 223, 103, 
-    235, 239, 16, 1, 245, 6, 223, 103, 235, 239, 16, 1, 243, 202, 223, 103, 
-    235, 239, 16, 1, 242, 60, 223, 103, 235, 239, 16, 1, 73, 223, 103, 235, 
-    239, 16, 1, 235, 144, 223, 103, 235, 239, 16, 1, 235, 23, 223, 103, 235, 
-    239, 16, 1, 156, 223, 103, 235, 239, 16, 1, 193, 223, 103, 235, 239, 16, 
-    1, 230, 25, 223, 103, 235, 239, 16, 1, 76, 223, 103, 235, 239, 16, 1, 
-    226, 105, 223, 103, 235, 239, 16, 1, 224, 96, 223, 103, 235, 239, 16, 1, 
-    153, 223, 103, 235, 239, 16, 1, 222, 91, 223, 103, 235, 239, 16, 1, 217, 
-    152, 223, 103, 235, 239, 16, 1, 70, 223, 103, 235, 239, 16, 1, 214, 105, 
-    223, 103, 235, 239, 16, 1, 212, 98, 223, 103, 235, 239, 16, 1, 211, 178, 
-    223, 103, 235, 239, 16, 1, 211, 117, 223, 103, 235, 239, 16, 1, 210, 159, 
-    42, 141, 241, 63, 92, 56, 234, 18, 92, 56, 206, 92, 9, 214, 177, 238, 50, 
-    92, 9, 214, 177, 238, 54, 92, 9, 214, 177, 238, 62, 92, 56, 248, 90, 92, 
-    9, 214, 177, 238, 69, 92, 9, 214, 177, 238, 56, 92, 9, 214, 177, 238, 28, 
-    92, 9, 214, 177, 238, 55, 92, 9, 214, 177, 238, 68, 92, 9, 214, 177, 238, 
-    42, 92, 9, 214, 177, 238, 35, 92, 9, 214, 177, 238, 44, 92, 9, 214, 177, 
-    238, 65, 92, 9, 214, 177, 238, 51, 92, 9, 214, 177, 238, 67, 92, 9, 214, 
-    177, 238, 43, 92, 9, 214, 177, 238, 66, 92, 9, 214, 177, 238, 29, 92, 9, 
-    214, 177, 238, 34, 92, 9, 214, 177, 238, 27, 92, 9, 214, 177, 238, 57, 
-    92, 9, 214, 177, 238, 59, 92, 9, 214, 177, 238, 37, 92, 9, 214, 177, 238, 
-    48, 92, 9, 214, 177, 238, 46, 92, 9, 214, 177, 238, 72, 92, 9, 214, 177, 
-    238, 71, 92, 9, 214, 177, 238, 25, 92, 9, 214, 177, 238, 52, 92, 9, 214, 
-    177, 238, 70, 92, 9, 214, 177, 238, 61, 92, 9, 214, 177, 238, 47, 92, 9, 
-    214, 177, 238, 26, 92, 9, 214, 177, 238, 49, 92, 9, 214, 177, 238, 31, 
-    92, 9, 214, 177, 238, 30, 92, 9, 214, 177, 238, 60, 92, 9, 214, 177, 238, 
-    38, 92, 9, 214, 177, 238, 40, 92, 9, 214, 177, 238, 41, 92, 9, 214, 177, 
-    238, 33, 92, 9, 214, 177, 238, 64, 92, 9, 214, 177, 238, 58, 216, 6, 220, 
-    53, 251, 157, 9, 214, 177, 238, 39, 216, 6, 220, 53, 251, 157, 9, 214, 
-    177, 238, 71, 216, 6, 220, 53, 251, 157, 9, 214, 177, 238, 69, 216, 6, 
-    220, 53, 251, 157, 9, 214, 177, 238, 53, 216, 6, 220, 53, 251, 157, 9, 
-    214, 177, 238, 36, 216, 6, 220, 53, 251, 157, 9, 214, 177, 238, 49, 216, 
-    6, 220, 53, 251, 157, 9, 214, 177, 238, 32, 216, 6, 220, 53, 251, 157, 9, 
-    214, 177, 238, 63, 216, 6, 220, 53, 251, 157, 9, 214, 177, 238, 45, 37, 
-    154, 254, 245, 37, 154, 255, 12, 249, 71, 244, 42, 250, 0, 214, 194, 228, 
-    213, 2, 218, 153, 218, 33, 117, 230, 114, 218, 32, 250, 26, 253, 207, 
-    246, 54, 218, 31, 117, 251, 118, 223, 158, 251, 140, 253, 207, 228, 212, 
-    212, 41, 212, 35, 213, 131, 230, 195, 212, 25, 245, 224, 242, 181, 245, 
-    45, 245, 224, 242, 181, 254, 128, 245, 224, 242, 181, 253, 225, 242, 181, 
-    2, 231, 51, 166, 230, 129, 87, 212, 27, 249, 137, 230, 129, 87, 244, 92, 
-    224, 22, 230, 129, 87, 212, 27, 242, 210, 230, 129, 87, 243, 229, 230, 
-    129, 87, 212, 52, 242, 210, 230, 129, 87, 233, 80, 224, 22, 230, 129, 87, 
-    212, 52, 249, 137, 230, 129, 87, 249, 137, 230, 128, 166, 230, 129, 2, 
-    244, 190, 244, 92, 224, 22, 230, 129, 2, 244, 190, 233, 80, 224, 22, 230, 
-    129, 2, 244, 190, 243, 229, 230, 129, 2, 244, 190, 218, 38, 2, 244, 190, 
-    242, 179, 218, 156, 219, 255, 218, 156, 250, 116, 221, 168, 245, 39, 215, 
-    235, 248, 84, 215, 235, 226, 59, 215, 235, 251, 27, 215, 109, 250, 118, 
-    251, 210, 222, 191, 241, 179, 218, 36, 251, 210, 245, 228, 64, 231, 194, 
-    245, 228, 64, 223, 31, 241, 204, 244, 11, 233, 54, 249, 246, 231, 170, 
-    233, 53, 244, 176, 233, 53, 233, 54, 244, 47, 236, 0, 211, 239, 230, 58, 
-    216, 34, 253, 191, 242, 143, 231, 67, 212, 39, 217, 57, 233, 26, 252, 
-    149, 225, 62, 223, 111, 254, 54, 242, 127, 254, 54, 225, 217, 225, 218, 
-    250, 119, 218, 114, 242, 23, 219, 90, 64, 225, 44, 231, 87, 226, 197, 
-    251, 194, 224, 229, 233, 36, 223, 32, 249, 142, 223, 32, 252, 159, 249, 
-    173, 223, 31, 249, 95, 22, 223, 31, 218, 141, 251, 167, 219, 14, 251, 
-    151, 243, 251, 243, 247, 222, 207, 217, 246, 224, 231, 248, 175, 226, 
-    236, 218, 7, 243, 248, 219, 230, 244, 91, 251, 21, 2, 217, 239, 248, 35, 
-    219, 52, 240, 112, 249, 141, 220, 70, 240, 111, 240, 112, 249, 141, 246, 
-    108, 249, 172, 250, 84, 130, 250, 254, 232, 141, 249, 88, 241, 55, 224, 
-    233, 219, 240, 252, 36, 251, 163, 224, 234, 64, 244, 33, 249, 171, 244, 
-    24, 22, 234, 32, 217, 19, 211, 230, 242, 13, 222, 12, 251, 177, 22, 249, 
-    102, 211, 237, 242, 184, 249, 235, 242, 184, 215, 193, 246, 90, 252, 62, 
-    230, 93, 250, 7, 252, 62, 230, 92, 252, 187, 251, 176, 223, 33, 211, 201, 
-    224, 195, 251, 235, 251, 20, 235, 138, 250, 77, 215, 235, 244, 162, 250, 
-    76, 244, 94, 244, 95, 219, 12, 252, 158, 225, 250, 224, 244, 249, 204, 
-    252, 159, 217, 59, 215, 235, 249, 128, 244, 67, 225, 63, 248, 81, 235, 
-    131, 247, 131, 250, 232, 218, 113, 211, 240, 250, 98, 230, 129, 213, 164, 
-    250, 162, 221, 199, 221, 224, 242, 148, 250, 251, 250, 233, 240, 245, 
-    244, 130, 212, 0, 222, 200, 249, 236, 244, 86, 225, 2, 22, 244, 90, 230, 
-    227, 230, 108, 251, 10, 250, 39, 241, 232, 253, 241, 226, 62, 216, 14, 
-    241, 251, 250, 29, 216, 242, 216, 113, 250, 20, 251, 202, 225, 177, 253, 
-    240, 213, 172, 243, 110, 247, 197, 241, 156, 219, 84, 231, 234, 251, 245, 
-    243, 111, 247, 240, 251, 166, 244, 52, 225, 33, 250, 241, 28, 228, 47, 
-    230, 85, 28, 228, 42, 221, 212, 242, 99, 28, 234, 137, 215, 190, 213, 
-    154, 28, 221, 192, 222, 124, 220, 11, 2, 221, 227, 216, 244, 223, 178, 
-    22, 252, 159, 219, 105, 22, 219, 105, 251, 187, 252, 123, 22, 241, 49, 
-    250, 120, 244, 73, 219, 63, 222, 125, 218, 12, 215, 194, 240, 246, 223, 
-    179, 254, 129, 244, 31, 222, 136, 244, 31, 217, 241, 240, 235, 251, 119, 
-    240, 235, 2, 243, 94, 226, 229, 251, 119, 235, 131, 224, 239, 226, 228, 
-    245, 44, 224, 239, 226, 228, 240, 244, 252, 145, 253, 181, 216, 252, 231, 
-    234, 240, 240, 232, 111, 240, 240, 249, 176, 218, 125, 221, 198, 248, 43, 
-    218, 125, 244, 180, 235, 149, 233, 89, 235, 131, 250, 226, 245, 44, 250, 
-    226, 223, 141, 230, 112, 226, 114, 212, 41, 251, 123, 249, 145, 216, 106, 
-    233, 18, 223, 180, 250, 224, 246, 96, 249, 135, 212, 3, 219, 70, 219, 68, 
-    240, 245, 223, 153, 242, 170, 220, 57, 230, 145, 222, 194, 250, 108, 247, 
-    136, 225, 73, 251, 203, 245, 169, 226, 238, 218, 252, 220, 52, 251, 122, 
-    254, 92, 241, 54, 233, 121, 252, 60, 244, 90, 215, 193, 244, 90, 251, 
-    209, 215, 91, 241, 249, 250, 109, 252, 187, 250, 109, 243, 242, 252, 187, 
-    250, 109, 251, 237, 225, 195, 234, 26, 224, 248, 246, 87, 251, 11, 252, 
-    177, 251, 11, 247, 130, 230, 113, 244, 190, 249, 146, 244, 190, 216, 107, 
-    244, 190, 223, 181, 244, 190, 250, 225, 244, 190, 246, 97, 244, 190, 218, 
-    241, 212, 3, 240, 246, 244, 190, 230, 146, 244, 190, 247, 137, 244, 190, 
-    225, 74, 244, 190, 243, 245, 244, 190, 242, 20, 244, 190, 211, 224, 244, 
-    190, 252, 71, 244, 190, 226, 45, 244, 190, 225, 74, 228, 53, 225, 232, 
-    224, 186, 245, 13, 245, 227, 228, 53, 230, 110, 216, 19, 71, 120, 225, 7, 
-    252, 182, 235, 242, 71, 124, 225, 7, 252, 182, 235, 242, 71, 43, 225, 7, 
-    252, 182, 235, 242, 71, 44, 225, 7, 252, 182, 235, 242, 244, 84, 242, 16, 
-    50, 212, 33, 242, 16, 50, 226, 215, 242, 16, 50, 216, 135, 120, 50, 216, 
-    135, 124, 50, 250, 19, 242, 11, 50, 204, 242, 11, 50, 249, 123, 211, 220, 
-    241, 251, 245, 14, 229, 104, 217, 151, 235, 125, 246, 92, 234, 82, 251, 
-    247, 211, 220, 249, 249, 224, 127, 242, 14, 224, 230, 231, 177, 220, 4, 
-    253, 203, 220, 4, 241, 164, 220, 4, 211, 220, 221, 240, 211, 220, 251, 
-    186, 244, 29, 251, 90, 236, 0, 219, 169, 251, 89, 236, 0, 219, 169, 251, 
-    162, 242, 194, 231, 185, 211, 221, 244, 174, 231, 186, 22, 211, 222, 241, 
-    60, 242, 10, 113, 231, 59, 241, 60, 242, 10, 113, 211, 219, 241, 60, 242, 
-    10, 224, 255, 226, 227, 211, 222, 2, 251, 106, 245, 225, 251, 141, 2, 
-    213, 246, 225, 168, 2, 251, 212, 242, 34, 231, 186, 2, 242, 110, 225, 
-    109, 231, 174, 231, 186, 2, 215, 97, 226, 208, 231, 185, 226, 208, 211, 
-    221, 252, 186, 249, 190, 211, 205, 224, 189, 235, 131, 226, 223, 235, 
-    131, 242, 169, 242, 222, 252, 187, 254, 113, 245, 18, 254, 160, 254, 161, 
-    230, 136, 236, 5, 219, 100, 235, 232, 248, 34, 225, 167, 242, 105, 248, 
-    179, 232, 201, 229, 211, 224, 254, 244, 191, 231, 142, 242, 33, 252, 138, 
-    225, 1, 217, 171, 225, 66, 234, 64, 78, 232, 111, 233, 10, 222, 233, 243, 
-    54, 218, 131, 234, 63, 251, 171, 249, 148, 2, 241, 227, 212, 19, 252, 69, 
-    241, 227, 251, 135, 241, 227, 113, 241, 225, 219, 10, 241, 227, 242, 120, 
-    241, 227, 241, 228, 2, 74, 251, 208, 241, 227, 242, 127, 241, 227, 211, 
-    42, 241, 227, 224, 128, 241, 227, 241, 228, 2, 223, 33, 223, 44, 241, 
-    225, 241, 228, 248, 81, 247, 249, 220, 82, 2, 115, 59, 235, 215, 245, 
-    172, 192, 251, 116, 254, 112, 87, 251, 195, 219, 92, 87, 249, 228, 87, 
-    218, 246, 217, 248, 87, 246, 85, 248, 157, 87, 225, 67, 64, 224, 249, 
-    244, 61, 252, 3, 247, 165, 87, 219, 3, 252, 158, 216, 149, 252, 158, 71, 
-    244, 51, 240, 211, 225, 5, 87, 230, 149, 252, 172, 249, 98, 245, 32, 114, 
-    247, 132, 50, 249, 139, 250, 242, 252, 144, 2, 211, 40, 50, 252, 144, 2, 
-    247, 132, 50, 252, 144, 2, 245, 47, 50, 252, 144, 2, 224, 228, 50, 230, 
-    149, 2, 211, 235, 250, 138, 2, 214, 153, 215, 231, 22, 211, 40, 50, 221, 
-    178, 225, 166, 249, 208, 251, 139, 230, 186, 244, 56, 247, 185, 226, 161, 
-    247, 190, 246, 49, 244, 107, 244, 40, 204, 244, 107, 244, 40, 226, 76, 2, 
-    249, 100, 226, 76, 244, 183, 214, 163, 251, 16, 217, 18, 251, 16, 250, 
-    243, 235, 242, 250, 138, 2, 214, 153, 215, 230, 250, 138, 2, 246, 104, 
-    215, 230, 252, 141, 250, 137, 250, 6, 224, 123, 222, 185, 224, 123, 226, 
-    19, 218, 121, 222, 131, 215, 222, 222, 131, 251, 191, 217, 91, 233, 51, 
-    228, 45, 228, 46, 2, 248, 80, 249, 147, 250, 0, 251, 192, 204, 251, 192, 
-    242, 127, 251, 192, 251, 208, 251, 192, 226, 157, 251, 192, 251, 189, 
-    229, 205, 252, 175, 221, 186, 231, 60, 217, 1, 223, 123, 226, 74, 244, 
-    159, 231, 234, 221, 223, 254, 89, 224, 145, 254, 252, 232, 113, 250, 127, 
-    231, 72, 226, 129, 215, 238, 235, 252, 215, 238, 226, 82, 246, 24, 87, 
-    235, 249, 245, 119, 245, 120, 2, 246, 104, 80, 48, 250, 0, 231, 200, 2, 
-    232, 107, 244, 73, 250, 0, 231, 200, 2, 223, 157, 244, 73, 204, 231, 200, 
-    2, 223, 157, 244, 73, 204, 231, 200, 2, 232, 107, 244, 73, 224, 236, 224, 
-    237, 240, 248, 229, 84, 230, 159, 225, 117, 230, 159, 225, 118, 2, 97, 
-    80, 253, 207, 233, 46, 213, 175, 230, 158, 230, 159, 225, 118, 226, 230, 
-    228, 75, 230, 159, 225, 116, 254, 90, 2, 252, 129, 251, 10, 213, 172, 
-    251, 10, 216, 254, 223, 173, 213, 171, 215, 60, 97, 253, 247, 250, 2, 97, 
-    22, 140, 204, 250, 36, 253, 247, 250, 2, 97, 22, 140, 204, 250, 36, 253, 
-    248, 2, 37, 123, 226, 120, 250, 2, 246, 104, 22, 214, 153, 204, 250, 36, 
-    253, 247, 254, 88, 246, 104, 22, 214, 153, 204, 250, 36, 253, 247, 121, 
-    251, 138, 87, 125, 251, 138, 87, 219, 7, 2, 251, 4, 91, 219, 6, 219, 7, 
-    2, 123, 219, 31, 212, 35, 219, 7, 2, 134, 219, 31, 212, 34, 252, 115, 
-    245, 172, 225, 27, 233, 42, 231, 211, 242, 184, 222, 247, 231, 211, 242, 
-    184, 232, 152, 2, 235, 225, 225, 199, 250, 0, 232, 152, 2, 234, 138, 234, 
-    138, 232, 151, 204, 232, 151, 252, 44, 252, 45, 2, 251, 4, 91, 251, 190, 
-    232, 204, 87, 223, 174, 251, 86, 252, 185, 2, 140, 80, 48, 245, 143, 2, 
-    140, 80, 48, 226, 197, 2, 245, 31, 164, 2, 43, 44, 80, 48, 219, 39, 2, 
-    97, 80, 48, 216, 14, 2, 214, 153, 80, 48, 228, 75, 123, 214, 184, 245, 
-    191, 87, 234, 136, 216, 247, 235, 219, 16, 31, 7, 6, 233, 9, 235, 219, 
-    16, 31, 7, 4, 233, 9, 235, 219, 16, 31, 227, 199, 235, 219, 16, 31, 217, 
-    183, 235, 219, 16, 31, 7, 233, 9, 244, 96, 245, 172, 216, 9, 211, 199, 
-    242, 21, 227, 182, 22, 251, 197, 241, 66, 225, 50, 230, 226, 216, 255, 
-    249, 114, 252, 159, 219, 125, 225, 9, 218, 157, 2, 230, 224, 247, 120, 
-    235, 131, 16, 31, 252, 57, 215, 220, 245, 156, 85, 42, 251, 86, 71, 42, 
-    251, 86, 233, 85, 223, 111, 250, 35, 233, 85, 251, 208, 250, 35, 233, 85, 
-    226, 157, 247, 248, 233, 85, 251, 208, 247, 248, 4, 226, 157, 247, 248, 
-    4, 251, 208, 247, 248, 214, 162, 223, 111, 215, 225, 246, 105, 223, 111, 
-    215, 225, 214, 162, 4, 223, 111, 215, 225, 246, 105, 4, 223, 111, 215, 
-    225, 37, 249, 131, 224, 252, 249, 131, 224, 253, 2, 242, 26, 51, 249, 
-    131, 224, 252, 228, 49, 43, 220, 153, 2, 134, 247, 118, 250, 4, 244, 191, 
-    123, 226, 242, 250, 4, 244, 191, 113, 226, 242, 250, 4, 244, 191, 134, 
-    226, 242, 250, 4, 244, 191, 244, 11, 226, 242, 250, 4, 244, 191, 244, 81, 
-    226, 242, 250, 4, 244, 191, 219, 125, 226, 242, 250, 4, 244, 191, 220, 
-    122, 226, 242, 250, 4, 244, 191, 245, 193, 226, 242, 250, 4, 244, 191, 
-    228, 200, 226, 242, 250, 4, 244, 191, 216, 248, 226, 242, 250, 4, 244, 
-    191, 245, 168, 226, 242, 250, 4, 244, 191, 215, 77, 226, 242, 250, 4, 
-    244, 191, 226, 192, 250, 4, 244, 191, 215, 56, 250, 4, 244, 191, 216, 
-    140, 250, 4, 244, 191, 244, 7, 250, 4, 244, 191, 244, 79, 250, 4, 244, 
-    191, 219, 121, 250, 4, 244, 191, 220, 121, 250, 4, 244, 191, 245, 192, 
-    250, 4, 244, 191, 228, 199, 250, 4, 244, 191, 216, 246, 250, 4, 244, 191, 
-    245, 166, 250, 4, 244, 191, 215, 75, 230, 117, 243, 230, 216, 36, 216, 2, 
-    218, 148, 64, 232, 239, 219, 170, 64, 235, 132, 230, 106, 242, 124, 244, 
-    190, 242, 124, 244, 191, 2, 219, 74, 245, 13, 244, 191, 2, 217, 14, 64, 
-    235, 53, 219, 74, 244, 191, 2, 204, 230, 110, 219, 74, 244, 191, 2, 204, 
-    230, 111, 22, 219, 74, 245, 13, 219, 74, 244, 191, 2, 204, 230, 111, 22, 
-    249, 230, 217, 247, 219, 74, 244, 191, 2, 204, 230, 111, 22, 216, 104, 
-    245, 13, 219, 74, 244, 191, 2, 242, 25, 219, 74, 244, 191, 2, 240, 247, 
-    211, 233, 244, 190, 219, 74, 244, 191, 2, 219, 74, 245, 13, 244, 191, 
-    221, 217, 248, 62, 244, 33, 223, 88, 244, 190, 219, 74, 244, 191, 2, 241, 
-    226, 245, 13, 219, 74, 244, 191, 2, 218, 34, 219, 73, 244, 190, 229, 87, 
-    244, 190, 245, 23, 244, 190, 214, 188, 244, 190, 244, 191, 2, 249, 230, 
-    217, 247, 225, 192, 244, 190, 249, 201, 244, 190, 249, 202, 244, 190, 
-    234, 62, 244, 190, 244, 191, 216, 137, 115, 234, 63, 234, 62, 244, 191, 
-    2, 219, 74, 245, 13, 234, 62, 244, 191, 2, 250, 0, 245, 13, 244, 191, 2, 
-    218, 88, 216, 19, 244, 191, 2, 218, 88, 216, 20, 22, 211, 233, 245, 15, 
-    244, 191, 2, 218, 88, 216, 20, 22, 216, 104, 245, 13, 247, 192, 244, 190, 
-    211, 204, 244, 190, 254, 108, 244, 190, 224, 227, 244, 190, 249, 116, 
-    244, 190, 225, 170, 244, 190, 244, 191, 2, 232, 126, 64, 215, 204, 247, 
-    192, 251, 88, 223, 88, 244, 190, 243, 239, 244, 191, 2, 204, 230, 110, 
-    254, 106, 244, 190, 244, 152, 244, 190, 212, 20, 244, 190, 219, 91, 244, 
-    190, 216, 71, 244, 190, 242, 125, 244, 190, 232, 114, 249, 116, 244, 190, 
-    244, 191, 2, 204, 230, 110, 240, 203, 244, 190, 244, 191, 2, 204, 230, 
-    111, 22, 249, 230, 217, 247, 244, 191, 221, 190, 236, 0, 244, 153, 253, 
-    213, 244, 190, 244, 49, 244, 190, 219, 92, 244, 190, 247, 165, 244, 190, 
-    244, 191, 211, 230, 230, 110, 244, 191, 2, 231, 84, 231, 144, 242, 124, 
-    250, 225, 244, 191, 2, 219, 74, 245, 13, 250, 225, 244, 191, 2, 217, 14, 
-    64, 235, 53, 219, 74, 250, 225, 244, 191, 2, 204, 230, 110, 219, 74, 250, 
-    225, 244, 191, 2, 241, 226, 245, 13, 250, 225, 244, 191, 2, 211, 196, 
-    219, 75, 234, 62, 250, 225, 244, 191, 2, 250, 0, 245, 13, 224, 227, 250, 
-    225, 244, 190, 249, 116, 250, 225, 244, 190, 212, 20, 250, 225, 244, 190, 
-    244, 191, 2, 228, 75, 242, 163, 243, 34, 244, 191, 2, 226, 215, 243, 34, 
-    225, 168, 251, 168, 248, 75, 221, 169, 230, 145, 241, 229, 230, 145, 219, 
-    8, 230, 145, 242, 5, 225, 168, 223, 156, 123, 242, 15, 225, 168, 223, 
-    156, 251, 178, 242, 11, 236, 0, 250, 179, 225, 168, 243, 238, 225, 168, 
-    2, 224, 227, 244, 190, 225, 168, 2, 244, 41, 242, 10, 222, 203, 241, 214, 
-    218, 143, 232, 149, 223, 162, 250, 244, 241, 162, 215, 248, 241, 162, 
-    215, 249, 2, 251, 114, 228, 53, 215, 248, 231, 32, 192, 223, 163, 218, 
-    149, 215, 246, 215, 247, 250, 244, 251, 92, 226, 194, 251, 92, 215, 201, 
-    251, 93, 218, 129, 230, 187, 254, 130, 244, 97, 245, 137, 224, 255, 250, 
-    244, 226, 194, 224, 255, 250, 244, 217, 32, 226, 194, 217, 32, 253, 180, 
-    226, 194, 253, 180, 223, 118, 213, 247, 248, 58, 215, 192, 253, 242, 232, 
-    117, 215, 254, 230, 139, 230, 116, 223, 161, 218, 6, 223, 161, 230, 116, 
-    251, 28, 254, 229, 215, 245, 220, 16, 222, 182, 219, 1, 203, 215, 252, 
-    232, 230, 67, 215, 252, 232, 230, 249, 190, 50, 224, 255, 250, 229, 223, 
-    44, 232, 230, 215, 222, 244, 74, 226, 197, 224, 238, 247, 123, 228, 75, 
-    245, 125, 50, 219, 72, 87, 228, 75, 219, 72, 87, 224, 122, 232, 193, 236, 
-    0, 235, 157, 225, 41, 87, 247, 146, 228, 52, 232, 193, 87, 224, 232, 212, 
-    41, 87, 228, 66, 212, 41, 87, 252, 2, 228, 75, 252, 1, 252, 0, 230, 116, 
-    252, 0, 225, 213, 228, 75, 225, 212, 250, 100, 249, 124, 231, 56, 87, 
-    211, 218, 87, 223, 59, 252, 187, 87, 216, 37, 212, 41, 249, 253, 219, 
-    234, 252, 118, 252, 116, 225, 242, 249, 177, 249, 86, 252, 169, 250, 22, 
-    43, 232, 90, 108, 16, 31, 224, 3, 108, 16, 31, 254, 192, 108, 16, 31, 
-    244, 96, 108, 16, 31, 245, 223, 108, 16, 31, 212, 40, 108, 16, 31, 254, 
-    43, 108, 16, 31, 254, 44, 223, 105, 108, 16, 31, 254, 44, 223, 104, 108, 
-    16, 31, 254, 44, 213, 143, 108, 16, 31, 254, 44, 213, 142, 108, 16, 31, 
+    211, 8, 95, 25, 5, 254, 244, 95, 25, 5, 254, 240, 95, 25, 5, 245, 87, 95, 
+    25, 5, 222, 184, 245, 87, 95, 25, 5, 245, 93, 95, 25, 5, 222, 184, 245, 
+    93, 95, 25, 5, 254, 202, 95, 25, 5, 245, 196, 95, 25, 5, 253, 193, 95, 
+    25, 5, 226, 135, 95, 25, 5, 230, 26, 95, 25, 5, 229, 80, 95, 138, 222, 
+    252, 95, 138, 216, 15, 222, 252, 95, 138, 48, 95, 138, 51, 95, 1, 216, 
+    29, 95, 1, 216, 28, 95, 1, 216, 27, 95, 1, 216, 26, 95, 1, 216, 25, 95, 
+    1, 216, 24, 95, 1, 216, 23, 95, 1, 223, 107, 216, 30, 95, 1, 223, 107, 
+    216, 29, 95, 1, 223, 107, 216, 27, 95, 1, 223, 107, 216, 26, 95, 1, 223, 
+    107, 216, 25, 95, 1, 223, 107, 216, 23, 56, 1, 254, 24, 75, 141, 1, 254, 
+    24, 211, 47, 49, 28, 16, 224, 155, 49, 28, 16, 248, 159, 49, 28, 16, 225, 
+    176, 49, 28, 16, 226, 114, 245, 179, 49, 28, 16, 226, 114, 247, 202, 49, 
+    28, 16, 214, 16, 245, 179, 49, 28, 16, 214, 16, 247, 202, 49, 28, 16, 
+    234, 198, 49, 28, 16, 217, 170, 49, 28, 16, 226, 10, 49, 28, 16, 210, 
+    217, 49, 28, 16, 210, 218, 247, 202, 49, 28, 16, 233, 235, 49, 28, 16, 
+    254, 69, 245, 179, 49, 28, 16, 245, 27, 245, 179, 49, 28, 16, 217, 3, 49, 
+    28, 16, 234, 162, 49, 28, 16, 254, 59, 49, 28, 16, 254, 60, 247, 202, 49, 
+    28, 16, 217, 176, 49, 28, 16, 216, 160, 49, 28, 16, 226, 207, 254, 22, 
+    49, 28, 16, 242, 160, 254, 22, 49, 28, 16, 224, 154, 49, 28, 16, 250, 
+    150, 49, 28, 16, 214, 6, 49, 28, 16, 235, 165, 254, 22, 49, 28, 16, 234, 
+    164, 254, 22, 49, 28, 16, 234, 163, 254, 22, 49, 28, 16, 221, 214, 49, 
+    28, 16, 226, 1, 49, 28, 16, 218, 147, 254, 62, 49, 28, 16, 226, 113, 254, 
+    22, 49, 28, 16, 214, 15, 254, 22, 49, 28, 16, 254, 63, 254, 22, 49, 28, 
+    16, 254, 57, 49, 28, 16, 234, 38, 49, 28, 16, 223, 47, 49, 28, 16, 225, 
+    107, 254, 22, 49, 28, 16, 216, 84, 49, 28, 16, 254, 122, 49, 28, 16, 221, 
+    160, 49, 28, 16, 217, 179, 254, 22, 49, 28, 16, 217, 179, 231, 41, 218, 
+    145, 49, 28, 16, 226, 108, 254, 22, 49, 28, 16, 216, 191, 49, 28, 16, 
+    233, 28, 49, 28, 16, 246, 42, 49, 28, 16, 215, 228, 49, 28, 16, 216, 233, 
+    49, 28, 16, 233, 238, 49, 28, 16, 254, 69, 245, 27, 229, 96, 49, 28, 16, 
+    243, 237, 254, 22, 49, 28, 16, 236, 13, 49, 28, 16, 215, 200, 254, 22, 
+    49, 28, 16, 234, 201, 215, 199, 49, 28, 16, 225, 201, 49, 28, 16, 224, 
+    159, 49, 28, 16, 234, 12, 49, 28, 16, 250, 81, 254, 22, 49, 28, 16, 223, 
+    147, 49, 28, 16, 226, 13, 254, 22, 49, 28, 16, 226, 11, 254, 22, 49, 28, 
+    16, 240, 110, 49, 28, 16, 229, 204, 49, 28, 16, 225, 157, 49, 28, 16, 
+    234, 13, 254, 150, 49, 28, 16, 215, 200, 254, 150, 49, 28, 16, 218, 124, 
+    49, 28, 16, 242, 124, 49, 28, 16, 235, 165, 229, 96, 49, 28, 16, 226, 
+    207, 229, 96, 49, 28, 16, 226, 114, 229, 96, 49, 28, 16, 225, 156, 49, 
+    28, 16, 233, 255, 49, 28, 16, 225, 155, 49, 28, 16, 233, 237, 49, 28, 16, 
+    225, 202, 229, 96, 49, 28, 16, 234, 163, 229, 97, 254, 97, 49, 28, 16, 
+    234, 164, 229, 97, 254, 97, 49, 28, 16, 210, 215, 49, 28, 16, 254, 60, 
+    229, 96, 49, 28, 16, 254, 61, 217, 177, 229, 96, 49, 28, 16, 210, 216, 
+    49, 28, 16, 233, 236, 49, 28, 16, 245, 174, 49, 28, 16, 250, 151, 49, 28, 
+    16, 230, 199, 235, 164, 49, 28, 16, 214, 16, 229, 96, 49, 28, 16, 225, 
+    107, 229, 96, 49, 28, 16, 224, 160, 229, 96, 49, 28, 16, 226, 204, 49, 
+    28, 16, 254, 85, 49, 28, 16, 232, 59, 49, 28, 16, 226, 11, 229, 96, 49, 
+    28, 16, 226, 13, 229, 96, 49, 28, 16, 245, 61, 226, 12, 49, 28, 16, 233, 
+    154, 49, 28, 16, 254, 86, 49, 28, 16, 215, 200, 229, 96, 49, 28, 16, 245, 
+    177, 49, 28, 16, 217, 179, 229, 96, 49, 28, 16, 217, 171, 49, 28, 16, 
+    250, 81, 229, 96, 49, 28, 16, 245, 107, 49, 28, 16, 221, 161, 229, 96, 
+    49, 28, 16, 211, 151, 234, 38, 49, 28, 16, 215, 197, 49, 28, 16, 224, 
+    161, 49, 28, 16, 215, 201, 49, 28, 16, 215, 198, 49, 28, 16, 224, 158, 
+    49, 28, 16, 215, 196, 49, 28, 16, 224, 157, 49, 28, 16, 242, 159, 49, 28, 
+    16, 254, 15, 49, 28, 16, 245, 61, 254, 15, 49, 28, 16, 226, 108, 229, 96, 
+    49, 28, 16, 216, 190, 245, 70, 49, 28, 16, 216, 190, 245, 26, 49, 28, 16, 
+    216, 192, 254, 64, 49, 28, 16, 216, 185, 234, 248, 254, 56, 49, 28, 16, 
+    234, 200, 49, 28, 16, 245, 140, 49, 28, 16, 211, 11, 234, 197, 49, 28, 
+    16, 211, 11, 254, 97, 49, 28, 16, 218, 146, 49, 28, 16, 234, 39, 254, 97, 
+    49, 28, 16, 247, 203, 254, 22, 49, 28, 16, 233, 239, 254, 22, 49, 28, 16, 
+    233, 239, 254, 150, 49, 28, 16, 233, 239, 229, 96, 49, 28, 16, 254, 63, 
+    229, 96, 49, 28, 16, 254, 65, 49, 28, 16, 247, 202, 49, 28, 16, 215, 211, 
+    49, 28, 16, 216, 225, 49, 28, 16, 234, 3, 49, 28, 16, 233, 33, 245, 135, 
+    250, 72, 49, 28, 16, 233, 33, 246, 43, 250, 73, 49, 28, 16, 233, 33, 215, 
+    213, 250, 73, 49, 28, 16, 233, 33, 216, 235, 250, 73, 49, 28, 16, 233, 
+    33, 236, 8, 250, 72, 49, 28, 16, 242, 160, 229, 97, 254, 97, 49, 28, 16, 
+    242, 160, 226, 2, 254, 11, 49, 28, 16, 242, 160, 226, 2, 248, 30, 49, 28, 
+    16, 247, 226, 49, 28, 16, 247, 227, 226, 2, 254, 12, 234, 197, 49, 28, 
+    16, 247, 227, 226, 2, 254, 12, 254, 97, 49, 28, 16, 247, 227, 226, 2, 
+    248, 30, 49, 28, 16, 215, 217, 49, 28, 16, 254, 16, 49, 28, 16, 236, 15, 
+    49, 28, 16, 247, 247, 49, 28, 16, 254, 212, 225, 1, 254, 17, 49, 28, 16, 
+    254, 212, 254, 14, 49, 28, 16, 254, 212, 254, 17, 49, 28, 16, 254, 212, 
+    231, 35, 49, 28, 16, 254, 212, 231, 46, 49, 28, 16, 254, 212, 242, 161, 
+    49, 28, 16, 254, 212, 242, 158, 49, 28, 16, 254, 212, 225, 1, 242, 161, 
+    49, 28, 16, 231, 152, 224, 166, 240, 108, 49, 28, 16, 231, 152, 254, 152, 
+    224, 166, 240, 108, 49, 28, 16, 231, 152, 248, 29, 240, 108, 49, 28, 16, 
+    231, 152, 254, 152, 248, 29, 240, 108, 49, 28, 16, 231, 152, 215, 206, 
+    240, 108, 49, 28, 16, 231, 152, 215, 218, 49, 28, 16, 231, 152, 216, 229, 
+    240, 108, 49, 28, 16, 231, 152, 216, 229, 233, 36, 240, 108, 49, 28, 16, 
+    231, 152, 233, 36, 240, 108, 49, 28, 16, 231, 152, 225, 40, 240, 108, 49, 
+    28, 16, 235, 170, 216, 252, 240, 109, 49, 28, 16, 254, 61, 216, 252, 240, 
+    109, 49, 28, 16, 244, 173, 216, 226, 49, 28, 16, 244, 173, 230, 144, 49, 
+    28, 16, 244, 173, 247, 231, 49, 28, 16, 231, 152, 214, 10, 240, 108, 49, 
+    28, 16, 231, 152, 224, 165, 240, 108, 49, 28, 16, 231, 152, 225, 40, 216, 
+    229, 240, 108, 49, 28, 16, 242, 156, 230, 27, 254, 64, 49, 28, 16, 242, 
+    156, 230, 27, 247, 201, 49, 28, 16, 245, 149, 234, 248, 243, 237, 213, 
+    124, 49, 28, 16, 236, 14, 49, 28, 16, 236, 12, 49, 28, 16, 243, 237, 254, 
+    23, 248, 28, 240, 107, 49, 28, 16, 243, 237, 247, 245, 190, 49, 28, 16, 
+    243, 237, 247, 245, 229, 204, 49, 28, 16, 243, 237, 229, 199, 240, 108, 
+    49, 28, 16, 243, 237, 247, 245, 248, 4, 49, 28, 16, 243, 237, 219, 103, 
+    247, 244, 248, 4, 49, 28, 16, 243, 237, 247, 245, 234, 183, 49, 28, 16, 
+    243, 237, 247, 245, 210, 23, 49, 28, 16, 243, 237, 247, 245, 228, 235, 
+    234, 197, 49, 28, 16, 243, 237, 247, 245, 228, 235, 254, 97, 49, 28, 16, 
+    243, 237, 231, 192, 250, 74, 247, 231, 49, 28, 16, 243, 237, 231, 192, 
+    250, 74, 230, 144, 49, 28, 16, 244, 123, 219, 103, 250, 74, 214, 9, 49, 
+    28, 16, 243, 237, 219, 103, 250, 74, 217, 180, 49, 28, 16, 243, 237, 229, 
+    98, 49, 28, 16, 250, 75, 209, 249, 49, 28, 16, 250, 75, 234, 37, 49, 28, 
+    16, 250, 75, 219, 10, 49, 28, 16, 243, 237, 240, 155, 211, 10, 216, 230, 
+    49, 28, 16, 243, 237, 245, 150, 254, 87, 49, 28, 16, 211, 10, 215, 207, 
+    49, 28, 16, 247, 239, 215, 207, 49, 28, 16, 247, 239, 216, 230, 49, 28, 
+    16, 247, 239, 254, 66, 246, 43, 247, 140, 49, 28, 16, 247, 239, 230, 142, 
+    216, 234, 247, 140, 49, 28, 16, 247, 239, 247, 223, 245, 37, 247, 140, 
+    49, 28, 16, 247, 239, 215, 215, 226, 212, 247, 140, 49, 28, 16, 211, 10, 
+    254, 66, 246, 43, 247, 140, 49, 28, 16, 211, 10, 230, 142, 216, 234, 247, 
+    140, 49, 28, 16, 211, 10, 247, 223, 245, 37, 247, 140, 49, 28, 16, 211, 
+    10, 215, 215, 226, 212, 247, 140, 49, 28, 16, 243, 50, 247, 238, 49, 28, 
+    16, 243, 50, 211, 9, 49, 28, 16, 247, 246, 254, 66, 230, 200, 49, 28, 16, 
+    247, 246, 254, 66, 231, 74, 49, 28, 16, 247, 246, 247, 202, 49, 28, 16, 
+    247, 246, 216, 183, 49, 28, 16, 219, 164, 216, 183, 49, 28, 16, 219, 164, 
+    216, 184, 247, 187, 49, 28, 16, 219, 164, 216, 184, 215, 208, 49, 28, 16, 
+    219, 164, 216, 184, 216, 223, 49, 28, 16, 219, 164, 253, 245, 49, 28, 16, 
+    219, 164, 253, 246, 247, 187, 49, 28, 16, 219, 164, 253, 246, 215, 208, 
+    49, 28, 16, 219, 164, 253, 246, 216, 223, 49, 28, 16, 247, 224, 243, 31, 
+    49, 28, 16, 247, 230, 226, 135, 49, 28, 16, 218, 138, 49, 28, 16, 254, 8, 
+    190, 49, 28, 16, 254, 8, 213, 124, 49, 28, 16, 254, 8, 243, 136, 49, 28, 
+    16, 254, 8, 248, 4, 49, 28, 16, 254, 8, 234, 183, 49, 28, 16, 254, 8, 
+    210, 23, 49, 28, 16, 254, 8, 228, 234, 49, 28, 16, 234, 163, 229, 97, 
+    231, 45, 49, 28, 16, 234, 164, 229, 97, 231, 45, 49, 28, 16, 234, 163, 
+    229, 97, 234, 197, 49, 28, 16, 234, 164, 229, 97, 234, 197, 49, 28, 16, 
+    234, 39, 234, 197, 49, 28, 16, 242, 160, 229, 97, 234, 197, 28, 16, 219, 
+    156, 252, 136, 28, 16, 52, 252, 136, 28, 16, 40, 252, 136, 28, 16, 223, 
+    51, 40, 252, 136, 28, 16, 248, 156, 252, 136, 28, 16, 219, 252, 252, 136, 
+    28, 16, 43, 223, 78, 50, 28, 16, 44, 223, 78, 50, 28, 16, 223, 78, 247, 
+    119, 28, 16, 248, 197, 221, 164, 28, 16, 248, 223, 250, 250, 28, 16, 221, 
+    164, 28, 16, 249, 235, 28, 16, 223, 76, 244, 112, 28, 16, 223, 76, 244, 
+    111, 28, 16, 223, 76, 244, 110, 28, 16, 244, 132, 28, 16, 244, 133, 51, 
+    28, 16, 251, 149, 78, 28, 16, 251, 25, 28, 16, 251, 160, 28, 16, 127, 28, 
+    16, 226, 194, 218, 164, 28, 16, 215, 57, 218, 164, 28, 16, 216, 143, 218, 
+    164, 28, 16, 244, 11, 218, 164, 28, 16, 244, 81, 218, 164, 28, 16, 219, 
+    125, 218, 164, 28, 16, 219, 123, 243, 251, 28, 16, 244, 9, 243, 251, 28, 
+    16, 243, 204, 250, 15, 28, 16, 243, 204, 250, 16, 226, 137, 254, 143, 28, 
+    16, 243, 204, 250, 16, 226, 137, 252, 123, 28, 16, 251, 68, 250, 15, 28, 
+    16, 245, 8, 250, 15, 28, 16, 245, 8, 250, 16, 226, 137, 254, 143, 28, 16, 
+    245, 8, 250, 16, 226, 137, 252, 123, 28, 16, 246, 84, 250, 14, 28, 16, 
+    246, 84, 250, 13, 28, 16, 230, 86, 231, 91, 223, 62, 28, 16, 52, 220, 76, 
+    28, 16, 52, 244, 66, 28, 16, 244, 67, 214, 163, 28, 16, 244, 67, 246, 
+    107, 28, 16, 229, 189, 214, 163, 28, 16, 229, 189, 246, 107, 28, 16, 220, 
+    77, 214, 163, 28, 16, 220, 77, 246, 107, 28, 16, 224, 23, 138, 220, 76, 
+    28, 16, 224, 23, 138, 244, 66, 28, 16, 249, 217, 216, 88, 28, 16, 249, 
+    86, 216, 88, 28, 16, 226, 137, 254, 143, 28, 16, 226, 137, 252, 123, 28, 
+    16, 224, 5, 254, 143, 28, 16, 224, 5, 252, 123, 28, 16, 230, 89, 223, 62, 
+    28, 16, 211, 251, 223, 62, 28, 16, 163, 223, 62, 28, 16, 224, 23, 223, 
+    62, 28, 16, 245, 190, 223, 62, 28, 16, 219, 119, 223, 62, 28, 16, 216, 
+    161, 223, 62, 28, 16, 219, 111, 223, 62, 28, 16, 123, 240, 212, 215, 71, 
+    223, 62, 28, 16, 211, 179, 228, 44, 28, 16, 96, 228, 44, 28, 16, 250, 37, 
+    211, 179, 228, 44, 28, 16, 42, 228, 45, 211, 253, 28, 16, 42, 228, 45, 
+    251, 222, 28, 16, 215, 227, 228, 45, 120, 211, 253, 28, 16, 215, 227, 
+    228, 45, 120, 251, 222, 28, 16, 215, 227, 228, 45, 43, 211, 253, 28, 16, 
+    215, 227, 228, 45, 43, 251, 222, 28, 16, 215, 227, 228, 45, 44, 211, 253, 
+    28, 16, 215, 227, 228, 45, 44, 251, 222, 28, 16, 215, 227, 228, 45, 124, 
+    211, 253, 28, 16, 215, 227, 228, 45, 124, 251, 222, 28, 16, 215, 227, 
+    228, 45, 120, 44, 211, 253, 28, 16, 215, 227, 228, 45, 120, 44, 251, 222, 
+    28, 16, 230, 130, 228, 45, 211, 253, 28, 16, 230, 130, 228, 45, 251, 222, 
+    28, 16, 215, 224, 228, 45, 124, 211, 253, 28, 16, 215, 224, 228, 45, 124, 
+    251, 222, 28, 16, 226, 5, 228, 44, 28, 16, 213, 132, 228, 44, 28, 16, 
+    228, 45, 251, 222, 28, 16, 227, 204, 228, 44, 28, 16, 249, 242, 228, 45, 
+    211, 253, 28, 16, 249, 242, 228, 45, 251, 222, 28, 16, 251, 147, 28, 16, 
+    211, 251, 228, 48, 28, 16, 163, 228, 48, 28, 16, 224, 23, 228, 48, 28, 
+    16, 245, 190, 228, 48, 28, 16, 219, 119, 228, 48, 28, 16, 216, 161, 228, 
+    48, 28, 16, 219, 111, 228, 48, 28, 16, 123, 240, 212, 215, 71, 228, 48, 
+    28, 16, 38, 218, 140, 28, 16, 38, 218, 241, 218, 140, 28, 16, 38, 215, 
+    235, 28, 16, 38, 215, 234, 28, 16, 38, 215, 233, 28, 16, 244, 102, 215, 
+    235, 28, 16, 244, 102, 215, 234, 28, 16, 244, 102, 215, 233, 28, 16, 38, 
+    253, 190, 247, 121, 28, 16, 38, 244, 73, 28, 16, 38, 244, 72, 28, 16, 38, 
+    244, 71, 28, 16, 38, 244, 70, 28, 16, 38, 244, 69, 28, 16, 252, 59, 252, 
+    75, 28, 16, 245, 144, 252, 75, 28, 16, 252, 59, 216, 112, 28, 16, 245, 
+    144, 216, 112, 28, 16, 252, 59, 219, 81, 28, 16, 245, 144, 219, 81, 28, 
+    16, 252, 59, 225, 116, 28, 16, 245, 144, 225, 116, 28, 16, 38, 255, 15, 
+    28, 16, 38, 218, 166, 28, 16, 38, 216, 239, 28, 16, 38, 218, 167, 28, 16, 
+    38, 231, 163, 28, 16, 38, 231, 162, 28, 16, 38, 255, 14, 28, 16, 38, 232, 
+    113, 28, 16, 253, 255, 214, 163, 28, 16, 253, 255, 246, 107, 28, 16, 38, 
+    247, 136, 28, 16, 38, 222, 232, 28, 16, 38, 244, 59, 28, 16, 38, 219, 77, 
+    28, 16, 38, 252, 39, 28, 16, 38, 52, 216, 20, 28, 16, 38, 215, 212, 216, 
+    20, 28, 16, 222, 236, 28, 16, 218, 76, 28, 16, 210, 159, 28, 16, 225, 
+    108, 28, 16, 231, 26, 28, 16, 244, 18, 28, 16, 249, 139, 28, 16, 248, 79, 
+    28, 16, 242, 151, 228, 49, 219, 96, 28, 16, 242, 151, 228, 49, 228, 76, 
+    219, 96, 28, 16, 216, 1, 28, 16, 215, 95, 28, 16, 235, 194, 215, 95, 28, 
+    16, 215, 96, 219, 96, 28, 16, 215, 96, 214, 163, 28, 16, 226, 149, 218, 
+    103, 28, 16, 226, 149, 218, 100, 28, 16, 226, 149, 218, 99, 28, 16, 226, 
+    149, 218, 98, 28, 16, 226, 149, 218, 97, 28, 16, 226, 149, 218, 96, 28, 
+    16, 226, 149, 218, 95, 28, 16, 226, 149, 218, 94, 28, 16, 226, 149, 218, 
+    93, 28, 16, 226, 149, 218, 102, 28, 16, 226, 149, 218, 101, 28, 16, 241, 
+    246, 28, 16, 229, 106, 28, 16, 245, 144, 64, 218, 134, 28, 16, 248, 72, 
+    219, 96, 28, 16, 38, 124, 251, 170, 28, 16, 38, 120, 251, 170, 28, 16, 
+    38, 242, 1, 28, 16, 38, 219, 68, 225, 44, 28, 16, 225, 217, 78, 28, 16, 
+    225, 217, 120, 78, 28, 16, 163, 225, 217, 78, 28, 16, 242, 183, 214, 163, 
+    28, 16, 242, 183, 246, 107, 28, 16, 2, 244, 101, 28, 16, 248, 181, 28, 
+    16, 248, 182, 254, 155, 28, 16, 231, 134, 28, 16, 232, 130, 28, 16, 251, 
+    144, 28, 16, 220, 155, 211, 253, 28, 16, 220, 155, 251, 222, 28, 16, 230, 
+    185, 28, 16, 230, 186, 251, 222, 28, 16, 220, 149, 211, 253, 28, 16, 220, 
+    149, 251, 222, 28, 16, 243, 221, 211, 253, 28, 16, 243, 221, 251, 222, 
+    28, 16, 232, 131, 225, 181, 223, 62, 28, 16, 232, 131, 236, 5, 223, 62, 
+    28, 16, 251, 145, 223, 62, 28, 16, 220, 155, 223, 62, 28, 16, 230, 186, 
+    223, 62, 28, 16, 220, 149, 223, 62, 28, 16, 216, 250, 225, 179, 249, 108, 
+    224, 175, 225, 180, 28, 16, 216, 250, 225, 179, 249, 108, 224, 175, 236, 
+    4, 28, 16, 216, 250, 225, 179, 249, 108, 224, 175, 225, 181, 247, 212, 
+    28, 16, 216, 250, 236, 3, 249, 108, 224, 175, 225, 180, 28, 16, 216, 250, 
+    236, 3, 249, 108, 224, 175, 236, 4, 28, 16, 216, 250, 236, 3, 249, 108, 
+    224, 175, 236, 5, 247, 212, 28, 16, 216, 250, 236, 3, 249, 108, 224, 175, 
+    236, 5, 247, 211, 28, 16, 216, 250, 236, 3, 249, 108, 224, 175, 236, 5, 
+    247, 210, 28, 16, 249, 134, 28, 16, 242, 127, 251, 68, 250, 15, 28, 16, 
+    242, 127, 245, 8, 250, 15, 28, 16, 42, 253, 159, 28, 16, 213, 151, 28, 
+    16, 225, 15, 28, 16, 250, 6, 28, 16, 221, 204, 28, 16, 250, 10, 28, 16, 
+    216, 8, 28, 16, 224, 243, 28, 16, 224, 244, 244, 61, 28, 16, 221, 205, 
+    244, 61, 28, 16, 216, 9, 223, 59, 28, 16, 225, 164, 218, 67, 26, 213, 
+    137, 188, 217, 230, 26, 213, 137, 188, 217, 219, 26, 213, 137, 188, 217, 
+    209, 26, 213, 137, 188, 217, 202, 26, 213, 137, 188, 217, 194, 26, 213, 
+    137, 188, 217, 188, 26, 213, 137, 188, 217, 187, 26, 213, 137, 188, 217, 
+    186, 26, 213, 137, 188, 217, 185, 26, 213, 137, 188, 217, 229, 26, 213, 
+    137, 188, 217, 228, 26, 213, 137, 188, 217, 227, 26, 213, 137, 188, 217, 
+    226, 26, 213, 137, 188, 217, 225, 26, 213, 137, 188, 217, 224, 26, 213, 
+    137, 188, 217, 223, 26, 213, 137, 188, 217, 222, 26, 213, 137, 188, 217, 
+    221, 26, 213, 137, 188, 217, 220, 26, 213, 137, 188, 217, 218, 26, 213, 
+    137, 188, 217, 217, 26, 213, 137, 188, 217, 216, 26, 213, 137, 188, 217, 
+    215, 26, 213, 137, 188, 217, 214, 26, 213, 137, 188, 217, 193, 26, 213, 
+    137, 188, 217, 192, 26, 213, 137, 188, 217, 191, 26, 213, 137, 188, 217, 
+    190, 26, 213, 137, 188, 217, 189, 26, 235, 215, 188, 217, 230, 26, 235, 
+    215, 188, 217, 219, 26, 235, 215, 188, 217, 202, 26, 235, 215, 188, 217, 
+    194, 26, 235, 215, 188, 217, 187, 26, 235, 215, 188, 217, 186, 26, 235, 
+    215, 188, 217, 228, 26, 235, 215, 188, 217, 227, 26, 235, 215, 188, 217, 
+    226, 26, 235, 215, 188, 217, 225, 26, 235, 215, 188, 217, 222, 26, 235, 
+    215, 188, 217, 221, 26, 235, 215, 188, 217, 220, 26, 235, 215, 188, 217, 
+    215, 26, 235, 215, 188, 217, 214, 26, 235, 215, 188, 217, 213, 26, 235, 
+    215, 188, 217, 212, 26, 235, 215, 188, 217, 211, 26, 235, 215, 188, 217, 
+    210, 26, 235, 215, 188, 217, 208, 26, 235, 215, 188, 217, 207, 26, 235, 
+    215, 188, 217, 206, 26, 235, 215, 188, 217, 205, 26, 235, 215, 188, 217, 
+    204, 26, 235, 215, 188, 217, 203, 26, 235, 215, 188, 217, 201, 26, 235, 
+    215, 188, 217, 200, 26, 235, 215, 188, 217, 199, 26, 235, 215, 188, 217, 
+    198, 26, 235, 215, 188, 217, 197, 26, 235, 215, 188, 217, 196, 26, 235, 
+    215, 188, 217, 195, 26, 235, 215, 188, 217, 193, 26, 235, 215, 188, 217, 
+    192, 26, 235, 215, 188, 217, 191, 26, 235, 215, 188, 217, 190, 26, 235, 
+    215, 188, 217, 189, 38, 26, 28, 215, 209, 38, 26, 28, 216, 224, 38, 26, 
+    28, 225, 189, 26, 28, 233, 32, 230, 143, 31, 245, 224, 247, 225, 31, 241, 
+    223, 245, 224, 247, 225, 31, 240, 215, 245, 224, 247, 225, 31, 245, 223, 
+    241, 224, 247, 225, 31, 245, 223, 240, 214, 247, 225, 31, 245, 224, 180, 
+    31, 250, 175, 180, 31, 243, 230, 250, 36, 180, 31, 230, 178, 180, 31, 
+    252, 131, 180, 31, 234, 180, 219, 80, 180, 31, 249, 180, 180, 31, 253, 
+    234, 180, 31, 226, 164, 180, 31, 251, 154, 226, 131, 180, 31, 248, 74, 
+    177, 247, 180, 180, 31, 247, 177, 180, 31, 210, 222, 180, 31, 235, 248, 
+    180, 31, 225, 198, 180, 31, 223, 128, 180, 31, 249, 190, 180, 31, 241, 
+    61, 252, 185, 180, 31, 212, 59, 180, 31, 244, 40, 180, 31, 254, 247, 180, 
+    31, 223, 90, 180, 31, 223, 66, 180, 31, 245, 222, 180, 31, 235, 54, 180, 
+    31, 249, 185, 180, 31, 245, 143, 180, 31, 246, 53, 180, 31, 250, 146, 
+    180, 31, 248, 83, 180, 31, 23, 223, 65, 180, 31, 226, 82, 180, 31, 233, 
+    35, 180, 31, 249, 255, 180, 31, 234, 78, 180, 31, 243, 87, 180, 31, 218, 
+    113, 180, 31, 224, 131, 180, 31, 243, 229, 180, 31, 223, 67, 180, 31, 
+    233, 72, 177, 230, 158, 180, 31, 223, 63, 180, 31, 242, 169, 216, 43, 
+    231, 77, 180, 31, 245, 145, 180, 31, 218, 125, 180, 31, 242, 129, 180, 
+    31, 245, 137, 180, 31, 225, 236, 180, 31, 222, 226, 180, 31, 244, 60, 
+    180, 31, 214, 8, 177, 212, 44, 180, 31, 249, 194, 180, 31, 231, 90, 180, 
+    31, 245, 62, 180, 31, 214, 172, 180, 31, 247, 213, 180, 31, 250, 1, 230, 
+    111, 180, 31, 242, 107, 180, 31, 243, 88, 236, 0, 180, 31, 231, 142, 180, 
+    31, 255, 11, 180, 31, 245, 158, 180, 31, 246, 110, 180, 31, 212, 42, 180, 
+    31, 219, 151, 180, 31, 235, 223, 180, 31, 248, 43, 180, 31, 248, 161, 
+    180, 31, 247, 209, 180, 31, 245, 30, 180, 31, 220, 116, 180, 31, 218, 
+    129, 180, 31, 242, 3, 180, 31, 249, 213, 180, 31, 249, 252, 180, 31, 244, 
+    178, 180, 31, 254, 213, 180, 31, 249, 212, 180, 31, 226, 198, 216, 197, 
+    213, 242, 180, 31, 247, 233, 180, 31, 233, 125, 180, 31, 244, 14, 249, 
+    150, 222, 203, 214, 174, 21, 110, 249, 150, 222, 203, 214, 174, 21, 105, 
+    249, 150, 222, 203, 214, 174, 21, 158, 249, 150, 222, 203, 214, 174, 21, 
+    161, 249, 150, 222, 203, 214, 174, 21, 189, 249, 150, 222, 203, 214, 174, 
+    21, 194, 249, 150, 222, 203, 214, 174, 21, 198, 249, 150, 222, 203, 214, 
+    174, 21, 195, 249, 150, 222, 203, 214, 174, 21, 200, 249, 150, 222, 203, 
+    216, 244, 21, 110, 249, 150, 222, 203, 216, 244, 21, 105, 249, 150, 222, 
+    203, 216, 244, 21, 158, 249, 150, 222, 203, 216, 244, 21, 161, 249, 150, 
+    222, 203, 216, 244, 21, 189, 249, 150, 222, 203, 216, 244, 21, 194, 249, 
+    150, 222, 203, 216, 244, 21, 198, 249, 150, 222, 203, 216, 244, 21, 195, 
+    249, 150, 222, 203, 216, 244, 21, 200, 11, 23, 6, 61, 11, 23, 6, 253, 
+    159, 11, 23, 6, 251, 67, 11, 23, 6, 249, 61, 11, 23, 6, 75, 11, 23, 6, 
+    245, 7, 11, 23, 6, 243, 203, 11, 23, 6, 242, 61, 11, 23, 6, 73, 11, 23, 
+    6, 235, 145, 11, 23, 6, 235, 24, 11, 23, 6, 156, 11, 23, 6, 193, 11, 23, 
+    6, 230, 26, 11, 23, 6, 76, 11, 23, 6, 226, 106, 11, 23, 6, 224, 97, 11, 
+    23, 6, 153, 11, 23, 6, 222, 92, 11, 23, 6, 217, 153, 11, 23, 6, 70, 11, 
+    23, 6, 214, 105, 11, 23, 6, 212, 98, 11, 23, 6, 211, 178, 11, 23, 6, 211, 
+    117, 11, 23, 6, 210, 159, 11, 23, 4, 61, 11, 23, 4, 253, 159, 11, 23, 4, 
+    251, 67, 11, 23, 4, 249, 61, 11, 23, 4, 75, 11, 23, 4, 245, 7, 11, 23, 4, 
+    243, 203, 11, 23, 4, 242, 61, 11, 23, 4, 73, 11, 23, 4, 235, 145, 11, 23, 
+    4, 235, 24, 11, 23, 4, 156, 11, 23, 4, 193, 11, 23, 4, 230, 26, 11, 23, 
+    4, 76, 11, 23, 4, 226, 106, 11, 23, 4, 224, 97, 11, 23, 4, 153, 11, 23, 
+    4, 222, 92, 11, 23, 4, 217, 153, 11, 23, 4, 70, 11, 23, 4, 214, 105, 11, 
+    23, 4, 212, 98, 11, 23, 4, 211, 178, 11, 23, 4, 211, 117, 11, 23, 4, 210, 
+    159, 11, 32, 6, 61, 11, 32, 6, 253, 159, 11, 32, 6, 251, 67, 11, 32, 6, 
+    249, 61, 11, 32, 6, 75, 11, 32, 6, 245, 7, 11, 32, 6, 243, 203, 11, 32, 
+    6, 242, 61, 11, 32, 6, 73, 11, 32, 6, 235, 145, 11, 32, 6, 235, 24, 11, 
+    32, 6, 156, 11, 32, 6, 193, 11, 32, 6, 230, 26, 11, 32, 6, 76, 11, 32, 6, 
+    226, 106, 11, 32, 6, 224, 97, 11, 32, 6, 153, 11, 32, 6, 222, 92, 11, 32, 
+    6, 217, 153, 11, 32, 6, 70, 11, 32, 6, 214, 105, 11, 32, 6, 212, 98, 11, 
+    32, 6, 211, 178, 11, 32, 6, 211, 117, 11, 32, 6, 210, 159, 11, 32, 4, 61, 
+    11, 32, 4, 253, 159, 11, 32, 4, 251, 67, 11, 32, 4, 249, 61, 11, 32, 4, 
+    75, 11, 32, 4, 245, 7, 11, 32, 4, 243, 203, 11, 32, 4, 73, 11, 32, 4, 
+    235, 145, 11, 32, 4, 235, 24, 11, 32, 4, 156, 11, 32, 4, 193, 11, 32, 4, 
+    230, 26, 11, 32, 4, 76, 11, 32, 4, 226, 106, 11, 32, 4, 224, 97, 11, 32, 
+    4, 153, 11, 32, 4, 222, 92, 11, 32, 4, 217, 153, 11, 32, 4, 70, 11, 32, 
+    4, 214, 105, 11, 32, 4, 212, 98, 11, 32, 4, 211, 178, 11, 32, 4, 211, 
+    117, 11, 32, 4, 210, 159, 11, 23, 32, 6, 61, 11, 23, 32, 6, 253, 159, 11, 
+    23, 32, 6, 251, 67, 11, 23, 32, 6, 249, 61, 11, 23, 32, 6, 75, 11, 23, 
+    32, 6, 245, 7, 11, 23, 32, 6, 243, 203, 11, 23, 32, 6, 242, 61, 11, 23, 
+    32, 6, 73, 11, 23, 32, 6, 235, 145, 11, 23, 32, 6, 235, 24, 11, 23, 32, 
+    6, 156, 11, 23, 32, 6, 193, 11, 23, 32, 6, 230, 26, 11, 23, 32, 6, 76, 
+    11, 23, 32, 6, 226, 106, 11, 23, 32, 6, 224, 97, 11, 23, 32, 6, 153, 11, 
+    23, 32, 6, 222, 92, 11, 23, 32, 6, 217, 153, 11, 23, 32, 6, 70, 11, 23, 
+    32, 6, 214, 105, 11, 23, 32, 6, 212, 98, 11, 23, 32, 6, 211, 178, 11, 23, 
+    32, 6, 211, 117, 11, 23, 32, 6, 210, 159, 11, 23, 32, 4, 61, 11, 23, 32, 
+    4, 253, 159, 11, 23, 32, 4, 251, 67, 11, 23, 32, 4, 249, 61, 11, 23, 32, 
+    4, 75, 11, 23, 32, 4, 245, 7, 11, 23, 32, 4, 243, 203, 11, 23, 32, 4, 
+    242, 61, 11, 23, 32, 4, 73, 11, 23, 32, 4, 235, 145, 11, 23, 32, 4, 235, 
+    24, 11, 23, 32, 4, 156, 11, 23, 32, 4, 193, 11, 23, 32, 4, 230, 26, 11, 
+    23, 32, 4, 76, 11, 23, 32, 4, 226, 106, 11, 23, 32, 4, 224, 97, 11, 23, 
+    32, 4, 153, 11, 23, 32, 4, 222, 92, 11, 23, 32, 4, 217, 153, 11, 23, 32, 
+    4, 70, 11, 23, 32, 4, 214, 105, 11, 23, 32, 4, 212, 98, 11, 23, 32, 4, 
+    211, 178, 11, 23, 32, 4, 211, 117, 11, 23, 32, 4, 210, 159, 11, 119, 6, 
+    61, 11, 119, 6, 251, 67, 11, 119, 6, 249, 61, 11, 119, 6, 243, 203, 11, 
+    119, 6, 235, 145, 11, 119, 6, 235, 24, 11, 119, 6, 230, 26, 11, 119, 6, 
+    76, 11, 119, 6, 226, 106, 11, 119, 6, 224, 97, 11, 119, 6, 222, 92, 11, 
+    119, 6, 217, 153, 11, 119, 6, 70, 11, 119, 6, 214, 105, 11, 119, 6, 212, 
+    98, 11, 119, 6, 211, 178, 11, 119, 6, 211, 117, 11, 119, 6, 210, 159, 11, 
+    119, 4, 61, 11, 119, 4, 253, 159, 11, 119, 4, 251, 67, 11, 119, 4, 249, 
+    61, 11, 119, 4, 245, 7, 11, 119, 4, 242, 61, 11, 119, 4, 73, 11, 119, 4, 
+    235, 145, 11, 119, 4, 235, 24, 11, 119, 4, 156, 11, 119, 4, 193, 11, 119, 
+    4, 230, 26, 11, 119, 4, 226, 106, 11, 119, 4, 224, 97, 11, 119, 4, 153, 
+    11, 119, 4, 222, 92, 11, 119, 4, 217, 153, 11, 119, 4, 70, 11, 119, 4, 
+    214, 105, 11, 119, 4, 212, 98, 11, 119, 4, 211, 178, 11, 119, 4, 211, 
+    117, 11, 119, 4, 210, 159, 11, 23, 119, 6, 61, 11, 23, 119, 6, 253, 159, 
+    11, 23, 119, 6, 251, 67, 11, 23, 119, 6, 249, 61, 11, 23, 119, 6, 75, 11, 
+    23, 119, 6, 245, 7, 11, 23, 119, 6, 243, 203, 11, 23, 119, 6, 242, 61, 
+    11, 23, 119, 6, 73, 11, 23, 119, 6, 235, 145, 11, 23, 119, 6, 235, 24, 
+    11, 23, 119, 6, 156, 11, 23, 119, 6, 193, 11, 23, 119, 6, 230, 26, 11, 
+    23, 119, 6, 76, 11, 23, 119, 6, 226, 106, 11, 23, 119, 6, 224, 97, 11, 
+    23, 119, 6, 153, 11, 23, 119, 6, 222, 92, 11, 23, 119, 6, 217, 153, 11, 
+    23, 119, 6, 70, 11, 23, 119, 6, 214, 105, 11, 23, 119, 6, 212, 98, 11, 
+    23, 119, 6, 211, 178, 11, 23, 119, 6, 211, 117, 11, 23, 119, 6, 210, 159, 
+    11, 23, 119, 4, 61, 11, 23, 119, 4, 253, 159, 11, 23, 119, 4, 251, 67, 
+    11, 23, 119, 4, 249, 61, 11, 23, 119, 4, 75, 11, 23, 119, 4, 245, 7, 11, 
+    23, 119, 4, 243, 203, 11, 23, 119, 4, 242, 61, 11, 23, 119, 4, 73, 11, 
+    23, 119, 4, 235, 145, 11, 23, 119, 4, 235, 24, 11, 23, 119, 4, 156, 11, 
+    23, 119, 4, 193, 11, 23, 119, 4, 230, 26, 11, 23, 119, 4, 76, 11, 23, 
+    119, 4, 226, 106, 11, 23, 119, 4, 224, 97, 11, 23, 119, 4, 153, 11, 23, 
+    119, 4, 222, 92, 11, 23, 119, 4, 217, 153, 11, 23, 119, 4, 70, 11, 23, 
+    119, 4, 214, 105, 11, 23, 119, 4, 212, 98, 11, 23, 119, 4, 211, 178, 11, 
+    23, 119, 4, 211, 117, 11, 23, 119, 4, 210, 159, 11, 133, 6, 61, 11, 133, 
+    6, 253, 159, 11, 133, 6, 249, 61, 11, 133, 6, 75, 11, 133, 6, 245, 7, 11, 
+    133, 6, 243, 203, 11, 133, 6, 235, 145, 11, 133, 6, 235, 24, 11, 133, 6, 
+    156, 11, 133, 6, 193, 11, 133, 6, 230, 26, 11, 133, 6, 76, 11, 133, 6, 
+    226, 106, 11, 133, 6, 224, 97, 11, 133, 6, 222, 92, 11, 133, 6, 217, 153, 
+    11, 133, 6, 70, 11, 133, 6, 214, 105, 11, 133, 6, 212, 98, 11, 133, 6, 
+    211, 178, 11, 133, 6, 211, 117, 11, 133, 4, 61, 11, 133, 4, 253, 159, 11, 
+    133, 4, 251, 67, 11, 133, 4, 249, 61, 11, 133, 4, 75, 11, 133, 4, 245, 7, 
+    11, 133, 4, 243, 203, 11, 133, 4, 242, 61, 11, 133, 4, 73, 11, 133, 4, 
+    235, 145, 11, 133, 4, 235, 24, 11, 133, 4, 156, 11, 133, 4, 193, 11, 133, 
+    4, 230, 26, 11, 133, 4, 76, 11, 133, 4, 226, 106, 11, 133, 4, 224, 97, 
+    11, 133, 4, 153, 11, 133, 4, 222, 92, 11, 133, 4, 217, 153, 11, 133, 4, 
+    70, 11, 133, 4, 214, 105, 11, 133, 4, 212, 98, 11, 133, 4, 211, 178, 11, 
+    133, 4, 211, 117, 11, 133, 4, 210, 159, 11, 139, 6, 61, 11, 139, 6, 253, 
+    159, 11, 139, 6, 249, 61, 11, 139, 6, 75, 11, 139, 6, 245, 7, 11, 139, 6, 
+    243, 203, 11, 139, 6, 73, 11, 139, 6, 235, 145, 11, 139, 6, 235, 24, 11, 
+    139, 6, 156, 11, 139, 6, 193, 11, 139, 6, 76, 11, 139, 6, 222, 92, 11, 
+    139, 6, 217, 153, 11, 139, 6, 70, 11, 139, 6, 214, 105, 11, 139, 6, 212, 
+    98, 11, 139, 6, 211, 178, 11, 139, 6, 211, 117, 11, 139, 4, 61, 11, 139, 
+    4, 253, 159, 11, 139, 4, 251, 67, 11, 139, 4, 249, 61, 11, 139, 4, 75, 
+    11, 139, 4, 245, 7, 11, 139, 4, 243, 203, 11, 139, 4, 242, 61, 11, 139, 
+    4, 73, 11, 139, 4, 235, 145, 11, 139, 4, 235, 24, 11, 139, 4, 156, 11, 
+    139, 4, 193, 11, 139, 4, 230, 26, 11, 139, 4, 76, 11, 139, 4, 226, 106, 
+    11, 139, 4, 224, 97, 11, 139, 4, 153, 11, 139, 4, 222, 92, 11, 139, 4, 
+    217, 153, 11, 139, 4, 70, 11, 139, 4, 214, 105, 11, 139, 4, 212, 98, 11, 
+    139, 4, 211, 178, 11, 139, 4, 211, 117, 11, 139, 4, 210, 159, 11, 23, 
+    133, 6, 61, 11, 23, 133, 6, 253, 159, 11, 23, 133, 6, 251, 67, 11, 23, 
+    133, 6, 249, 61, 11, 23, 133, 6, 75, 11, 23, 133, 6, 245, 7, 11, 23, 133, 
+    6, 243, 203, 11, 23, 133, 6, 242, 61, 11, 23, 133, 6, 73, 11, 23, 133, 6, 
+    235, 145, 11, 23, 133, 6, 235, 24, 11, 23, 133, 6, 156, 11, 23, 133, 6, 
+    193, 11, 23, 133, 6, 230, 26, 11, 23, 133, 6, 76, 11, 23, 133, 6, 226, 
+    106, 11, 23, 133, 6, 224, 97, 11, 23, 133, 6, 153, 11, 23, 133, 6, 222, 
+    92, 11, 23, 133, 6, 217, 153, 11, 23, 133, 6, 70, 11, 23, 133, 6, 214, 
+    105, 11, 23, 133, 6, 212, 98, 11, 23, 133, 6, 211, 178, 11, 23, 133, 6, 
+    211, 117, 11, 23, 133, 6, 210, 159, 11, 23, 133, 4, 61, 11, 23, 133, 4, 
+    253, 159, 11, 23, 133, 4, 251, 67, 11, 23, 133, 4, 249, 61, 11, 23, 133, 
+    4, 75, 11, 23, 133, 4, 245, 7, 11, 23, 133, 4, 243, 203, 11, 23, 133, 4, 
+    242, 61, 11, 23, 133, 4, 73, 11, 23, 133, 4, 235, 145, 11, 23, 133, 4, 
+    235, 24, 11, 23, 133, 4, 156, 11, 23, 133, 4, 193, 11, 23, 133, 4, 230, 
+    26, 11, 23, 133, 4, 76, 11, 23, 133, 4, 226, 106, 11, 23, 133, 4, 224, 
+    97, 11, 23, 133, 4, 153, 11, 23, 133, 4, 222, 92, 11, 23, 133, 4, 217, 
+    153, 11, 23, 133, 4, 70, 11, 23, 133, 4, 214, 105, 11, 23, 133, 4, 212, 
+    98, 11, 23, 133, 4, 211, 178, 11, 23, 133, 4, 211, 117, 11, 23, 133, 4, 
+    210, 159, 11, 35, 6, 61, 11, 35, 6, 253, 159, 11, 35, 6, 251, 67, 11, 35, 
+    6, 249, 61, 11, 35, 6, 75, 11, 35, 6, 245, 7, 11, 35, 6, 243, 203, 11, 
+    35, 6, 242, 61, 11, 35, 6, 73, 11, 35, 6, 235, 145, 11, 35, 6, 235, 24, 
+    11, 35, 6, 156, 11, 35, 6, 193, 11, 35, 6, 230, 26, 11, 35, 6, 76, 11, 
+    35, 6, 226, 106, 11, 35, 6, 224, 97, 11, 35, 6, 153, 11, 35, 6, 222, 92, 
+    11, 35, 6, 217, 153, 11, 35, 6, 70, 11, 35, 6, 214, 105, 11, 35, 6, 212, 
+    98, 11, 35, 6, 211, 178, 11, 35, 6, 211, 117, 11, 35, 6, 210, 159, 11, 
+    35, 4, 61, 11, 35, 4, 253, 159, 11, 35, 4, 251, 67, 11, 35, 4, 249, 61, 
+    11, 35, 4, 75, 11, 35, 4, 245, 7, 11, 35, 4, 243, 203, 11, 35, 4, 242, 
+    61, 11, 35, 4, 73, 11, 35, 4, 235, 145, 11, 35, 4, 235, 24, 11, 35, 4, 
+    156, 11, 35, 4, 193, 11, 35, 4, 230, 26, 11, 35, 4, 76, 11, 35, 4, 226, 
+    106, 11, 35, 4, 224, 97, 11, 35, 4, 153, 11, 35, 4, 222, 92, 11, 35, 4, 
+    217, 153, 11, 35, 4, 70, 11, 35, 4, 214, 105, 11, 35, 4, 212, 98, 11, 35, 
+    4, 211, 178, 11, 35, 4, 211, 117, 11, 35, 4, 210, 159, 11, 35, 23, 6, 61, 
+    11, 35, 23, 6, 253, 159, 11, 35, 23, 6, 251, 67, 11, 35, 23, 6, 249, 61, 
+    11, 35, 23, 6, 75, 11, 35, 23, 6, 245, 7, 11, 35, 23, 6, 243, 203, 11, 
+    35, 23, 6, 242, 61, 11, 35, 23, 6, 73, 11, 35, 23, 6, 235, 145, 11, 35, 
+    23, 6, 235, 24, 11, 35, 23, 6, 156, 11, 35, 23, 6, 193, 11, 35, 23, 6, 
+    230, 26, 11, 35, 23, 6, 76, 11, 35, 23, 6, 226, 106, 11, 35, 23, 6, 224, 
+    97, 11, 35, 23, 6, 153, 11, 35, 23, 6, 222, 92, 11, 35, 23, 6, 217, 153, 
+    11, 35, 23, 6, 70, 11, 35, 23, 6, 214, 105, 11, 35, 23, 6, 212, 98, 11, 
+    35, 23, 6, 211, 178, 11, 35, 23, 6, 211, 117, 11, 35, 23, 6, 210, 159, 
+    11, 35, 23, 4, 61, 11, 35, 23, 4, 253, 159, 11, 35, 23, 4, 251, 67, 11, 
+    35, 23, 4, 249, 61, 11, 35, 23, 4, 75, 11, 35, 23, 4, 245, 7, 11, 35, 23, 
+    4, 243, 203, 11, 35, 23, 4, 242, 61, 11, 35, 23, 4, 73, 11, 35, 23, 4, 
+    235, 145, 11, 35, 23, 4, 235, 24, 11, 35, 23, 4, 156, 11, 35, 23, 4, 193, 
+    11, 35, 23, 4, 230, 26, 11, 35, 23, 4, 76, 11, 35, 23, 4, 226, 106, 11, 
+    35, 23, 4, 224, 97, 11, 35, 23, 4, 153, 11, 35, 23, 4, 222, 92, 11, 35, 
+    23, 4, 217, 153, 11, 35, 23, 4, 70, 11, 35, 23, 4, 214, 105, 11, 35, 23, 
+    4, 212, 98, 11, 35, 23, 4, 211, 178, 11, 35, 23, 4, 211, 117, 11, 35, 23, 
+    4, 210, 159, 11, 35, 32, 6, 61, 11, 35, 32, 6, 253, 159, 11, 35, 32, 6, 
+    251, 67, 11, 35, 32, 6, 249, 61, 11, 35, 32, 6, 75, 11, 35, 32, 6, 245, 
+    7, 11, 35, 32, 6, 243, 203, 11, 35, 32, 6, 242, 61, 11, 35, 32, 6, 73, 
+    11, 35, 32, 6, 235, 145, 11, 35, 32, 6, 235, 24, 11, 35, 32, 6, 156, 11, 
+    35, 32, 6, 193, 11, 35, 32, 6, 230, 26, 11, 35, 32, 6, 76, 11, 35, 32, 6, 
+    226, 106, 11, 35, 32, 6, 224, 97, 11, 35, 32, 6, 153, 11, 35, 32, 6, 222, 
+    92, 11, 35, 32, 6, 217, 153, 11, 35, 32, 6, 70, 11, 35, 32, 6, 214, 105, 
+    11, 35, 32, 6, 212, 98, 11, 35, 32, 6, 211, 178, 11, 35, 32, 6, 211, 117, 
+    11, 35, 32, 6, 210, 159, 11, 35, 32, 4, 61, 11, 35, 32, 4, 253, 159, 11, 
+    35, 32, 4, 251, 67, 11, 35, 32, 4, 249, 61, 11, 35, 32, 4, 75, 11, 35, 
+    32, 4, 245, 7, 11, 35, 32, 4, 243, 203, 11, 35, 32, 4, 242, 61, 11, 35, 
+    32, 4, 73, 11, 35, 32, 4, 235, 145, 11, 35, 32, 4, 235, 24, 11, 35, 32, 
+    4, 156, 11, 35, 32, 4, 193, 11, 35, 32, 4, 230, 26, 11, 35, 32, 4, 76, 
+    11, 35, 32, 4, 226, 106, 11, 35, 32, 4, 224, 97, 11, 35, 32, 4, 153, 11, 
+    35, 32, 4, 222, 92, 11, 35, 32, 4, 217, 153, 11, 35, 32, 4, 70, 11, 35, 
+    32, 4, 214, 105, 11, 35, 32, 4, 212, 98, 11, 35, 32, 4, 211, 178, 11, 35, 
+    32, 4, 211, 117, 11, 35, 32, 4, 210, 159, 11, 35, 23, 32, 6, 61, 11, 35, 
+    23, 32, 6, 253, 159, 11, 35, 23, 32, 6, 251, 67, 11, 35, 23, 32, 6, 249, 
+    61, 11, 35, 23, 32, 6, 75, 11, 35, 23, 32, 6, 245, 7, 11, 35, 23, 32, 6, 
+    243, 203, 11, 35, 23, 32, 6, 242, 61, 11, 35, 23, 32, 6, 73, 11, 35, 23, 
+    32, 6, 235, 145, 11, 35, 23, 32, 6, 235, 24, 11, 35, 23, 32, 6, 156, 11, 
+    35, 23, 32, 6, 193, 11, 35, 23, 32, 6, 230, 26, 11, 35, 23, 32, 6, 76, 
+    11, 35, 23, 32, 6, 226, 106, 11, 35, 23, 32, 6, 224, 97, 11, 35, 23, 32, 
+    6, 153, 11, 35, 23, 32, 6, 222, 92, 11, 35, 23, 32, 6, 217, 153, 11, 35, 
+    23, 32, 6, 70, 11, 35, 23, 32, 6, 214, 105, 11, 35, 23, 32, 6, 212, 98, 
+    11, 35, 23, 32, 6, 211, 178, 11, 35, 23, 32, 6, 211, 117, 11, 35, 23, 32, 
+    6, 210, 159, 11, 35, 23, 32, 4, 61, 11, 35, 23, 32, 4, 253, 159, 11, 35, 
+    23, 32, 4, 251, 67, 11, 35, 23, 32, 4, 249, 61, 11, 35, 23, 32, 4, 75, 
+    11, 35, 23, 32, 4, 245, 7, 11, 35, 23, 32, 4, 243, 203, 11, 35, 23, 32, 
+    4, 242, 61, 11, 35, 23, 32, 4, 73, 11, 35, 23, 32, 4, 235, 145, 11, 35, 
+    23, 32, 4, 235, 24, 11, 35, 23, 32, 4, 156, 11, 35, 23, 32, 4, 193, 11, 
+    35, 23, 32, 4, 230, 26, 11, 35, 23, 32, 4, 76, 11, 35, 23, 32, 4, 226, 
+    106, 11, 35, 23, 32, 4, 224, 97, 11, 35, 23, 32, 4, 153, 11, 35, 23, 32, 
+    4, 222, 92, 11, 35, 23, 32, 4, 217, 153, 11, 35, 23, 32, 4, 70, 11, 35, 
+    23, 32, 4, 214, 105, 11, 35, 23, 32, 4, 212, 98, 11, 35, 23, 32, 4, 211, 
+    178, 11, 35, 23, 32, 4, 211, 117, 11, 35, 23, 32, 4, 210, 159, 11, 230, 
+    139, 6, 61, 11, 230, 139, 6, 253, 159, 11, 230, 139, 6, 251, 67, 11, 230, 
+    139, 6, 249, 61, 11, 230, 139, 6, 75, 11, 230, 139, 6, 245, 7, 11, 230, 
+    139, 6, 243, 203, 11, 230, 139, 6, 242, 61, 11, 230, 139, 6, 73, 11, 230, 
+    139, 6, 235, 145, 11, 230, 139, 6, 235, 24, 11, 230, 139, 6, 156, 11, 
+    230, 139, 6, 193, 11, 230, 139, 6, 230, 26, 11, 230, 139, 6, 76, 11, 230, 
+    139, 6, 226, 106, 11, 230, 139, 6, 224, 97, 11, 230, 139, 6, 153, 11, 
+    230, 139, 6, 222, 92, 11, 230, 139, 6, 217, 153, 11, 230, 139, 6, 70, 11, 
+    230, 139, 6, 214, 105, 11, 230, 139, 6, 212, 98, 11, 230, 139, 6, 211, 
+    178, 11, 230, 139, 6, 211, 117, 11, 230, 139, 6, 210, 159, 11, 230, 139, 
+    4, 61, 11, 230, 139, 4, 253, 159, 11, 230, 139, 4, 251, 67, 11, 230, 139, 
+    4, 249, 61, 11, 230, 139, 4, 75, 11, 230, 139, 4, 245, 7, 11, 230, 139, 
+    4, 243, 203, 11, 230, 139, 4, 242, 61, 11, 230, 139, 4, 73, 11, 230, 139, 
+    4, 235, 145, 11, 230, 139, 4, 235, 24, 11, 230, 139, 4, 156, 11, 230, 
+    139, 4, 193, 11, 230, 139, 4, 230, 26, 11, 230, 139, 4, 76, 11, 230, 139, 
+    4, 226, 106, 11, 230, 139, 4, 224, 97, 11, 230, 139, 4, 153, 11, 230, 
+    139, 4, 222, 92, 11, 230, 139, 4, 217, 153, 11, 230, 139, 4, 70, 11, 230, 
+    139, 4, 214, 105, 11, 230, 139, 4, 212, 98, 11, 230, 139, 4, 211, 178, 
+    11, 230, 139, 4, 211, 117, 11, 230, 139, 4, 210, 159, 11, 32, 4, 247, 
+    120, 73, 11, 32, 4, 247, 120, 235, 145, 11, 23, 6, 254, 144, 11, 23, 6, 
+    252, 27, 11, 23, 6, 243, 108, 11, 23, 6, 248, 55, 11, 23, 6, 245, 101, 
+    11, 23, 6, 210, 85, 11, 23, 6, 245, 64, 11, 23, 6, 216, 180, 11, 23, 6, 
+    235, 186, 11, 23, 6, 234, 223, 11, 23, 6, 233, 99, 11, 23, 6, 230, 103, 
+    11, 23, 6, 227, 238, 11, 23, 6, 211, 157, 11, 23, 6, 226, 200, 11, 23, 6, 
+    225, 109, 11, 23, 6, 223, 38, 11, 23, 6, 216, 181, 87, 11, 23, 6, 219, 
+    178, 11, 23, 6, 217, 42, 11, 23, 6, 214, 157, 11, 23, 6, 225, 134, 11, 
+    23, 6, 250, 111, 11, 23, 6, 224, 162, 11, 23, 6, 226, 202, 11, 23, 229, 
+    222, 11, 23, 4, 254, 144, 11, 23, 4, 252, 27, 11, 23, 4, 243, 108, 11, 
+    23, 4, 248, 55, 11, 23, 4, 245, 101, 11, 23, 4, 210, 85, 11, 23, 4, 245, 
+    64, 11, 23, 4, 216, 180, 11, 23, 4, 235, 186, 11, 23, 4, 234, 223, 11, 
+    23, 4, 233, 99, 11, 23, 4, 230, 103, 11, 23, 4, 227, 238, 11, 23, 4, 211, 
+    157, 11, 23, 4, 226, 200, 11, 23, 4, 225, 109, 11, 23, 4, 223, 38, 11, 
+    23, 4, 40, 219, 178, 11, 23, 4, 219, 178, 11, 23, 4, 217, 42, 11, 23, 4, 
+    214, 157, 11, 23, 4, 225, 134, 11, 23, 4, 250, 111, 11, 23, 4, 224, 162, 
+    11, 23, 4, 226, 202, 11, 23, 225, 254, 247, 234, 11, 23, 245, 102, 87, 
+    11, 23, 216, 181, 87, 11, 23, 234, 224, 87, 11, 23, 225, 135, 87, 11, 23, 
+    223, 39, 87, 11, 23, 225, 110, 87, 11, 32, 6, 254, 144, 11, 32, 6, 252, 
+    27, 11, 32, 6, 243, 108, 11, 32, 6, 248, 55, 11, 32, 6, 245, 101, 11, 32, 
+    6, 210, 85, 11, 32, 6, 245, 64, 11, 32, 6, 216, 180, 11, 32, 6, 235, 186, 
+    11, 32, 6, 234, 223, 11, 32, 6, 233, 99, 11, 32, 6, 230, 103, 11, 32, 6, 
+    227, 238, 11, 32, 6, 211, 157, 11, 32, 6, 226, 200, 11, 32, 6, 225, 109, 
+    11, 32, 6, 223, 38, 11, 32, 6, 216, 181, 87, 11, 32, 6, 219, 178, 11, 32, 
+    6, 217, 42, 11, 32, 6, 214, 157, 11, 32, 6, 225, 134, 11, 32, 6, 250, 
+    111, 11, 32, 6, 224, 162, 11, 32, 6, 226, 202, 11, 32, 229, 222, 11, 32, 
+    4, 254, 144, 11, 32, 4, 252, 27, 11, 32, 4, 243, 108, 11, 32, 4, 248, 55, 
+    11, 32, 4, 245, 101, 11, 32, 4, 210, 85, 11, 32, 4, 245, 64, 11, 32, 4, 
+    216, 180, 11, 32, 4, 235, 186, 11, 32, 4, 234, 223, 11, 32, 4, 233, 99, 
+    11, 32, 4, 230, 103, 11, 32, 4, 227, 238, 11, 32, 4, 211, 157, 11, 32, 4, 
+    226, 200, 11, 32, 4, 225, 109, 11, 32, 4, 223, 38, 11, 32, 4, 40, 219, 
+    178, 11, 32, 4, 219, 178, 11, 32, 4, 217, 42, 11, 32, 4, 214, 157, 11, 
+    32, 4, 225, 134, 11, 32, 4, 250, 111, 11, 32, 4, 224, 162, 11, 32, 4, 
+    226, 202, 11, 32, 225, 254, 247, 234, 11, 32, 245, 102, 87, 11, 32, 216, 
+    181, 87, 11, 32, 234, 224, 87, 11, 32, 225, 135, 87, 11, 32, 223, 39, 87, 
+    11, 32, 225, 110, 87, 11, 23, 32, 6, 254, 144, 11, 23, 32, 6, 252, 27, 
+    11, 23, 32, 6, 243, 108, 11, 23, 32, 6, 248, 55, 11, 23, 32, 6, 245, 101, 
+    11, 23, 32, 6, 210, 85, 11, 23, 32, 6, 245, 64, 11, 23, 32, 6, 216, 180, 
+    11, 23, 32, 6, 235, 186, 11, 23, 32, 6, 234, 223, 11, 23, 32, 6, 233, 99, 
+    11, 23, 32, 6, 230, 103, 11, 23, 32, 6, 227, 238, 11, 23, 32, 6, 211, 
+    157, 11, 23, 32, 6, 226, 200, 11, 23, 32, 6, 225, 109, 11, 23, 32, 6, 
+    223, 38, 11, 23, 32, 6, 216, 181, 87, 11, 23, 32, 6, 219, 178, 11, 23, 
+    32, 6, 217, 42, 11, 23, 32, 6, 214, 157, 11, 23, 32, 6, 225, 134, 11, 23, 
+    32, 6, 250, 111, 11, 23, 32, 6, 224, 162, 11, 23, 32, 6, 226, 202, 11, 
+    23, 32, 229, 222, 11, 23, 32, 4, 254, 144, 11, 23, 32, 4, 252, 27, 11, 
+    23, 32, 4, 243, 108, 11, 23, 32, 4, 248, 55, 11, 23, 32, 4, 245, 101, 11, 
+    23, 32, 4, 210, 85, 11, 23, 32, 4, 245, 64, 11, 23, 32, 4, 216, 180, 11, 
+    23, 32, 4, 235, 186, 11, 23, 32, 4, 234, 223, 11, 23, 32, 4, 233, 99, 11, 
+    23, 32, 4, 230, 103, 11, 23, 32, 4, 227, 238, 11, 23, 32, 4, 211, 157, 
+    11, 23, 32, 4, 226, 200, 11, 23, 32, 4, 225, 109, 11, 23, 32, 4, 223, 38, 
+    11, 23, 32, 4, 40, 219, 178, 11, 23, 32, 4, 219, 178, 11, 23, 32, 4, 217, 
+    42, 11, 23, 32, 4, 214, 157, 11, 23, 32, 4, 225, 134, 11, 23, 32, 4, 250, 
+    111, 11, 23, 32, 4, 224, 162, 11, 23, 32, 4, 226, 202, 11, 23, 32, 225, 
+    254, 247, 234, 11, 23, 32, 245, 102, 87, 11, 23, 32, 216, 181, 87, 11, 
+    23, 32, 234, 224, 87, 11, 23, 32, 225, 135, 87, 11, 23, 32, 223, 39, 87, 
+    11, 23, 32, 225, 110, 87, 11, 35, 23, 6, 254, 144, 11, 35, 23, 6, 252, 
+    27, 11, 35, 23, 6, 243, 108, 11, 35, 23, 6, 248, 55, 11, 35, 23, 6, 245, 
+    101, 11, 35, 23, 6, 210, 85, 11, 35, 23, 6, 245, 64, 11, 35, 23, 6, 216, 
+    180, 11, 35, 23, 6, 235, 186, 11, 35, 23, 6, 234, 223, 11, 35, 23, 6, 
+    233, 99, 11, 35, 23, 6, 230, 103, 11, 35, 23, 6, 227, 238, 11, 35, 23, 6, 
+    211, 157, 11, 35, 23, 6, 226, 200, 11, 35, 23, 6, 225, 109, 11, 35, 23, 
+    6, 223, 38, 11, 35, 23, 6, 216, 181, 87, 11, 35, 23, 6, 219, 178, 11, 35, 
+    23, 6, 217, 42, 11, 35, 23, 6, 214, 157, 11, 35, 23, 6, 225, 134, 11, 35, 
+    23, 6, 250, 111, 11, 35, 23, 6, 224, 162, 11, 35, 23, 6, 226, 202, 11, 
+    35, 23, 229, 222, 11, 35, 23, 4, 254, 144, 11, 35, 23, 4, 252, 27, 11, 
+    35, 23, 4, 243, 108, 11, 35, 23, 4, 248, 55, 11, 35, 23, 4, 245, 101, 11, 
+    35, 23, 4, 210, 85, 11, 35, 23, 4, 245, 64, 11, 35, 23, 4, 216, 180, 11, 
+    35, 23, 4, 235, 186, 11, 35, 23, 4, 234, 223, 11, 35, 23, 4, 233, 99, 11, 
+    35, 23, 4, 230, 103, 11, 35, 23, 4, 227, 238, 11, 35, 23, 4, 211, 157, 
+    11, 35, 23, 4, 226, 200, 11, 35, 23, 4, 225, 109, 11, 35, 23, 4, 223, 38, 
+    11, 35, 23, 4, 40, 219, 178, 11, 35, 23, 4, 219, 178, 11, 35, 23, 4, 217, 
+    42, 11, 35, 23, 4, 214, 157, 11, 35, 23, 4, 225, 134, 11, 35, 23, 4, 250, 
+    111, 11, 35, 23, 4, 224, 162, 11, 35, 23, 4, 226, 202, 11, 35, 23, 225, 
+    254, 247, 234, 11, 35, 23, 245, 102, 87, 11, 35, 23, 216, 181, 87, 11, 
+    35, 23, 234, 224, 87, 11, 35, 23, 225, 135, 87, 11, 35, 23, 223, 39, 87, 
+    11, 35, 23, 225, 110, 87, 11, 35, 23, 32, 6, 254, 144, 11, 35, 23, 32, 6, 
+    252, 27, 11, 35, 23, 32, 6, 243, 108, 11, 35, 23, 32, 6, 248, 55, 11, 35, 
+    23, 32, 6, 245, 101, 11, 35, 23, 32, 6, 210, 85, 11, 35, 23, 32, 6, 245, 
+    64, 11, 35, 23, 32, 6, 216, 180, 11, 35, 23, 32, 6, 235, 186, 11, 35, 23, 
+    32, 6, 234, 223, 11, 35, 23, 32, 6, 233, 99, 11, 35, 23, 32, 6, 230, 103, 
+    11, 35, 23, 32, 6, 227, 238, 11, 35, 23, 32, 6, 211, 157, 11, 35, 23, 32, 
+    6, 226, 200, 11, 35, 23, 32, 6, 225, 109, 11, 35, 23, 32, 6, 223, 38, 11, 
+    35, 23, 32, 6, 216, 181, 87, 11, 35, 23, 32, 6, 219, 178, 11, 35, 23, 32, 
+    6, 217, 42, 11, 35, 23, 32, 6, 214, 157, 11, 35, 23, 32, 6, 225, 134, 11, 
+    35, 23, 32, 6, 250, 111, 11, 35, 23, 32, 6, 224, 162, 11, 35, 23, 32, 6, 
+    226, 202, 11, 35, 23, 32, 229, 222, 11, 35, 23, 32, 4, 254, 144, 11, 35, 
+    23, 32, 4, 252, 27, 11, 35, 23, 32, 4, 243, 108, 11, 35, 23, 32, 4, 248, 
+    55, 11, 35, 23, 32, 4, 245, 101, 11, 35, 23, 32, 4, 210, 85, 11, 35, 23, 
+    32, 4, 245, 64, 11, 35, 23, 32, 4, 216, 180, 11, 35, 23, 32, 4, 235, 186, 
+    11, 35, 23, 32, 4, 234, 223, 11, 35, 23, 32, 4, 233, 99, 11, 35, 23, 32, 
+    4, 230, 103, 11, 35, 23, 32, 4, 227, 238, 11, 35, 23, 32, 4, 211, 157, 
+    11, 35, 23, 32, 4, 226, 200, 11, 35, 23, 32, 4, 225, 109, 11, 35, 23, 32, 
+    4, 223, 38, 11, 35, 23, 32, 4, 40, 219, 178, 11, 35, 23, 32, 4, 219, 178, 
+    11, 35, 23, 32, 4, 217, 42, 11, 35, 23, 32, 4, 214, 157, 11, 35, 23, 32, 
+    4, 225, 134, 11, 35, 23, 32, 4, 250, 111, 11, 35, 23, 32, 4, 224, 162, 
+    11, 35, 23, 32, 4, 226, 202, 11, 35, 23, 32, 225, 254, 247, 234, 11, 35, 
+    23, 32, 245, 102, 87, 11, 35, 23, 32, 216, 181, 87, 11, 35, 23, 32, 234, 
+    224, 87, 11, 35, 23, 32, 225, 135, 87, 11, 35, 23, 32, 223, 39, 87, 11, 
+    35, 23, 32, 225, 110, 87, 11, 23, 6, 247, 228, 11, 23, 4, 247, 228, 11, 
+    23, 21, 210, 86, 11, 23, 21, 110, 11, 23, 21, 105, 11, 23, 21, 158, 11, 
+    23, 21, 161, 11, 23, 21, 189, 11, 23, 21, 194, 11, 23, 21, 198, 11, 23, 
+    21, 195, 11, 23, 21, 200, 11, 139, 21, 210, 86, 11, 139, 21, 110, 11, 
+    139, 21, 105, 11, 139, 21, 158, 11, 139, 21, 161, 11, 139, 21, 189, 11, 
+    139, 21, 194, 11, 139, 21, 198, 11, 139, 21, 195, 11, 139, 21, 200, 11, 
+    35, 21, 210, 86, 11, 35, 21, 110, 11, 35, 21, 105, 11, 35, 21, 158, 11, 
+    35, 21, 161, 11, 35, 21, 189, 11, 35, 21, 194, 11, 35, 21, 198, 11, 35, 
+    21, 195, 11, 35, 21, 200, 11, 35, 23, 21, 210, 86, 11, 35, 23, 21, 110, 
+    11, 35, 23, 21, 105, 11, 35, 23, 21, 158, 11, 35, 23, 21, 161, 11, 35, 
+    23, 21, 189, 11, 35, 23, 21, 194, 11, 35, 23, 21, 198, 11, 35, 23, 21, 
+    195, 11, 35, 23, 21, 200, 11, 230, 139, 21, 210, 86, 11, 230, 139, 21, 
+    110, 11, 230, 139, 21, 105, 11, 230, 139, 21, 158, 11, 230, 139, 21, 161, 
+    11, 230, 139, 21, 189, 11, 230, 139, 21, 194, 11, 230, 139, 21, 198, 11, 
+    230, 139, 21, 195, 11, 230, 139, 21, 200, 10, 11, 254, 171, 10, 11, 252, 
+    55, 10, 11, 235, 124, 10, 11, 248, 196, 10, 11, 212, 30, 10, 11, 210, 
+    108, 10, 11, 242, 38, 10, 11, 217, 81, 10, 11, 211, 43, 10, 11, 234, 251, 
+    10, 11, 233, 103, 10, 11, 231, 79, 10, 11, 228, 63, 10, 11, 221, 167, 10, 
+    11, 254, 197, 10, 11, 244, 143, 10, 11, 222, 27, 10, 11, 224, 82, 10, 11, 
+    223, 96, 10, 11, 220, 60, 10, 11, 217, 8, 10, 11, 216, 193, 10, 11, 234, 
+    130, 10, 11, 216, 203, 10, 11, 248, 217, 10, 11, 210, 111, 10, 11, 242, 
+    245, 10, 11, 247, 120, 252, 55, 10, 11, 247, 120, 228, 63, 10, 11, 247, 
+    120, 244, 143, 10, 11, 247, 120, 224, 82, 10, 11, 65, 252, 55, 10, 11, 
+    65, 235, 124, 10, 11, 65, 241, 219, 10, 11, 65, 242, 38, 10, 11, 65, 211, 
+    43, 10, 11, 65, 234, 251, 10, 11, 65, 233, 103, 10, 11, 65, 231, 79, 10, 
+    11, 65, 228, 63, 10, 11, 65, 221, 167, 10, 11, 65, 254, 197, 10, 11, 65, 
+    244, 143, 10, 11, 65, 222, 27, 10, 11, 65, 224, 82, 10, 11, 65, 220, 60, 
+    10, 11, 65, 217, 8, 10, 11, 65, 216, 193, 10, 11, 65, 234, 130, 10, 11, 
+    65, 248, 217, 10, 11, 65, 242, 245, 10, 11, 217, 77, 235, 124, 10, 11, 
+    217, 77, 242, 38, 10, 11, 217, 77, 211, 43, 10, 11, 217, 77, 233, 103, 
+    10, 11, 217, 77, 228, 63, 10, 11, 217, 77, 221, 167, 10, 11, 217, 77, 
+    254, 197, 10, 11, 217, 77, 222, 27, 10, 11, 217, 77, 224, 82, 10, 11, 
+    217, 77, 220, 60, 10, 11, 217, 77, 234, 130, 10, 11, 217, 77, 248, 217, 
+    10, 11, 217, 77, 242, 245, 10, 11, 217, 77, 247, 120, 228, 63, 10, 11, 
+    217, 77, 247, 120, 224, 82, 10, 11, 218, 111, 252, 55, 10, 11, 218, 111, 
+    235, 124, 10, 11, 218, 111, 241, 219, 10, 11, 218, 111, 242, 38, 10, 11, 
+    218, 111, 217, 81, 10, 11, 218, 111, 211, 43, 10, 11, 218, 111, 234, 251, 
+    10, 11, 218, 111, 231, 79, 10, 11, 218, 111, 228, 63, 10, 11, 218, 111, 
+    221, 167, 10, 11, 218, 111, 254, 197, 10, 11, 218, 111, 244, 143, 10, 11, 
+    218, 111, 222, 27, 10, 11, 218, 111, 224, 82, 10, 11, 218, 111, 220, 60, 
+    10, 11, 218, 111, 217, 8, 10, 11, 218, 111, 216, 193, 10, 11, 218, 111, 
+    234, 130, 10, 11, 218, 111, 248, 217, 10, 11, 218, 111, 210, 111, 10, 11, 
+    218, 111, 242, 245, 10, 11, 218, 111, 247, 120, 252, 55, 10, 11, 218, 
+    111, 247, 120, 244, 143, 10, 11, 232, 123, 254, 171, 10, 11, 232, 123, 
+    252, 55, 10, 11, 232, 123, 235, 124, 10, 11, 232, 123, 248, 196, 10, 11, 
+    232, 123, 241, 219, 10, 11, 232, 123, 212, 30, 10, 11, 232, 123, 210, 
+    108, 10, 11, 232, 123, 242, 38, 10, 11, 232, 123, 217, 81, 10, 11, 232, 
+    123, 211, 43, 10, 11, 232, 123, 233, 103, 10, 11, 232, 123, 231, 79, 10, 
+    11, 232, 123, 228, 63, 10, 11, 232, 123, 221, 167, 10, 11, 232, 123, 254, 
+    197, 10, 11, 232, 123, 244, 143, 10, 11, 232, 123, 222, 27, 10, 11, 232, 
+    123, 224, 82, 10, 11, 232, 123, 223, 96, 10, 11, 232, 123, 220, 60, 10, 
+    11, 232, 123, 217, 8, 10, 11, 232, 123, 216, 193, 10, 11, 232, 123, 234, 
+    130, 10, 11, 232, 123, 216, 203, 10, 11, 232, 123, 248, 217, 10, 11, 232, 
+    123, 210, 111, 10, 11, 232, 123, 242, 245, 10, 11, 139, 252, 55, 10, 11, 
+    139, 235, 124, 10, 11, 139, 248, 196, 10, 11, 139, 212, 30, 10, 11, 139, 
+    210, 108, 10, 11, 139, 242, 38, 10, 11, 139, 217, 81, 10, 11, 139, 211, 
+    43, 10, 11, 139, 233, 103, 10, 11, 139, 231, 79, 10, 11, 139, 228, 63, 
+    10, 11, 139, 221, 167, 10, 11, 139, 254, 197, 10, 11, 139, 244, 143, 10, 
+    11, 139, 222, 27, 10, 11, 139, 224, 82, 10, 11, 139, 223, 96, 10, 11, 
+    139, 220, 60, 10, 11, 139, 217, 8, 10, 11, 139, 216, 193, 10, 11, 139, 
+    234, 130, 10, 11, 139, 216, 203, 10, 11, 139, 248, 217, 10, 11, 139, 210, 
+    111, 10, 11, 139, 242, 245, 10, 11, 226, 169, 66, 2, 122, 2, 217, 44, 10, 
+    11, 226, 169, 122, 2, 248, 196, 231, 206, 86, 245, 221, 211, 239, 231, 
+    206, 86, 219, 29, 211, 239, 231, 206, 86, 212, 9, 211, 239, 231, 206, 86, 
+    228, 57, 211, 239, 231, 206, 86, 223, 112, 246, 97, 231, 206, 86, 242, 
+    128, 246, 97, 231, 206, 86, 71, 246, 97, 231, 206, 86, 123, 64, 250, 142, 
+    231, 206, 86, 113, 64, 250, 142, 231, 206, 86, 134, 64, 250, 142, 231, 
+    206, 86, 244, 12, 64, 250, 142, 231, 206, 86, 244, 82, 64, 250, 142, 231, 
+    206, 86, 219, 126, 64, 250, 142, 231, 206, 86, 220, 123, 64, 250, 142, 
+    231, 206, 86, 245, 194, 64, 250, 142, 231, 206, 86, 228, 201, 64, 250, 
+    142, 231, 206, 86, 123, 64, 252, 154, 231, 206, 86, 113, 64, 252, 154, 
+    231, 206, 86, 134, 64, 252, 154, 231, 206, 86, 244, 12, 64, 252, 154, 
+    231, 206, 86, 244, 82, 64, 252, 154, 231, 206, 86, 219, 126, 64, 252, 
+    154, 231, 206, 86, 220, 123, 64, 252, 154, 231, 206, 86, 245, 194, 64, 
+    252, 154, 231, 206, 86, 228, 201, 64, 252, 154, 231, 206, 86, 123, 64, 
+    250, 35, 231, 206, 86, 113, 64, 250, 35, 231, 206, 86, 134, 64, 250, 35, 
+    231, 206, 86, 244, 12, 64, 250, 35, 231, 206, 86, 244, 82, 64, 250, 35, 
+    231, 206, 86, 219, 126, 64, 250, 35, 231, 206, 86, 220, 123, 64, 250, 35, 
+    231, 206, 86, 245, 194, 64, 250, 35, 231, 206, 86, 228, 201, 64, 250, 35, 
+    231, 206, 86, 225, 26, 231, 206, 86, 226, 157, 231, 206, 86, 252, 155, 
+    231, 206, 86, 250, 71, 231, 206, 86, 218, 240, 231, 206, 86, 218, 40, 
+    231, 206, 86, 253, 180, 231, 206, 86, 211, 232, 231, 206, 86, 235, 63, 
+    231, 206, 86, 252, 185, 131, 86, 203, 252, 185, 131, 86, 241, 44, 131, 
+    86, 241, 43, 131, 86, 241, 42, 131, 86, 241, 41, 131, 86, 241, 40, 131, 
+    86, 241, 39, 131, 86, 241, 38, 131, 86, 241, 37, 131, 86, 241, 36, 131, 
+    86, 241, 35, 131, 86, 241, 34, 131, 86, 241, 33, 131, 86, 241, 32, 131, 
+    86, 241, 31, 131, 86, 241, 30, 131, 86, 241, 29, 131, 86, 241, 28, 131, 
+    86, 241, 27, 131, 86, 241, 26, 131, 86, 241, 25, 131, 86, 241, 24, 131, 
+    86, 241, 23, 131, 86, 241, 22, 131, 86, 241, 21, 131, 86, 241, 20, 131, 
+    86, 241, 19, 131, 86, 241, 18, 131, 86, 241, 17, 131, 86, 241, 16, 131, 
+    86, 241, 15, 131, 86, 241, 14, 131, 86, 241, 13, 131, 86, 241, 12, 131, 
+    86, 241, 11, 131, 86, 241, 10, 131, 86, 241, 9, 131, 86, 241, 8, 131, 86, 
+    241, 7, 131, 86, 241, 6, 131, 86, 241, 5, 131, 86, 241, 4, 131, 86, 241, 
+    3, 131, 86, 241, 2, 131, 86, 241, 1, 131, 86, 241, 0, 131, 86, 240, 255, 
+    131, 86, 240, 254, 131, 86, 240, 253, 131, 86, 240, 252, 131, 86, 67, 
+    252, 185, 131, 86, 213, 238, 131, 86, 213, 237, 131, 86, 213, 236, 131, 
+    86, 213, 235, 131, 86, 213, 234, 131, 86, 213, 233, 131, 86, 213, 232, 
+    131, 86, 213, 231, 131, 86, 213, 230, 131, 86, 213, 229, 131, 86, 213, 
+    228, 131, 86, 213, 227, 131, 86, 213, 226, 131, 86, 213, 225, 131, 86, 
+    213, 224, 131, 86, 213, 223, 131, 86, 213, 222, 131, 86, 213, 221, 131, 
+    86, 213, 220, 131, 86, 213, 219, 131, 86, 213, 218, 131, 86, 213, 217, 
+    131, 86, 213, 216, 131, 86, 213, 215, 131, 86, 213, 214, 131, 86, 213, 
+    213, 131, 86, 213, 212, 131, 86, 213, 211, 131, 86, 213, 210, 131, 86, 
+    213, 209, 131, 86, 213, 208, 131, 86, 213, 207, 131, 86, 213, 206, 131, 
+    86, 213, 205, 131, 86, 213, 204, 131, 86, 213, 203, 131, 86, 213, 202, 
+    131, 86, 213, 201, 131, 86, 213, 200, 131, 86, 213, 199, 131, 86, 213, 
+    198, 131, 86, 213, 197, 131, 86, 213, 196, 131, 86, 213, 195, 131, 86, 
+    213, 194, 131, 86, 213, 193, 131, 86, 213, 192, 131, 86, 213, 191, 131, 
+    86, 213, 190, 225, 34, 250, 244, 252, 185, 225, 34, 250, 244, 255, 10, 
+    64, 219, 16, 225, 34, 250, 244, 113, 64, 219, 16, 225, 34, 250, 244, 134, 
+    64, 219, 16, 225, 34, 250, 244, 244, 12, 64, 219, 16, 225, 34, 250, 244, 
+    244, 82, 64, 219, 16, 225, 34, 250, 244, 219, 126, 64, 219, 16, 225, 34, 
+    250, 244, 220, 123, 64, 219, 16, 225, 34, 250, 244, 245, 194, 64, 219, 
+    16, 225, 34, 250, 244, 228, 201, 64, 219, 16, 225, 34, 250, 244, 216, 
+    249, 64, 219, 16, 225, 34, 250, 244, 235, 140, 64, 219, 16, 225, 34, 250, 
+    244, 234, 32, 64, 219, 16, 225, 34, 250, 244, 224, 16, 64, 219, 16, 225, 
+    34, 250, 244, 234, 80, 64, 219, 16, 225, 34, 250, 244, 255, 10, 64, 241, 
+    226, 225, 34, 250, 244, 113, 64, 241, 226, 225, 34, 250, 244, 134, 64, 
+    241, 226, 225, 34, 250, 244, 244, 12, 64, 241, 226, 225, 34, 250, 244, 
+    244, 82, 64, 241, 226, 225, 34, 250, 244, 219, 126, 64, 241, 226, 225, 
+    34, 250, 244, 220, 123, 64, 241, 226, 225, 34, 250, 244, 245, 194, 64, 
+    241, 226, 225, 34, 250, 244, 228, 201, 64, 241, 226, 225, 34, 250, 244, 
+    216, 249, 64, 241, 226, 225, 34, 250, 244, 235, 140, 64, 241, 226, 225, 
+    34, 250, 244, 234, 32, 64, 241, 226, 225, 34, 250, 244, 224, 16, 64, 241, 
+    226, 225, 34, 250, 244, 234, 80, 64, 241, 226, 225, 34, 250, 244, 255, 
+    10, 64, 247, 248, 225, 34, 250, 244, 113, 64, 247, 248, 225, 34, 250, 
+    244, 134, 64, 247, 248, 225, 34, 250, 244, 244, 12, 64, 247, 248, 225, 
+    34, 250, 244, 244, 82, 64, 247, 248, 225, 34, 250, 244, 219, 126, 64, 
+    247, 248, 225, 34, 250, 244, 220, 123, 64, 247, 248, 225, 34, 250, 244, 
+    245, 194, 64, 247, 248, 225, 34, 250, 244, 228, 201, 64, 247, 248, 225, 
+    34, 250, 244, 216, 249, 64, 247, 248, 225, 34, 250, 244, 235, 140, 64, 
+    247, 248, 225, 34, 250, 244, 234, 32, 64, 247, 248, 225, 34, 250, 244, 
+    224, 16, 64, 247, 248, 225, 34, 250, 244, 234, 80, 64, 247, 248, 225, 34, 
+    250, 244, 85, 235, 63, 225, 34, 250, 244, 255, 10, 64, 249, 243, 225, 34, 
+    250, 244, 113, 64, 249, 243, 225, 34, 250, 244, 134, 64, 249, 243, 225, 
+    34, 250, 244, 244, 12, 64, 249, 243, 225, 34, 250, 244, 244, 82, 64, 249, 
+    243, 225, 34, 250, 244, 219, 126, 64, 249, 243, 225, 34, 250, 244, 220, 
+    123, 64, 249, 243, 225, 34, 250, 244, 245, 194, 64, 249, 243, 225, 34, 
+    250, 244, 228, 201, 64, 249, 243, 225, 34, 250, 244, 216, 249, 64, 249, 
+    243, 225, 34, 250, 244, 235, 140, 64, 249, 243, 225, 34, 250, 244, 234, 
+    32, 64, 249, 243, 225, 34, 250, 244, 224, 16, 64, 249, 243, 225, 34, 250, 
+    244, 234, 80, 64, 249, 243, 225, 34, 250, 244, 71, 235, 63, 21, 210, 87, 
+    243, 230, 218, 130, 21, 210, 87, 249, 220, 21, 123, 249, 220, 21, 113, 
+    249, 220, 21, 134, 249, 220, 21, 244, 12, 249, 220, 21, 244, 82, 249, 
+    220, 21, 219, 126, 249, 220, 21, 220, 123, 249, 220, 21, 245, 194, 249, 
+    220, 21, 228, 201, 249, 220, 88, 7, 6, 1, 61, 88, 7, 6, 1, 253, 159, 88, 
+    7, 6, 1, 251, 67, 88, 7, 6, 1, 249, 61, 88, 7, 6, 1, 75, 88, 7, 6, 1, 
+    245, 7, 88, 7, 6, 1, 243, 203, 88, 7, 6, 1, 242, 61, 88, 7, 6, 1, 73, 88, 
+    7, 6, 1, 235, 145, 88, 7, 6, 1, 235, 24, 88, 7, 6, 1, 156, 88, 7, 6, 1, 
+    193, 88, 7, 6, 1, 230, 26, 88, 7, 6, 1, 76, 88, 7, 6, 1, 226, 106, 88, 7, 
+    6, 1, 224, 97, 88, 7, 6, 1, 153, 88, 7, 6, 1, 222, 92, 88, 7, 6, 1, 217, 
+    153, 88, 7, 6, 1, 70, 88, 7, 6, 1, 214, 105, 88, 7, 6, 1, 212, 98, 88, 7, 
+    6, 1, 211, 178, 88, 7, 6, 1, 211, 117, 88, 7, 6, 1, 210, 159, 216, 7, 
+    220, 54, 251, 158, 7, 6, 1, 222, 92, 37, 32, 7, 6, 1, 251, 67, 37, 32, 7, 
+    6, 1, 153, 37, 250, 192, 37, 211, 180, 92, 7, 6, 1, 61, 92, 7, 6, 1, 253, 
+    159, 92, 7, 6, 1, 251, 67, 92, 7, 6, 1, 249, 61, 92, 7, 6, 1, 75, 92, 7, 
+    6, 1, 245, 7, 92, 7, 6, 1, 243, 203, 92, 7, 6, 1, 242, 61, 92, 7, 6, 1, 
+    73, 92, 7, 6, 1, 235, 145, 92, 7, 6, 1, 235, 24, 92, 7, 6, 1, 156, 92, 7, 
+    6, 1, 193, 92, 7, 6, 1, 230, 26, 92, 7, 6, 1, 76, 92, 7, 6, 1, 226, 106, 
+    92, 7, 6, 1, 224, 97, 92, 7, 6, 1, 153, 92, 7, 6, 1, 222, 92, 92, 7, 6, 
+    1, 217, 153, 92, 7, 6, 1, 70, 92, 7, 6, 1, 214, 105, 92, 7, 6, 1, 212, 
+    98, 92, 7, 6, 1, 211, 178, 92, 7, 6, 1, 211, 117, 92, 7, 6, 1, 210, 159, 
+    92, 240, 202, 92, 230, 50, 92, 221, 184, 92, 218, 227, 92, 224, 219, 92, 
+    212, 23, 152, 37, 7, 6, 1, 61, 152, 37, 7, 6, 1, 253, 159, 152, 37, 7, 6, 
+    1, 251, 67, 152, 37, 7, 6, 1, 249, 61, 152, 37, 7, 6, 1, 75, 152, 37, 7, 
+    6, 1, 245, 7, 152, 37, 7, 6, 1, 243, 203, 152, 37, 7, 6, 1, 242, 61, 152, 
+    37, 7, 6, 1, 73, 152, 37, 7, 6, 1, 235, 145, 152, 37, 7, 6, 1, 235, 24, 
+    152, 37, 7, 6, 1, 156, 152, 37, 7, 6, 1, 193, 152, 37, 7, 6, 1, 230, 26, 
+    152, 37, 7, 6, 1, 76, 152, 37, 7, 6, 1, 226, 106, 152, 37, 7, 6, 1, 224, 
+    97, 152, 37, 7, 6, 1, 153, 152, 37, 7, 6, 1, 222, 92, 152, 37, 7, 6, 1, 
+    217, 153, 152, 37, 7, 6, 1, 70, 152, 37, 7, 6, 1, 214, 105, 152, 37, 7, 
+    6, 1, 212, 98, 152, 37, 7, 6, 1, 211, 178, 152, 37, 7, 6, 1, 211, 117, 
+    152, 37, 7, 6, 1, 210, 159, 223, 158, 231, 98, 50, 223, 158, 231, 95, 50, 
+    152, 92, 7, 6, 1, 61, 152, 92, 7, 6, 1, 253, 159, 152, 92, 7, 6, 1, 251, 
+    67, 152, 92, 7, 6, 1, 249, 61, 152, 92, 7, 6, 1, 75, 152, 92, 7, 6, 1, 
+    245, 7, 152, 92, 7, 6, 1, 243, 203, 152, 92, 7, 6, 1, 242, 61, 152, 92, 
+    7, 6, 1, 73, 152, 92, 7, 6, 1, 235, 145, 152, 92, 7, 6, 1, 235, 24, 152, 
+    92, 7, 6, 1, 156, 152, 92, 7, 6, 1, 193, 152, 92, 7, 6, 1, 230, 26, 152, 
+    92, 7, 6, 1, 76, 152, 92, 7, 6, 1, 226, 106, 152, 92, 7, 6, 1, 224, 97, 
+    152, 92, 7, 6, 1, 153, 152, 92, 7, 6, 1, 222, 92, 152, 92, 7, 6, 1, 217, 
+    153, 152, 92, 7, 6, 1, 70, 152, 92, 7, 6, 1, 214, 105, 152, 92, 7, 6, 1, 
+    212, 98, 152, 92, 7, 6, 1, 211, 178, 152, 92, 7, 6, 1, 211, 117, 152, 92, 
+    7, 6, 1, 210, 159, 249, 129, 152, 92, 7, 6, 1, 226, 106, 152, 92, 240, 
+    114, 152, 92, 190, 152, 92, 206, 152, 92, 255, 26, 152, 92, 212, 23, 42, 
+    247, 165, 92, 250, 24, 92, 249, 171, 92, 243, 253, 92, 240, 106, 92, 229, 
+    87, 92, 229, 80, 92, 226, 215, 92, 219, 36, 92, 120, 2, 245, 32, 78, 92, 
+    213, 119, 223, 104, 235, 240, 16, 1, 61, 223, 104, 235, 240, 16, 1, 253, 
+    159, 223, 104, 235, 240, 16, 1, 251, 67, 223, 104, 235, 240, 16, 1, 249, 
+    61, 223, 104, 235, 240, 16, 1, 75, 223, 104, 235, 240, 16, 1, 245, 7, 
+    223, 104, 235, 240, 16, 1, 243, 203, 223, 104, 235, 240, 16, 1, 242, 61, 
+    223, 104, 235, 240, 16, 1, 73, 223, 104, 235, 240, 16, 1, 235, 145, 223, 
+    104, 235, 240, 16, 1, 235, 24, 223, 104, 235, 240, 16, 1, 156, 223, 104, 
+    235, 240, 16, 1, 193, 223, 104, 235, 240, 16, 1, 230, 26, 223, 104, 235, 
+    240, 16, 1, 76, 223, 104, 235, 240, 16, 1, 226, 106, 223, 104, 235, 240, 
+    16, 1, 224, 97, 223, 104, 235, 240, 16, 1, 153, 223, 104, 235, 240, 16, 
+    1, 222, 92, 223, 104, 235, 240, 16, 1, 217, 153, 223, 104, 235, 240, 16, 
+    1, 70, 223, 104, 235, 240, 16, 1, 214, 105, 223, 104, 235, 240, 16, 1, 
+    212, 98, 223, 104, 235, 240, 16, 1, 211, 178, 223, 104, 235, 240, 16, 1, 
+    211, 117, 223, 104, 235, 240, 16, 1, 210, 159, 42, 141, 241, 64, 92, 56, 
+    234, 19, 92, 56, 206, 92, 9, 214, 177, 238, 51, 92, 9, 214, 177, 238, 55, 
+    92, 9, 214, 177, 238, 63, 92, 56, 248, 91, 92, 9, 214, 177, 238, 70, 92, 
+    9, 214, 177, 238, 57, 92, 9, 214, 177, 238, 29, 92, 9, 214, 177, 238, 56, 
+    92, 9, 214, 177, 238, 69, 92, 9, 214, 177, 238, 43, 92, 9, 214, 177, 238, 
+    36, 92, 9, 214, 177, 238, 45, 92, 9, 214, 177, 238, 66, 92, 9, 214, 177, 
+    238, 52, 92, 9, 214, 177, 238, 68, 92, 9, 214, 177, 238, 44, 92, 9, 214, 
+    177, 238, 67, 92, 9, 214, 177, 238, 30, 92, 9, 214, 177, 238, 35, 92, 9, 
+    214, 177, 238, 28, 92, 9, 214, 177, 238, 58, 92, 9, 214, 177, 238, 60, 
+    92, 9, 214, 177, 238, 38, 92, 9, 214, 177, 238, 49, 92, 9, 214, 177, 238, 
+    47, 92, 9, 214, 177, 238, 73, 92, 9, 214, 177, 238, 72, 92, 9, 214, 177, 
+    238, 26, 92, 9, 214, 177, 238, 53, 92, 9, 214, 177, 238, 71, 92, 9, 214, 
+    177, 238, 62, 92, 9, 214, 177, 238, 48, 92, 9, 214, 177, 238, 27, 92, 9, 
+    214, 177, 238, 50, 92, 9, 214, 177, 238, 32, 92, 9, 214, 177, 238, 31, 
+    92, 9, 214, 177, 238, 61, 92, 9, 214, 177, 238, 39, 92, 9, 214, 177, 238, 
+    41, 92, 9, 214, 177, 238, 42, 92, 9, 214, 177, 238, 34, 92, 9, 214, 177, 
+    238, 65, 92, 9, 214, 177, 238, 59, 216, 7, 220, 54, 251, 158, 9, 214, 
+    177, 238, 40, 216, 7, 220, 54, 251, 158, 9, 214, 177, 238, 72, 216, 7, 
+    220, 54, 251, 158, 9, 214, 177, 238, 70, 216, 7, 220, 54, 251, 158, 9, 
+    214, 177, 238, 54, 216, 7, 220, 54, 251, 158, 9, 214, 177, 238, 37, 216, 
+    7, 220, 54, 251, 158, 9, 214, 177, 238, 50, 216, 7, 220, 54, 251, 158, 9, 
+    214, 177, 238, 33, 216, 7, 220, 54, 251, 158, 9, 214, 177, 238, 64, 216, 
+    7, 220, 54, 251, 158, 9, 214, 177, 238, 46, 37, 154, 254, 246, 37, 154, 
+    255, 13, 249, 72, 244, 43, 250, 1, 214, 194, 228, 214, 2, 218, 154, 218, 
+    34, 117, 230, 115, 218, 33, 250, 27, 253, 208, 246, 55, 218, 32, 117, 
+    251, 119, 223, 159, 251, 141, 253, 208, 228, 213, 212, 41, 212, 35, 213, 
+    131, 230, 196, 212, 25, 245, 225, 242, 182, 245, 46, 245, 225, 242, 182, 
+    254, 129, 245, 225, 242, 182, 253, 226, 242, 182, 2, 231, 52, 166, 230, 
+    130, 87, 212, 27, 249, 138, 230, 130, 87, 244, 93, 224, 23, 230, 130, 87, 
+    212, 27, 242, 211, 230, 130, 87, 243, 230, 230, 130, 87, 212, 52, 242, 
+    211, 230, 130, 87, 233, 81, 224, 23, 230, 130, 87, 212, 52, 249, 138, 
+    230, 130, 87, 249, 138, 230, 129, 166, 230, 130, 2, 244, 191, 244, 93, 
+    224, 23, 230, 130, 2, 244, 191, 233, 81, 224, 23, 230, 130, 2, 244, 191, 
+    243, 230, 230, 130, 2, 244, 191, 218, 39, 2, 244, 191, 242, 180, 218, 
+    157, 220, 0, 218, 157, 250, 117, 221, 169, 245, 40, 215, 236, 248, 85, 
+    215, 236, 226, 60, 215, 236, 251, 28, 215, 110, 250, 119, 251, 211, 222, 
+    192, 241, 180, 218, 37, 251, 211, 245, 229, 64, 231, 195, 245, 229, 64, 
+    223, 32, 241, 205, 244, 12, 233, 55, 249, 247, 231, 171, 233, 54, 244, 
+    177, 233, 54, 233, 55, 244, 48, 236, 1, 211, 239, 230, 59, 216, 35, 253, 
+    192, 242, 144, 231, 68, 212, 39, 217, 58, 233, 27, 252, 150, 225, 63, 
+    223, 112, 254, 55, 242, 128, 254, 55, 225, 218, 225, 219, 250, 120, 218, 
+    115, 242, 24, 219, 91, 64, 225, 45, 231, 88, 226, 198, 251, 195, 224, 
+    230, 233, 37, 223, 33, 249, 143, 223, 33, 252, 160, 249, 174, 223, 32, 
+    249, 96, 22, 223, 32, 218, 142, 251, 168, 219, 15, 251, 152, 243, 252, 
+    243, 248, 222, 208, 217, 247, 224, 232, 248, 176, 226, 237, 218, 8, 243, 
+    249, 219, 231, 244, 92, 251, 22, 2, 217, 240, 248, 36, 219, 53, 240, 113, 
+    249, 142, 220, 71, 240, 112, 240, 113, 249, 142, 246, 109, 249, 173, 250, 
+    85, 130, 250, 255, 232, 142, 249, 89, 241, 56, 224, 234, 219, 241, 252, 
+    37, 251, 164, 224, 235, 64, 244, 34, 249, 172, 244, 25, 22, 234, 33, 217, 
+    20, 211, 230, 242, 14, 222, 13, 251, 178, 22, 249, 103, 211, 237, 242, 
+    185, 249, 236, 242, 185, 215, 194, 246, 91, 252, 63, 230, 94, 250, 8, 
+    252, 63, 230, 93, 252, 188, 251, 177, 223, 34, 211, 201, 224, 196, 251, 
+    236, 251, 21, 235, 139, 250, 78, 215, 236, 244, 163, 250, 77, 244, 95, 
+    244, 96, 219, 13, 252, 159, 225, 251, 224, 245, 249, 205, 252, 160, 217, 
+    60, 215, 236, 249, 129, 244, 68, 225, 64, 248, 82, 235, 132, 247, 132, 
+    250, 233, 218, 114, 211, 240, 250, 99, 230, 130, 213, 164, 250, 163, 221, 
+    200, 221, 225, 242, 149, 250, 252, 250, 234, 240, 246, 244, 131, 212, 0, 
+    222, 201, 249, 237, 244, 87, 225, 3, 22, 244, 91, 230, 228, 230, 109, 
+    251, 11, 250, 40, 241, 233, 253, 242, 226, 63, 216, 15, 241, 252, 250, 
+    30, 216, 243, 216, 114, 250, 21, 251, 203, 225, 178, 253, 241, 213, 172, 
+    243, 111, 247, 198, 241, 157, 219, 85, 231, 235, 251, 246, 243, 112, 247, 
+    241, 251, 167, 244, 53, 225, 34, 250, 242, 28, 228, 48, 230, 86, 28, 228, 
+    43, 221, 213, 242, 100, 28, 234, 138, 215, 191, 213, 154, 28, 221, 193, 
+    222, 125, 220, 12, 2, 221, 228, 216, 245, 223, 179, 22, 252, 160, 219, 
+    106, 22, 219, 106, 251, 188, 252, 124, 22, 241, 50, 250, 121, 244, 74, 
+    219, 64, 222, 126, 218, 13, 215, 195, 240, 247, 223, 180, 254, 130, 244, 
+    32, 222, 137, 244, 32, 217, 242, 240, 236, 251, 120, 240, 236, 2, 243, 
+    95, 226, 230, 251, 120, 235, 132, 224, 240, 226, 229, 245, 45, 224, 240, 
+    226, 229, 240, 245, 252, 146, 253, 182, 216, 253, 231, 235, 240, 241, 
+    232, 112, 240, 241, 249, 177, 218, 126, 221, 199, 248, 44, 218, 126, 244, 
+    181, 235, 150, 233, 90, 235, 132, 250, 227, 245, 45, 250, 227, 223, 142, 
+    230, 113, 226, 115, 212, 41, 251, 124, 249, 146, 216, 107, 233, 19, 223, 
+    181, 250, 225, 246, 97, 249, 136, 212, 3, 219, 71, 219, 69, 240, 246, 
+    223, 154, 242, 171, 220, 58, 230, 146, 222, 195, 250, 109, 247, 137, 225, 
+    74, 251, 204, 245, 170, 226, 239, 218, 253, 220, 53, 251, 123, 254, 93, 
+    241, 55, 233, 122, 252, 61, 244, 91, 215, 194, 244, 91, 251, 210, 215, 
+    91, 241, 250, 250, 110, 252, 188, 250, 110, 243, 243, 252, 188, 250, 110, 
+    251, 238, 225, 196, 234, 27, 224, 249, 246, 88, 251, 12, 252, 178, 251, 
+    12, 247, 131, 230, 114, 244, 191, 249, 147, 244, 191, 216, 108, 244, 191, 
+    223, 182, 244, 191, 250, 226, 244, 191, 246, 98, 244, 191, 218, 242, 212, 
+    3, 240, 247, 244, 191, 230, 147, 244, 191, 247, 138, 244, 191, 225, 75, 
+    244, 191, 243, 246, 244, 191, 242, 21, 244, 191, 211, 224, 244, 191, 252, 
+    72, 244, 191, 226, 46, 244, 191, 225, 75, 228, 54, 225, 233, 224, 187, 
+    245, 14, 245, 228, 228, 54, 230, 111, 216, 20, 71, 120, 225, 8, 252, 183, 
+    235, 243, 71, 124, 225, 8, 252, 183, 235, 243, 71, 43, 225, 8, 252, 183, 
+    235, 243, 71, 44, 225, 8, 252, 183, 235, 243, 244, 85, 242, 17, 50, 212, 
+    33, 242, 17, 50, 226, 216, 242, 17, 50, 216, 136, 120, 50, 216, 136, 124, 
+    50, 250, 20, 242, 12, 50, 204, 242, 12, 50, 249, 124, 211, 220, 241, 252, 
+    245, 15, 229, 105, 217, 152, 235, 126, 246, 93, 234, 83, 251, 248, 211, 
+    220, 249, 250, 224, 128, 242, 15, 224, 231, 231, 178, 220, 5, 253, 204, 
+    220, 5, 241, 165, 220, 5, 211, 220, 221, 241, 211, 220, 251, 187, 244, 
+    30, 251, 91, 236, 1, 219, 170, 251, 90, 236, 1, 219, 170, 251, 163, 242, 
+    195, 231, 186, 211, 221, 244, 175, 231, 187, 22, 211, 222, 241, 61, 242, 
+    11, 113, 231, 60, 241, 61, 242, 11, 113, 211, 219, 241, 61, 242, 11, 225, 
+    0, 226, 228, 211, 222, 2, 251, 107, 245, 226, 251, 142, 2, 213, 246, 225, 
+    169, 2, 251, 213, 242, 35, 231, 187, 2, 242, 111, 225, 110, 231, 175, 
+    231, 187, 2, 215, 98, 226, 209, 231, 186, 226, 209, 211, 221, 252, 187, 
+    249, 191, 211, 205, 224, 190, 235, 132, 226, 224, 235, 132, 242, 170, 
+    242, 223, 252, 188, 254, 114, 245, 19, 254, 161, 254, 162, 230, 137, 236, 
+    6, 219, 101, 235, 233, 248, 35, 225, 168, 242, 106, 248, 180, 232, 202, 
+    229, 212, 224, 255, 244, 192, 231, 143, 242, 34, 252, 139, 225, 2, 217, 
+    172, 225, 67, 234, 65, 78, 232, 112, 233, 11, 222, 234, 243, 55, 218, 
+    132, 234, 64, 251, 172, 249, 149, 2, 241, 228, 212, 19, 252, 70, 241, 
+    228, 251, 136, 241, 228, 113, 241, 226, 219, 11, 241, 228, 242, 121, 241, 
+    228, 241, 229, 2, 74, 251, 209, 241, 228, 242, 128, 241, 228, 211, 42, 
+    241, 228, 224, 129, 241, 228, 241, 229, 2, 223, 34, 223, 45, 241, 226, 
+    241, 229, 248, 82, 247, 250, 220, 83, 2, 115, 59, 235, 216, 245, 173, 
+    192, 251, 117, 254, 113, 87, 251, 196, 219, 93, 87, 249, 229, 87, 218, 
+    247, 217, 249, 87, 246, 86, 248, 158, 87, 225, 68, 64, 224, 250, 244, 62, 
+    252, 4, 247, 166, 87, 219, 4, 252, 159, 216, 150, 252, 159, 71, 244, 52, 
+    240, 212, 225, 6, 87, 230, 150, 252, 173, 249, 99, 245, 33, 114, 247, 
+    133, 50, 249, 140, 250, 243, 252, 145, 2, 211, 40, 50, 252, 145, 2, 247, 
+    133, 50, 252, 145, 2, 245, 48, 50, 252, 145, 2, 224, 229, 50, 230, 150, 
+    2, 211, 235, 250, 139, 2, 214, 153, 215, 232, 22, 211, 40, 50, 221, 179, 
+    225, 167, 249, 209, 251, 140, 230, 187, 244, 57, 247, 186, 226, 162, 247, 
+    191, 246, 50, 244, 108, 244, 41, 204, 244, 108, 244, 41, 226, 77, 2, 249, 
+    101, 226, 77, 244, 184, 214, 163, 251, 17, 217, 19, 251, 17, 250, 244, 
+    235, 243, 250, 139, 2, 214, 153, 215, 231, 250, 139, 2, 246, 105, 215, 
+    231, 252, 142, 250, 138, 250, 7, 224, 124, 222, 186, 224, 124, 226, 20, 
+    218, 122, 222, 132, 215, 223, 222, 132, 251, 192, 217, 92, 233, 52, 228, 
+    46, 228, 47, 2, 248, 81, 249, 148, 250, 1, 251, 193, 204, 251, 193, 242, 
+    128, 251, 193, 251, 209, 251, 193, 226, 158, 251, 193, 251, 190, 229, 
+    206, 252, 176, 221, 187, 231, 61, 217, 2, 223, 124, 226, 75, 244, 160, 
+    231, 235, 221, 224, 254, 90, 224, 146, 254, 253, 232, 114, 250, 128, 231, 
+    73, 226, 130, 215, 239, 235, 253, 215, 239, 226, 83, 246, 25, 87, 235, 
+    250, 245, 120, 245, 121, 2, 246, 105, 80, 48, 250, 1, 231, 201, 2, 232, 
+    108, 244, 74, 250, 1, 231, 201, 2, 223, 158, 244, 74, 204, 231, 201, 2, 
+    223, 158, 244, 74, 204, 231, 201, 2, 232, 108, 244, 74, 224, 237, 224, 
+    238, 240, 249, 229, 85, 230, 160, 225, 118, 230, 160, 225, 119, 2, 97, 
+    80, 253, 208, 233, 47, 213, 175, 230, 159, 230, 160, 225, 119, 226, 231, 
+    228, 76, 230, 160, 225, 117, 254, 91, 2, 252, 130, 251, 11, 213, 172, 
+    251, 11, 216, 255, 223, 174, 213, 171, 215, 60, 97, 253, 248, 250, 3, 97, 
+    22, 140, 204, 250, 37, 253, 248, 250, 3, 97, 22, 140, 204, 250, 37, 253, 
+    249, 2, 37, 123, 226, 121, 250, 3, 246, 105, 22, 214, 153, 204, 250, 37, 
+    253, 248, 254, 89, 246, 105, 22, 214, 153, 204, 250, 37, 253, 248, 121, 
+    251, 139, 87, 125, 251, 139, 87, 219, 8, 2, 251, 5, 91, 219, 7, 219, 8, 
+    2, 123, 219, 32, 212, 35, 219, 8, 2, 134, 219, 32, 212, 34, 252, 116, 
+    245, 173, 225, 28, 233, 43, 231, 212, 242, 185, 222, 248, 231, 212, 242, 
+    185, 232, 153, 2, 235, 226, 225, 200, 250, 1, 232, 153, 2, 234, 139, 234, 
+    139, 232, 152, 204, 232, 152, 252, 45, 252, 46, 2, 251, 5, 91, 251, 191, 
+    232, 205, 87, 223, 175, 251, 87, 252, 186, 2, 140, 80, 48, 245, 144, 2, 
+    140, 80, 48, 226, 198, 2, 245, 32, 164, 2, 43, 44, 80, 48, 219, 40, 2, 
+    97, 80, 48, 216, 15, 2, 214, 153, 80, 48, 228, 76, 123, 214, 184, 245, 
+    192, 87, 234, 137, 216, 248, 235, 220, 16, 31, 7, 6, 233, 10, 235, 220, 
+    16, 31, 7, 4, 233, 10, 235, 220, 16, 31, 227, 200, 235, 220, 16, 31, 217, 
+    184, 235, 220, 16, 31, 7, 233, 10, 244, 97, 245, 173, 216, 10, 211, 199, 
+    242, 22, 227, 183, 22, 251, 198, 241, 67, 225, 51, 230, 227, 217, 0, 249, 
+    115, 252, 160, 219, 126, 225, 10, 218, 158, 2, 230, 225, 247, 121, 235, 
+    132, 16, 31, 252, 58, 215, 221, 245, 157, 85, 42, 251, 87, 71, 42, 251, 
+    87, 233, 86, 223, 112, 250, 36, 233, 86, 251, 209, 250, 36, 233, 86, 226, 
+    158, 247, 249, 233, 86, 251, 209, 247, 249, 4, 226, 158, 247, 249, 4, 
+    251, 209, 247, 249, 214, 162, 223, 112, 215, 226, 246, 106, 223, 112, 
+    215, 226, 214, 162, 4, 223, 112, 215, 226, 246, 106, 4, 223, 112, 215, 
+    226, 37, 249, 132, 224, 253, 249, 132, 224, 254, 2, 242, 27, 51, 249, 
+    132, 224, 253, 228, 50, 43, 220, 154, 2, 134, 247, 119, 250, 5, 244, 192, 
+    123, 226, 243, 250, 5, 244, 192, 113, 226, 243, 250, 5, 244, 192, 134, 
+    226, 243, 250, 5, 244, 192, 244, 12, 226, 243, 250, 5, 244, 192, 244, 82, 
+    226, 243, 250, 5, 244, 192, 219, 126, 226, 243, 250, 5, 244, 192, 220, 
+    123, 226, 243, 250, 5, 244, 192, 245, 194, 226, 243, 250, 5, 244, 192, 
+    228, 201, 226, 243, 250, 5, 244, 192, 216, 249, 226, 243, 250, 5, 244, 
+    192, 245, 169, 226, 243, 250, 5, 244, 192, 215, 77, 226, 243, 250, 5, 
+    244, 192, 226, 193, 250, 5, 244, 192, 215, 56, 250, 5, 244, 192, 216, 
+    141, 250, 5, 244, 192, 244, 8, 250, 5, 244, 192, 244, 80, 250, 5, 244, 
+    192, 219, 122, 250, 5, 244, 192, 220, 122, 250, 5, 244, 192, 245, 193, 
+    250, 5, 244, 192, 228, 200, 250, 5, 244, 192, 216, 247, 250, 5, 244, 192, 
+    245, 167, 250, 5, 244, 192, 215, 75, 230, 118, 243, 231, 216, 37, 216, 3, 
+    218, 149, 64, 232, 240, 219, 171, 64, 235, 133, 230, 107, 242, 125, 244, 
+    191, 242, 125, 244, 192, 2, 219, 75, 245, 14, 244, 192, 2, 217, 15, 64, 
+    235, 54, 219, 75, 244, 192, 2, 204, 230, 111, 219, 75, 244, 192, 2, 204, 
+    230, 112, 22, 219, 75, 245, 14, 219, 75, 244, 192, 2, 204, 230, 112, 22, 
+    249, 231, 217, 248, 219, 75, 244, 192, 2, 204, 230, 112, 22, 216, 105, 
+    245, 14, 219, 75, 244, 192, 2, 242, 26, 219, 75, 244, 192, 2, 240, 248, 
+    211, 233, 244, 191, 219, 75, 244, 192, 2, 219, 75, 245, 14, 244, 192, 
+    221, 218, 248, 63, 244, 34, 223, 89, 244, 191, 219, 75, 244, 192, 2, 241, 
+    227, 245, 14, 219, 75, 244, 192, 2, 218, 35, 219, 74, 244, 191, 229, 88, 
+    244, 191, 245, 24, 244, 191, 214, 188, 244, 191, 244, 192, 2, 249, 231, 
+    217, 248, 225, 193, 244, 191, 249, 202, 244, 191, 249, 203, 244, 191, 
+    234, 63, 244, 191, 244, 192, 216, 138, 115, 234, 64, 234, 63, 244, 192, 
+    2, 219, 75, 245, 14, 234, 63, 244, 192, 2, 250, 1, 245, 14, 244, 192, 2, 
+    218, 89, 216, 20, 244, 192, 2, 218, 89, 216, 21, 22, 211, 233, 245, 16, 
+    244, 192, 2, 218, 89, 216, 21, 22, 216, 105, 245, 14, 247, 193, 244, 191, 
+    211, 204, 244, 191, 254, 109, 244, 191, 224, 228, 244, 191, 249, 117, 
+    244, 191, 225, 171, 244, 191, 244, 192, 2, 232, 127, 64, 215, 205, 247, 
+    193, 251, 89, 223, 89, 244, 191, 243, 240, 244, 192, 2, 204, 230, 111, 
+    254, 107, 244, 191, 244, 153, 244, 191, 212, 20, 244, 191, 219, 92, 244, 
+    191, 216, 72, 244, 191, 242, 126, 244, 191, 232, 115, 249, 117, 244, 191, 
+    244, 192, 2, 204, 230, 111, 240, 204, 244, 191, 244, 192, 2, 204, 230, 
+    112, 22, 249, 231, 217, 248, 244, 192, 221, 191, 236, 1, 244, 154, 253, 
+    214, 244, 191, 244, 50, 244, 191, 219, 93, 244, 191, 247, 166, 244, 191, 
+    244, 192, 211, 230, 230, 111, 244, 192, 2, 231, 85, 231, 145, 242, 125, 
+    250, 226, 244, 192, 2, 219, 75, 245, 14, 250, 226, 244, 192, 2, 217, 15, 
+    64, 235, 54, 219, 75, 250, 226, 244, 192, 2, 204, 230, 111, 219, 75, 250, 
+    226, 244, 192, 2, 241, 227, 245, 14, 250, 226, 244, 192, 2, 211, 196, 
+    219, 76, 234, 63, 250, 226, 244, 192, 2, 250, 1, 245, 14, 224, 228, 250, 
+    226, 244, 191, 249, 117, 250, 226, 244, 191, 212, 20, 250, 226, 244, 191, 
+    244, 192, 2, 228, 76, 242, 164, 243, 35, 244, 192, 2, 226, 216, 243, 35, 
+    225, 169, 251, 169, 248, 76, 221, 170, 230, 146, 241, 230, 230, 146, 219, 
+    9, 230, 146, 242, 6, 225, 169, 223, 157, 123, 242, 16, 225, 169, 223, 
+    157, 251, 179, 242, 12, 236, 1, 250, 180, 225, 169, 243, 239, 225, 169, 
+    2, 224, 228, 244, 191, 225, 169, 2, 244, 42, 242, 11, 222, 204, 241, 215, 
+    218, 144, 232, 150, 223, 163, 250, 245, 241, 163, 215, 249, 241, 163, 
+    215, 250, 2, 251, 115, 228, 54, 215, 249, 231, 33, 192, 223, 164, 218, 
+    150, 215, 247, 215, 248, 250, 245, 251, 93, 226, 195, 251, 93, 215, 202, 
+    251, 94, 218, 130, 230, 188, 254, 131, 244, 98, 245, 138, 225, 0, 250, 
+    245, 226, 195, 225, 0, 250, 245, 217, 33, 226, 195, 217, 33, 253, 181, 
+    226, 195, 253, 181, 223, 119, 213, 247, 248, 59, 215, 193, 253, 243, 232, 
+    118, 215, 255, 230, 140, 230, 117, 223, 162, 218, 7, 223, 162, 230, 117, 
+    251, 29, 254, 230, 215, 246, 220, 17, 222, 183, 219, 2, 203, 215, 253, 
+    232, 231, 67, 215, 253, 232, 231, 249, 191, 50, 225, 0, 250, 230, 223, 
+    45, 232, 231, 215, 223, 244, 75, 226, 198, 224, 239, 247, 124, 228, 76, 
+    245, 126, 50, 219, 73, 87, 228, 76, 219, 73, 87, 224, 123, 232, 194, 236, 
+    1, 235, 158, 225, 42, 87, 247, 147, 228, 53, 232, 194, 87, 224, 233, 212, 
+    41, 87, 228, 67, 212, 41, 87, 252, 3, 228, 76, 252, 2, 252, 1, 230, 117, 
+    252, 1, 225, 214, 228, 76, 225, 213, 250, 101, 249, 125, 231, 57, 87, 
+    211, 218, 87, 223, 60, 252, 188, 87, 216, 38, 212, 41, 249, 254, 219, 
+    235, 252, 119, 252, 117, 225, 243, 249, 178, 249, 87, 252, 170, 250, 23, 
+    43, 232, 91, 108, 16, 31, 224, 4, 108, 16, 31, 254, 193, 108, 16, 31, 
+    244, 97, 108, 16, 31, 245, 224, 108, 16, 31, 212, 40, 108, 16, 31, 254, 
+    44, 108, 16, 31, 254, 45, 223, 106, 108, 16, 31, 254, 45, 223, 105, 108, 
+    16, 31, 254, 45, 213, 143, 108, 16, 31, 254, 45, 213, 142, 108, 16, 31, 
     213, 157, 108, 16, 31, 213, 156, 108, 16, 31, 213, 155, 108, 16, 31, 218, 
-    44, 108, 16, 31, 225, 125, 218, 44, 108, 16, 31, 85, 218, 44, 108, 16, 
-    31, 231, 55, 218, 71, 108, 16, 31, 231, 55, 218, 70, 108, 16, 31, 231, 
-    55, 218, 69, 108, 16, 31, 250, 38, 108, 16, 31, 222, 1, 108, 16, 31, 228, 
-    188, 108, 16, 31, 213, 141, 108, 16, 31, 213, 140, 108, 16, 31, 222, 204, 
-    222, 1, 108, 16, 31, 222, 204, 222, 0, 108, 16, 31, 242, 166, 108, 16, 
-    31, 219, 166, 108, 16, 31, 235, 177, 226, 153, 108, 16, 31, 235, 177, 
-    226, 152, 108, 16, 31, 249, 134, 64, 235, 176, 108, 16, 31, 223, 101, 64, 
-    235, 176, 108, 16, 31, 249, 168, 226, 153, 108, 16, 31, 235, 175, 226, 
-    153, 108, 16, 31, 218, 72, 64, 249, 167, 108, 16, 31, 249, 134, 64, 249, 
-    167, 108, 16, 31, 249, 134, 64, 249, 166, 108, 16, 31, 249, 168, 254, 83, 
-    108, 16, 31, 222, 2, 64, 249, 168, 254, 83, 108, 16, 31, 218, 72, 64, 
-    222, 2, 64, 249, 167, 108, 16, 31, 213, 243, 108, 16, 31, 216, 84, 226, 
-    153, 108, 16, 31, 233, 57, 226, 153, 108, 16, 31, 254, 82, 226, 153, 108, 
-    16, 31, 218, 72, 64, 254, 81, 108, 16, 31, 222, 2, 64, 254, 81, 108, 16, 
-    31, 218, 72, 64, 222, 2, 64, 254, 81, 108, 16, 31, 213, 158, 64, 254, 81, 
-    108, 16, 31, 223, 101, 64, 254, 81, 108, 16, 31, 223, 101, 64, 254, 80, 
-    108, 16, 31, 223, 100, 108, 16, 31, 223, 99, 108, 16, 31, 223, 98, 108, 
-    16, 31, 223, 97, 108, 16, 31, 254, 157, 108, 16, 31, 254, 156, 108, 16, 
-    31, 231, 163, 108, 16, 31, 222, 7, 108, 16, 31, 253, 246, 108, 16, 31, 
-    223, 125, 108, 16, 31, 223, 124, 108, 16, 31, 253, 183, 108, 16, 31, 251, 
-    229, 226, 153, 108, 16, 31, 217, 49, 108, 16, 31, 217, 48, 108, 16, 31, 
-    224, 8, 232, 222, 108, 16, 31, 251, 183, 108, 16, 31, 251, 182, 108, 16, 
-    31, 251, 181, 108, 16, 31, 254, 138, 108, 16, 31, 226, 218, 108, 16, 31, 
-    218, 248, 108, 16, 31, 216, 82, 108, 16, 31, 242, 96, 108, 16, 31, 212, 
-    28, 108, 16, 31, 224, 226, 108, 16, 31, 251, 14, 108, 16, 31, 215, 86, 
-    108, 16, 31, 250, 246, 230, 122, 108, 16, 31, 221, 202, 64, 235, 55, 108, 
-    16, 31, 251, 25, 108, 16, 31, 215, 219, 108, 16, 31, 218, 154, 215, 219, 
-    108, 16, 31, 232, 148, 108, 16, 31, 219, 56, 108, 16, 31, 214, 142, 108, 
-    16, 31, 240, 246, 246, 64, 108, 16, 31, 253, 227, 108, 16, 31, 224, 234, 
-    253, 227, 108, 16, 31, 251, 142, 108, 16, 31, 224, 225, 251, 142, 108, 
-    16, 31, 254, 135, 108, 16, 31, 218, 117, 218, 26, 218, 116, 108, 16, 31, 
-    218, 117, 218, 26, 218, 115, 108, 16, 31, 218, 68, 108, 16, 31, 224, 200, 
-    108, 16, 31, 247, 181, 108, 16, 31, 247, 183, 108, 16, 31, 247, 182, 108, 
-    16, 31, 224, 131, 108, 16, 31, 224, 120, 108, 16, 31, 249, 122, 108, 16, 
-    31, 249, 121, 108, 16, 31, 249, 120, 108, 16, 31, 249, 119, 108, 16, 31, 
-    249, 118, 108, 16, 31, 254, 169, 108, 16, 31, 252, 119, 64, 231, 149, 
-    108, 16, 31, 252, 119, 64, 214, 17, 108, 16, 31, 223, 57, 108, 16, 31, 
-    240, 238, 108, 16, 31, 228, 212, 108, 16, 31, 248, 145, 108, 16, 31, 230, 
-    134, 108, 16, 31, 163, 246, 94, 108, 16, 31, 163, 226, 132, 9, 14, 240, 
-    102, 9, 14, 240, 101, 9, 14, 240, 100, 9, 14, 240, 99, 9, 14, 240, 98, 9, 
-    14, 240, 97, 9, 14, 240, 96, 9, 14, 240, 95, 9, 14, 240, 94, 9, 14, 240, 
-    93, 9, 14, 240, 92, 9, 14, 240, 91, 9, 14, 240, 90, 9, 14, 240, 89, 9, 
-    14, 240, 88, 9, 14, 240, 87, 9, 14, 240, 86, 9, 14, 240, 85, 9, 14, 240, 
-    84, 9, 14, 240, 83, 9, 14, 240, 82, 9, 14, 240, 81, 9, 14, 240, 80, 9, 
-    14, 240, 79, 9, 14, 240, 78, 9, 14, 240, 77, 9, 14, 240, 76, 9, 14, 240, 
-    75, 9, 14, 240, 74, 9, 14, 240, 73, 9, 14, 240, 72, 9, 14, 240, 71, 9, 
-    14, 240, 70, 9, 14, 240, 69, 9, 14, 240, 68, 9, 14, 240, 67, 9, 14, 240, 
-    66, 9, 14, 240, 65, 9, 14, 240, 64, 9, 14, 240, 63, 9, 14, 240, 62, 9, 
-    14, 240, 61, 9, 14, 240, 60, 9, 14, 240, 59, 9, 14, 240, 58, 9, 14, 240, 
-    57, 9, 14, 240, 56, 9, 14, 240, 55, 9, 14, 240, 54, 9, 14, 240, 53, 9, 
-    14, 240, 52, 9, 14, 240, 51, 9, 14, 240, 50, 9, 14, 240, 49, 9, 14, 240, 
-    48, 9, 14, 240, 47, 9, 14, 240, 46, 9, 14, 240, 45, 9, 14, 240, 44, 9, 
-    14, 240, 43, 9, 14, 240, 42, 9, 14, 240, 41, 9, 14, 240, 40, 9, 14, 240, 
-    39, 9, 14, 240, 38, 9, 14, 240, 37, 9, 14, 240, 36, 9, 14, 240, 35, 9, 
-    14, 240, 34, 9, 14, 240, 33, 9, 14, 240, 32, 9, 14, 240, 31, 9, 14, 240, 
-    30, 9, 14, 240, 29, 9, 14, 240, 28, 9, 14, 240, 27, 9, 14, 240, 26, 9, 
-    14, 240, 25, 9, 14, 240, 24, 9, 14, 240, 23, 9, 14, 240, 22, 9, 14, 240, 
-    21, 9, 14, 240, 20, 9, 14, 240, 19, 9, 14, 240, 18, 9, 14, 240, 17, 9, 
-    14, 240, 16, 9, 14, 240, 15, 9, 14, 240, 14, 9, 14, 240, 13, 9, 14, 240, 
-    12, 9, 14, 240, 11, 9, 14, 240, 10, 9, 14, 240, 9, 9, 14, 240, 8, 9, 14, 
-    240, 7, 9, 14, 240, 6, 9, 14, 240, 5, 9, 14, 240, 4, 9, 14, 240, 3, 9, 
-    14, 240, 2, 9, 14, 240, 1, 9, 14, 240, 0, 9, 14, 239, 255, 9, 14, 239, 
-    254, 9, 14, 239, 253, 9, 14, 239, 252, 9, 14, 239, 251, 9, 14, 239, 250, 
-    9, 14, 239, 249, 9, 14, 239, 248, 9, 14, 239, 247, 9, 14, 239, 246, 9, 
-    14, 239, 245, 9, 14, 239, 244, 9, 14, 239, 243, 9, 14, 239, 242, 9, 14, 
-    239, 241, 9, 14, 239, 240, 9, 14, 239, 239, 9, 14, 239, 238, 9, 14, 239, 
-    237, 9, 14, 239, 236, 9, 14, 239, 235, 9, 14, 239, 234, 9, 14, 239, 233, 
-    9, 14, 239, 232, 9, 14, 239, 231, 9, 14, 239, 230, 9, 14, 239, 229, 9, 
-    14, 239, 228, 9, 14, 239, 227, 9, 14, 239, 226, 9, 14, 239, 225, 9, 14, 
-    239, 224, 9, 14, 239, 223, 9, 14, 239, 222, 9, 14, 239, 221, 9, 14, 239, 
-    220, 9, 14, 239, 219, 9, 14, 239, 218, 9, 14, 239, 217, 9, 14, 239, 216, 
-    9, 14, 239, 215, 9, 14, 239, 214, 9, 14, 239, 213, 9, 14, 239, 212, 9, 
-    14, 239, 211, 9, 14, 239, 210, 9, 14, 239, 209, 9, 14, 239, 208, 9, 14, 
-    239, 207, 9, 14, 239, 206, 9, 14, 239, 205, 9, 14, 239, 204, 9, 14, 239, 
-    203, 9, 14, 239, 202, 9, 14, 239, 201, 9, 14, 239, 200, 9, 14, 239, 199, 
-    9, 14, 239, 198, 9, 14, 239, 197, 9, 14, 239, 196, 9, 14, 239, 195, 9, 
-    14, 239, 194, 9, 14, 239, 193, 9, 14, 239, 192, 9, 14, 239, 191, 9, 14, 
-    239, 190, 9, 14, 239, 189, 9, 14, 239, 188, 9, 14, 239, 187, 9, 14, 239, 
-    186, 9, 14, 239, 185, 9, 14, 239, 184, 9, 14, 239, 183, 9, 14, 239, 182, 
-    9, 14, 239, 181, 9, 14, 239, 180, 9, 14, 239, 179, 9, 14, 239, 178, 9, 
-    14, 239, 177, 9, 14, 239, 176, 9, 14, 239, 175, 9, 14, 239, 174, 9, 14, 
-    239, 173, 9, 14, 239, 172, 9, 14, 239, 171, 9, 14, 239, 170, 9, 14, 239, 
-    169, 9, 14, 239, 168, 9, 14, 239, 167, 9, 14, 239, 166, 9, 14, 239, 165, 
-    9, 14, 239, 164, 9, 14, 239, 163, 9, 14, 239, 162, 9, 14, 239, 161, 9, 
-    14, 239, 160, 9, 14, 239, 159, 9, 14, 239, 158, 9, 14, 239, 157, 9, 14, 
-    239, 156, 9, 14, 239, 155, 9, 14, 239, 154, 9, 14, 239, 153, 9, 14, 239, 
-    152, 9, 14, 239, 151, 9, 14, 239, 150, 9, 14, 239, 149, 9, 14, 239, 148, 
-    9, 14, 239, 147, 9, 14, 239, 146, 9, 14, 239, 145, 9, 14, 239, 144, 9, 
-    14, 239, 143, 9, 14, 239, 142, 9, 14, 239, 141, 9, 14, 239, 140, 9, 14, 
-    239, 139, 9, 14, 239, 138, 9, 14, 239, 137, 9, 14, 239, 136, 9, 14, 239, 
-    135, 9, 14, 239, 134, 9, 14, 239, 133, 9, 14, 239, 132, 9, 14, 239, 131, 
-    9, 14, 239, 130, 9, 14, 239, 129, 9, 14, 239, 128, 9, 14, 239, 127, 9, 
-    14, 239, 126, 9, 14, 239, 125, 9, 14, 239, 124, 9, 14, 239, 123, 9, 14, 
-    239, 122, 9, 14, 239, 121, 9, 14, 239, 120, 9, 14, 239, 119, 9, 14, 239, 
-    118, 9, 14, 239, 117, 9, 14, 239, 116, 9, 14, 239, 115, 9, 14, 239, 114, 
-    9, 14, 239, 113, 9, 14, 239, 112, 9, 14, 239, 111, 9, 14, 239, 110, 9, 
-    14, 239, 109, 9, 14, 239, 108, 9, 14, 239, 107, 9, 14, 239, 106, 9, 14, 
-    239, 105, 9, 14, 239, 104, 9, 14, 239, 103, 9, 14, 239, 102, 9, 14, 239, 
-    101, 9, 14, 239, 100, 9, 14, 239, 99, 9, 14, 239, 98, 9, 14, 239, 97, 9, 
-    14, 239, 96, 9, 14, 239, 95, 9, 14, 239, 94, 9, 14, 239, 93, 9, 14, 239, 
-    92, 9, 14, 239, 91, 9, 14, 239, 90, 9, 14, 239, 89, 9, 14, 239, 88, 9, 
-    14, 239, 87, 9, 14, 239, 86, 9, 14, 239, 85, 9, 14, 239, 84, 9, 14, 239, 
-    83, 9, 14, 239, 82, 9, 14, 239, 81, 9, 14, 239, 80, 9, 14, 239, 79, 9, 
-    14, 239, 78, 9, 14, 239, 77, 9, 14, 239, 76, 9, 14, 239, 75, 9, 14, 239, 
-    74, 9, 14, 239, 73, 9, 14, 239, 72, 9, 14, 239, 71, 9, 14, 239, 70, 9, 
-    14, 239, 69, 9, 14, 239, 68, 9, 14, 239, 67, 9, 14, 239, 66, 9, 14, 239, 
-    65, 9, 14, 239, 64, 9, 14, 239, 63, 9, 14, 239, 62, 9, 14, 239, 61, 9, 
-    14, 239, 60, 9, 14, 239, 59, 9, 14, 239, 58, 9, 14, 239, 57, 9, 14, 239, 
-    56, 9, 14, 239, 55, 9, 14, 239, 54, 9, 14, 239, 53, 9, 14, 239, 52, 9, 
-    14, 239, 51, 9, 14, 239, 50, 9, 14, 239, 49, 9, 14, 239, 48, 9, 14, 239, 
-    47, 9, 14, 239, 46, 9, 14, 239, 45, 9, 14, 239, 44, 9, 14, 239, 43, 9, 
-    14, 239, 42, 9, 14, 239, 41, 9, 14, 239, 40, 9, 14, 239, 39, 9, 14, 239, 
-    38, 9, 14, 239, 37, 9, 14, 239, 36, 9, 14, 239, 35, 9, 14, 239, 34, 9, 
-    14, 239, 33, 9, 14, 239, 32, 9, 14, 239, 31, 9, 14, 239, 30, 9, 14, 239, 
-    29, 9, 14, 239, 28, 9, 14, 239, 27, 9, 14, 239, 26, 9, 14, 239, 25, 9, 
-    14, 239, 24, 9, 14, 239, 23, 9, 14, 239, 22, 9, 14, 239, 21, 9, 14, 239, 
-    20, 9, 14, 239, 19, 9, 14, 239, 18, 9, 14, 239, 17, 9, 14, 239, 16, 9, 
-    14, 239, 15, 9, 14, 239, 14, 9, 14, 239, 13, 9, 14, 239, 12, 9, 14, 239, 
-    11, 9, 14, 239, 10, 9, 14, 239, 9, 9, 14, 239, 8, 9, 14, 239, 7, 9, 14, 
-    239, 6, 9, 14, 239, 5, 9, 14, 239, 4, 9, 14, 239, 3, 9, 14, 239, 2, 9, 
-    14, 239, 1, 9, 14, 239, 0, 9, 14, 238, 255, 9, 14, 238, 254, 9, 14, 238, 
-    253, 9, 14, 238, 252, 9, 14, 238, 251, 9, 14, 238, 250, 9, 14, 238, 249, 
-    9, 14, 238, 248, 9, 14, 238, 247, 9, 14, 238, 246, 9, 14, 238, 245, 9, 
-    14, 238, 244, 9, 14, 238, 243, 9, 14, 238, 242, 9, 14, 238, 241, 9, 14, 
-    238, 240, 9, 14, 238, 239, 9, 14, 238, 238, 9, 14, 238, 237, 9, 14, 238, 
-    236, 9, 14, 238, 235, 9, 14, 238, 234, 9, 14, 238, 233, 9, 14, 238, 232, 
-    9, 14, 238, 231, 9, 14, 238, 230, 9, 14, 238, 229, 9, 14, 238, 228, 9, 
-    14, 238, 227, 9, 14, 238, 226, 9, 14, 238, 225, 9, 14, 238, 224, 9, 14, 
-    238, 223, 9, 14, 238, 222, 9, 14, 238, 221, 9, 14, 238, 220, 9, 14, 238, 
-    219, 9, 14, 238, 218, 9, 14, 238, 217, 9, 14, 238, 216, 9, 14, 238, 215, 
-    9, 14, 238, 214, 9, 14, 238, 213, 9, 14, 238, 212, 9, 14, 238, 211, 9, 
-    14, 238, 210, 9, 14, 238, 209, 9, 14, 238, 208, 9, 14, 238, 207, 9, 14, 
-    238, 206, 9, 14, 238, 205, 9, 14, 238, 204, 9, 14, 238, 203, 9, 14, 238, 
-    202, 9, 14, 238, 201, 9, 14, 238, 200, 9, 14, 238, 199, 9, 14, 238, 198, 
-    9, 14, 238, 197, 9, 14, 238, 196, 9, 14, 238, 195, 9, 14, 238, 194, 9, 
-    14, 238, 193, 9, 14, 238, 192, 9, 14, 238, 191, 9, 14, 238, 190, 9, 14, 
-    238, 189, 9, 14, 238, 188, 9, 14, 238, 187, 9, 14, 238, 186, 9, 14, 238, 
-    185, 9, 14, 238, 184, 9, 14, 238, 183, 9, 14, 238, 182, 9, 14, 238, 181, 
-    9, 14, 238, 180, 9, 14, 238, 179, 9, 14, 238, 178, 9, 14, 238, 177, 9, 
-    14, 238, 176, 9, 14, 238, 175, 9, 14, 238, 174, 9, 14, 238, 173, 9, 14, 
-    238, 172, 9, 14, 238, 171, 9, 14, 238, 170, 9, 14, 238, 169, 9, 14, 238, 
-    168, 9, 14, 238, 167, 9, 14, 238, 166, 9, 14, 238, 165, 9, 14, 238, 164, 
-    9, 14, 238, 163, 9, 14, 238, 162, 9, 14, 238, 161, 9, 14, 238, 160, 9, 
-    14, 238, 159, 9, 14, 238, 158, 9, 14, 238, 157, 9, 14, 238, 156, 9, 14, 
-    238, 155, 9, 14, 238, 154, 9, 14, 238, 153, 9, 14, 238, 152, 9, 14, 238, 
-    151, 9, 14, 238, 150, 9, 14, 238, 149, 9, 14, 238, 148, 9, 14, 238, 147, 
-    9, 14, 238, 146, 9, 14, 238, 145, 9, 14, 238, 144, 9, 14, 238, 143, 9, 
-    14, 238, 142, 9, 14, 238, 141, 9, 14, 238, 140, 9, 14, 238, 139, 9, 14, 
-    238, 138, 9, 14, 238, 137, 9, 14, 238, 136, 9, 14, 238, 135, 9, 14, 238, 
-    134, 9, 14, 238, 133, 9, 14, 238, 132, 9, 14, 238, 131, 9, 14, 238, 130, 
-    9, 14, 238, 129, 9, 14, 238, 128, 9, 14, 238, 127, 9, 14, 238, 126, 9, 
-    14, 238, 125, 9, 14, 238, 124, 9, 14, 238, 123, 9, 14, 238, 122, 9, 14, 
-    238, 121, 9, 14, 238, 120, 9, 14, 238, 119, 9, 14, 238, 118, 9, 14, 238, 
-    117, 9, 14, 238, 116, 9, 14, 238, 115, 9, 14, 238, 114, 9, 14, 238, 113, 
-    9, 14, 238, 112, 9, 14, 238, 111, 9, 14, 238, 110, 9, 14, 238, 109, 9, 
-    14, 238, 108, 9, 14, 238, 107, 9, 14, 238, 106, 9, 14, 238, 105, 9, 14, 
-    238, 104, 9, 14, 238, 103, 9, 14, 238, 102, 9, 14, 238, 101, 9, 14, 238, 
-    100, 9, 14, 238, 99, 9, 14, 238, 98, 9, 14, 238, 97, 9, 14, 238, 96, 9, 
-    14, 238, 95, 9, 14, 238, 94, 9, 14, 238, 93, 9, 14, 238, 92, 9, 14, 238, 
-    91, 9, 14, 238, 90, 9, 14, 238, 89, 9, 14, 238, 88, 9, 14, 238, 87, 9, 
-    14, 238, 86, 9, 14, 238, 85, 9, 14, 238, 84, 9, 14, 238, 83, 9, 14, 238, 
-    82, 9, 14, 238, 81, 9, 14, 238, 80, 9, 14, 238, 79, 9, 14, 238, 78, 9, 
-    14, 238, 77, 9, 14, 238, 76, 9, 14, 238, 75, 9, 14, 238, 74, 9, 14, 238, 
-    73, 233, 90, 217, 84, 129, 219, 18, 129, 245, 31, 78, 129, 223, 254, 78, 
-    129, 54, 50, 129, 247, 132, 50, 129, 225, 182, 50, 129, 254, 126, 129, 
-    254, 57, 129, 43, 226, 3, 129, 44, 226, 3, 129, 253, 216, 129, 96, 50, 
-    129, 249, 219, 129, 240, 167, 129, 243, 229, 218, 129, 129, 219, 46, 129, 
-    21, 210, 86, 129, 21, 110, 129, 21, 105, 129, 21, 158, 129, 21, 161, 129, 
-    21, 189, 129, 21, 194, 129, 21, 198, 129, 21, 195, 129, 21, 200, 129, 
-    249, 226, 129, 220, 150, 129, 233, 15, 50, 129, 245, 98, 50, 129, 242, 
-    130, 50, 129, 224, 13, 78, 129, 249, 217, 253, 206, 129, 7, 6, 1, 61, 
-    129, 7, 6, 1, 253, 158, 129, 7, 6, 1, 251, 66, 129, 7, 6, 1, 249, 60, 
-    129, 7, 6, 1, 75, 129, 7, 6, 1, 245, 6, 129, 7, 6, 1, 243, 202, 129, 7, 
-    6, 1, 242, 60, 129, 7, 6, 1, 73, 129, 7, 6, 1, 235, 144, 129, 7, 6, 1, 
-    235, 23, 129, 7, 6, 1, 156, 129, 7, 6, 1, 193, 129, 7, 6, 1, 230, 25, 
-    129, 7, 6, 1, 76, 129, 7, 6, 1, 226, 105, 129, 7, 6, 1, 224, 96, 129, 7, 
-    6, 1, 153, 129, 7, 6, 1, 222, 91, 129, 7, 6, 1, 217, 152, 129, 7, 6, 1, 
+    45, 108, 16, 31, 225, 126, 218, 45, 108, 16, 31, 85, 218, 45, 108, 16, 
+    31, 231, 56, 218, 72, 108, 16, 31, 231, 56, 218, 71, 108, 16, 31, 231, 
+    56, 218, 70, 108, 16, 31, 250, 39, 108, 16, 31, 222, 2, 108, 16, 31, 228, 
+    189, 108, 16, 31, 213, 141, 108, 16, 31, 213, 140, 108, 16, 31, 222, 205, 
+    222, 2, 108, 16, 31, 222, 205, 222, 1, 108, 16, 31, 242, 167, 108, 16, 
+    31, 219, 167, 108, 16, 31, 235, 178, 226, 154, 108, 16, 31, 235, 178, 
+    226, 153, 108, 16, 31, 249, 135, 64, 235, 177, 108, 16, 31, 223, 102, 64, 
+    235, 177, 108, 16, 31, 249, 169, 226, 154, 108, 16, 31, 235, 176, 226, 
+    154, 108, 16, 31, 218, 73, 64, 249, 168, 108, 16, 31, 249, 135, 64, 249, 
+    168, 108, 16, 31, 249, 135, 64, 249, 167, 108, 16, 31, 249, 169, 254, 84, 
+    108, 16, 31, 222, 3, 64, 249, 169, 254, 84, 108, 16, 31, 218, 73, 64, 
+    222, 3, 64, 249, 168, 108, 16, 31, 213, 243, 108, 16, 31, 216, 85, 226, 
+    154, 108, 16, 31, 233, 58, 226, 154, 108, 16, 31, 254, 83, 226, 154, 108, 
+    16, 31, 218, 73, 64, 254, 82, 108, 16, 31, 222, 3, 64, 254, 82, 108, 16, 
+    31, 218, 73, 64, 222, 3, 64, 254, 82, 108, 16, 31, 213, 158, 64, 254, 82, 
+    108, 16, 31, 223, 102, 64, 254, 82, 108, 16, 31, 223, 102, 64, 254, 81, 
+    108, 16, 31, 223, 101, 108, 16, 31, 223, 100, 108, 16, 31, 223, 99, 108, 
+    16, 31, 223, 98, 108, 16, 31, 254, 158, 108, 16, 31, 254, 157, 108, 16, 
+    31, 231, 164, 108, 16, 31, 222, 8, 108, 16, 31, 253, 247, 108, 16, 31, 
+    223, 126, 108, 16, 31, 223, 125, 108, 16, 31, 253, 184, 108, 16, 31, 251, 
+    230, 226, 154, 108, 16, 31, 217, 50, 108, 16, 31, 217, 49, 108, 16, 31, 
+    224, 9, 232, 223, 108, 16, 31, 251, 184, 108, 16, 31, 251, 183, 108, 16, 
+    31, 251, 182, 108, 16, 31, 254, 139, 108, 16, 31, 226, 219, 108, 16, 31, 
+    218, 249, 108, 16, 31, 216, 83, 108, 16, 31, 242, 97, 108, 16, 31, 212, 
+    28, 108, 16, 31, 224, 227, 108, 16, 31, 251, 15, 108, 16, 31, 215, 86, 
+    108, 16, 31, 250, 247, 230, 123, 108, 16, 31, 221, 203, 64, 235, 56, 108, 
+    16, 31, 251, 26, 108, 16, 31, 215, 220, 108, 16, 31, 218, 155, 215, 220, 
+    108, 16, 31, 232, 149, 108, 16, 31, 219, 57, 108, 16, 31, 214, 142, 108, 
+    16, 31, 240, 247, 246, 65, 108, 16, 31, 253, 228, 108, 16, 31, 224, 235, 
+    253, 228, 108, 16, 31, 251, 143, 108, 16, 31, 224, 226, 251, 143, 108, 
+    16, 31, 254, 136, 108, 16, 31, 218, 118, 218, 27, 218, 117, 108, 16, 31, 
+    218, 118, 218, 27, 218, 116, 108, 16, 31, 218, 69, 108, 16, 31, 224, 201, 
+    108, 16, 31, 247, 182, 108, 16, 31, 247, 184, 108, 16, 31, 247, 183, 108, 
+    16, 31, 224, 132, 108, 16, 31, 224, 121, 108, 16, 31, 249, 123, 108, 16, 
+    31, 249, 122, 108, 16, 31, 249, 121, 108, 16, 31, 249, 120, 108, 16, 31, 
+    249, 119, 108, 16, 31, 254, 170, 108, 16, 31, 252, 120, 64, 231, 150, 
+    108, 16, 31, 252, 120, 64, 214, 17, 108, 16, 31, 223, 58, 108, 16, 31, 
+    240, 239, 108, 16, 31, 228, 213, 108, 16, 31, 248, 146, 108, 16, 31, 230, 
+    135, 108, 16, 31, 163, 246, 95, 108, 16, 31, 163, 226, 133, 9, 14, 240, 
+    103, 9, 14, 240, 102, 9, 14, 240, 101, 9, 14, 240, 100, 9, 14, 240, 99, 
+    9, 14, 240, 98, 9, 14, 240, 97, 9, 14, 240, 96, 9, 14, 240, 95, 9, 14, 
+    240, 94, 9, 14, 240, 93, 9, 14, 240, 92, 9, 14, 240, 91, 9, 14, 240, 90, 
+    9, 14, 240, 89, 9, 14, 240, 88, 9, 14, 240, 87, 9, 14, 240, 86, 9, 14, 
+    240, 85, 9, 14, 240, 84, 9, 14, 240, 83, 9, 14, 240, 82, 9, 14, 240, 81, 
+    9, 14, 240, 80, 9, 14, 240, 79, 9, 14, 240, 78, 9, 14, 240, 77, 9, 14, 
+    240, 76, 9, 14, 240, 75, 9, 14, 240, 74, 9, 14, 240, 73, 9, 14, 240, 72, 
+    9, 14, 240, 71, 9, 14, 240, 70, 9, 14, 240, 69, 9, 14, 240, 68, 9, 14, 
+    240, 67, 9, 14, 240, 66, 9, 14, 240, 65, 9, 14, 240, 64, 9, 14, 240, 63, 
+    9, 14, 240, 62, 9, 14, 240, 61, 9, 14, 240, 60, 9, 14, 240, 59, 9, 14, 
+    240, 58, 9, 14, 240, 57, 9, 14, 240, 56, 9, 14, 240, 55, 9, 14, 240, 54, 
+    9, 14, 240, 53, 9, 14, 240, 52, 9, 14, 240, 51, 9, 14, 240, 50, 9, 14, 
+    240, 49, 9, 14, 240, 48, 9, 14, 240, 47, 9, 14, 240, 46, 9, 14, 240, 45, 
+    9, 14, 240, 44, 9, 14, 240, 43, 9, 14, 240, 42, 9, 14, 240, 41, 9, 14, 
+    240, 40, 9, 14, 240, 39, 9, 14, 240, 38, 9, 14, 240, 37, 9, 14, 240, 36, 
+    9, 14, 240, 35, 9, 14, 240, 34, 9, 14, 240, 33, 9, 14, 240, 32, 9, 14, 
+    240, 31, 9, 14, 240, 30, 9, 14, 240, 29, 9, 14, 240, 28, 9, 14, 240, 27, 
+    9, 14, 240, 26, 9, 14, 240, 25, 9, 14, 240, 24, 9, 14, 240, 23, 9, 14, 
+    240, 22, 9, 14, 240, 21, 9, 14, 240, 20, 9, 14, 240, 19, 9, 14, 240, 18, 
+    9, 14, 240, 17, 9, 14, 240, 16, 9, 14, 240, 15, 9, 14, 240, 14, 9, 14, 
+    240, 13, 9, 14, 240, 12, 9, 14, 240, 11, 9, 14, 240, 10, 9, 14, 240, 9, 
+    9, 14, 240, 8, 9, 14, 240, 7, 9, 14, 240, 6, 9, 14, 240, 5, 9, 14, 240, 
+    4, 9, 14, 240, 3, 9, 14, 240, 2, 9, 14, 240, 1, 9, 14, 240, 0, 9, 14, 
+    239, 255, 9, 14, 239, 254, 9, 14, 239, 253, 9, 14, 239, 252, 9, 14, 239, 
+    251, 9, 14, 239, 250, 9, 14, 239, 249, 9, 14, 239, 248, 9, 14, 239, 247, 
+    9, 14, 239, 246, 9, 14, 239, 245, 9, 14, 239, 244, 9, 14, 239, 243, 9, 
+    14, 239, 242, 9, 14, 239, 241, 9, 14, 239, 240, 9, 14, 239, 239, 9, 14, 
+    239, 238, 9, 14, 239, 237, 9, 14, 239, 236, 9, 14, 239, 235, 9, 14, 239, 
+    234, 9, 14, 239, 233, 9, 14, 239, 232, 9, 14, 239, 231, 9, 14, 239, 230, 
+    9, 14, 239, 229, 9, 14, 239, 228, 9, 14, 239, 227, 9, 14, 239, 226, 9, 
+    14, 239, 225, 9, 14, 239, 224, 9, 14, 239, 223, 9, 14, 239, 222, 9, 14, 
+    239, 221, 9, 14, 239, 220, 9, 14, 239, 219, 9, 14, 239, 218, 9, 14, 239, 
+    217, 9, 14, 239, 216, 9, 14, 239, 215, 9, 14, 239, 214, 9, 14, 239, 213, 
+    9, 14, 239, 212, 9, 14, 239, 211, 9, 14, 239, 210, 9, 14, 239, 209, 9, 
+    14, 239, 208, 9, 14, 239, 207, 9, 14, 239, 206, 9, 14, 239, 205, 9, 14, 
+    239, 204, 9, 14, 239, 203, 9, 14, 239, 202, 9, 14, 239, 201, 9, 14, 239, 
+    200, 9, 14, 239, 199, 9, 14, 239, 198, 9, 14, 239, 197, 9, 14, 239, 196, 
+    9, 14, 239, 195, 9, 14, 239, 194, 9, 14, 239, 193, 9, 14, 239, 192, 9, 
+    14, 239, 191, 9, 14, 239, 190, 9, 14, 239, 189, 9, 14, 239, 188, 9, 14, 
+    239, 187, 9, 14, 239, 186, 9, 14, 239, 185, 9, 14, 239, 184, 9, 14, 239, 
+    183, 9, 14, 239, 182, 9, 14, 239, 181, 9, 14, 239, 180, 9, 14, 239, 179, 
+    9, 14, 239, 178, 9, 14, 239, 177, 9, 14, 239, 176, 9, 14, 239, 175, 9, 
+    14, 239, 174, 9, 14, 239, 173, 9, 14, 239, 172, 9, 14, 239, 171, 9, 14, 
+    239, 170, 9, 14, 239, 169, 9, 14, 239, 168, 9, 14, 239, 167, 9, 14, 239, 
+    166, 9, 14, 239, 165, 9, 14, 239, 164, 9, 14, 239, 163, 9, 14, 239, 162, 
+    9, 14, 239, 161, 9, 14, 239, 160, 9, 14, 239, 159, 9, 14, 239, 158, 9, 
+    14, 239, 157, 9, 14, 239, 156, 9, 14, 239, 155, 9, 14, 239, 154, 9, 14, 
+    239, 153, 9, 14, 239, 152, 9, 14, 239, 151, 9, 14, 239, 150, 9, 14, 239, 
+    149, 9, 14, 239, 148, 9, 14, 239, 147, 9, 14, 239, 146, 9, 14, 239, 145, 
+    9, 14, 239, 144, 9, 14, 239, 143, 9, 14, 239, 142, 9, 14, 239, 141, 9, 
+    14, 239, 140, 9, 14, 239, 139, 9, 14, 239, 138, 9, 14, 239, 137, 9, 14, 
+    239, 136, 9, 14, 239, 135, 9, 14, 239, 134, 9, 14, 239, 133, 9, 14, 239, 
+    132, 9, 14, 239, 131, 9, 14, 239, 130, 9, 14, 239, 129, 9, 14, 239, 128, 
+    9, 14, 239, 127, 9, 14, 239, 126, 9, 14, 239, 125, 9, 14, 239, 124, 9, 
+    14, 239, 123, 9, 14, 239, 122, 9, 14, 239, 121, 9, 14, 239, 120, 9, 14, 
+    239, 119, 9, 14, 239, 118, 9, 14, 239, 117, 9, 14, 239, 116, 9, 14, 239, 
+    115, 9, 14, 239, 114, 9, 14, 239, 113, 9, 14, 239, 112, 9, 14, 239, 111, 
+    9, 14, 239, 110, 9, 14, 239, 109, 9, 14, 239, 108, 9, 14, 239, 107, 9, 
+    14, 239, 106, 9, 14, 239, 105, 9, 14, 239, 104, 9, 14, 239, 103, 9, 14, 
+    239, 102, 9, 14, 239, 101, 9, 14, 239, 100, 9, 14, 239, 99, 9, 14, 239, 
+    98, 9, 14, 239, 97, 9, 14, 239, 96, 9, 14, 239, 95, 9, 14, 239, 94, 9, 
+    14, 239, 93, 9, 14, 239, 92, 9, 14, 239, 91, 9, 14, 239, 90, 9, 14, 239, 
+    89, 9, 14, 239, 88, 9, 14, 239, 87, 9, 14, 239, 86, 9, 14, 239, 85, 9, 
+    14, 239, 84, 9, 14, 239, 83, 9, 14, 239, 82, 9, 14, 239, 81, 9, 14, 239, 
+    80, 9, 14, 239, 79, 9, 14, 239, 78, 9, 14, 239, 77, 9, 14, 239, 76, 9, 
+    14, 239, 75, 9, 14, 239, 74, 9, 14, 239, 73, 9, 14, 239, 72, 9, 14, 239, 
+    71, 9, 14, 239, 70, 9, 14, 239, 69, 9, 14, 239, 68, 9, 14, 239, 67, 9, 
+    14, 239, 66, 9, 14, 239, 65, 9, 14, 239, 64, 9, 14, 239, 63, 9, 14, 239, 
+    62, 9, 14, 239, 61, 9, 14, 239, 60, 9, 14, 239, 59, 9, 14, 239, 58, 9, 
+    14, 239, 57, 9, 14, 239, 56, 9, 14, 239, 55, 9, 14, 239, 54, 9, 14, 239, 
+    53, 9, 14, 239, 52, 9, 14, 239, 51, 9, 14, 239, 50, 9, 14, 239, 49, 9, 
+    14, 239, 48, 9, 14, 239, 47, 9, 14, 239, 46, 9, 14, 239, 45, 9, 14, 239, 
+    44, 9, 14, 239, 43, 9, 14, 239, 42, 9, 14, 239, 41, 9, 14, 239, 40, 9, 
+    14, 239, 39, 9, 14, 239, 38, 9, 14, 239, 37, 9, 14, 239, 36, 9, 14, 239, 
+    35, 9, 14, 239, 34, 9, 14, 239, 33, 9, 14, 239, 32, 9, 14, 239, 31, 9, 
+    14, 239, 30, 9, 14, 239, 29, 9, 14, 239, 28, 9, 14, 239, 27, 9, 14, 239, 
+    26, 9, 14, 239, 25, 9, 14, 239, 24, 9, 14, 239, 23, 9, 14, 239, 22, 9, 
+    14, 239, 21, 9, 14, 239, 20, 9, 14, 239, 19, 9, 14, 239, 18, 9, 14, 239, 
+    17, 9, 14, 239, 16, 9, 14, 239, 15, 9, 14, 239, 14, 9, 14, 239, 13, 9, 
+    14, 239, 12, 9, 14, 239, 11, 9, 14, 239, 10, 9, 14, 239, 9, 9, 14, 239, 
+    8, 9, 14, 239, 7, 9, 14, 239, 6, 9, 14, 239, 5, 9, 14, 239, 4, 9, 14, 
+    239, 3, 9, 14, 239, 2, 9, 14, 239, 1, 9, 14, 239, 0, 9, 14, 238, 255, 9, 
+    14, 238, 254, 9, 14, 238, 253, 9, 14, 238, 252, 9, 14, 238, 251, 9, 14, 
+    238, 250, 9, 14, 238, 249, 9, 14, 238, 248, 9, 14, 238, 247, 9, 14, 238, 
+    246, 9, 14, 238, 245, 9, 14, 238, 244, 9, 14, 238, 243, 9, 14, 238, 242, 
+    9, 14, 238, 241, 9, 14, 238, 240, 9, 14, 238, 239, 9, 14, 238, 238, 9, 
+    14, 238, 237, 9, 14, 238, 236, 9, 14, 238, 235, 9, 14, 238, 234, 9, 14, 
+    238, 233, 9, 14, 238, 232, 9, 14, 238, 231, 9, 14, 238, 230, 9, 14, 238, 
+    229, 9, 14, 238, 228, 9, 14, 238, 227, 9, 14, 238, 226, 9, 14, 238, 225, 
+    9, 14, 238, 224, 9, 14, 238, 223, 9, 14, 238, 222, 9, 14, 238, 221, 9, 
+    14, 238, 220, 9, 14, 238, 219, 9, 14, 238, 218, 9, 14, 238, 217, 9, 14, 
+    238, 216, 9, 14, 238, 215, 9, 14, 238, 214, 9, 14, 238, 213, 9, 14, 238, 
+    212, 9, 14, 238, 211, 9, 14, 238, 210, 9, 14, 238, 209, 9, 14, 238, 208, 
+    9, 14, 238, 207, 9, 14, 238, 206, 9, 14, 238, 205, 9, 14, 238, 204, 9, 
+    14, 238, 203, 9, 14, 238, 202, 9, 14, 238, 201, 9, 14, 238, 200, 9, 14, 
+    238, 199, 9, 14, 238, 198, 9, 14, 238, 197, 9, 14, 238, 196, 9, 14, 238, 
+    195, 9, 14, 238, 194, 9, 14, 238, 193, 9, 14, 238, 192, 9, 14, 238, 191, 
+    9, 14, 238, 190, 9, 14, 238, 189, 9, 14, 238, 188, 9, 14, 238, 187, 9, 
+    14, 238, 186, 9, 14, 238, 185, 9, 14, 238, 184, 9, 14, 238, 183, 9, 14, 
+    238, 182, 9, 14, 238, 181, 9, 14, 238, 180, 9, 14, 238, 179, 9, 14, 238, 
+    178, 9, 14, 238, 177, 9, 14, 238, 176, 9, 14, 238, 175, 9, 14, 238, 174, 
+    9, 14, 238, 173, 9, 14, 238, 172, 9, 14, 238, 171, 9, 14, 238, 170, 9, 
+    14, 238, 169, 9, 14, 238, 168, 9, 14, 238, 167, 9, 14, 238, 166, 9, 14, 
+    238, 165, 9, 14, 238, 164, 9, 14, 238, 163, 9, 14, 238, 162, 9, 14, 238, 
+    161, 9, 14, 238, 160, 9, 14, 238, 159, 9, 14, 238, 158, 9, 14, 238, 157, 
+    9, 14, 238, 156, 9, 14, 238, 155, 9, 14, 238, 154, 9, 14, 238, 153, 9, 
+    14, 238, 152, 9, 14, 238, 151, 9, 14, 238, 150, 9, 14, 238, 149, 9, 14, 
+    238, 148, 9, 14, 238, 147, 9, 14, 238, 146, 9, 14, 238, 145, 9, 14, 238, 
+    144, 9, 14, 238, 143, 9, 14, 238, 142, 9, 14, 238, 141, 9, 14, 238, 140, 
+    9, 14, 238, 139, 9, 14, 238, 138, 9, 14, 238, 137, 9, 14, 238, 136, 9, 
+    14, 238, 135, 9, 14, 238, 134, 9, 14, 238, 133, 9, 14, 238, 132, 9, 14, 
+    238, 131, 9, 14, 238, 130, 9, 14, 238, 129, 9, 14, 238, 128, 9, 14, 238, 
+    127, 9, 14, 238, 126, 9, 14, 238, 125, 9, 14, 238, 124, 9, 14, 238, 123, 
+    9, 14, 238, 122, 9, 14, 238, 121, 9, 14, 238, 120, 9, 14, 238, 119, 9, 
+    14, 238, 118, 9, 14, 238, 117, 9, 14, 238, 116, 9, 14, 238, 115, 9, 14, 
+    238, 114, 9, 14, 238, 113, 9, 14, 238, 112, 9, 14, 238, 111, 9, 14, 238, 
+    110, 9, 14, 238, 109, 9, 14, 238, 108, 9, 14, 238, 107, 9, 14, 238, 106, 
+    9, 14, 238, 105, 9, 14, 238, 104, 9, 14, 238, 103, 9, 14, 238, 102, 9, 
+    14, 238, 101, 9, 14, 238, 100, 9, 14, 238, 99, 9, 14, 238, 98, 9, 14, 
+    238, 97, 9, 14, 238, 96, 9, 14, 238, 95, 9, 14, 238, 94, 9, 14, 238, 93, 
+    9, 14, 238, 92, 9, 14, 238, 91, 9, 14, 238, 90, 9, 14, 238, 89, 9, 14, 
+    238, 88, 9, 14, 238, 87, 9, 14, 238, 86, 9, 14, 238, 85, 9, 14, 238, 84, 
+    9, 14, 238, 83, 9, 14, 238, 82, 9, 14, 238, 81, 9, 14, 238, 80, 9, 14, 
+    238, 79, 9, 14, 238, 78, 9, 14, 238, 77, 9, 14, 238, 76, 9, 14, 238, 75, 
+    9, 14, 238, 74, 233, 91, 217, 85, 129, 219, 19, 129, 245, 32, 78, 129, 
+    223, 255, 78, 129, 54, 50, 129, 247, 133, 50, 129, 225, 183, 50, 129, 
+    254, 127, 129, 254, 58, 129, 43, 226, 4, 129, 44, 226, 4, 129, 253, 217, 
+    129, 96, 50, 129, 249, 220, 129, 240, 168, 129, 243, 230, 218, 130, 129, 
+    219, 47, 129, 21, 210, 86, 129, 21, 110, 129, 21, 105, 129, 21, 158, 129, 
+    21, 161, 129, 21, 189, 129, 21, 194, 129, 21, 198, 129, 21, 195, 129, 21, 
+    200, 129, 249, 227, 129, 220, 151, 129, 233, 16, 50, 129, 245, 99, 50, 
+    129, 242, 131, 50, 129, 224, 14, 78, 129, 249, 218, 253, 207, 129, 7, 6, 
+    1, 61, 129, 7, 6, 1, 253, 159, 129, 7, 6, 1, 251, 67, 129, 7, 6, 1, 249, 
+    61, 129, 7, 6, 1, 75, 129, 7, 6, 1, 245, 7, 129, 7, 6, 1, 243, 203, 129, 
+    7, 6, 1, 242, 61, 129, 7, 6, 1, 73, 129, 7, 6, 1, 235, 145, 129, 7, 6, 1, 
+    235, 24, 129, 7, 6, 1, 156, 129, 7, 6, 1, 193, 129, 7, 6, 1, 230, 26, 
+    129, 7, 6, 1, 76, 129, 7, 6, 1, 226, 106, 129, 7, 6, 1, 224, 97, 129, 7, 
+    6, 1, 153, 129, 7, 6, 1, 222, 92, 129, 7, 6, 1, 217, 153, 129, 7, 6, 1, 
     70, 129, 7, 6, 1, 214, 105, 129, 7, 6, 1, 212, 98, 129, 7, 6, 1, 211, 
     178, 129, 7, 6, 1, 211, 117, 129, 7, 6, 1, 210, 159, 129, 43, 42, 127, 
-    129, 223, 50, 219, 46, 129, 44, 42, 127, 129, 250, 31, 255, 14, 129, 121, 
-    232, 213, 129, 242, 137, 255, 14, 129, 7, 4, 1, 61, 129, 7, 4, 1, 253, 
-    158, 129, 7, 4, 1, 251, 66, 129, 7, 4, 1, 249, 60, 129, 7, 4, 1, 75, 129, 
-    7, 4, 1, 245, 6, 129, 7, 4, 1, 243, 202, 129, 7, 4, 1, 242, 60, 129, 7, 
-    4, 1, 73, 129, 7, 4, 1, 235, 144, 129, 7, 4, 1, 235, 23, 129, 7, 4, 1, 
-    156, 129, 7, 4, 1, 193, 129, 7, 4, 1, 230, 25, 129, 7, 4, 1, 76, 129, 7, 
-    4, 1, 226, 105, 129, 7, 4, 1, 224, 96, 129, 7, 4, 1, 153, 129, 7, 4, 1, 
-    222, 91, 129, 7, 4, 1, 217, 152, 129, 7, 4, 1, 70, 129, 7, 4, 1, 214, 
+    129, 223, 51, 219, 47, 129, 44, 42, 127, 129, 250, 32, 255, 15, 129, 121, 
+    232, 214, 129, 242, 138, 255, 15, 129, 7, 4, 1, 61, 129, 7, 4, 1, 253, 
+    159, 129, 7, 4, 1, 251, 67, 129, 7, 4, 1, 249, 61, 129, 7, 4, 1, 75, 129, 
+    7, 4, 1, 245, 7, 129, 7, 4, 1, 243, 203, 129, 7, 4, 1, 242, 61, 129, 7, 
+    4, 1, 73, 129, 7, 4, 1, 235, 145, 129, 7, 4, 1, 235, 24, 129, 7, 4, 1, 
+    156, 129, 7, 4, 1, 193, 129, 7, 4, 1, 230, 26, 129, 7, 4, 1, 76, 129, 7, 
+    4, 1, 226, 106, 129, 7, 4, 1, 224, 97, 129, 7, 4, 1, 153, 129, 7, 4, 1, 
+    222, 92, 129, 7, 4, 1, 217, 153, 129, 7, 4, 1, 70, 129, 7, 4, 1, 214, 
     105, 129, 7, 4, 1, 212, 98, 129, 7, 4, 1, 211, 178, 129, 7, 4, 1, 211, 
-    117, 129, 7, 4, 1, 210, 159, 129, 43, 249, 99, 127, 129, 67, 232, 213, 
-    129, 44, 249, 99, 127, 129, 182, 251, 6, 217, 84, 45, 221, 78, 45, 221, 
-    67, 45, 221, 56, 45, 221, 44, 45, 221, 33, 45, 221, 22, 45, 221, 11, 45, 
-    221, 0, 45, 220, 245, 45, 220, 237, 45, 220, 236, 45, 220, 235, 45, 220, 
-    234, 45, 220, 232, 45, 220, 231, 45, 220, 230, 45, 220, 229, 45, 220, 
-    228, 45, 220, 227, 45, 220, 226, 45, 220, 225, 45, 220, 224, 45, 220, 
-    223, 45, 220, 221, 45, 220, 220, 45, 220, 219, 45, 220, 218, 45, 220, 
-    217, 45, 220, 216, 45, 220, 215, 45, 220, 214, 45, 220, 213, 45, 220, 
-    212, 45, 220, 210, 45, 220, 209, 45, 220, 208, 45, 220, 207, 45, 220, 
-    206, 45, 220, 205, 45, 220, 204, 45, 220, 203, 45, 220, 202, 45, 220, 
-    201, 45, 220, 199, 45, 220, 198, 45, 220, 197, 45, 220, 196, 45, 220, 
-    195, 45, 220, 194, 45, 220, 193, 45, 220, 192, 45, 220, 191, 45, 220, 
-    190, 45, 220, 188, 45, 220, 187, 45, 220, 186, 45, 220, 185, 45, 220, 
-    184, 45, 220, 183, 45, 220, 182, 45, 220, 181, 45, 220, 180, 45, 220, 
-    179, 45, 220, 177, 45, 220, 176, 45, 220, 175, 45, 220, 174, 45, 220, 
-    173, 45, 220, 172, 45, 220, 171, 45, 220, 170, 45, 220, 169, 45, 220, 
-    168, 45, 220, 166, 45, 220, 165, 45, 220, 164, 45, 220, 163, 45, 220, 
-    162, 45, 220, 161, 45, 220, 160, 45, 220, 159, 45, 220, 158, 45, 220, 
-    157, 45, 221, 154, 45, 221, 153, 45, 221, 152, 45, 221, 151, 45, 221, 
-    150, 45, 221, 149, 45, 221, 148, 45, 221, 147, 45, 221, 146, 45, 221, 
-    145, 45, 221, 143, 45, 221, 142, 45, 221, 141, 45, 221, 140, 45, 221, 
-    139, 45, 221, 138, 45, 221, 137, 45, 221, 136, 45, 221, 135, 45, 221, 
-    134, 45, 221, 132, 45, 221, 131, 45, 221, 130, 45, 221, 129, 45, 221, 
-    128, 45, 221, 127, 45, 221, 126, 45, 221, 125, 45, 221, 124, 45, 221, 
-    123, 45, 221, 121, 45, 221, 120, 45, 221, 119, 45, 221, 118, 45, 221, 
-    117, 45, 221, 116, 45, 221, 115, 45, 221, 114, 45, 221, 113, 45, 221, 
-    112, 45, 221, 110, 45, 221, 109, 45, 221, 108, 45, 221, 107, 45, 221, 
-    106, 45, 221, 105, 45, 221, 104, 45, 221, 103, 45, 221, 102, 45, 221, 
-    101, 45, 221, 99, 45, 221, 98, 45, 221, 97, 45, 221, 96, 45, 221, 95, 45, 
-    221, 94, 45, 221, 93, 45, 221, 92, 45, 221, 91, 45, 221, 90, 45, 221, 88, 
-    45, 221, 87, 45, 221, 86, 45, 221, 85, 45, 221, 84, 45, 221, 83, 45, 221, 
-    82, 45, 221, 81, 45, 221, 80, 45, 221, 79, 45, 221, 77, 45, 221, 76, 45, 
-    221, 75, 45, 221, 74, 45, 221, 73, 45, 221, 72, 45, 221, 71, 45, 221, 70, 
-    45, 221, 69, 45, 221, 68, 45, 221, 66, 45, 221, 65, 45, 221, 64, 45, 221, 
-    63, 45, 221, 62, 45, 221, 61, 45, 221, 60, 45, 221, 59, 45, 221, 58, 45, 
-    221, 57, 45, 221, 55, 45, 221, 54, 45, 221, 53, 45, 221, 52, 45, 221, 51, 
-    45, 221, 50, 45, 221, 49, 45, 221, 48, 45, 221, 47, 45, 221, 46, 45, 221, 
-    43, 45, 221, 42, 45, 221, 41, 45, 221, 40, 45, 221, 39, 45, 221, 38, 45, 
-    221, 37, 45, 221, 36, 45, 221, 35, 45, 221, 34, 45, 221, 32, 45, 221, 31, 
-    45, 221, 30, 45, 221, 29, 45, 221, 28, 45, 221, 27, 45, 221, 26, 45, 221, 
-    25, 45, 221, 24, 45, 221, 23, 45, 221, 21, 45, 221, 20, 45, 221, 19, 45, 
-    221, 18, 45, 221, 17, 45, 221, 16, 45, 221, 15, 45, 221, 14, 45, 221, 13, 
-    45, 221, 12, 45, 221, 10, 45, 221, 9, 45, 221, 8, 45, 221, 7, 45, 221, 6, 
-    45, 221, 5, 45, 221, 4, 45, 221, 3, 45, 221, 2, 45, 221, 1, 45, 220, 255, 
-    45, 220, 254, 45, 220, 253, 45, 220, 252, 45, 220, 251, 45, 220, 250, 45, 
-    220, 249, 45, 220, 248, 45, 220, 247, 45, 220, 246, 45, 220, 244, 45, 
-    220, 243, 45, 220, 242, 45, 220, 241, 45, 220, 240, 45, 220, 239, 45, 
-    220, 238, 227, 202, 227, 204, 218, 152, 64, 241, 233, 219, 48, 218, 152, 
-    64, 216, 212, 218, 85, 245, 143, 64, 216, 212, 245, 56, 245, 143, 64, 
-    215, 243, 245, 109, 245, 132, 245, 133, 255, 7, 255, 8, 254, 167, 252, 
-    47, 252, 179, 251, 131, 135, 217, 89, 203, 217, 89, 240, 227, 217, 93, 
-    232, 214, 244, 145, 166, 232, 213, 245, 143, 64, 232, 213, 233, 0, 228, 
-    135, 245, 112, 232, 214, 217, 89, 67, 217, 89, 212, 118, 244, 20, 244, 
-    145, 244, 125, 250, 230, 223, 53, 249, 143, 220, 28, 226, 130, 232, 150, 
-    110, 219, 58, 220, 28, 235, 255, 232, 150, 210, 86, 219, 191, 248, 151, 
-    232, 204, 245, 77, 247, 155, 248, 31, 249, 178, 110, 248, 141, 248, 31, 
-    249, 178, 105, 248, 140, 248, 31, 249, 178, 158, 248, 139, 248, 31, 249, 
-    178, 161, 248, 138, 152, 255, 7, 229, 209, 217, 177, 236, 62, 217, 180, 
-    245, 143, 64, 215, 244, 251, 213, 245, 62, 251, 5, 251, 7, 245, 143, 64, 
-    231, 81, 245, 110, 218, 61, 218, 78, 245, 77, 245, 78, 235, 232, 220, 
-    138, 161, 244, 107, 220, 137, 243, 237, 235, 232, 220, 138, 158, 242, 
-    121, 220, 137, 242, 118, 235, 232, 220, 138, 105, 223, 121, 220, 137, 
-    222, 145, 235, 232, 220, 138, 110, 214, 174, 220, 137, 214, 133, 219, 21, 
-    248, 63, 248, 65, 226, 78, 250, 142, 226, 80, 125, 226, 240, 224, 193, 
-    241, 47, 251, 150, 225, 173, 241, 203, 251, 161, 228, 75, 251, 150, 241, 
-    203, 229, 175, 235, 242, 235, 244, 229, 82, 232, 213, 229, 99, 218, 152, 
-    64, 221, 158, 254, 18, 218, 223, 245, 143, 64, 221, 158, 254, 18, 245, 
-    80, 135, 217, 90, 220, 127, 203, 217, 90, 220, 127, 240, 224, 135, 217, 
-    90, 2, 235, 35, 203, 217, 90, 2, 235, 35, 240, 225, 232, 214, 217, 90, 
-    220, 127, 67, 217, 90, 220, 127, 212, 117, 225, 253, 232, 214, 244, 14, 
-    225, 253, 232, 214, 246, 106, 225, 32, 225, 253, 232, 214, 252, 178, 225, 
-    253, 232, 214, 214, 163, 225, 28, 223, 50, 232, 214, 244, 145, 223, 50, 
-    235, 242, 223, 35, 219, 155, 220, 28, 105, 219, 152, 218, 225, 219, 155, 
-    220, 28, 158, 219, 151, 218, 224, 248, 31, 249, 178, 218, 105, 248, 137, 
-    224, 183, 214, 132, 110, 224, 183, 214, 130, 224, 149, 224, 183, 214, 
-    132, 105, 224, 183, 214, 129, 224, 148, 220, 128, 215, 242, 218, 151, 
-    218, 89, 251, 6, 250, 142, 250, 209, 231, 43, 212, 59, 230, 43, 218, 152, 
-    64, 242, 107, 254, 18, 218, 152, 64, 224, 166, 254, 18, 219, 20, 245, 
-    143, 64, 242, 107, 254, 18, 245, 143, 64, 224, 166, 254, 18, 245, 107, 
-    218, 152, 64, 218, 105, 219, 35, 219, 155, 242, 141, 135, 235, 195, 220, 
-    107, 219, 155, 135, 235, 195, 221, 194, 249, 178, 220, 135, 235, 195, 
-    249, 113, 218, 106, 216, 236, 218, 168, 226, 169, 217, 167, 249, 218, 
-    226, 142, 224, 184, 231, 42, 225, 19, 254, 53, 224, 178, 249, 218, 254, 
-    69, 229, 163, 219, 200, 7, 6, 1, 242, 249, 7, 4, 1, 242, 249, 250, 159, 
-    165, 1, 232, 175, 209, 209, 1, 244, 44, 244, 36, 209, 209, 1, 244, 44, 
-    244, 157, 209, 209, 1, 222, 211, 209, 209, 1, 232, 156, 63, 164, 251, 
-    223, 220, 3, 242, 215, 230, 248, 223, 41, 243, 216, 243, 215, 243, 214, 
-    230, 45, 209, 251, 209, 252, 209, 254, 232, 102, 222, 219, 232, 103, 222, 
-    220, 225, 223, 232, 101, 222, 218, 228, 106, 230, 165, 211, 229, 212, 15, 
-    245, 162, 243, 226, 230, 229, 226, 197, 214, 134, 87, 230, 229, 248, 157, 
-    87, 8, 3, 235, 158, 78, 224, 194, 244, 20, 31, 67, 44, 71, 233, 20, 127, 
-    213, 118, 213, 7, 212, 195, 212, 184, 212, 173, 212, 162, 212, 151, 212, 
-    140, 212, 129, 213, 117, 213, 106, 213, 95, 213, 84, 213, 73, 213, 62, 
-    213, 51, 251, 71, 226, 155, 78, 251, 196, 209, 253, 49, 28, 16, 243, 236, 
-    219, 102, 250, 73, 214, 9, 213, 40, 213, 29, 213, 18, 213, 6, 212, 251, 
-    212, 240, 212, 229, 212, 218, 212, 207, 212, 199, 212, 198, 212, 197, 
-    212, 196, 212, 194, 212, 193, 212, 192, 212, 191, 212, 190, 212, 189, 
-    212, 188, 212, 187, 212, 186, 212, 185, 212, 183, 212, 182, 212, 181, 
-    212, 180, 212, 179, 212, 178, 212, 177, 212, 176, 212, 175, 212, 174, 
-    212, 172, 212, 171, 212, 170, 212, 169, 212, 168, 212, 167, 212, 166, 
-    212, 165, 212, 164, 212, 163, 212, 161, 212, 160, 212, 159, 212, 158, 
-    212, 157, 212, 156, 212, 155, 212, 154, 212, 153, 212, 152, 212, 150, 
-    212, 149, 212, 148, 212, 147, 212, 146, 212, 145, 212, 144, 212, 143, 
-    212, 142, 212, 141, 212, 139, 212, 138, 212, 137, 212, 136, 212, 135, 
-    212, 134, 212, 133, 212, 132, 212, 131, 212, 130, 212, 128, 212, 127, 
-    212, 126, 212, 125, 212, 124, 212, 123, 212, 122, 212, 121, 212, 120, 
-    212, 119, 213, 116, 213, 115, 213, 114, 213, 113, 213, 112, 213, 111, 
-    213, 110, 213, 109, 213, 108, 213, 107, 213, 105, 213, 104, 213, 103, 
-    213, 102, 213, 101, 213, 100, 213, 99, 213, 98, 213, 97, 213, 96, 213, 
-    94, 213, 93, 213, 92, 213, 91, 213, 90, 213, 89, 213, 88, 213, 87, 213, 
-    86, 213, 85, 213, 83, 213, 82, 213, 81, 213, 80, 213, 79, 213, 78, 213, 
-    77, 213, 76, 213, 75, 213, 74, 213, 72, 213, 71, 213, 70, 213, 69, 213, 
-    68, 213, 67, 213, 66, 213, 65, 213, 64, 213, 63, 213, 61, 213, 60, 213, 
-    59, 213, 58, 213, 57, 213, 56, 213, 55, 213, 54, 213, 53, 213, 52, 213, 
-    50, 213, 49, 213, 48, 213, 47, 213, 46, 213, 45, 213, 44, 213, 43, 213, 
-    42, 213, 41, 213, 39, 213, 38, 213, 37, 213, 36, 213, 35, 213, 34, 213, 
-    33, 213, 32, 213, 31, 213, 30, 213, 28, 213, 27, 213, 26, 213, 25, 213, 
-    24, 213, 23, 213, 22, 213, 21, 213, 20, 213, 19, 213, 17, 213, 16, 213, 
-    15, 213, 14, 213, 13, 213, 12, 213, 11, 213, 10, 213, 9, 213, 8, 213, 5, 
-    213, 4, 213, 3, 213, 2, 213, 1, 213, 0, 212, 255, 212, 254, 212, 253, 
-    212, 252, 212, 250, 212, 249, 212, 248, 212, 247, 212, 246, 212, 245, 
-    212, 244, 212, 243, 212, 242, 212, 241, 212, 239, 212, 238, 212, 237, 
-    212, 236, 212, 235, 212, 234, 212, 233, 212, 232, 212, 231, 212, 230, 
-    212, 228, 212, 227, 212, 226, 212, 225, 212, 224, 212, 223, 212, 222, 
-    212, 221, 212, 220, 212, 219, 212, 217, 212, 216, 212, 215, 212, 214, 
-    212, 213, 212, 212, 212, 211, 212, 210, 212, 209, 212, 208, 212, 206, 
-    212, 205, 212, 204, 212, 203, 212, 202, 212, 201, 212, 200, 7, 6, 1, 115, 
-    2, 231, 233, 22, 242, 136, 7, 4, 1, 115, 2, 231, 233, 22, 242, 136, 7, 6, 
-    1, 160, 2, 67, 232, 214, 51, 7, 4, 1, 160, 2, 67, 232, 214, 51, 7, 6, 1, 
-    160, 2, 67, 232, 214, 252, 43, 22, 242, 136, 7, 4, 1, 160, 2, 67, 232, 
-    214, 252, 43, 22, 242, 136, 7, 6, 1, 160, 2, 67, 232, 214, 252, 43, 22, 
-    142, 7, 4, 1, 160, 2, 67, 232, 214, 252, 43, 22, 142, 7, 6, 1, 160, 2, 
-    250, 31, 22, 231, 232, 7, 4, 1, 160, 2, 250, 31, 22, 231, 232, 7, 6, 1, 
-    160, 2, 250, 31, 22, 250, 234, 7, 4, 1, 160, 2, 250, 31, 22, 250, 234, 7, 
-    6, 1, 240, 154, 2, 231, 233, 22, 242, 136, 7, 4, 1, 240, 154, 2, 231, 
-    233, 22, 242, 136, 7, 4, 1, 240, 154, 2, 59, 77, 22, 142, 7, 4, 1, 229, 
-    80, 2, 216, 89, 48, 7, 6, 1, 144, 2, 67, 232, 214, 51, 7, 4, 1, 144, 2, 
-    67, 232, 214, 51, 7, 6, 1, 144, 2, 67, 232, 214, 252, 43, 22, 242, 136, 
-    7, 4, 1, 144, 2, 67, 232, 214, 252, 43, 22, 242, 136, 7, 6, 1, 144, 2, 
-    67, 232, 214, 252, 43, 22, 142, 7, 4, 1, 144, 2, 67, 232, 214, 252, 43, 
-    22, 142, 7, 6, 1, 222, 92, 2, 67, 232, 214, 51, 7, 4, 1, 222, 92, 2, 67, 
-    232, 214, 51, 7, 6, 1, 104, 2, 231, 233, 22, 242, 136, 7, 4, 1, 104, 2, 
-    231, 233, 22, 242, 136, 7, 6, 1, 115, 2, 226, 225, 22, 142, 7, 4, 1, 115, 
-    2, 226, 225, 22, 142, 7, 6, 1, 115, 2, 226, 225, 22, 182, 7, 4, 1, 115, 
-    2, 226, 225, 22, 182, 7, 6, 1, 160, 2, 226, 225, 22, 142, 7, 4, 1, 160, 
-    2, 226, 225, 22, 142, 7, 6, 1, 160, 2, 226, 225, 22, 182, 7, 4, 1, 160, 
-    2, 226, 225, 22, 182, 7, 6, 1, 160, 2, 59, 77, 22, 142, 7, 4, 1, 160, 2, 
-    59, 77, 22, 142, 7, 6, 1, 160, 2, 59, 77, 22, 182, 7, 4, 1, 160, 2, 59, 
-    77, 22, 182, 7, 4, 1, 240, 154, 2, 59, 77, 22, 242, 136, 7, 4, 1, 240, 
-    154, 2, 59, 77, 22, 182, 7, 6, 1, 240, 154, 2, 226, 225, 22, 142, 7, 4, 
-    1, 240, 154, 2, 226, 225, 22, 59, 77, 22, 142, 7, 6, 1, 240, 154, 2, 226, 
-    225, 22, 182, 7, 4, 1, 240, 154, 2, 226, 225, 22, 59, 77, 22, 182, 7, 6, 
-    1, 235, 145, 2, 182, 7, 4, 1, 235, 145, 2, 59, 77, 22, 182, 7, 6, 1, 233, 
-    149, 2, 182, 7, 4, 1, 233, 149, 2, 182, 7, 6, 1, 232, 50, 2, 182, 7, 4, 
-    1, 232, 50, 2, 182, 7, 6, 1, 223, 224, 2, 182, 7, 4, 1, 223, 224, 2, 182, 
-    7, 6, 1, 104, 2, 226, 225, 22, 142, 7, 4, 1, 104, 2, 226, 225, 22, 142, 
-    7, 6, 1, 104, 2, 226, 225, 22, 182, 7, 4, 1, 104, 2, 226, 225, 22, 182, 
-    7, 6, 1, 104, 2, 231, 233, 22, 142, 7, 4, 1, 104, 2, 231, 233, 22, 142, 
-    7, 6, 1, 104, 2, 231, 233, 22, 182, 7, 4, 1, 104, 2, 231, 233, 22, 182, 
-    7, 4, 1, 254, 244, 2, 242, 136, 7, 4, 1, 204, 144, 2, 242, 136, 7, 4, 1, 
-    204, 144, 2, 142, 7, 4, 1, 215, 94, 214, 106, 2, 242, 136, 7, 4, 1, 215, 
-    94, 214, 106, 2, 142, 7, 4, 1, 221, 196, 2, 242, 136, 7, 4, 1, 221, 196, 
-    2, 142, 7, 4, 1, 241, 51, 221, 196, 2, 242, 136, 7, 4, 1, 241, 51, 221, 
-    196, 2, 142, 146, 1, 234, 109, 36, 116, 235, 23, 36, 116, 229, 79, 36, 
-    116, 251, 66, 36, 116, 227, 167, 36, 116, 215, 159, 36, 116, 228, 111, 
-    36, 116, 217, 152, 36, 116, 230, 25, 36, 116, 226, 105, 36, 116, 193, 36, 
-    116, 211, 117, 36, 116, 153, 36, 116, 156, 36, 116, 214, 105, 36, 116, 
-    232, 176, 36, 116, 232, 185, 36, 116, 222, 180, 36, 116, 228, 93, 36, 
-    116, 235, 144, 36, 116, 220, 104, 36, 116, 218, 226, 36, 116, 222, 91, 
-    36, 116, 242, 60, 36, 116, 233, 232, 36, 3, 235, 10, 36, 3, 234, 92, 36, 
-    3, 234, 83, 36, 3, 233, 217, 36, 3, 233, 188, 36, 3, 234, 182, 36, 3, 
-    234, 181, 36, 3, 234, 246, 36, 3, 234, 28, 36, 3, 234, 10, 36, 3, 234, 
-    195, 36, 3, 229, 76, 36, 3, 229, 27, 36, 3, 229, 23, 36, 3, 228, 248, 36, 
-    3, 228, 241, 36, 3, 229, 64, 36, 3, 229, 62, 36, 3, 229, 73, 36, 3, 229, 
-    4, 36, 3, 228, 255, 36, 3, 229, 66, 36, 3, 251, 32, 36, 3, 250, 51, 36, 
-    3, 250, 41, 36, 3, 249, 112, 36, 3, 249, 83, 36, 3, 250, 190, 36, 3, 250, 
-    182, 36, 3, 251, 22, 36, 3, 249, 238, 36, 3, 249, 174, 36, 3, 250, 222, 
-    36, 3, 227, 164, 36, 3, 227, 148, 36, 3, 227, 143, 36, 3, 227, 128, 36, 
-    3, 227, 121, 36, 3, 227, 156, 36, 3, 227, 155, 36, 3, 227, 161, 36, 3, 
-    227, 134, 36, 3, 227, 132, 36, 3, 227, 159, 36, 3, 215, 155, 36, 3, 215, 
-    135, 36, 3, 215, 134, 36, 3, 215, 123, 36, 3, 215, 120, 36, 3, 215, 151, 
-    36, 3, 215, 150, 36, 3, 215, 154, 36, 3, 215, 133, 36, 3, 215, 132, 36, 
-    3, 215, 153, 36, 3, 228, 109, 36, 3, 228, 95, 36, 3, 228, 94, 36, 3, 228, 
-    78, 36, 3, 228, 77, 36, 3, 228, 105, 36, 3, 228, 104, 36, 3, 228, 108, 
-    36, 3, 228, 80, 36, 3, 228, 79, 36, 3, 228, 107, 36, 3, 217, 101, 36, 3, 
-    216, 117, 36, 3, 216, 103, 36, 3, 215, 118, 36, 3, 215, 85, 36, 3, 217, 
-    22, 36, 3, 217, 11, 36, 3, 217, 79, 36, 3, 111, 36, 3, 216, 17, 36, 3, 
-    217, 41, 36, 3, 229, 225, 36, 3, 228, 233, 36, 3, 228, 208, 36, 3, 227, 
-    237, 36, 3, 227, 179, 36, 3, 229, 107, 36, 3, 229, 103, 36, 3, 229, 212, 
-    36, 3, 228, 74, 36, 3, 228, 64, 36, 3, 229, 187, 36, 3, 226, 89, 36, 3, 
-    225, 108, 36, 3, 225, 71, 36, 3, 224, 150, 36, 3, 224, 119, 36, 3, 225, 
-    221, 36, 3, 225, 211, 36, 3, 226, 71, 36, 3, 225, 16, 36, 3, 224, 249, 
-    36, 3, 225, 234, 36, 3, 231, 237, 36, 3, 230, 230, 36, 3, 230, 201, 36, 
-    3, 230, 102, 36, 3, 230, 54, 36, 3, 231, 91, 36, 3, 231, 80, 36, 3, 231, 
-    203, 36, 3, 230, 161, 36, 3, 230, 132, 36, 3, 231, 135, 36, 3, 211, 103, 
-    36, 3, 211, 8, 36, 3, 210, 255, 36, 3, 210, 212, 36, 3, 210, 181, 36, 3, 
-    211, 47, 36, 3, 211, 44, 36, 3, 211, 82, 36, 3, 210, 244, 36, 3, 210, 
-    229, 36, 3, 211, 55, 36, 3, 223, 184, 36, 3, 223, 35, 36, 3, 222, 239, 
-    36, 3, 222, 140, 36, 3, 222, 112, 36, 3, 223, 128, 36, 3, 223, 108, 36, 
-    3, 223, 166, 36, 3, 222, 211, 36, 3, 222, 197, 36, 3, 223, 136, 36, 3, 
-    233, 134, 36, 3, 232, 241, 36, 3, 232, 227, 36, 3, 232, 98, 36, 3, 232, 
-    73, 36, 3, 233, 58, 36, 3, 233, 50, 36, 3, 233, 109, 36, 3, 232, 156, 36, 
-    3, 232, 127, 36, 3, 233, 74, 36, 3, 214, 26, 36, 3, 213, 176, 36, 3, 213, 
-    162, 36, 3, 212, 116, 36, 3, 212, 109, 36, 3, 213, 255, 36, 3, 213, 250, 
-    36, 3, 214, 23, 36, 3, 213, 138, 36, 3, 213, 127, 36, 3, 214, 5, 36, 3, 
-    232, 174, 36, 3, 232, 169, 36, 3, 232, 168, 36, 3, 232, 165, 36, 3, 232, 
-    164, 36, 3, 232, 171, 36, 3, 232, 170, 36, 3, 232, 173, 36, 3, 232, 167, 
-    36, 3, 232, 166, 36, 3, 232, 172, 36, 3, 232, 183, 36, 3, 232, 178, 36, 
-    3, 232, 177, 36, 3, 232, 161, 36, 3, 232, 160, 36, 3, 232, 180, 36, 3, 
-    232, 179, 36, 3, 232, 182, 36, 3, 232, 163, 36, 3, 232, 162, 36, 3, 232, 
-    181, 36, 3, 222, 178, 36, 3, 222, 167, 36, 3, 222, 166, 36, 3, 222, 160, 
-    36, 3, 222, 153, 36, 3, 222, 174, 36, 3, 222, 173, 36, 3, 222, 177, 36, 
-    3, 222, 165, 36, 3, 222, 164, 36, 3, 222, 176, 36, 3, 228, 91, 36, 3, 
-    228, 86, 36, 3, 228, 85, 36, 3, 228, 82, 36, 3, 228, 81, 36, 3, 228, 88, 
-    36, 3, 228, 87, 36, 3, 228, 90, 36, 3, 228, 84, 36, 3, 228, 83, 36, 3, 
-    228, 89, 36, 3, 235, 140, 36, 3, 235, 108, 36, 3, 235, 101, 36, 3, 235, 
-    51, 36, 3, 235, 33, 36, 3, 235, 126, 36, 3, 235, 124, 36, 3, 235, 135, 
-    36, 3, 235, 68, 36, 3, 235, 59, 36, 3, 235, 129, 36, 3, 220, 98, 36, 3, 
-    220, 32, 36, 3, 220, 27, 36, 3, 219, 225, 36, 3, 219, 210, 36, 3, 220, 
-    63, 36, 3, 220, 61, 36, 3, 220, 90, 36, 3, 220, 7, 36, 3, 220, 1, 36, 3, 
-    220, 71, 36, 3, 218, 222, 36, 3, 218, 192, 36, 3, 218, 188, 36, 3, 218, 
-    179, 36, 3, 218, 176, 36, 3, 218, 197, 36, 3, 218, 196, 36, 3, 218, 221, 
-    36, 3, 218, 184, 36, 3, 218, 183, 36, 3, 218, 199, 36, 3, 222, 31, 36, 3, 
-    219, 191, 36, 3, 219, 175, 36, 3, 218, 83, 36, 3, 218, 4, 36, 3, 221, 
-    181, 36, 3, 221, 170, 36, 3, 222, 17, 36, 3, 219, 58, 36, 3, 219, 40, 36, 
-    3, 221, 219, 36, 3, 242, 46, 36, 3, 241, 180, 36, 3, 241, 161, 36, 3, 
-    240, 222, 36, 3, 240, 202, 36, 3, 241, 238, 36, 3, 241, 220, 36, 3, 242, 
-    36, 36, 3, 241, 68, 36, 3, 241, 53, 36, 3, 241, 246, 36, 3, 233, 231, 36, 
-    3, 233, 230, 36, 3, 233, 225, 36, 3, 233, 224, 36, 3, 233, 221, 36, 3, 
-    233, 220, 36, 3, 233, 227, 36, 3, 233, 226, 36, 3, 233, 229, 36, 3, 233, 
-    223, 36, 3, 233, 222, 36, 3, 233, 228, 36, 3, 219, 231, 175, 116, 5, 211, 
-    68, 175, 116, 5, 223, 155, 175, 116, 5, 223, 78, 98, 1, 215, 28, 69, 116, 
-    5, 249, 233, 176, 69, 116, 5, 249, 233, 234, 132, 69, 116, 5, 249, 233, 
-    234, 28, 69, 116, 5, 249, 233, 234, 105, 69, 116, 5, 249, 233, 229, 4, 
-    69, 116, 5, 249, 233, 251, 33, 69, 116, 5, 249, 233, 250, 157, 69, 116, 
-    5, 249, 233, 249, 238, 69, 116, 5, 249, 233, 250, 86, 69, 116, 5, 249, 
-    233, 227, 134, 69, 116, 5, 249, 233, 248, 221, 69, 116, 5, 249, 233, 215, 
-    144, 69, 116, 5, 249, 233, 247, 145, 69, 116, 5, 249, 233, 215, 139, 69, 
-    116, 5, 249, 233, 197, 69, 116, 5, 249, 233, 217, 105, 69, 116, 5, 249, 
-    233, 216, 208, 69, 116, 5, 249, 233, 111, 69, 116, 5, 249, 233, 216, 156, 
-    69, 116, 5, 249, 233, 228, 74, 69, 116, 5, 249, 233, 252, 191, 69, 116, 
-    5, 249, 233, 225, 147, 69, 116, 5, 249, 233, 225, 16, 69, 116, 5, 249, 
-    233, 225, 121, 69, 116, 5, 249, 233, 230, 161, 69, 116, 5, 249, 233, 210, 
-    244, 69, 116, 5, 249, 233, 222, 211, 69, 116, 5, 249, 233, 232, 156, 69, 
-    116, 5, 249, 233, 213, 138, 69, 116, 5, 249, 233, 220, 102, 69, 116, 5, 
-    249, 233, 218, 223, 69, 116, 5, 249, 233, 206, 69, 116, 5, 249, 233, 162, 
-    69, 116, 5, 249, 233, 233, 135, 69, 25, 5, 249, 233, 224, 88, 69, 235, 
-    243, 25, 5, 249, 233, 224, 30, 69, 235, 243, 25, 5, 249, 233, 222, 100, 
-    69, 235, 243, 25, 5, 249, 233, 222, 93, 69, 235, 243, 25, 5, 249, 233, 
-    224, 69, 69, 25, 5, 226, 204, 69, 25, 5, 255, 34, 141, 1, 251, 255, 229, 
-    77, 141, 1, 251, 255, 229, 27, 141, 1, 251, 255, 228, 248, 141, 1, 251, 
-    255, 229, 64, 141, 1, 251, 255, 229, 4, 56, 1, 251, 255, 229, 77, 56, 1, 
-    251, 255, 229, 27, 56, 1, 251, 255, 228, 248, 56, 1, 251, 255, 229, 64, 
-    56, 1, 251, 255, 229, 4, 56, 1, 254, 194, 250, 190, 56, 1, 254, 194, 215, 
-    118, 56, 1, 254, 194, 111, 56, 1, 254, 194, 226, 105, 58, 1, 245, 20, 
-    245, 19, 249, 182, 138, 130, 58, 1, 245, 19, 245, 20, 249, 182, 138, 130, 
+    117, 129, 7, 4, 1, 210, 159, 129, 43, 249, 100, 127, 129, 67, 232, 214, 
+    129, 44, 249, 100, 127, 129, 183, 251, 7, 217, 85, 45, 221, 79, 45, 221, 
+    68, 45, 221, 57, 45, 221, 45, 45, 221, 34, 45, 221, 23, 45, 221, 12, 45, 
+    221, 1, 45, 220, 246, 45, 220, 238, 45, 220, 237, 45, 220, 236, 45, 220, 
+    235, 45, 220, 233, 45, 220, 232, 45, 220, 231, 45, 220, 230, 45, 220, 
+    229, 45, 220, 228, 45, 220, 227, 45, 220, 226, 45, 220, 225, 45, 220, 
+    224, 45, 220, 222, 45, 220, 221, 45, 220, 220, 45, 220, 219, 45, 220, 
+    218, 45, 220, 217, 45, 220, 216, 45, 220, 215, 45, 220, 214, 45, 220, 
+    213, 45, 220, 211, 45, 220, 210, 45, 220, 209, 45, 220, 208, 45, 220, 
+    207, 45, 220, 206, 45, 220, 205, 45, 220, 204, 45, 220, 203, 45, 220, 
+    202, 45, 220, 200, 45, 220, 199, 45, 220, 198, 45, 220, 197, 45, 220, 
+    196, 45, 220, 195, 45, 220, 194, 45, 220, 193, 45, 220, 192, 45, 220, 
+    191, 45, 220, 189, 45, 220, 188, 45, 220, 187, 45, 220, 186, 45, 220, 
+    185, 45, 220, 184, 45, 220, 183, 45, 220, 182, 45, 220, 181, 45, 220, 
+    180, 45, 220, 178, 45, 220, 177, 45, 220, 176, 45, 220, 175, 45, 220, 
+    174, 45, 220, 173, 45, 220, 172, 45, 220, 171, 45, 220, 170, 45, 220, 
+    169, 45, 220, 167, 45, 220, 166, 45, 220, 165, 45, 220, 164, 45, 220, 
+    163, 45, 220, 162, 45, 220, 161, 45, 220, 160, 45, 220, 159, 45, 220, 
+    158, 45, 221, 155, 45, 221, 154, 45, 221, 153, 45, 221, 152, 45, 221, 
+    151, 45, 221, 150, 45, 221, 149, 45, 221, 148, 45, 221, 147, 45, 221, 
+    146, 45, 221, 144, 45, 221, 143, 45, 221, 142, 45, 221, 141, 45, 221, 
+    140, 45, 221, 139, 45, 221, 138, 45, 221, 137, 45, 221, 136, 45, 221, 
+    135, 45, 221, 133, 45, 221, 132, 45, 221, 131, 45, 221, 130, 45, 221, 
+    129, 45, 221, 128, 45, 221, 127, 45, 221, 126, 45, 221, 125, 45, 221, 
+    124, 45, 221, 122, 45, 221, 121, 45, 221, 120, 45, 221, 119, 45, 221, 
+    118, 45, 221, 117, 45, 221, 116, 45, 221, 115, 45, 221, 114, 45, 221, 
+    113, 45, 221, 111, 45, 221, 110, 45, 221, 109, 45, 221, 108, 45, 221, 
+    107, 45, 221, 106, 45, 221, 105, 45, 221, 104, 45, 221, 103, 45, 221, 
+    102, 45, 221, 100, 45, 221, 99, 45, 221, 98, 45, 221, 97, 45, 221, 96, 
+    45, 221, 95, 45, 221, 94, 45, 221, 93, 45, 221, 92, 45, 221, 91, 45, 221, 
+    89, 45, 221, 88, 45, 221, 87, 45, 221, 86, 45, 221, 85, 45, 221, 84, 45, 
+    221, 83, 45, 221, 82, 45, 221, 81, 45, 221, 80, 45, 221, 78, 45, 221, 77, 
+    45, 221, 76, 45, 221, 75, 45, 221, 74, 45, 221, 73, 45, 221, 72, 45, 221, 
+    71, 45, 221, 70, 45, 221, 69, 45, 221, 67, 45, 221, 66, 45, 221, 65, 45, 
+    221, 64, 45, 221, 63, 45, 221, 62, 45, 221, 61, 45, 221, 60, 45, 221, 59, 
+    45, 221, 58, 45, 221, 56, 45, 221, 55, 45, 221, 54, 45, 221, 53, 45, 221, 
+    52, 45, 221, 51, 45, 221, 50, 45, 221, 49, 45, 221, 48, 45, 221, 47, 45, 
+    221, 44, 45, 221, 43, 45, 221, 42, 45, 221, 41, 45, 221, 40, 45, 221, 39, 
+    45, 221, 38, 45, 221, 37, 45, 221, 36, 45, 221, 35, 45, 221, 33, 45, 221, 
+    32, 45, 221, 31, 45, 221, 30, 45, 221, 29, 45, 221, 28, 45, 221, 27, 45, 
+    221, 26, 45, 221, 25, 45, 221, 24, 45, 221, 22, 45, 221, 21, 45, 221, 20, 
+    45, 221, 19, 45, 221, 18, 45, 221, 17, 45, 221, 16, 45, 221, 15, 45, 221, 
+    14, 45, 221, 13, 45, 221, 11, 45, 221, 10, 45, 221, 9, 45, 221, 8, 45, 
+    221, 7, 45, 221, 6, 45, 221, 5, 45, 221, 4, 45, 221, 3, 45, 221, 2, 45, 
+    221, 0, 45, 220, 255, 45, 220, 254, 45, 220, 253, 45, 220, 252, 45, 220, 
+    251, 45, 220, 250, 45, 220, 249, 45, 220, 248, 45, 220, 247, 45, 220, 
+    245, 45, 220, 244, 45, 220, 243, 45, 220, 242, 45, 220, 241, 45, 220, 
+    240, 45, 220, 239, 227, 203, 227, 205, 218, 153, 64, 241, 234, 219, 49, 
+    218, 153, 64, 216, 213, 218, 86, 245, 144, 64, 216, 213, 245, 57, 245, 
+    144, 64, 215, 244, 245, 110, 245, 133, 245, 134, 255, 8, 255, 9, 254, 
+    168, 252, 48, 252, 180, 251, 132, 135, 217, 90, 203, 217, 90, 240, 228, 
+    217, 94, 232, 215, 244, 146, 166, 232, 214, 245, 144, 64, 232, 214, 233, 
+    1, 228, 136, 245, 113, 232, 215, 217, 90, 67, 217, 90, 212, 118, 244, 21, 
+    244, 146, 244, 126, 250, 231, 223, 54, 249, 144, 220, 29, 226, 131, 232, 
+    151, 110, 219, 59, 220, 29, 236, 0, 232, 151, 210, 86, 219, 192, 248, 
+    152, 232, 205, 245, 78, 247, 156, 248, 32, 249, 179, 110, 248, 142, 248, 
+    32, 249, 179, 105, 248, 141, 248, 32, 249, 179, 158, 248, 140, 248, 32, 
+    249, 179, 161, 248, 139, 152, 255, 8, 229, 210, 217, 178, 236, 63, 217, 
+    181, 245, 144, 64, 215, 245, 251, 214, 245, 63, 251, 6, 251, 8, 245, 144, 
+    64, 231, 82, 245, 111, 218, 62, 218, 79, 245, 78, 245, 79, 235, 233, 220, 
+    139, 161, 244, 108, 220, 138, 243, 238, 235, 233, 220, 139, 158, 242, 
+    122, 220, 138, 242, 119, 235, 233, 220, 139, 105, 223, 122, 220, 138, 
+    222, 146, 235, 233, 220, 139, 110, 214, 174, 220, 138, 214, 133, 219, 22, 
+    248, 64, 248, 66, 226, 79, 250, 143, 226, 81, 125, 226, 241, 224, 194, 
+    241, 48, 251, 151, 225, 174, 241, 204, 251, 162, 228, 76, 251, 151, 241, 
+    204, 229, 176, 235, 243, 235, 245, 229, 83, 232, 214, 229, 100, 218, 153, 
+    64, 221, 159, 254, 19, 218, 224, 245, 144, 64, 221, 159, 254, 19, 245, 
+    81, 135, 217, 91, 220, 128, 203, 217, 91, 220, 128, 240, 225, 135, 217, 
+    91, 2, 235, 36, 203, 217, 91, 2, 235, 36, 240, 226, 232, 215, 217, 91, 
+    220, 128, 67, 217, 91, 220, 128, 212, 117, 225, 254, 232, 215, 244, 15, 
+    225, 254, 232, 215, 246, 107, 225, 33, 225, 254, 232, 215, 252, 179, 225, 
+    254, 232, 215, 214, 163, 225, 29, 223, 51, 232, 215, 244, 146, 223, 51, 
+    235, 243, 223, 36, 219, 156, 220, 29, 105, 219, 153, 218, 226, 219, 156, 
+    220, 29, 158, 219, 152, 218, 225, 248, 32, 249, 179, 218, 106, 248, 138, 
+    224, 184, 214, 132, 110, 224, 184, 214, 130, 224, 150, 224, 184, 214, 
+    132, 105, 224, 184, 214, 129, 224, 149, 220, 129, 215, 243, 218, 152, 
+    218, 90, 251, 7, 250, 143, 250, 210, 231, 44, 212, 59, 230, 44, 218, 153, 
+    64, 242, 108, 254, 19, 218, 153, 64, 224, 167, 254, 19, 219, 21, 245, 
+    144, 64, 242, 108, 254, 19, 245, 144, 64, 224, 167, 254, 19, 245, 108, 
+    218, 153, 64, 218, 106, 219, 36, 219, 156, 242, 142, 135, 235, 196, 220, 
+    108, 219, 156, 135, 235, 196, 221, 195, 249, 179, 220, 136, 235, 196, 
+    249, 114, 218, 107, 216, 237, 218, 169, 226, 170, 217, 168, 249, 219, 
+    226, 143, 224, 185, 231, 43, 225, 20, 254, 54, 224, 179, 249, 219, 254, 
+    70, 229, 164, 219, 201, 7, 6, 1, 242, 250, 7, 4, 1, 242, 250, 250, 160, 
+    182, 218, 68, 249, 228, 219, 107, 233, 47, 165, 1, 232, 176, 209, 209, 1, 
+    244, 45, 244, 37, 209, 209, 1, 244, 45, 244, 158, 209, 209, 1, 222, 212, 
+    209, 209, 1, 232, 157, 63, 164, 251, 224, 220, 4, 242, 216, 230, 249, 
+    223, 42, 243, 217, 243, 216, 243, 215, 230, 46, 209, 251, 209, 252, 209, 
+    254, 232, 103, 222, 220, 232, 104, 222, 221, 225, 224, 232, 102, 222, 
+    219, 228, 107, 230, 166, 211, 229, 212, 15, 245, 163, 243, 227, 230, 230, 
+    226, 198, 214, 134, 87, 230, 230, 248, 158, 87, 8, 3, 235, 159, 78, 224, 
+    195, 244, 21, 31, 67, 44, 71, 233, 21, 127, 213, 118, 213, 7, 212, 195, 
+    212, 184, 212, 173, 212, 162, 212, 151, 212, 140, 212, 129, 213, 117, 
+    213, 106, 213, 95, 213, 84, 213, 73, 213, 62, 213, 51, 251, 72, 226, 156, 
+    78, 251, 197, 209, 253, 49, 28, 16, 243, 237, 219, 103, 250, 74, 214, 9, 
+    213, 40, 213, 29, 213, 18, 213, 6, 212, 251, 212, 240, 212, 229, 212, 
+    218, 212, 207, 212, 199, 212, 198, 212, 197, 212, 196, 212, 194, 212, 
+    193, 212, 192, 212, 191, 212, 190, 212, 189, 212, 188, 212, 187, 212, 
+    186, 212, 185, 212, 183, 212, 182, 212, 181, 212, 180, 212, 179, 212, 
+    178, 212, 177, 212, 176, 212, 175, 212, 174, 212, 172, 212, 171, 212, 
+    170, 212, 169, 212, 168, 212, 167, 212, 166, 212, 165, 212, 164, 212, 
+    163, 212, 161, 212, 160, 212, 159, 212, 158, 212, 157, 212, 156, 212, 
+    155, 212, 154, 212, 153, 212, 152, 212, 150, 212, 149, 212, 148, 212, 
+    147, 212, 146, 212, 145, 212, 144, 212, 143, 212, 142, 212, 141, 212, 
+    139, 212, 138, 212, 137, 212, 136, 212, 135, 212, 134, 212, 133, 212, 
+    132, 212, 131, 212, 130, 212, 128, 212, 127, 212, 126, 212, 125, 212, 
+    124, 212, 123, 212, 122, 212, 121, 212, 120, 212, 119, 213, 116, 213, 
+    115, 213, 114, 213, 113, 213, 112, 213, 111, 213, 110, 213, 109, 213, 
+    108, 213, 107, 213, 105, 213, 104, 213, 103, 213, 102, 213, 101, 213, 
+    100, 213, 99, 213, 98, 213, 97, 213, 96, 213, 94, 213, 93, 213, 92, 213, 
+    91, 213, 90, 213, 89, 213, 88, 213, 87, 213, 86, 213, 85, 213, 83, 213, 
+    82, 213, 81, 213, 80, 213, 79, 213, 78, 213, 77, 213, 76, 213, 75, 213, 
+    74, 213, 72, 213, 71, 213, 70, 213, 69, 213, 68, 213, 67, 213, 66, 213, 
+    65, 213, 64, 213, 63, 213, 61, 213, 60, 213, 59, 213, 58, 213, 57, 213, 
+    56, 213, 55, 213, 54, 213, 53, 213, 52, 213, 50, 213, 49, 213, 48, 213, 
+    47, 213, 46, 213, 45, 213, 44, 213, 43, 213, 42, 213, 41, 213, 39, 213, 
+    38, 213, 37, 213, 36, 213, 35, 213, 34, 213, 33, 213, 32, 213, 31, 213, 
+    30, 213, 28, 213, 27, 213, 26, 213, 25, 213, 24, 213, 23, 213, 22, 213, 
+    21, 213, 20, 213, 19, 213, 17, 213, 16, 213, 15, 213, 14, 213, 13, 213, 
+    12, 213, 11, 213, 10, 213, 9, 213, 8, 213, 5, 213, 4, 213, 3, 213, 2, 
+    213, 1, 213, 0, 212, 255, 212, 254, 212, 253, 212, 252, 212, 250, 212, 
+    249, 212, 248, 212, 247, 212, 246, 212, 245, 212, 244, 212, 243, 212, 
+    242, 212, 241, 212, 239, 212, 238, 212, 237, 212, 236, 212, 235, 212, 
+    234, 212, 233, 212, 232, 212, 231, 212, 230, 212, 228, 212, 227, 212, 
+    226, 212, 225, 212, 224, 212, 223, 212, 222, 212, 221, 212, 220, 212, 
+    219, 212, 217, 212, 216, 212, 215, 212, 214, 212, 213, 212, 212, 212, 
+    211, 212, 210, 212, 209, 212, 208, 212, 206, 212, 205, 212, 204, 212, 
+    203, 212, 202, 212, 201, 212, 200, 7, 6, 1, 115, 2, 231, 234, 22, 242, 
+    137, 7, 4, 1, 115, 2, 231, 234, 22, 242, 137, 7, 6, 1, 160, 2, 67, 232, 
+    215, 51, 7, 4, 1, 160, 2, 67, 232, 215, 51, 7, 6, 1, 160, 2, 67, 232, 
+    215, 252, 44, 22, 242, 137, 7, 4, 1, 160, 2, 67, 232, 215, 252, 44, 22, 
+    242, 137, 7, 6, 1, 160, 2, 67, 232, 215, 252, 44, 22, 142, 7, 4, 1, 160, 
+    2, 67, 232, 215, 252, 44, 22, 142, 7, 6, 1, 160, 2, 250, 32, 22, 231, 
+    233, 7, 4, 1, 160, 2, 250, 32, 22, 231, 233, 7, 6, 1, 160, 2, 250, 32, 
+    22, 250, 235, 7, 4, 1, 160, 2, 250, 32, 22, 250, 235, 7, 6, 1, 240, 155, 
+    2, 231, 234, 22, 242, 137, 7, 4, 1, 240, 155, 2, 231, 234, 22, 242, 137, 
+    7, 4, 1, 240, 155, 2, 59, 77, 22, 142, 7, 4, 1, 229, 81, 2, 216, 90, 48, 
+    7, 6, 1, 144, 2, 67, 232, 215, 51, 7, 4, 1, 144, 2, 67, 232, 215, 51, 7, 
+    6, 1, 144, 2, 67, 232, 215, 252, 44, 22, 242, 137, 7, 4, 1, 144, 2, 67, 
+    232, 215, 252, 44, 22, 242, 137, 7, 6, 1, 144, 2, 67, 232, 215, 252, 44, 
+    22, 142, 7, 4, 1, 144, 2, 67, 232, 215, 252, 44, 22, 142, 7, 6, 1, 222, 
+    93, 2, 67, 232, 215, 51, 7, 4, 1, 222, 93, 2, 67, 232, 215, 51, 7, 6, 1, 
+    104, 2, 231, 234, 22, 242, 137, 7, 4, 1, 104, 2, 231, 234, 22, 242, 137, 
+    7, 6, 1, 115, 2, 226, 226, 22, 142, 7, 4, 1, 115, 2, 226, 226, 22, 142, 
+    7, 6, 1, 115, 2, 226, 226, 22, 183, 7, 4, 1, 115, 2, 226, 226, 22, 183, 
+    7, 6, 1, 160, 2, 226, 226, 22, 142, 7, 4, 1, 160, 2, 226, 226, 22, 142, 
+    7, 6, 1, 160, 2, 226, 226, 22, 183, 7, 4, 1, 160, 2, 226, 226, 22, 183, 
+    7, 6, 1, 160, 2, 59, 77, 22, 142, 7, 4, 1, 160, 2, 59, 77, 22, 142, 7, 6, 
+    1, 160, 2, 59, 77, 22, 183, 7, 4, 1, 160, 2, 59, 77, 22, 183, 7, 4, 1, 
+    240, 155, 2, 59, 77, 22, 242, 137, 7, 4, 1, 240, 155, 2, 59, 77, 22, 183, 
+    7, 6, 1, 240, 155, 2, 226, 226, 22, 142, 7, 4, 1, 240, 155, 2, 226, 226, 
+    22, 59, 77, 22, 142, 7, 6, 1, 240, 155, 2, 226, 226, 22, 183, 7, 4, 1, 
+    240, 155, 2, 226, 226, 22, 59, 77, 22, 183, 7, 6, 1, 235, 146, 2, 183, 7, 
+    4, 1, 235, 146, 2, 59, 77, 22, 183, 7, 6, 1, 233, 150, 2, 183, 7, 4, 1, 
+    233, 150, 2, 183, 7, 6, 1, 232, 51, 2, 183, 7, 4, 1, 232, 51, 2, 183, 7, 
+    6, 1, 223, 225, 2, 183, 7, 4, 1, 223, 225, 2, 183, 7, 6, 1, 104, 2, 226, 
+    226, 22, 142, 7, 4, 1, 104, 2, 226, 226, 22, 142, 7, 6, 1, 104, 2, 226, 
+    226, 22, 183, 7, 4, 1, 104, 2, 226, 226, 22, 183, 7, 6, 1, 104, 2, 231, 
+    234, 22, 142, 7, 4, 1, 104, 2, 231, 234, 22, 142, 7, 6, 1, 104, 2, 231, 
+    234, 22, 183, 7, 4, 1, 104, 2, 231, 234, 22, 183, 7, 4, 1, 254, 245, 2, 
+    242, 137, 7, 4, 1, 204, 144, 2, 242, 137, 7, 4, 1, 204, 144, 2, 142, 7, 
+    4, 1, 215, 94, 214, 106, 2, 242, 137, 7, 4, 1, 215, 94, 214, 106, 2, 142, 
+    7, 4, 1, 221, 197, 2, 242, 137, 7, 4, 1, 221, 197, 2, 142, 7, 4, 1, 241, 
+    52, 221, 197, 2, 242, 137, 7, 4, 1, 241, 52, 221, 197, 2, 142, 146, 1, 
+    234, 110, 36, 116, 235, 24, 36, 116, 229, 80, 36, 116, 251, 67, 36, 116, 
+    227, 168, 36, 116, 215, 160, 36, 116, 228, 112, 36, 116, 217, 153, 36, 
+    116, 230, 26, 36, 116, 226, 106, 36, 116, 193, 36, 116, 211, 117, 36, 
+    116, 153, 36, 116, 156, 36, 116, 214, 105, 36, 116, 232, 177, 36, 116, 
+    232, 186, 36, 116, 222, 181, 36, 116, 228, 94, 36, 116, 235, 145, 36, 
+    116, 220, 105, 36, 116, 218, 227, 36, 116, 222, 92, 36, 116, 242, 61, 36, 
+    116, 233, 233, 36, 3, 235, 11, 36, 3, 234, 93, 36, 3, 234, 84, 36, 3, 
+    233, 218, 36, 3, 233, 189, 36, 3, 234, 183, 36, 3, 234, 182, 36, 3, 234, 
+    247, 36, 3, 234, 29, 36, 3, 234, 11, 36, 3, 234, 196, 36, 3, 229, 77, 36, 
+    3, 229, 28, 36, 3, 229, 24, 36, 3, 228, 249, 36, 3, 228, 242, 36, 3, 229, 
+    65, 36, 3, 229, 63, 36, 3, 229, 74, 36, 3, 229, 5, 36, 3, 229, 0, 36, 3, 
+    229, 67, 36, 3, 251, 33, 36, 3, 250, 52, 36, 3, 250, 42, 36, 3, 249, 113, 
+    36, 3, 249, 84, 36, 3, 250, 191, 36, 3, 250, 183, 36, 3, 251, 23, 36, 3, 
+    249, 239, 36, 3, 249, 175, 36, 3, 250, 223, 36, 3, 227, 165, 36, 3, 227, 
+    149, 36, 3, 227, 144, 36, 3, 227, 129, 36, 3, 227, 122, 36, 3, 227, 157, 
+    36, 3, 227, 156, 36, 3, 227, 162, 36, 3, 227, 135, 36, 3, 227, 133, 36, 
+    3, 227, 160, 36, 3, 215, 156, 36, 3, 215, 136, 36, 3, 215, 135, 36, 3, 
+    215, 124, 36, 3, 215, 121, 36, 3, 215, 152, 36, 3, 215, 151, 36, 3, 215, 
+    155, 36, 3, 215, 134, 36, 3, 215, 133, 36, 3, 215, 154, 36, 3, 228, 110, 
+    36, 3, 228, 96, 36, 3, 228, 95, 36, 3, 228, 79, 36, 3, 228, 78, 36, 3, 
+    228, 106, 36, 3, 228, 105, 36, 3, 228, 109, 36, 3, 228, 81, 36, 3, 228, 
+    80, 36, 3, 228, 108, 36, 3, 217, 102, 36, 3, 216, 118, 36, 3, 216, 104, 
+    36, 3, 215, 119, 36, 3, 215, 85, 36, 3, 217, 23, 36, 3, 217, 12, 36, 3, 
+    217, 80, 36, 3, 111, 36, 3, 216, 18, 36, 3, 217, 42, 36, 3, 229, 226, 36, 
+    3, 228, 234, 36, 3, 228, 209, 36, 3, 227, 238, 36, 3, 227, 180, 36, 3, 
+    229, 108, 36, 3, 229, 104, 36, 3, 229, 213, 36, 3, 228, 75, 36, 3, 228, 
+    65, 36, 3, 229, 188, 36, 3, 226, 90, 36, 3, 225, 109, 36, 3, 225, 72, 36, 
+    3, 224, 151, 36, 3, 224, 120, 36, 3, 225, 222, 36, 3, 225, 212, 36, 3, 
+    226, 72, 36, 3, 225, 17, 36, 3, 224, 250, 36, 3, 225, 235, 36, 3, 231, 
+    238, 36, 3, 230, 231, 36, 3, 230, 202, 36, 3, 230, 103, 36, 3, 230, 55, 
+    36, 3, 231, 92, 36, 3, 231, 81, 36, 3, 231, 204, 36, 3, 230, 162, 36, 3, 
+    230, 133, 36, 3, 231, 136, 36, 3, 211, 103, 36, 3, 211, 8, 36, 3, 210, 
+    255, 36, 3, 210, 212, 36, 3, 210, 181, 36, 3, 211, 47, 36, 3, 211, 44, 
+    36, 3, 211, 82, 36, 3, 210, 244, 36, 3, 210, 229, 36, 3, 211, 55, 36, 3, 
+    223, 185, 36, 3, 223, 36, 36, 3, 222, 240, 36, 3, 222, 141, 36, 3, 222, 
+    113, 36, 3, 223, 129, 36, 3, 223, 109, 36, 3, 223, 167, 36, 3, 222, 212, 
+    36, 3, 222, 198, 36, 3, 223, 137, 36, 3, 233, 135, 36, 3, 232, 242, 36, 
+    3, 232, 228, 36, 3, 232, 99, 36, 3, 232, 74, 36, 3, 233, 59, 36, 3, 233, 
+    51, 36, 3, 233, 110, 36, 3, 232, 157, 36, 3, 232, 128, 36, 3, 233, 75, 
+    36, 3, 214, 26, 36, 3, 213, 176, 36, 3, 213, 162, 36, 3, 212, 116, 36, 3, 
+    212, 109, 36, 3, 213, 255, 36, 3, 213, 250, 36, 3, 214, 23, 36, 3, 213, 
+    138, 36, 3, 213, 127, 36, 3, 214, 5, 36, 3, 232, 175, 36, 3, 232, 170, 
+    36, 3, 232, 169, 36, 3, 232, 166, 36, 3, 232, 165, 36, 3, 232, 172, 36, 
+    3, 232, 171, 36, 3, 232, 174, 36, 3, 232, 168, 36, 3, 232, 167, 36, 3, 
+    232, 173, 36, 3, 232, 184, 36, 3, 232, 179, 36, 3, 232, 178, 36, 3, 232, 
+    162, 36, 3, 232, 161, 36, 3, 232, 181, 36, 3, 232, 180, 36, 3, 232, 183, 
+    36, 3, 232, 164, 36, 3, 232, 163, 36, 3, 232, 182, 36, 3, 222, 179, 36, 
+    3, 222, 168, 36, 3, 222, 167, 36, 3, 222, 161, 36, 3, 222, 154, 36, 3, 
+    222, 175, 36, 3, 222, 174, 36, 3, 222, 178, 36, 3, 222, 166, 36, 3, 222, 
+    165, 36, 3, 222, 177, 36, 3, 228, 92, 36, 3, 228, 87, 36, 3, 228, 86, 36, 
+    3, 228, 83, 36, 3, 228, 82, 36, 3, 228, 89, 36, 3, 228, 88, 36, 3, 228, 
+    91, 36, 3, 228, 85, 36, 3, 228, 84, 36, 3, 228, 90, 36, 3, 235, 141, 36, 
+    3, 235, 109, 36, 3, 235, 102, 36, 3, 235, 52, 36, 3, 235, 34, 36, 3, 235, 
+    127, 36, 3, 235, 125, 36, 3, 235, 136, 36, 3, 235, 69, 36, 3, 235, 60, 
+    36, 3, 235, 130, 36, 3, 220, 99, 36, 3, 220, 33, 36, 3, 220, 28, 36, 3, 
+    219, 226, 36, 3, 219, 211, 36, 3, 220, 64, 36, 3, 220, 62, 36, 3, 220, 
+    91, 36, 3, 220, 8, 36, 3, 220, 2, 36, 3, 220, 72, 36, 3, 218, 223, 36, 3, 
+    218, 193, 36, 3, 218, 189, 36, 3, 218, 180, 36, 3, 218, 177, 36, 3, 218, 
+    198, 36, 3, 218, 197, 36, 3, 218, 222, 36, 3, 218, 185, 36, 3, 218, 184, 
+    36, 3, 218, 200, 36, 3, 222, 32, 36, 3, 219, 192, 36, 3, 219, 176, 36, 3, 
+    218, 84, 36, 3, 218, 5, 36, 3, 221, 182, 36, 3, 221, 171, 36, 3, 222, 18, 
+    36, 3, 219, 59, 36, 3, 219, 41, 36, 3, 221, 220, 36, 3, 242, 47, 36, 3, 
+    241, 181, 36, 3, 241, 162, 36, 3, 240, 223, 36, 3, 240, 203, 36, 3, 241, 
+    239, 36, 3, 241, 221, 36, 3, 242, 37, 36, 3, 241, 69, 36, 3, 241, 54, 36, 
+    3, 241, 247, 36, 3, 233, 232, 36, 3, 233, 231, 36, 3, 233, 226, 36, 3, 
+    233, 225, 36, 3, 233, 222, 36, 3, 233, 221, 36, 3, 233, 228, 36, 3, 233, 
+    227, 36, 3, 233, 230, 36, 3, 233, 224, 36, 3, 233, 223, 36, 3, 233, 229, 
+    36, 3, 219, 232, 175, 116, 5, 211, 68, 175, 116, 5, 223, 156, 175, 116, 
+    5, 223, 79, 98, 1, 215, 28, 69, 116, 5, 249, 234, 176, 69, 116, 5, 249, 
+    234, 234, 133, 69, 116, 5, 249, 234, 234, 29, 69, 116, 5, 249, 234, 234, 
+    106, 69, 116, 5, 249, 234, 229, 5, 69, 116, 5, 249, 234, 251, 34, 69, 
+    116, 5, 249, 234, 250, 158, 69, 116, 5, 249, 234, 249, 239, 69, 116, 5, 
+    249, 234, 250, 87, 69, 116, 5, 249, 234, 227, 135, 69, 116, 5, 249, 234, 
+    248, 222, 69, 116, 5, 249, 234, 215, 145, 69, 116, 5, 249, 234, 247, 146, 
+    69, 116, 5, 249, 234, 215, 140, 69, 116, 5, 249, 234, 197, 69, 116, 5, 
+    249, 234, 217, 106, 69, 116, 5, 249, 234, 216, 209, 69, 116, 5, 249, 234, 
+    111, 69, 116, 5, 249, 234, 216, 157, 69, 116, 5, 249, 234, 228, 75, 69, 
+    116, 5, 249, 234, 252, 192, 69, 116, 5, 249, 234, 225, 148, 69, 116, 5, 
+    249, 234, 225, 17, 69, 116, 5, 249, 234, 225, 122, 69, 116, 5, 249, 234, 
+    230, 162, 69, 116, 5, 249, 234, 210, 244, 69, 116, 5, 249, 234, 222, 212, 
+    69, 116, 5, 249, 234, 232, 157, 69, 116, 5, 249, 234, 213, 138, 69, 116, 
+    5, 249, 234, 220, 103, 69, 116, 5, 249, 234, 218, 224, 69, 116, 5, 249, 
+    234, 206, 69, 116, 5, 249, 234, 162, 69, 116, 5, 249, 234, 233, 136, 69, 
+    25, 5, 249, 234, 224, 89, 69, 235, 244, 25, 5, 249, 234, 224, 31, 69, 
+    235, 244, 25, 5, 249, 234, 222, 101, 69, 235, 244, 25, 5, 249, 234, 222, 
+    94, 69, 235, 244, 25, 5, 249, 234, 224, 70, 69, 25, 5, 226, 205, 69, 25, 
+    5, 255, 35, 141, 1, 252, 0, 229, 78, 141, 1, 252, 0, 229, 28, 141, 1, 
+    252, 0, 228, 249, 141, 1, 252, 0, 229, 65, 141, 1, 252, 0, 229, 5, 56, 1, 
+    252, 0, 229, 78, 56, 1, 252, 0, 229, 28, 56, 1, 252, 0, 228, 249, 56, 1, 
+    252, 0, 229, 65, 56, 1, 252, 0, 229, 5, 56, 1, 254, 195, 250, 191, 56, 1, 
+    254, 195, 215, 119, 56, 1, 254, 195, 111, 56, 1, 254, 195, 226, 106, 58, 
+    1, 245, 21, 245, 20, 249, 183, 138, 130, 58, 1, 245, 20, 245, 21, 249, 
+    183, 138, 130, 
 };
 
 static unsigned char phrasebook_offset1[] = {
@@ -15040,2044 +15042,2044 @@
     39251, 39258, 39265, 39272, 39279, 39285, 39291, 39298, 39305, 39312, 0, 
     0, 0, 39319, 39322, 39325, 39328, 39333, 39336, 39339, 39342, 39345, 
     39348, 39351, 39355, 39358, 39361, 39364, 39367, 39370, 39375, 39378, 
-    39381, 39384, 39387, 39390, 39395, 39398, 39401, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39406, 39411, 39416, 39423, 
-    39431, 39436, 39441, 39445, 39449, 39454, 39461, 39468, 39472, 39477, 
-    39482, 39487, 39492, 39499, 39504, 39509, 39514, 39523, 39530, 39537, 
-    39541, 39546, 39552, 39557, 39564, 39573, 39582, 39586, 39590, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39594, 39598, 39606, 39610, 39614, 
-    39619, 39623, 39627, 39631, 39633, 39637, 39641, 39645, 39650, 39654, 
-    39658, 39666, 39669, 39673, 39676, 39679, 39685, 39689, 39692, 39698, 
-    39702, 39706, 39710, 39713, 39717, 39720, 39724, 39726, 39729, 39732, 
-    39736, 39738, 39742, 39745, 39748, 39753, 39758, 39765, 39768, 39771, 
-    39775, 39780, 39783, 39786, 39789, 39793, 39798, 39801, 39804, 39806, 
-    39809, 39812, 39815, 39819, 39824, 39827, 39831, 39835, 39839, 39843, 
-    39848, 39854, 39859, 39864, 39870, 39875, 39880, 39884, 39888, 39893, 
-    39897, 39901, 39904, 39906, 39911, 39917, 39924, 39931, 39938, 39945, 
-    39952, 39959, 39966, 39973, 39981, 39988, 39996, 40003, 40010, 40018, 
-    40026, 40031, 40036, 40041, 40046, 40051, 40056, 40061, 40066, 40071, 
-    40076, 40082, 40088, 40094, 40100, 40107, 40115, 40122, 40128, 40134, 
-    40140, 40146, 40152, 40158, 40164, 40170, 40176, 40183, 40190, 40197, 
-    40204, 40212, 40221, 40229, 40240, 40248, 40256, 40265, 40272, 40281, 
-    40290, 40298, 40307, 0, 0, 0, 0, 0, 0, 40315, 40317, 40320, 40322, 40325, 
-    40328, 40331, 40336, 40341, 40346, 40351, 40355, 40359, 40363, 40367, 
-    40372, 40378, 40383, 40389, 40394, 40399, 40404, 40410, 40415, 40421, 
-    40427, 40431, 40435, 40440, 40445, 40450, 40455, 40460, 40468, 40476, 
-    40484, 40492, 40499, 40507, 40514, 40521, 40530, 40542, 40548, 40554, 
-    40562, 40570, 40579, 40588, 40596, 40604, 40613, 40622, 40627, 40635, 
-    40640, 40645, 40651, 40656, 40662, 40669, 40676, 40681, 40687, 40692, 
-    40695, 40699, 40702, 40706, 40710, 40714, 40720, 40726, 40732, 40738, 
-    40742, 40746, 40750, 40754, 40760, 40766, 40770, 40775, 40779, 40784, 
-    40789, 40794, 40797, 40801, 40804, 40808, 40815, 40823, 40834, 40845, 
-    40850, 40859, 40866, 40875, 40884, 40888, 40894, 40902, 40906, 40911, 
-    40916, 40922, 40928, 40934, 40941, 40945, 40949, 40954, 40957, 40959, 
-    40963, 40967, 40975, 40979, 40981, 40983, 40987, 40995, 41000, 41006, 
-    41016, 41023, 41028, 41032, 41036, 41040, 41043, 41046, 41049, 41053, 
-    41057, 41061, 41065, 41069, 41072, 41076, 41080, 41083, 41085, 41088, 
-    41090, 41094, 41098, 41100, 41106, 41109, 41114, 41118, 41122, 41124, 
-    41126, 41128, 41131, 41135, 41139, 41143, 41147, 41151, 41157, 41163, 
-    41165, 41167, 41169, 41171, 41174, 41176, 41180, 41182, 41186, 41189, 
-    41195, 41199, 41203, 41206, 41209, 41213, 41219, 41223, 41233, 41243, 
-    41247, 41253, 41259, 41262, 41266, 41269, 41274, 41278, 41284, 41288, 
-    41300, 41308, 41312, 41316, 41322, 41326, 41329, 41331, 41334, 41338, 
-    41342, 41349, 41353, 41357, 41361, 41364, 41369, 41374, 41379, 41384, 
-    41389, 41394, 41402, 41410, 41414, 41418, 41420, 41425, 41429, 41433, 
-    41441, 41449, 41455, 41461, 41470, 41479, 41484, 41489, 41497, 41505, 
-    41507, 41509, 41514, 41519, 41525, 41531, 41537, 41543, 41547, 41551, 
-    41558, 41565, 41571, 41577, 41587, 41597, 41605, 41613, 41615, 41619, 
-    41623, 41628, 41633, 41640, 41647, 41650, 41653, 41656, 41659, 41662, 
-    41667, 41671, 41676, 41681, 41684, 41687, 41690, 41693, 41696, 41700, 
-    41703, 41706, 41709, 41712, 41714, 41716, 41718, 41720, 41728, 41736, 
-    41742, 41746, 41752, 41762, 41768, 41774, 41780, 41788, 41796, 41807, 
-    41811, 41815, 41817, 41823, 41825, 41827, 41829, 41831, 41837, 41840, 
-    41846, 41852, 41856, 41860, 41864, 41867, 41871, 41875, 41877, 41886, 
-    41895, 41900, 41905, 41911, 41917, 41923, 41926, 41929, 41932, 41935, 
-    41937, 41942, 41947, 41952, 41958, 41964, 41972, 41980, 41986, 41992, 
-    41998, 42004, 42013, 42022, 42031, 42040, 42049, 42058, 42067, 42076, 
-    42085, 42094, 42102, 42114, 42124, 42139, 42142, 42147, 42153, 42159, 
-    42166, 42180, 42195, 42201, 42207, 42214, 42220, 42228, 42234, 42247, 
-    42261, 42266, 42272, 42279, 42282, 42285, 42287, 42290, 42293, 42295, 
-    42297, 42301, 42304, 42307, 42310, 42313, 42318, 42323, 42328, 42333, 
-    42338, 42341, 42343, 42345, 42347, 42351, 42355, 42359, 42365, 42370, 
-    42372, 42374, 42379, 42384, 42389, 42394, 42399, 42404, 42406, 42408, 
-    42417, 42421, 42429, 42438, 42440, 42445, 42450, 42458, 42462, 42464, 
-    42468, 42470, 42474, 42478, 42482, 42484, 42486, 42488, 42495, 42504, 
-    42513, 42522, 42531, 42540, 42549, 42558, 42567, 42575, 42583, 42592, 
-    42601, 42610, 42619, 42627, 42635, 42644, 42653, 42662, 42672, 42681, 
-    42691, 42700, 42710, 42719, 42729, 42739, 42748, 42758, 42767, 42777, 
-    42786, 42796, 42805, 42814, 42823, 42832, 42841, 42851, 42860, 42869, 
-    42878, 42888, 42897, 42906, 42915, 42924, 42934, 42944, 42953, 42962, 
-    42970, 42978, 42985, 42993, 43002, 43013, 43022, 43031, 43040, 43047, 
-    43054, 43061, 43070, 43079, 43088, 43097, 43104, 43109, 43118, 43123, 
-    43126, 43134, 43137, 43142, 43147, 43150, 43153, 43161, 43164, 43169, 
-    43172, 43179, 43184, 43192, 43195, 43198, 43201, 43206, 43211, 43214, 
-    43217, 43225, 43228, 43235, 43242, 43246, 43250, 43255, 43260, 43266, 
-    43271, 43277, 43283, 43288, 43294, 43302, 43308, 43316, 43324, 43330, 
-    43338, 43346, 43355, 43363, 43369, 43377, 43386, 43394, 43398, 43403, 
-    43416, 43429, 43433, 43437, 43441, 43445, 43455, 43459, 43464, 43469, 
-    43474, 43479, 43484, 43489, 43499, 43509, 43517, 43527, 43537, 43545, 
-    43555, 43565, 43573, 43583, 43593, 43601, 43609, 43619, 43629, 43632, 
-    43635, 43638, 43643, 43647, 43653, 43660, 43667, 43675, 43682, 43686, 
-    43690, 43694, 43698, 43700, 43704, 43708, 43713, 43718, 43725, 43732, 
-    43735, 43742, 43744, 43746, 43750, 43754, 43759, 43765, 43771, 43777, 
-    43783, 43792, 43801, 43810, 43814, 43816, 43820, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 43827, 43831, 43838, 43845, 43852, 43859, 43863, 43867, 
-    43871, 43875, 43880, 43886, 43891, 43897, 43903, 43909, 43915, 43923, 
-    43930, 43937, 43944, 43951, 43956, 43962, 43971, 43975, 43982, 43986, 
-    43990, 43996, 44002, 44008, 44014, 44018, 44022, 44025, 44028, 44032, 
-    44039, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 44046, 44049, 44053, 44057, 44063, 44069, 44075, 44083, 44090, 
-    44094, 44102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 44107, 44110, 44113, 44116, 44119, 44122, 44125, 44128, 44131, 44134, 
-    44138, 44142, 44146, 44150, 44154, 44158, 44162, 44166, 44170, 44174, 
-    44178, 44181, 44184, 44187, 44190, 44193, 44196, 44199, 44202, 44205, 
-    44209, 44213, 44217, 44221, 44225, 44229, 44233, 44237, 44241, 44245, 
-    44249, 44255, 44261, 44267, 44274, 44281, 44288, 44295, 44302, 44309, 
-    44316, 44323, 44330, 44337, 44344, 44351, 44358, 44365, 44372, 44379, 
-    44386, 44391, 44397, 44403, 44409, 44414, 44420, 44426, 44432, 44437, 
-    44443, 44449, 44454, 44459, 44465, 44470, 44476, 44482, 44487, 44493, 
-    44499, 44504, 44510, 44516, 44522, 44528, 44534, 44539, 44545, 44551, 
-    44557, 44562, 44568, 44574, 44580, 44585, 44591, 44597, 44602, 44607, 
-    44613, 44618, 44624, 44630, 44635, 44641, 44647, 44652, 44658, 44664, 
-    44670, 44676, 44682, 44687, 44693, 44699, 44705, 44710, 44716, 44722, 
-    44728, 44733, 44739, 44745, 44750, 44755, 44761, 44766, 44772, 44778, 
-    44783, 44789, 44795, 44800, 44806, 44812, 44818, 44824, 44830, 44834, 
-    44839, 44844, 44849, 44854, 44859, 44864, 44869, 44874, 44879, 44884, 
-    44888, 44892, 44896, 44900, 44904, 44908, 44912, 44916, 44920, 44925, 
-    44930, 44935, 44940, 44945, 44950, 44959, 44968, 44977, 44986, 44995, 
-    45004, 45013, 45022, 45029, 45037, 45045, 45052, 45059, 45067, 45075, 
-    45082, 45089, 45097, 45105, 45112, 45119, 45127, 45135, 45142, 45149, 
-    45157, 45166, 45175, 45183, 45192, 45201, 45208, 45215, 45223, 45232, 
-    45241, 45249, 45258, 45267, 45274, 45281, 45290, 45299, 45307, 45315, 
-    45324, 45333, 45340, 45347, 45356, 45365, 45373, 45381, 45390, 45399, 
-    45406, 45413, 45422, 45431, 45439, 45448, 45457, 45465, 45475, 45485, 
-    45495, 45505, 45514, 45523, 45532, 45541, 45548, 45556, 45564, 45572, 
-    45580, 45585, 45590, 45599, 45607, 45614, 45623, 45631, 45638, 45647, 
-    45655, 45662, 45671, 45679, 45686, 45695, 45703, 45710, 45719, 45727, 
-    45734, 45743, 45751, 45758, 45767, 45775, 45782, 45791, 45799, 45806, 
-    45815, 45824, 45833, 45842, 45856, 45870, 45877, 45882, 45887, 45892, 
-    45897, 45902, 45907, 45912, 45917, 45925, 45933, 45941, 45949, 45954, 
-    45961, 45968, 45975, 45980, 45988, 45995, 46003, 46007, 46014, 46020, 
-    46027, 46031, 46037, 46043, 46049, 46053, 46056, 46060, 46064, 46071, 
-    46077, 46083, 46089, 46095, 46109, 46119, 46133, 46147, 46153, 46163, 
-    46177, 46180, 46183, 46190, 46198, 46203, 46208, 46216, 46228, 46240, 
-    46248, 46252, 46256, 46259, 46262, 46266, 46270, 46273, 46276, 46281, 
-    46286, 46292, 46298, 46303, 46308, 46314, 46320, 46325, 46330, 46335, 
-    46340, 46346, 46352, 46357, 46362, 46368, 46374, 46379, 46384, 46387, 
-    46390, 46399, 46401, 46403, 46406, 46410, 46416, 46418, 46421, 46428, 
-    46435, 46443, 46451, 46461, 46475, 46480, 46485, 46489, 46494, 46502, 
-    46510, 46519, 46528, 46537, 46546, 46551, 46556, 46562, 46568, 46574, 
-    46580, 46583, 46589, 46595, 46605, 46615, 46623, 46631, 46640, 46649, 
-    46653, 46661, 46669, 46677, 46685, 46694, 46703, 46712, 46721, 46726, 
-    46731, 46736, 46741, 46746, 46752, 46758, 46763, 46769, 46771, 46773, 
-    46775, 46777, 46780, 46783, 46785, 46787, 46789, 46793, 46797, 46799, 
-    46801, 46804, 46807, 46811, 46817, 46823, 46825, 46832, 46836, 46841, 
-    46846, 46848, 46858, 46864, 46870, 46876, 46882, 46888, 46894, 46899, 
-    46902, 46905, 46908, 46910, 46912, 46916, 46920, 46925, 46930, 46935, 
-    46938, 46942, 46947, 46950, 46954, 46959, 46964, 46969, 46974, 46979, 
-    46984, 46989, 46994, 46999, 47004, 47009, 47014, 47020, 47026, 47032, 
-    47034, 47037, 47039, 47042, 47044, 47046, 47048, 47050, 47052, 47054, 
-    47056, 47058, 47060, 47062, 47064, 47066, 47068, 47070, 47072, 47074, 
-    47076, 47081, 47086, 47091, 47096, 47101, 47106, 47111, 47116, 47121, 
-    47126, 47131, 47136, 47141, 47146, 47151, 47156, 47161, 47166, 47171, 
-    47176, 47180, 47184, 47188, 47194, 47200, 47205, 47210, 47215, 47220, 
-    47225, 47230, 47238, 47246, 47254, 47262, 47270, 47278, 47286, 47294, 
-    47300, 47305, 47310, 47315, 47318, 47322, 47326, 47330, 47334, 47338, 
-    47342, 47349, 47356, 47364, 47372, 47377, 47382, 47389, 47396, 47403, 
-    47410, 47413, 47416, 47421, 47423, 47427, 47432, 47434, 47436, 47438, 
-    47440, 47445, 47448, 47450, 47455, 47462, 47469, 47472, 47476, 47481, 
-    47486, 47494, 47500, 47506, 47518, 47525, 47532, 47537, 47542, 47548, 
-    47551, 47554, 47559, 47561, 47565, 47567, 47569, 47571, 47573, 47575, 
-    47577, 47582, 47584, 47586, 47588, 47590, 47594, 47596, 47599, 47604, 
-    47609, 47614, 47619, 47625, 47631, 47633, 47636, 47643, 47650, 47657, 
-    47664, 47668, 47672, 47674, 47676, 47680, 47686, 47691, 47693, 47697, 
-    47706, 47714, 47722, 47728, 47734, 47739, 47745, 47750, 47753, 47767, 
-    47770, 47775, 47780, 47786, 47796, 47798, 47804, 47810, 47814, 47821, 
-    47825, 47827, 47829, 47833, 47839, 47844, 47850, 47852, 47858, 47860, 
-    47866, 47868, 47870, 47875, 47877, 47881, 47886, 47888, 47893, 47898, 
-    47902, 47909, 0, 47919, 47925, 47928, 47934, 47937, 47942, 47947, 47951, 
-    47953, 47955, 47959, 47963, 47967, 47971, 47976, 47978, 47983, 47986, 
-    47989, 47992, 47996, 48000, 48005, 48009, 48014, 48019, 48023, 48028, 
-    48034, 48037, 48043, 48048, 48052, 48057, 48063, 48069, 48076, 48082, 
-    48089, 48096, 48098, 48105, 48109, 48115, 48121, 48126, 48132, 48136, 
-    48141, 48144, 48149, 48155, 48162, 48170, 48177, 48186, 48196, 48203, 
-    48209, 48213, 48220, 48225, 48234, 48237, 48240, 48249, 48259, 48266, 
-    48268, 48274, 48279, 48281, 48284, 48288, 48296, 48305, 48308, 48313, 
-    48318, 48326, 48334, 48342, 48350, 48356, 48362, 48368, 48376, 48381, 
-    48384, 48388, 48391, 48403, 48413, 48424, 48433, 48444, 48454, 48463, 
-    48469, 48477, 48481, 48489, 48493, 48501, 48508, 48515, 48524, 48533, 
-    48543, 48553, 48563, 48573, 48582, 48591, 48601, 48611, 48620, 48629, 
-    48635, 48641, 48647, 48653, 48659, 48665, 48671, 48677, 48683, 48690, 
-    48696, 48702, 48708, 48714, 48720, 48726, 48732, 48738, 48744, 48751, 
-    48758, 48765, 48772, 48779, 48786, 48793, 48800, 48807, 48814, 48822, 
-    48827, 48830, 48834, 48838, 48844, 48847, 48853, 48859, 48864, 48868, 
-    48873, 48879, 48886, 48889, 48896, 48903, 48907, 48916, 48925, 48930, 
-    48936, 48941, 48946, 48953, 48960, 48968, 48976, 48985, 48989, 48998, 
-    49003, 49007, 49014, 49018, 49025, 49033, 49038, 49046, 49050, 49055, 
-    49059, 49064, 49068, 49073, 49078, 49087, 49089, 49092, 49095, 49102, 
-    49109, 49114, 49122, 49128, 49134, 49139, 49142, 49147, 49152, 49157, 
-    49165, 49169, 49176, 49184, 49192, 49197, 49202, 49208, 49213, 49218, 
-    49224, 49229, 49232, 49236, 49240, 49247, 49256, 49261, 49270, 49279, 
-    49285, 49291, 49296, 49301, 49306, 49311, 49317, 49323, 49331, 49339, 
-    49345, 49351, 49356, 49361, 49368, 49375, 49381, 49384, 49387, 49391, 
-    49395, 49399, 49404, 49410, 49416, 49423, 49430, 49435, 49439, 49443, 
-    49447, 49451, 49455, 49459, 49463, 49467, 49471, 49475, 49479, 49483, 
-    49487, 49491, 49495, 49499, 49503, 49507, 49511, 49515, 49519, 49523, 
-    49527, 49531, 49535, 49539, 49543, 49547, 49551, 49555, 49559, 49563, 
-    49567, 49571, 49575, 49579, 49583, 49587, 49591, 49595, 49599, 49603, 
-    49607, 49611, 49615, 49619, 49623, 49627, 49631, 49635, 49639, 49643, 
-    49647, 49651, 49655, 49659, 49663, 49667, 49671, 49675, 49679, 49683, 
-    49687, 49691, 49695, 49699, 49703, 49707, 49711, 49715, 49719, 49723, 
-    49727, 49731, 49735, 49739, 49743, 49747, 49751, 49755, 49759, 49763, 
-    49767, 49771, 49775, 49779, 49783, 49787, 49791, 49795, 49799, 49803, 
-    49807, 49811, 49815, 49819, 49823, 49827, 49831, 49835, 49839, 49843, 
-    49847, 49851, 49855, 49859, 49863, 49867, 49871, 49875, 49879, 49883, 
-    49887, 49891, 49895, 49899, 49903, 49907, 49911, 49915, 49919, 49923, 
-    49927, 49931, 49935, 49939, 49943, 49947, 49951, 49955, 49959, 49963, 
-    49967, 49971, 49975, 49979, 49983, 49987, 49991, 49995, 49999, 50003, 
-    50007, 50011, 50015, 50019, 50023, 50027, 50031, 50035, 50039, 50043, 
-    50047, 50051, 50055, 50059, 50063, 50067, 50071, 50075, 50079, 50083, 
-    50087, 50091, 50095, 50099, 50103, 50107, 50111, 50115, 50119, 50123, 
-    50127, 50131, 50135, 50139, 50143, 50147, 50151, 50155, 50159, 50163, 
-    50167, 50171, 50175, 50179, 50183, 50187, 50191, 50195, 50199, 50203, 
-    50207, 50211, 50215, 50219, 50223, 50227, 50231, 50235, 50239, 50243, 
-    50247, 50251, 50255, 50259, 50263, 50267, 50271, 50275, 50279, 50283, 
-    50287, 50291, 50295, 50299, 50303, 50307, 50311, 50315, 50319, 50323, 
-    50327, 50331, 50335, 50339, 50343, 50347, 50351, 50355, 50359, 50363, 
-    50367, 50371, 50375, 50379, 50383, 50387, 50391, 50395, 50399, 50403, 
-    50407, 50411, 50415, 50419, 50423, 50427, 50431, 50435, 50439, 50443, 
-    50447, 50451, 50455, 50459, 50466, 50474, 50480, 50486, 50493, 50500, 
-    50506, 50512, 50518, 50524, 50529, 50534, 50539, 50544, 50550, 50556, 
-    50564, 50571, 50577, 50583, 50591, 50600, 50607, 50617, 50628, 50631, 
-    50634, 50638, 50642, 50649, 50656, 50667, 50678, 50688, 50698, 50705, 
-    50712, 50719, 50726, 50737, 50748, 50759, 50770, 50780, 50790, 50802, 
-    50814, 50825, 50836, 50848, 50860, 50869, 50879, 50889, 50900, 50911, 
-    50918, 50925, 50932, 50939, 50949, 50959, 50967, 50975, 50982, 50989, 
-    50996, 51003, 51010, 51015, 51020, 51026, 51034, 51044, 51054, 51064, 
-    51074, 51084, 51094, 51104, 51114, 51124, 51134, 51144, 51155, 51166, 
-    51176, 51186, 51197, 51208, 51218, 51228, 51239, 51250, 51260, 51270, 
-    51281, 51292, 51308, 51327, 51343, 51362, 51378, 51394, 51410, 51426, 
-    51437, 51449, 51460, 51472, 51491, 51510, 51518, 51524, 51531, 51538, 
-    51545, 51552, 51557, 51563, 51568, 51573, 51579, 51584, 51589, 51594, 
-    51599, 51604, 51611, 51616, 51623, 51628, 51633, 51637, 51641, 51648, 
-    51655, 51662, 51669, 51676, 51683, 51696, 51709, 51722, 51735, 51743, 
-    51751, 51757, 51763, 51770, 51777, 51784, 51791, 51795, 51800, 51808, 
-    51816, 51824, 51831, 51835, 51843, 51851, 51855, 51859, 51864, 51871, 
-    51879, 51887, 51906, 51925, 51944, 51963, 51982, 52001, 52020, 52039, 
-    52045, 52052, 52061, 52069, 52077, 52082, 52085, 52088, 52093, 52096, 
-    52115, 52122, 52128, 52134, 52138, 52141, 52144, 52147, 52159, 52172, 
-    52179, 52186, 52189, 52193, 52196, 52201, 52206, 52211, 52217, 52226, 
-    52233, 52240, 52248, 52255, 52262, 52265, 52271, 52277, 52280, 52283, 
-    52288, 52293, 52299, 52305, 52309, 52314, 52321, 52325, 52331, 52335, 
-    52339, 52347, 52359, 52368, 52372, 52374, 52383, 52392, 52398, 52401, 
-    52407, 52413, 52418, 52423, 52428, 52433, 52438, 52443, 52445, 52451, 
-    52456, 52463, 52467, 52473, 52476, 52480, 52487, 52494, 52496, 52498, 
-    52504, 52510, 52516, 52525, 52534, 52541, 52548, 52554, 52560, 52565, 
-    52570, 52575, 52581, 52587, 52592, 52599, 52603, 52607, 52620, 52633, 
-    52645, 52654, 52660, 52667, 52672, 52677, 52682, 52687, 52692, 52694, 
-    52701, 52708, 52715, 52722, 52729, 52737, 52743, 52748, 52754, 52760, 
-    52766, 52773, 52779, 52787, 52795, 52803, 52811, 52818, 52824, 52830, 
-    52839, 52843, 52852, 52861, 52870, 52878, 52882, 52888, 52895, 52902, 
-    52906, 52912, 52919, 52924, 52929, 52935, 52940, 52945, 52952, 52959, 
-    52964, 52969, 52977, 52985, 52995, 53005, 53012, 53019, 53023, 53027, 
-    53039, 53045, 53051, 53056, 53061, 53068, 53075, 53081, 53087, 53096, 
-    53104, 53112, 53119, 53126, 53133, 53139, 53146, 53152, 53159, 53166, 
-    53173, 53180, 53186, 53191, 53200, 53210, 53217, 53226, 53232, 53237, 
-    53242, 53252, 53258, 53264, 53270, 53278, 53283, 53290, 53297, 53308, 
-    53315, 53322, 53329, 53336, 53343, 53350, 53357, 53369, 53381, 53392, 
-    53403, 53416, 53429, 53434, 53439, 53448, 53457, 53464, 53471, 53480, 
-    53489, 53497, 53505, 53513, 53521, 53531, 53541, 53555, 53569, 53577, 
-    53585, 53597, 53609, 53617, 53625, 53635, 53645, 53650, 53655, 53664, 
-    53673, 53678, 53683, 53691, 53697, 53703, 53711, 53719, 53732, 53745, 
-    53749, 53753, 53760, 53767, 53774, 53782, 53790, 53799, 53808, 53814, 
-    53820, 53827, 53834, 53841, 53848, 53857, 53866, 53869, 53872, 53877, 
-    53882, 53888, 53894, 53901, 53908, 53918, 53928, 53935, 53942, 53950, 
-    53958, 53966, 53974, 53982, 53990, 53996, 54002, 54006, 54010, 54017, 
-    54024, 54029, 54034, 54039, 54044, 54050, 54064, 54071, 54078, 54082, 
-    54084, 54086, 54091, 54096, 54101, 54106, 54114, 54121, 54128, 54136, 
-    54148, 54156, 54164, 54175, 54179, 54183, 54189, 54197, 54210, 54217, 
-    54224, 54231, 54236, 54243, 54252, 54260, 54266, 54272, 54278, 54287, 
-    54296, 54304, 54313, 54318, 54321, 54326, 54332, 54338, 54344, 54350, 
-    54354, 54357, 54361, 54365, 54371, 54377, 54383, 54389, 54393, 54397, 
-    54404, 54411, 54418, 54425, 54432, 54439, 54449, 54459, 54466, 54473, 
-    54481, 54489, 54493, 54498, 54503, 54509, 54515, 54518, 54521, 54524, 
-    54527, 54531, 54536, 54541, 54546, 54551, 54556, 54560, 54564, 54568, 
-    54572, 54576, 54580, 54584, 54590, 54594, 54600, 54605, 54612, 54620, 
-    54627, 54635, 54642, 54650, 54659, 54666, 54676, 54687, 54693, 54702, 
-    54708, 54717, 54726, 54732, 54738, 54742, 54746, 54755, 54764, 54771, 
-    54778, 54787, 0, 0, 0, 54796, 54801, 54805, 54809, 54814, 54819, 54824, 
-    54832, 54840, 54843, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 54847, 54852, 54857, 54862, 54867, 54872, 54877, 54882, 
-    54887, 54892, 54897, 54903, 54907, 54912, 54917, 54922, 54927, 54932, 
-    54937, 54942, 54947, 54952, 54957, 54962, 54967, 54972, 54977, 54982, 
-    54987, 54992, 54997, 55002, 55007, 55012, 55017, 55023, 55028, 55034, 
-    55043, 55048, 55056, 55063, 55072, 55077, 55082, 55087, 55093, 0, 55100, 
-    55105, 55110, 55115, 55120, 55125, 55130, 55135, 55140, 55145, 55150, 
-    55156, 55160, 55165, 55170, 55175, 55180, 55185, 55190, 55195, 55200, 
-    55205, 55210, 55215, 55220, 55225, 55230, 55235, 55240, 55245, 55250, 
-    55255, 55260, 55265, 55270, 55276, 55281, 55287, 55296, 55301, 55309, 
-    55316, 55325, 55330, 55335, 55340, 55346, 0, 55353, 55361, 55369, 55378, 
-    55385, 55393, 55399, 55408, 55416, 55424, 55432, 55440, 55448, 55456, 
-    55461, 55468, 55474, 55481, 55489, 55496, 55503, 55511, 55517, 55523, 
-    55530, 55537, 55547, 55557, 55564, 55571, 55576, 55586, 55596, 55601, 
-    55606, 55611, 55616, 55621, 55626, 55631, 55636, 55641, 55646, 55651, 
-    55656, 55661, 55666, 55671, 55676, 55681, 55686, 55691, 55696, 55701, 
-    55706, 55711, 55716, 55721, 55726, 55731, 55736, 55741, 55746, 55750, 
-    55754, 55759, 55764, 55769, 55774, 55779, 55784, 55789, 55794, 55799, 
-    55804, 55809, 55814, 55819, 55824, 55829, 55834, 55839, 55844, 55851, 
-    55858, 55865, 55872, 55879, 55886, 55893, 55900, 55907, 55914, 55921, 
-    55928, 55935, 55942, 55947, 55952, 55959, 55966, 55973, 55980, 55987, 
-    55994, 56001, 56008, 56015, 56022, 56029, 56036, 56042, 56048, 56054, 
-    56060, 56067, 56074, 56081, 56088, 56095, 56102, 56109, 56116, 56123, 
-    56130, 56138, 56146, 56154, 56162, 56170, 56178, 56186, 56194, 56198, 
-    56204, 56210, 56214, 56220, 56226, 56232, 56239, 56246, 56253, 56260, 
-    56265, 56271, 56277, 56284, 0, 0, 0, 0, 0, 56291, 56299, 56308, 56317, 
-    56325, 56331, 56336, 56341, 56346, 56351, 56356, 56361, 56366, 56371, 
-    56376, 56381, 56386, 56391, 56396, 56401, 56406, 56411, 56416, 56421, 
-    56426, 56431, 56436, 56441, 56446, 56451, 56456, 56461, 56466, 56471, 
-    56476, 56481, 56486, 56491, 56496, 56501, 56506, 56511, 56516, 56521, 
-    56526, 0, 56531, 0, 0, 0, 0, 0, 56536, 0, 0, 56541, 56545, 56550, 56555, 
-    56560, 56565, 56574, 56579, 56584, 56589, 56594, 56599, 56604, 56609, 
-    56614, 56621, 56626, 56631, 56640, 56647, 56652, 56657, 56662, 56669, 
-    56674, 56681, 56686, 56691, 56698, 56705, 56710, 56715, 56720, 56727, 
-    56734, 56739, 56744, 56749, 56754, 56759, 56766, 56773, 56778, 56783, 
-    56788, 56793, 56798, 56803, 56808, 56813, 56818, 56823, 56828, 56835, 
-    56840, 56845, 0, 0, 0, 0, 0, 0, 0, 56850, 56857, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 56862, 56867, 56871, 56875, 56879, 56883, 56887, 56891, 
-    56895, 56899, 56903, 56907, 56913, 56917, 56921, 56925, 56929, 56933, 
-    56937, 56941, 56945, 56949, 56953, 56957, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    56961, 56965, 56969, 56973, 56977, 56981, 56985, 0, 56989, 56993, 56997, 
-    57001, 57005, 57009, 57013, 0, 57017, 57021, 57025, 57029, 57033, 57037, 
-    57041, 0, 57045, 57049, 57053, 57057, 57061, 57065, 57069, 0, 57073, 
-    57077, 57081, 57085, 57089, 57093, 57097, 0, 57101, 57105, 57109, 57113, 
-    57117, 57121, 57125, 0, 57129, 57133, 57137, 57141, 57145, 57149, 57153, 
-    0, 57157, 57161, 57165, 57169, 57173, 57177, 57181, 0, 57185, 57190, 
-    57195, 57200, 57205, 57210, 57215, 57219, 57224, 57229, 57234, 57238, 
-    57243, 57248, 57253, 57258, 57262, 57267, 57272, 57277, 57282, 57287, 
-    57292, 57296, 57301, 57306, 57313, 57318, 57323, 57329, 57336, 57343, 
-    57352, 57359, 57368, 57372, 57376, 57382, 57388, 57394, 57402, 57408, 
-    57412, 57416, 57420, 57426, 57432, 57436, 57438, 57442, 57448, 57450, 
-    57454, 57458, 57462, 57468, 57473, 57477, 57481, 57486, 57492, 57497, 
-    57502, 57507, 57512, 57519, 57526, 57531, 57536, 57541, 57546, 57551, 
-    57556, 57560, 57564, 57571, 57578, 57584, 57588, 57593, 57595, 57599, 
-    57607, 57611, 57615, 57619, 57623, 57629, 57635, 57639, 57645, 57649, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57653, 57657, 
-    57661, 57666, 57671, 57676, 57680, 57684, 57688, 57693, 57698, 57702, 
-    57706, 57710, 57714, 57719, 57724, 57729, 57734, 57738, 57742, 57747, 
-    57752, 57757, 57762, 57766, 0, 57770, 57774, 57778, 57782, 57786, 57790, 
-    57794, 57799, 57804, 57808, 57813, 57818, 57827, 57831, 57835, 57839, 
-    57846, 57850, 57855, 57860, 57864, 57868, 57874, 57879, 57884, 57889, 
-    57894, 57898, 57902, 57906, 57910, 57914, 57919, 57924, 57928, 57932, 
-    57937, 57942, 57947, 57951, 57955, 57960, 57965, 57971, 57977, 57981, 
-    57987, 57993, 57997, 58003, 58009, 58014, 58019, 58023, 58029, 58033, 
-    58037, 58043, 58049, 58054, 58059, 58063, 58067, 58075, 58081, 58087, 
-    58093, 58098, 58103, 58108, 58114, 58118, 58124, 58128, 58132, 58138, 
-    58144, 58150, 58156, 58162, 58168, 58174, 58180, 58186, 58192, 58198, 
-    58204, 58208, 58214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58220, 58223, 
-    58227, 58231, 58235, 58239, 58242, 58245, 58249, 58253, 58257, 58261, 
-    58264, 58269, 58273, 58277, 58281, 58286, 58290, 58294, 58298, 58302, 
-    58308, 58314, 58318, 58322, 58326, 58330, 58334, 58338, 58342, 58346, 
-    58350, 58354, 58358, 58364, 58368, 58372, 58376, 58380, 58384, 58388, 
-    58392, 58396, 58400, 58404, 58408, 58412, 58416, 58420, 58424, 58428, 
-    58434, 58440, 58445, 58450, 58454, 58458, 58462, 58466, 58470, 58474, 
-    58478, 58482, 58486, 58490, 58494, 58498, 58502, 58506, 58510, 58514, 
-    58518, 58522, 58526, 58530, 58534, 58538, 58542, 58546, 58552, 58556, 
-    58560, 58564, 58568, 58572, 58576, 58580, 58584, 58589, 58596, 58600, 
-    58604, 58608, 58612, 58616, 58620, 58624, 58628, 58632, 58636, 58640, 
-    58644, 58651, 58655, 58661, 58665, 58669, 58673, 58677, 58681, 58684, 
-    58688, 58692, 58696, 58700, 58704, 58708, 58712, 58716, 58720, 58724, 
-    58728, 58732, 58736, 58740, 58744, 58748, 58752, 58756, 58760, 58764, 
-    58768, 58772, 58776, 58780, 58784, 58788, 58792, 58796, 58800, 58804, 
-    58808, 58812, 58818, 58822, 58826, 58830, 58834, 58838, 58842, 58846, 
-    58850, 58854, 58858, 58862, 58866, 58870, 58874, 58878, 58882, 58886, 
-    58890, 58894, 58898, 58902, 58906, 58910, 58914, 58918, 58922, 58926, 
-    58934, 58938, 58942, 58946, 58950, 58954, 58960, 58964, 58968, 58972, 
-    58976, 58980, 58984, 58988, 58992, 58996, 59000, 59004, 59008, 59012, 
-    59018, 59022, 59026, 59030, 59034, 59038, 59042, 59046, 59050, 59054, 
-    59058, 59062, 59066, 59070, 59074, 59078, 59082, 59086, 59090, 59094, 
-    59098, 59102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 59106, 59115, 59123, 59135, 59146, 59154, 59163, 59172, 
-    59182, 59194, 59206, 59218, 0, 0, 0, 0, 59224, 59227, 59230, 59235, 
-    59238, 59245, 59249, 59253, 59257, 59261, 59265, 59270, 59275, 59279, 
-    59283, 59288, 59293, 59298, 59303, 59306, 59309, 59315, 59321, 59326, 
-    59331, 59338, 59345, 59349, 59353, 59357, 59365, 59371, 59378, 59383, 
-    59388, 59393, 59398, 59403, 59408, 59413, 59418, 59423, 59428, 59433, 
-    59438, 59443, 59448, 59454, 59459, 59463, 59469, 59480, 59490, 59505, 
-    59515, 59519, 59529, 59535, 59541, 59547, 59552, 59555, 59560, 59564, 0, 
-    59570, 59574, 59577, 59581, 59584, 59588, 59591, 59595, 59598, 59602, 
-    59605, 59608, 59612, 59616, 59620, 59624, 59628, 59632, 59636, 59640, 
-    59644, 59647, 59651, 59655, 59659, 59663, 59667, 59671, 59675, 59679, 
-    59683, 59687, 59691, 59695, 59699, 59704, 59708, 59712, 59716, 59720, 
-    59723, 59727, 59730, 59734, 59738, 59742, 59746, 59749, 59753, 59756, 
-    59760, 59764, 59768, 59772, 59776, 59780, 59784, 59788, 59792, 59796, 
-    59800, 59804, 59807, 59811, 59815, 59819, 59823, 59827, 59830, 59835, 
-    59839, 59844, 59848, 59851, 59855, 59859, 59863, 59867, 59872, 59876, 
-    59880, 59884, 59888, 59892, 59896, 59900, 0, 0, 59905, 59913, 59921, 
-    59928, 59935, 59939, 59945, 59950, 59955, 59959, 59962, 59966, 59969, 
-    59973, 59976, 59980, 59983, 59987, 59990, 59993, 59997, 60001, 60005, 
-    60009, 60013, 60017, 60021, 60025, 60029, 60032, 60036, 60040, 60044, 
-    60048, 60052, 60056, 60060, 60064, 60068, 60072, 60076, 60080, 60084, 
-    60089, 60093, 60097, 60101, 60105, 60108, 60112, 60115, 60119, 60123, 
-    60127, 60131, 60134, 60138, 60141, 60145, 60149, 60153, 60157, 60161, 
-    60165, 60169, 60173, 60177, 60181, 60185, 60189, 60192, 60196, 60200, 
-    60204, 60208, 60212, 60215, 60220, 60224, 60229, 60233, 60236, 60240, 
-    60244, 60248, 60252, 60257, 60261, 60265, 60269, 60273, 60277, 60281, 
-    60285, 60290, 60294, 60298, 60302, 60306, 60311, 60318, 60322, 60328, 0, 
-    0, 0, 0, 0, 60333, 60338, 60343, 60347, 60352, 60357, 60362, 60367, 
-    60371, 60376, 60381, 60386, 60391, 60396, 60401, 60406, 60411, 60416, 
-    60420, 60425, 60430, 60435, 60439, 60443, 60447, 60452, 60457, 60462, 
-    60467, 60472, 60477, 60482, 60487, 60492, 60497, 60501, 60505, 60510, 
-    60515, 60520, 60525, 0, 0, 0, 60530, 60534, 60538, 60542, 60546, 60550, 
-    60554, 60558, 60562, 60566, 60570, 60574, 60578, 60582, 60586, 60590, 
-    60594, 60598, 60602, 60606, 60610, 60614, 60618, 60622, 60626, 60630, 
-    60634, 60638, 60642, 60646, 60650, 60653, 60657, 60660, 60664, 60668, 
-    60671, 60675, 60679, 60682, 60686, 60690, 60694, 60698, 60701, 60705, 
-    60709, 60713, 60717, 60721, 60725, 60728, 60731, 60735, 60739, 60743, 
-    60747, 60751, 60755, 60759, 60763, 60767, 60771, 60775, 60779, 60783, 
-    60787, 60791, 60795, 60799, 60803, 60807, 60811, 60815, 60819, 60823, 
-    60827, 60831, 60835, 60839, 60843, 60847, 60851, 60855, 60859, 60863, 
-    60867, 60871, 60875, 60879, 60883, 60887, 60891, 60895, 0, 60899, 60905, 
-    60911, 60916, 60921, 60926, 60932, 60938, 60944, 60950, 60956, 60962, 
-    60968, 60974, 60980, 60986, 60992, 60997, 61002, 61007, 61012, 61017, 
-    61022, 61027, 61032, 61037, 61042, 61047, 61052, 61057, 61062, 61067, 
-    61072, 61077, 61082, 61087, 61092, 61098, 61104, 61110, 61116, 61121, 
-    61126, 0, 0, 0, 0, 0, 61131, 61136, 61141, 61146, 61151, 61156, 61161, 
-    61166, 61171, 61176, 61181, 61186, 61191, 61196, 61201, 61206, 61211, 
-    61216, 61221, 61226, 61231, 61236, 61241, 61246, 61251, 61256, 61261, 
-    61266, 61271, 61276, 61281, 61286, 61291, 61296, 61301, 61306, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 61311, 61316, 61321, 61326, 61330, 61335, 
-    61339, 61344, 61349, 61354, 61359, 61364, 61368, 61373, 61378, 61383, 
-    61388, 61392, 61396, 61400, 61404, 61408, 61412, 61416, 61420, 61424, 
-    61428, 61432, 61436, 61440, 61444, 61449, 61454, 61459, 61464, 61469, 
-    61474, 61479, 61484, 61489, 61494, 61499, 61504, 61509, 61514, 61519, 
-    61525, 0, 61532, 61535, 61538, 61541, 61544, 61547, 61550, 61553, 61556, 
-    61559, 61563, 61567, 61571, 61575, 61579, 61583, 61587, 61591, 61595, 
-    61599, 61603, 61607, 61611, 61615, 61619, 61623, 61627, 61631, 61635, 
-    61639, 61643, 61647, 61651, 61655, 61659, 61663, 61667, 61671, 61675, 
-    61679, 61683, 61692, 61701, 61710, 61719, 61728, 61737, 61746, 61755, 
-    61758, 61763, 61768, 61773, 61778, 61783, 61788, 61793, 61798, 61803, 
-    61807, 61812, 61817, 61822, 61827, 61832, 61836, 61840, 61844, 61848, 
-    61852, 61856, 61860, 61864, 61868, 61872, 61876, 61880, 61884, 61888, 
-    61893, 61898, 61903, 61908, 61913, 61918, 61923, 61928, 61933, 61938, 
-    61943, 61948, 61953, 61958, 61964, 61970, 61975, 61980, 61983, 61986, 
-    61989, 61992, 61995, 61998, 62001, 62004, 62007, 62011, 62015, 62019, 
-    62023, 62027, 62031, 62035, 62039, 62043, 62047, 62051, 62055, 62059, 
-    62063, 62067, 62071, 62075, 62079, 62083, 62087, 62091, 62095, 62099, 
-    62103, 62107, 62111, 62115, 62119, 62123, 62127, 62131, 62135, 62139, 
-    62143, 62147, 62151, 62155, 62159, 62163, 62167, 62172, 62177, 62182, 
-    62187, 62191, 62196, 62201, 62206, 62211, 62216, 62221, 62226, 62231, 
-    62236, 62240, 62247, 62254, 62261, 62268, 62275, 62282, 62289, 62296, 
-    62303, 62310, 62317, 62324, 62327, 62330, 62333, 62338, 62341, 62344, 
-    62347, 62350, 62353, 62356, 62360, 62364, 62368, 62372, 62375, 62379, 
-    62383, 62387, 62391, 62395, 62399, 62403, 62407, 62410, 62413, 62417, 
-    62421, 62425, 62429, 62432, 62436, 62440, 62444, 62448, 62451, 62455, 
-    62459, 62463, 62467, 62470, 62474, 62478, 62481, 62485, 62489, 62493, 
-    62497, 62501, 62505, 62509, 0, 62513, 62516, 62519, 62522, 62525, 62528, 
-    62531, 62534, 62537, 62540, 62543, 62546, 62549, 62552, 62555, 62558, 
-    62561, 62564, 62567, 62570, 62573, 62576, 62579, 62582, 62585, 62588, 
-    62591, 62594, 62597, 62600, 62603, 62606, 62609, 62612, 62615, 62618, 
-    62621, 62624, 62627, 62630, 62633, 62636, 62639, 62642, 62645, 62648, 
-    62651, 62654, 62657, 62660, 62663, 62666, 62669, 62672, 62675, 62678, 
-    62681, 62684, 62687, 62690, 62693, 62696, 62699, 62702, 62705, 62708, 
-    62711, 62714, 62717, 62720, 62723, 62726, 62729, 62732, 62735, 62738, 
-    62741, 62744, 62747, 62750, 62753, 62756, 62759, 62762, 62765, 62768, 
-    62771, 62774, 62777, 62786, 62794, 62802, 62810, 62818, 62826, 62834, 
-    62842, 62850, 62858, 62867, 62876, 62885, 62894, 62903, 62912, 62921, 
-    62930, 62939, 62948, 62957, 62966, 62975, 62984, 62993, 62996, 62999, 
-    63002, 63004, 63007, 63010, 63013, 63018, 63023, 63026, 63033, 63040, 
-    63047, 63054, 63057, 63062, 63064, 63068, 63070, 63072, 63075, 63078, 
-    63081, 63084, 63087, 63090, 63093, 63098, 63103, 63106, 63109, 63112, 
-    63115, 63118, 63121, 63124, 63128, 63131, 63134, 63137, 63140, 63143, 
-    63147, 63150, 63153, 63156, 63161, 63166, 63171, 63176, 63181, 63186, 
-    63191, 63196, 63202, 63210, 63212, 63215, 63218, 63221, 63224, 63230, 
-    63238, 63241, 63244, 63249, 63252, 63255, 63258, 63263, 63266, 63269, 
-    63274, 63277, 63280, 63285, 63288, 63291, 63296, 63301, 63306, 63309, 
-    63312, 63315, 63318, 63324, 63327, 63330, 63333, 63335, 63338, 63341, 
-    63344, 63349, 63352, 63355, 63358, 63361, 63364, 63369, 63372, 63375, 
-    63378, 63381, 63384, 63387, 63390, 63393, 63396, 63401, 63405, 63413, 
-    63421, 63429, 63437, 63445, 63453, 63461, 63469, 63477, 63486, 63495, 
-    63504, 63513, 63522, 63531, 63540, 63549, 63558, 63567, 63576, 63585, 
-    63594, 63603, 63612, 63621, 63630, 63639, 63648, 63657, 63666, 63675, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63678, 63687, 63696, 63707, 
-    63714, 63719, 63724, 63731, 63738, 63744, 63749, 63754, 63759, 63764, 
-    63771, 63776, 63781, 63786, 63797, 63802, 63807, 63814, 63819, 63826, 
-    63831, 63836, 63843, 63850, 63857, 63866, 63875, 63880, 63885, 63890, 
-    63897, 63902, 63912, 63919, 63924, 63929, 63934, 63939, 63944, 63949, 
-    63958, 63965, 63972, 63977, 63984, 63989, 63996, 64005, 64016, 64021, 
-    64030, 64035, 64042, 64051, 64060, 64065, 64070, 64077, 64083, 64090, 
-    64097, 64101, 64105, 64108, 64112, 64116, 64120, 64124, 64128, 64132, 
-    64136, 64139, 64143, 64147, 64151, 64155, 64159, 64163, 64166, 64170, 
-    64174, 64177, 64181, 64185, 64189, 64193, 64197, 64201, 64205, 64209, 
-    64213, 64217, 64221, 64225, 64229, 64233, 64237, 64241, 64245, 64249, 
-    64253, 64257, 64261, 64265, 64269, 64273, 64277, 64281, 64285, 64289, 
-    64293, 64297, 64301, 64305, 64309, 64313, 64317, 64321, 64325, 64329, 
-    64333, 64337, 64341, 64345, 64349, 64353, 64356, 64360, 64364, 64368, 
-    64372, 64376, 64380, 64384, 64388, 64392, 64396, 64400, 64404, 64408, 
-    64412, 64416, 64420, 64424, 64428, 64432, 64436, 64440, 64444, 64448, 
-    64452, 64456, 64460, 64464, 64468, 64472, 64476, 64480, 64484, 64488, 
-    64492, 64496, 64500, 64504, 64508, 64512, 64516, 64520, 64524, 64528, 
-    64532, 64536, 64540, 64544, 64548, 64552, 64556, 64560, 64564, 64568, 
-    64572, 64576, 64580, 64584, 64588, 64592, 64596, 64600, 64604, 64608, 
-    64612, 64616, 64620, 64624, 64628, 64632, 64636, 64640, 64644, 64648, 
-    64652, 64656, 64660, 64664, 64668, 64672, 64676, 64680, 64684, 64688, 
-    64692, 64696, 64700, 64704, 64708, 64712, 64716, 64720, 64724, 64728, 
-    64732, 64736, 64740, 64744, 64748, 64752, 64756, 64760, 64764, 64768, 
-    64772, 64776, 64780, 64784, 64788, 64792, 64796, 64800, 64804, 64808, 
-    64812, 64816, 64820, 64824, 64827, 64831, 64835, 64839, 64843, 64847, 
-    64851, 64855, 64859, 64863, 64867, 64871, 64875, 64879, 64883, 64887, 
-    64891, 64895, 64899, 64903, 64907, 64911, 64915, 64919, 64923, 64927, 
-    64931, 64935, 64939, 64943, 64947, 64951, 64955, 64959, 64963, 64967, 
-    64971, 64975, 64979, 64983, 64987, 64991, 64995, 64999, 65003, 65007, 
-    65011, 65015, 65019, 65023, 65027, 65031, 65035, 65039, 65043, 65047, 
-    65051, 65055, 65059, 65063, 65067, 65071, 65075, 65079, 65083, 65087, 
-    65091, 65095, 65099, 65103, 65107, 65111, 65115, 65119, 65123, 65127, 
-    65131, 65135, 65139, 65143, 65147, 65151, 65155, 65159, 65163, 65167, 
-    65171, 65175, 65179, 65183, 65187, 65191, 65195, 65199, 65203, 65207, 
-    65211, 65215, 65219, 65223, 65227, 65231, 65235, 65239, 65243, 65247, 
-    65251, 65255, 65259, 65263, 65267, 65271, 65275, 65279, 65283, 65287, 
-    65290, 65294, 65298, 65302, 65306, 65310, 65314, 65318, 65322, 65326, 
-    65330, 65334, 65338, 65342, 65346, 65350, 65354, 65358, 65362, 65366, 
-    65370, 65374, 65378, 65382, 65386, 65390, 65394, 65398, 65402, 65406, 
-    65410, 65414, 65418, 65422, 65426, 65430, 65434, 65438, 65442, 65446, 
-    65450, 65454, 65458, 65462, 65466, 65470, 65474, 65478, 65482, 65486, 
-    65490, 65494, 65498, 65502, 65506, 65510, 65514, 65518, 65522, 65526, 
-    65530, 65534, 65538, 65542, 65546, 65550, 65554, 65558, 65562, 65566, 
-    65570, 65574, 65578, 65582, 65586, 65590, 65594, 65598, 65602, 65606, 
-    65610, 65614, 65618, 65622, 65626, 65630, 65634, 65638, 65642, 65646, 
-    65649, 65653, 65657, 65661, 65665, 65669, 65673, 65677, 65681, 65685, 
-    65689, 65693, 65697, 65701, 65705, 65709, 65713, 65717, 65721, 65725, 
-    65729, 65733, 65737, 65741, 65745, 65749, 65753, 65757, 65761, 65765, 
-    65769, 65773, 65777, 65781, 65785, 65789, 65793, 65797, 65801, 65805, 
-    65809, 65813, 65817, 65821, 65825, 65829, 65833, 65837, 65841, 65845, 
-    65849, 65853, 65857, 65861, 65865, 65869, 65873, 65877, 65881, 65885, 
-    65889, 65893, 65897, 65901, 65905, 65909, 65913, 65917, 65921, 65925, 
-    65929, 65933, 65937, 65941, 65945, 65949, 65953, 65957, 65961, 65965, 
-    65969, 65973, 65977, 65981, 65985, 65989, 65993, 65997, 66001, 66005, 
-    66009, 66013, 66017, 66021, 66025, 66029, 66033, 66037, 66041, 66045, 
-    66049, 66053, 66057, 66061, 66065, 66069, 66073, 66077, 66081, 66085, 
-    66089, 66093, 66097, 66101, 66105, 66109, 66113, 66117, 66121, 66125, 
-    66129, 66133, 66137, 66141, 66144, 66148, 66152, 66156, 66160, 66164, 
-    66168, 66172, 66176, 66180, 66184, 66188, 66192, 66196, 66200, 66204, 
-    66208, 66212, 66216, 66220, 66224, 66228, 66232, 66236, 66240, 66244, 
-    66248, 66252, 66256, 66260, 66264, 66268, 66272, 66276, 66280, 66284, 
-    66288, 66292, 66296, 66300, 66304, 66308, 66312, 66316, 66320, 66324, 
-    66328, 66332, 66336, 66340, 66344, 66348, 66352, 66356, 66360, 66364, 
-    66368, 66372, 66376, 66380, 66384, 66388, 66392, 66396, 66400, 66404, 
-    66408, 66412, 66416, 66420, 66424, 66428, 66432, 66436, 66440, 66444, 
-    66448, 66452, 66456, 66460, 66464, 66468, 66472, 66476, 66480, 66484, 
-    66488, 66492, 66496, 66500, 66504, 66508, 66512, 66516, 66520, 66524, 
-    66528, 66532, 66536, 66540, 66544, 66548, 66552, 66556, 66560, 66564, 
-    66568, 66572, 66576, 66580, 66584, 66588, 66592, 66596, 66599, 66603, 
-    66607, 66611, 66615, 66619, 66623, 66627, 66631, 66635, 66639, 66643, 
-    66647, 66651, 66655, 66659, 66663, 66667, 66671, 66675, 66679, 66683, 
-    66687, 66691, 66695, 66699, 66703, 66707, 66711, 66715, 66719, 66723, 
-    66727, 66731, 66735, 66739, 66743, 66747, 66751, 66755, 66759, 66763, 
-    66767, 66771, 66775, 66779, 66783, 66787, 66791, 66795, 66799, 66803, 
-    66807, 66811, 66815, 66819, 66823, 66827, 66831, 66835, 66839, 66843, 
-    66847, 66851, 66855, 66859, 66863, 66867, 66871, 66875, 66879, 66883, 
-    66887, 66891, 66895, 66899, 66903, 66907, 66911, 66915, 66919, 66923, 
-    66927, 66931, 66935, 66939, 66943, 66947, 66951, 66955, 66959, 66963, 
-    66967, 66971, 66975, 66979, 66983, 66987, 66991, 66995, 66999, 67003, 
-    67007, 67011, 67015, 67019, 67023, 67027, 67031, 67035, 67039, 67043, 
-    67047, 67051, 67055, 67059, 67063, 67067, 67071, 67075, 67079, 67083, 
-    67087, 67091, 67095, 67099, 67103, 67107, 67111, 67115, 67119, 67123, 
-    67127, 67131, 67135, 67139, 67143, 67147, 67151, 67155, 67159, 67163, 
-    67167, 67171, 67175, 67179, 67183, 67187, 67191, 67195, 67199, 67202, 
-    67206, 67210, 67214, 67218, 67222, 67226, 67230, 67233, 67237, 67241, 
-    67245, 67249, 67253, 67257, 67261, 67265, 67269, 67273, 67277, 67281, 
-    67285, 67289, 67293, 67297, 67301, 67305, 67309, 67313, 67317, 67321, 
-    67325, 67329, 67333, 67337, 67341, 67345, 67349, 67353, 67357, 67361, 
-    67365, 67369, 67373, 67377, 67381, 67385, 67389, 67393, 67397, 67401, 
-    67405, 67409, 67413, 67417, 67421, 67425, 67429, 67433, 67437, 67441, 
-    67445, 67449, 67453, 67457, 67461, 67465, 67469, 67473, 67477, 67481, 
-    67485, 67489, 67493, 67497, 67501, 67505, 67509, 67513, 67517, 67521, 
-    67525, 67529, 67533, 67537, 67541, 67545, 67549, 67553, 67557, 67561, 
-    67565, 67569, 67573, 67577, 67581, 67585, 67589, 67593, 67597, 67601, 
-    67605, 67609, 67613, 67617, 67621, 67625, 67629, 67633, 67637, 67641, 
-    67645, 67649, 67653, 67657, 67661, 67665, 67669, 67673, 67677, 67681, 
-    67685, 67689, 67693, 67697, 67701, 67705, 67709, 67713, 67717, 67721, 
-    67725, 67729, 67733, 67737, 67741, 67745, 67749, 67753, 67757, 67761, 
-    67765, 67769, 67773, 67777, 67781, 67785, 67789, 67793, 67797, 67801, 
-    67805, 67809, 67813, 67817, 67821, 67825, 67829, 67833, 67837, 67841, 
-    67845, 67849, 67853, 67857, 67861, 67865, 67869, 67873, 67877, 67881, 
-    67885, 67889, 67893, 67897, 67901, 67905, 67909, 67913, 67917, 67921, 
-    67925, 67929, 67933, 67937, 67941, 67945, 67949, 67953, 67957, 67960, 
-    67964, 67968, 67972, 67976, 67980, 67984, 67988, 67992, 67996, 68000, 
-    68004, 68008, 68012, 68016, 68020, 68024, 68028, 68032, 68036, 68040, 
-    68044, 68048, 68052, 68056, 68060, 68064, 68068, 68072, 68076, 68080, 
-    68084, 68088, 68092, 68096, 68100, 68104, 68108, 68112, 68116, 68120, 
-    68124, 68128, 68132, 68136, 68140, 68144, 68148, 68152, 68156, 68160, 
-    68164, 68168, 68172, 68176, 68180, 68184, 68188, 68192, 68196, 68200, 
-    68204, 68208, 68212, 68216, 68220, 68224, 68228, 68232, 68236, 68240, 
-    68244, 68248, 68252, 68256, 68260, 68264, 68268, 68272, 68276, 68280, 
-    68284, 68288, 68292, 68296, 68300, 68304, 68308, 68312, 68316, 68320, 
-    68324, 68328, 68332, 68336, 68340, 68344, 68348, 68352, 68356, 68360, 
-    68364, 68368, 68372, 68376, 68380, 68384, 68388, 68392, 68396, 68400, 
-    68404, 68408, 68412, 68416, 68420, 68424, 68428, 68432, 68436, 68440, 
-    68444, 68448, 68452, 68456, 68460, 68464, 68468, 68472, 68476, 68480, 
-    68484, 68488, 68492, 68496, 68500, 68504, 68508, 68512, 68516, 68520, 
-    68524, 68528, 68532, 68536, 68540, 68544, 68548, 68552, 68556, 68560, 
-    68564, 68568, 68572, 68576, 68580, 68584, 68588, 68592, 68596, 68600, 
-    68604, 68608, 68612, 68616, 68620, 68624, 68628, 68632, 68636, 68640, 
-    68644, 68648, 68652, 68656, 68660, 68664, 68668, 68672, 68676, 68680, 
-    68684, 68688, 68692, 68696, 68700, 68704, 68708, 68712, 68716, 68720, 
-    68724, 68728, 68732, 68736, 68740, 0, 0, 0, 68744, 68748, 68752, 68756, 
-    68760, 68764, 68768, 68772, 68776, 68780, 68784, 68788, 68792, 68796, 
-    68800, 68804, 68808, 68812, 68816, 68820, 68824, 68828, 68832, 68836, 
-    68840, 68844, 68848, 68852, 68856, 68860, 68864, 68868, 68872, 68876, 
-    68880, 68884, 68888, 68892, 68896, 68900, 68904, 68908, 68912, 68916, 
-    68920, 68924, 68928, 68932, 68936, 68940, 68944, 68948, 68952, 68956, 
-    68960, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68964, 68969, 68973, 68978, 68983, 
-    68988, 68993, 68998, 69002, 69007, 69012, 69017, 69022, 69027, 69032, 
-    69037, 69041, 69045, 69050, 69054, 69059, 69064, 69069, 69073, 69078, 
-    69083, 69088, 69093, 69098, 69102, 69107, 69111, 69116, 69120, 69125, 
-    69129, 69133, 69137, 69142, 69147, 69152, 69160, 69168, 69176, 69184, 
-    69191, 69199, 69205, 69213, 69217, 69221, 69225, 69229, 69233, 69237, 
-    69241, 69245, 69249, 69253, 69257, 69261, 69265, 69269, 69273, 69277, 
-    69281, 69285, 69289, 69293, 69297, 69301, 69305, 69309, 69313, 69317, 
-    69321, 69325, 69329, 69333, 69337, 69341, 69345, 69349, 69353, 69357, 
-    69360, 69364, 69368, 69372, 69376, 69380, 69384, 69388, 69392, 69396, 
-    69400, 69404, 69408, 69412, 69416, 69420, 69424, 69428, 69432, 69436, 
-    69440, 69444, 69448, 69452, 69456, 69460, 69464, 69468, 69472, 69476, 
-    69480, 69484, 69488, 69492, 69496, 69500, 69504, 69507, 69511, 69515, 
-    69518, 69522, 69526, 69530, 69533, 69537, 69541, 69545, 69549, 69553, 
-    69557, 69561, 69565, 69569, 69573, 69577, 69581, 69585, 69589, 69592, 
-    69596, 69600, 69603, 69607, 69611, 69615, 69619, 69623, 69627, 69630, 
-    69633, 69637, 69641, 69645, 69648, 69651, 69655, 69659, 69663, 69667, 
-    69671, 69675, 69679, 69683, 69687, 69691, 69695, 69699, 69703, 69707, 
-    69711, 69715, 69719, 69723, 69727, 69731, 69735, 69739, 69743, 69747, 
-    69751, 69755, 69759, 69763, 69767, 69771, 69775, 69779, 69783, 69787, 
-    69791, 69795, 69799, 69802, 69806, 69810, 69814, 69818, 69822, 69826, 
-    69830, 69834, 69838, 69842, 69846, 69850, 69854, 69858, 69862, 69866, 
-    69870, 69874, 69878, 69882, 69886, 69890, 69894, 69898, 69902, 69906, 
-    69910, 69914, 69918, 69922, 69926, 69930, 69934, 69938, 69942, 69946, 
-    69949, 69953, 69957, 69961, 69965, 69969, 69973, 69977, 69981, 69985, 
-    69989, 69993, 69997, 70001, 70005, 70009, 70013, 70016, 70020, 70024, 
-    70028, 70032, 70036, 70040, 70044, 70048, 70052, 70056, 70060, 70064, 
-    70068, 70072, 70076, 70080, 70084, 70088, 70092, 70096, 70100, 70103, 
-    70107, 70111, 70115, 70119, 70123, 70127, 70131, 70135, 70139, 70143, 
-    70147, 70151, 70155, 70159, 70163, 70167, 70171, 70175, 70179, 70183, 
-    70187, 70191, 70195, 70199, 70203, 70207, 70211, 70215, 70219, 70223, 
-    70227, 70231, 70235, 70239, 70243, 70247, 70251, 70255, 70259, 70263, 
-    70267, 70271, 70275, 70278, 70283, 70287, 70293, 70298, 70304, 70308, 
-    70312, 70316, 70320, 70324, 70328, 70332, 70336, 70340, 70344, 70348, 
-    70352, 70356, 70360, 70363, 70366, 70369, 70372, 70375, 70378, 70381, 
-    70384, 70387, 70392, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 70398, 70403, 70408, 70413, 70418, 70425, 70432, 70437, 70442, 
-    70447, 70452, 70459, 70466, 70473, 70480, 70487, 70494, 70504, 70514, 
-    70521, 70528, 70535, 70542, 70548, 70554, 70563, 70572, 70579, 70586, 
-    70597, 70608, 70613, 70618, 70625, 70632, 70639, 70646, 70653, 70660, 
-    70667, 70674, 70680, 70686, 70692, 70698, 70705, 70712, 70717, 70721, 
-    70728, 70735, 70742, 70746, 70753, 70757, 70762, 70766, 70772, 70777, 
-    70783, 70788, 70792, 70796, 70799, 70802, 70807, 70812, 70817, 70822, 
-    70827, 70832, 70837, 70842, 70847, 70852, 70861, 70870, 70875, 70880, 
-    70885, 70890, 70895, 70900, 70905, 70910, 70915, 70920, 70925, 0, 0, 0, 
-    0, 0, 0, 0, 70930, 70936, 70939, 70942, 70945, 70949, 70953, 70957, 
-    70961, 70964, 70968, 70971, 70975, 70978, 70982, 70986, 70990, 70994, 
-    70998, 71002, 71006, 71009, 71013, 71017, 71021, 71025, 71029, 71033, 
-    71037, 71041, 71045, 71049, 71053, 71057, 71061, 71065, 71068, 71072, 
-    71076, 71080, 71084, 71088, 71092, 71096, 71100, 71104, 71108, 71112, 
-    71116, 71120, 71124, 71128, 71132, 71136, 71140, 71144, 71148, 71152, 
-    71156, 71160, 71164, 71167, 71171, 71175, 71179, 71183, 71187, 71191, 
-    71195, 71198, 71202, 71206, 71210, 71214, 71218, 71222, 71226, 71230, 
-    71234, 71238, 71242, 71246, 71251, 71256, 71259, 71264, 71267, 71270, 
-    71273, 0, 0, 0, 0, 0, 0, 0, 0, 71277, 71286, 71295, 71304, 71313, 71322, 
-    71331, 71340, 71349, 71357, 71364, 71372, 71379, 71387, 71397, 71406, 
-    71416, 71425, 71435, 71443, 71450, 71458, 71465, 71473, 71478, 71483, 
-    71488, 71497, 71503, 71509, 71516, 71525, 71533, 71541, 71549, 71556, 
-    71563, 71570, 71577, 71582, 71587, 71592, 71597, 71602, 71607, 71612, 
-    71617, 71625, 71633, 71639, 71645, 71650, 71655, 71660, 71665, 71670, 
-    71675, 71680, 71685, 71693, 71701, 71706, 71711, 71721, 71731, 71738, 
-    71745, 71754, 71763, 71775, 71787, 71793, 71799, 71807, 71815, 71825, 
-    71835, 71842, 71849, 71854, 71859, 71871, 71883, 71891, 71899, 71909, 
-    71919, 71931, 71943, 71952, 71961, 71968, 71975, 71982, 71989, 71998, 
-    72007, 72012, 72017, 72024, 72031, 72038, 72045, 72057, 72069, 72074, 
-    72079, 72084, 72089, 72094, 72099, 72104, 72109, 72113, 72118, 72123, 
-    72128, 72133, 72138, 72144, 72149, 72154, 72161, 72168, 72175, 72182, 
-    72189, 72198, 72207, 72213, 72219, 72225, 72231, 72238, 72245, 72252, 
-    72259, 72266, 72270, 72277, 72282, 72287, 72294, 0, 72307, 72315, 72323, 
-    72330, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72337, 72346, 72355, 72364, 
-    72373, 72382, 72391, 72400, 72409, 72418, 72427, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72434, 
-    72441, 72447, 72454, 72462, 72470, 72477, 72485, 72492, 72498, 72504, 
-    72511, 72517, 72523, 72529, 72536, 72543, 72550, 72557, 72564, 72571, 
-    72578, 72585, 72592, 72599, 72606, 72613, 72620, 72627, 72633, 72640, 
-    72647, 72654, 72661, 72668, 72675, 72682, 72689, 72696, 72703, 72710, 
-    72717, 72724, 72731, 72738, 72745, 72752, 72759, 72767, 72775, 72783, 
-    72791, 0, 0, 0, 0, 72799, 72808, 72817, 72826, 72835, 72844, 72853, 
-    72860, 72867, 72874, 0, 0, 0, 0, 0, 0, 72881, 72885, 72890, 72895, 72900, 
-    72905, 72910, 72915, 72920, 72925, 72930, 72935, 72939, 72943, 72948, 
-    72953, 72957, 72962, 72967, 72972, 72977, 72982, 72987, 72992, 72996, 
-    73000, 73005, 73010, 73014, 73018, 73022, 73026, 73030, 73034, 73038, 
-    73043, 73048, 73053, 73058, 73063, 73070, 73076, 73081, 73086, 73091, 
-    73096, 73102, 73109, 73115, 73122, 73128, 73134, 73139, 73146, 73152, 
-    73157, 0, 0, 0, 0, 0, 0, 0, 0, 73163, 73167, 73171, 73174, 73178, 73181, 
-    73185, 73188, 73192, 73196, 73201, 73205, 73210, 73213, 73217, 73221, 
-    73224, 73228, 73232, 73235, 73239, 73243, 73247, 73251, 73255, 73259, 
-    73263, 73267, 73271, 73275, 73279, 73283, 73287, 73291, 73295, 73299, 
-    73303, 73307, 73310, 73313, 73317, 73321, 73325, 73328, 73331, 73334, 
-    73338, 73342, 73346, 73350, 73353, 73356, 73360, 73365, 73370, 73374, 
-    73379, 73383, 73388, 73393, 73399, 73404, 73410, 73414, 73419, 73424, 
-    73428, 73433, 73438, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73442, 73445, 73449, 
-    73453, 73456, 73459, 73462, 73465, 73468, 73471, 73474, 73477, 0, 0, 0, 
-    0, 0, 0, 73480, 73485, 73489, 73493, 73497, 73501, 73505, 73509, 73513, 
-    73517, 73521, 73525, 73529, 73533, 73537, 73541, 73545, 73550, 73555, 
-    73561, 73567, 73574, 73579, 73584, 73590, 73594, 73599, 73602, 0, 0, 0, 
-    0, 73605, 73612, 73618, 73624, 73630, 73636, 73642, 73648, 73654, 73660, 
-    73666, 73672, 73679, 73686, 73693, 73699, 73706, 73713, 73720, 73727, 
-    73734, 73740, 73746, 73753, 73759, 73766, 73773, 73779, 73785, 73792, 
-    73799, 73806, 73812, 73819, 73826, 73832, 73839, 73845, 73852, 73859, 
-    73865, 73871, 73878, 73884, 73891, 73898, 73907, 73914, 73921, 73925, 
-    73930, 73935, 73940, 73945, 73949, 73953, 73958, 73962, 73967, 73972, 
-    73977, 73981, 73985, 73990, 73994, 73999, 74003, 74008, 74013, 74018, 
-    74023, 74027, 74032, 74037, 74042, 74048, 74053, 74059, 74065, 74071, 
-    74077, 74083, 74088, 74094, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74098, 
-    74103, 74107, 74111, 74115, 74119, 74123, 74127, 74131, 74135, 74139, 
-    74143, 74147, 74151, 74155, 74159, 74163, 74167, 74171, 74175, 74179, 
-    74183, 74187, 74191, 74195, 74199, 74203, 74207, 74211, 74215, 0, 0, 0, 
-    74219, 74223, 74227, 74231, 74235, 74238, 74244, 74247, 74251, 74254, 
-    74260, 74266, 74274, 74277, 74281, 74284, 74287, 74293, 74299, 74303, 
-    74309, 74313, 74317, 74323, 74327, 74333, 74339, 74343, 74347, 74353, 
-    74357, 74363, 74369, 74373, 74379, 74383, 74389, 74392, 74395, 74401, 
-    74405, 74411, 74414, 74417, 74420, 74426, 74430, 74434, 74440, 74446, 
-    74449, 74452, 74458, 74463, 74468, 74473, 74480, 74485, 74492, 74497, 
-    74504, 74509, 74514, 74519, 74524, 74527, 74531, 74535, 74540, 74545, 
-    74550, 74555, 74560, 74565, 74570, 74575, 74582, 74587, 0, 74594, 74597, 
-    74601, 74604, 74607, 74610, 74613, 74616, 74619, 74622, 74625, 0, 0, 0, 
-    0, 74628, 74635, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74640, 74643, 74646, 74649, 74652, 
-    74656, 74659, 74662, 74666, 74670, 74674, 74678, 74682, 74686, 74690, 
-    74694, 74698, 74702, 74706, 74710, 74714, 74718, 74722, 74726, 74730, 
-    74733, 74737, 74740, 74744, 74748, 74752, 74756, 74760, 74763, 74767, 
-    74770, 74773, 74777, 74781, 74785, 74788, 74791, 74796, 74800, 74805, 
-    74810, 74814, 74819, 74823, 74828, 74833, 74838, 74842, 74846, 74851, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 74856, 74861, 74866, 74871, 74877, 74882, 74887, 
-    74892, 74897, 74902, 74906, 74910, 74915, 74920, 0, 0, 74926, 74930, 
-    74933, 74936, 74939, 74942, 74945, 74948, 74951, 74954, 0, 0, 74957, 
-    74962, 74967, 74973, 74980, 74986, 74992, 74998, 75004, 75010, 75016, 
-    75022, 75028, 75034, 75040, 75046, 75051, 75056, 75061, 75067, 75073, 
-    75080, 75086, 75092, 75097, 75104, 75111, 75118, 75124, 75129, 75134, 
-    75139, 0, 0, 0, 0, 75147, 75153, 75159, 75165, 75171, 75177, 75183, 
-    75189, 75195, 75201, 75207, 75213, 75219, 75225, 75231, 75237, 75243, 
-    75249, 75255, 75261, 75267, 75272, 75277, 75283, 75289, 75295, 75301, 
-    75307, 75313, 75319, 75325, 75331, 75337, 75343, 75349, 75355, 75361, 
-    75367, 75373, 75379, 75385, 75391, 75397, 75403, 75409, 75415, 75421, 
-    75426, 75431, 75437, 75442, 75446, 75451, 75455, 75459, 75463, 75469, 
-    75474, 75479, 75484, 75489, 75494, 75499, 75504, 75511, 75518, 75525, 0, 
+    39381, 39384, 39387, 39390, 39395, 39398, 39401, 39406, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39411, 39416, 39421, 39428, 
+    39436, 39441, 39446, 39450, 39454, 39459, 39466, 39473, 39477, 39482, 
+    39487, 39492, 39497, 39504, 39509, 39514, 39519, 39528, 39535, 39542, 
+    39546, 39551, 39557, 39562, 39569, 39578, 39587, 39591, 39595, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 39599, 39603, 39611, 39615, 39619, 
+    39624, 39628, 39632, 39636, 39638, 39642, 39646, 39650, 39655, 39659, 
+    39663, 39671, 39674, 39678, 39681, 39684, 39690, 39694, 39697, 39703, 
+    39707, 39711, 39715, 39718, 39722, 39725, 39729, 39731, 39734, 39737, 
+    39741, 39743, 39747, 39750, 39753, 39758, 39763, 39770, 39773, 39776, 
+    39780, 39785, 39788, 39791, 39794, 39798, 39803, 39806, 39809, 39811, 
+    39814, 39817, 39820, 39824, 39829, 39832, 39836, 39840, 39844, 39848, 
+    39853, 39859, 39864, 39869, 39875, 39880, 39885, 39889, 39893, 39898, 
+    39902, 39906, 39909, 39911, 39916, 39922, 39929, 39936, 39943, 39950, 
+    39957, 39964, 39971, 39978, 39986, 39993, 40001, 40008, 40015, 40023, 
+    40031, 40036, 40041, 40046, 40051, 40056, 40061, 40066, 40071, 40076, 
+    40081, 40087, 40093, 40099, 40105, 40112, 40120, 40127, 40133, 40139, 
+    40145, 40151, 40157, 40163, 40169, 40175, 40181, 40188, 40195, 40202, 
+    40209, 40217, 40226, 40234, 40245, 40253, 40261, 40270, 40277, 40286, 
+    40295, 40303, 40312, 0, 0, 0, 0, 0, 0, 40320, 40322, 40325, 40327, 40330, 
+    40333, 40336, 40341, 40346, 40351, 40356, 40360, 40364, 40368, 40372, 
+    40377, 40383, 40388, 40394, 40399, 40404, 40409, 40415, 40420, 40426, 
+    40432, 40436, 40440, 40445, 40450, 40455, 40460, 40465, 40473, 40481, 
+    40489, 40497, 40504, 40512, 40519, 40526, 40535, 40547, 40553, 40559, 
+    40567, 40575, 40584, 40593, 40601, 40609, 40618, 40627, 40632, 40640, 
+    40645, 40650, 40656, 40661, 40667, 40674, 40681, 40686, 40692, 40697, 
+    40700, 40704, 40707, 40711, 40715, 40719, 40725, 40731, 40737, 40743, 
+    40747, 40751, 40755, 40759, 40765, 40771, 40775, 40780, 40784, 40789, 
+    40794, 40799, 40802, 40806, 40809, 40813, 40820, 40828, 40839, 40850, 
+    40855, 40864, 40871, 40880, 40889, 40893, 40899, 40907, 40911, 40916, 
+    40921, 40927, 40933, 40939, 40946, 40950, 40954, 40959, 40962, 40964, 
+    40968, 40972, 40980, 40984, 40986, 40988, 40992, 41000, 41005, 41011, 
+    41021, 41028, 41033, 41037, 41041, 41045, 41048, 41051, 41054, 41058, 
+    41062, 41066, 41070, 41074, 41077, 41081, 41085, 41088, 41090, 41093, 
+    41095, 41099, 41103, 41105, 41111, 41114, 41119, 41123, 41127, 41129, 
+    41131, 41133, 41136, 41140, 41144, 41148, 41152, 41156, 41162, 41168, 
+    41170, 41172, 41174, 41176, 41179, 41181, 41185, 41187, 41191, 41194, 
+    41200, 41204, 41208, 41211, 41214, 41218, 41224, 41228, 41238, 41248, 
+    41252, 41258, 41264, 41267, 41271, 41274, 41279, 41283, 41289, 41293, 
+    41305, 41313, 41317, 41321, 41327, 41331, 41334, 41336, 41339, 41343, 
+    41347, 41354, 41358, 41362, 41366, 41369, 41374, 41379, 41384, 41389, 
+    41394, 41399, 41407, 41415, 41419, 41423, 41425, 41430, 41434, 41438, 
+    41446, 41454, 41460, 41466, 41475, 41484, 41489, 41494, 41502, 41510, 
+    41512, 41514, 41519, 41524, 41530, 41536, 41542, 41548, 41552, 41556, 
+    41563, 41570, 41576, 41582, 41592, 41602, 41610, 41618, 41620, 41624, 
+    41628, 41633, 41638, 41645, 41652, 41655, 41658, 41661, 41664, 41667, 
+    41672, 41676, 41681, 41686, 41689, 41692, 41695, 41698, 41701, 41705, 
+    41708, 41711, 41714, 41717, 41719, 41721, 41723, 41725, 41733, 41741, 
+    41747, 41751, 41757, 41767, 41773, 41779, 41785, 41793, 41801, 41812, 
+    41816, 41820, 41822, 41828, 41830, 41832, 41834, 41836, 41842, 41845, 
+    41851, 41857, 41861, 41865, 41869, 41872, 41876, 41880, 41882, 41891, 
+    41900, 41905, 41910, 41916, 41922, 41928, 41931, 41934, 41937, 41940, 
+    41942, 41947, 41952, 41957, 41963, 41969, 41977, 41985, 41991, 41997, 
+    42003, 42009, 42018, 42027, 42036, 42045, 42054, 42063, 42072, 42081, 
+    42090, 42099, 42107, 42119, 42129, 42144, 42147, 42152, 42158, 42164, 
+    42171, 42185, 42200, 42206, 42212, 42219, 42225, 42233, 42239, 42252, 
+    42266, 42271, 42277, 42284, 42287, 42290, 42292, 42295, 42298, 42300, 
+    42302, 42306, 42309, 42312, 42315, 42318, 42323, 42328, 42333, 42338, 
+    42343, 42346, 42348, 42350, 42352, 42356, 42360, 42364, 42370, 42375, 
+    42377, 42379, 42384, 42389, 42394, 42399, 42404, 42409, 42411, 42413, 
+    42422, 42426, 42434, 42443, 42445, 42450, 42455, 42463, 42467, 42469, 
+    42473, 42475, 42479, 42483, 42487, 42489, 42491, 42493, 42500, 42509, 
+    42518, 42527, 42536, 42545, 42554, 42563, 42572, 42580, 42588, 42597, 
+    42606, 42615, 42624, 42632, 42640, 42649, 42658, 42667, 42677, 42686, 
+    42696, 42705, 42715, 42724, 42734, 42744, 42753, 42763, 42772, 42782, 
+    42791, 42801, 42810, 42819, 42828, 42837, 42846, 42856, 42865, 42874, 
+    42883, 42893, 42902, 42911, 42920, 42929, 42939, 42949, 42958, 42967, 
+    42975, 42983, 42990, 42998, 43007, 43018, 43027, 43036, 43045, 43052, 
+    43059, 43066, 43075, 43084, 43093, 43102, 43109, 43114, 43123, 43128, 
+    43131, 43139, 43142, 43147, 43152, 43155, 43158, 43166, 43169, 43174, 
+    43177, 43184, 43189, 43197, 43200, 43203, 43206, 43211, 43216, 43219, 
+    43222, 43230, 43233, 43240, 43247, 43251, 43255, 43260, 43265, 43271, 
+    43276, 43282, 43288, 43293, 43299, 43307, 43313, 43321, 43329, 43335, 
+    43343, 43351, 43360, 43368, 43374, 43382, 43391, 43399, 43403, 43408, 
+    43421, 43434, 43438, 43442, 43446, 43450, 43460, 43464, 43469, 43474, 
+    43479, 43484, 43489, 43494, 43504, 43514, 43522, 43532, 43542, 43550, 
+    43560, 43570, 43578, 43588, 43598, 43606, 43614, 43624, 43634, 43637, 
+    43640, 43643, 43648, 43652, 43658, 43665, 43672, 43680, 43687, 43691, 
+    43695, 43699, 43703, 43705, 43709, 43713, 43718, 43723, 43730, 43737, 
+    43740, 43747, 43749, 43751, 43755, 43759, 43764, 43770, 43776, 43782, 
+    43788, 43797, 43806, 43815, 43819, 43821, 43825, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 43832, 43836, 43843, 43850, 43857, 43864, 43868, 43872, 
+    43876, 43880, 43885, 43891, 43896, 43902, 43908, 43914, 43920, 43928, 
+    43935, 43942, 43949, 43956, 43961, 43967, 43976, 43980, 43987, 43991, 
+    43995, 44001, 44007, 44013, 44019, 44023, 44027, 44030, 44033, 44037, 
+    44044, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 44051, 44054, 44058, 44062, 44068, 44074, 44080, 44088, 44095, 
+    44099, 44107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 44112, 44115, 44118, 44121, 44124, 44127, 44130, 44133, 44136, 44139, 
+    44143, 44147, 44151, 44155, 44159, 44163, 44167, 44171, 44175, 44179, 
+    44183, 44186, 44189, 44192, 44195, 44198, 44201, 44204, 44207, 44210, 
+    44214, 44218, 44222, 44226, 44230, 44234, 44238, 44242, 44246, 44250, 
+    44254, 44260, 44266, 44272, 44279, 44286, 44293, 44300, 44307, 44314, 
+    44321, 44328, 44335, 44342, 44349, 44356, 44363, 44370, 44377, 44384, 
+    44391, 44396, 44402, 44408, 44414, 44419, 44425, 44431, 44437, 44442, 
+    44448, 44454, 44459, 44464, 44470, 44475, 44481, 44487, 44492, 44498, 
+    44504, 44509, 44515, 44521, 44527, 44533, 44539, 44544, 44550, 44556, 
+    44562, 44567, 44573, 44579, 44585, 44590, 44596, 44602, 44607, 44612, 
+    44618, 44623, 44629, 44635, 44640, 44646, 44652, 44657, 44663, 44669, 
+    44675, 44681, 44687, 44692, 44698, 44704, 44710, 44715, 44721, 44727, 
+    44733, 44738, 44744, 44750, 44755, 44760, 44766, 44771, 44777, 44783, 
+    44788, 44794, 44800, 44805, 44811, 44817, 44823, 44829, 44835, 44839, 
+    44844, 44849, 44854, 44859, 44864, 44869, 44874, 44879, 44884, 44889, 
+    44893, 44897, 44901, 44905, 44909, 44913, 44917, 44921, 44925, 44930, 
+    44935, 44940, 44945, 44950, 44955, 44964, 44973, 44982, 44991, 45000, 
+    45009, 45018, 45027, 45034, 45042, 45050, 45057, 45064, 45072, 45080, 
+    45087, 45094, 45102, 45110, 45117, 45124, 45132, 45140, 45147, 45154, 
+    45162, 45171, 45180, 45188, 45197, 45206, 45213, 45220, 45228, 45237, 
+    45246, 45254, 45263, 45272, 45279, 45286, 45295, 45304, 45312, 45320, 
+    45329, 45338, 45345, 45352, 45361, 45370, 45378, 45386, 45395, 45404, 
+    45411, 45418, 45427, 45436, 45444, 45453, 45462, 45470, 45480, 45490, 
+    45500, 45510, 45519, 45528, 45537, 45546, 45553, 45561, 45569, 45577, 
+    45585, 45590, 45595, 45604, 45612, 45619, 45628, 45636, 45643, 45652, 
+    45660, 45667, 45676, 45684, 45691, 45700, 45708, 45715, 45724, 45732, 
+    45739, 45748, 45756, 45763, 45772, 45780, 45787, 45796, 45804, 45811, 
+    45820, 45829, 45838, 45847, 45861, 45875, 45882, 45887, 45892, 45897, 
+    45902, 45907, 45912, 45917, 45922, 45930, 45938, 45946, 45954, 45959, 
+    45966, 45973, 45980, 45985, 45993, 46000, 46008, 46012, 46019, 46025, 
+    46032, 46036, 46042, 46048, 46054, 46058, 46061, 46065, 46069, 46076, 
+    46082, 46088, 46094, 46100, 46114, 46124, 46138, 46152, 46158, 46168, 
+    46182, 46185, 46188, 46195, 46203, 46208, 46213, 46221, 46233, 46245, 
+    46253, 46257, 46261, 46264, 46267, 46271, 46275, 46278, 46281, 46286, 
+    46291, 46297, 46303, 46308, 46313, 46319, 46325, 46330, 46335, 46340, 
+    46345, 46351, 46357, 46362, 46367, 46373, 46379, 46384, 46389, 46392, 
+    46395, 46404, 46406, 46408, 46411, 46415, 46421, 46423, 46426, 46433, 
+    46440, 46448, 46456, 46466, 46480, 46485, 46490, 46494, 46499, 46507, 
+    46515, 46524, 46533, 46542, 46551, 46556, 46561, 46567, 46573, 46579, 
+    46585, 46588, 46594, 46600, 46610, 46620, 46628, 46636, 46645, 46654, 
+    46658, 46666, 46674, 46682, 46690, 46699, 46708, 46717, 46726, 46731, 
+    46736, 46741, 46746, 46751, 46757, 46763, 46768, 46774, 46776, 46778, 
+    46780, 46782, 46785, 46788, 46790, 46792, 46794, 46798, 46802, 46804, 
+    46806, 46809, 46812, 46816, 46822, 46828, 46830, 46837, 46841, 46846, 
+    46851, 46853, 46863, 46869, 46875, 46881, 46887, 46893, 46899, 46904, 
+    46907, 46910, 46913, 46915, 46917, 46921, 46925, 46930, 46935, 46940, 
+    46943, 46947, 46952, 46955, 46959, 46964, 46969, 46974, 46979, 46984, 
+    46989, 46994, 46999, 47004, 47009, 47014, 47019, 47025, 47031, 47037, 
+    47039, 47042, 47044, 47047, 47049, 47051, 47053, 47055, 47057, 47059, 
+    47061, 47063, 47065, 47067, 47069, 47071, 47073, 47075, 47077, 47079, 
+    47081, 47086, 47091, 47096, 47101, 47106, 47111, 47116, 47121, 47126, 
+    47131, 47136, 47141, 47146, 47151, 47156, 47161, 47166, 47171, 47176, 
+    47181, 47185, 47189, 47193, 47199, 47205, 47210, 47215, 47220, 47225, 
+    47230, 47235, 47243, 47251, 47259, 47267, 47275, 47283, 47291, 47299, 
+    47305, 47310, 47315, 47320, 47323, 47327, 47331, 47335, 47339, 47343, 
+    47347, 47354, 47361, 47369, 47377, 47382, 47387, 47394, 47401, 47408, 
+    47415, 47418, 47421, 47426, 47428, 47432, 47437, 47439, 47441, 47443, 
+    47445, 47450, 47453, 47455, 47460, 47467, 47474, 47477, 47481, 47486, 
+    47491, 47499, 47505, 47511, 47523, 47530, 47537, 47542, 47547, 47553, 
+    47556, 47559, 47564, 47566, 47570, 47572, 47574, 47576, 47578, 47580, 
+    47582, 47587, 47589, 47591, 47593, 47595, 47599, 47601, 47604, 47609, 
+    47614, 47619, 47624, 47630, 47636, 47638, 47641, 47648, 47655, 47662, 
+    47669, 47673, 47677, 47679, 47681, 47685, 47691, 47696, 47698, 47702, 
+    47711, 47719, 47727, 47733, 47739, 47744, 47750, 47755, 47758, 47772, 
+    47775, 47780, 47785, 47791, 47801, 47803, 47809, 47815, 47819, 47826, 
+    47830, 47832, 47834, 47838, 47844, 47849, 47855, 47857, 47863, 47865, 
+    47871, 47873, 47875, 47880, 47882, 47886, 47891, 47893, 47898, 47903, 
+    47907, 47914, 0, 47924, 47930, 47933, 47939, 47942, 47947, 47952, 47956, 
+    47958, 47960, 47964, 47968, 47972, 47976, 47981, 47983, 47988, 47991, 
+    47994, 47997, 48001, 48005, 48010, 48014, 48019, 48024, 48028, 48033, 
+    48039, 48042, 48048, 48053, 48057, 48062, 48068, 48074, 48081, 48087, 
+    48094, 48101, 48103, 48110, 48114, 48120, 48126, 48131, 48137, 48141, 
+    48146, 48149, 48154, 48160, 48167, 48175, 48182, 48191, 48201, 48208, 
+    48214, 48218, 48225, 48230, 48239, 48242, 48245, 48254, 48264, 48271, 
+    48273, 48279, 48284, 48286, 48289, 48293, 48301, 48310, 48313, 48318, 
+    48323, 48331, 48339, 48347, 48355, 48361, 48367, 48373, 48381, 48386, 
+    48389, 48393, 48396, 48408, 48418, 48429, 48438, 48449, 48459, 48468, 
+    48474, 48482, 48486, 48494, 48498, 48506, 48513, 48520, 48529, 48538, 
+    48548, 48558, 48568, 48578, 48587, 48596, 48606, 48616, 48625, 48634, 
+    48640, 48646, 48652, 48658, 48664, 48670, 48676, 48682, 48688, 48695, 
+    48701, 48707, 48713, 48719, 48725, 48731, 48737, 48743, 48749, 48756, 
+    48763, 48770, 48777, 48784, 48791, 48798, 48805, 48812, 48819, 48827, 
+    48832, 48835, 48839, 48843, 48849, 48852, 48858, 48864, 48869, 48873, 
+    48878, 48884, 48891, 48894, 48901, 48908, 48912, 48921, 48930, 48935, 
+    48941, 48946, 48951, 48958, 48965, 48973, 48981, 48990, 48994, 49003, 
+    49008, 49012, 49019, 49023, 49030, 49038, 49043, 49051, 49055, 49060, 
+    49064, 49069, 49073, 49078, 49083, 49092, 49094, 49097, 49100, 49107, 
+    49114, 49119, 49127, 49133, 49139, 49144, 49147, 49152, 49157, 49162, 
+    49170, 49174, 49181, 49189, 49197, 49202, 49207, 49213, 49218, 49223, 
+    49229, 49234, 49237, 49241, 49245, 49252, 49261, 49266, 49275, 49284, 
+    49290, 49296, 49301, 49306, 49311, 49316, 49322, 49328, 49336, 49344, 
+    49350, 49356, 49361, 49366, 49373, 49380, 49386, 49389, 49392, 49396, 
+    49400, 49404, 49409, 49415, 49421, 49428, 49435, 49440, 49444, 49448, 
+    49452, 49456, 49460, 49464, 49468, 49472, 49476, 49480, 49484, 49488, 
+    49492, 49496, 49500, 49504, 49508, 49512, 49516, 49520, 49524, 49528, 
+    49532, 49536, 49540, 49544, 49548, 49552, 49556, 49560, 49564, 49568, 
+    49572, 49576, 49580, 49584, 49588, 49592, 49596, 49600, 49604, 49608, 
+    49612, 49616, 49620, 49624, 49628, 49632, 49636, 49640, 49644, 49648, 
+    49652, 49656, 49660, 49664, 49668, 49672, 49676, 49680, 49684, 49688, 
+    49692, 49696, 49700, 49704, 49708, 49712, 49716, 49720, 49724, 49728, 
+    49732, 49736, 49740, 49744, 49748, 49752, 49756, 49760, 49764, 49768, 
+    49772, 49776, 49780, 49784, 49788, 49792, 49796, 49800, 49804, 49808, 
+    49812, 49816, 49820, 49824, 49828, 49832, 49836, 49840, 49844, 49848, 
+    49852, 49856, 49860, 49864, 49868, 49872, 49876, 49880, 49884, 49888, 
+    49892, 49896, 49900, 49904, 49908, 49912, 49916, 49920, 49924, 49928, 
+    49932, 49936, 49940, 49944, 49948, 49952, 49956, 49960, 49964, 49968, 
+    49972, 49976, 49980, 49984, 49988, 49992, 49996, 50000, 50004, 50008, 
+    50012, 50016, 50020, 50024, 50028, 50032, 50036, 50040, 50044, 50048, 
+    50052, 50056, 50060, 50064, 50068, 50072, 50076, 50080, 50084, 50088, 
+    50092, 50096, 50100, 50104, 50108, 50112, 50116, 50120, 50124, 50128, 
+    50132, 50136, 50140, 50144, 50148, 50152, 50156, 50160, 50164, 50168, 
+    50172, 50176, 50180, 50184, 50188, 50192, 50196, 50200, 50204, 50208, 
+    50212, 50216, 50220, 50224, 50228, 50232, 50236, 50240, 50244, 50248, 
+    50252, 50256, 50260, 50264, 50268, 50272, 50276, 50280, 50284, 50288, 
+    50292, 50296, 50300, 50304, 50308, 50312, 50316, 50320, 50324, 50328, 
+    50332, 50336, 50340, 50344, 50348, 50352, 50356, 50360, 50364, 50368, 
+    50372, 50376, 50380, 50384, 50388, 50392, 50396, 50400, 50404, 50408, 
+    50412, 50416, 50420, 50424, 50428, 50432, 50436, 50440, 50444, 50448, 
+    50452, 50456, 50460, 50464, 50471, 50479, 50485, 50491, 50498, 50505, 
+    50511, 50517, 50523, 50529, 50534, 50539, 50544, 50549, 50555, 50561, 
+    50569, 50576, 50582, 50588, 50596, 50605, 50612, 50622, 50633, 50636, 
+    50639, 50643, 50647, 50654, 50661, 50672, 50683, 50693, 50703, 50710, 
+    50717, 50724, 50731, 50742, 50753, 50764, 50775, 50785, 50795, 50807, 
+    50819, 50830, 50841, 50853, 50865, 50874, 50884, 50894, 50905, 50916, 
+    50923, 50930, 50937, 50944, 50954, 50964, 50972, 50980, 50987, 50994, 
+    51001, 51008, 51015, 51020, 51025, 51031, 51039, 51049, 51059, 51069, 
+    51079, 51089, 51099, 51109, 51119, 51129, 51139, 51149, 51160, 51171, 
+    51181, 51191, 51202, 51213, 51223, 51233, 51244, 51255, 51265, 51275, 
+    51286, 51297, 51313, 51332, 51348, 51367, 51383, 51399, 51415, 51431, 
+    51442, 51454, 51465, 51477, 51496, 51515, 51523, 51529, 51536, 51543, 
+    51550, 51557, 51562, 51568, 51573, 51578, 51584, 51589, 51594, 51599, 
+    51604, 51609, 51616, 51621, 51628, 51633, 51638, 51642, 51646, 51653, 
+    51660, 51667, 51674, 51681, 51688, 51701, 51714, 51727, 51740, 51748, 
+    51756, 51762, 51768, 51775, 51782, 51789, 51796, 51800, 51805, 51813, 
+    51821, 51829, 51836, 51840, 51848, 51856, 51860, 51864, 51869, 51876, 
+    51884, 51892, 51911, 51930, 51949, 51968, 51987, 52006, 52025, 52044, 
+    52050, 52057, 52066, 52074, 52082, 52087, 52090, 52093, 52098, 52101, 
+    52120, 52127, 52133, 52139, 52143, 52146, 52149, 52152, 52164, 52177, 
+    52184, 52191, 52194, 52198, 52201, 52206, 52211, 52216, 52222, 52231, 
+    52238, 52245, 52253, 52260, 52267, 52270, 52276, 52282, 52285, 52288, 
+    52293, 52298, 52304, 52310, 52314, 52319, 52326, 52330, 52336, 52340, 
+    52344, 52352, 52364, 52373, 52377, 52379, 52388, 52397, 52403, 52406, 
+    52412, 52418, 52423, 52428, 52433, 52438, 52443, 52448, 52450, 52456, 
+    52461, 52468, 52472, 52478, 52481, 52485, 52492, 52499, 52501, 52503, 
+    52509, 52515, 52521, 52530, 52539, 52546, 52553, 52559, 52565, 52570, 
+    52575, 52580, 52586, 52592, 52597, 52604, 52608, 52612, 52625, 52638, 
+    52650, 52659, 52665, 52672, 52677, 52682, 52687, 52692, 52697, 52699, 
+    52706, 52713, 52720, 52727, 52734, 52742, 52748, 52753, 52759, 52765, 
+    52771, 52778, 52784, 52792, 52800, 52808, 52816, 52823, 52829, 52835, 
+    52844, 52848, 52857, 52866, 52875, 52883, 52887, 52893, 52900, 52907, 
+    52911, 52917, 52924, 52929, 52934, 52940, 52945, 52950, 52957, 52964, 
+    52969, 52974, 52982, 52990, 53000, 53010, 53017, 53024, 53028, 53032, 
+    53044, 53050, 53056, 53061, 53066, 53073, 53080, 53086, 53092, 53101, 
+    53109, 53117, 53124, 53131, 53138, 53144, 53151, 53157, 53164, 53171, 
+    53178, 53185, 53191, 53196, 53205, 53215, 53222, 53231, 53237, 53242, 
+    53247, 53257, 53263, 53269, 53275, 53283, 53288, 53295, 53302, 53313, 
+    53320, 53327, 53334, 53341, 53348, 53355, 53362, 53374, 53386, 53397, 
+    53408, 53421, 53434, 53439, 53444, 53453, 53462, 53469, 53476, 53485, 
+    53494, 53502, 53510, 53518, 53526, 53536, 53546, 53560, 53574, 53582, 
+    53590, 53602, 53614, 53622, 53630, 53640, 53650, 53655, 53660, 53669, 
+    53678, 53683, 53688, 53696, 53702, 53708, 53716, 53724, 53737, 53750, 
+    53754, 53758, 53765, 53772, 53779, 53787, 53795, 53804, 53813, 53819, 
+    53825, 53832, 53839, 53846, 53853, 53862, 53871, 53874, 53877, 53882, 
+    53887, 53893, 53899, 53906, 53913, 53923, 53933, 53940, 53947, 53955, 
+    53963, 53971, 53979, 53987, 53995, 54001, 54007, 54011, 54015, 54022, 
+    54029, 54034, 54039, 54044, 54049, 54055, 54069, 54076, 54083, 54087, 
+    54089, 54091, 54096, 54101, 54106, 54111, 54119, 54126, 54133, 54141, 
+    54153, 54161, 54169, 54180, 54184, 54188, 54194, 54202, 54215, 54222, 
+    54229, 54236, 54241, 54248, 54257, 54265, 54271, 54277, 54283, 54292, 
+    54301, 54309, 54318, 54323, 54326, 54331, 54337, 54343, 54349, 54355, 
+    54359, 54362, 54366, 54370, 54376, 54382, 54388, 54394, 54398, 54402, 
+    54409, 54416, 54423, 54430, 54437, 54444, 54454, 54464, 54471, 54478, 
+    54486, 54494, 54498, 54503, 54508, 54514, 54520, 54523, 54526, 54529, 
+    54532, 54536, 54541, 54546, 54551, 54556, 54561, 54565, 54569, 54573, 
+    54577, 54581, 54585, 54589, 54595, 54599, 54605, 54610, 54617, 54625, 
+    54632, 54640, 54647, 54655, 54664, 54671, 54681, 54692, 54698, 54707, 
+    54713, 54722, 54731, 54737, 54743, 54747, 54751, 54760, 54769, 54776, 
+    54783, 54792, 0, 0, 0, 54801, 54806, 54810, 54814, 54819, 54824, 54829, 
+    54837, 54845, 54848, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 54852, 54857, 54862, 54867, 54872, 54877, 54882, 54887, 
+    54892, 54897, 54902, 54908, 54912, 54917, 54922, 54927, 54932, 54937, 
+    54942, 54947, 54952, 54957, 54962, 54967, 54972, 54977, 54982, 54987, 
+    54992, 54997, 55002, 55007, 55012, 55017, 55022, 55028, 55033, 55039, 
+    55048, 55053, 55061, 55068, 55077, 55082, 55087, 55092, 55098, 0, 55105, 
+    55110, 55115, 55120, 55125, 55130, 55135, 55140, 55145, 55150, 55155, 
+    55161, 55165, 55170, 55175, 55180, 55185, 55190, 55195, 55200, 55205, 
+    55210, 55215, 55220, 55225, 55230, 55235, 55240, 55245, 55250, 55255, 
+    55260, 55265, 55270, 55275, 55281, 55286, 55292, 55301, 55306, 55314, 
+    55321, 55330, 55335, 55340, 55345, 55351, 0, 55358, 55366, 55374, 55383, 
+    55390, 55398, 55404, 55413, 55421, 55429, 55437, 55445, 55453, 55461, 
+    55466, 55473, 55479, 55486, 55494, 55501, 55508, 55516, 55522, 55528, 
+    55535, 55542, 55552, 55562, 55569, 55576, 55581, 55591, 55601, 55606, 
+    55611, 55616, 55621, 55626, 55631, 55636, 55641, 55646, 55651, 55656, 
+    55661, 55666, 55671, 55676, 55681, 55686, 55691, 55696, 55701, 55706, 
+    55711, 55716, 55721, 55726, 55731, 55736, 55741, 55746, 55751, 55755, 
+    55759, 55764, 55769, 55774, 55779, 55784, 55789, 55794, 55799, 55804, 
+    55809, 55814, 55819, 55824, 55829, 55834, 55839, 55844, 55849, 55856, 
+    55863, 55870, 55877, 55884, 55891, 55898, 55905, 55912, 55919, 55926, 
+    55933, 55940, 55947, 55952, 55957, 55964, 55971, 55978, 55985, 55992, 
+    55999, 56006, 56013, 56020, 56027, 56034, 56041, 56047, 56053, 56059, 
+    56065, 56072, 56079, 56086, 56093, 56100, 56107, 56114, 56121, 56128, 
+    56135, 56143, 56151, 56159, 56167, 56175, 56183, 56191, 56199, 56203, 
+    56209, 56215, 56219, 56225, 56231, 56237, 56244, 56251, 56258, 56265, 
+    56270, 56276, 56282, 56289, 0, 0, 0, 0, 0, 56296, 56304, 56313, 56322, 
+    56330, 56336, 56341, 56346, 56351, 56356, 56361, 56366, 56371, 56376, 
+    56381, 56386, 56391, 56396, 56401, 56406, 56411, 56416, 56421, 56426, 
+    56431, 56436, 56441, 56446, 56451, 56456, 56461, 56466, 56471, 56476, 
+    56481, 56486, 56491, 56496, 56501, 56506, 56511, 56516, 56521, 56526, 
+    56531, 0, 56536, 0, 0, 0, 0, 0, 56541, 0, 0, 56546, 56550, 56555, 56560, 
+    56565, 56570, 56579, 56584, 56589, 56594, 56599, 56604, 56609, 56614, 
+    56619, 56626, 56631, 56636, 56645, 56652, 56657, 56662, 56667, 56674, 
+    56679, 56686, 56691, 56696, 56703, 56710, 56715, 56720, 56725, 56732, 
+    56739, 56744, 56749, 56754, 56759, 56764, 56771, 56778, 56783, 56788, 
+    56793, 56798, 56803, 56808, 56813, 56818, 56823, 56828, 56833, 56840, 
+    56845, 56850, 0, 0, 0, 0, 0, 0, 0, 56855, 56862, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 56867, 56872, 56876, 56880, 56884, 56888, 56892, 56896, 
+    56900, 56904, 56908, 56912, 56918, 56922, 56926, 56930, 56934, 56938, 
+    56942, 56946, 56950, 56954, 56958, 56962, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    56966, 56970, 56974, 56978, 56982, 56986, 56990, 0, 56994, 56998, 57002, 
+    57006, 57010, 57014, 57018, 0, 57022, 57026, 57030, 57034, 57038, 57042, 
+    57046, 0, 57050, 57054, 57058, 57062, 57066, 57070, 57074, 0, 57078, 
+    57082, 57086, 57090, 57094, 57098, 57102, 0, 57106, 57110, 57114, 57118, 
+    57122, 57126, 57130, 0, 57134, 57138, 57142, 57146, 57150, 57154, 57158, 
+    0, 57162, 57166, 57170, 57174, 57178, 57182, 57186, 0, 57190, 57195, 
+    57200, 57205, 57210, 57215, 57220, 57224, 57229, 57234, 57239, 57243, 
+    57248, 57253, 57258, 57263, 57267, 57272, 57277, 57282, 57287, 57292, 
+    57297, 57301, 57306, 57311, 57318, 57323, 57328, 57334, 57341, 57348, 
+    57357, 57364, 57373, 57377, 57381, 57387, 57393, 57399, 57407, 57413, 
+    57417, 57421, 57425, 57431, 57437, 57441, 57443, 57447, 57453, 57455, 
+    57459, 57463, 57467, 57473, 57478, 57482, 57486, 57491, 57497, 57502, 
+    57507, 57512, 57517, 57524, 57531, 57536, 57541, 57546, 57551, 57556, 
+    57561, 57565, 57569, 57576, 57583, 57589, 57593, 57598, 57600, 57604, 
+    57612, 57616, 57620, 57624, 57628, 57634, 57640, 57644, 57650, 57654, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 57658, 57662, 
+    57666, 57671, 57676, 57681, 57685, 57689, 57693, 57698, 57703, 57707, 
+    57711, 57715, 57719, 57724, 57729, 57734, 57739, 57743, 57747, 57752, 
+    57757, 57762, 57767, 57771, 0, 57775, 57779, 57783, 57787, 57791, 57795, 
+    57799, 57804, 57809, 57813, 57818, 57823, 57832, 57836, 57840, 57844, 
+    57851, 57855, 57860, 57865, 57869, 57873, 57879, 57884, 57889, 57894, 
+    57899, 57903, 57907, 57911, 57915, 57919, 57924, 57929, 57933, 57937, 
+    57942, 57947, 57952, 57956, 57960, 57965, 57970, 57976, 57982, 57986, 
+    57992, 57998, 58002, 58008, 58014, 58019, 58024, 58028, 58034, 58038, 
+    58042, 58048, 58054, 58059, 58064, 58068, 58072, 58080, 58086, 58092, 
+    58098, 58103, 58108, 58113, 58119, 58123, 58129, 58133, 58137, 58143, 
+    58149, 58155, 58161, 58167, 58173, 58179, 58185, 58191, 58197, 58203, 
+    58209, 58213, 58219, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58225, 58228, 
+    58232, 58236, 58240, 58244, 58247, 58250, 58254, 58258, 58262, 58266, 
+    58269, 58274, 58278, 58282, 58286, 58291, 58295, 58299, 58303, 58307, 
+    58313, 58319, 58323, 58327, 58331, 58335, 58339, 58343, 58347, 58351, 
+    58355, 58359, 58363, 58369, 58373, 58377, 58381, 58385, 58389, 58393, 
+    58397, 58401, 58405, 58409, 58413, 58417, 58421, 58425, 58429, 58433, 
+    58439, 58445, 58450, 58455, 58459, 58463, 58467, 58471, 58475, 58479, 
+    58483, 58487, 58491, 58495, 58499, 58503, 58507, 58511, 58515, 58519, 
+    58523, 58527, 58531, 58535, 58539, 58543, 58547, 58551, 58557, 58561, 
+    58565, 58569, 58573, 58577, 58581, 58585, 58589, 58594, 58601, 58605, 
+    58609, 58613, 58617, 58621, 58625, 58629, 58633, 58637, 58641, 58645, 
+    58649, 58656, 58660, 58666, 58670, 58674, 58678, 58682, 58686, 58689, 
+    58693, 58697, 58701, 58705, 58709, 58713, 58717, 58721, 58725, 58729, 
+    58733, 58737, 58741, 58745, 58749, 58753, 58757, 58761, 58765, 58769, 
+    58773, 58777, 58781, 58785, 58789, 58793, 58797, 58801, 58805, 58809, 
+    58813, 58817, 58823, 58827, 58831, 58835, 58839, 58843, 58847, 58851, 
+    58855, 58859, 58863, 58867, 58871, 58875, 58879, 58883, 58887, 58891, 
+    58895, 58899, 58903, 58907, 58911, 58915, 58919, 58923, 58927, 58931, 
+    58939, 58943, 58947, 58951, 58955, 58959, 58965, 58969, 58973, 58977, 
+    58981, 58985, 58989, 58993, 58997, 59001, 59005, 59009, 59013, 59017, 
+    59023, 59027, 59031, 59035, 59039, 59043, 59047, 59051, 59055, 59059, 
+    59063, 59067, 59071, 59075, 59079, 59083, 59087, 59091, 59095, 59099, 
+    59103, 59107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 59111, 59120, 59128, 59140, 59151, 59159, 59168, 59177, 
+    59187, 59199, 59211, 59223, 0, 0, 0, 0, 59229, 59232, 59235, 59240, 
+    59243, 59250, 59254, 59258, 59262, 59266, 59270, 59275, 59280, 59284, 
+    59288, 59293, 59298, 59303, 59308, 59311, 59314, 59320, 59326, 59331, 
+    59336, 59343, 59350, 59354, 59358, 59362, 59370, 59376, 59383, 59388, 
+    59393, 59398, 59403, 59408, 59413, 59418, 59423, 59428, 59433, 59438, 
+    59443, 59448, 59453, 59459, 59464, 59468, 59474, 59485, 59495, 59510, 
+    59520, 59524, 59534, 59540, 59546, 59552, 59557, 59560, 59565, 59569, 0, 
+    59575, 59579, 59582, 59586, 59589, 59593, 59596, 59600, 59603, 59607, 
+    59610, 59613, 59617, 59621, 59625, 59629, 59633, 59637, 59641, 59645, 
+    59649, 59652, 59656, 59660, 59664, 59668, 59672, 59676, 59680, 59684, 
+    59688, 59692, 59696, 59700, 59704, 59709, 59713, 59717, 59721, 59725, 
+    59728, 59732, 59735, 59739, 59743, 59747, 59751, 59754, 59758, 59761, 
+    59765, 59769, 59773, 59777, 59781, 59785, 59789, 59793, 59797, 59801, 
+    59805, 59809, 59812, 59816, 59820, 59824, 59828, 59832, 59835, 59840, 
+    59844, 59849, 59853, 59856, 59860, 59864, 59868, 59872, 59877, 59881, 
+    59885, 59889, 59893, 59897, 59901, 59905, 0, 0, 59910, 59918, 59926, 
+    59933, 59940, 59944, 59950, 59955, 59960, 59964, 59967, 59971, 59974, 
+    59978, 59981, 59985, 59988, 59992, 59995, 59998, 60002, 60006, 60010, 
+    60014, 60018, 60022, 60026, 60030, 60034, 60037, 60041, 60045, 60049, 
+    60053, 60057, 60061, 60065, 60069, 60073, 60077, 60081, 60085, 60089, 
+    60094, 60098, 60102, 60106, 60110, 60113, 60117, 60120, 60124, 60128, 
+    60132, 60136, 60139, 60143, 60146, 60150, 60154, 60158, 60162, 60166, 
+    60170, 60174, 60178, 60182, 60186, 60190, 60194, 60197, 60201, 60205, 
+    60209, 60213, 60217, 60220, 60225, 60229, 60234, 60238, 60241, 60245, 
+    60249, 60253, 60257, 60262, 60266, 60270, 60274, 60278, 60282, 60286, 
+    60290, 60295, 60299, 60303, 60307, 60311, 60316, 60323, 60327, 60333, 0, 
+    0, 0, 0, 0, 60338, 60343, 60348, 60352, 60357, 60362, 60367, 60372, 
+    60376, 60381, 60386, 60391, 60396, 60401, 60406, 60411, 60416, 60421, 
+    60425, 60430, 60435, 60440, 60444, 60448, 60452, 60457, 60462, 60467, 
+    60472, 60477, 60482, 60487, 60492, 60497, 60502, 60506, 60510, 60515, 
+    60520, 60525, 60530, 0, 0, 0, 60535, 60539, 60543, 60547, 60551, 60555, 
+    60559, 60563, 60567, 60571, 60575, 60579, 60583, 60587, 60591, 60595, 
+    60599, 60603, 60607, 60611, 60615, 60619, 60623, 60627, 60631, 60635, 
+    60639, 60643, 60647, 60651, 60655, 60658, 60662, 60665, 60669, 60673, 
+    60676, 60680, 60684, 60687, 60691, 60695, 60699, 60703, 60706, 60710, 
+    60714, 60718, 60722, 60726, 60730, 60733, 60736, 60740, 60744, 60748, 
+    60752, 60756, 60760, 60764, 60768, 60772, 60776, 60780, 60784, 60788, 
+    60792, 60796, 60800, 60804, 60808, 60812, 60816, 60820, 60824, 60828, 
+    60832, 60836, 60840, 60844, 60848, 60852, 60856, 60860, 60864, 60868, 
+    60872, 60876, 60880, 60884, 60888, 60892, 60896, 60900, 0, 60904, 60910, 
+    60916, 60921, 60926, 60931, 60937, 60943, 60949, 60955, 60961, 60967, 
+    60973, 60979, 60985, 60991, 60997, 61002, 61007, 61012, 61017, 61022, 
+    61027, 61032, 61037, 61042, 61047, 61052, 61057, 61062, 61067, 61072, 
+    61077, 61082, 61087, 61092, 61097, 61103, 61109, 61115, 61121, 61126, 
+    61131, 0, 0, 0, 0, 0, 61136, 61141, 61146, 61151, 61156, 61161, 61166, 
+    61171, 61176, 61181, 61186, 61191, 61196, 61201, 61206, 61211, 61216, 
+    61221, 61226, 61231, 61236, 61241, 61246, 61251, 61256, 61261, 61266, 
+    61271, 61276, 61281, 61286, 61291, 61296, 61301, 61306, 61311, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 61316, 61321, 61326, 61331, 61335, 61340, 
+    61344, 61349, 61354, 61359, 61364, 61369, 61373, 61378, 61383, 61388, 
+    61393, 61397, 61401, 61405, 61409, 61413, 61417, 61421, 61425, 61429, 
+    61433, 61437, 61441, 61445, 61449, 61454, 61459, 61464, 61469, 61474, 
+    61479, 61484, 61489, 61494, 61499, 61504, 61509, 61514, 61519, 61524, 
+    61530, 0, 61537, 61540, 61543, 61546, 61549, 61552, 61555, 61558, 61561, 
+    61564, 61568, 61572, 61576, 61580, 61584, 61588, 61592, 61596, 61600, 
+    61604, 61608, 61612, 61616, 61620, 61624, 61628, 61632, 61636, 61640, 
+    61644, 61648, 61652, 61656, 61660, 61664, 61668, 61672, 61676, 61680, 
+    61684, 61688, 61697, 61706, 61715, 61724, 61733, 61742, 61751, 61760, 
+    61763, 61768, 61773, 61778, 61783, 61788, 61793, 61798, 61803, 61808, 
+    61812, 61817, 61822, 61827, 61832, 61837, 61841, 61845, 61849, 61853, 
+    61857, 61861, 61865, 61869, 61873, 61877, 61881, 61885, 61889, 61893, 
+    61898, 61903, 61908, 61913, 61918, 61923, 61928, 61933, 61938, 61943, 
+    61948, 61953, 61958, 61963, 61969, 61975, 61980, 61985, 61988, 61991, 
+    61994, 61997, 62000, 62003, 62006, 62009, 62012, 62016, 62020, 62024, 
+    62028, 62032, 62036, 62040, 62044, 62048, 62052, 62056, 62060, 62064, 
+    62068, 62072, 62076, 62080, 62084, 62088, 62092, 62096, 62100, 62104, 
+    62108, 62112, 62116, 62120, 62124, 62128, 62132, 62136, 62140, 62144, 
+    62148, 62152, 62156, 62160, 62164, 62168, 62172, 62177, 62182, 62187, 
+    62192, 62196, 62201, 62206, 62211, 62216, 62221, 62226, 62231, 62236, 
+    62241, 62245, 62252, 62259, 62266, 62273, 62280, 62287, 62294, 62301, 
+    62308, 62315, 62322, 62329, 62332, 62335, 62338, 62343, 62346, 62349, 
+    62352, 62355, 62358, 62361, 62365, 62369, 62373, 62377, 62380, 62384, 
+    62388, 62392, 62396, 62400, 62404, 62408, 62412, 62415, 62418, 62422, 
+    62426, 62430, 62434, 62437, 62441, 62445, 62449, 62453, 62456, 62460, 
+    62464, 62468, 62472, 62475, 62479, 62483, 62486, 62490, 62494, 62498, 
+    62502, 62506, 62510, 62514, 0, 62518, 62521, 62524, 62527, 62530, 62533, 
+    62536, 62539, 62542, 62545, 62548, 62551, 62554, 62557, 62560, 62563, 
+    62566, 62569, 62572, 62575, 62578, 62581, 62584, 62587, 62590, 62593, 
+    62596, 62599, 62602, 62605, 62608, 62611, 62614, 62617, 62620, 62623, 
+    62626, 62629, 62632, 62635, 62638, 62641, 62644, 62647, 62650, 62653, 
+    62656, 62659, 62662, 62665, 62668, 62671, 62674, 62677, 62680, 62683, 
+    62686, 62689, 62692, 62695, 62698, 62701, 62704, 62707, 62710, 62713, 
+    62716, 62719, 62722, 62725, 62728, 62731, 62734, 62737, 62740, 62743, 
+    62746, 62749, 62752, 62755, 62758, 62761, 62764, 62767, 62770, 62773, 
+    62776, 62779, 62782, 62791, 62799, 62807, 62815, 62823, 62831, 62839, 
+    62847, 62855, 62863, 62872, 62881, 62890, 62899, 62908, 62917, 62926, 
+    62935, 62944, 62953, 62962, 62971, 62980, 62989, 62998, 63001, 63004, 
+    63007, 63009, 63012, 63015, 63018, 63023, 63028, 63031, 63038, 63045, 
+    63052, 63059, 63062, 63067, 63069, 63073, 63075, 63077, 63080, 63083, 
+    63086, 63089, 63092, 63095, 63098, 63103, 63108, 63111, 63114, 63117, 
+    63120, 63123, 63126, 63129, 63133, 63136, 63139, 63142, 63145, 63148, 
+    63152, 63155, 63158, 63161, 63166, 63171, 63176, 63181, 63186, 63191, 
+    63196, 63201, 63207, 63215, 63217, 63220, 63223, 63226, 63229, 63235, 
+    63243, 63246, 63249, 63254, 63257, 63260, 63263, 63268, 63271, 63274, 
+    63279, 63282, 63285, 63290, 63293, 63296, 63301, 63306, 63311, 63314, 
+    63317, 63320, 63323, 63329, 63332, 63335, 63338, 63340, 63343, 63346, 
+    63349, 63354, 63357, 63360, 63363, 63366, 63369, 63374, 63377, 63380, 
+    63383, 63386, 63389, 63392, 63395, 63398, 63401, 63406, 63410, 63418, 
+    63426, 63434, 63442, 63450, 63458, 63466, 63474, 63482, 63491, 63500, 
+    63509, 63518, 63527, 63536, 63545, 63554, 63563, 63572, 63581, 63590, 
+    63599, 63608, 63617, 63626, 63635, 63644, 63653, 63662, 63671, 63680, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63683, 63692, 63701, 63712, 
+    63719, 63724, 63729, 63736, 63743, 63749, 63754, 63759, 63764, 63769, 
+    63776, 63781, 63786, 63791, 63802, 63807, 63812, 63819, 63824, 63831, 
+    63836, 63841, 63848, 63855, 63862, 63871, 63880, 63885, 63890, 63895, 
+    63902, 63907, 63917, 63924, 63929, 63934, 63939, 63944, 63949, 63954, 
+    63963, 63970, 63977, 63982, 63989, 63994, 64001, 64010, 64021, 64026, 
+    64035, 64040, 64047, 64056, 64065, 64070, 64075, 64082, 64088, 64095, 
+    64102, 64106, 64110, 64113, 64117, 64121, 64125, 64129, 64133, 64137, 
+    64141, 64144, 64148, 64152, 64156, 64160, 64164, 64168, 64171, 64175, 
+    64179, 64182, 64186, 64190, 64194, 64198, 64202, 64206, 64210, 64214, 
+    64218, 64222, 64226, 64230, 64234, 64238, 64242, 64246, 64250, 64254, 
+    64258, 64262, 64266, 64270, 64274, 64278, 64282, 64286, 64290, 64294, 
+    64298, 64302, 64306, 64310, 64314, 64318, 64322, 64326, 64330, 64334, 
+    64338, 64342, 64346, 64350, 64354, 64358, 64361, 64365, 64369, 64373, 
+    64377, 64381, 64385, 64389, 64393, 64397, 64401, 64405, 64409, 64413, 
+    64417, 64421, 64425, 64429, 64433, 64437, 64441, 64445, 64449, 64453, 
+    64457, 64461, 64465, 64469, 64473, 64477, 64481, 64485, 64489, 64493, 
+    64497, 64501, 64505, 64509, 64513, 64517, 64521, 64525, 64529, 64533, 
+    64537, 64541, 64545, 64549, 64553, 64557, 64561, 64565, 64569, 64573, 
+    64577, 64581, 64585, 64589, 64593, 64597, 64601, 64605, 64609, 64613, 
+    64617, 64621, 64625, 64629, 64633, 64637, 64641, 64645, 64649, 64653, 
+    64657, 64661, 64665, 64669, 64673, 64677, 64681, 64685, 64689, 64693, 
+    64697, 64701, 64705, 64709, 64713, 64717, 64721, 64725, 64729, 64733, 
+    64737, 64741, 64745, 64749, 64753, 64757, 64761, 64765, 64769, 64773, 
+    64777, 64781, 64785, 64789, 64793, 64797, 64801, 64805, 64809, 64813, 
+    64817, 64821, 64825, 64829, 64832, 64836, 64840, 64844, 64848, 64852, 
+    64856, 64860, 64864, 64868, 64872, 64876, 64880, 64884, 64888, 64892, 
+    64896, 64900, 64904, 64908, 64912, 64916, 64920, 64924, 64928, 64932, 
+    64936, 64940, 64944, 64948, 64952, 64956, 64960, 64964, 64968, 64972, 
+    64976, 64980, 64984, 64988, 64992, 64996, 65000, 65004, 65008, 65012, 
+    65016, 65020, 65024, 65028, 65032, 65036, 65040, 65044, 65048, 65052, 
+    65056, 65060, 65064, 65068, 65072, 65076, 65080, 65084, 65088, 65092, 
+    65096, 65100, 65104, 65108, 65112, 65116, 65120, 65124, 65128, 65132, 
+    65136, 65140, 65144, 65148, 65152, 65156, 65160, 65164, 65168, 65172, 
+    65176, 65180, 65184, 65188, 65192, 65196, 65200, 65204, 65208, 65212, 
+    65216, 65220, 65224, 65228, 65232, 65236, 65240, 65244, 65248, 65252, 
+    65256, 65260, 65264, 65268, 65272, 65276, 65280, 65284, 65288, 65292, 
+    65295, 65299, 65303, 65307, 65311, 65315, 65319, 65323, 65327, 65331, 
+    65335, 65339, 65343, 65347, 65351, 65355, 65359, 65363, 65367, 65371, 
+    65375, 65379, 65383, 65387, 65391, 65395, 65399, 65403, 65407, 65411, 
+    65415, 65419, 65423, 65427, 65431, 65435, 65439, 65443, 65447, 65451, 
+    65455, 65459, 65463, 65467, 65471, 65475, 65479, 65483, 65487, 65491, 
+    65495, 65499, 65503, 65507, 65511, 65515, 65519, 65523, 65527, 65531, 
+    65535, 65539, 65543, 65547, 65551, 65555, 65559, 65563, 65567, 65571, 
+    65575, 65579, 65583, 65587, 65591, 65595, 65599, 65603, 65607, 65611, 
+    65615, 65619, 65623, 65627, 65631, 65635, 65639, 65643, 65647, 65651, 
+    65654, 65658, 65662, 65666, 65670, 65674, 65678, 65682, 65686, 65690, 
+    65694, 65698, 65702, 65706, 65710, 65714, 65718, 65722, 65726, 65730, 
+    65734, 65738, 65742, 65746, 65750, 65754, 65758, 65762, 65766, 65770, 
+    65774, 65778, 65782, 65786, 65790, 65794, 65798, 65802, 65806, 65810, 
+    65814, 65818, 65822, 65826, 65830, 65834, 65838, 65842, 65846, 65850, 
+    65854, 65858, 65862, 65866, 65870, 65874, 65878, 65882, 65886, 65890, 
+    65894, 65898, 65902, 65906, 65910, 65914, 65918, 65922, 65926, 65930, 
+    65934, 65938, 65942, 65946, 65950, 65954, 65958, 65962, 65966, 65970, 
+    65974, 65978, 65982, 65986, 65990, 65994, 65998, 66002, 66006, 66010, 
+    66014, 66018, 66022, 66026, 66030, 66034, 66038, 66042, 66046, 66050, 
+    66054, 66058, 66062, 66066, 66070, 66074, 66078, 66082, 66086, 66090, 
+    66094, 66098, 66102, 66106, 66110, 66114, 66118, 66122, 66126, 66130, 
+    66134, 66138, 66142, 66146, 66149, 66153, 66157, 66161, 66165, 66169, 
+    66173, 66177, 66181, 66185, 66189, 66193, 66197, 66201, 66205, 66209, 
+    66213, 66217, 66221, 66225, 66229, 66233, 66237, 66241, 66245, 66249, 
+    66253, 66257, 66261, 66265, 66269, 66273, 66277, 66281, 66285, 66289, 
+    66293, 66297, 66301, 66305, 66309, 66313, 66317, 66321, 66325, 66329, 
+    66333, 66337, 66341, 66345, 66349, 66353, 66357, 66361, 66365, 66369, 
+    66373, 66377, 66381, 66385, 66389, 66393, 66397, 66401, 66405, 66409, 
+    66413, 66417, 66421, 66425, 66429, 66433, 66437, 66441, 66445, 66449, 
+    66453, 66457, 66461, 66465, 66469, 66473, 66477, 66481, 66485, 66489, 
+    66493, 66497, 66501, 66505, 66509, 66513, 66517, 66521, 66525, 66529, 
+    66533, 66537, 66541, 66545, 66549, 66553, 66557, 66561, 66565, 66569, 
+    66573, 66577, 66581, 66585, 66589, 66593, 66597, 66601, 66604, 66608, 
+    66612, 66616, 66620, 66624, 66628, 66632, 66636, 66640, 66644, 66648, 
+    66652, 66656, 66660, 66664, 66668, 66672, 66676, 66680, 66684, 66688, 
+    66692, 66696, 66700, 66704, 66708, 66712, 66716, 66720, 66724, 66728, 
+    66732, 66736, 66740, 66744, 66748, 66752, 66756, 66760, 66764, 66768, 
+    66772, 66776, 66780, 66784, 66788, 66792, 66796, 66800, 66804, 66808, 
+    66812, 66816, 66820, 66824, 66828, 66832, 66836, 66840, 66844, 66848, 
+    66852, 66856, 66860, 66864, 66868, 66872, 66876, 66880, 66884, 66888, 
+    66892, 66896, 66900, 66904, 66908, 66912, 66916, 66920, 66924, 66928, 
+    66932, 66936, 66940, 66944, 66948, 66952, 66956, 66960, 66964, 66968, 
+    66972, 66976, 66980, 66984, 66988, 66992, 66996, 67000, 67004, 67008, 
+    67012, 67016, 67020, 67024, 67028, 67032, 67036, 67040, 67044, 67048, 
+    67052, 67056, 67060, 67064, 67068, 67072, 67076, 67080, 67084, 67088, 
+    67092, 67096, 67100, 67104, 67108, 67112, 67116, 67120, 67124, 67128, 
+    67132, 67136, 67140, 67144, 67148, 67152, 67156, 67160, 67164, 67168, 
+    67172, 67176, 67180, 67184, 67188, 67192, 67196, 67200, 67204, 67207, 
+    67211, 67215, 67219, 67223, 67227, 67231, 67235, 67238, 67242, 67246, 
+    67250, 67254, 67258, 67262, 67266, 67270, 67274, 67278, 67282, 67286, 
+    67290, 67294, 67298, 67302, 67306, 67310, 67314, 67318, 67322, 67326, 
+    67330, 67334, 67338, 67342, 67346, 67350, 67354, 67358, 67362, 67366, 
+    67370, 67374, 67378, 67382, 67386, 67390, 67394, 67398, 67402, 67406, 
+    67410, 67414, 67418, 67422, 67426, 67430, 67434, 67438, 67442, 67446, 
+    67450, 67454, 67458, 67462, 67466, 67470, 67474, 67478, 67482, 67486, 
+    67490, 67494, 67498, 67502, 67506, 67510, 67514, 67518, 67522, 67526, 
+    67530, 67534, 67538, 67542, 67546, 67550, 67554, 67558, 67562, 67566, 
+    67570, 67574, 67578, 67582, 67586, 67590, 67594, 67598, 67602, 67606, 
+    67610, 67614, 67618, 67622, 67626, 67630, 67634, 67638, 67642, 67646, 
+    67650, 67654, 67658, 67662, 67666, 67670, 67674, 67678, 67682, 67686, 
+    67690, 67694, 67698, 67702, 67706, 67710, 67714, 67718, 67722, 67726, 
+    67730, 67734, 67738, 67742, 67746, 67750, 67754, 67758, 67762, 67766, 
+    67770, 67774, 67778, 67782, 67786, 67790, 67794, 67798, 67802, 67806, 
+    67810, 67814, 67818, 67822, 67826, 67830, 67834, 67838, 67842, 67846, 
+    67850, 67854, 67858, 67862, 67866, 67870, 67874, 67878, 67882, 67886, 
+    67890, 67894, 67898, 67902, 67906, 67910, 67914, 67918, 67922, 67926, 
+    67930, 67934, 67938, 67942, 67946, 67950, 67954, 67958, 67962, 67965, 
+    67969, 67973, 67977, 67981, 67985, 67989, 67993, 67997, 68001, 68005, 
+    68009, 68013, 68017, 68021, 68025, 68029, 68033, 68037, 68041, 68045, 
+    68049, 68053, 68057, 68061, 68065, 68069, 68073, 68077, 68081, 68085, 
+    68089, 68093, 68097, 68101, 68105, 68109, 68113, 68117, 68121, 68125, 
+    68129, 68133, 68137, 68141, 68145, 68149, 68153, 68157, 68161, 68165, 
+    68169, 68173, 68177, 68181, 68185, 68189, 68193, 68197, 68201, 68205, 
+    68209, 68213, 68217, 68221, 68225, 68229, 68233, 68237, 68241, 68245, 
+    68249, 68253, 68257, 68261, 68265, 68269, 68273, 68277, 68281, 68285, 
+    68289, 68293, 68297, 68301, 68305, 68309, 68313, 68317, 68321, 68325, 
+    68329, 68333, 68337, 68341, 68345, 68349, 68353, 68357, 68361, 68365, 
+    68369, 68373, 68377, 68381, 68385, 68389, 68393, 68397, 68401, 68405, 
+    68409, 68413, 68417, 68421, 68425, 68429, 68433, 68437, 68441, 68445, 
+    68449, 68453, 68457, 68461, 68465, 68469, 68473, 68477, 68481, 68485, 
+    68489, 68493, 68497, 68501, 68505, 68509, 68513, 68517, 68521, 68525, 
+    68529, 68533, 68537, 68541, 68545, 68549, 68553, 68557, 68561, 68565, 
+    68569, 68573, 68577, 68581, 68585, 68589, 68593, 68597, 68601, 68605, 
+    68609, 68613, 68617, 68621, 68625, 68629, 68633, 68637, 68641, 68645, 
+    68649, 68653, 68657, 68661, 68665, 68669, 68673, 68677, 68681, 68685, 
+    68689, 68693, 68697, 68701, 68705, 68709, 68713, 68717, 68721, 68725, 
+    68729, 68733, 68737, 68741, 68745, 0, 0, 0, 68749, 68753, 68757, 68761, 
+    68765, 68769, 68773, 68777, 68781, 68785, 68789, 68793, 68797, 68801, 
+    68805, 68809, 68813, 68817, 68821, 68825, 68829, 68833, 68837, 68841, 
+    68845, 68849, 68853, 68857, 68861, 68865, 68869, 68873, 68877, 68881, 
+    68885, 68889, 68893, 68897, 68901, 68905, 68909, 68913, 68917, 68921, 
+    68925, 68929, 68933, 68937, 68941, 68945, 68949, 68953, 68957, 68961, 
+    68965, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68969, 68974, 68978, 68983, 68988, 
+    68993, 68998, 69003, 69007, 69012, 69017, 69022, 69027, 69032, 69037, 
+    69042, 69046, 69050, 69055, 69059, 69064, 69069, 69074, 69078, 69083, 
+    69088, 69093, 69098, 69103, 69107, 69112, 69116, 69121, 69125, 69130, 
+    69134, 69138, 69142, 69147, 69152, 69157, 69165, 69173, 69181, 69189, 
+    69196, 69204, 69210, 69218, 69222, 69226, 69230, 69234, 69238, 69242, 
+    69246, 69250, 69254, 69258, 69262, 69266, 69270, 69274, 69278, 69282, 
+    69286, 69290, 69294, 69298, 69302, 69306, 69310, 69314, 69318, 69322, 
+    69326, 69330, 69334, 69338, 69342, 69346, 69350, 69354, 69358, 69362, 
+    69365, 69369, 69373, 69377, 69381, 69385, 69389, 69393, 69397, 69401, 
+    69405, 69409, 69413, 69417, 69421, 69425, 69429, 69433, 69437, 69441, 
+    69445, 69449, 69453, 69457, 69461, 69465, 69469, 69473, 69477, 69481, 
+    69485, 69489, 69493, 69497, 69501, 69505, 69509, 69512, 69516, 69520, 
+    69523, 69527, 69531, 69535, 69538, 69542, 69546, 69550, 69554, 69558, 
+    69562, 69566, 69570, 69574, 69578, 69582, 69586, 69590, 69594, 69597, 
+    69601, 69605, 69608, 69612, 69616, 69620, 69624, 69628, 69632, 69635, 
+    69638, 69642, 69646, 69650, 69653, 69656, 69660, 69664, 69668, 69672, 
+    69676, 69680, 69684, 69688, 69692, 69696, 69700, 69704, 69708, 69712, 
+    69716, 69720, 69724, 69728, 69732, 69736, 69740, 69744, 69748, 69752, 
+    69756, 69760, 69764, 69768, 69772, 69776, 69780, 69784, 69788, 69792, 
+    69796, 69800, 69804, 69807, 69811, 69815, 69819, 69823, 69827, 69831, 
+    69835, 69839, 69843, 69847, 69851, 69855, 69859, 69863, 69867, 69871, 
+    69875, 69879, 69883, 69887, 69891, 69895, 69899, 69903, 69907, 69911, 
+    69915, 69919, 69923, 69927, 69931, 69935, 69939, 69943, 69947, 69951, 
+    69954, 69958, 69962, 69966, 69970, 69974, 69978, 69982, 69986, 69990, 
+    69994, 69998, 70002, 70006, 70010, 70014, 70018, 70021, 70025, 70029, 
+    70033, 70037, 70041, 70045, 70049, 70053, 70057, 70061, 70065, 70069, 
+    70073, 70077, 70081, 70085, 70089, 70093, 70097, 70101, 70105, 70108, 
+    70112, 70116, 70120, 70124, 70128, 70132, 70136, 70140, 70144, 70148, 
+    70152, 70156, 70160, 70164, 70168, 70172, 70176, 70180, 70184, 70188, 
+    70192, 70196, 70200, 70204, 70208, 70212, 70216, 70220, 70224, 70228, 
+    70232, 70236, 70240, 70244, 70248, 70252, 70256, 70260, 70264, 70268, 
+    70272, 70276, 70280, 70283, 70288, 70292, 70298, 70303, 70309, 70313, 
+    70317, 70321, 70325, 70329, 70333, 70337, 70341, 70345, 70349, 70353, 
+    70357, 70361, 70365, 70368, 70371, 70374, 70377, 70380, 70383, 70386, 
+    70389, 70392, 70397, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 70403, 70408, 70413, 70418, 70423, 70430, 70437, 70442, 70447, 
+    70452, 70457, 70464, 70471, 70478, 70485, 70492, 70499, 70509, 70519, 
+    70526, 70533, 70540, 70547, 70553, 70559, 70568, 70577, 70584, 70591, 
+    70602, 70613, 70618, 70623, 70630, 70637, 70644, 70651, 70658, 70665, 
+    70672, 70679, 70685, 70691, 70697, 70703, 70710, 70717, 70722, 70726, 
+    70733, 70740, 70747, 70751, 70758, 70762, 70767, 70771, 70777, 70782, 
+    70788, 70793, 70797, 70801, 70804, 70807, 70812, 70817, 70822, 70827, 
+    70832, 70837, 70842, 70847, 70852, 70857, 70866, 70875, 70880, 70885, 
+    70890, 70895, 70900, 70905, 70910, 70915, 70920, 70925, 70930, 0, 0, 0, 
+    0, 0, 0, 0, 70935, 70941, 70944, 70947, 70950, 70954, 70958, 70962, 
+    70966, 70969, 70973, 70976, 70980, 70983, 70987, 70991, 70995, 70999, 
+    71003, 71007, 71011, 71014, 71018, 71022, 71026, 71030, 71034, 71038, 
+    71042, 71046, 71050, 71054, 71058, 71062, 71066, 71070, 71073, 71077, 
+    71081, 71085, 71089, 71093, 71097, 71101, 71105, 71109, 71113, 71117, 
+    71121, 71125, 71129, 71133, 71137, 71141, 71145, 71149, 71153, 71157, 
+    71161, 71165, 71169, 71172, 71176, 71180, 71184, 71188, 71192, 71196, 
+    71200, 71203, 71207, 71211, 71215, 71219, 71223, 71227, 71231, 71235, 
+    71239, 71243, 71247, 71251, 71256, 71261, 71264, 71269, 71272, 71275, 
+    71278, 0, 0, 0, 0, 0, 0, 0, 0, 71282, 71291, 71300, 71309, 71318, 71327, 
+    71336, 71345, 71354, 71362, 71369, 71377, 71384, 71392, 71402, 71411, 
+    71421, 71430, 71440, 71448, 71455, 71463, 71470, 71478, 71483, 71488, 
+    71493, 71502, 71508, 71514, 71521, 71530, 71538, 71546, 71554, 71561, 
+    71568, 71575, 71582, 71587, 71592, 71597, 71602, 71607, 71612, 71617, 
+    71622, 71630, 71638, 71644, 71650, 71655, 71660, 71665, 71670, 71675, 
+    71680, 71685, 71690, 71698, 71706, 71711, 71716, 71726, 71736, 71743, 
+    71750, 71759, 71768, 71780, 71792, 71798, 71804, 71812, 71820, 71830, 
+    71840, 71847, 71854, 71859, 71864, 71876, 71888, 71896, 71904, 71914, 
+    71924, 71936, 71948, 71957, 71966, 71973, 71980, 71987, 71994, 72003, 
+    72012, 72017, 72022, 72029, 72036, 72043, 72050, 72062, 72074, 72079, 
+    72084, 72089, 72094, 72099, 72104, 72109, 72114, 72118, 72123, 72128, 
+    72133, 72138, 72143, 72149, 72154, 72159, 72166, 72173, 72180, 72187, 
+    72194, 72203, 72212, 72218, 72224, 72230, 72236, 72243, 72250, 72257, 
+    72264, 72271, 72275, 72282, 72287, 72292, 72299, 0, 72312, 72320, 72328, 
+    72335, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72342, 72351, 72360, 72369, 
+    72378, 72387, 72396, 72405, 72414, 72423, 72432, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72439, 
+    72446, 72452, 72459, 72467, 72475, 72482, 72490, 72497, 72503, 72509, 
+    72516, 72522, 72528, 72534, 72541, 72548, 72555, 72562, 72569, 72576, 
+    72583, 72590, 72597, 72604, 72611, 72618, 72625, 72632, 72638, 72645, 
+    72652, 72659, 72666, 72673, 72680, 72687, 72694, 72701, 72708, 72715, 
+    72722, 72729, 72736, 72743, 72750, 72757, 72764, 72772, 72780, 72788, 
+    72796, 0, 0, 0, 0, 72804, 72813, 72822, 72831, 72840, 72849, 72858, 
+    72865, 72872, 72879, 0, 0, 0, 0, 0, 0, 72886, 72890, 72895, 72900, 72905, 
+    72910, 72915, 72920, 72925, 72930, 72935, 72940, 72944, 72948, 72953, 
+    72958, 72962, 72967, 72972, 72977, 72982, 72987, 72992, 72997, 73001, 
+    73005, 73010, 73015, 73019, 73023, 73027, 73031, 73035, 73039, 73043, 
+    73048, 73053, 73058, 73063, 73068, 73075, 73081, 73086, 73091, 73096, 
+    73101, 73107, 73114, 73120, 73127, 73133, 73139, 73144, 73151, 73157, 
+    73162, 0, 0, 0, 0, 0, 0, 0, 0, 73168, 73172, 73176, 73179, 73183, 73186, 
+    73190, 73193, 73197, 73201, 73206, 73210, 73215, 73218, 73222, 73226, 
+    73229, 73233, 73237, 73240, 73244, 73248, 73252, 73256, 73260, 73264, 
+    73268, 73272, 73276, 73280, 73284, 73288, 73292, 73296, 73300, 73304, 
+    73308, 73312, 73315, 73318, 73322, 73326, 73330, 73333, 73336, 73339, 
+    73343, 73347, 73351, 73355, 73358, 73361, 73365, 73370, 73375, 73379, 
+    73384, 73388, 73393, 73398, 73404, 73409, 73415, 73419, 73424, 73429, 
+    73433, 73438, 73443, 0, 0, 0, 0, 0, 0, 0, 0, 0, 73447, 73450, 73454, 
+    73458, 73461, 73464, 73467, 73470, 73473, 73476, 73479, 73482, 0, 0, 0, 
+    0, 0, 0, 73485, 73490, 73494, 73498, 73502, 73506, 73510, 73514, 73518, 
+    73522, 73526, 73530, 73534, 73538, 73542, 73546, 73550, 73555, 73560, 
+    73566, 73572, 73579, 73584, 73589, 73595, 73599, 73604, 73607, 0, 0, 0, 
+    0, 73610, 73617, 73623, 73629, 73635, 73641, 73647, 73653, 73659, 73665, 
+    73671, 73677, 73684, 73691, 73698, 73704, 73711, 73718, 73725, 73732, 
+    73739, 73745, 73751, 73758, 73764, 73771, 73778, 73784, 73790, 73797, 
+    73804, 73811, 73817, 73824, 73831, 73837, 73844, 73850, 73857, 73864, 
+    73870, 73876, 73883, 73889, 73896, 73903, 73912, 73919, 73926, 73930, 
+    73935, 73940, 73945, 73950, 73954, 73958, 73963, 73967, 73972, 73977, 
+    73982, 73986, 73990, 73995, 73999, 74004, 74008, 74013, 74018, 74023, 
+    74028, 74032, 74037, 74042, 74047, 74053, 74058, 74064, 74070, 74076, 
+    74082, 74088, 74093, 74099, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74103, 
+    74108, 74112, 74116, 74120, 74124, 74128, 74132, 74136, 74140, 74144, 
+    74148, 74152, 74156, 74160, 74164, 74168, 74172, 74176, 74180, 74184, 
+    74188, 74192, 74196, 74200, 74204, 74208, 74212, 74216, 74220, 0, 0, 0, 
+    74224, 74228, 74232, 74236, 74240, 74243, 74249, 74252, 74256, 74259, 
+    74265, 74271, 74279, 74282, 74286, 74289, 74292, 74298, 74304, 74308, 
+    74314, 74318, 74322, 74328, 74332, 74338, 74344, 74348, 74352, 74358, 
+    74362, 74368, 74374, 74378, 74384, 74388, 74394, 74397, 74400, 74406, 
+    74410, 74416, 74419, 74422, 74425, 74431, 74435, 74439, 74445, 74451, 
+    74454, 74457, 74463, 74468, 74473, 74478, 74485, 74490, 74497, 74502, 
+    74509, 74514, 74519, 74524, 74529, 74532, 74536, 74540, 74545, 74550, 
+    74555, 74560, 74565, 74570, 74575, 74580, 74587, 74592, 0, 74599, 74602, 
+    74606, 74609, 74612, 74615, 74618, 74621, 74624, 74627, 74630, 0, 0, 0, 
+    0, 74633, 74640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74645, 74648, 74651, 74654, 74657, 
+    74661, 74664, 74667, 74671, 74675, 74679, 74683, 74687, 74691, 74695, 
+    74699, 74703, 74707, 74711, 74715, 74719, 74723, 74727, 74731, 74735, 
+    74738, 74742, 74745, 74749, 74753, 74757, 74761, 74765, 74768, 74772, 
+    74775, 74778, 74782, 74786, 74790, 74793, 74796, 74801, 74805, 74810, 
+    74815, 74819, 74824, 74828, 74833, 74838, 74843, 74847, 74851, 74856, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 74861, 74866, 74871, 74876, 74882, 74887, 74892, 
+    74897, 74902, 74907, 74911, 74915, 74920, 74925, 0, 0, 74931, 74935, 
+    74938, 74941, 74944, 74947, 74950, 74953, 74956, 74959, 0, 0, 74962, 
+    74967, 74972, 74978, 74985, 74991, 74997, 75003, 75009, 75015, 75021, 
+    75027, 75033, 75039, 75045, 75051, 75056, 75061, 75066, 75072, 75078, 
+    75085, 75091, 75097, 75102, 75109, 75116, 75123, 75129, 75134, 75139, 
+    75144, 0, 0, 0, 0, 75152, 75158, 75164, 75170, 75176, 75182, 75188, 
+    75194, 75200, 75206, 75212, 75218, 75224, 75230, 75236, 75242, 75248, 
+    75254, 75260, 75266, 75272, 75277, 75282, 75288, 75294, 75300, 75306, 
+    75312, 75318, 75324, 75330, 75336, 75342, 75348, 75354, 75360, 75366, 
+    75372, 75378, 75384, 75390, 75396, 75402, 75408, 75414, 75420, 75426, 
+    75431, 75436, 75442, 75447, 75451, 75456, 75460, 75464, 75468, 75474, 
+    75479, 75484, 75489, 75494, 75499, 75504, 75509, 75516, 75523, 75530, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    75532, 75537, 75542, 75547, 75554, 75561, 75565, 75569, 75574, 75579, 
-    75584, 75589, 75594, 75599, 75604, 75609, 75614, 75620, 75626, 75632, 
-    75638, 75644, 75648, 75654, 75658, 75664, 75671, 75677, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 75681, 75685, 75689, 75693, 75697, 75701, 0, 0, 75705, 75709, 
-    75713, 75717, 75721, 75725, 0, 0, 75729, 75733, 75737, 75741, 75745, 
-    75749, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75753, 75757, 75761, 75765, 75769, 
-    75773, 75777, 0, 75781, 75785, 75789, 75793, 75797, 75801, 75805, 0, 0, 
+    75537, 75542, 75547, 75552, 75559, 75566, 75570, 75574, 75579, 75584, 
+    75589, 75594, 75599, 75604, 75609, 75614, 75619, 75625, 75631, 75637, 
+    75643, 75649, 75653, 75659, 75663, 75669, 75676, 75682, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 75686, 75690, 75694, 75698, 75702, 75706, 0, 0, 75710, 75714, 
+    75718, 75722, 75726, 75730, 0, 0, 75734, 75738, 75742, 75746, 75750, 
+    75754, 0, 0, 0, 0, 0, 0, 0, 0, 0, 75758, 75762, 75766, 75770, 75774, 
+    75778, 75782, 0, 75786, 75790, 75794, 75798, 75802, 75806, 75810, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    75809, 75814, 75819, 75824, 75829, 75833, 75837, 75842, 75847, 75852, 
-    75857, 75862, 75867, 75872, 75877, 75882, 75886, 75891, 75896, 75901, 
-    75906, 75911, 75916, 75921, 75926, 75931, 75936, 75941, 75948, 75955, 
-    75962, 75969, 75976, 75983, 75990, 75997, 76003, 76009, 76015, 76021, 
-    76027, 76033, 76039, 76045, 76049, 76055, 0, 0, 76061, 76066, 76070, 
-    76074, 76078, 76082, 76086, 76090, 76094, 76098, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76102, 
-    76106, 76110, 76114, 76118, 76122, 76126, 76130, 76134, 76138, 76142, 
-    76146, 76150, 76154, 76158, 76162, 76166, 76170, 76174, 76178, 76182, 
-    76186, 76190, 0, 0, 0, 0, 76194, 76198, 76202, 76206, 76210, 76214, 
-    76218, 76222, 76226, 76230, 76234, 76238, 76242, 76246, 76250, 76254, 
-    76258, 76262, 76266, 76270, 76274, 76278, 76282, 76286, 76290, 76294, 
-    76298, 76302, 76306, 76310, 76314, 76318, 76322, 76326, 76330, 76334, 
-    76338, 76342, 76346, 76350, 76354, 76358, 76362, 76366, 76370, 76374, 
-    76378, 76382, 76386, 0, 0, 0, 0, 76390, 76394, 76398, 76402, 76406, 
-    76410, 76414, 76418, 76422, 76426, 76430, 76434, 76438, 76442, 76446, 
-    76450, 76454, 76458, 76462, 76466, 76470, 76474, 76478, 76482, 76486, 
-    76490, 76494, 76498, 76502, 76506, 76510, 76514, 76518, 76522, 76526, 
-    76530, 76534, 76538, 76542, 76546, 76550, 76554, 76558, 76562, 76566, 
-    76570, 76574, 76578, 76582, 76586, 76590, 76594, 76598, 76602, 76606, 
-    76610, 76614, 76618, 76622, 76626, 76630, 76634, 76638, 76642, 76646, 
-    76650, 76654, 76658, 76662, 76666, 76670, 76674, 76678, 76682, 76686, 
-    76690, 76694, 76698, 76702, 76706, 76710, 76714, 76718, 76722, 76726, 
-    76730, 76734, 76738, 76742, 76746, 76750, 76754, 76758, 76762, 76766, 
-    76770, 76774, 76778, 76782, 76786, 76790, 76794, 76798, 76802, 76806, 
-    76810, 76814, 76818, 76822, 76826, 76830, 76834, 76838, 76842, 76846, 
-    76850, 76854, 76858, 76862, 76866, 76870, 76874, 76878, 76882, 76886, 
-    76890, 76894, 76898, 76902, 76906, 76910, 76914, 76918, 76922, 76926, 
-    76930, 76934, 76938, 76942, 76946, 76950, 76954, 76958, 76962, 76966, 
-    76970, 76974, 76978, 76982, 76986, 76990, 76994, 76998, 77002, 77006, 
-    77010, 77014, 77018, 77022, 77026, 77030, 77034, 77038, 77042, 77046, 
-    77050, 77054, 77058, 77062, 77066, 77070, 77074, 77078, 77082, 77086, 
-    77090, 77094, 77098, 77102, 77106, 77110, 77114, 77118, 77122, 77126, 
-    77130, 77134, 77138, 77142, 77146, 77150, 77154, 77158, 77162, 77166, 
-    77170, 77174, 77178, 77182, 77186, 77190, 77194, 77198, 77202, 77206, 
-    77210, 77214, 77218, 77222, 77226, 77230, 77234, 77238, 77242, 77246, 
-    77250, 77254, 77258, 77262, 77266, 77270, 77274, 77278, 77282, 77286, 
-    77290, 77294, 77298, 77302, 77306, 77310, 77314, 77318, 77322, 77326, 
-    77330, 77334, 77338, 77342, 77346, 77350, 77354, 77358, 77362, 77366, 
-    77370, 77374, 77378, 77382, 77386, 77390, 77394, 77398, 77402, 77406, 
-    77410, 77414, 77418, 77422, 77426, 77430, 77434, 77438, 77442, 77446, 
-    77450, 77454, 77458, 77462, 77466, 77470, 77474, 77478, 77482, 77486, 
-    77490, 77494, 77498, 77502, 77506, 77510, 77514, 77518, 77522, 77526, 
-    77530, 77534, 77538, 77542, 77546, 77550, 77554, 77558, 77562, 77566, 
-    77570, 77574, 77578, 77582, 77586, 77590, 77594, 77598, 77602, 77606, 
-    77610, 77614, 77618, 77622, 77626, 77630, 77634, 77638, 77642, 77646, 
-    77650, 77654, 77658, 77662, 77666, 77670, 77674, 77678, 77682, 77686, 
-    77690, 77694, 77698, 77702, 77706, 77710, 77714, 77718, 77722, 77726, 
-    77730, 77734, 77738, 77742, 77746, 77750, 77754, 77758, 77762, 77766, 
-    77770, 77774, 77778, 77782, 77786, 77790, 77794, 77798, 77802, 77806, 
-    77810, 77814, 77818, 77822, 77826, 77830, 77834, 77838, 77842, 77846, 
-    77850, 0, 0, 77854, 77858, 77862, 77866, 77870, 77874, 77878, 77882, 
-    77886, 77890, 77894, 77898, 77902, 77906, 77910, 77914, 77918, 77922, 
-    77926, 77930, 77934, 77938, 77942, 77946, 77950, 77954, 77958, 77962, 
-    77966, 77970, 77974, 77978, 77982, 77986, 77990, 77994, 77998, 78002, 
-    78006, 78010, 78014, 78018, 78022, 78026, 78030, 78034, 78038, 78042, 
-    78046, 78050, 78054, 78058, 78062, 78066, 78070, 78074, 78078, 78082, 
-    78086, 78090, 78094, 78098, 78102, 78106, 78110, 78114, 78118, 78122, 
-    78126, 78130, 78134, 78138, 78142, 78146, 78150, 78154, 78158, 78162, 
-    78166, 78170, 78174, 78178, 78182, 78186, 78190, 78194, 78198, 78202, 
-    78206, 78210, 78214, 78218, 78222, 78226, 78230, 78234, 78238, 78242, 
-    78246, 78250, 78254, 78258, 78262, 78266, 78270, 78274, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 78278, 78283, 78288, 78293, 78298, 78303, 78311, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78316, 78323, 78330, 78337, 78344, 0, 
-    0, 0, 0, 0, 78351, 78358, 78365, 78375, 78381, 78387, 78393, 78399, 
-    78405, 78411, 78418, 78424, 78430, 78436, 78445, 78454, 78466, 78478, 
-    78484, 78490, 78496, 78503, 78510, 78517, 78524, 78531, 0, 78538, 78545, 
-    78552, 78560, 78567, 0, 78574, 0, 78581, 78588, 0, 78595, 78603, 0, 
-    78610, 78617, 78624, 78631, 78638, 78645, 78652, 78659, 78666, 78673, 
-    78678, 78685, 78692, 78698, 78704, 78710, 78716, 78722, 78728, 78734, 
-    78740, 78746, 78752, 78758, 78764, 78770, 78776, 78782, 78788, 78794, 
-    78800, 78806, 78812, 78818, 78824, 78830, 78836, 78842, 78848, 78854, 
-    78860, 78866, 78872, 78878, 78884, 78890, 78896, 78902, 78908, 78914, 
-    78920, 78926, 78932, 78938, 78944, 78950, 78956, 78962, 78968, 78974, 
-    78980, 78986, 78992, 78998, 79004, 79010, 79016, 79022, 79028, 79034, 
-    79040, 79046, 79052, 79058, 79064, 79070, 79076, 79082, 79088, 79094, 
-    79100, 79106, 79112, 79118, 79124, 79130, 79136, 79142, 79148, 79156, 
-    79164, 79170, 79176, 79182, 79188, 79197, 79206, 79214, 79222, 79230, 
-    79238, 79246, 79254, 79262, 79270, 79277, 79284, 79294, 79304, 79308, 
-    79312, 79317, 79322, 79327, 79332, 79341, 79350, 79356, 79362, 79369, 
-    79376, 79383, 79387, 79393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 79399, 79405, 79411, 79417, 79423, 79428, 79433, 79439, 79445, 
-    79451, 79457, 79465, 79471, 79477, 79485, 79493, 79501, 79509, 79514, 
-    79519, 79524, 79529, 79542, 79555, 79565, 79575, 79586, 79597, 79608, 
-    79619, 79629, 79639, 79650, 79661, 79672, 79683, 79693, 79703, 79713, 
-    79729, 79745, 79761, 79768, 79775, 79782, 79789, 79799, 79809, 79819, 
-    79831, 79841, 79849, 79857, 79866, 79874, 79884, 79892, 79900, 79908, 
-    79917, 79925, 79935, 79943, 79951, 79959, 79969, 79977, 79984, 79991, 
-    79998, 80005, 80013, 80021, 80029, 80037, 80045, 80054, 80062, 80070, 
-    80078, 80086, 80094, 80103, 80111, 80119, 80127, 80135, 80143, 80151, 
-    80159, 80167, 80175, 80183, 80192, 80200, 80210, 80218, 80226, 80234, 
-    80244, 80252, 80260, 80268, 80276, 80285, 80294, 80302, 80312, 80320, 
-    80328, 80336, 80345, 80353, 80363, 80371, 80378, 80385, 80393, 80400, 
-    80409, 80416, 80424, 80432, 80441, 80449, 80459, 80467, 80475, 80483, 
-    80493, 80501, 80508, 80515, 80523, 80530, 80539, 80546, 80556, 80566, 
-    80577, 80586, 80595, 80604, 80613, 80622, 80632, 80643, 80654, 80664, 
-    80675, 80687, 80697, 80706, 80715, 80723, 80732, 80742, 80750, 80759, 
-    80768, 80776, 80785, 80795, 80803, 80812, 80821, 80829, 80838, 80848, 
-    80856, 80866, 80874, 80884, 80892, 80900, 80909, 80917, 80927, 80935, 
-    80943, 80953, 80961, 80968, 80975, 80984, 80993, 81001, 81010, 81020, 
-    81028, 81039, 81047, 81055, 81062, 81070, 81079, 81086, 81096, 81106, 
-    81117, 81127, 81138, 81146, 81154, 81163, 81171, 81180, 81188, 81196, 
-    81205, 81213, 81222, 81230, 81237, 81244, 81251, 81258, 81266, 81274, 
-    81282, 81290, 81299, 81307, 81315, 81324, 81332, 81340, 81348, 81357, 
-    81365, 81373, 81381, 81389, 81397, 81405, 81413, 81421, 81429, 81438, 
-    81446, 81454, 81462, 81470, 81478, 81487, 81496, 81504, 81512, 81520, 
-    81529, 81537, 81546, 81553, 81560, 81568, 81575, 81583, 81591, 81600, 
-    81608, 81617, 81625, 81633, 81643, 81650, 81657, 81665, 81672, 81680, 
-    81690, 81701, 81709, 81718, 81726, 81735, 81743, 81752, 81760, 81769, 
-    81777, 81786, 81795, 81803, 81811, 81819, 81828, 81835, 81843, 81852, 
-    81861, 81870, 81880, 81888, 81898, 81906, 81916, 81924, 81934, 81942, 
-    81952, 81960, 81969, 81976, 81985, 81992, 82002, 82010, 82020, 82028, 
-    82038, 82046, 82054, 82062, 82071, 82079, 82088, 82097, 82106, 82115, 
-    82125, 82133, 82143, 82151, 82161, 82169, 82179, 82187, 82197, 82205, 
-    82214, 82221, 82230, 82237, 82247, 82255, 82265, 82273, 82283, 82291, 
-    82299, 82307, 82316, 82324, 82333, 82342, 82351, 82360, 82368, 82376, 
-    82385, 82393, 82402, 82411, 82419, 82427, 82435, 82444, 82452, 82460, 
-    82469, 82477, 82485, 82493, 82501, 82506, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 82511, 82521, 82531, 82541, 82551, 82562, 82572, 82582, 
-    82593, 82602, 82611, 82620, 82631, 82641, 82651, 82663, 82673, 82683, 
-    82693, 82703, 82713, 82723, 82733, 82743, 82753, 82763, 82773, 82784, 
-    82795, 82805, 82815, 82827, 82838, 82849, 82859, 82869, 82879, 82889, 
-    82899, 82909, 82919, 82931, 82941, 82951, 82963, 82974, 82985, 82995, 
-    83005, 83015, 83025, 83037, 83047, 83057, 83068, 83079, 83089, 83099, 
-    83108, 83117, 83126, 83135, 83144, 83154, 0, 0, 83164, 83174, 83184, 
-    83194, 83204, 83216, 83226, 83236, 83248, 83258, 83270, 83279, 83288, 
-    83299, 83309, 83321, 83332, 83345, 83355, 83367, 83376, 83387, 83398, 
-    83411, 83421, 83431, 83441, 83451, 83461, 83470, 83479, 83488, 83497, 
-    83507, 83517, 83527, 83537, 83547, 83557, 83567, 83577, 83587, 83597, 
-    83607, 83617, 83626, 83635, 83644, 83654, 83664, 83674, 83684, 83694, 
-    83705, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83715, 83730, 
-    83745, 83751, 83757, 83763, 83769, 83775, 83781, 83787, 83793, 83801, 
-    83805, 83808, 0, 0, 83816, 83819, 83822, 83825, 83828, 83831, 83834, 
-    83837, 83840, 83843, 83846, 83849, 83852, 83855, 83858, 83861, 83864, 
-    83872, 83881, 83892, 83900, 83908, 83917, 83926, 83937, 83949, 0, 0, 0, 
-    0, 0, 0, 83958, 83963, 83968, 83975, 83982, 83988, 83994, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 83999, 84009, 84019, 84029, 84038, 84049, 84058, 84067, 
-    84077, 84087, 84099, 84111, 84122, 84133, 84144, 84155, 84165, 84175, 
-    84185, 84195, 84206, 84217, 84221, 84226, 84235, 84244, 84248, 84252, 
-    84256, 84261, 84266, 84271, 84276, 84279, 84283, 0, 84288, 84291, 84294, 
-    84298, 84302, 84307, 84311, 84315, 84320, 84325, 84332, 84339, 84342, 
-    84345, 84348, 84351, 84354, 84358, 84362, 0, 84366, 84371, 84375, 84379, 
-    0, 0, 0, 0, 84384, 84389, 84396, 84401, 84406, 0, 84411, 84416, 84421, 
-    84426, 84431, 84436, 84441, 84446, 84451, 84456, 84461, 84466, 84475, 
-    84484, 84492, 84500, 84509, 84518, 84527, 84536, 84544, 84552, 84560, 
-    84568, 84573, 84578, 84584, 84590, 84596, 84602, 84610, 84618, 84624, 
-    84630, 84636, 84642, 84648, 84654, 84660, 84666, 84671, 84676, 84681, 
-    84686, 84691, 84696, 84701, 84706, 84712, 84718, 84724, 84730, 84736, 
-    84742, 84748, 84754, 84760, 84766, 84772, 84778, 84784, 84790, 84796, 
-    84802, 84808, 84814, 84820, 84826, 84832, 84838, 84844, 84850, 84856, 
-    84862, 84868, 84874, 84880, 84886, 84892, 84898, 84904, 84910, 84916, 
-    84922, 84928, 84934, 84940, 84946, 84952, 84958, 84964, 84970, 84976, 
-    84982, 84988, 84994, 85000, 85006, 85012, 85018, 85024, 85030, 85036, 
-    85042, 85048, 85054, 85060, 85066, 85071, 85076, 85081, 85086, 85092, 
-    85098, 85104, 85110, 85116, 85122, 85128, 85134, 85140, 85146, 85153, 
-    85160, 85165, 85170, 85175, 85180, 85192, 85204, 85215, 85226, 85238, 
-    85250, 85258, 0, 0, 85266, 0, 85274, 85278, 85282, 85285, 85289, 85293, 
-    85296, 85299, 85303, 85307, 85310, 85313, 85316, 85319, 85324, 85327, 
-    85331, 85334, 85337, 85340, 85343, 85346, 85349, 85352, 85355, 85358, 
-    85361, 85364, 85368, 85372, 85376, 85380, 85385, 85390, 85396, 85402, 
-    85408, 85413, 85419, 85425, 85431, 85436, 85442, 85448, 85453, 85458, 
-    85464, 85469, 85475, 85481, 85486, 85492, 85498, 85503, 85509, 85515, 
-    85521, 85527, 85533, 85537, 85542, 85546, 85551, 85555, 85560, 85565, 
-    85571, 85577, 85583, 85588, 85594, 85600, 85606, 85611, 85617, 85623, 
-    85628, 85633, 85639, 85644, 85650, 85656, 85661, 85667, 85673, 85678, 
-    85684, 85690, 85696, 85702, 85708, 85713, 85717, 85722, 85724, 85729, 
-    85734, 85740, 85745, 85750, 85754, 85760, 85765, 85770, 85775, 85780, 
-    85785, 85790, 85795, 85801, 85807, 85813, 85821, 85825, 85829, 85833, 
-    85837, 85841, 85845, 85850, 85855, 85860, 85865, 85869, 85874, 85879, 
-    85884, 85889, 85894, 85899, 85904, 85909, 85913, 85917, 85922, 85927, 
-    85932, 85937, 85941, 85946, 85951, 85956, 85961, 85965, 85970, 85975, 
-    85980, 85985, 85989, 85994, 85999, 86003, 86008, 86013, 86018, 86023, 
-    86028, 86033, 86040, 86047, 86051, 86056, 86061, 86066, 86071, 86076, 
-    86081, 86086, 86091, 86096, 86101, 86106, 86111, 86116, 86121, 86126, 
-    86131, 86136, 86141, 86146, 86151, 86156, 86161, 86166, 86171, 86176, 
-    86181, 86186, 86191, 86196, 0, 0, 0, 86201, 86205, 86210, 86214, 86219, 
-    86224, 0, 0, 86228, 86233, 86238, 86242, 86247, 86252, 0, 0, 86257, 
-    86262, 86266, 86271, 86276, 86281, 0, 0, 86286, 86291, 86296, 0, 0, 0, 
-    86300, 86304, 86308, 86312, 86315, 86319, 86323, 0, 86327, 86333, 86336, 
-    86340, 86343, 86347, 86351, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86355, 86361, 
-    86367, 86373, 86379, 0, 0, 86383, 86389, 86395, 86401, 86407, 86413, 
-    86420, 86427, 86434, 86441, 86448, 86455, 0, 86462, 86469, 86476, 86482, 
-    86489, 86496, 86503, 86510, 86516, 86523, 86530, 86537, 86544, 86550, 
-    86557, 86564, 86571, 86578, 86584, 86591, 86598, 86605, 86612, 86619, 
-    86626, 86633, 0, 86640, 86646, 86653, 86660, 86667, 86674, 86680, 86687, 
-    86694, 86701, 86708, 86715, 86722, 86729, 86735, 86742, 86749, 86756, 
-    86763, 0, 86770, 86777, 0, 86784, 86791, 86798, 86805, 86812, 86819, 
-    86826, 86833, 86840, 86847, 86854, 86861, 86868, 86875, 86882, 0, 0, 
-    86888, 86893, 86898, 86903, 86908, 86913, 86918, 86923, 86928, 86933, 
-    86938, 86943, 86948, 86953, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86958, 86965, 
-    86972, 86979, 86986, 86993, 87000, 87007, 87014, 87021, 87028, 87035, 
-    87042, 87049, 87056, 87063, 87070, 87077, 87084, 87091, 87099, 87107, 
-    87114, 87121, 87126, 87134, 87142, 87149, 87156, 87161, 87168, 87173, 
-    87178, 87185, 87190, 87195, 87200, 87208, 87213, 87218, 87225, 87230, 
-    87235, 87242, 87249, 87254, 87259, 87264, 87269, 87274, 87279, 87284, 
-    87289, 87294, 87301, 87306, 87313, 87318, 87323, 87328, 87333, 87338, 
-    87343, 87348, 87353, 87358, 87363, 87368, 87375, 87382, 87389, 87396, 
-    87402, 87407, 87414, 87419, 87424, 87433, 87440, 87449, 87456, 87461, 
-    87466, 87474, 87479, 87484, 87489, 87494, 87499, 87506, 87511, 87516, 
-    87521, 87526, 87531, 87538, 87545, 87552, 87559, 87566, 87573, 87580, 
-    87587, 87594, 87601, 87608, 87615, 87622, 87629, 87636, 87643, 87650, 
-    87657, 87664, 87671, 87678, 87685, 87692, 87699, 87706, 87713, 87720, 
-    87727, 0, 0, 0, 0, 0, 87734, 87742, 87750, 0, 0, 0, 0, 87755, 87759, 
-    87763, 87767, 87771, 87775, 87779, 87783, 87787, 87791, 87796, 87801, 
-    87806, 87811, 87816, 87821, 87826, 87831, 87836, 87842, 87848, 87854, 
-    87861, 87868, 87875, 87882, 87889, 87896, 87902, 87908, 87914, 87921, 
-    87928, 87935, 87942, 87949, 87956, 87963, 87970, 87977, 87984, 87991, 
-    87998, 88005, 88012, 0, 0, 0, 88019, 88027, 88035, 88043, 88051, 88059, 
-    88069, 88079, 88087, 88095, 88103, 88111, 88119, 88125, 88132, 88141, 
-    88150, 88159, 88168, 88177, 88186, 88196, 88207, 88217, 88228, 88237, 
-    88246, 88255, 88265, 88276, 88286, 88297, 88308, 88317, 88325, 88331, 
-    88337, 88343, 88349, 88357, 88365, 88371, 88378, 88388, 88395, 88402, 
-    88409, 88416, 88423, 88433, 88440, 88447, 88455, 88463, 88472, 88481, 
-    88490, 88499, 88508, 88516, 88525, 88534, 88543, 88547, 88554, 88559, 
-    88564, 88568, 88572, 88576, 88580, 88585, 88590, 88596, 88602, 88606, 
-    88612, 88616, 88620, 88624, 88628, 88632, 88636, 88642, 0, 0, 0, 0, 0, 
-    88646, 88651, 88656, 88661, 88666, 88673, 88678, 88683, 88688, 88693, 
-    88698, 88703, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 88708, 88715, 88724, 88733, 88740, 88747, 88754, 
-    88761, 88768, 88775, 88781, 88788, 88795, 88802, 88809, 88816, 88823, 
-    88830, 88837, 88846, 88853, 88860, 88867, 88874, 88881, 88888, 88895, 
-    88902, 88911, 88918, 88925, 88932, 88939, 88946, 88953, 88962, 88969, 
-    88976, 88983, 88990, 88999, 89006, 89013, 89020, 89028, 89037, 0, 0, 
-    89046, 89050, 89054, 89059, 89064, 89069, 89074, 89078, 89083, 89088, 
-    89093, 89098, 89103, 89108, 89112, 89116, 89121, 89126, 89131, 89135, 
-    89140, 89145, 89149, 89154, 89159, 89164, 89169, 89174, 89179, 0, 0, 0, 
-    89184, 89188, 89193, 89198, 89202, 89207, 89211, 89216, 89221, 89226, 
-    89231, 89235, 89239, 89244, 89249, 89254, 89259, 89264, 89269, 89273, 
-    89278, 89283, 89288, 89293, 89298, 89303, 89307, 89311, 89316, 89321, 
-    89326, 89331, 89336, 89341, 89346, 89351, 89356, 89361, 89366, 89371, 
-    89376, 89381, 89386, 89391, 89396, 89401, 89406, 89411, 89416, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89421, 89425, 
-    89430, 89435, 89440, 89444, 89449, 89454, 89459, 89464, 89468, 89472, 
-    89477, 89482, 89487, 89492, 89496, 89501, 89506, 89511, 89516, 89521, 
-    89526, 89530, 89535, 89540, 89545, 89550, 89555, 89560, 89565, 0, 89570, 
-    89575, 89580, 89586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89592, 89597, 
-    89602, 89607, 89612, 89617, 89622, 89627, 89632, 89637, 89642, 89647, 
-    89652, 89657, 89662, 89667, 89672, 89677, 89682, 89687, 89692, 89697, 
-    89702, 89707, 89712, 89717, 89722, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89729, 89734, 89739, 
-    89744, 89749, 89754, 89759, 89764, 89769, 89774, 89779, 89784, 89789, 
-    89794, 89799, 89804, 89809, 89814, 89819, 89824, 89829, 89834, 89839, 
-    89844, 89849, 89854, 89859, 89863, 89867, 89871, 0, 89876, 89882, 89887, 
-    89892, 89897, 89902, 89908, 89914, 89920, 89926, 89932, 89938, 89944, 
-    89950, 89956, 89962, 89968, 89974, 89980, 89985, 89991, 89997, 90002, 
-    90008, 90013, 90019, 90025, 90030, 90036, 90042, 90047, 90053, 90059, 
-    90064, 90070, 90076, 90082, 0, 0, 0, 0, 90087, 90093, 90099, 90105, 
-    90111, 90117, 90123, 90129, 90135, 90142, 90147, 90152, 90158, 90164, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90170, 90175, 90180, 
-    90185, 90191, 90196, 90202, 90208, 90214, 90220, 90227, 90233, 90240, 
-    90245, 90250, 90255, 90260, 90265, 90270, 90275, 90280, 90285, 90290, 
-    90295, 90300, 90305, 90310, 90315, 90320, 90325, 90330, 90335, 90340, 
-    90345, 90350, 90355, 90360, 90365, 90370, 90375, 90380, 90385, 90390, 
-    90395, 90401, 90406, 90412, 90418, 90424, 90430, 90437, 90443, 90450, 
-    90455, 90460, 90465, 90470, 90475, 90480, 90485, 90490, 90495, 90500, 
-    90505, 90510, 90515, 90520, 90525, 90530, 90535, 90540, 90545, 90550, 
-    90555, 90560, 90565, 90570, 90575, 90580, 90585, 90590, 90595, 90600, 
-    90605, 90610, 90615, 90620, 90625, 90630, 90635, 90640, 90645, 90650, 
-    90655, 90660, 90665, 90670, 90675, 90680, 90685, 90690, 90695, 90700, 
-    90705, 90710, 90715, 90720, 90725, 90730, 90735, 90740, 90745, 90750, 
-    90755, 90760, 90765, 90770, 90775, 90780, 90785, 90790, 90795, 90800, 
-    90805, 90810, 90815, 90820, 90825, 90830, 90835, 90840, 90845, 90850, 
-    90855, 90860, 90865, 90869, 90873, 90878, 90883, 90888, 90893, 90898, 
-    90903, 90908, 90913, 90918, 90923, 90928, 90932, 90936, 90940, 90944, 
-    90948, 90952, 90956, 90961, 90966, 0, 0, 90971, 90976, 90980, 90984, 
-    90988, 90992, 90996, 91000, 91004, 91008, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 91012, 91016, 91020, 91024, 91028, 91032, 0, 0, 91037, 0, 
-    91042, 91046, 91051, 91056, 91061, 91066, 91071, 91076, 91081, 91086, 
-    91091, 91095, 91100, 91105, 91110, 91115, 91119, 91124, 91129, 91134, 
-    91139, 91143, 91148, 91153, 91158, 91163, 91167, 91172, 91177, 91182, 
-    91187, 91191, 91196, 91201, 91206, 91211, 91216, 91221, 91226, 91230, 
-    91235, 91240, 91245, 91250, 0, 91255, 91260, 0, 0, 0, 91265, 0, 0, 91270, 
-    91275, 91282, 91289, 91296, 91303, 91310, 91317, 91324, 91331, 91338, 
-    91345, 91352, 91359, 91366, 91373, 91380, 91387, 91394, 91401, 91408, 
-    91415, 91422, 0, 91429, 91436, 91442, 91448, 91454, 91461, 91468, 91476, 
-    91484, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91493, 91498, 91503, 91508, 91513, 91518, 
-    91523, 91528, 91533, 91538, 91543, 91548, 91553, 91558, 91563, 91568, 
-    91573, 91578, 91583, 91588, 91593, 91598, 91603, 91607, 91612, 91617, 
-    91623, 91627, 0, 0, 0, 91631, 91637, 91641, 91646, 91651, 91656, 91660, 
-    91665, 91669, 91674, 91679, 91683, 91687, 91692, 91696, 91700, 91705, 
-    91710, 91714, 91719, 91724, 91729, 91734, 91739, 91744, 91749, 91754, 0, 
-    0, 0, 0, 0, 91759, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91764, 
-    91770, 91776, 91782, 91788, 91794, 91801, 91808, 91815, 91821, 91827, 
-    91833, 91840, 91847, 91854, 91860, 91867, 91874, 91881, 91888, 91894, 
-    91901, 91908, 91914, 91921, 91928, 91935, 91942, 91949, 91955, 91962, 
-    91969, 91976, 91982, 91988, 91994, 92000, 92006, 92013, 92020, 92026, 
-    92032, 92038, 92045, 92051, 92058, 92065, 92072, 92078, 92086, 92093, 
-    92099, 92106, 92113, 92120, 92126, 0, 0, 0, 0, 0, 0, 92133, 92141, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92149, 92153, 92158, 92163, 0, 
-    92169, 92174, 0, 0, 0, 0, 0, 92179, 92185, 92192, 92197, 92202, 92206, 
-    92211, 92216, 0, 92221, 92226, 92231, 0, 92236, 92241, 92246, 92251, 
-    92256, 92261, 92266, 92271, 92276, 92281, 92286, 92290, 92294, 92299, 
-    92304, 92309, 92313, 92317, 92321, 92326, 92331, 92336, 92341, 92345, 
-    92350, 92354, 92359, 0, 0, 0, 0, 92364, 92370, 92375, 0, 0, 0, 0, 92380, 
-    92384, 92388, 92392, 92396, 92400, 92405, 92410, 92416, 0, 0, 0, 0, 0, 0, 
-    0, 0, 92422, 92428, 92435, 92441, 92448, 92454, 92460, 92466, 92473, 0, 
-    0, 0, 0, 0, 0, 0, 92479, 92487, 92495, 92503, 92511, 92519, 92527, 92535, 
-    92543, 92551, 92559, 92567, 92575, 92583, 92591, 92599, 92607, 92615, 
-    92623, 92631, 92639, 92647, 92655, 92663, 92671, 92679, 92687, 92695, 
-    92703, 92711, 92718, 92726, 92734, 92738, 92743, 92748, 92753, 92758, 
-    92763, 92768, 92773, 92777, 92782, 92786, 92791, 92795, 92800, 92804, 
-    92809, 92814, 92819, 92824, 92829, 92834, 92839, 92844, 92849, 92854, 
-    92859, 92864, 92869, 92874, 92879, 92884, 92889, 92894, 92899, 92904, 
-    92909, 92914, 92919, 92924, 92929, 92934, 92939, 92944, 92949, 92954, 
-    92959, 92964, 92969, 92974, 92979, 92984, 92989, 92994, 0, 0, 0, 92999, 
-    93004, 93013, 93021, 93030, 93039, 93050, 93061, 93068, 93075, 93082, 
-    93089, 93096, 93103, 93110, 93117, 93124, 93131, 93138, 93145, 93152, 
-    93159, 93166, 93173, 93180, 93187, 93194, 93201, 93208, 0, 0, 93215, 
-    93221, 93227, 93233, 93239, 93246, 93253, 93261, 93269, 93276, 93283, 
-    93290, 93297, 93304, 93311, 93318, 93325, 93332, 93339, 93346, 93353, 
-    93360, 93367, 93374, 93381, 93388, 93395, 0, 0, 0, 0, 0, 93402, 93408, 
-    93414, 93420, 93426, 93433, 93440, 93448, 93456, 93462, 93468, 93475, 
-    93481, 93487, 93493, 93499, 93506, 93513, 93520, 93527, 93534, 93541, 
-    93548, 93555, 93562, 93569, 93576, 93583, 93590, 93597, 93604, 93611, 
-    93618, 93625, 93632, 93639, 93646, 93653, 93660, 93667, 93674, 93681, 
-    93688, 93695, 93702, 93709, 93716, 93723, 93730, 93737, 93744, 93751, 
-    93758, 93765, 93772, 93779, 93786, 93793, 93800, 93807, 93814, 93821, 
-    93828, 93835, 93842, 93849, 93856, 93863, 93870, 93877, 93884, 93891, 
-    93898, 93905, 93912, 93919, 93926, 93933, 93940, 93947, 93954, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 93961, 93965, 93969, 93973, 93977, 93981, 93985, 93989, 
-    93993, 93997, 94002, 94007, 94012, 94017, 94022, 94027, 94032, 94037, 
-    94042, 94048, 94054, 94060, 94067, 94074, 94081, 94088, 94095, 94102, 
-    94109, 94116, 94123, 0, 94130, 94134, 94138, 94142, 94146, 94150, 94153, 
-    94157, 94160, 94164, 94167, 94171, 94175, 94180, 94184, 94189, 94192, 
-    94196, 94199, 94203, 94206, 94210, 94214, 94218, 94222, 94226, 94230, 
-    94234, 94238, 94242, 94246, 94250, 94254, 94258, 94262, 94266, 94270, 
-    94274, 94278, 94281, 94284, 94288, 94292, 94296, 94299, 94302, 94305, 
-    94309, 94313, 94317, 94321, 94324, 94327, 94331, 94337, 94343, 94349, 
-    94354, 94361, 94365, 94370, 94374, 94379, 94384, 94390, 94395, 94401, 
-    94405, 94410, 94414, 94419, 94422, 94425, 94429, 94434, 94440, 94445, 
-    94451, 0, 0, 0, 0, 94456, 94459, 94462, 94465, 94468, 94471, 94474, 
-    94477, 94480, 94483, 94487, 94491, 94495, 94499, 94503, 94507, 94511, 
-    94515, 94519, 94524, 94529, 94533, 94536, 94539, 94542, 94545, 94548, 
-    94551, 94554, 94557, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    94560, 94565, 94570, 94575, 94579, 94584, 94588, 94593, 94597, 94602, 
-    94606, 94611, 94615, 94620, 94624, 94629, 94634, 94639, 94644, 94649, 
-    94654, 94659, 94664, 94669, 94674, 94679, 94684, 94689, 94694, 94699, 
-    94704, 94709, 94714, 94719, 94724, 94728, 94732, 94737, 94742, 94747, 
-    94751, 94755, 94759, 94764, 94769, 94774, 94779, 94783, 94787, 94793, 
-    94798, 94804, 94809, 94815, 94820, 94826, 94831, 94837, 94842, 94847, 
-    94852, 94857, 94861, 94866, 94872, 94876, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 94881, 94888, 94895, 94902, 94909, 94916, 94923, 94930, 
-    94937, 94944, 94951, 94958, 94965, 94972, 94979, 94986, 94993, 95000, 
-    95007, 95014, 95021, 95028, 95035, 95042, 95049, 0, 0, 0, 0, 0, 0, 0, 
-    95056, 95063, 95069, 95075, 95081, 95087, 95093, 95099, 95105, 95111, 0, 
-    0, 0, 0, 0, 0, 95117, 95122, 95127, 95132, 95137, 95141, 95145, 95149, 
-    95154, 95159, 95164, 95169, 95174, 95179, 95184, 95189, 95194, 95199, 
-    95204, 95209, 95214, 95219, 95224, 95229, 95234, 95239, 95244, 95249, 
-    95254, 95259, 95264, 95269, 95274, 95279, 95284, 95289, 95294, 95299, 
-    95304, 95309, 95314, 95319, 95325, 95330, 95336, 95341, 95347, 95352, 
-    95358, 95364, 95368, 95373, 95377, 0, 95381, 95386, 95390, 95394, 95398, 
-    95402, 95406, 95410, 95414, 95418, 95422, 95427, 95431, 95436, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 95441, 95445, 95449, 95453, 95456, 95460, 
-    95463, 95467, 95470, 95474, 95478, 95483, 95487, 95492, 95495, 95499, 
-    95502, 95506, 95509, 95513, 95517, 95521, 95525, 95529, 95533, 95537, 
-    95541, 95545, 95549, 95553, 95557, 95561, 95565, 95569, 95573, 95577, 
-    95581, 95584, 95587, 95591, 95595, 95599, 95602, 95605, 95608, 95612, 
-    95616, 95620, 95624, 95628, 95631, 95634, 95639, 95643, 95648, 95652, 
-    95657, 95662, 95668, 95673, 95679, 95683, 95688, 95692, 95697, 95701, 
-    95705, 95709, 95713, 95716, 95719, 95723, 95727, 0, 0, 0, 0, 0, 0, 0, 
-    95730, 95734, 95737, 95740, 95743, 95746, 95749, 95752, 95755, 95758, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95761, 95765, 95770, 95774, 95779, 
-    95783, 95788, 95792, 95797, 95801, 95806, 95810, 95815, 95820, 95825, 
-    95830, 95835, 95840, 95845, 95850, 95855, 95860, 95865, 95870, 95875, 
-    95880, 95885, 95890, 95895, 95900, 95904, 95908, 95913, 95918, 95923, 
-    95927, 95931, 95935, 95940, 95945, 95950, 95954, 95958, 95963, 95968, 
-    95973, 95979, 95984, 95990, 95995, 96001, 96006, 96012, 96017, 96023, 
-    96028, 0, 0, 0, 0, 0, 0, 0, 0, 96033, 96038, 96042, 96046, 96050, 96054, 
-    96058, 96062, 96066, 96070, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96074, 96077, 96082, 96088, 
-    96096, 96101, 96107, 96115, 96121, 96127, 96131, 96135, 96142, 96151, 
-    96158, 96167, 96173, 96182, 96189, 96196, 96203, 96213, 96219, 96223, 
-    96230, 96239, 96249, 96256, 96263, 96267, 96271, 96278, 96288, 96292, 
-    96299, 96306, 96313, 96319, 96326, 96333, 96340, 96347, 96351, 96355, 
-    96359, 96366, 96370, 96377, 96384, 96398, 96407, 96411, 96415, 96419, 
-    96426, 96430, 96434, 96438, 96446, 96454, 96473, 96483, 96503, 96507, 
-    96511, 96515, 96519, 96523, 96527, 96531, 96538, 96542, 96545, 96549, 
-    96553, 96559, 96566, 96575, 96579, 96588, 96597, 96605, 96609, 96616, 
-    96620, 96624, 96628, 96632, 96643, 96652, 96661, 96670, 96679, 96691, 
-    96700, 96709, 96718, 96726, 96735, 96747, 96756, 96765, 96774, 96786, 
-    96795, 96804, 96816, 96825, 96834, 96846, 96855, 96859, 96863, 96867, 
-    96871, 96875, 96879, 96883, 96890, 96894, 96898, 96909, 96913, 96917, 
-    96924, 96930, 96936, 96940, 96947, 96951, 96955, 96959, 96963, 96967, 
-    96971, 96977, 96985, 96989, 96993, 96996, 97002, 97012, 97016, 97028, 
-    97035, 97042, 97049, 97056, 97062, 97066, 97070, 97074, 97078, 97085, 
-    97094, 97101, 97109, 97117, 97123, 97127, 97131, 97135, 97139, 97145, 
-    97154, 97166, 97173, 97180, 97189, 97200, 97206, 97215, 97224, 97231, 
-    97240, 97247, 97254, 97264, 97271, 97278, 97285, 97292, 97296, 97302, 
-    97306, 97317, 97325, 97334, 97346, 97353, 97360, 97370, 97377, 97386, 
-    97393, 97402, 97409, 97416, 97426, 97433, 97440, 97450, 97457, 97469, 
-    97478, 97485, 97492, 97499, 97508, 97518, 97531, 97538, 97548, 97558, 
-    97565, 97574, 97587, 97594, 97601, 97608, 97618, 97628, 97635, 97645, 
-    97652, 97659, 97669, 97675, 97682, 97689, 97696, 97706, 97713, 97720, 
-    97727, 97733, 97740, 97750, 97757, 97761, 97769, 97773, 97785, 97789, 
-    97803, 97807, 97811, 97815, 97819, 97825, 97832, 97840, 97844, 97848, 
-    97852, 97856, 97863, 97867, 97873, 97879, 97887, 97891, 97898, 97906, 
-    97910, 97914, 97920, 97924, 97933, 97942, 97949, 97959, 97965, 97969, 
-    97973, 97981, 97988, 97995, 98001, 98005, 98013, 98017, 98024, 98036, 
-    98043, 98053, 98059, 98063, 98072, 98079, 98088, 98092, 98096, 98103, 
-    98107, 98111, 98115, 98119, 98122, 98128, 98134, 98138, 98142, 98149, 
-    98156, 98163, 98170, 98177, 98184, 98191, 98198, 98204, 98208, 98212, 
-    98219, 98226, 98233, 98240, 98247, 98251, 98254, 98259, 98263, 98267, 
-    98276, 98285, 98289, 98293, 98299, 98305, 98322, 98328, 98332, 98341, 
-    98345, 98349, 98356, 98364, 98372, 98378, 98382, 98386, 98390, 98394, 
-    98397, 98403, 98410, 98420, 98427, 98434, 98441, 98447, 98454, 98461, 
-    98468, 98475, 98482, 98491, 98498, 98510, 98517, 98524, 98534, 98545, 
-    98552, 98559, 98566, 98573, 98580, 98587, 98594, 98601, 98608, 98615, 
-    98625, 98635, 98645, 98652, 98662, 98669, 98676, 98683, 98690, 98696, 
-    98703, 98710, 98717, 98724, 98731, 98738, 98745, 98752, 98758, 98765, 
-    98772, 98781, 98788, 98795, 98799, 98807, 98811, 98815, 98819, 98823, 
-    98827, 98834, 98838, 98847, 98851, 98858, 98866, 98870, 98874, 98878, 
-    98891, 98907, 98911, 98915, 98922, 98928, 98935, 98939, 98943, 98947, 
-    98951, 98955, 98962, 98966, 98984, 98988, 98992, 98999, 99003, 99007, 
-    99013, 99017, 99021, 99029, 99033, 99037, 99041, 99045, 99051, 99062, 
-    99071, 99080, 99087, 99094, 99105, 99112, 99119, 99126, 99133, 99140, 
-    99147, 99154, 99164, 99170, 99177, 99187, 99196, 99203, 99212, 99222, 
-    99229, 99236, 99243, 99250, 99262, 99269, 99276, 99283, 99290, 99297, 
-    99307, 99314, 99321, 99331, 99344, 99356, 99363, 99373, 99380, 99387, 
-    99394, 99408, 99414, 99422, 99432, 99442, 99449, 99456, 99462, 99466, 
-    99473, 99483, 99489, 99502, 99506, 99510, 99517, 99521, 99528, 99538, 
-    99542, 99546, 99550, 99554, 99558, 99565, 99569, 99576, 99583, 99590, 
-    99599, 99608, 99618, 99625, 99632, 99639, 99649, 99656, 99666, 99673, 
-    99683, 99690, 99697, 99707, 99717, 99724, 99730, 99738, 99746, 99752, 
-    99758, 99762, 99766, 99773, 99781, 99787, 99791, 99795, 99799, 99806, 
-    99818, 99821, 99828, 99834, 99838, 99842, 99846, 99850, 99854, 99858, 
-    99862, 99866, 99870, 99874, 99881, 99885, 99891, 99895, 99899, 99903, 
-    99909, 99916, 99923, 99930, 99941, 99949, 99953, 99959, 99968, 99975, 
-    99981, 99984, 99988, 99992, 99998, 100007, 100015, 100019, 100025, 
-    100029, 100033, 100037, 100043, 100050, 100056, 100060, 100066, 100070, 
-    100074, 100083, 100095, 100099, 100106, 100113, 100123, 100130, 100142, 
-    100149, 100156, 100163, 100174, 100184, 100197, 100207, 100214, 100218, 
-    100222, 100226, 100230, 100239, 100248, 100257, 100274, 100283, 100289, 
-    100296, 100304, 100317, 100321, 100330, 100339, 100348, 100357, 100368, 
-    100377, 100386, 100395, 100404, 100413, 100422, 100432, 100435, 100439, 
-    100443, 100447, 100451, 100455, 100461, 100468, 100475, 100482, 100488, 
-    100494, 100501, 100507, 100514, 100522, 100526, 100533, 100540, 100547, 
-    100555, 100558, 100562, 100566, 100570, 100573, 100579, 100583, 100589, 
-    100596, 100603, 100609, 100616, 100623, 100630, 100637, 100644, 100651, 
-    100658, 100665, 100672, 100679, 100686, 100693, 100700, 100707, 100713, 
-    100717, 100726, 100730, 100734, 100738, 100742, 100748, 100755, 100762, 
-    100769, 100776, 100783, 100789, 100797, 100801, 100805, 100809, 100813, 
-    100819, 100836, 100853, 100857, 100861, 100865, 100869, 100873, 100877, 
-    100883, 100890, 100894, 100900, 100907, 100914, 100921, 100928, 100935, 
-    100944, 100951, 100958, 100965, 100972, 100976, 100980, 100986, 100998, 
-    101002, 101006, 101015, 101019, 101023, 101027, 101033, 101037, 101041, 
-    101050, 101054, 101058, 101062, 101069, 101073, 101077, 101081, 101085, 
-    101089, 101093, 101097, 101101, 101107, 101114, 101121, 101127, 101131, 
-    101148, 101154, 101158, 101164, 101170, 101176, 101182, 101188, 101194, 
-    101198, 101202, 101206, 101212, 101216, 101222, 101226, 101230, 101237, 
-    101244, 101261, 101265, 101269, 101273, 101277, 101281, 101293, 101296, 
-    101301, 101306, 101321, 101331, 101343, 101347, 101351, 101355, 101361, 
-    101368, 101375, 101385, 101397, 101403, 101409, 101418, 101422, 101426, 
-    101433, 101443, 101450, 101456, 101460, 101464, 101471, 101477, 101481, 
-    101487, 101491, 101499, 101505, 101509, 101517, 101525, 101532, 101538, 
-    101545, 101552, 101562, 101572, 101576, 101580, 101584, 101588, 101594, 
-    101601, 101607, 101614, 101621, 101628, 101637, 101644, 101651, 101657, 
-    101664, 101671, 101678, 101685, 101692, 101699, 101705, 101712, 101719, 
-    101726, 101735, 101742, 101749, 101753, 101759, 101763, 101769, 101776, 
-    101783, 101790, 101794, 101798, 101802, 101806, 101810, 101817, 101821, 
-    101825, 101831, 101839, 101843, 101847, 101851, 101855, 101862, 101866, 
-    101870, 101878, 101882, 101886, 101890, 101894, 101900, 101904, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101908, 101914, 101920, 101927, 
-    101934, 101941, 101948, 101955, 101962, 101968, 101975, 101982, 101989, 
-    101996, 102003, 102010, 102016, 102022, 102028, 102034, 102040, 102046, 
-    102052, 102058, 102064, 102071, 102078, 102085, 102092, 102099, 102106, 
-    102112, 102118, 102124, 102131, 102138, 102144, 102150, 102159, 102166, 
-    102173, 102180, 102187, 102194, 102201, 102207, 102213, 102219, 102228, 
-    102235, 102242, 102253, 102264, 102270, 102276, 102282, 102291, 102298, 
-    102305, 102315, 102325, 102336, 102347, 102359, 102372, 102383, 102394, 
-    102406, 102419, 102430, 102441, 102452, 102463, 102474, 102486, 102494, 
-    102502, 102511, 102520, 102529, 102535, 102541, 102547, 102554, 102564, 
-    102571, 102581, 102586, 102591, 102597, 102603, 102611, 102619, 102628, 
-    102639, 102650, 102658, 102666, 102675, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 102684, 102695, 102702, 102710, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    102718, 102722, 102726, 102730, 102734, 102738, 102742, 102746, 102750, 
-    102754, 102758, 102762, 102766, 102770, 102774, 102778, 102782, 102786, 
-    102790, 102794, 102798, 102802, 102806, 102810, 102814, 102818, 102822, 
-    102826, 102830, 102834, 102838, 102842, 102846, 102850, 102854, 102858, 
-    102862, 102866, 102870, 102874, 102878, 102882, 102886, 102890, 102894, 
-    102898, 102902, 102906, 102910, 102914, 102918, 102922, 102926, 102930, 
-    102934, 102938, 102942, 102946, 102950, 102954, 102958, 102962, 102966, 
-    102970, 102974, 102978, 102982, 102986, 102990, 102994, 102998, 103002, 
-    103006, 103010, 103014, 103018, 103022, 103026, 103030, 103034, 103038, 
-    103042, 103046, 103050, 103054, 103058, 103062, 103066, 103070, 103074, 
-    103078, 103082, 103086, 103090, 103094, 103098, 103102, 103106, 103110, 
-    103114, 103118, 103122, 103126, 103130, 103134, 103138, 103142, 103146, 
-    103150, 103154, 103158, 103162, 103166, 103170, 103174, 103178, 103182, 
-    103186, 103190, 103194, 103198, 103202, 103206, 103210, 103214, 103218, 
-    103222, 103226, 103230, 103234, 103238, 103242, 103246, 103250, 103254, 
-    103258, 103262, 103266, 103270, 103274, 103278, 103282, 103286, 103290, 
-    103294, 103298, 103302, 103306, 103310, 103314, 103318, 103322, 103326, 
-    103330, 103334, 103338, 103342, 103346, 103350, 103354, 103358, 103362, 
-    103366, 103370, 103374, 103378, 103382, 103386, 103390, 103394, 103398, 
-    103402, 103406, 103410, 103414, 103418, 103422, 103426, 103430, 103434, 
-    103438, 103442, 103446, 103450, 103454, 103458, 103462, 103466, 103470, 
-    103474, 103478, 103482, 103486, 103490, 103494, 103498, 103502, 103506, 
-    103510, 103514, 103518, 103522, 103526, 103530, 103534, 103538, 103542, 
-    103546, 103550, 103554, 103558, 103562, 103566, 103570, 103574, 103578, 
-    103582, 103586, 103590, 103594, 103598, 103602, 103606, 103610, 103614, 
-    103618, 103622, 103626, 103630, 103634, 103638, 103642, 103646, 103650, 
-    103654, 103658, 103662, 103666, 103670, 103674, 103678, 103682, 103686, 
-    103690, 103694, 103698, 103702, 103706, 103710, 103714, 103718, 103722, 
-    103726, 103730, 103734, 103738, 103742, 103746, 103750, 103754, 103758, 
-    103762, 103766, 103770, 103774, 103778, 103782, 103786, 103790, 103794, 
-    103798, 103802, 103806, 103810, 103814, 103818, 103822, 103826, 103830, 
-    103834, 103838, 103842, 103846, 103850, 103854, 103858, 103862, 103866, 
-    103870, 103874, 103878, 103882, 103886, 103890, 103894, 103898, 103902, 
-    103906, 103910, 103914, 103918, 103922, 103926, 103930, 103934, 103938, 
-    103942, 103946, 103950, 103954, 103958, 103962, 103966, 103970, 103974, 
-    103978, 103982, 103986, 103990, 103994, 103998, 104002, 104006, 104010, 
-    104014, 104018, 104022, 104026, 104030, 104034, 104038, 104042, 104046, 
-    104050, 104054, 104058, 104062, 104066, 104070, 104074, 104078, 104082, 
-    104086, 104090, 104094, 104098, 104102, 104106, 104110, 104114, 104118, 
-    104122, 104126, 104130, 104134, 104138, 104142, 104146, 104150, 104154, 
-    104158, 104162, 104166, 104170, 104174, 104178, 104182, 104186, 104190, 
-    104194, 104198, 104202, 104206, 104210, 104214, 104218, 104222, 104226, 
-    104230, 104234, 104238, 104242, 104246, 104250, 104254, 104258, 104262, 
-    104266, 104270, 104274, 104278, 104282, 104286, 104290, 104294, 104298, 
-    104302, 104306, 104310, 104314, 104318, 104322, 104326, 104330, 104334, 
-    104338, 104342, 104346, 104350, 104354, 104358, 104362, 104366, 104370, 
-    104374, 104378, 104382, 104386, 104390, 104394, 104398, 104402, 104406, 
-    104410, 104414, 104418, 104422, 104426, 104430, 104434, 104438, 104442, 
-    104446, 104450, 104454, 104458, 104462, 104466, 104470, 104474, 104478, 
-    104482, 104486, 104490, 104494, 104498, 104502, 104506, 104510, 104514, 
-    104518, 104522, 104526, 104530, 104534, 104538, 104542, 104546, 104550, 
-    104554, 104558, 104562, 104566, 104570, 104574, 104578, 104582, 104586, 
-    104590, 104594, 104598, 104602, 104606, 104610, 104614, 104618, 104622, 
-    104626, 104630, 104634, 104638, 104642, 104646, 104650, 104654, 104658, 
-    104662, 104666, 104670, 104674, 104678, 104682, 104686, 104690, 104694, 
-    104698, 104702, 104706, 104710, 104714, 104718, 104722, 104726, 104730, 
-    104734, 104738, 104742, 104746, 104750, 104754, 104758, 104762, 104766, 
-    104770, 104774, 104778, 104782, 104786, 104790, 104794, 104798, 104802, 
-    104806, 104810, 104814, 104818, 104822, 104826, 104830, 104834, 104838, 
-    104842, 104846, 104850, 104854, 104858, 104862, 104866, 104870, 104874, 
-    104878, 104882, 104886, 104890, 104894, 104898, 104902, 104906, 104910, 
-    104914, 104918, 104922, 104926, 104930, 104934, 104938, 104942, 104946, 
-    104950, 104954, 104958, 104962, 104966, 104970, 104974, 104978, 104982, 
-    104986, 104990, 104994, 104998, 105002, 105006, 105010, 105014, 105018, 
-    105022, 105026, 105030, 105034, 105038, 105042, 105046, 105050, 105054, 
-    105058, 105062, 105066, 105070, 105074, 105078, 105082, 105086, 105090, 
-    105094, 105098, 105102, 105106, 105110, 105114, 105118, 105122, 105126, 
-    105130, 105134, 105138, 105142, 105146, 105150, 105154, 105158, 105162, 
-    105166, 105170, 105174, 105178, 105182, 105186, 105190, 105194, 105198, 
-    105202, 105206, 105210, 105214, 105218, 105222, 105226, 105230, 105234, 
-    105238, 105242, 105246, 105250, 105254, 105258, 105262, 105266, 105270, 
-    105274, 105278, 105282, 105286, 105290, 105294, 105298, 105302, 105306, 
-    105310, 105314, 105318, 105322, 105326, 105330, 105334, 105338, 105342, 
-    105346, 105350, 105354, 105358, 105362, 105366, 105370, 105374, 105378, 
-    105382, 105386, 105390, 105394, 105398, 105402, 105406, 105410, 105414, 
-    105418, 105422, 105426, 105430, 105434, 105438, 105442, 105446, 105450, 
-    105454, 105458, 105462, 105466, 105470, 105474, 105478, 105482, 105486, 
-    105490, 105494, 105498, 105502, 105506, 105510, 105514, 105518, 105522, 
-    105526, 105530, 105534, 105538, 105542, 105546, 105550, 105554, 105558, 
-    105562, 105566, 105570, 105574, 105578, 105582, 105586, 105590, 105594, 
-    105598, 105602, 105606, 105610, 105614, 105618, 105622, 105626, 105630, 
-    105634, 105638, 105642, 105646, 105650, 105654, 105658, 105662, 105666, 
-    105670, 105674, 105678, 105682, 105686, 105690, 105694, 105698, 105702, 
-    105706, 105710, 105714, 105718, 105722, 105726, 105730, 105734, 105738, 
-    105742, 105746, 105750, 105754, 105758, 105762, 105766, 105770, 105774, 
-    105778, 105782, 105786, 105790, 105794, 105798, 105802, 105806, 105810, 
-    105814, 105818, 105822, 105826, 105830, 105834, 105838, 105842, 105846, 
-    105850, 105854, 105858, 105862, 105866, 105870, 105874, 105878, 105882, 
-    105886, 105890, 105894, 105898, 105902, 105906, 105910, 105914, 105918, 
-    105922, 105926, 105930, 105934, 105938, 105942, 105946, 105950, 105954, 
-    105958, 105962, 105966, 105970, 105974, 105978, 105982, 105986, 105990, 
-    105994, 105998, 106002, 106006, 106010, 106014, 106018, 106022, 106026, 
-    106030, 106034, 106038, 106042, 106046, 106050, 106054, 106058, 106062, 
-    106066, 106070, 106074, 106078, 106082, 106086, 106090, 106094, 106098, 
-    106102, 106106, 106110, 106114, 106118, 106122, 106126, 106130, 106134, 
-    106138, 106142, 106146, 106150, 106154, 106158, 106162, 106166, 106170, 
-    106174, 106178, 106182, 106186, 106190, 106194, 106198, 106202, 106206, 
-    106210, 106214, 106218, 106222, 106226, 106230, 106234, 106238, 106242, 
-    106246, 106250, 106254, 106258, 106262, 106266, 106270, 106274, 106278, 
-    106282, 106286, 106290, 106294, 106298, 106302, 106306, 106310, 106314, 
-    106318, 106322, 106326, 106330, 106334, 106338, 106342, 106346, 106350, 
-    106354, 106358, 106362, 106366, 106370, 106374, 106378, 106382, 106386, 
-    106390, 106394, 106398, 106402, 106406, 106410, 106414, 106418, 106422, 
-    106426, 106430, 106434, 106438, 106442, 106446, 106450, 106454, 106458, 
-    106462, 106466, 106470, 106474, 106478, 106482, 106486, 106490, 106494, 
-    106498, 106502, 106506, 106510, 106514, 106518, 106522, 106526, 106530, 
-    106534, 106538, 106542, 106546, 106550, 106554, 106558, 106562, 106566, 
-    106570, 106574, 106578, 106582, 106586, 106590, 106594, 106598, 106602, 
-    106606, 106610, 106614, 106618, 106622, 106626, 106630, 106634, 106638, 
-    106642, 106646, 106650, 106654, 106658, 106662, 106666, 106670, 106674, 
-    106678, 106682, 106686, 106690, 106694, 106698, 106702, 106706, 106710, 
-    106714, 106718, 106722, 106726, 106730, 106734, 106738, 106742, 106746, 
-    106750, 106754, 106758, 106762, 106766, 106770, 106774, 106778, 106782, 
-    106786, 106790, 106794, 106798, 106802, 106806, 106810, 106814, 106818, 
-    106822, 106826, 106830, 106834, 106838, 106842, 106846, 106850, 106854, 
-    106858, 106862, 106866, 106870, 106874, 106878, 106882, 106886, 106890, 
-    106894, 106898, 106902, 106906, 106910, 106914, 106918, 106922, 106926, 
-    106930, 106934, 106938, 106942, 106946, 106950, 106954, 106958, 106962, 
-    106966, 106970, 106974, 106978, 106982, 106986, 106990, 106994, 106998, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 107002, 107009, 107016, 107025, 107034, 
-    107041, 107046, 107053, 107060, 107069, 107080, 107091, 107096, 107103, 
-    107108, 107113, 107118, 107123, 107128, 107133, 107138, 107143, 107148, 
-    107153, 107158, 107165, 107172, 107177, 107182, 107187, 107192, 107199, 
-    107206, 107214, 107219, 107226, 107231, 107236, 107241, 107246, 107251, 
-    107258, 107265, 107270, 107275, 107280, 107285, 107290, 107295, 107300, 
-    107305, 107310, 107315, 107320, 107325, 107330, 107335, 107340, 107345, 
-    107350, 107355, 107360, 107367, 107372, 107377, 107386, 107393, 107398, 
-    107403, 107408, 107413, 107418, 107423, 107428, 107433, 107438, 107443, 
-    107448, 107453, 107458, 107463, 107468, 107473, 107478, 107483, 107488, 
-    107493, 107498, 107504, 107512, 107518, 107526, 107534, 107542, 107548, 
-    107554, 107560, 107566, 107572, 107580, 107590, 107598, 107606, 107612, 
-    107618, 107626, 107634, 107640, 107648, 107656, 107664, 107670, 107676, 
-    107682, 107688, 107694, 107700, 107708, 107716, 107722, 107728, 107734, 
-    107740, 107746, 107754, 107760, 107766, 107772, 107778, 107784, 107790, 
-    107798, 107804, 107810, 107816, 107822, 107830, 107838, 107844, 107850, 
-    107856, 107861, 107867, 107873, 107880, 107885, 107890, 107895, 107900, 
-    107905, 107910, 107915, 107920, 107925, 107934, 107941, 107946, 107951, 
-    107956, 107963, 107968, 107973, 107978, 107985, 107990, 107995, 108000, 
-    108005, 108010, 108015, 108020, 108025, 108030, 108035, 108040, 108047, 
-    108052, 108059, 108064, 108069, 108076, 108081, 108086, 108091, 108096, 
-    108101, 108106, 108111, 108116, 108121, 108126, 108131, 108136, 108141, 
-    108146, 108151, 108156, 108161, 108166, 108171, 108178, 108183, 108188, 
-    108193, 108198, 108203, 108208, 108213, 108218, 108223, 108228, 108233, 
-    108238, 108243, 108250, 108255, 108260, 108267, 108272, 108277, 108282, 
-    108287, 108292, 108297, 108302, 108307, 108312, 108317, 108324, 108329, 
-    108334, 108339, 108344, 108349, 108356, 108363, 108368, 108373, 108378, 
-    108383, 108388, 108393, 108398, 108403, 108408, 108413, 108418, 108423, 
-    108428, 108433, 108438, 108443, 108448, 108453, 108458, 108463, 108468, 
-    108473, 108478, 108483, 108488, 108493, 108498, 108503, 108508, 108513, 
-    108518, 108523, 108528, 108533, 108538, 108543, 108550, 108555, 108560, 
-    108565, 108570, 108575, 108580, 108585, 108590, 108595, 108600, 108605, 
-    108610, 108615, 108620, 108625, 108630, 108635, 108640, 108645, 108650, 
-    108655, 108660, 108665, 108670, 108675, 108680, 108685, 108690, 108695, 
-    108700, 108705, 108710, 108715, 108720, 108725, 108730, 108735, 108740, 
-    108745, 108750, 108755, 108760, 108765, 108770, 108775, 108780, 108785, 
-    108790, 108795, 108800, 108805, 108810, 108815, 108820, 108825, 108830, 
-    108835, 108840, 108847, 108852, 108857, 108862, 108867, 108872, 108877, 
-    108881, 108886, 108891, 108896, 108901, 108906, 108911, 108916, 108921, 
-    108926, 108931, 108936, 108941, 108946, 108951, 108958, 108963, 108968, 
-    108974, 108979, 108984, 108989, 108994, 108999, 109004, 109009, 109014, 
-    109019, 109024, 109029, 109034, 109039, 109044, 109049, 109054, 109059, 
-    109064, 109069, 109074, 109079, 109084, 109089, 109094, 109099, 109104, 
-    109109, 109114, 109119, 109124, 109129, 109134, 109139, 109144, 109149, 
-    109154, 109159, 109164, 109169, 109174, 109179, 109184, 109189, 109196, 
-    109201, 109206, 109213, 109220, 109225, 109230, 109235, 109240, 109245, 
-    109250, 109255, 109260, 109265, 109270, 109275, 109280, 109285, 109290, 
-    109295, 109300, 109305, 109310, 109315, 109320, 109325, 109330, 109335, 
-    109340, 109345, 109352, 109357, 109362, 109367, 109372, 109377, 109382, 
-    109387, 109392, 109397, 109402, 109407, 109412, 109417, 109422, 109427, 
-    109432, 109437, 109442, 109449, 109454, 109459, 109464, 109469, 109474, 
-    109479, 109484, 109490, 109495, 109500, 109505, 109510, 109515, 109520, 
-    109525, 109530, 109537, 109544, 109549, 109554, 109558, 109563, 109567, 
-    109571, 109576, 109583, 109588, 109593, 109602, 109607, 109612, 109617, 
-    109622, 109629, 109636, 109641, 109646, 109651, 109656, 109663, 109668, 
-    109673, 109678, 109683, 109688, 109693, 109698, 109703, 109708, 109713, 
-    109718, 109723, 109730, 109734, 109739, 109744, 109749, 109754, 109758, 
-    109763, 109768, 109773, 109778, 109783, 109788, 109793, 109798, 109803, 
-    109809, 109815, 109821, 109827, 109833, 109839, 109845, 109851, 109857, 
-    109863, 109869, 109875, 109880, 109886, 109892, 109898, 109904, 109910, 
-    109916, 109922, 109928, 109934, 109940, 109946, 109951, 109957, 109963, 
-    109969, 109975, 109981, 109987, 109993, 109999, 110005, 110011, 110017, 
-    110023, 110029, 110035, 110041, 110047, 110053, 110059, 110065, 110071, 
-    110076, 110082, 110088, 110094, 110100, 110106, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110112, 110115, 110119, 
-    110123, 110127, 110130, 110134, 110139, 110143, 110147, 110151, 110155, 
-    110159, 110164, 110169, 110173, 110177, 110180, 110184, 110189, 110194, 
-    110198, 110202, 110206, 110210, 110214, 110218, 110222, 110226, 110230, 
-    110234, 110237, 110241, 110245, 110249, 110253, 110257, 110261, 110267, 
-    110270, 110274, 110278, 110282, 110286, 110290, 110294, 110298, 110302, 
-    110306, 110311, 110316, 110322, 110326, 110330, 110334, 110338, 110342, 
-    110346, 110351, 110354, 110358, 110362, 110366, 110370, 110376, 110380, 
-    110384, 110388, 110392, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110396, 110400, 
-    110404, 110410, 110416, 110420, 110425, 110430, 110435, 110440, 110444, 
-    110449, 110454, 110459, 110463, 110468, 110473, 110478, 110482, 110487, 
-    110492, 110497, 110502, 110507, 110512, 110517, 110522, 110526, 110531, 
-    110536, 110541, 110546, 110551, 110556, 110561, 110566, 110571, 110576, 
-    110581, 110588, 110593, 110600, 110605, 110610, 110615, 110620, 110625, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110630, 110634, 110640, 
-    110643, 110646, 110650, 110654, 110658, 110662, 110666, 110670, 110674, 
-    110680, 110686, 110692, 110698, 110704, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110710, 110715, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    110721, 110726, 110731, 110736, 110743, 110750, 110757, 110764, 110769, 
-    110774, 110779, 110784, 110791, 110796, 110803, 110810, 110815, 110820, 
-    110825, 110832, 110837, 110842, 110849, 110856, 110861, 110866, 110871, 
-    110878, 110885, 110892, 110897, 110902, 110909, 110916, 110923, 110930, 
-    110935, 110940, 110945, 110952, 110957, 110962, 110967, 110974, 110983, 
-    110990, 110995, 111000, 111005, 111010, 111015, 111020, 111029, 111036, 
-    111041, 111048, 111055, 111060, 111065, 111070, 111077, 111082, 111089, 
-    111096, 111101, 111106, 111111, 111118, 111125, 111130, 111135, 111142, 
-    111149, 111156, 111161, 111166, 111171, 111176, 111183, 111192, 111201, 
-    111206, 111213, 111222, 111227, 111232, 111237, 111242, 111249, 111256, 
-    111263, 111270, 111275, 111280, 111285, 111292, 111299, 111306, 111311, 
-    111316, 111323, 111328, 111335, 111340, 111347, 111352, 111359, 111366, 
-    111371, 111376, 111381, 111386, 111391, 111396, 111401, 111406, 111411, 
-    111418, 111425, 111432, 111439, 111446, 111455, 111460, 111465, 111472, 
-    111479, 111484, 111491, 111498, 111505, 111512, 111519, 111526, 111531, 
-    111536, 111541, 111546, 111551, 111560, 111569, 111578, 111587, 111596, 
-    111605, 111614, 111623, 111628, 111639, 111650, 111659, 111664, 111669, 
-    111674, 111679, 111688, 111695, 111702, 111709, 111716, 111723, 111730, 
-    111739, 111748, 111759, 111768, 111779, 111788, 111795, 111804, 111815, 
-    111824, 111833, 111842, 111851, 111858, 111865, 111872, 111881, 111890, 
-    111901, 111910, 111919, 111930, 111935, 111940, 111951, 111959, 111968, 
-    111977, 111986, 111997, 112006, 112015, 112026, 112037, 112048, 112059, 
-    112070, 112081, 112088, 112095, 112102, 112109, 112120, 112129, 112136, 
-    112143, 112150, 112161, 112172, 112183, 112194, 112205, 112216, 112227, 
-    112238, 112245, 112252, 112261, 112270, 112277, 112284, 112291, 112300, 
-    112309, 112318, 112325, 112334, 112343, 112352, 112359, 112366, 112371, 
-    112377, 112384, 112391, 112398, 112405, 112412, 112419, 112428, 112437, 
-    112446, 112455, 112462, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112471, 112477, 
-    112482, 112487, 112494, 112500, 112506, 112512, 112518, 112524, 112530, 
-    112536, 112540, 112544, 112550, 112556, 112562, 112566, 112571, 112576, 
-    112580, 112584, 112587, 112593, 112599, 112605, 112611, 112617, 112623, 
-    112629, 112635, 112641, 112651, 112661, 112667, 112673, 112683, 112693, 
-    112699, 0, 0, 112705, 112713, 112718, 112723, 112729, 112735, 112741, 
-    112747, 112753, 112759, 112766, 112773, 112779, 112785, 112791, 112797, 
-    112803, 112809, 112815, 112821, 112826, 112832, 112838, 112844, 112850, 
-    112856, 112865, 112871, 112876, 112884, 112891, 112898, 112907, 112916, 
-    112925, 112934, 112943, 112952, 112961, 112970, 112980, 112990, 112998, 
-    113006, 113015, 113024, 113030, 113036, 113042, 113048, 113056, 113064, 
-    113068, 113074, 113079, 113085, 113091, 113097, 113103, 113109, 113118, 
-    113123, 113130, 113135, 113140, 113145, 113151, 113157, 113163, 113170, 
-    113175, 113180, 113185, 113190, 113195, 113201, 113207, 113213, 113219, 
-    113225, 113231, 113237, 113243, 113248, 113253, 113258, 113263, 113268, 
-    113273, 113278, 113283, 113289, 113295, 113300, 113305, 113310, 113315, 
-    113320, 113326, 113333, 113337, 113341, 113345, 113349, 113353, 113357, 
-    113361, 113365, 113373, 113383, 113387, 113391, 113397, 113403, 113409, 
-    113415, 113421, 113427, 113433, 113439, 113445, 113451, 113457, 113463, 
-    113469, 113475, 113479, 113483, 113490, 113496, 113502, 113508, 113513, 
-    113520, 113525, 113531, 113537, 113543, 113549, 113554, 113558, 113564, 
-    113568, 113572, 113576, 113582, 113588, 113592, 113598, 113604, 113610, 
-    113616, 113622, 113630, 113638, 113644, 113650, 113656, 113662, 113674, 
-    113686, 113700, 113712, 113724, 113738, 113752, 113766, 113770, 113778, 
-    113786, 113791, 113795, 113799, 113803, 113807, 113811, 113815, 113819, 
-    113825, 113831, 113837, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 113843, 113849, 
-    113855, 113861, 113867, 113873, 113879, 113885, 113891, 113897, 113903, 
-    113909, 113915, 113921, 113927, 113933, 113939, 113945, 113951, 113957, 
-    113963, 113969, 113975, 113981, 113987, 113993, 113999, 114005, 114011, 
-    114017, 114023, 114029, 114035, 114041, 114047, 114053, 114059, 114065, 
-    114071, 114077, 114083, 114089, 114095, 114101, 114107, 114113, 114119, 
-    114125, 114131, 114137, 114143, 114149, 114155, 114161, 114167, 114173, 
-    114179, 114185, 114191, 114197, 114203, 114209, 114215, 114221, 114227, 
-    114233, 114239, 114244, 114249, 114254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    75814, 75819, 75824, 75829, 75834, 75838, 75842, 75847, 75852, 75857, 
+    75862, 75867, 75872, 75877, 75882, 75887, 75891, 75896, 75901, 75906, 
+    75911, 75916, 75921, 75926, 75931, 75936, 75941, 75946, 75953, 75960, 
+    75967, 75974, 75981, 75988, 75995, 76002, 76008, 76014, 76020, 76026, 
+    76032, 76038, 76044, 76050, 76054, 76060, 0, 0, 76066, 76071, 76075, 
+    76079, 76083, 76087, 76091, 76095, 76099, 76103, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 76107, 
+    76111, 76115, 76119, 76123, 76127, 76131, 76135, 76139, 76143, 76147, 
+    76151, 76155, 76159, 76163, 76167, 76171, 76175, 76179, 76183, 76187, 
+    76191, 76195, 0, 0, 0, 0, 76199, 76203, 76207, 76211, 76215, 76219, 
+    76223, 76227, 76231, 76235, 76239, 76243, 76247, 76251, 76255, 76259, 
+    76263, 76267, 76271, 76275, 76279, 76283, 76287, 76291, 76295, 76299, 
+    76303, 76307, 76311, 76315, 76319, 76323, 76327, 76331, 76335, 76339, 
+    76343, 76347, 76351, 76355, 76359, 76363, 76367, 76371, 76375, 76379, 
+    76383, 76387, 76391, 0, 0, 0, 0, 76395, 76399, 76403, 76407, 76411, 
+    76415, 76419, 76423, 76427, 76431, 76435, 76439, 76443, 76447, 76451, 
+    76455, 76459, 76463, 76467, 76471, 76475, 76479, 76483, 76487, 76491, 
+    76495, 76499, 76503, 76507, 76511, 76515, 76519, 76523, 76527, 76531, 
+    76535, 76539, 76543, 76547, 76551, 76555, 76559, 76563, 76567, 76571, 
+    76575, 76579, 76583, 76587, 76591, 76595, 76599, 76603, 76607, 76611, 
+    76615, 76619, 76623, 76627, 76631, 76635, 76639, 76643, 76647, 76651, 
+    76655, 76659, 76663, 76667, 76671, 76675, 76679, 76683, 76687, 76691, 
+    76695, 76699, 76703, 76707, 76711, 76715, 76719, 76723, 76727, 76731, 
+    76735, 76739, 76743, 76747, 76751, 76755, 76759, 76763, 76767, 76771, 
+    76775, 76779, 76783, 76787, 76791, 76795, 76799, 76803, 76807, 76811, 
+    76815, 76819, 76823, 76827, 76831, 76835, 76839, 76843, 76847, 76851, 
+    76855, 76859, 76863, 76867, 76871, 76875, 76879, 76883, 76887, 76891, 
+    76895, 76899, 76903, 76907, 76911, 76915, 76919, 76923, 76927, 76931, 
+    76935, 76939, 76943, 76947, 76951, 76955, 76959, 76963, 76967, 76971, 
+    76975, 76979, 76983, 76987, 76991, 76995, 76999, 77003, 77007, 77011, 
+    77015, 77019, 77023, 77027, 77031, 77035, 77039, 77043, 77047, 77051, 
+    77055, 77059, 77063, 77067, 77071, 77075, 77079, 77083, 77087, 77091, 
+    77095, 77099, 77103, 77107, 77111, 77115, 77119, 77123, 77127, 77131, 
+    77135, 77139, 77143, 77147, 77151, 77155, 77159, 77163, 77167, 77171, 
+    77175, 77179, 77183, 77187, 77191, 77195, 77199, 77203, 77207, 77211, 
+    77215, 77219, 77223, 77227, 77231, 77235, 77239, 77243, 77247, 77251, 
+    77255, 77259, 77263, 77267, 77271, 77275, 77279, 77283, 77287, 77291, 
+    77295, 77299, 77303, 77307, 77311, 77315, 77319, 77323, 77327, 77331, 
+    77335, 77339, 77343, 77347, 77351, 77355, 77359, 77363, 77367, 77371, 
+    77375, 77379, 77383, 77387, 77391, 77395, 77399, 77403, 77407, 77411, 
+    77415, 77419, 77423, 77427, 77431, 77435, 77439, 77443, 77447, 77451, 
+    77455, 77459, 77463, 77467, 77471, 77475, 77479, 77483, 77487, 77491, 
+    77495, 77499, 77503, 77507, 77511, 77515, 77519, 77523, 77527, 77531, 
+    77535, 77539, 77543, 77547, 77551, 77555, 77559, 77563, 77567, 77571, 
+    77575, 77579, 77583, 77587, 77591, 77595, 77599, 77603, 77607, 77611, 
+    77615, 77619, 77623, 77627, 77631, 77635, 77639, 77643, 77647, 77651, 
+    77655, 77659, 77663, 77667, 77671, 77675, 77679, 77683, 77687, 77691, 
+    77695, 77699, 77703, 77707, 77711, 77715, 77719, 77723, 77727, 77731, 
+    77735, 77739, 77743, 77747, 77751, 77755, 77759, 77763, 77767, 77771, 
+    77775, 77779, 77783, 77787, 77791, 77795, 77799, 77803, 77807, 77811, 
+    77815, 77819, 77823, 77827, 77831, 77835, 77839, 77843, 77847, 77851, 
+    77855, 0, 0, 77859, 77863, 77867, 77871, 77875, 77879, 77883, 77887, 
+    77891, 77895, 77899, 77903, 77907, 77911, 77915, 77919, 77923, 77927, 
+    77931, 77935, 77939, 77943, 77947, 77951, 77955, 77959, 77963, 77967, 
+    77971, 77975, 77979, 77983, 77987, 77991, 77995, 77999, 78003, 78007, 
+    78011, 78015, 78019, 78023, 78027, 78031, 78035, 78039, 78043, 78047, 
+    78051, 78055, 78059, 78063, 78067, 78071, 78075, 78079, 78083, 78087, 
+    78091, 78095, 78099, 78103, 78107, 78111, 78115, 78119, 78123, 78127, 
+    78131, 78135, 78139, 78143, 78147, 78151, 78155, 78159, 78163, 78167, 
+    78171, 78175, 78179, 78183, 78187, 78191, 78195, 78199, 78203, 78207, 
+    78211, 78215, 78219, 78223, 78227, 78231, 78235, 78239, 78243, 78247, 
+    78251, 78255, 78259, 78263, 78267, 78271, 78275, 78279, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 78283, 78288, 78293, 78298, 78303, 78308, 78316, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 78321, 78328, 78335, 78342, 78349, 0, 
+    0, 0, 0, 0, 78356, 78363, 78370, 78380, 78386, 78392, 78398, 78404, 
+    78410, 78416, 78423, 78429, 78435, 78441, 78450, 78459, 78471, 78483, 
+    78489, 78495, 78501, 78508, 78515, 78522, 78529, 78536, 0, 78543, 78550, 
+    78557, 78565, 78572, 0, 78579, 0, 78586, 78593, 0, 78600, 78608, 0, 
+    78615, 78622, 78629, 78636, 78643, 78650, 78657, 78664, 78671, 78678, 
+    78683, 78690, 78697, 78703, 78709, 78715, 78721, 78727, 78733, 78739, 
+    78745, 78751, 78757, 78763, 78769, 78775, 78781, 78787, 78793, 78799, 
+    78805, 78811, 78817, 78823, 78829, 78835, 78841, 78847, 78853, 78859, 
+    78865, 78871, 78877, 78883, 78889, 78895, 78901, 78907, 78913, 78919, 
+    78925, 78931, 78937, 78943, 78949, 78955, 78961, 78967, 78973, 78979, 
+    78985, 78991, 78997, 79003, 79009, 79015, 79021, 79027, 79033, 79039, 
+    79045, 79051, 79057, 79063, 79069, 79075, 79081, 79087, 79093, 79099, 
+    79105, 79111, 79117, 79123, 79129, 79135, 79141, 79147, 79153, 79161, 
+    79169, 79175, 79181, 79187, 79193, 79202, 79211, 79219, 79227, 79235, 
+    79243, 79251, 79259, 79267, 79275, 79282, 79289, 79299, 79309, 79313, 
+    79317, 79322, 79327, 79332, 79337, 79346, 79355, 79361, 79367, 79374, 
+    79381, 79388, 79392, 79398, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 79404, 79410, 79416, 79422, 79428, 79433, 79438, 79444, 79450, 
+    79456, 79462, 79470, 79476, 79482, 79490, 79498, 79506, 79514, 79519, 
+    79524, 79529, 79534, 79547, 79560, 79570, 79580, 79591, 79602, 79613, 
+    79624, 79634, 79644, 79655, 79666, 79677, 79688, 79698, 79708, 79718, 
+    79734, 79750, 79766, 79773, 79780, 79787, 79794, 79804, 79814, 79824, 
+    79836, 79846, 79854, 79862, 79871, 79879, 79889, 79897, 79905, 79913, 
+    79922, 79930, 79940, 79948, 79956, 79964, 79974, 79982, 79989, 79996, 
+    80003, 80010, 80018, 80026, 80034, 80042, 80050, 80059, 80067, 80075, 
+    80083, 80091, 80099, 80108, 80116, 80124, 80132, 80140, 80148, 80156, 
+    80164, 80172, 80180, 80188, 80197, 80205, 80215, 80223, 80231, 80239, 
+    80249, 80257, 80265, 80273, 80281, 80290, 80299, 80307, 80317, 80325, 
+    80333, 80341, 80350, 80358, 80368, 80376, 80383, 80390, 80398, 80405, 
+    80414, 80421, 80429, 80437, 80446, 80454, 80464, 80472, 80480, 80488, 
+    80498, 80506, 80513, 80520, 80528, 80535, 80544, 80551, 80561, 80571, 
+    80582, 80591, 80600, 80609, 80618, 80627, 80637, 80648, 80659, 80669, 
+    80680, 80692, 80702, 80711, 80720, 80728, 80737, 80747, 80755, 80764, 
+    80773, 80781, 80790, 80800, 80808, 80817, 80826, 80834, 80843, 80853, 
+    80861, 80871, 80879, 80889, 80897, 80905, 80914, 80922, 80932, 80940, 
+    80948, 80958, 80966, 80973, 80980, 80989, 80998, 81006, 81015, 81025, 
+    81033, 81044, 81052, 81060, 81067, 81075, 81084, 81091, 81101, 81111, 
+    81122, 81132, 81143, 81151, 81159, 81168, 81176, 81185, 81193, 81201, 
+    81210, 81218, 81227, 81235, 81242, 81249, 81256, 81263, 81271, 81279, 
+    81287, 81295, 81304, 81312, 81320, 81329, 81337, 81345, 81353, 81362, 
+    81370, 81378, 81386, 81394, 81402, 81410, 81418, 81426, 81434, 81443, 
+    81451, 81459, 81467, 81475, 81483, 81492, 81501, 81509, 81517, 81525, 
+    81534, 81542, 81551, 81558, 81565, 81573, 81580, 81588, 81596, 81605, 
+    81613, 81622, 81630, 81638, 81648, 81655, 81662, 81670, 81677, 81685, 
+    81695, 81706, 81714, 81723, 81731, 81740, 81748, 81757, 81765, 81774, 
+    81782, 81791, 81800, 81808, 81816, 81824, 81833, 81840, 81848, 81857, 
+    81866, 81875, 81885, 81893, 81903, 81911, 81921, 81929, 81939, 81947, 
+    81957, 81965, 81974, 81981, 81990, 81997, 82007, 82015, 82025, 82033, 
+    82043, 82051, 82059, 82067, 82076, 82084, 82093, 82102, 82111, 82120, 
+    82130, 82138, 82148, 82156, 82166, 82174, 82184, 82192, 82202, 82210, 
+    82219, 82226, 82235, 82242, 82252, 82260, 82270, 82278, 82288, 82296, 
+    82304, 82312, 82321, 82329, 82338, 82347, 82356, 82365, 82373, 82381, 
+    82390, 82398, 82407, 82416, 82424, 82432, 82440, 82449, 82457, 82465, 
+    82474, 82482, 82490, 82498, 82506, 82511, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 82516, 82526, 82536, 82546, 82556, 82567, 82577, 82587, 
+    82598, 82607, 82616, 82625, 82636, 82646, 82656, 82668, 82678, 82688, 
+    82698, 82708, 82718, 82728, 82738, 82748, 82758, 82768, 82778, 82789, 
+    82800, 82810, 82820, 82832, 82843, 82854, 82864, 82874, 82884, 82894, 
+    82904, 82914, 82924, 82936, 82946, 82956, 82968, 82979, 82990, 83000, 
+    83010, 83020, 83030, 83042, 83052, 83062, 83073, 83084, 83094, 83104, 
+    83113, 83122, 83131, 83140, 83149, 83159, 0, 0, 83169, 83179, 83189, 
+    83199, 83209, 83221, 83231, 83241, 83253, 83263, 83275, 83284, 83293, 
+    83304, 83314, 83326, 83337, 83350, 83360, 83372, 83381, 83392, 83403, 
+    83416, 83426, 83436, 83446, 83456, 83466, 83475, 83484, 83493, 83502, 
+    83512, 83522, 83532, 83542, 83552, 83562, 83572, 83582, 83592, 83602, 
+    83612, 83622, 83631, 83640, 83649, 83659, 83669, 83679, 83689, 83699, 
+    83710, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83720, 83735, 
+    83750, 83756, 83762, 83768, 83774, 83780, 83786, 83792, 83798, 83806, 
+    83810, 83813, 0, 0, 83821, 83824, 83827, 83830, 83833, 83836, 83839, 
+    83842, 83845, 83848, 83851, 83854, 83857, 83860, 83863, 83866, 83869, 
+    83877, 83886, 83897, 83905, 83913, 83922, 83931, 83942, 83954, 0, 0, 0, 
+    0, 0, 0, 83963, 83968, 83973, 83980, 83987, 83993, 83999, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 84004, 84014, 84024, 84034, 84043, 84054, 84063, 84072, 
+    84082, 84092, 84104, 84116, 84127, 84138, 84149, 84160, 84170, 84180, 
+    84190, 84200, 84211, 84222, 84226, 84231, 84240, 84249, 84253, 84257, 
+    84261, 84266, 84271, 84276, 84281, 84284, 84288, 0, 84293, 84296, 84299, 
+    84303, 84307, 84312, 84316, 84320, 84325, 84330, 84337, 84344, 84347, 
+    84350, 84353, 84356, 84359, 84363, 84367, 0, 84371, 84376, 84380, 84384, 
+    0, 0, 0, 0, 84389, 84394, 84401, 84406, 84411, 0, 84416, 84421, 84426, 
+    84431, 84436, 84441, 84446, 84451, 84456, 84461, 84466, 84471, 84480, 
+    84489, 84497, 84505, 84514, 84523, 84532, 84541, 84549, 84557, 84565, 
+    84573, 84578, 84583, 84589, 84595, 84601, 84607, 84615, 84623, 84629, 
+    84635, 84641, 84647, 84653, 84659, 84665, 84671, 84676, 84681, 84686, 
+    84691, 84696, 84701, 84706, 84711, 84717, 84723, 84729, 84735, 84741, 
+    84747, 84753, 84759, 84765, 84771, 84777, 84783, 84789, 84795, 84801, 
+    84807, 84813, 84819, 84825, 84831, 84837, 84843, 84849, 84855, 84861, 
+    84867, 84873, 84879, 84885, 84891, 84897, 84903, 84909, 84915, 84921, 
+    84927, 84933, 84939, 84945, 84951, 84957, 84963, 84969, 84975, 84981, 
+    84987, 84993, 84999, 85005, 85011, 85017, 85023, 85029, 85035, 85041, 
+    85047, 85053, 85059, 85065, 85071, 85076, 85081, 85086, 85091, 85097, 
+    85103, 85109, 85115, 85121, 85127, 85133, 85139, 85145, 85151, 85158, 
+    85165, 85170, 85175, 85180, 85185, 85197, 85209, 85220, 85231, 85243, 
+    85255, 85263, 0, 0, 85271, 0, 85279, 85283, 85287, 85290, 85294, 85298, 
+    85301, 85304, 85308, 85312, 85315, 85318, 85321, 85324, 85329, 85332, 
+    85336, 85339, 85342, 85345, 85348, 85351, 85354, 85357, 85360, 85363, 
+    85366, 85369, 85373, 85377, 85381, 85385, 85390, 85395, 85401, 85407, 
+    85413, 85418, 85424, 85430, 85436, 85441, 85447, 85453, 85458, 85463, 
+    85469, 85474, 85480, 85486, 85491, 85497, 85503, 85508, 85514, 85520, 
+    85526, 85532, 85538, 85542, 85547, 85551, 85556, 85560, 85565, 85570, 
+    85576, 85582, 85588, 85593, 85599, 85605, 85611, 85616, 85622, 85628, 
+    85633, 85638, 85644, 85649, 85655, 85661, 85666, 85672, 85678, 85683, 
+    85689, 85695, 85701, 85707, 85713, 85718, 85722, 85727, 85729, 85734, 
+    85739, 85745, 85750, 85755, 85759, 85765, 85770, 85775, 85780, 85785, 
+    85790, 85795, 85800, 85806, 85812, 85818, 85826, 85830, 85834, 85838, 
+    85842, 85846, 85850, 85855, 85860, 85865, 85870, 85874, 85879, 85884, 
+    85889, 85894, 85899, 85904, 85909, 85914, 85918, 85922, 85927, 85932, 
+    85937, 85942, 85946, 85951, 85956, 85961, 85966, 85970, 85975, 85980, 
+    85985, 85990, 85994, 85999, 86004, 86008, 86013, 86018, 86023, 86028, 
+    86033, 86038, 86045, 86052, 86056, 86061, 86066, 86071, 86076, 86081, 
+    86086, 86091, 86096, 86101, 86106, 86111, 86116, 86121, 86126, 86131, 
+    86136, 86141, 86146, 86151, 86156, 86161, 86166, 86171, 86176, 86181, 
+    86186, 86191, 86196, 86201, 0, 0, 0, 86206, 86210, 86215, 86219, 86224, 
+    86229, 0, 0, 86233, 86238, 86243, 86247, 86252, 86257, 0, 0, 86262, 
+    86267, 86271, 86276, 86281, 86286, 0, 0, 86291, 86296, 86301, 0, 0, 0, 
+    86305, 86309, 86313, 86317, 86320, 86324, 86328, 0, 86332, 86338, 86341, 
+    86345, 86348, 86352, 86356, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86360, 86366, 
+    86372, 86378, 86384, 0, 0, 86388, 86394, 86400, 86406, 86412, 86418, 
+    86425, 86432, 86439, 86446, 86453, 86460, 0, 86467, 86474, 86481, 86487, 
+    86494, 86501, 86508, 86515, 86521, 86528, 86535, 86542, 86549, 86555, 
+    86562, 86569, 86576, 86583, 86589, 86596, 86603, 86610, 86617, 86624, 
+    86631, 86638, 0, 86645, 86651, 86658, 86665, 86672, 86679, 86685, 86692, 
+    86699, 86706, 86713, 86720, 86727, 86734, 86740, 86747, 86754, 86761, 
+    86768, 0, 86775, 86782, 0, 86789, 86796, 86803, 86810, 86817, 86824, 
+    86831, 86838, 86845, 86852, 86859, 86866, 86873, 86880, 86887, 0, 0, 
+    86893, 86898, 86903, 86908, 86913, 86918, 86923, 86928, 86933, 86938, 
+    86943, 86948, 86953, 86958, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86963, 86970, 
+    86977, 86984, 86991, 86998, 87005, 87012, 87019, 87026, 87033, 87040, 
+    87047, 87054, 87061, 87068, 87075, 87082, 87089, 87096, 87104, 87112, 
+    87119, 87126, 87131, 87139, 87147, 87154, 87161, 87166, 87173, 87178, 
+    87183, 87190, 87195, 87200, 87205, 87213, 87218, 87223, 87230, 87235, 
+    87240, 87247, 87254, 87259, 87264, 87269, 87274, 87279, 87284, 87289, 
+    87294, 87299, 87306, 87311, 87318, 87323, 87328, 87333, 87338, 87343, 
+    87348, 87353, 87358, 87363, 87368, 87373, 87380, 87387, 87394, 87401, 
+    87407, 87412, 87419, 87424, 87429, 87438, 87445, 87454, 87461, 87466, 
+    87471, 87479, 87484, 87489, 87494, 87499, 87504, 87511, 87516, 87521, 
+    87526, 87531, 87536, 87543, 87550, 87557, 87564, 87571, 87578, 87585, 
+    87592, 87599, 87606, 87613, 87620, 87627, 87634, 87641, 87648, 87655, 
+    87662, 87669, 87676, 87683, 87690, 87697, 87704, 87711, 87718, 87725, 
+    87732, 0, 0, 0, 0, 0, 87739, 87747, 87755, 0, 0, 0, 0, 87760, 87764, 
+    87768, 87772, 87776, 87780, 87784, 87788, 87792, 87796, 87801, 87806, 
+    87811, 87816, 87821, 87826, 87831, 87836, 87841, 87847, 87853, 87859, 
+    87866, 87873, 87880, 87887, 87894, 87901, 87907, 87913, 87919, 87926, 
+    87933, 87940, 87947, 87954, 87961, 87968, 87975, 87982, 87989, 87996, 
+    88003, 88010, 88017, 0, 0, 0, 88024, 88032, 88040, 88048, 88056, 88064, 
+    88074, 88084, 88092, 88100, 88108, 88116, 88124, 88130, 88137, 88146, 
+    88155, 88164, 88173, 88182, 88191, 88201, 88212, 88222, 88233, 88242, 
+    88251, 88260, 88270, 88281, 88291, 88302, 88313, 88322, 88330, 88336, 
+    88342, 88348, 88354, 88362, 88370, 88376, 88383, 88393, 88400, 88407, 
+    88414, 88421, 88428, 88438, 88445, 88452, 88460, 88468, 88477, 88486, 
+    88495, 88504, 88513, 88521, 88530, 88539, 88548, 88552, 88559, 88564, 
+    88569, 88573, 88577, 88581, 88585, 88590, 88595, 88601, 88607, 88611, 
+    88617, 88621, 88625, 88629, 88633, 88637, 88641, 88647, 0, 0, 0, 0, 0, 
+    88651, 88656, 88661, 88666, 88671, 88678, 88683, 88688, 88693, 88698, 
+    88703, 88708, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 88713, 88720, 88729, 88738, 88745, 88752, 88759, 
+    88766, 88773, 88780, 88786, 88793, 88800, 88807, 88814, 88821, 88828, 
+    88835, 88842, 88851, 88858, 88865, 88872, 88879, 88886, 88893, 88900, 
+    88907, 88916, 88923, 88930, 88937, 88944, 88951, 88958, 88967, 88974, 
+    88981, 88988, 88995, 89004, 89011, 89018, 89025, 89033, 89042, 0, 0, 
+    89051, 89055, 89059, 89064, 89069, 89074, 89079, 89083, 89088, 89093, 
+    89098, 89103, 89108, 89113, 89117, 89121, 89126, 89131, 89136, 89140, 
+    89145, 89150, 89154, 89159, 89164, 89169, 89174, 89179, 89184, 0, 0, 0, 
+    89189, 89193, 89198, 89203, 89207, 89212, 89216, 89221, 89226, 89231, 
+    89236, 89240, 89244, 89249, 89254, 89259, 89264, 89269, 89274, 89278, 
+    89283, 89288, 89293, 89298, 89303, 89308, 89312, 89316, 89321, 89326, 
+    89331, 89336, 89341, 89346, 89351, 89356, 89361, 89366, 89371, 89376, 
+    89381, 89386, 89391, 89396, 89401, 89406, 89411, 89416, 89421, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89426, 89430, 
+    89435, 89440, 89445, 89449, 89454, 89459, 89464, 89469, 89473, 89477, 
+    89482, 89487, 89492, 89497, 89501, 89506, 89511, 89516, 89521, 89526, 
+    89531, 89535, 89540, 89545, 89550, 89555, 89560, 89565, 89570, 0, 89575, 
+    89580, 89585, 89591, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89597, 89602, 
+    89607, 89612, 89617, 89622, 89627, 89632, 89637, 89642, 89647, 89652, 
+    89657, 89662, 89667, 89672, 89677, 89682, 89687, 89692, 89697, 89702, 
+    89707, 89712, 89717, 89722, 89727, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89734, 89739, 89744, 
+    89749, 89754, 89759, 89764, 89769, 89774, 89779, 89784, 89789, 89794, 
+    89799, 89804, 89809, 89814, 89819, 89824, 89829, 89834, 89839, 89844, 
+    89849, 89854, 89859, 89864, 89868, 89872, 89876, 0, 89881, 89887, 89892, 
+    89897, 89902, 89907, 89913, 89919, 89925, 89931, 89937, 89943, 89949, 
+    89955, 89961, 89967, 89973, 89979, 89985, 89990, 89996, 90002, 90007, 
+    90013, 90018, 90024, 90030, 90035, 90041, 90047, 90052, 90058, 90064, 
+    90069, 90075, 90081, 90087, 0, 0, 0, 0, 90092, 90098, 90104, 90110, 
+    90116, 90122, 90128, 90134, 90140, 90147, 90152, 90157, 90163, 90169, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90175, 90180, 90185, 
+    90190, 90196, 90201, 90207, 90213, 90219, 90225, 90232, 90238, 90245, 
+    90250, 90255, 90260, 90265, 90270, 90275, 90280, 90285, 90290, 90295, 
+    90300, 90305, 90310, 90315, 90320, 90325, 90330, 90335, 90340, 90345, 
+    90350, 90355, 90360, 90365, 90370, 90375, 90380, 90385, 90390, 90395, 
+    90400, 90406, 90411, 90417, 90423, 90429, 90435, 90442, 90448, 90455, 
+    90460, 90465, 90470, 90475, 90480, 90485, 90490, 90495, 90500, 90505, 
+    90510, 90515, 90520, 90525, 90530, 90535, 90540, 90545, 90550, 90555, 
+    90560, 90565, 90570, 90575, 90580, 90585, 90590, 90595, 90600, 90605, 
+    90610, 90615, 90620, 90625, 90630, 90635, 90640, 90645, 90650, 90655, 
+    90660, 90665, 90670, 90675, 90680, 90685, 90690, 90695, 90700, 90705, 
+    90710, 90715, 90720, 90725, 90730, 90735, 90740, 90745, 90750, 90755, 
+    90760, 90765, 90770, 90775, 90780, 90785, 90790, 90795, 90800, 90805, 
+    90810, 90815, 90820, 90825, 90830, 90835, 90840, 90845, 90850, 90855, 
+    90860, 90865, 90870, 90874, 90878, 90883, 90888, 90893, 90898, 90903, 
+    90908, 90913, 90918, 90923, 90928, 90933, 90937, 90941, 90945, 90949, 
+    90953, 90957, 90961, 90966, 90971, 0, 0, 90976, 90981, 90985, 90989, 
+    90993, 90997, 91001, 91005, 91009, 91013, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 91017, 91021, 91025, 91029, 91033, 91037, 0, 0, 91042, 0, 
+    91047, 91051, 91056, 91061, 91066, 91071, 91076, 91081, 91086, 91091, 
+    91096, 91100, 91105, 91110, 91115, 91120, 91124, 91129, 91134, 91139, 
+    91144, 91148, 91153, 91158, 91163, 91168, 91172, 91177, 91182, 91187, 
+    91192, 91196, 91201, 91206, 91211, 91216, 91221, 91226, 91231, 91235, 
+    91240, 91245, 91250, 91255, 0, 91260, 91265, 0, 0, 0, 91270, 0, 0, 91275, 
+    91280, 91287, 91294, 91301, 91308, 91315, 91322, 91329, 91336, 91343, 
+    91350, 91357, 91364, 91371, 91378, 91385, 91392, 91399, 91406, 91413, 
+    91420, 91427, 0, 91434, 91441, 91447, 91453, 91459, 91466, 91473, 91481, 
+    91489, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91498, 91503, 91508, 91513, 91518, 91523, 
+    91528, 91533, 91538, 91543, 91548, 91553, 91558, 91563, 91568, 91573, 
+    91578, 91583, 91588, 91593, 91598, 91603, 91608, 91612, 91617, 91622, 
+    91628, 91632, 0, 0, 0, 91636, 91642, 91646, 91651, 91656, 91661, 91665, 
+    91670, 91674, 91679, 91684, 91688, 91692, 91697, 91701, 91705, 91710, 
+    91715, 91719, 91724, 91729, 91734, 91739, 91744, 91749, 91754, 91759, 0, 
+    0, 0, 0, 0, 91764, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91769, 
+    91775, 91781, 91787, 91793, 91799, 91806, 91813, 91820, 91826, 91832, 
+    91838, 91845, 91852, 91859, 91865, 91872, 91879, 91886, 91893, 91899, 
+    91906, 91913, 91919, 91926, 91933, 91940, 91947, 91954, 91960, 91967, 
+    91974, 91981, 91987, 91993, 91999, 92005, 92011, 92018, 92025, 92031, 
+    92037, 92043, 92050, 92056, 92063, 92070, 92077, 92083, 92091, 92098, 
+    92104, 92111, 92118, 92125, 92131, 0, 0, 0, 0, 0, 0, 92138, 92146, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92154, 92158, 92163, 92168, 0, 
+    92174, 92179, 0, 0, 0, 0, 0, 92184, 92190, 92197, 92202, 92207, 92211, 
+    92216, 92221, 0, 92226, 92231, 92236, 0, 92241, 92246, 92251, 92256, 
+    92261, 92266, 92271, 92276, 92281, 92286, 92291, 92295, 92299, 92304, 
+    92309, 92314, 92318, 92322, 92326, 92331, 92336, 92341, 92346, 92350, 
+    92355, 92359, 92364, 0, 0, 0, 0, 92369, 92375, 92380, 0, 0, 0, 0, 92385, 
+    92389, 92393, 92397, 92401, 92405, 92410, 92415, 92421, 0, 0, 0, 0, 0, 0, 
+    0, 0, 92427, 92433, 92440, 92446, 92453, 92459, 92465, 92471, 92478, 0, 
+    0, 0, 0, 0, 0, 0, 92484, 92492, 92500, 92508, 92516, 92524, 92532, 92540, 
+    92548, 92556, 92564, 92572, 92580, 92588, 92596, 92604, 92612, 92620, 
+    92628, 92636, 92644, 92652, 92660, 92668, 92676, 92684, 92692, 92700, 
+    92708, 92716, 92723, 92731, 92739, 92743, 92748, 92753, 92758, 92763, 
+    92768, 92773, 92778, 92782, 92787, 92791, 92796, 92800, 92805, 92809, 
+    92814, 92819, 92824, 92829, 92834, 92839, 92844, 92849, 92854, 92859, 
+    92864, 92869, 92874, 92879, 92884, 92889, 92894, 92899, 92904, 92909, 
+    92914, 92919, 92924, 92929, 92934, 92939, 92944, 92949, 92954, 92959, 
+    92964, 92969, 92974, 92979, 92984, 92989, 92994, 92999, 0, 0, 0, 93004, 
+    93009, 93018, 93026, 93035, 93044, 93055, 93066, 93073, 93080, 93087, 
+    93094, 93101, 93108, 93115, 93122, 93129, 93136, 93143, 93150, 93157, 
+    93164, 93171, 93178, 93185, 93192, 93199, 93206, 93213, 0, 0, 93220, 
+    93226, 93232, 93238, 93244, 93251, 93258, 93266, 93274, 93281, 93288, 
+    93295, 93302, 93309, 93316, 93323, 93330, 93337, 93344, 93351, 93358, 
+    93365, 93372, 93379, 93386, 93393, 93400, 0, 0, 0, 0, 0, 93407, 93413, 
+    93419, 93425, 93431, 93438, 93445, 93453, 93461, 93467, 93473, 93480, 
+    93486, 93492, 93498, 93504, 93511, 93518, 93525, 93532, 93539, 93546, 
+    93553, 93560, 93567, 93574, 93581, 93588, 93595, 93602, 93609, 93616, 
+    93623, 93630, 93637, 93644, 93651, 93658, 93665, 93672, 93679, 93686, 
+    93693, 93700, 93707, 93714, 93721, 93728, 93735, 93742, 93749, 93756, 
+    93763, 93770, 93777, 93784, 93791, 93798, 93805, 93812, 93819, 93826, 
+    93833, 93840, 93847, 93854, 93861, 93868, 93875, 93882, 93889, 93896, 
+    93903, 93910, 93917, 93924, 93931, 93938, 93945, 93952, 93959, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 93966, 93970, 93974, 93978, 93982, 93986, 93990, 93994, 
+    93998, 94002, 94007, 94012, 94017, 94022, 94027, 94032, 94037, 94042, 
+    94047, 94053, 94059, 94065, 94072, 94079, 94086, 94093, 94100, 94107, 
+    94114, 94121, 94128, 0, 94135, 94139, 94143, 94147, 94151, 94155, 94158, 
+    94162, 94165, 94169, 94172, 94176, 94180, 94185, 94189, 94194, 94197, 
+    94201, 94204, 94208, 94211, 94215, 94219, 94223, 94227, 94231, 94235, 
+    94239, 94243, 94247, 94251, 94255, 94259, 94263, 94267, 94271, 94275, 
+    94279, 94283, 94286, 94289, 94293, 94297, 94301, 94304, 94307, 94310, 
+    94314, 94318, 94322, 94326, 94329, 94332, 94336, 94342, 94348, 94354, 
+    94359, 94366, 94370, 94375, 94379, 94384, 94389, 94395, 94400, 94406, 
+    94410, 94415, 94419, 94424, 94427, 94430, 94434, 94439, 94445, 94450, 
+    94456, 0, 0, 0, 0, 94461, 94464, 94467, 94470, 94473, 94476, 94479, 
+    94482, 94485, 94488, 94492, 94496, 94500, 94504, 94508, 94512, 94516, 
+    94520, 94524, 94529, 94534, 94538, 94541, 94544, 94547, 94550, 94553, 
+    94556, 94559, 94562, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    94565, 94570, 94575, 94580, 94584, 94589, 94593, 94598, 94602, 94607, 
+    94611, 94616, 94620, 94625, 94629, 94634, 94639, 94644, 94649, 94654, 
+    94659, 94664, 94669, 94674, 94679, 94684, 94689, 94694, 94699, 94704, 
+    94709, 94714, 94719, 94724, 94729, 94733, 94737, 94742, 94747, 94752, 
+    94756, 94760, 94764, 94769, 94774, 94779, 94784, 94788, 94792, 94798, 
+    94803, 94809, 94814, 94820, 94825, 94831, 94836, 94842, 94847, 94852, 
+    94857, 94862, 94866, 94871, 94877, 94881, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 94886, 94893, 94900, 94907, 94914, 94921, 94928, 94935, 
+    94942, 94949, 94956, 94963, 94970, 94977, 94984, 94991, 94998, 95005, 
+    95012, 95019, 95026, 95033, 95040, 95047, 95054, 0, 0, 0, 0, 0, 0, 0, 
+    95061, 95068, 95074, 95080, 95086, 95092, 95098, 95104, 95110, 95116, 0, 
+    0, 0, 0, 0, 0, 95122, 95127, 95132, 95137, 95142, 95146, 95150, 95154, 
+    95159, 95164, 95169, 95174, 95179, 95184, 95189, 95194, 95199, 95204, 
+    95209, 95214, 95219, 95224, 95229, 95234, 95239, 95244, 95249, 95254, 
+    95259, 95264, 95269, 95274, 95279, 95284, 95289, 95294, 95299, 95304, 
+    95309, 95314, 95319, 95324, 95330, 95335, 95341, 95346, 95352, 95357, 
+    95363, 95369, 95373, 95378, 95382, 0, 95386, 95391, 95395, 95399, 95403, 
+    95407, 95411, 95415, 95419, 95423, 95427, 95432, 95436, 95441, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 95446, 95450, 95454, 95458, 95461, 95465, 
+    95468, 95472, 95475, 95479, 95483, 95488, 95492, 95497, 95500, 95504, 
+    95507, 95511, 95514, 95518, 95522, 95526, 95530, 95534, 95538, 95542, 
+    95546, 95550, 95554, 95558, 95562, 95566, 95570, 95574, 95578, 95582, 
+    95586, 95589, 95592, 95596, 95600, 95604, 95607, 95610, 95613, 95617, 
+    95621, 95625, 95629, 95633, 95636, 95639, 95644, 95648, 95653, 95657, 
+    95662, 95667, 95673, 95678, 95684, 95688, 95693, 95697, 95702, 95706, 
+    95710, 95714, 95718, 95721, 95724, 95728, 95732, 0, 0, 0, 0, 0, 0, 0, 
+    95735, 95739, 95742, 95745, 95748, 95751, 95754, 95757, 95760, 95763, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95766, 95770, 95775, 95779, 95784, 
+    95788, 95793, 95797, 95802, 95806, 95811, 95815, 95820, 95825, 95830, 
+    95835, 95840, 95845, 95850, 95855, 95860, 95865, 95870, 95875, 95880, 
+    95885, 95890, 95895, 95900, 95905, 95909, 95913, 95918, 95923, 95928, 
+    95932, 95936, 95940, 95945, 95950, 95955, 95959, 95963, 95968, 95973, 
+    95978, 95984, 95989, 95995, 96000, 96006, 96011, 96017, 96022, 96028, 
+    96033, 0, 0, 0, 0, 0, 0, 0, 0, 96038, 96043, 96047, 96051, 96055, 96059, 
+    96063, 96067, 96071, 96075, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96079, 96082, 96087, 96093, 
+    96101, 96106, 96112, 96120, 96126, 96132, 96136, 96140, 96147, 96156, 
+    96163, 96172, 96178, 96187, 96194, 96201, 96208, 96218, 96224, 96228, 
+    96235, 96244, 96254, 96261, 96268, 96272, 96276, 96283, 96293, 96297, 
+    96304, 96311, 96318, 96324, 96331, 96338, 96345, 96352, 96356, 96360, 
+    96364, 96371, 96375, 96382, 96389, 96403, 96412, 96416, 96420, 96424, 
+    96431, 96435, 96439, 96443, 96451, 96459, 96478, 96488, 96508, 96512, 
+    96516, 96520, 96524, 96528, 96532, 96536, 96543, 96547, 96550, 96554, 
+    96558, 96564, 96571, 96580, 96584, 96593, 96602, 96610, 96614, 96621, 
+    96625, 96629, 96633, 96637, 96648, 96657, 96666, 96675, 96684, 96696, 
+    96705, 96714, 96723, 96731, 96740, 96752, 96761, 96770, 96779, 96791, 
+    96800, 96809, 96821, 96830, 96839, 96851, 96860, 96864, 96868, 96872, 
+    96876, 96880, 96884, 96888, 96895, 96899, 96903, 96914, 96918, 96922, 
+    96929, 96935, 96941, 96945, 96952, 96956, 96960, 96964, 96968, 96972, 
+    96976, 96982, 96990, 96994, 96998, 97001, 97007, 97017, 97021, 97033, 
+    97040, 97047, 97054, 97061, 97067, 97071, 97075, 97079, 97083, 97090, 
+    97099, 97106, 97114, 97122, 97128, 97132, 97136, 97140, 97144, 97150, 
+    97159, 97171, 97178, 97185, 97194, 97205, 97211, 97220, 97229, 97236, 
+    97245, 97252, 97259, 97269, 97276, 97283, 97290, 97297, 97301, 97307, 
+    97311, 97322, 97330, 97339, 97351, 97358, 97365, 97375, 97382, 97391, 
+    97398, 97407, 97414, 97421, 97431, 97438, 97445, 97455, 97462, 97474, 
+    97483, 97490, 97497, 97504, 97513, 97523, 97536, 97543, 97553, 97563, 
+    97570, 97579, 97592, 97599, 97606, 97613, 97623, 97633, 97640, 97650, 
+    97657, 97664, 97674, 97680, 97687, 97694, 97701, 97711, 97718, 97725, 
+    97732, 97738, 97745, 97755, 97762, 97766, 97774, 97778, 97790, 97794, 
+    97808, 97812, 97816, 97820, 97824, 97830, 97837, 97845, 97849, 97853, 
+    97857, 97861, 97868, 97872, 97878, 97884, 97892, 97896, 97903, 97911, 
+    97915, 97919, 97925, 97929, 97938, 97947, 97954, 97964, 97970, 97974, 
+    97978, 97986, 97993, 98000, 98006, 98010, 98018, 98022, 98029, 98041, 
+    98048, 98058, 98064, 98068, 98077, 98084, 98093, 98097, 98101, 98108, 
+    98112, 98116, 98120, 98124, 98127, 98133, 98139, 98143, 98147, 98154, 
+    98161, 98168, 98175, 98182, 98189, 98196, 98203, 98209, 98213, 98217, 
+    98224, 98231, 98238, 98245, 98252, 98256, 98259, 98264, 98268, 98272, 
+    98281, 98290, 98294, 98298, 98304, 98310, 98327, 98333, 98337, 98346, 
+    98350, 98354, 98361, 98369, 98377, 98383, 98387, 98391, 98395, 98399, 
+    98402, 98408, 98415, 98425, 98432, 98439, 98446, 98452, 98459, 98466, 
+    98473, 98480, 98487, 98496, 98503, 98515, 98522, 98529, 98539, 98550, 
+    98557, 98564, 98571, 98578, 98585, 98592, 98599, 98606, 98613, 98620, 
+    98630, 98640, 98650, 98657, 98667, 98674, 98681, 98688, 98695, 98701, 
+    98708, 98715, 98722, 98729, 98736, 98743, 98750, 98757, 98763, 98770, 
+    98777, 98786, 98793, 98800, 98804, 98812, 98816, 98820, 98824, 98828, 
+    98832, 98839, 98843, 98852, 98856, 98863, 98871, 98875, 98879, 98883, 
+    98896, 98912, 98916, 98920, 98927, 98933, 98940, 98944, 98948, 98952, 
+    98956, 98960, 98967, 98971, 98989, 98993, 98997, 99004, 99008, 99012, 
+    99018, 99022, 99026, 99034, 99038, 99042, 99046, 99050, 99056, 99067, 
+    99076, 99085, 99092, 99099, 99110, 99117, 99124, 99131, 99138, 99145, 
+    99152, 99159, 99169, 99175, 99182, 99192, 99201, 99208, 99217, 99227, 
+    99234, 99241, 99248, 99255, 99267, 99274, 99281, 99288, 99295, 99302, 
+    99312, 99319, 99326, 99336, 99349, 99361, 99368, 99378, 99385, 99392, 
+    99399, 99413, 99419, 99427, 99437, 99447, 99454, 99461, 99467, 99471, 
+    99478, 99488, 99494, 99507, 99511, 99515, 99522, 99526, 99533, 99543, 
+    99547, 99551, 99555, 99559, 99563, 99570, 99574, 99581, 99588, 99595, 
+    99604, 99613, 99623, 99630, 99637, 99644, 99654, 99661, 99671, 99678, 
+    99688, 99695, 99702, 99712, 99722, 99729, 99735, 99743, 99751, 99757, 
+    99763, 99767, 99771, 99778, 99786, 99792, 99796, 99800, 99804, 99811, 
+    99823, 99826, 99833, 99839, 99843, 99847, 99851, 99855, 99859, 99863, 
+    99867, 99871, 99875, 99879, 99886, 99890, 99896, 99900, 99904, 99908, 
+    99914, 99921, 99928, 99935, 99946, 99954, 99958, 99964, 99973, 99980, 
+    99986, 99989, 99993, 99997, 100003, 100012, 100020, 100024, 100030, 
+    100034, 100038, 100042, 100048, 100055, 100061, 100065, 100071, 100075, 
+    100079, 100088, 100100, 100104, 100111, 100118, 100128, 100135, 100147, 
+    100154, 100161, 100168, 100179, 100189, 100202, 100212, 100219, 100223, 
+    100227, 100231, 100235, 100244, 100253, 100262, 100279, 100288, 100294, 
+    100301, 100309, 100322, 100326, 100335, 100344, 100353, 100362, 100373, 
+    100382, 100391, 100400, 100409, 100418, 100427, 100437, 100440, 100444, 
+    100448, 100452, 100456, 100460, 100466, 100473, 100480, 100487, 100493, 
+    100499, 100506, 100512, 100519, 100527, 100531, 100538, 100545, 100552, 
+    100560, 100563, 100567, 100571, 100575, 100578, 100584, 100588, 100594, 
+    100601, 100608, 100614, 100621, 100628, 100635, 100642, 100649, 100656, 
+    100663, 100670, 100677, 100684, 100691, 100698, 100705, 100712, 100718, 
+    100722, 100731, 100735, 100739, 100743, 100747, 100753, 100760, 100767, 
+    100774, 100781, 100788, 100794, 100802, 100806, 100810, 100814, 100818, 
+    100824, 100841, 100858, 100862, 100866, 100870, 100874, 100878, 100882, 
+    100888, 100895, 100899, 100905, 100912, 100919, 100926, 100933, 100940, 
+    100949, 100956, 100963, 100970, 100977, 100981, 100985, 100991, 101003, 
+    101007, 101011, 101020, 101024, 101028, 101032, 101038, 101042, 101046, 
+    101055, 101059, 101063, 101067, 101074, 101078, 101082, 101086, 101090, 
+    101094, 101098, 101102, 101106, 101112, 101119, 101126, 101132, 101136, 
+    101153, 101159, 101163, 101169, 101175, 101181, 101187, 101193, 101199, 
+    101203, 101207, 101211, 101217, 101221, 101227, 101231, 101235, 101242, 
+    101249, 101266, 101270, 101274, 101278, 101282, 101286, 101298, 101301, 
+    101306, 101311, 101326, 101336, 101348, 101352, 101356, 101360, 101366, 
+    101373, 101380, 101390, 101402, 101408, 101414, 101423, 101427, 101431, 
+    101438, 101448, 101455, 101461, 101465, 101469, 101476, 101482, 101486, 
+    101492, 101496, 101504, 101510, 101514, 101522, 101530, 101537, 101543, 
+    101550, 101557, 101567, 101577, 101581, 101585, 101589, 101593, 101599, 
+    101606, 101612, 101619, 101626, 101633, 101642, 101649, 101656, 101662, 
+    101669, 101676, 101683, 101690, 101697, 101704, 101710, 101717, 101724, 
+    101731, 101740, 101747, 101754, 101758, 101764, 101768, 101774, 101781, 
+    101788, 101795, 101799, 101803, 101807, 101811, 101815, 101822, 101826, 
+    101830, 101836, 101844, 101848, 101852, 101856, 101860, 101867, 101871, 
+    101875, 101883, 101887, 101891, 101895, 101899, 101905, 101909, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101913, 101919, 101925, 101932, 
+    101939, 101946, 101953, 101960, 101967, 101973, 101980, 101987, 101994, 
+    102001, 102008, 102015, 102021, 102027, 102033, 102039, 102045, 102051, 
+    102057, 102063, 102069, 102076, 102083, 102090, 102097, 102104, 102111, 
+    102117, 102123, 102129, 102136, 102143, 102149, 102155, 102164, 102171, 
+    102178, 102185, 102192, 102199, 102206, 102212, 102218, 102224, 102233, 
+    102240, 102247, 102258, 102269, 102275, 102281, 102287, 102296, 102303, 
+    102310, 102320, 102330, 102341, 102352, 102364, 102377, 102388, 102399, 
+    102411, 102424, 102435, 102446, 102457, 102468, 102479, 102491, 102499, 
+    102507, 102516, 102525, 102534, 102540, 102546, 102552, 102559, 102569, 
+    102576, 102586, 102591, 102596, 102602, 102608, 102616, 102624, 102633, 
+    102644, 102655, 102663, 102671, 102680, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 102689, 102700, 102707, 102715, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    102723, 102727, 102731, 102735, 102739, 102743, 102747, 102751, 102755, 
+    102759, 102763, 102767, 102771, 102775, 102779, 102783, 102787, 102791, 
+    102795, 102799, 102803, 102807, 102811, 102815, 102819, 102823, 102827, 
+    102831, 102835, 102839, 102843, 102847, 102851, 102855, 102859, 102863, 
+    102867, 102871, 102875, 102879, 102883, 102887, 102891, 102895, 102899, 
+    102903, 102907, 102911, 102915, 102919, 102923, 102927, 102931, 102935, 
+    102939, 102943, 102947, 102951, 102955, 102959, 102963, 102967, 102971, 
+    102975, 102979, 102983, 102987, 102991, 102995, 102999, 103003, 103007, 
+    103011, 103015, 103019, 103023, 103027, 103031, 103035, 103039, 103043, 
+    103047, 103051, 103055, 103059, 103063, 103067, 103071, 103075, 103079, 
+    103083, 103087, 103091, 103095, 103099, 103103, 103107, 103111, 103115, 
+    103119, 103123, 103127, 103131, 103135, 103139, 103143, 103147, 103151, 
+    103155, 103159, 103163, 103167, 103171, 103175, 103179, 103183, 103187, 
+    103191, 103195, 103199, 103203, 103207, 103211, 103215, 103219, 103223, 
+    103227, 103231, 103235, 103239, 103243, 103247, 103251, 103255, 103259, 
+    103263, 103267, 103271, 103275, 103279, 103283, 103287, 103291, 103295, 
+    103299, 103303, 103307, 103311, 103315, 103319, 103323, 103327, 103331, 
+    103335, 103339, 103343, 103347, 103351, 103355, 103359, 103363, 103367, 
+    103371, 103375, 103379, 103383, 103387, 103391, 103395, 103399, 103403, 
+    103407, 103411, 103415, 103419, 103423, 103427, 103431, 103435, 103439, 
+    103443, 103447, 103451, 103455, 103459, 103463, 103467, 103471, 103475, 
+    103479, 103483, 103487, 103491, 103495, 103499, 103503, 103507, 103511, 
+    103515, 103519, 103523, 103527, 103531, 103535, 103539, 103543, 103547, 
+    103551, 103555, 103559, 103563, 103567, 103571, 103575, 103579, 103583, 
+    103587, 103591, 103595, 103599, 103603, 103607, 103611, 103615, 103619, 
+    103623, 103627, 103631, 103635, 103639, 103643, 103647, 103651, 103655, 
+    103659, 103663, 103667, 103671, 103675, 103679, 103683, 103687, 103691, 
+    103695, 103699, 103703, 103707, 103711, 103715, 103719, 103723, 103727, 
+    103731, 103735, 103739, 103743, 103747, 103751, 103755, 103759, 103763, 
+    103767, 103771, 103775, 103779, 103783, 103787, 103791, 103795, 103799, 
+    103803, 103807, 103811, 103815, 103819, 103823, 103827, 103831, 103835, 
+    103839, 103843, 103847, 103851, 103855, 103859, 103863, 103867, 103871, 
+    103875, 103879, 103883, 103887, 103891, 103895, 103899, 103903, 103907, 
+    103911, 103915, 103919, 103923, 103927, 103931, 103935, 103939, 103943, 
+    103947, 103951, 103955, 103959, 103963, 103967, 103971, 103975, 103979, 
+    103983, 103987, 103991, 103995, 103999, 104003, 104007, 104011, 104015, 
+    104019, 104023, 104027, 104031, 104035, 104039, 104043, 104047, 104051, 
+    104055, 104059, 104063, 104067, 104071, 104075, 104079, 104083, 104087, 
+    104091, 104095, 104099, 104103, 104107, 104111, 104115, 104119, 104123, 
+    104127, 104131, 104135, 104139, 104143, 104147, 104151, 104155, 104159, 
+    104163, 104167, 104171, 104175, 104179, 104183, 104187, 104191, 104195, 
+    104199, 104203, 104207, 104211, 104215, 104219, 104223, 104227, 104231, 
+    104235, 104239, 104243, 104247, 104251, 104255, 104259, 104263, 104267, 
+    104271, 104275, 104279, 104283, 104287, 104291, 104295, 104299, 104303, 
+    104307, 104311, 104315, 104319, 104323, 104327, 104331, 104335, 104339, 
+    104343, 104347, 104351, 104355, 104359, 104363, 104367, 104371, 104375, 
+    104379, 104383, 104387, 104391, 104395, 104399, 104403, 104407, 104411, 
+    104415, 104419, 104423, 104427, 104431, 104435, 104439, 104443, 104447, 
+    104451, 104455, 104459, 104463, 104467, 104471, 104475, 104479, 104483, 
+    104487, 104491, 104495, 104499, 104503, 104507, 104511, 104515, 104519, 
+    104523, 104527, 104531, 104535, 104539, 104543, 104547, 104551, 104555, 
+    104559, 104563, 104567, 104571, 104575, 104579, 104583, 104587, 104591, 
+    104595, 104599, 104603, 104607, 104611, 104615, 104619, 104623, 104627, 
+    104631, 104635, 104639, 104643, 104647, 104651, 104655, 104659, 104663, 
+    104667, 104671, 104675, 104679, 104683, 104687, 104691, 104695, 104699, 
+    104703, 104707, 104711, 104715, 104719, 104723, 104727, 104731, 104735, 
+    104739, 104743, 104747, 104751, 104755, 104759, 104763, 104767, 104771, 
+    104775, 104779, 104783, 104787, 104791, 104795, 104799, 104803, 104807, 
+    104811, 104815, 104819, 104823, 104827, 104831, 104835, 104839, 104843, 
+    104847, 104851, 104855, 104859, 104863, 104867, 104871, 104875, 104879, 
+    104883, 104887, 104891, 104895, 104899, 104903, 104907, 104911, 104915, 
+    104919, 104923, 104927, 104931, 104935, 104939, 104943, 104947, 104951, 
+    104955, 104959, 104963, 104967, 104971, 104975, 104979, 104983, 104987, 
+    104991, 104995, 104999, 105003, 105007, 105011, 105015, 105019, 105023, 
+    105027, 105031, 105035, 105039, 105043, 105047, 105051, 105055, 105059, 
+    105063, 105067, 105071, 105075, 105079, 105083, 105087, 105091, 105095, 
+    105099, 105103, 105107, 105111, 105115, 105119, 105123, 105127, 105131, 
+    105135, 105139, 105143, 105147, 105151, 105155, 105159, 105163, 105167, 
+    105171, 105175, 105179, 105183, 105187, 105191, 105195, 105199, 105203, 
+    105207, 105211, 105215, 105219, 105223, 105227, 105231, 105235, 105239, 
+    105243, 105247, 105251, 105255, 105259, 105263, 105267, 105271, 105275, 
+    105279, 105283, 105287, 105291, 105295, 105299, 105303, 105307, 105311, 
+    105315, 105319, 105323, 105327, 105331, 105335, 105339, 105343, 105347, 
+    105351, 105355, 105359, 105363, 105367, 105371, 105375, 105379, 105383, 
+    105387, 105391, 105395, 105399, 105403, 105407, 105411, 105415, 105419, 
+    105423, 105427, 105431, 105435, 105439, 105443, 105447, 105451, 105455, 
+    105459, 105463, 105467, 105471, 105475, 105479, 105483, 105487, 105491, 
+    105495, 105499, 105503, 105507, 105511, 105515, 105519, 105523, 105527, 
+    105531, 105535, 105539, 105543, 105547, 105551, 105555, 105559, 105563, 
+    105567, 105571, 105575, 105579, 105583, 105587, 105591, 105595, 105599, 
+    105603, 105607, 105611, 105615, 105619, 105623, 105627, 105631, 105635, 
+    105639, 105643, 105647, 105651, 105655, 105659, 105663, 105667, 105671, 
+    105675, 105679, 105683, 105687, 105691, 105695, 105699, 105703, 105707, 
+    105711, 105715, 105719, 105723, 105727, 105731, 105735, 105739, 105743, 
+    105747, 105751, 105755, 105759, 105763, 105767, 105771, 105775, 105779, 
+    105783, 105787, 105791, 105795, 105799, 105803, 105807, 105811, 105815, 
+    105819, 105823, 105827, 105831, 105835, 105839, 105843, 105847, 105851, 
+    105855, 105859, 105863, 105867, 105871, 105875, 105879, 105883, 105887, 
+    105891, 105895, 105899, 105903, 105907, 105911, 105915, 105919, 105923, 
+    105927, 105931, 105935, 105939, 105943, 105947, 105951, 105955, 105959, 
+    105963, 105967, 105971, 105975, 105979, 105983, 105987, 105991, 105995, 
+    105999, 106003, 106007, 106011, 106015, 106019, 106023, 106027, 106031, 
+    106035, 106039, 106043, 106047, 106051, 106055, 106059, 106063, 106067, 
+    106071, 106075, 106079, 106083, 106087, 106091, 106095, 106099, 106103, 
+    106107, 106111, 106115, 106119, 106123, 106127, 106131, 106135, 106139, 
+    106143, 106147, 106151, 106155, 106159, 106163, 106167, 106171, 106175, 
+    106179, 106183, 106187, 106191, 106195, 106199, 106203, 106207, 106211, 
+    106215, 106219, 106223, 106227, 106231, 106235, 106239, 106243, 106247, 
+    106251, 106255, 106259, 106263, 106267, 106271, 106275, 106279, 106283, 
+    106287, 106291, 106295, 106299, 106303, 106307, 106311, 106315, 106319, 
+    106323, 106327, 106331, 106335, 106339, 106343, 106347, 106351, 106355, 
+    106359, 106363, 106367, 106371, 106375, 106379, 106383, 106387, 106391, 
+    106395, 106399, 106403, 106407, 106411, 106415, 106419, 106423, 106427, 
+    106431, 106435, 106439, 106443, 106447, 106451, 106455, 106459, 106463, 
+    106467, 106471, 106475, 106479, 106483, 106487, 106491, 106495, 106499, 
+    106503, 106507, 106511, 106515, 106519, 106523, 106527, 106531, 106535, 
+    106539, 106543, 106547, 106551, 106555, 106559, 106563, 106567, 106571, 
+    106575, 106579, 106583, 106587, 106591, 106595, 106599, 106603, 106607, 
+    106611, 106615, 106619, 106623, 106627, 106631, 106635, 106639, 106643, 
+    106647, 106651, 106655, 106659, 106663, 106667, 106671, 106675, 106679, 
+    106683, 106687, 106691, 106695, 106699, 106703, 106707, 106711, 106715, 
+    106719, 106723, 106727, 106731, 106735, 106739, 106743, 106747, 106751, 
+    106755, 106759, 106763, 106767, 106771, 106775, 106779, 106783, 106787, 
+    106791, 106795, 106799, 106803, 106807, 106811, 106815, 106819, 106823, 
+    106827, 106831, 106835, 106839, 106843, 106847, 106851, 106855, 106859, 
+    106863, 106867, 106871, 106875, 106879, 106883, 106887, 106891, 106895, 
+    106899, 106903, 106907, 106911, 106915, 106919, 106923, 106927, 106931, 
+    106935, 106939, 106943, 106947, 106951, 106955, 106959, 106963, 106967, 
+    106971, 106975, 106979, 106983, 106987, 106991, 106995, 106999, 107003, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 107007, 107014, 107021, 107030, 107039, 
+    107046, 107051, 107058, 107065, 107074, 107085, 107096, 107101, 107108, 
+    107113, 107118, 107123, 107128, 107133, 107138, 107143, 107148, 107153, 
+    107158, 107163, 107170, 107177, 107182, 107187, 107192, 107197, 107204, 
+    107211, 107219, 107224, 107231, 107236, 107241, 107246, 107251, 107256, 
+    107263, 107270, 107275, 107280, 107285, 107290, 107295, 107300, 107305, 
+    107310, 107315, 107320, 107325, 107330, 107335, 107340, 107345, 107350, 
+    107355, 107360, 107365, 107372, 107377, 107382, 107391, 107398, 107403, 
+    107408, 107413, 107418, 107423, 107428, 107433, 107438, 107443, 107448, 
+    107453, 107458, 107463, 107468, 107473, 107478, 107483, 107488, 107493, 
+    107498, 107503, 107509, 107517, 107523, 107531, 107539, 107547, 107553, 
+    107559, 107565, 107571, 107577, 107585, 107595, 107603, 107611, 107617, 
+    107623, 107631, 107639, 107645, 107653, 107661, 107669, 107675, 107681, 
+    107687, 107693, 107699, 107705, 107713, 107721, 107727, 107733, 107739, 
+    107745, 107751, 107759, 107765, 107771, 107777, 107783, 107789, 107795, 
+    107803, 107809, 107815, 107821, 107827, 107835, 107843, 107849, 107855, 
+    107861, 107866, 107872, 107878, 107885, 107890, 107895, 107900, 107905, 
+    107910, 107915, 107920, 107925, 107930, 107939, 107946, 107951, 107956, 
+    107961, 107968, 107973, 107978, 107983, 107990, 107995, 108000, 108005, 
+    108010, 108015, 108020, 108025, 108030, 108035, 108040, 108045, 108052, 
+    108057, 108064, 108069, 108074, 108081, 108086, 108091, 108096, 108101, 
+    108106, 108111, 108116, 108121, 108126, 108131, 108136, 108141, 108146, 
+    108151, 108156, 108161, 108166, 108171, 108176, 108183, 108188, 108193, 
+    108198, 108203, 108208, 108213, 108218, 108223, 108228, 108233, 108238, 
+    108243, 108248, 108255, 108260, 108265, 108272, 108277, 108282, 108287, 
+    108292, 108297, 108302, 108307, 108312, 108317, 108322, 108329, 108334, 
+    108339, 108344, 108349, 108354, 108361, 108368, 108373, 108378, 108383, 
+    108388, 108393, 108398, 108403, 108408, 108413, 108418, 108423, 108428, 
+    108433, 108438, 108443, 108448, 108453, 108458, 108463, 108468, 108473, 
+    108478, 108483, 108488, 108493, 108498, 108503, 108508, 108513, 108518, 
+    108523, 108528, 108533, 108538, 108543, 108548, 108555, 108560, 108565, 
+    108570, 108575, 108580, 108585, 108590, 108595, 108600, 108605, 108610, 
+    108615, 108620, 108625, 108630, 108635, 108640, 108645, 108650, 108655, 
+    108660, 108665, 108670, 108675, 108680, 108685, 108690, 108695, 108700, 
+    108705, 108710, 108715, 108720, 108725, 108730, 108735, 108740, 108745, 
+    108750, 108755, 108760, 108765, 108770, 108775, 108780, 108785, 108790, 
+    108795, 108800, 108805, 108810, 108815, 108820, 108825, 108830, 108835, 
+    108840, 108845, 108852, 108857, 108862, 108867, 108872, 108877, 108882, 
+    108886, 108891, 108896, 108901, 108906, 108911, 108916, 108921, 108926, 
+    108931, 108936, 108941, 108946, 108951, 108956, 108963, 108968, 108973, 
+    108979, 108984, 108989, 108994, 108999, 109004, 109009, 109014, 109019, 
+    109024, 109029, 109034, 109039, 109044, 109049, 109054, 109059, 109064, 
+    109069, 109074, 109079, 109084, 109089, 109094, 109099, 109104, 109109, 
+    109114, 109119, 109124, 109129, 109134, 109139, 109144, 109149, 109154, 
+    109159, 109164, 109169, 109174, 109179, 109184, 109189, 109194, 109201, 
+    109206, 109211, 109218, 109225, 109230, 109235, 109240, 109245, 109250, 
+    109255, 109260, 109265, 109270, 109275, 109280, 109285, 109290, 109295, 
+    109300, 109305, 109310, 109315, 109320, 109325, 109330, 109335, 109340, 
+    109345, 109350, 109357, 109362, 109367, 109372, 109377, 109382, 109387, 
+    109392, 109397, 109402, 109407, 109412, 109417, 109422, 109427, 109432, 
+    109437, 109442, 109447, 109454, 109459, 109464, 109469, 109474, 109479, 
+    109484, 109489, 109495, 109500, 109505, 109510, 109515, 109520, 109525, 
+    109530, 109535, 109542, 109549, 109554, 109559, 109563, 109568, 109572, 
+    109576, 109581, 109588, 109593, 109598, 109607, 109612, 109617, 109622, 
+    109627, 109634, 109641, 109646, 109651, 109656, 109661, 109668, 109673, 
+    109678, 109683, 109688, 109693, 109698, 109703, 109708, 109713, 109718, 
+    109723, 109728, 109735, 109739, 109744, 109749, 109754, 109759, 109763, 
+    109768, 109773, 109778, 109783, 109788, 109793, 109798, 109803, 109808, 
+    109814, 109820, 109826, 109832, 109838, 109844, 109850, 109856, 109862, 
+    109868, 109874, 109880, 109885, 109891, 109897, 109903, 109909, 109915, 
+    109921, 109927, 109933, 109939, 109945, 109951, 109956, 109962, 109968, 
+    109974, 109980, 109986, 109992, 109998, 110004, 110010, 110016, 110022, 
+    110028, 110034, 110040, 110046, 110052, 110058, 110064, 110070, 110076, 
+    110081, 110087, 110093, 110099, 110105, 110111, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110117, 110120, 110124, 
+    110128, 110132, 110135, 110139, 110144, 110148, 110152, 110156, 110160, 
+    110164, 110169, 110174, 110178, 110182, 110185, 110189, 110194, 110199, 
+    110203, 110207, 110211, 110215, 110219, 110223, 110227, 110231, 110235, 
+    110239, 110242, 110246, 110250, 110254, 110258, 110262, 110266, 110272, 
+    110275, 110279, 110283, 110287, 110291, 110295, 110299, 110303, 110307, 
+    110311, 110316, 110321, 110327, 110331, 110335, 110339, 110343, 110347, 
+    110351, 110356, 110359, 110363, 110367, 110371, 110375, 110381, 110385, 
+    110389, 110393, 110397, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110401, 110405, 
+    110409, 110415, 110421, 110425, 110430, 110435, 110440, 110445, 110449, 
+    110454, 110459, 110464, 110468, 110473, 110478, 110483, 110487, 110492, 
+    110497, 110502, 110507, 110512, 110517, 110522, 110527, 110531, 110536, 
+    110541, 110546, 110551, 110556, 110561, 110566, 110571, 110576, 110581, 
+    110586, 110593, 110598, 110605, 110610, 110615, 110620, 110625, 110630, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110635, 110639, 110645, 
+    110648, 110651, 110655, 110659, 110663, 110667, 110671, 110675, 110679, 
+    110685, 110691, 110697, 110703, 110709, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110715, 110720, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    110726, 110731, 110736, 110741, 110748, 110755, 110762, 110769, 110774, 
+    110779, 110784, 110789, 110796, 110801, 110808, 110815, 110820, 110825, 
+    110830, 110837, 110842, 110847, 110854, 110861, 110866, 110871, 110876, 
+    110883, 110890, 110897, 110902, 110907, 110914, 110921, 110928, 110935, 
+    110940, 110945, 110950, 110957, 110962, 110967, 110972, 110979, 110988, 
+    110995, 111000, 111005, 111010, 111015, 111020, 111025, 111034, 111041, 
+    111046, 111053, 111060, 111065, 111070, 111075, 111082, 111087, 111094, 
+    111101, 111106, 111111, 111116, 111123, 111130, 111135, 111140, 111147, 
+    111154, 111161, 111166, 111171, 111176, 111181, 111188, 111197, 111206, 
+    111211, 111218, 111227, 111232, 111237, 111242, 111247, 111254, 111261, 
+    111268, 111275, 111280, 111285, 111290, 111297, 111304, 111311, 111316, 
+    111321, 111328, 111333, 111340, 111345, 111352, 111357, 111364, 111371, 
+    111376, 111381, 111386, 111391, 111396, 111401, 111406, 111411, 111416, 
+    111423, 111430, 111437, 111444, 111451, 111460, 111465, 111470, 111477, 
+    111484, 111489, 111496, 111503, 111510, 111517, 111524, 111531, 111536, 
+    111541, 111546, 111551, 111556, 111565, 111574, 111583, 111592, 111601, 
+    111610, 111619, 111628, 111633, 111644, 111655, 111664, 111669, 111674, 
+    111679, 111684, 111693, 111700, 111707, 111714, 111721, 111728, 111735, 
+    111744, 111753, 111764, 111773, 111784, 111793, 111800, 111809, 111820, 
+    111829, 111838, 111847, 111856, 111863, 111870, 111877, 111886, 111895, 
+    111906, 111915, 111924, 111935, 111940, 111945, 111956, 111964, 111973, 
+    111982, 111991, 112002, 112011, 112020, 112031, 112042, 112053, 112064, 
+    112075, 112086, 112093, 112100, 112107, 112114, 112125, 112134, 112141, 
+    112148, 112155, 112166, 112177, 112188, 112199, 112210, 112221, 112232, 
+    112243, 112250, 112257, 112266, 112275, 112282, 112289, 112296, 112305, 
+    112314, 112323, 112330, 112339, 112348, 112357, 112364, 112371, 112376, 
+    112382, 112389, 112396, 112403, 112410, 112417, 112424, 112433, 112442, 
+    112451, 112460, 112467, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112476, 112482, 
+    112487, 112492, 112499, 112505, 112511, 112517, 112523, 112529, 112535, 
+    112541, 112545, 112549, 112555, 112561, 112567, 112571, 112576, 112581, 
+    112585, 112589, 112592, 112598, 112604, 112610, 112616, 112622, 112628, 
+    112634, 112640, 112646, 112656, 112666, 112672, 112678, 112688, 112698, 
+    112704, 0, 0, 112710, 112718, 112723, 112728, 112734, 112740, 112746, 
+    112752, 112758, 112764, 112771, 112778, 112784, 112790, 112796, 112802, 
+    112808, 112814, 112820, 112826, 112831, 112837, 112843, 112849, 112855, 
+    112861, 112870, 112876, 112881, 112889, 112896, 112903, 112912, 112921, 
+    112930, 112939, 112948, 112957, 112966, 112975, 112985, 112995, 113003, 
+    113011, 113020, 113029, 113035, 113041, 113047, 113053, 113061, 113069, 
+    113073, 113079, 113084, 113090, 113096, 113102, 113108, 113114, 113123, 
+    113128, 113135, 113140, 113145, 113150, 113156, 113162, 113168, 113175, 
+    113180, 113185, 113190, 113195, 113200, 113206, 113212, 113218, 113224, 
+    113230, 113236, 113242, 113248, 113253, 113258, 113263, 113268, 113273, 
+    113278, 113283, 113288, 113294, 113300, 113305, 113310, 113315, 113320, 
+    113325, 113331, 113338, 113342, 113346, 113350, 113354, 113358, 113362, 
+    113366, 113370, 113378, 113388, 113392, 113396, 113402, 113408, 113414, 
+    113420, 113426, 113432, 113438, 113444, 113450, 113456, 113462, 113468, 
+    113474, 113480, 113484, 113488, 113495, 113501, 113507, 113513, 113518, 
+    113525, 113530, 113536, 113542, 113548, 113554, 113559, 113563, 113569, 
+    113573, 113577, 113581, 113587, 113593, 113597, 113603, 113609, 113615, 
+    113621, 113627, 113635, 113643, 113649, 113655, 113661, 113667, 113679, 
+    113691, 113705, 113717, 113729, 113743, 113757, 113771, 113775, 113783, 
+    113791, 113796, 113800, 113804, 113808, 113812, 113816, 113820, 113824, 
+    113830, 113836, 113842, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 113848, 113854, 
+    113860, 113866, 113872, 113878, 113884, 113890, 113896, 113902, 113908, 
+    113914, 113920, 113926, 113932, 113938, 113944, 113950, 113956, 113962, 
+    113968, 113974, 113980, 113986, 113992, 113998, 114004, 114010, 114016, 
+    114022, 114028, 114034, 114040, 114046, 114052, 114058, 114064, 114070, 
+    114076, 114082, 114088, 114094, 114100, 114106, 114112, 114118, 114124, 
+    114130, 114136, 114142, 114148, 114154, 114160, 114166, 114172, 114178, 
+    114184, 114190, 114196, 114202, 114208, 114214, 114220, 114226, 114232, 
+    114238, 114244, 114249, 114254, 114259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    114258, 114263, 114270, 114277, 114284, 114291, 114296, 114300, 114306, 
-    114310, 114314, 114320, 114324, 114328, 114332, 114338, 114345, 114349, 
-    114353, 114357, 114361, 114365, 114369, 114375, 114379, 114383, 114387, 
-    114391, 114395, 114399, 114403, 114407, 114411, 114415, 114419, 114423, 
-    114428, 114432, 114436, 114440, 114444, 114448, 114452, 114456, 114460, 
-    114464, 114471, 114475, 114483, 114487, 114491, 114495, 114499, 114503, 
-    114507, 114511, 114518, 114522, 114526, 114530, 114534, 114538, 114544, 
-    114548, 114554, 114558, 114562, 114566, 114570, 114574, 114578, 114582, 
-    114586, 114590, 114594, 114598, 114602, 114606, 114610, 114614, 114618, 
-    114622, 114626, 114630, 114638, 114642, 114646, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 114650, 114658, 114666, 114674, 114682, 114690, 114698, 114706, 
-    114714, 114722, 114730, 114738, 114746, 114754, 114762, 114770, 114778, 
-    114786, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 114794, 114798, 114803, 
-    114808, 114813, 114817, 114822, 114827, 114832, 114836, 114841, 114846, 
-    114850, 114854, 114859, 114863, 114868, 114873, 114877, 114882, 114887, 
-    114891, 114896, 114901, 114906, 114911, 114916, 114920, 114925, 114930, 
-    114935, 114939, 114944, 114949, 114954, 114958, 114963, 114968, 114972, 
-    114976, 114981, 114985, 114990, 114995, 114999, 115004, 115009, 115013, 
-    115018, 115023, 115028, 115033, 115038, 115042, 115047, 115052, 115057, 
-    115061, 115066, 115071, 115076, 115080, 115085, 115090, 115094, 115098, 
-    115103, 115107, 115112, 115117, 115121, 115126, 115131, 115135, 115140, 
-    115145, 115150, 115155, 115160, 115164, 115169, 115174, 115179, 115183, 
-    115188, 0, 115193, 115197, 115202, 115207, 115211, 115215, 115220, 
-    115224, 115229, 115234, 115238, 115243, 115248, 115252, 115257, 115262, 
-    115267, 115272, 115277, 115282, 115288, 115294, 115300, 115305, 115311, 
-    115317, 115323, 115328, 115334, 115340, 115345, 115350, 115356, 115361, 
-    115367, 115373, 115378, 115384, 115390, 115395, 115401, 115407, 115413, 
-    115419, 115425, 115430, 115436, 115442, 115448, 115453, 115459, 115465, 
-    115471, 115476, 115482, 115488, 115493, 115498, 115504, 115509, 115515, 
-    115521, 115526, 115532, 115538, 115543, 115549, 115555, 115561, 115567, 
-    115573, 0, 115577, 115582, 0, 0, 115587, 0, 0, 115592, 115597, 0, 0, 
-    115602, 115607, 115611, 115616, 0, 115621, 115626, 115631, 115635, 
-    115640, 115645, 115650, 115655, 115660, 115664, 115669, 115674, 0, 
-    115679, 0, 115684, 115689, 115693, 115698, 115703, 115707, 115711, 0, 
-    115716, 115721, 115726, 115730, 115735, 115740, 115744, 115749, 115754, 
-    115759, 115764, 115769, 115774, 115780, 115786, 115792, 115797, 115803, 
-    115809, 115815, 115820, 115826, 115832, 115837, 115842, 115848, 115853, 
-    115859, 115865, 115870, 115876, 115882, 115887, 115893, 115899, 115905, 
-    115911, 115917, 115922, 115928, 115934, 115940, 115945, 115951, 115957, 
-    115963, 115968, 115974, 115980, 115985, 115990, 115996, 116001, 116007, 
-    116013, 116018, 116024, 116030, 116035, 116041, 116047, 116053, 116059, 
-    116065, 116069, 0, 116074, 116079, 116083, 116088, 0, 0, 116093, 116098, 
-    116103, 116107, 116111, 116116, 116120, 116125, 0, 116130, 116135, 
-    116140, 116144, 116149, 116154, 116159, 0, 116164, 116168, 116173, 
-    116178, 116183, 116187, 116192, 116197, 116202, 116206, 116211, 116216, 
-    116220, 116224, 116229, 116233, 116238, 116243, 116247, 116252, 116257, 
-    116261, 116266, 116271, 116276, 116281, 116286, 116290, 0, 116295, 
-    116300, 116304, 116309, 0, 116314, 116318, 116323, 116328, 116332, 0, 
-    116336, 0, 0, 0, 116340, 116345, 116350, 116354, 116359, 116364, 116369, 
-    0, 116374, 116378, 116383, 116388, 116393, 116397, 116402, 116407, 
-    116412, 116416, 116421, 116426, 116430, 116434, 116439, 116443, 116448, 
-    116453, 116457, 116462, 116467, 116471, 116476, 116481, 116486, 116491, 
-    116496, 116501, 116507, 116513, 116519, 116524, 116530, 116536, 116542, 
-    116547, 116553, 116559, 116564, 116569, 116575, 116580, 116586, 116592, 
-    116597, 116603, 116609, 116614, 116620, 116626, 116632, 116638, 116644, 
-    116649, 116655, 116661, 116667, 116672, 116678, 116684, 116690, 116695, 
-    116701, 116707, 116712, 116717, 116723, 116728, 116734, 116740, 116745, 
-    116751, 116757, 116762, 116768, 116774, 116780, 116786, 116792, 116796, 
-    116801, 116806, 116811, 116815, 116820, 116825, 116830, 116834, 116839, 
-    116844, 116848, 116852, 116857, 116861, 116866, 116871, 116875, 116880, 
-    116885, 116889, 116894, 116899, 116904, 116909, 116914, 116918, 116923, 
-    116928, 116933, 116937, 116942, 116947, 116952, 116956, 116961, 116966, 
-    116970, 116974, 116979, 116983, 116988, 116993, 116997, 117002, 117007, 
-    117011, 117016, 117021, 117026, 117031, 117036, 117041, 117047, 117053, 
-    117059, 117064, 117070, 117076, 117082, 117087, 117093, 117099, 117104, 
-    117109, 117115, 117120, 117126, 117132, 117137, 117143, 117149, 117154, 
-    117160, 117166, 117172, 117178, 117184, 117189, 117195, 117201, 117207, 
-    117212, 117218, 117224, 117230, 117235, 117241, 117247, 117252, 117257, 
-    117263, 117268, 117274, 117280, 117285, 117291, 117297, 117302, 117308, 
-    117314, 117320, 117326, 117332, 117337, 117343, 117349, 117355, 117360, 
-    117366, 117372, 117378, 117383, 117389, 117395, 117400, 117405, 117411, 
-    117416, 117422, 117428, 117433, 117439, 117445, 117450, 117456, 117462, 
-    117468, 117474, 117480, 117485, 117491, 117497, 117503, 117508, 117514, 
-    117520, 117526, 117531, 117537, 117543, 117548, 117553, 117559, 117564, 
-    117570, 117576, 117581, 117587, 117593, 117598, 117604, 117610, 117616, 
-    117622, 117628, 117634, 117641, 117648, 117655, 117661, 117668, 117675, 
-    117682, 117688, 117695, 117702, 117708, 117714, 117721, 117727, 117734, 
-    117741, 117747, 117754, 117761, 117767, 117774, 117781, 117788, 117795, 
-    117802, 117808, 117815, 117822, 117829, 117835, 117842, 117849, 117856, 
-    117862, 117869, 117876, 117882, 117888, 117895, 117901, 117908, 117915, 
-    117921, 117928, 117935, 117941, 117948, 117955, 117962, 117969, 117976, 
-    117981, 117987, 117993, 117999, 118004, 118010, 118016, 118022, 118027, 
-    118033, 118039, 118044, 118049, 118055, 118060, 118066, 118072, 118077, 
-    118083, 118089, 118094, 118100, 118106, 118112, 118118, 118124, 118129, 
-    118135, 118141, 118147, 118152, 118158, 118164, 118170, 118175, 118181, 
-    118187, 118192, 118197, 118203, 118208, 118214, 118220, 118225, 118231, 
-    118237, 118242, 118248, 118254, 118260, 118266, 118272, 118278, 0, 0, 
-    118285, 118290, 118295, 118300, 118305, 118310, 118315, 118320, 118325, 
-    118330, 118335, 118340, 118345, 118350, 118355, 118360, 118365, 118370, 
-    118376, 118381, 118386, 118391, 118396, 118401, 118406, 118411, 118415, 
-    118420, 118425, 118430, 118435, 118440, 118445, 118450, 118455, 118460, 
-    118465, 118470, 118475, 118480, 118485, 118490, 118495, 118500, 118506, 
-    118511, 118516, 118521, 118526, 118531, 118536, 118541, 118547, 118552, 
-    118557, 118562, 118567, 118572, 118577, 118582, 118587, 118592, 118597, 
-    118602, 118607, 118612, 118617, 118622, 118627, 118632, 118637, 118642, 
-    118647, 118652, 118657, 118662, 118668, 118673, 118678, 118683, 118688, 
-    118693, 118698, 118703, 118707, 118712, 118717, 118722, 118727, 118732, 
-    118737, 118742, 118747, 118752, 118757, 118762, 118767, 118772, 118777, 
-    118782, 118787, 118792, 118798, 118803, 118808, 118813, 118818, 118823, 
-    118828, 118833, 118839, 118844, 118849, 118854, 118859, 118864, 118869, 
-    118875, 118881, 118887, 118893, 118899, 118905, 118911, 118917, 118923, 
-    118929, 118935, 118941, 118947, 118953, 118959, 118965, 118971, 118978, 
-    118984, 118990, 118996, 119002, 119008, 119014, 119020, 119025, 119031, 
-    119037, 119043, 119049, 119055, 119061, 119067, 119073, 119079, 119085, 
-    119091, 119097, 119103, 119109, 119115, 119121, 119127, 119134, 119140, 
-    119146, 119152, 119158, 119164, 119170, 119176, 119183, 119189, 119195, 
-    119201, 119207, 119213, 119219, 119225, 119231, 119237, 119243, 119249, 
-    119255, 119261, 119267, 119273, 119279, 119285, 119291, 119297, 119303, 
-    119309, 119315, 119321, 119328, 119334, 119340, 119346, 119352, 119358, 
-    119364, 119370, 119375, 119381, 119387, 119393, 119399, 119405, 119411, 
-    119417, 119423, 119429, 119435, 119441, 119447, 119453, 119459, 119465, 
-    119471, 119477, 119484, 119490, 119496, 119502, 119508, 119514, 119520, 
-    119526, 119533, 119539, 119545, 119551, 119557, 119563, 119569, 119576, 
-    119583, 119590, 119597, 119604, 119611, 119618, 119625, 119632, 119639, 
-    119646, 119653, 119660, 119667, 119674, 119681, 119688, 119696, 119703, 
-    119710, 119717, 119724, 119731, 119738, 119745, 119751, 119758, 119765, 
-    119772, 119779, 119786, 119793, 119800, 119807, 119814, 119821, 119828, 
-    119835, 119842, 119849, 119856, 119863, 119870, 119878, 119885, 119892, 
-    119899, 119906, 119913, 119920, 119927, 119935, 119942, 119949, 119956, 
-    119963, 119970, 119977, 119982, 0, 0, 119987, 119992, 119996, 120000, 
-    120004, 120008, 120012, 120016, 120020, 120024, 120028, 120033, 120037, 
-    120041, 120045, 120049, 120053, 120057, 120061, 120065, 120069, 120074, 
-    120078, 120082, 120086, 120090, 120094, 120098, 120102, 120106, 120110, 
-    120116, 120121, 120126, 120131, 120136, 120141, 120146, 120151, 120156, 
-    120161, 120167, 120172, 120177, 120182, 120187, 120192, 120197, 120202, 
-    120207, 120212, 120216, 120220, 120224, 0, 120228, 120232, 120236, 
-    120240, 120244, 120248, 120252, 120256, 120260, 120264, 120268, 120272, 
-    120276, 120280, 120284, 120288, 120292, 120296, 120300, 120304, 120308, 
-    120312, 120316, 120320, 120326, 120332, 120338, 0, 120344, 120349, 0, 
-    120354, 0, 0, 120359, 0, 120364, 120369, 120374, 120379, 120384, 120389, 
-    120394, 120399, 120404, 120409, 0, 120414, 120419, 120424, 120429, 0, 
-    120434, 0, 120439, 0, 0, 0, 0, 0, 0, 120444, 0, 0, 0, 0, 120450, 0, 
-    120456, 0, 120462, 0, 120468, 120474, 120480, 0, 120486, 120492, 0, 
-    120498, 0, 0, 120504, 0, 120510, 0, 120516, 0, 120522, 0, 120530, 0, 
-    120538, 120544, 0, 120550, 0, 0, 120556, 120562, 120568, 120574, 0, 
-    120580, 120586, 120592, 120598, 120604, 120610, 120616, 0, 120622, 
-    120628, 120634, 120640, 0, 120646, 120652, 120658, 120664, 0, 120672, 0, 
-    120680, 120686, 120692, 120698, 120704, 120710, 120716, 120722, 120728, 
-    120734, 0, 120740, 120746, 120752, 120758, 120764, 120770, 120776, 
-    120782, 120788, 120794, 120800, 120806, 120812, 120818, 120824, 120830, 
-    120836, 0, 0, 0, 0, 0, 120842, 120847, 120852, 0, 120857, 120862, 120867, 
-    120872, 120877, 0, 120882, 120887, 120892, 120897, 120902, 120907, 
-    120912, 120917, 120922, 120927, 120932, 120937, 120942, 120947, 120952, 
-    120957, 120962, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 120967, 120977, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 120985, 120992, 120999, 121006, 121013, 121020, 121027, 
-    121033, 121040, 121047, 121054, 121062, 121070, 121078, 121086, 121094, 
-    121102, 121109, 121116, 121123, 121131, 121139, 121147, 121155, 121163, 
-    121171, 121178, 121185, 121192, 121200, 121208, 121216, 121224, 121232, 
-    121240, 121245, 121250, 121255, 121260, 121265, 121270, 121275, 121280, 
-    121285, 0, 0, 0, 0, 121290, 121295, 121299, 121303, 121307, 121311, 
-    121315, 121319, 121323, 121327, 121331, 121335, 121339, 121343, 121347, 
-    121351, 121355, 121359, 121363, 121367, 121371, 121375, 121379, 121383, 
-    121387, 121391, 121395, 121399, 121403, 121407, 121411, 121415, 121419, 
-    121423, 121427, 121431, 121435, 121439, 121443, 121447, 121451, 121455, 
-    121459, 121463, 121467, 121471, 121475, 121479, 121483, 121487, 121491, 
-    121496, 121500, 121504, 121508, 121512, 121516, 121520, 121524, 121528, 
-    121532, 121536, 121540, 121544, 121548, 121552, 121556, 121560, 121564, 
-    121568, 121572, 121576, 121580, 121584, 121588, 121592, 121596, 121600, 
-    121604, 121608, 121612, 121616, 121620, 121624, 121628, 121632, 121636, 
-    121640, 121644, 121648, 121652, 121656, 121660, 121664, 121668, 121672, 
-    121676, 121680, 121684, 121688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    121692, 121698, 121707, 121715, 121723, 121732, 121741, 121750, 121759, 
-    121768, 121777, 121786, 121795, 121804, 121813, 0, 0, 121822, 121831, 
-    121839, 121847, 121856, 121865, 121874, 121883, 121892, 121901, 121910, 
-    121919, 121928, 121937, 0, 0, 121946, 121955, 121963, 121971, 121980, 
-    121989, 121998, 122007, 122016, 122025, 122034, 122043, 122052, 122061, 
-    122070, 0, 122077, 122086, 122094, 122102, 122111, 122120, 122129, 
-    122138, 122147, 122156, 122165, 122174, 122183, 122192, 122201, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 122208, 122215, 122220, 122224, 122228, 122232, 122237, 
-    122242, 122247, 122252, 122257, 0, 0, 0, 0, 0, 122262, 122267, 122273, 
-    122279, 122285, 122290, 122296, 122302, 122308, 122313, 122319, 122325, 
-    122330, 122335, 122341, 122346, 122352, 122358, 122363, 122369, 122375, 
-    122380, 122386, 122392, 122398, 122404, 122410, 122421, 122428, 122434, 
-    122437, 0, 122440, 122445, 122451, 122457, 122463, 122468, 122474, 
-    122480, 122486, 122491, 122497, 122503, 122508, 122513, 122519, 122524, 
-    122530, 122536, 122541, 122547, 122553, 122558, 122564, 122570, 122576, 
-    122582, 122588, 122591, 122594, 122597, 122600, 122603, 122606, 122612, 
-    122619, 122626, 122633, 122639, 122646, 122653, 122660, 122666, 122673, 
-    122680, 122686, 122692, 122699, 122705, 122712, 122719, 122725, 122732, 
-    122739, 122745, 122752, 122759, 122766, 122773, 122780, 122785, 0, 0, 0, 
-    0, 122790, 122796, 122803, 122810, 122817, 122823, 122830, 122837, 
-    122844, 122850, 122857, 122864, 122870, 122876, 122883, 122889, 122896, 
-    122903, 122909, 122916, 122923, 122929, 122936, 122943, 122950, 122957, 
-    122964, 122973, 122977, 122980, 122983, 122987, 122991, 122994, 122997, 
-    123000, 123003, 123006, 123009, 123012, 123015, 123018, 123024, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    123027, 123034, 123042, 123050, 123058, 123065, 123073, 123081, 123089, 
-    123096, 123104, 123112, 123119, 123126, 123134, 123141, 123149, 123157, 
-    123164, 123172, 123180, 123187, 123195, 123203, 123211, 123219, 123227, 
-    123231, 123235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123238, 123244, 
-    123250, 123256, 123260, 123266, 123272, 123278, 123284, 123290, 123296, 
-    123302, 123308, 123314, 123320, 123326, 123332, 123338, 123344, 123350, 
-    123356, 123362, 123368, 123374, 123380, 123386, 123392, 123398, 123404, 
-    123410, 123416, 123422, 123428, 123434, 123440, 123446, 123452, 123458, 
-    123464, 123470, 123476, 123482, 123488, 0, 0, 0, 0, 0, 123494, 123505, 
-    123516, 123527, 123538, 123549, 123560, 123571, 123582, 0, 0, 0, 0, 0, 0, 
-    0, 123593, 123597, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 123601, 123603, 123605, 123609, 123614, 123619, 123621, 
-    123627, 123632, 123634, 123640, 123644, 123646, 123650, 123656, 123662, 
-    123668, 123673, 123677, 123684, 123691, 123698, 123703, 123710, 123717, 
-    123724, 123728, 123734, 123743, 123752, 123759, 123764, 123768, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123772, 123774, 123776, 123780, 
-    123784, 123788, 0, 123790, 123792, 123796, 123798, 123800, 123802, 
-    123804, 123809, 123814, 123816, 123822, 123826, 123830, 123838, 123840, 
-    123842, 123844, 123846, 123848, 123850, 123852, 123854, 123856, 123858, 
-    123862, 123866, 123868, 123870, 123872, 123874, 123876, 123881, 123887, 
-    123891, 123895, 123899, 123903, 123908, 123912, 123914, 123916, 123920, 
-    123926, 123928, 123930, 123932, 123936, 123945, 123951, 123955, 123959, 
-    123961, 123963, 123966, 123968, 123970, 123972, 123976, 123978, 123982, 
-    123987, 123989, 123994, 124000, 124007, 124011, 124015, 124019, 124023, 
-    124029, 0, 0, 0, 124033, 124035, 124039, 124043, 124045, 124049, 124053, 
-    124055, 124059, 124061, 124065, 124069, 124073, 124077, 124081, 124085, 
-    124089, 124093, 124099, 124103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    124107, 124111, 124115, 124119, 124126, 124128, 124132, 124134, 124136, 
-    124140, 124144, 124148, 124150, 124154, 124158, 124162, 124166, 124170, 
-    124172, 124176, 124178, 124184, 124187, 124192, 124194, 124196, 124199, 
-    124201, 124203, 124206, 124213, 124220, 124227, 124232, 124236, 124238, 
-    124240, 0, 124242, 124244, 124248, 124252, 124256, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124258, 124262, 124267, 124271, 
-    124277, 124283, 124285, 124287, 124293, 124295, 124299, 124303, 124305, 
-    124309, 124311, 124315, 124319, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 124323, 124325, 124327, 124329, 124333, 124335, 124337, 124339, 
-    124341, 124343, 124345, 124347, 124349, 124351, 124353, 124355, 124357, 
-    124359, 124361, 124363, 124365, 124367, 124369, 124371, 124373, 124375, 
-    124377, 124381, 124383, 124385, 124387, 124391, 124393, 124397, 124399, 
-    124401, 124405, 124409, 124415, 124417, 124419, 124421, 124423, 124427, 
-    124431, 124433, 124437, 124441, 124445, 124449, 124453, 124457, 124461, 
-    124465, 124469, 124473, 124477, 124481, 124485, 124489, 124493, 124497, 
-    124501, 0, 124505, 0, 124507, 124509, 124511, 124513, 124515, 124523, 
-    124531, 124539, 124547, 124552, 124557, 124562, 124566, 124570, 124575, 
-    124579, 124581, 124585, 124587, 124589, 124591, 124593, 124595, 124597, 
-    124599, 124603, 124605, 124607, 124609, 124613, 124617, 124621, 124625, 
-    124629, 124631, 124637, 124643, 124645, 124647, 124649, 124651, 124653, 
-    124662, 124669, 124676, 124680, 124687, 124692, 124699, 124708, 124713, 
-    124717, 124721, 124723, 124727, 124729, 124733, 124737, 124739, 124743, 
-    124747, 124751, 124753, 124755, 124761, 124763, 124765, 124767, 124771, 
-    124775, 124777, 124781, 124783, 124785, 124788, 124792, 124794, 124798, 
-    124800, 124802, 124807, 124809, 124813, 124817, 124820, 124824, 124828, 
-    124832, 124836, 124840, 124844, 124848, 124853, 124857, 124861, 124870, 
-    124875, 124878, 124880, 124883, 124886, 124891, 124893, 124896, 124901, 
-    124905, 124908, 124912, 124916, 124919, 124924, 124928, 124932, 124936, 
-    124940, 124946, 124952, 124958, 124964, 124969, 124980, 124982, 124986, 
-    124988, 124990, 124994, 124998, 125000, 125004, 125009, 125014, 125020, 
-    125022, 125026, 125030, 125037, 125044, 125048, 125050, 125052, 125056, 
-    125058, 125062, 125066, 125070, 125072, 125074, 125081, 125085, 125088, 
-    125092, 125096, 125100, 125102, 125106, 125108, 125110, 125114, 125116, 
-    125120, 125124, 125130, 125134, 125138, 125142, 125144, 125147, 125151, 
-    125158, 125167, 125176, 125184, 125192, 125194, 125198, 125200, 125204, 
-    125215, 125219, 125225, 125231, 125236, 0, 125238, 125242, 125244, 
-    125246, 0, 0, 0, 125248, 125253, 125263, 125278, 125290, 125302, 125306, 
-    125310, 125316, 125318, 125326, 125334, 125336, 125340, 125346, 125352, 
-    125359, 125366, 125368, 125370, 125373, 125375, 125381, 125383, 125386, 
-    125390, 125396, 125402, 125413, 125419, 125426, 125434, 125438, 125446, 
-    125454, 125460, 125466, 125473, 125475, 125479, 125481, 125483, 125488, 
-    125490, 125492, 125494, 125496, 125500, 125511, 125517, 125521, 125525, 
-    125529, 125535, 125541, 125547, 125553, 125558, 125563, 125569, 125575, 
-    125582, 0, 0, 125589, 125594, 125602, 125606, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 125615, 125622, 125629, 125636, 125644, 125652, 125660, 125668, 
-    125676, 125684, 125692, 125700, 125708, 125714, 125720, 125726, 125732, 
-    125738, 125744, 125750, 125756, 125762, 125768, 125774, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 125780, 
-    125784, 125788, 125793, 125798, 125800, 125804, 125813, 125821, 125829, 
-    125842, 125855, 125868, 125875, 125882, 125886, 125895, 125903, 125907, 
-    125916, 125923, 125927, 125931, 125935, 125939, 125946, 125950, 125954, 
-    125958, 125962, 125969, 125978, 125987, 125994, 126006, 126018, 126022, 
-    126026, 126030, 126034, 126038, 126042, 126050, 126058, 126066, 126070, 
-    126074, 126078, 126082, 126086, 126090, 126096, 126102, 126106, 126117, 
-    126125, 126129, 126133, 126137, 126141, 126147, 126154, 126165, 126175, 
-    126185, 126196, 126205, 126216, 126222, 126228, 0, 0, 0, 0, 126234, 
-    126243, 126250, 126256, 126260, 126264, 126268, 126277, 126289, 126293, 
-    126300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 126307, 126309, 126311, 126315, 126319, 126323, 126332, 126334, 
-    126336, 126339, 126341, 126343, 126347, 126349, 126353, 126355, 126359, 
-    126361, 126363, 126367, 126371, 126377, 126379, 126383, 126385, 126389, 
-    126393, 126397, 126401, 126403, 126405, 126409, 126413, 126417, 126421, 
-    126423, 126425, 126427, 126432, 126437, 126440, 126448, 126456, 126458, 
-    126463, 126466, 126471, 126482, 126489, 126494, 126499, 126501, 126505, 
-    126507, 126511, 126513, 126517, 126521, 126524, 126527, 126529, 126532, 
-    126534, 126538, 126540, 126542, 126544, 126548, 126550, 126554, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 126557, 126562, 126567, 126572, 126577, 126582, 
-    126587, 126594, 126601, 126608, 126615, 126620, 126625, 126630, 126635, 
-    126642, 126648, 126655, 126662, 126669, 126674, 126679, 126684, 126689, 
-    126694, 126701, 126708, 126713, 126718, 126725, 126732, 126740, 126748, 
-    126755, 126762, 126770, 126778, 126786, 126793, 126803, 126814, 126819, 
-    126826, 126833, 126840, 126848, 126856, 126867, 126875, 126883, 126891, 
-    126896, 126901, 126906, 126911, 126916, 126921, 126926, 126931, 126936, 
-    126941, 126946, 126951, 126958, 126963, 126968, 126975, 126980, 126985, 
-    126990, 126995, 127000, 127005, 127010, 127015, 127020, 127025, 127030, 
-    127035, 127042, 127050, 127055, 127060, 127067, 127072, 127077, 127082, 
-    127089, 127094, 127101, 127106, 127113, 127118, 127127, 127136, 127141, 
-    127146, 127151, 127156, 127161, 127166, 127171, 127176, 127181, 127186, 
-    127191, 127196, 127201, 127209, 127217, 127222, 127227, 127232, 127237, 
-    127242, 127248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127254, 127258, 
-    127262, 127266, 127270, 127274, 127278, 127282, 127286, 127290, 127294, 
-    127298, 127302, 127306, 127310, 127314, 127318, 127322, 127326, 127330, 
-    127334, 127338, 127342, 127346, 127350, 127354, 127358, 127362, 127366, 
-    127370, 127374, 127378, 127382, 127386, 127390, 127394, 127398, 127402, 
-    127406, 127410, 127414, 127418, 127422, 127426, 127430, 127434, 127438, 
-    127442, 127446, 127450, 127454, 127458, 127462, 127466, 127470, 127474, 
-    127478, 127482, 127486, 127490, 127494, 127498, 127502, 127506, 127510, 
-    127514, 127518, 127522, 127526, 127530, 127534, 127538, 127542, 127546, 
-    127550, 127554, 127558, 127562, 127566, 127570, 127574, 127578, 127582, 
-    127586, 127590, 127594, 127598, 127602, 127606, 127610, 127614, 127618, 
-    127622, 127626, 127630, 127634, 127638, 127642, 127646, 127650, 127654, 
-    127658, 127662, 127666, 127670, 127674, 127678, 127682, 127686, 127690, 
-    127694, 127698, 127702, 127706, 127710, 127714, 127718, 127722, 127726, 
-    127730, 127734, 127738, 127742, 127746, 127750, 127754, 127758, 127762, 
-    127766, 127770, 127774, 127778, 127782, 127786, 127790, 127794, 127798, 
-    127802, 127806, 127810, 127814, 127818, 127822, 127826, 127830, 127834, 
-    127838, 127842, 127846, 127850, 127854, 127858, 127862, 127866, 127870, 
-    127874, 127878, 127882, 127886, 127890, 127894, 127898, 127902, 127906, 
-    127910, 127914, 127918, 127922, 127926, 127930, 127934, 127938, 127942, 
-    127946, 127950, 127954, 127958, 127962, 127966, 127970, 127974, 127978, 
-    127982, 127986, 127990, 127994, 127998, 128002, 128006, 128010, 128014, 
-    128018, 128022, 128026, 128030, 128034, 128038, 128042, 128046, 128050, 
-    128054, 128058, 128062, 128066, 128070, 128074, 128078, 128082, 128086, 
-    128090, 128094, 128098, 128102, 128106, 128110, 128114, 128118, 128122, 
-    128126, 128130, 128134, 128138, 128142, 128146, 128150, 128154, 128158, 
-    128162, 128166, 128170, 128174, 128178, 128182, 128186, 128190, 128194, 
-    128198, 128202, 128206, 128210, 128214, 128218, 128222, 128226, 128230, 
-    128234, 128238, 128242, 128246, 128250, 128254, 128258, 128262, 128266, 
-    128270, 128274, 128278, 128282, 128286, 128290, 128294, 128298, 128302, 
-    128306, 128310, 128314, 128318, 128322, 128326, 128330, 128334, 128338, 
-    128342, 128346, 128350, 128354, 128358, 128362, 128366, 128370, 128374, 
-    128378, 128382, 128386, 128390, 128394, 128398, 128402, 128406, 128410, 
-    128414, 128418, 128422, 128426, 128430, 128434, 128438, 128442, 128446, 
-    128450, 128454, 128458, 128462, 128466, 128470, 128474, 128478, 128482, 
-    128486, 128490, 128494, 128498, 128502, 128506, 128510, 128514, 128518, 
-    128522, 128526, 128530, 128534, 128538, 128542, 128546, 128550, 128554, 
-    128558, 128562, 128566, 128570, 128574, 128578, 128582, 128586, 128590, 
-    128594, 128598, 128602, 128606, 128610, 128614, 128618, 128622, 128626, 
-    128630, 128634, 128638, 128642, 128646, 128650, 128654, 128658, 128662, 
-    128666, 128670, 128674, 128678, 128682, 128686, 128690, 128694, 128698, 
-    128702, 128706, 128710, 128714, 128718, 128722, 128726, 128730, 128734, 
-    128738, 128742, 128746, 128750, 128754, 128758, 128762, 128766, 128770, 
-    128774, 128778, 128782, 128786, 128790, 128794, 128798, 128802, 128806, 
-    128810, 128814, 128818, 128822, 128826, 128830, 128834, 128838, 128842, 
-    128846, 128850, 128854, 128858, 128862, 128866, 128870, 128874, 128878, 
-    128882, 128886, 128890, 128894, 128898, 128902, 128906, 128910, 128914, 
-    128918, 128922, 128926, 128930, 128934, 128938, 128942, 128946, 128950, 
-    128954, 128958, 128962, 128966, 128970, 128974, 128978, 128982, 128986, 
-    128990, 128994, 128998, 129002, 129006, 129010, 129014, 129018, 129022, 
-    129026, 129030, 129034, 129038, 129042, 129046, 129050, 129054, 129058, 
-    129062, 129066, 129070, 129074, 129078, 129082, 129086, 129090, 129094, 
-    129098, 129102, 129106, 129110, 129114, 129118, 129122, 129126, 129130, 
-    129134, 129138, 129142, 129146, 129150, 129154, 129158, 129162, 129166, 
-    129170, 129174, 129178, 129182, 129186, 129190, 129194, 129198, 129202, 
-    129206, 129210, 129214, 129218, 129222, 129226, 129230, 129234, 129238, 
-    129242, 129246, 129250, 129254, 129258, 129262, 129266, 129270, 129274, 
-    129278, 129282, 129286, 129290, 129294, 129298, 129302, 129306, 129310, 
-    129314, 129318, 129322, 129326, 129330, 129334, 129338, 129342, 129346, 
-    129350, 129354, 129358, 129362, 129366, 129370, 129374, 129378, 129382, 
-    129386, 129390, 129394, 129398, 129402, 129406, 129410, 129414, 129418, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 129422, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129426, 129429, 129433, 129437, 129440, 
-    129444, 129448, 129451, 129454, 129458, 129462, 129465, 129468, 129471, 
-    129474, 129479, 129482, 129486, 129489, 129492, 129495, 129498, 129501, 
-    129504, 129507, 129510, 129513, 129516, 129519, 129523, 129527, 129531, 
-    129535, 129540, 129545, 129551, 129557, 129563, 129568, 129574, 129580, 
-    129586, 129591, 129597, 129603, 129608, 129613, 129619, 129624, 129630, 
-    129636, 129641, 129647, 129653, 129658, 129664, 129670, 129676, 129682, 
-    129688, 129692, 129697, 129701, 129706, 129710, 129715, 129720, 129726, 
-    129732, 129738, 129743, 129749, 129755, 129761, 129766, 129772, 129778, 
-    129783, 129788, 129794, 129799, 129805, 129811, 129816, 129822, 129828, 
-    129833, 129839, 129845, 129851, 129857, 129863, 129868, 129872, 129877, 
-    129879, 129883, 129886, 129889, 129892, 129895, 129898, 129901, 129904, 
-    129907, 129910, 129913, 129916, 129919, 129922, 129925, 129928, 129931, 
-    129934, 129937, 129940, 129943, 129946, 129949, 129952, 129955, 129958, 
-    129961, 129964, 129967, 129970, 129973, 129976, 129979, 129982, 129985, 
-    129988, 129991, 129994, 129997, 130000, 130003, 130006, 130009, 130012, 
-    130015, 130018, 130021, 130024, 130027, 130030, 130033, 130036, 130039, 
-    130042, 130045, 130048, 130051, 130054, 130057, 130060, 130063, 130066, 
-    130069, 130072, 130075, 130078, 130081, 130084, 130087, 130090, 130093, 
-    130096, 130099, 130102, 130105, 130108, 130111, 130114, 130117, 130120, 
-    130123, 130126, 130129, 130132, 130135, 130138, 130141, 130144, 130147, 
-    130150, 130153, 130156, 130159, 130162, 130165, 130168, 130171, 130174, 
-    130177, 130180, 130183, 130186, 130189, 130192, 130195, 130198, 130201, 
-    130204, 130207, 130210, 130213, 130216, 130219, 130222, 130225, 130228, 
-    130231, 130234, 130237, 130240, 130243, 130246, 130249, 130252, 130255, 
-    130258, 130261, 130264, 130267, 130270, 130273, 130276, 130279, 130282, 
-    130285, 130288, 130291, 130294, 130297, 130300, 130303, 130306, 130309, 
-    130312, 130315, 130318, 130321, 130324, 130327, 130330, 130333, 130336, 
-    130339, 130342, 130345, 130348, 130351, 130354, 130357, 130360, 130363, 
-    130366, 130369, 130372, 130375, 130378, 130381, 130384, 130387, 130390, 
-    130393, 130396, 130399, 130402, 130405, 130408, 130411, 130414, 130417, 
-    130420, 130423, 130426, 130429, 130432, 130435, 130438, 130441, 130444, 
-    130447, 130450, 130453, 130456, 130459, 130462, 130465, 130468, 130471, 
-    130474, 130477, 130480, 130483, 130486, 130489, 130492, 130495, 130498, 
-    130501, 130504, 130507, 130510, 130513, 130516, 130519, 130522, 130525, 
-    130528, 130531, 130534, 130537, 130540, 130543, 130546, 130549, 130552, 
-    130555, 130558, 130561, 130564, 130567, 130570, 130573, 130576, 130579, 
-    130582, 130585, 130588, 130591, 130594, 130597, 130600, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130603, 130605, 130607, 130612, 130614, 
-    130619, 130621, 130626, 130628, 130633, 130635, 130637, 130639, 130641, 
-    130643, 130645, 130647, 130649, 130651, 130654, 130657, 130659, 130661, 
-    130665, 130668, 130673, 130675, 130677, 130679, 130683, 130686, 130688, 
-    130692, 130694, 130698, 130700, 130704, 130707, 130709, 130713, 130717, 
-    130719, 130725, 130727, 130732, 130734, 130739, 130741, 130746, 130748, 
-    130753, 130755, 130758, 130760, 130764, 130766, 130773, 130775, 130777, 
-    130779, 130784, 130786, 130788, 130790, 130792, 130794, 130799, 130803, 
-    130805, 130810, 130814, 130816, 130821, 130825, 130827, 130832, 130836, 
-    130838, 130840, 130842, 130844, 130848, 130850, 130855, 130857, 130863, 
-    130865, 130871, 130873, 130875, 130877, 130881, 130883, 130890, 130892, 
-    130899, 130901, 130906, 130911, 130913, 130919, 130925, 130927, 130933, 
-    130938, 130940, 130946, 130952, 130954, 130960, 130966, 130968, 130974, 
-    130978, 130980, 130985, 130987, 130989, 130994, 130996, 130998, 131004, 
-    131006, 131011, 131015, 131017, 131022, 131026, 131028, 131034, 131036, 
-    131040, 131042, 131046, 131048, 131055, 131062, 131064, 131071, 131078, 
-    131080, 131085, 131087, 131094, 131096, 131101, 131103, 131109, 131111, 
-    131115, 131117, 131123, 131125, 131129, 131131, 131137, 131139, 131141, 
-    131143, 131148, 131153, 131155, 131159, 131166, 131173, 131178, 131183, 
-    131195, 131197, 131199, 131201, 131203, 131205, 131207, 131209, 131211, 
-    131213, 131215, 131217, 131219, 131221, 131223, 131225, 131227, 131229, 
-    131235, 131242, 131247, 131252, 131263, 131265, 131267, 131269, 131271, 
-    131273, 131275, 131277, 131279, 131281, 131283, 131285, 131287, 131289, 
-    131291, 131293, 131295, 131300, 131302, 131304, 131315, 131317, 131319, 
-    131321, 131323, 131325, 131327, 131329, 131331, 131333, 131335, 131337, 
-    131339, 131341, 131343, 131345, 131347, 131349, 131351, 131353, 131355, 
-    131357, 131359, 131361, 131363, 131365, 131367, 131369, 131371, 131373, 
-    131375, 131377, 131379, 131381, 131383, 131385, 131387, 131389, 131391, 
-    131393, 131395, 131397, 131399, 131401, 131403, 131405, 131407, 131409, 
-    131411, 131413, 131415, 131417, 131419, 131421, 131423, 131425, 131427, 
-    131429, 131431, 131433, 131435, 131437, 131439, 131441, 131443, 131445, 
-    131447, 131449, 131451, 131453, 131455, 131457, 131459, 131461, 131463, 
-    131465, 131467, 131469, 131471, 131473, 131475, 131477, 131479, 131481, 
-    131483, 131485, 131487, 131489, 131491, 131493, 131495, 131497, 131499, 
-    131501, 131503, 131505, 131507, 131509, 131511, 131513, 131515, 131517, 
-    131519, 131521, 131523, 131525, 131527, 131529, 131531, 131533, 131535, 
-    131537, 131539, 131541, 131543, 131545, 131547, 131549, 131551, 131553, 
-    131555, 131557, 131559, 131561, 131563, 131565, 131567, 131569, 131571, 
-    131573, 131575, 131577, 131579, 131581, 131583, 131585, 131587, 131589, 
-    131591, 131593, 131595, 131597, 131599, 131601, 131603, 131605, 131607, 
-    131609, 131611, 131613, 131615, 131617, 131619, 131621, 131623, 131625, 
-    131627, 131629, 131631, 131633, 131635, 131637, 131639, 131641, 131643, 
-    131645, 131647, 131649, 131651, 131653, 131655, 131657, 131659, 131661, 
-    131663, 131665, 131667, 131669, 131671, 131673, 131675, 131677, 131679, 
-    131681, 131683, 131685, 131687, 131689, 131691, 131693, 131695, 131697, 
-    131699, 131701, 131703, 131705, 131707, 131709, 131711, 131713, 131715, 
-    131717, 131719, 131721, 131723, 131725, 131727, 131729, 131731, 131733, 
-    131735, 131737, 131739, 131741, 131743, 131745, 131747, 131749, 131751, 
-    131753, 131755, 131757, 131759, 131761, 131763, 131765, 131767, 131769, 
-    131771, 131773, 131775, 131777, 131779, 131781, 131783, 131785, 131787, 
-    131789, 131791, 131793, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    131795, 131805, 131815, 131824, 131833, 131846, 131859, 131871, 131883, 
-    131893, 131903, 131913, 131923, 131934, 131945, 131955, 131964, 131973, 
-    131982, 131995, 132008, 132020, 132032, 132042, 132052, 132062, 132072, 
-    132081, 132090, 132099, 132108, 132117, 132126, 132135, 132144, 132153, 
-    132162, 132171, 132180, 132191, 132201, 132211, 132224, 132234, 132247, 
-    132254, 132264, 132271, 132278, 132285, 132292, 132299, 132306, 132315, 
-    132324, 132333, 132342, 132351, 132360, 132369, 132378, 132386, 132394, 
-    132401, 132411, 132420, 132428, 132435, 132445, 132454, 132458, 132462, 
-    132466, 132470, 132474, 132478, 132482, 132486, 132490, 132494, 132497, 
-    132501, 132504, 132507, 132511, 132515, 132519, 132523, 132527, 132531, 
-    132535, 132539, 132543, 132547, 132551, 132555, 132559, 132563, 132567, 
-    132571, 132575, 132579, 132583, 132587, 132591, 132595, 132599, 132603, 
-    132607, 132611, 132615, 132619, 132623, 132627, 132631, 132635, 132639, 
-    132643, 132647, 132651, 132655, 132659, 132663, 132667, 132671, 132675, 
-    132679, 132683, 132687, 132691, 132695, 132699, 132703, 132707, 132711, 
-    132715, 132719, 132723, 132727, 132731, 132735, 132739, 132743, 132747, 
-    132751, 132755, 132759, 132763, 132767, 132771, 132775, 132779, 132783, 
-    132787, 132791, 132795, 132799, 132803, 132807, 132811, 132815, 132819, 
-    132823, 132827, 132831, 132835, 132839, 132843, 132847, 132850, 132854, 
-    132858, 132862, 132866, 132870, 132874, 132878, 132882, 132886, 132890, 
-    132894, 132898, 132902, 132906, 132910, 132914, 132918, 132922, 132926, 
-    132930, 132934, 132938, 132942, 132946, 132950, 132954, 132958, 132962, 
-    132966, 132970, 132974, 132978, 132982, 132986, 132990, 132994, 132998, 
-    133002, 133006, 133010, 133014, 133018, 133022, 133026, 133030, 133034, 
-    133038, 133042, 133046, 133050, 133054, 133058, 133062, 133066, 133070, 
-    133074, 133078, 133082, 133086, 133090, 133094, 133098, 133102, 133106, 
-    133110, 133114, 133118, 133122, 133126, 133130, 133134, 133138, 133142, 
-    133146, 133150, 133154, 133158, 133162, 133166, 133170, 133174, 133178, 
-    133182, 133186, 133190, 133194, 133198, 133202, 133206, 133210, 133214, 
-    133218, 133222, 133226, 133230, 133234, 133238, 133242, 133246, 133250, 
-    133254, 133258, 133262, 133266, 133270, 133274, 133278, 133282, 133286, 
-    133290, 133294, 133298, 133302, 133306, 133310, 133314, 133318, 133322, 
-    133326, 133330, 133334, 133338, 133342, 133346, 133350, 133354, 133358, 
-    133362, 133366, 133370, 133374, 133378, 133382, 133386, 133390, 133394, 
-    133398, 133402, 133406, 133410, 133414, 133418, 133422, 133426, 133430, 
-    133434, 133438, 133442, 133446, 133450, 133454, 133458, 133462, 133466, 
-    133470, 133474, 133478, 133482, 133486, 133490, 133494, 133498, 133502, 
-    133506, 133510, 133514, 133518, 133522, 133526, 133530, 133534, 133538, 
-    133542, 133546, 133550, 133554, 133558, 133562, 133566, 133570, 133574, 
-    133578, 133582, 133586, 133590, 133594, 133598, 133602, 133606, 133610, 
-    133614, 133619, 133624, 133629, 133633, 133639, 133646, 133653, 133660, 
-    133667, 133674, 133681, 133688, 133695, 133702, 133709, 133716, 133723, 
-    133730, 133736, 133743, 133750, 133756, 133763, 133770, 133777, 133784, 
-    133791, 133798, 133805, 133812, 133819, 133826, 133833, 133840, 133847, 
-    133853, 133859, 133866, 133873, 133882, 133891, 133900, 133909, 133914, 
-    133919, 133925, 133931, 133937, 133943, 133949, 133955, 133961, 133967, 
-    133973, 133979, 133985, 133991, 133996, 134002, 134012, 0, 0, 0, 0, 0, 0, 
+    114263, 114268, 114275, 114282, 114289, 114296, 114301, 114305, 114311, 
+    114315, 114319, 114325, 114329, 114333, 114337, 114343, 114350, 114354, 
+    114358, 114362, 114366, 114370, 114374, 114380, 114384, 114388, 114392, 
+    114396, 114400, 114404, 114408, 114412, 114416, 114420, 114424, 114428, 
+    114433, 114437, 114441, 114445, 114449, 114453, 114457, 114461, 114465, 
+    114469, 114476, 114480, 114488, 114492, 114496, 114500, 114504, 114508, 
+    114512, 114516, 114523, 114527, 114531, 114535, 114539, 114543, 114549, 
+    114553, 114559, 114563, 114567, 114571, 114575, 114579, 114583, 114587, 
+    114591, 114595, 114599, 114603, 114607, 114611, 114615, 114619, 114623, 
+    114627, 114631, 114635, 114643, 114647, 114651, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 114655, 114663, 114671, 114679, 114687, 114695, 114703, 114711, 
+    114719, 114727, 114735, 114743, 114751, 114759, 114767, 114775, 114783, 
+    114791, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 114799, 114803, 114808, 
+    114813, 114818, 114822, 114827, 114832, 114837, 114841, 114846, 114851, 
+    114855, 114859, 114864, 114868, 114873, 114878, 114882, 114887, 114892, 
+    114896, 114901, 114906, 114911, 114916, 114921, 114925, 114930, 114935, 
+    114940, 114944, 114949, 114954, 114959, 114963, 114968, 114973, 114977, 
+    114981, 114986, 114990, 114995, 115000, 115004, 115009, 115014, 115018, 
+    115023, 115028, 115033, 115038, 115043, 115047, 115052, 115057, 115062, 
+    115066, 115071, 115076, 115081, 115085, 115090, 115095, 115099, 115103, 
+    115108, 115112, 115117, 115122, 115126, 115131, 115136, 115140, 115145, 
+    115150, 115155, 115160, 115165, 115169, 115174, 115179, 115184, 115188, 
+    115193, 0, 115198, 115202, 115207, 115212, 115216, 115220, 115225, 
+    115229, 115234, 115239, 115243, 115248, 115253, 115257, 115262, 115267, 
+    115272, 115277, 115282, 115287, 115293, 115299, 115305, 115310, 115316, 
+    115322, 115328, 115333, 115339, 115345, 115350, 115355, 115361, 115366, 
+    115372, 115378, 115383, 115389, 115395, 115400, 115406, 115412, 115418, 
+    115424, 115430, 115435, 115441, 115447, 115453, 115458, 115464, 115470, 
+    115476, 115481, 115487, 115493, 115498, 115503, 115509, 115514, 115520, 
+    115526, 115531, 115537, 115543, 115548, 115554, 115560, 115566, 115572, 
+    115578, 0, 115582, 115587, 0, 0, 115592, 0, 0, 115597, 115602, 0, 0, 
+    115607, 115612, 115616, 115621, 0, 115626, 115631, 115636, 115640, 
+    115645, 115650, 115655, 115660, 115665, 115669, 115674, 115679, 0, 
+    115684, 0, 115689, 115694, 115698, 115703, 115708, 115712, 115716, 0, 
+    115721, 115726, 115731, 115735, 115740, 115745, 115749, 115754, 115759, 
+    115764, 115769, 115774, 115779, 115785, 115791, 115797, 115802, 115808, 
+    115814, 115820, 115825, 115831, 115837, 115842, 115847, 115853, 115858, 
+    115864, 115870, 115875, 115881, 115887, 115892, 115898, 115904, 115910, 
+    115916, 115922, 115927, 115933, 115939, 115945, 115950, 115956, 115962, 
+    115968, 115973, 115979, 115985, 115990, 115995, 116001, 116006, 116012, 
+    116018, 116023, 116029, 116035, 116040, 116046, 116052, 116058, 116064, 
+    116070, 116074, 0, 116079, 116084, 116088, 116093, 0, 0, 116098, 116103, 
+    116108, 116112, 116116, 116121, 116125, 116130, 0, 116135, 116140, 
+    116145, 116149, 116154, 116159, 116164, 0, 116169, 116173, 116178, 
+    116183, 116188, 116192, 116197, 116202, 116207, 116211, 116216, 116221, 
+    116225, 116229, 116234, 116238, 116243, 116248, 116252, 116257, 116262, 
+    116266, 116271, 116276, 116281, 116286, 116291, 116295, 0, 116300, 
+    116305, 116309, 116314, 0, 116319, 116323, 116328, 116333, 116337, 0, 
+    116341, 0, 0, 0, 116345, 116350, 116355, 116359, 116364, 116369, 116374, 
+    0, 116379, 116383, 116388, 116393, 116398, 116402, 116407, 116412, 
+    116417, 116421, 116426, 116431, 116435, 116439, 116444, 116448, 116453, 
+    116458, 116462, 116467, 116472, 116476, 116481, 116486, 116491, 116496, 
+    116501, 116506, 116512, 116518, 116524, 116529, 116535, 116541, 116547, 
+    116552, 116558, 116564, 116569, 116574, 116580, 116585, 116591, 116597, 
+    116602, 116608, 116614, 116619, 116625, 116631, 116637, 116643, 116649, 
+    116654, 116660, 116666, 116672, 116677, 116683, 116689, 116695, 116700, 
+    116706, 116712, 116717, 116722, 116728, 116733, 116739, 116745, 116750, 
+    116756, 116762, 116767, 116773, 116779, 116785, 116791, 116797, 116801, 
+    116806, 116811, 116816, 116820, 116825, 116830, 116835, 116839, 116844, 
+    116849, 116853, 116857, 116862, 116866, 116871, 116876, 116880, 116885, 
+    116890, 116894, 116899, 116904, 116909, 116914, 116919, 116923, 116928, 
+    116933, 116938, 116942, 116947, 116952, 116957, 116961, 116966, 116971, 
+    116975, 116979, 116984, 116988, 116993, 116998, 117002, 117007, 117012, 
+    117016, 117021, 117026, 117031, 117036, 117041, 117046, 117052, 117058, 
+    117064, 117069, 117075, 117081, 117087, 117092, 117098, 117104, 117109, 
+    117114, 117120, 117125, 117131, 117137, 117142, 117148, 117154, 117159, 
+    117165, 117171, 117177, 117183, 117189, 117194, 117200, 117206, 117212, 
+    117217, 117223, 117229, 117235, 117240, 117246, 117252, 117257, 117262, 
+    117268, 117273, 117279, 117285, 117290, 117296, 117302, 117307, 117313, 
+    117319, 117325, 117331, 117337, 117342, 117348, 117354, 117360, 117365, 
+    117371, 117377, 117383, 117388, 117394, 117400, 117405, 117410, 117416, 
+    117421, 117427, 117433, 117438, 117444, 117450, 117455, 117461, 117467, 
+    117473, 117479, 117485, 117490, 117496, 117502, 117508, 117513, 117519, 
+    117525, 117531, 117536, 117542, 117548, 117553, 117558, 117564, 117569, 
+    117575, 117581, 117586, 117592, 117598, 117603, 117609, 117615, 117621, 
+    117627, 117633, 117639, 117646, 117653, 117660, 117666, 117673, 117680, 
+    117687, 117693, 117700, 117707, 117713, 117719, 117726, 117732, 117739, 
+    117746, 117752, 117759, 117766, 117772, 117779, 117786, 117793, 117800, 
+    117807, 117813, 117820, 117827, 117834, 117840, 117847, 117854, 117861, 
+    117867, 117874, 117881, 117887, 117893, 117900, 117906, 117913, 117920, 
+    117926, 117933, 117940, 117946, 117953, 117960, 117967, 117974, 117981, 
+    117986, 117992, 117998, 118004, 118009, 118015, 118021, 118027, 118032, 
+    118038, 118044, 118049, 118054, 118060, 118065, 118071, 118077, 118082, 
+    118088, 118094, 118099, 118105, 118111, 118117, 118123, 118129, 118134, 
+    118140, 118146, 118152, 118157, 118163, 118169, 118175, 118180, 118186, 
+    118192, 118197, 118202, 118208, 118213, 118219, 118225, 118230, 118236, 
+    118242, 118247, 118253, 118259, 118265, 118271, 118277, 118283, 0, 0, 
+    118290, 118295, 118300, 118305, 118310, 118315, 118320, 118325, 118330, 
+    118335, 118340, 118345, 118350, 118355, 118360, 118365, 118370, 118375, 
+    118381, 118386, 118391, 118396, 118401, 118406, 118411, 118416, 118420, 
+    118425, 118430, 118435, 118440, 118445, 118450, 118455, 118460, 118465, 
+    118470, 118475, 118480, 118485, 118490, 118495, 118500, 118505, 118511, 
+    118516, 118521, 118526, 118531, 118536, 118541, 118546, 118552, 118557, 
+    118562, 118567, 118572, 118577, 118582, 118587, 118592, 118597, 118602, 
+    118607, 118612, 118617, 118622, 118627, 118632, 118637, 118642, 118647, 
+    118652, 118657, 118662, 118667, 118673, 118678, 118683, 118688, 118693, 
+    118698, 118703, 118708, 118712, 118717, 118722, 118727, 118732, 118737, 
+    118742, 118747, 118752, 118757, 118762, 118767, 118772, 118777, 118782, 
+    118787, 118792, 118797, 118803, 118808, 118813, 118818, 118823, 118828, 
+    118833, 118838, 118844, 118849, 118854, 118859, 118864, 118869, 118874, 
+    118880, 118886, 118892, 118898, 118904, 118910, 118916, 118922, 118928, 
+    118934, 118940, 118946, 118952, 118958, 118964, 118970, 118976, 118983, 
+    118989, 118995, 119001, 119007, 119013, 119019, 119025, 119030, 119036, 
+    119042, 119048, 119054, 119060, 119066, 119072, 119078, 119084, 119090, 
+    119096, 119102, 119108, 119114, 119120, 119126, 119132, 119139, 119145, 
+    119151, 119157, 119163, 119169, 119175, 119181, 119188, 119194, 119200, 
+    119206, 119212, 119218, 119224, 119230, 119236, 119242, 119248, 119254, 
+    119260, 119266, 119272, 119278, 119284, 119290, 119296, 119302, 119308, 
+    119314, 119320, 119326, 119333, 119339, 119345, 119351, 119357, 119363, 
+    119369, 119375, 119380, 119386, 119392, 119398, 119404, 119410, 119416, 
+    119422, 119428, 119434, 119440, 119446, 119452, 119458, 119464, 119470, 
+    119476, 119482, 119489, 119495, 119501, 119507, 119513, 119519, 119525, 
+    119531, 119538, 119544, 119550, 119556, 119562, 119568, 119574, 119581, 
+    119588, 119595, 119602, 119609, 119616, 119623, 119630, 119637, 119644, 
+    119651, 119658, 119665, 119672, 119679, 119686, 119693, 119701, 119708, 
+    119715, 119722, 119729, 119736, 119743, 119750, 119756, 119763, 119770, 
+    119777, 119784, 119791, 119798, 119805, 119812, 119819, 119826, 119833, 
+    119840, 119847, 119854, 119861, 119868, 119875, 119883, 119890, 119897, 
+    119904, 119911, 119918, 119925, 119932, 119940, 119947, 119954, 119961, 
+    119968, 119975, 119982, 119987, 0, 0, 119992, 119997, 120001, 120005, 
+    120009, 120013, 120017, 120021, 120025, 120029, 120033, 120038, 120042, 
+    120046, 120050, 120054, 120058, 120062, 120066, 120070, 120074, 120079, 
+    120083, 120087, 120091, 120095, 120099, 120103, 120107, 120111, 120115, 
+    120121, 120126, 120131, 120136, 120141, 120146, 120151, 120156, 120161, 
+    120166, 120172, 120177, 120182, 120187, 120192, 120197, 120202, 120207, 
+    120212, 120217, 120221, 120225, 120229, 0, 120233, 120237, 120241, 
+    120245, 120249, 120253, 120257, 120261, 120265, 120269, 120273, 120277, 
+    120281, 120285, 120289, 120293, 120297, 120301, 120305, 120309, 120313, 
+    120317, 120321, 120325, 120331, 120337, 120343, 0, 120349, 120354, 0, 
+    120359, 0, 0, 120364, 0, 120369, 120374, 120379, 120384, 120389, 120394, 
+    120399, 120404, 120409, 120414, 0, 120419, 120424, 120429, 120434, 0, 
+    120439, 0, 120444, 0, 0, 0, 0, 0, 0, 120449, 0, 0, 0, 0, 120455, 0, 
+    120461, 0, 120467, 0, 120473, 120479, 120485, 0, 120491, 120497, 0, 
+    120503, 0, 0, 120509, 0, 120515, 0, 120521, 0, 120527, 0, 120535, 0, 
+    120543, 120549, 0, 120555, 0, 0, 120561, 120567, 120573, 120579, 0, 
+    120585, 120591, 120597, 120603, 120609, 120615, 120621, 0, 120627, 
+    120633, 120639, 120645, 0, 120651, 120657, 120663, 120669, 0, 120677, 0, 
+    120685, 120691, 120697, 120703, 120709, 120715, 120721, 120727, 120733, 
+    120739, 0, 120745, 120751, 120757, 120763, 120769, 120775, 120781, 
+    120787, 120793, 120799, 120805, 120811, 120817, 120823, 120829, 120835, 
+    120841, 0, 0, 0, 0, 0, 120847, 120852, 120857, 0, 120862, 120867, 120872, 
+    120877, 120882, 0, 120887, 120892, 120897, 120902, 120907, 120912, 
+    120917, 120922, 120927, 120932, 120937, 120942, 120947, 120952, 120957, 
+    120962, 120967, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 120972, 120982, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 120990, 120997, 121004, 121011, 121018, 121025, 121032, 
+    121038, 121045, 121052, 121059, 121067, 121075, 121083, 121091, 121099, 
+    121107, 121114, 121121, 121128, 121136, 121144, 121152, 121160, 121168, 
+    121176, 121183, 121190, 121197, 121205, 121213, 121221, 121229, 121237, 
+    121245, 121250, 121255, 121260, 121265, 121270, 121275, 121280, 121285, 
+    121290, 0, 0, 0, 0, 121295, 121300, 121304, 121308, 121312, 121316, 
+    121320, 121324, 121328, 121332, 121336, 121340, 121344, 121348, 121352, 
+    121356, 121360, 121364, 121368, 121372, 121376, 121380, 121384, 121388, 
+    121392, 121396, 121400, 121404, 121408, 121412, 121416, 121420, 121424, 
+    121428, 121432, 121436, 121440, 121444, 121448, 121452, 121456, 121460, 
+    121464, 121468, 121472, 121476, 121480, 121484, 121488, 121492, 121496, 
+    121501, 121505, 121509, 121513, 121517, 121521, 121525, 121529, 121533, 
+    121537, 121541, 121545, 121549, 121553, 121557, 121561, 121565, 121569, 
+    121573, 121577, 121581, 121585, 121589, 121593, 121597, 121601, 121605, 
+    121609, 121613, 121617, 121621, 121625, 121629, 121633, 121637, 121641, 
+    121645, 121649, 121653, 121657, 121661, 121665, 121669, 121673, 121677, 
+    121681, 121685, 121689, 121693, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    121697, 121703, 121712, 121720, 121728, 121737, 121746, 121755, 121764, 
+    121773, 121782, 121791, 121800, 121809, 121818, 0, 0, 121827, 121836, 
+    121844, 121852, 121861, 121870, 121879, 121888, 121897, 121906, 121915, 
+    121924, 121933, 121942, 0, 0, 121951, 121960, 121968, 121976, 121985, 
+    121994, 122003, 122012, 122021, 122030, 122039, 122048, 122057, 122066, 
+    122075, 0, 122082, 122091, 122099, 122107, 122116, 122125, 122134, 
+    122143, 122152, 122161, 122170, 122179, 122188, 122197, 122206, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 122213, 122220, 122225, 122229, 122233, 122237, 122242, 
+    122247, 122252, 122257, 122262, 0, 0, 0, 0, 0, 122267, 122272, 122278, 
+    122284, 122290, 122295, 122301, 122307, 122313, 122318, 122324, 122330, 
+    122335, 122340, 122346, 122351, 122357, 122363, 122368, 122374, 122380, 
+    122385, 122391, 122397, 122403, 122409, 122415, 122426, 122433, 122439, 
+    122442, 0, 122445, 122450, 122456, 122462, 122468, 122473, 122479, 
+    122485, 122491, 122496, 122502, 122508, 122513, 122518, 122524, 122529, 
+    122535, 122541, 122546, 122552, 122558, 122563, 122569, 122575, 122581, 
+    122587, 122593, 122596, 122599, 122602, 122605, 122608, 122611, 122617, 
+    122624, 122631, 122638, 122644, 122651, 122658, 122665, 122671, 122678, 
+    122685, 122691, 122697, 122704, 122710, 122717, 122724, 122730, 122737, 
+    122744, 122750, 122757, 122764, 122771, 122778, 122785, 122790, 0, 0, 0, 
+    0, 122795, 122801, 122808, 122815, 122822, 122828, 122835, 122842, 
+    122849, 122855, 122862, 122869, 122875, 122881, 122888, 122894, 122901, 
+    122908, 122914, 122921, 122928, 122934, 122941, 122948, 122955, 122962, 
+    122969, 122978, 122982, 122985, 122988, 122992, 122996, 122999, 123002, 
+    123005, 123008, 123011, 123014, 123017, 123020, 123023, 123029, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    123032, 123039, 123047, 123055, 123063, 123070, 123078, 123086, 123094, 
+    123101, 123109, 123117, 123124, 123131, 123139, 123146, 123154, 123162, 
+    123169, 123177, 123185, 123192, 123200, 123208, 123216, 123224, 123232, 
+    123236, 123240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123243, 123249, 
+    123255, 123261, 123265, 123271, 123277, 123283, 123289, 123295, 123301, 
+    123307, 123313, 123319, 123325, 123331, 123337, 123343, 123349, 123355, 
+    123361, 123367, 123373, 123379, 123385, 123391, 123397, 123403, 123409, 
+    123415, 123421, 123427, 123433, 123439, 123445, 123451, 123457, 123463, 
+    123469, 123475, 123481, 123487, 123493, 0, 0, 0, 0, 0, 123499, 123510, 
+    123521, 123532, 123543, 123554, 123565, 123576, 123587, 0, 0, 0, 0, 0, 0, 
+    0, 123598, 123602, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 123606, 123608, 123610, 123614, 123619, 123624, 123626, 
+    123632, 123637, 123639, 123645, 123649, 123651, 123655, 123661, 123667, 
+    123673, 123678, 123682, 123689, 123696, 123703, 123708, 123715, 123722, 
+    123729, 123733, 123739, 123748, 123757, 123764, 123769, 123773, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123777, 123779, 123781, 123785, 
+    123789, 123793, 0, 123795, 123797, 123801, 123803, 123805, 123807, 
+    123809, 123814, 123819, 123821, 123827, 123831, 123835, 123843, 123845, 
+    123847, 123849, 123851, 123853, 123855, 123857, 123859, 123861, 123863, 
+    123867, 123871, 123873, 123875, 123877, 123879, 123881, 123886, 123892, 
+    123896, 123900, 123904, 123908, 123913, 123917, 123919, 123921, 123925, 
+    123931, 123933, 123935, 123937, 123941, 123950, 123956, 123960, 123964, 
+    123966, 123968, 123971, 123973, 123975, 123977, 123981, 123983, 123987, 
+    123992, 123994, 123999, 124005, 124012, 124016, 124020, 124024, 124028, 
+    124034, 0, 0, 0, 124038, 124040, 124044, 124048, 124050, 124054, 124058, 
+    124060, 124064, 124066, 124070, 124074, 124078, 124082, 124086, 124090, 
+    124094, 124098, 124104, 124108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    124112, 124116, 124120, 124124, 124131, 124133, 124137, 124139, 124141, 
+    124145, 124149, 124153, 124155, 124159, 124163, 124167, 124171, 124175, 
+    124177, 124181, 124183, 124189, 124192, 124197, 124199, 124201, 124204, 
+    124206, 124208, 124211, 124218, 124225, 124232, 124237, 124241, 124243, 
+    124245, 0, 124247, 124249, 124253, 124257, 124261, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124263, 124267, 124272, 124276, 
+    124282, 124288, 124290, 124292, 124298, 124300, 124304, 124308, 124310, 
+    124314, 124316, 124320, 124324, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 124328, 124330, 124332, 124334, 124338, 124340, 124342, 124344, 
+    124346, 124348, 124350, 124352, 124354, 124356, 124358, 124360, 124362, 
+    124364, 124366, 124368, 124370, 124372, 124374, 124376, 124378, 124380, 
+    124382, 124386, 124388, 124390, 124392, 124396, 124398, 124402, 124404, 
+    124406, 124410, 124414, 124420, 124422, 124424, 124426, 124428, 124432, 
+    124436, 124438, 124442, 124446, 124450, 124454, 124458, 124462, 124466, 
+    124470, 124474, 124478, 124482, 124486, 124490, 124494, 124498, 124502, 
+    124506, 0, 124510, 0, 124512, 124514, 124516, 124518, 124520, 124528, 
+    124536, 124544, 124552, 124557, 124562, 124567, 124571, 124575, 124580, 
+    124584, 124586, 124590, 124592, 124594, 124596, 124598, 124600, 124602, 
+    124604, 124608, 124610, 124612, 124614, 124618, 124622, 124626, 124630, 
+    124634, 124636, 124642, 124648, 124650, 124652, 124654, 124656, 124658, 
+    124667, 124674, 124681, 124685, 124692, 124697, 124704, 124713, 124718, 
+    124722, 124726, 124728, 124732, 124734, 124738, 124742, 124744, 124748, 
+    124752, 124756, 124758, 124760, 124766, 124768, 124770, 124772, 124776, 
+    124780, 124782, 124786, 124788, 124790, 124793, 124797, 124799, 124803, 
+    124805, 124807, 124812, 124814, 124818, 124822, 124825, 124829, 124833, 
+    124837, 124841, 124845, 124849, 124853, 124858, 124862, 124866, 124875, 
+    124880, 124883, 124885, 124888, 124891, 124896, 124898, 124901, 124906, 
+    124910, 124913, 124917, 124921, 124924, 124929, 124933, 124937, 124941, 
+    124945, 124951, 124957, 124963, 124969, 124974, 124985, 124987, 124991, 
+    124993, 124995, 124999, 125003, 125005, 125009, 125014, 125019, 125025, 
+    125027, 125031, 125035, 125042, 125049, 125053, 125055, 125057, 125061, 
+    125063, 125067, 125071, 125075, 125077, 125079, 125086, 125090, 125093, 
+    125097, 125101, 125105, 125107, 125111, 125113, 125115, 125119, 125121, 
+    125125, 125129, 125135, 125139, 125143, 125147, 125149, 125152, 125156, 
+    125163, 125172, 125181, 125189, 125197, 125199, 125203, 125205, 125209, 
+    125220, 125224, 125230, 125236, 125241, 0, 125243, 125247, 125249, 
+    125251, 0, 0, 0, 125253, 125258, 125268, 125283, 125295, 125307, 125311, 
+    125315, 125321, 125323, 125331, 125339, 125341, 125345, 125351, 125357, 
+    125364, 125371, 125373, 125375, 125378, 125380, 125386, 125388, 125391, 
+    125395, 125401, 125407, 125418, 125424, 125431, 125439, 125443, 125451, 
+    125459, 125465, 125471, 125478, 125480, 125484, 125486, 125488, 125493, 
+    125495, 125497, 125499, 125501, 125505, 125516, 125522, 125526, 125530, 
+    125534, 125540, 125546, 125552, 125558, 125563, 125568, 125574, 125580, 
+    125587, 0, 0, 125594, 125599, 125607, 125611, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 125620, 125627, 125634, 125641, 125649, 125657, 125665, 125673, 
+    125681, 125689, 125697, 125705, 125713, 125719, 125725, 125731, 125737, 
+    125743, 125749, 125755, 125761, 125767, 125773, 125779, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 125785, 
+    125789, 125793, 125798, 125803, 125805, 125809, 125818, 125826, 125834, 
+    125847, 125860, 125873, 125880, 125887, 125891, 125900, 125908, 125912, 
+    125921, 125928, 125932, 125936, 125940, 125944, 125951, 125955, 125959, 
+    125963, 125967, 125974, 125983, 125992, 125999, 126011, 126023, 126027, 
+    126031, 126035, 126039, 126043, 126047, 126055, 126063, 126071, 126075, 
+    126079, 126083, 126087, 126091, 126095, 126101, 126107, 126111, 126122, 
+    126130, 126134, 126138, 126142, 126146, 126152, 126159, 126170, 126180, 
+    126190, 126201, 126210, 126221, 126227, 126233, 0, 0, 0, 0, 126239, 
+    126248, 126255, 126261, 126265, 126269, 126273, 126282, 126294, 126298, 
+    126305, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 126312, 126314, 126316, 126320, 126324, 126328, 126337, 126339, 
+    126341, 126344, 126346, 126348, 126352, 126354, 126358, 126360, 126364, 
+    126366, 126368, 126372, 126376, 126382, 126384, 126388, 126390, 126394, 
+    126398, 126402, 126406, 126408, 126410, 126414, 126418, 126422, 126426, 
+    126428, 126430, 126432, 126437, 126442, 126445, 126453, 126461, 126463, 
+    126468, 126471, 126476, 126487, 126494, 126499, 126504, 126506, 126510, 
+    126512, 126516, 126518, 126522, 126526, 126529, 126532, 126534, 126537, 
+    126539, 126543, 126545, 126547, 126549, 126553, 126555, 126559, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 126562, 126567, 126572, 126577, 126582, 126587, 
+    126592, 126599, 126606, 126613, 126620, 126625, 126630, 126635, 126640, 
+    126647, 126653, 126660, 126667, 126674, 126679, 126684, 126689, 126694, 
+    126699, 126706, 126713, 126718, 126723, 126730, 126737, 126745, 126753, 
+    126760, 126767, 126775, 126783, 126791, 126798, 126808, 126819, 126824, 
+    126831, 126838, 126845, 126853, 126861, 126872, 126880, 126888, 126896, 
+    126901, 126906, 126911, 126916, 126921, 126926, 126931, 126936, 126941, 
+    126946, 126951, 126956, 126963, 126968, 126973, 126980, 126985, 126990, 
+    126995, 127000, 127005, 127010, 127015, 127020, 127025, 127030, 127035, 
+    127040, 127047, 127055, 127060, 127065, 127072, 127077, 127082, 127087, 
+    127094, 127099, 127106, 127111, 127118, 127123, 127132, 127141, 127146, 
+    127151, 127156, 127161, 127166, 127171, 127176, 127181, 127186, 127191, 
+    127196, 127201, 127206, 127214, 127222, 127227, 127232, 127237, 127242, 
+    127247, 127253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 127259, 127263, 
+    127267, 127271, 127275, 127279, 127283, 127287, 127291, 127295, 127299, 
+    127303, 127307, 127311, 127315, 127319, 127323, 127327, 127331, 127335, 
+    127339, 127343, 127347, 127351, 127355, 127359, 127363, 127367, 127371, 
+    127375, 127379, 127383, 127387, 127391, 127395, 127399, 127403, 127407, 
+    127411, 127415, 127419, 127423, 127427, 127431, 127435, 127439, 127443, 
+    127447, 127451, 127455, 127459, 127463, 127467, 127471, 127475, 127479, 
+    127483, 127487, 127491, 127495, 127499, 127503, 127507, 127511, 127515, 
+    127519, 127523, 127527, 127531, 127535, 127539, 127543, 127547, 127551, 
+    127555, 127559, 127563, 127567, 127571, 127575, 127579, 127583, 127587, 
+    127591, 127595, 127599, 127603, 127607, 127611, 127615, 127619, 127623, 
+    127627, 127631, 127635, 127639, 127643, 127647, 127651, 127655, 127659, 
+    127663, 127667, 127671, 127675, 127679, 127683, 127687, 127691, 127695, 
+    127699, 127703, 127707, 127711, 127715, 127719, 127723, 127727, 127731, 
+    127735, 127739, 127743, 127747, 127751, 127755, 127759, 127763, 127767, 
+    127771, 127775, 127779, 127783, 127787, 127791, 127795, 127799, 127803, 
+    127807, 127811, 127815, 127819, 127823, 127827, 127831, 127835, 127839, 
+    127843, 127847, 127851, 127855, 127859, 127863, 127867, 127871, 127875, 
+    127879, 127883, 127887, 127891, 127895, 127899, 127903, 127907, 127911, 
+    127915, 127919, 127923, 127927, 127931, 127935, 127939, 127943, 127947, 
+    127951, 127955, 127959, 127963, 127967, 127971, 127975, 127979, 127983, 
+    127987, 127991, 127995, 127999, 128003, 128007, 128011, 128015, 128019, 
+    128023, 128027, 128031, 128035, 128039, 128043, 128047, 128051, 128055, 
+    128059, 128063, 128067, 128071, 128075, 128079, 128083, 128087, 128091, 
+    128095, 128099, 128103, 128107, 128111, 128115, 128119, 128123, 128127, 
+    128131, 128135, 128139, 128143, 128147, 128151, 128155, 128159, 128163, 
+    128167, 128171, 128175, 128179, 128183, 128187, 128191, 128195, 128199, 
+    128203, 128207, 128211, 128215, 128219, 128223, 128227, 128231, 128235, 
+    128239, 128243, 128247, 128251, 128255, 128259, 128263, 128267, 128271, 
+    128275, 128279, 128283, 128287, 128291, 128295, 128299, 128303, 128307, 
+    128311, 128315, 128319, 128323, 128327, 128331, 128335, 128339, 128343, 
+    128347, 128351, 128355, 128359, 128363, 128367, 128371, 128375, 128379, 
+    128383, 128387, 128391, 128395, 128399, 128403, 128407, 128411, 128415, 
+    128419, 128423, 128427, 128431, 128435, 128439, 128443, 128447, 128451, 
+    128455, 128459, 128463, 128467, 128471, 128475, 128479, 128483, 128487, 
+    128491, 128495, 128499, 128503, 128507, 128511, 128515, 128519, 128523, 
+    128527, 128531, 128535, 128539, 128543, 128547, 128551, 128555, 128559, 
+    128563, 128567, 128571, 128575, 128579, 128583, 128587, 128591, 128595, 
+    128599, 128603, 128607, 128611, 128615, 128619, 128623, 128627, 128631, 
+    128635, 128639, 128643, 128647, 128651, 128655, 128659, 128663, 128667, 
+    128671, 128675, 128679, 128683, 128687, 128691, 128695, 128699, 128703, 
+    128707, 128711, 128715, 128719, 128723, 128727, 128731, 128735, 128739, 
+    128743, 128747, 128751, 128755, 128759, 128763, 128767, 128771, 128775, 
+    128779, 128783, 128787, 128791, 128795, 128799, 128803, 128807, 128811, 
+    128815, 128819, 128823, 128827, 128831, 128835, 128839, 128843, 128847, 
+    128851, 128855, 128859, 128863, 128867, 128871, 128875, 128879, 128883, 
+    128887, 128891, 128895, 128899, 128903, 128907, 128911, 128915, 128919, 
+    128923, 128927, 128931, 128935, 128939, 128943, 128947, 128951, 128955, 
+    128959, 128963, 128967, 128971, 128975, 128979, 128983, 128987, 128991, 
+    128995, 128999, 129003, 129007, 129011, 129015, 129019, 129023, 129027, 
+    129031, 129035, 129039, 129043, 129047, 129051, 129055, 129059, 129063, 
+    129067, 129071, 129075, 129079, 129083, 129087, 129091, 129095, 129099, 
+    129103, 129107, 129111, 129115, 129119, 129123, 129127, 129131, 129135, 
+    129139, 129143, 129147, 129151, 129155, 129159, 129163, 129167, 129171, 
+    129175, 129179, 129183, 129187, 129191, 129195, 129199, 129203, 129207, 
+    129211, 129215, 129219, 129223, 129227, 129231, 129235, 129239, 129243, 
+    129247, 129251, 129255, 129259, 129263, 129267, 129271, 129275, 129279, 
+    129283, 129287, 129291, 129295, 129299, 129303, 129307, 129311, 129315, 
+    129319, 129323, 129327, 129331, 129335, 129339, 129343, 129347, 129351, 
+    129355, 129359, 129363, 129367, 129371, 129375, 129379, 129383, 129387, 
+    129391, 129395, 129399, 129403, 129407, 129411, 129415, 129419, 129423, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 129427, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129431, 129434, 129438, 129442, 129445, 
+    129449, 129453, 129456, 129459, 129463, 129467, 129470, 129473, 129476, 
+    129479, 129484, 129487, 129491, 129494, 129497, 129500, 129503, 129506, 
+    129509, 129512, 129515, 129518, 129521, 129524, 129528, 129532, 129536, 
+    129540, 129545, 129550, 129556, 129562, 129568, 129573, 129579, 129585, 
+    129591, 129596, 129602, 129608, 129613, 129618, 129624, 129629, 129635, 
+    129641, 129646, 129652, 129658, 129663, 129669, 129675, 129681, 129687, 
+    129693, 129697, 129702, 129706, 129711, 129715, 129720, 129725, 129731, 
+    129737, 129743, 129748, 129754, 129760, 129766, 129771, 129777, 129783, 
+    129788, 129793, 129799, 129804, 129810, 129816, 129821, 129827, 129833, 
+    129838, 129844, 129850, 129856, 129862, 129868, 129873, 129877, 129882, 
+    129884, 129888, 129891, 129894, 129897, 129900, 129903, 129906, 129909, 
+    129912, 129915, 129918, 129921, 129924, 129927, 129930, 129933, 129936, 
+    129939, 129942, 129945, 129948, 129951, 129954, 129957, 129960, 129963, 
+    129966, 129969, 129972, 129975, 129978, 129981, 129984, 129987, 129990, 
+    129993, 129996, 129999, 130002, 130005, 130008, 130011, 130014, 130017, 
+    130020, 130023, 130026, 130029, 130032, 130035, 130038, 130041, 130044, 
+    130047, 130050, 130053, 130056, 130059, 130062, 130065, 130068, 130071, 
+    130074, 130077, 130080, 130083, 130086, 130089, 130092, 130095, 130098, 
+    130101, 130104, 130107, 130110, 130113, 130116, 130119, 130122, 130125, 
+    130128, 130131, 130134, 130137, 130140, 130143, 130146, 130149, 130152, 
+    130155, 130158, 130161, 130164, 130167, 130170, 130173, 130176, 130179, 
+    130182, 130185, 130188, 130191, 130194, 130197, 130200, 130203, 130206, 
+    130209, 130212, 130215, 130218, 130221, 130224, 130227, 130230, 130233, 
+    130236, 130239, 130242, 130245, 130248, 130251, 130254, 130257, 130260, 
+    130263, 130266, 130269, 130272, 130275, 130278, 130281, 130284, 130287, 
+    130290, 130293, 130296, 130299, 130302, 130305, 130308, 130311, 130314, 
+    130317, 130320, 130323, 130326, 130329, 130332, 130335, 130338, 130341, 
+    130344, 130347, 130350, 130353, 130356, 130359, 130362, 130365, 130368, 
+    130371, 130374, 130377, 130380, 130383, 130386, 130389, 130392, 130395, 
+    130398, 130401, 130404, 130407, 130410, 130413, 130416, 130419, 130422, 
+    130425, 130428, 130431, 130434, 130437, 130440, 130443, 130446, 130449, 
+    130452, 130455, 130458, 130461, 130464, 130467, 130470, 130473, 130476, 
+    130479, 130482, 130485, 130488, 130491, 130494, 130497, 130500, 130503, 
+    130506, 130509, 130512, 130515, 130518, 130521, 130524, 130527, 130530, 
+    130533, 130536, 130539, 130542, 130545, 130548, 130551, 130554, 130557, 
+    130560, 130563, 130566, 130569, 130572, 130575, 130578, 130581, 130584, 
+    130587, 130590, 130593, 130596, 130599, 130602, 130605, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 130608, 130610, 130612, 130617, 130619, 
+    130624, 130626, 130631, 130633, 130638, 130640, 130642, 130644, 130646, 
+    130648, 130650, 130652, 130654, 130656, 130659, 130662, 130664, 130666, 
+    130670, 130673, 130678, 130680, 130682, 130684, 130688, 130691, 130693, 
+    130697, 130699, 130703, 130705, 130709, 130712, 130714, 130718, 130722, 
+    130724, 130730, 130732, 130737, 130739, 130744, 130746, 130751, 130753, 
+    130758, 130760, 130763, 130765, 130769, 130771, 130778, 130780, 130782, 
+    130784, 130789, 130791, 130793, 130795, 130797, 130799, 130804, 130808, 
+    130810, 130815, 130819, 130821, 130826, 130830, 130832, 130837, 130841, 
+    130843, 130845, 130847, 130849, 130853, 130855, 130860, 130862, 130868, 
+    130870, 130876, 130878, 130880, 130882, 130886, 130888, 130895, 130897, 
+    130904, 130906, 130911, 130916, 130918, 130924, 130930, 130932, 130938, 
+    130943, 130945, 130951, 130957, 130959, 130965, 130971, 130973, 130979, 
+    130983, 130985, 130990, 130992, 130994, 130999, 131001, 131003, 131009, 
+    131011, 131016, 131020, 131022, 131027, 131031, 131033, 131039, 131041, 
+    131045, 131047, 131051, 131053, 131060, 131067, 131069, 131076, 131083, 
+    131085, 131090, 131092, 131099, 131101, 131106, 131108, 131114, 131116, 
+    131120, 131122, 131128, 131130, 131134, 131136, 131142, 131144, 131146, 
+    131148, 131153, 131158, 131160, 131169, 131173, 131180, 131187, 131192, 
+    131197, 131209, 131211, 131213, 131215, 131217, 131219, 131221, 131223, 
+    131225, 131227, 131229, 131231, 131233, 131235, 131237, 131239, 131241, 
+    131243, 131249, 131256, 131261, 131266, 131277, 131279, 131281, 131283, 
+    131285, 131287, 131289, 131291, 131293, 131295, 131297, 131299, 131301, 
+    131303, 131305, 131307, 131309, 131314, 131316, 131318, 131329, 131331, 
+    131333, 131335, 131337, 131339, 131341, 131343, 131345, 131347, 131349, 
+    131351, 131353, 131355, 131357, 131359, 131361, 131363, 131365, 131367, 
+    131369, 131371, 131373, 131375, 131377, 131379, 131381, 131383, 131385, 
+    131387, 131389, 131391, 131393, 131395, 131397, 131399, 131401, 131403, 
+    131405, 131407, 131409, 131411, 131413, 131415, 131417, 131419, 131421, 
+    131423, 131425, 131427, 131429, 131431, 131433, 131435, 131437, 131439, 
+    131441, 131443, 131445, 131447, 131449, 131451, 131453, 131455, 131457, 
+    131459, 131461, 131463, 131465, 131467, 131469, 131471, 131473, 131475, 
+    131477, 131479, 131481, 131483, 131485, 131487, 131489, 131491, 131493, 
+    131495, 131497, 131499, 131501, 131503, 131505, 131507, 131509, 131511, 
+    131513, 131515, 131517, 131519, 131521, 131523, 131525, 131527, 131529, 
+    131531, 131533, 131535, 131537, 131539, 131541, 131543, 131545, 131547, 
+    131549, 131551, 131553, 131555, 131557, 131559, 131561, 131563, 131565, 
+    131567, 131569, 131571, 131573, 131575, 131577, 131579, 131581, 131583, 
+    131585, 131587, 131589, 131591, 131593, 131595, 131597, 131599, 131601, 
+    131603, 131605, 131607, 131609, 131611, 131613, 131615, 131617, 131619, 
+    131621, 131623, 131625, 131627, 131629, 131631, 131633, 131635, 131637, 
+    131639, 131641, 131643, 131645, 131647, 131649, 131651, 131653, 131655, 
+    131657, 131659, 131661, 131663, 131665, 131667, 131669, 131671, 131673, 
+    131675, 131677, 131679, 131681, 131683, 131685, 131687, 131689, 131691, 
+    131693, 131695, 131697, 131699, 131701, 131703, 131705, 131707, 131709, 
+    131711, 131713, 131715, 131717, 131719, 131721, 131723, 131725, 131727, 
+    131729, 131731, 131733, 131735, 131737, 131739, 131741, 131743, 131745, 
+    131747, 131749, 131751, 131753, 131755, 131757, 131759, 131761, 131763, 
+    131765, 131767, 131769, 131771, 131773, 131775, 131777, 131779, 131781, 
+    131783, 131785, 131787, 131789, 131791, 131793, 131795, 131797, 131799, 
+    131801, 131803, 131805, 131807, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    131809, 131819, 131829, 131838, 131847, 131860, 131873, 131885, 131897, 
+    131907, 131917, 131927, 131937, 131948, 131959, 131969, 131978, 131987, 
+    131996, 132009, 132022, 132034, 132046, 132056, 132066, 132076, 132086, 
+    132095, 132104, 132113, 132122, 132131, 132140, 132149, 132158, 132167, 
+    132176, 132185, 132194, 132205, 132215, 132225, 132238, 132248, 132261, 
+    132268, 132278, 132285, 132292, 132299, 132306, 132313, 132320, 132329, 
+    132338, 132347, 132356, 132365, 132374, 132383, 132392, 132400, 132408, 
+    132415, 132425, 132434, 132442, 132449, 132459, 132468, 132472, 132476, 
+    132480, 132484, 132488, 132492, 132496, 132500, 132504, 132508, 132511, 
+    132515, 132518, 132521, 132525, 132529, 132533, 132537, 132541, 132545, 
+    132549, 132553, 132557, 132561, 132565, 132569, 132573, 132577, 132581, 
+    132585, 132589, 132593, 132597, 132601, 132605, 132609, 132613, 132617, 
+    132621, 132625, 132629, 132633, 132637, 132641, 132645, 132649, 132653, 
+    132657, 132661, 132665, 132669, 132673, 132677, 132681, 132685, 132689, 
+    132693, 132697, 132701, 132705, 132709, 132713, 132717, 132721, 132725, 
+    132729, 132733, 132737, 132741, 132745, 132749, 132753, 132757, 132761, 
+    132765, 132769, 132773, 132777, 132781, 132785, 132789, 132793, 132797, 
+    132801, 132805, 132809, 132813, 132817, 132821, 132825, 132829, 132833, 
+    132837, 132841, 132845, 132849, 132853, 132857, 132861, 132864, 132868, 
+    132872, 132876, 132880, 132884, 132888, 132892, 132896, 132900, 132904, 
+    132908, 132912, 132916, 132920, 132924, 132928, 132932, 132936, 132940, 
+    132944, 132948, 132952, 132956, 132960, 132964, 132968, 132972, 132976, 
+    132980, 132984, 132988, 132992, 132996, 133000, 133004, 133008, 133012, 
+    133016, 133020, 133024, 133028, 133032, 133036, 133040, 133044, 133048, 
+    133052, 133056, 133060, 133064, 133068, 133072, 133076, 133080, 133084, 
+    133088, 133092, 133096, 133100, 133104, 133108, 133112, 133116, 133120, 
+    133124, 133128, 133132, 133136, 133140, 133144, 133148, 133152, 133156, 
+    133160, 133164, 133168, 133172, 133176, 133180, 133184, 133188, 133192, 
+    133196, 133200, 133204, 133208, 133212, 133216, 133220, 133224, 133228, 
+    133232, 133236, 133240, 133244, 133248, 133252, 133256, 133260, 133264, 
+    133268, 133272, 133276, 133280, 133284, 133288, 133292, 133296, 133300, 
+    133304, 133308, 133312, 133316, 133320, 133324, 133328, 133332, 133336, 
+    133340, 133344, 133348, 133352, 133356, 133360, 133364, 133368, 133372, 
+    133376, 133380, 133384, 133388, 133392, 133396, 133400, 133404, 133408, 
+    133412, 133416, 133420, 133424, 133428, 133432, 133436, 133440, 133444, 
+    133448, 133452, 133456, 133460, 133464, 133468, 133472, 133476, 133480, 
+    133484, 133488, 133492, 133496, 133500, 133504, 133508, 133512, 133516, 
+    133520, 133524, 133528, 133532, 133536, 133540, 133544, 133548, 133552, 
+    133556, 133560, 133564, 133568, 133572, 133576, 133580, 133584, 133588, 
+    133592, 133596, 133600, 133604, 133608, 133612, 133616, 133620, 133624, 
+    133628, 133633, 133638, 133643, 133647, 133653, 133660, 133667, 133674, 
+    133681, 133688, 133695, 133702, 133709, 133716, 133723, 133730, 133737, 
+    133744, 133750, 133757, 133764, 133770, 133777, 133784, 133791, 133798, 
+    133805, 133812, 133819, 133826, 133833, 133840, 133847, 133854, 133861, 
+    133867, 133873, 133880, 133887, 133896, 133905, 133914, 133923, 133928, 
+    133933, 133939, 133945, 133951, 133957, 133963, 133969, 133975, 133981, 
+    133987, 133993, 133999, 134005, 134010, 134016, 134026, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -17117,9 +17119,9 @@
     64065, 64072, 64071, 63, 7233, 92212, 0, 41904, 6639, 64064, 983766, 
     128344, 0, 1176, 118959, 127930, 8162, 128667, 983822, 0, 120519, 66376, 
     66242, 11415, 4333, 9855, 64112, 64642, 0, 5388, 0, 0, 0, 7714, 66222, 
-    69902, 7768, 0, 4199, 64708, 983413, 0, 0, 8708, 9560, 64077, 64076, 
+    69902, 7768, 0, 4199, 64708, 983414, 0, 0, 8708, 9560, 64077, 64076, 
     8996, 4992, 4471, 42622, 64079, 64078, 92179, 0, 126570, 0, 64615, 41915, 
-    0, 12075, 70062, 0, 5174, 983215, 0, 127557, 3123, 0, 12685, 127904, 
+    0, 12075, 70062, 0, 5174, 983216, 0, 127557, 3123, 0, 12685, 127904, 
     8408, 64704, 0, 0, 9223, 0, 41616, 67999, 73797, 0, 1116, 128204, 43049, 
     7136, 43050, 8548, 120485, 0, 119061, 917999, 0, 13115, 43675, 64091, 
     9322, 0, 120595, 64095, 64094, 8111, 66247, 42332, 64089, 64088, 6199, 0, 
@@ -17127,10 +17129,10 @@
     9927, 41335, 4118, 1797, 0, 41334, 0, 46, 43448, 127881, 298, 0, 128114, 
     0, 42627, 0, 32, 6187, 119052, 11495, 11459, 3665, 983600, 42871, 0, 
     19923, 74335, 0, 127192, 66239, 42264, 64403, 4412, 7240, 92495, 0, 
-    983458, 65758, 12750, 4181, 8544, 0, 120199, 917897, 120198, 69809, 6181, 
+    983459, 65758, 12750, 4181, 8544, 0, 120199, 917897, 120198, 69809, 6181, 
     65014, 0, 0, 983196, 3639, 119588, 0, 0, 118904, 10073, 120206, 128862, 
     127186, 68409, 42844, 7498, 1098, 92565, 120205, 0, 983118, 10207, 8789, 
-    983223, 0, 0, 983464, 9234, 0, 6182, 983466, 65058, 0, 983470, 983467, 0, 
+    983224, 0, 0, 983465, 9234, 0, 6182, 983467, 65058, 0, 983471, 983468, 0, 
     5471, 9461, 5573, 118936, 5473, 44, 0, 66244, 94072, 0, 66238, 12844, 0, 
     1622, 7767, 1900, 41339, 11458, 0, 0, 6581, 5576, 0, 64405, 41337, 0, 
     41631, 8947, 68390, 127844, 41694, 0, 0, 7908, 0, 10408, 6579, 0, 64618, 
@@ -17177,7 +17179,7 @@
     12084, 127324, 127321, 92279, 127319, 127320, 127317, 127318, 127315, 
     12283, 1616, 3795, 0, 8795, 66245, 0, 0, 0, 1138, 73905, 12677, 0, 0, 
     3239, 127311, 0, 0, 8431, 0, 42164, 0, 11778, 12620, 6826, 73773, 119073, 
-    5040, 0, 0, 983435, 78420, 0, 5039, 0, 78418, 0, 5038, 0, 0, 13184, 
+    5040, 0, 0, 983436, 78420, 0, 5039, 0, 78418, 0, 5038, 0, 0, 13184, 
     74293, 0, 64648, 0, 9359, 78416, 0, 128770, 65157, 6662, 0, 0, 3863, 
     73909, 4835, 55266, 43432, 127822, 4309, 7127, 194569, 0, 194568, 1301, 
     0, 42589, 569, 0, 73813, 711, 4389, 7133, 0, 73880, 11610, 11368, 0, 
@@ -17202,16 +17204,16 @@
     6183, 0, 0, 0, 120448, 7623, 118925, 118889, 9235, 12760, 74176, 69662, 
     66445, 43540, 10062, 3743, 11514, 11078, 0, 12136, 0, 126597, 120435, 0, 
     7726, 0, 19922, 267, 3393, 42198, 1371, 194849, 69233, 2458, 0, 6201, 0, 
-    41074, 4266, 10652, 41612, 41077, 3402, 9050, 3398, 0, 983340, 0, 3391, 
+    41074, 4266, 10652, 41612, 41077, 3402, 9050, 3398, 0, 983341, 0, 3391, 
     41075, 2476, 0, 128017, 0, 10625, 0, 12767, 13017, 78743, 64261, 64934, 
-    127537, 13014, 13013, 0, 6673, 0, 0, 0, 12438, 0, 983334, 0, 983871, 
+    127537, 13014, 13013, 0, 6673, 0, 0, 0, 12438, 0, 983335, 0, 983871, 
     126638, 9053, 13015, 74523, 0, 704, 66215, 6195, 983819, 6660, 78758, 
-    917760, 917793, 42212, 12629, 11435, 0, 55256, 65538, 0, 127940, 983333, 
+    917760, 917793, 42212, 12629, 11435, 0, 55256, 65538, 0, 127940, 983334, 
     74547, 126585, 65448, 78100, 12948, 119001, 195002, 119238, 195004, 
     78099, 127085, 0, 128320, 4287, 8276, 4902, 1131, 0, 78458, 66728, 1816, 
     0, 42533, 168, 42845, 4898, 64298, 983141, 0, 4901, 1821, 0, 578, 3653, 
     0, 791, 9162, 6977, 0, 78889, 74561, 0, 73731, 8354, 43590, 119303, 
-    983441, 7557, 119339, 119301, 8234, 7241, 0, 120671, 119167, 194996, 
+    983442, 7557, 119339, 119301, 8234, 7241, 0, 120671, 119167, 194996, 
     12811, 65925, 3946, 78078, 10998, 78080, 673, 194867, 64397, 128276, 
     74599, 78449, 8890, 194977, 194976, 2448, 78085, 10267, 8424, 2452, 
     78083, 128824, 8729, 78456, 0, 7845, 917917, 71302, 4408, 4122, 6772, 
@@ -17267,12 +17269,12 @@
     194587, 0, 1211, 0, 0, 0, 118832, 12318, 0, 0, 68005, 10622, 983770, 0, 
     78654, 6566, 78659, 0, 73780, 119196, 64864, 0, 78660, 0, 8284, 13081, 0, 
     3589, 42051, 4035, 6492, 92236, 4265, 6642, 3977, 74186, 41778, 836, 
-    119216, 2488, 0, 4582, 0, 0, 41777, 12926, 983369, 7528, 10550, 0, 92706, 
+    119216, 2488, 0, 4582, 0, 0, 41777, 12926, 983370, 7528, 10550, 0, 92706, 
     0, 10961, 0, 1374, 64878, 119014, 0, 42389, 41374, 2286, 0, 78492, 41377, 
     127909, 0, 400, 12597, 120586, 0, 0, 6661, 983145, 64827, 0, 73817, 390, 
-    0, 71301, 983853, 3473, 7718, 0, 0, 0, 55285, 0, 0, 0, 11969, 983382, 
-    127841, 6365, 1887, 6763, 983362, 8080, 7006, 0, 983363, 6757, 64351, 
-    1544, 0, 6766, 64677, 120716, 983364, 6146, 0, 771, 983365, 0, 12812, 
+    0, 71301, 983853, 3473, 7718, 0, 0, 0, 55285, 0, 0, 0, 11969, 983383, 
+    127841, 6365, 1887, 6763, 983363, 8080, 7006, 0, 983364, 6757, 64351, 
+    1544, 0, 6766, 64677, 120716, 983365, 6146, 0, 771, 983366, 0, 12812, 
     13168, 42272, 12200, 917927, 7904, 0, 953, 12917, 119560, 12300, 0, 
     11491, 9724, 10341, 983764, 9524, 7490, 11389, 7489, 3379, 0, 7487, 0, 
     471, 7484, 7482, 6753, 7480, 5764, 7478, 7477, 6501, 7475, 6918, 7473, 
@@ -17286,11 +17288,11 @@
     118928, 1118, 71334, 0, 0, 1081, 7436, 68420, 7252, 0, 5996, 69921, 4903, 
     0, 41386, 5162, 119189, 1330, 0, 7139, 0, 12047, 41384, 0, 0, 1848, 4334, 
     6324, 41975, 64777, 10674, 12308, 12186, 0, 0, 983732, 12715, 68002, 
-    983471, 126630, 2018, 66672, 41979, 66685, 119157, 68000, 92464, 0, 
+    983472, 126630, 2018, 66672, 41979, 66685, 119157, 68000, 92464, 0, 
     126984, 68001, 9334, 92705, 92315, 70101, 7975, 0, 77957, 0, 66621, 4884, 
     66597, 69732, 0, 0, 6313, 65513, 69857, 0, 0, 0, 2345, 43697, 463, 0, 0, 
-    119607, 3117, 5460, 0, 0, 983379, 0, 42279, 194577, 0, 78415, 0, 195008, 
-    983376, 13248, 0, 0, 0, 0, 0, 0, 5663, 0, 0, 0, 0, 2482, 1471, 0, 0, 
+    119607, 3117, 5460, 0, 0, 983380, 0, 42279, 194577, 0, 78415, 0, 195008, 
+    983377, 13248, 0, 0, 0, 0, 0, 0, 5663, 0, 0, 0, 0, 2482, 1471, 0, 0, 
     42247, 12378, 73925, 69664, 0, 12374, 0, 0, 0, 983685, 2460, 0, 11944, 
     12376, 127868, 64679, 0, 12380, 10557, 64473, 5870, 0, 2024, 127180, 0, 
     0, 539, 0, 127765, 94052, 3853, 65180, 127923, 120796, 120245, 92324, 0, 
@@ -17298,20 +17300,20 @@
     69633, 120089, 12470, 0, 74189, 2742, 12476, 11798, 10946, 127310, 5000, 
     0, 983579, 0, 69672, 8213, 74017, 7771, 6161, 68018, 6709, 0, 78885, 
     983699, 127971, 120582, 78547, 0, 10301, 10333, 10397, 0, 0, 73791, 0, 0, 
-    0, 0, 119123, 4014, 12842, 73952, 12015, 127290, 8275, 3893, 983256, 0, 
+    0, 0, 119123, 4014, 12842, 73952, 12015, 127290, 8275, 3893, 983257, 0, 
     12210, 7221, 42147, 0, 74550, 74465, 64747, 118841, 0, 12516, 4444, 0, 
     92271, 74537, 10892, 8231, 0, 6473, 41968, 78388, 41973, 3591, 41969, 0, 
     2453, 128549, 92666, 64705, 0, 0, 10349, 10413, 43591, 41962, 3202, 
     74353, 0, 8316, 0, 0, 94060, 687, 0, 0, 0, 1840, 0, 68671, 119809, 4883, 
     285, 4723, 70099, 92692, 4459, 74577, 42921, 41720, 11089, 240, 19906, 0, 
-    42323, 0, 9743, 120232, 13134, 126535, 0, 0, 0, 0, 42634, 983335, 43437, 
+    42323, 0, 9743, 120232, 13134, 126535, 0, 0, 0, 0, 42634, 983336, 43437, 
     3081, 11463, 120154, 0, 0, 10445, 0, 0, 66717, 2614, 9125, 119023, 1729, 
     0, 120236, 65221, 63883, 43334, 64852, 0, 65194, 66201, 0, 66578, 5001, 
     41879, 74427, 4121, 5003, 884, 66700, 63879, 4943, 5150, 73889, 74182, 
     127915, 643, 3086, 0, 42448, 42299, 58, 0, 917952, 120083, 63873, 8491, 
     0, 0, 0, 4530, 42409, 7126, 194575, 2721, 120074, 119096, 19929, 0, 
     194574, 0, 4242, 4264, 120077, 120530, 66179, 42412, 65941, 13114, 64522, 
-    10740, 3094, 0, 9754, 119102, 4437, 73948, 127074, 983232, 55280, 42174, 
+    10740, 3094, 0, 9754, 119102, 4437, 73948, 127074, 983233, 55280, 42174, 
     194925, 42430, 0, 0, 42355, 66026, 4306, 41380, 68432, 92586, 0, 66667, 
     127309, 0, 126521, 42200, 42566, 0, 0, 5088, 6948, 0, 8524, 0, 0, 12385, 
     0, 0, 69646, 1386, 64580, 11480, 6116, 65039, 65038, 12392, 65036, 8064, 
@@ -17337,7 +17339,7 @@
     917776, 65148, 12433, 917781, 127276, 917779, 12431, 8668, 12434, 983826, 
     917782, 5999, 0, 7712, 12432, 128243, 43653, 1726, 1015, 0, 8212, 0, 
     128014, 42423, 119066, 0, 128108, 66709, 0, 8811, 927, 0, 0, 12436, 
-    983239, 42021, 0, 0, 1299, 12240, 42350, 65143, 0, 195016, 0, 78197, 
+    983240, 42021, 0, 0, 1299, 12240, 42350, 65143, 0, 195016, 0, 78197, 
     11348, 0, 78037, 9194, 983184, 0, 19914, 12179, 983803, 2296, 194923, 
     63836, 63832, 917773, 10967, 63816, 2594, 3444, 63817, 64651, 0, 41503, 
     127478, 11265, 0, 120756, 194922, 0, 5664, 3972, 0, 0, 0, 128508, 12416, 
@@ -17348,7 +17350,7 @@
     9171, 12741, 11400, 71305, 194799, 0, 128239, 0, 128881, 119604, 127523, 
     120190, 194773, 67608, 128214, 42368, 0, 7715, 3881, 41487, 12118, 42514, 
     68651, 0, 983886, 3009, 41476, 41489, 69825, 3007, 1448, 3018, 194809, 
-    3889, 8521, 5083, 5082, 119859, 120184, 8519, 983235, 3014, 5081, 65853, 
+    3889, 8521, 5083, 5082, 119859, 120184, 8519, 983236, 3014, 5081, 65853, 
     120715, 0, 68014, 69951, 5079, 64802, 42210, 4597, 65532, 11828, 120185, 
     12371, 0, 8407, 0, 10805, 8518, 10779, 120188, 71303, 983924, 12367, 
     42170, 0, 92557, 629, 1924, 0, 12037, 74366, 5987, 8462, 8005, 12365, 
@@ -17400,7 +17402,7 @@
     9594, 0, 0, 43527, 0, 727, 194703, 195023, 5805, 0, 6726, 0, 42176, 
     12370, 11655, 119095, 10591, 2280, 0, 12372, 120642, 120307, 0, 92343, 0, 
     12366, 10963, 6066, 1329, 0, 3052, 9220, 0, 64478, 194701, 10803, 4132, 
-    120306, 68474, 92473, 0, 983305, 74837, 120155, 1499, 0, 8055, 42740, 
+    120306, 68474, 92473, 0, 983306, 74837, 120155, 1499, 0, 8055, 42740, 
     63965, 0, 63962, 74042, 8924, 43123, 5988, 3660, 63969, 11781, 42718, 
     8788, 1357, 64851, 65743, 0, 8774, 0, 127086, 9941, 120172, 0, 1933, 
     69655, 9564, 0, 92435, 73866, 0, 0, 2487, 67614, 3121, 1804, 3311, 67615, 
@@ -17452,7 +17454,7 @@
     64436, 3601, 195094, 128073, 983562, 609, 11555, 983099, 12496, 127839, 
     74181, 4343, 12505, 0, 127863, 0, 11377, 239, 0, 637, 0, 0, 42671, 0, 0, 
     0, 43565, 71306, 126493, 12696, 128256, 0, 94062, 12929, 0, 712, 0, 4197, 
-    983204, 42818, 126632, 0, 120490, 0, 119137, 1506, 43562, 0, 92491, 0, 
+    983205, 42818, 126632, 0, 120490, 0, 119137, 1506, 43562, 0, 92491, 0, 
     12651, 0, 64628, 74517, 12058, 74084, 917838, 7494, 0, 4924, 65592, 
     118844, 0, 127088, 355, 9719, 127087, 13066, 64796, 0, 0, 12033, 42178, 
     0, 69760, 42571, 92635, 0, 0, 0, 0, 0, 127176, 3178, 0, 0, 92704, 0, 
@@ -17485,7 +17487,7 @@
     66489, 224, 0, 68670, 9332, 4966, 68677, 0, 68644, 0, 3841, 68634, 0, 
     10732, 68640, 850, 4972, 0, 12890, 2909, 68619, 44008, 68627, 983709, 
     11544, 10203, 9608, 0, 0, 11962, 194694, 12507, 1196, 128687, 128311, 
-    777, 120187, 4375, 65271, 67678, 0, 12198, 0, 64824, 119343, 983230, 
+    777, 120187, 4375, 65271, 67678, 0, 12198, 0, 64824, 119343, 983231, 
     9454, 63778, 8658, 42528, 78000, 2705, 917975, 41520, 0, 0, 11986, 7765, 
     42502, 8280, 74520, 2701, 0, 127002, 5767, 0, 0, 9809, 8353, 63747, 
     66701, 63772, 983805, 63745, 1748, 63770, 0, 0, 0, 65542, 63766, 55244, 
@@ -17495,7 +17497,7 @@
     10996, 92247, 1922, 0, 12498, 10987, 69936, 69939, 3894, 65543, 0, 
     194842, 983588, 493, 0, 43197, 1717, 4228, 479, 10303, 74020, 0, 917935, 
     10335, 3520, 917932, 12490, 64315, 0, 127039, 12493, 6233, 42681, 1002, 
-    12491, 0, 64911, 92615, 2096, 65120, 0, 78219, 983081, 11611, 11632, 
+    12491, 0, 64911, 92615, 2096, 65120, 0, 78219, 983081, 8378, 11632, 
     127041, 66213, 63864, 66221, 66226, 66229, 13218, 66231, 66216, 8507, 
     66236, 66211, 66218, 92672, 66240, 78041, 66233, 8928, 983552, 7909, 
     66234, 11605, 63759, 983645, 66208, 73999, 63799, 63803, 244, 11542, 
@@ -17515,7 +17517,7 @@
     9382, 9379, 9380, 9377, 9378, 9375, 9376, 1683, 9374, 983769, 9372, 
     12444, 0, 0, 13016, 8210, 983949, 42029, 11079, 12331, 43451, 42032, 
     8744, 726, 0, 983828, 4155, 0, 0, 42030, 5007, 12522, 43088, 0, 4951, 
-    127805, 127240, 0, 9922, 43309, 983832, 12525, 983463, 12016, 65770, 
+    127805, 127240, 0, 9922, 43309, 983832, 12525, 983464, 12016, 65770, 
     9548, 67665, 403, 78230, 12503, 0, 0, 11030, 0, 92567, 65691, 63998, 
     1819, 10496, 0, 0, 119920, 0, 194668, 0, 12506, 0, 12231, 0, 12500, 
     44023, 12509, 64393, 78830, 3389, 10589, 6608, 41047, 120321, 78395, 
@@ -17557,7 +17559,7 @@
     13043, 8056, 92494, 65681, 208, 127382, 41514, 0, 0, 0, 10699, 6408, 
     92227, 7825, 5661, 0, 120630, 3603, 41109, 2398, 3548, 126596, 0, 119933, 
     0, 3115, 9918, 0, 11321, 42912, 0, 0, 194726, 4876, 65804, 0, 0, 43468, 
-    983266, 41558, 41471, 73950, 8158, 9944, 41472, 120298, 13051, 78689, 
+    983267, 41558, 41471, 73950, 8158, 9944, 41472, 120298, 13051, 78689, 
     3143, 194674, 6701, 41559, 1896, 66256, 13052, 194680, 5665, 0, 119071, 
     7025, 63974, 0, 74352, 74161, 4154, 9863, 43550, 12310, 5662, 42382, 
     194686, 73924, 1121, 78319, 63959, 0, 9942, 13231, 0, 64752, 4732, 
@@ -17587,7 +17589,7 @@
     6153, 2867, 194708, 66312, 698, 128007, 194606, 10356, 70017, 194713, 
     651, 12641, 0, 0, 0, 0, 41552, 65115, 78465, 78467, 78463, 78464, 128851, 
     78461, 194697, 74356, 64945, 4716, 43277, 0, 78474, 12340, 120568, 0, 
-    194700, 55264, 41211, 120676, 8703, 5462, 917629, 983487, 10101, 0, 
+    194700, 55264, 41211, 120676, 8703, 5462, 917629, 983488, 10101, 0, 
     70049, 8479, 4151, 41933, 0, 0, 66254, 120821, 0, 0, 128654, 0, 119194, 
     74050, 92701, 0, 0, 0, 0, 0, 12278, 0, 0, 0, 2700, 12576, 7842, 12899, 0, 
     0, 2699, 0, 73845, 2985, 92568, 126475, 917845, 12192, 119314, 0, 119312, 
@@ -17602,8 +17604,8 @@
     9632, 92323, 74761, 64323, 127335, 0, 0, 0, 310, 0, 41281, 10976, 0, 
     71325, 0, 74266, 10054, 6497, 8574, 0, 9012, 19958, 74420, 65089, 13215, 
     12730, 65163, 74044, 374, 43195, 816, 120161, 0, 0, 41934, 7465, 0, 
-    128168, 983260, 4715, 6101, 94106, 41936, 0, 4879, 0, 65446, 0, 307, 
-    127147, 9585, 5374, 983259, 128059, 0, 0, 126618, 120390, 0, 65567, 
+    128168, 983261, 4715, 6101, 94106, 41936, 0, 4879, 0, 65446, 0, 307, 
+    127147, 9585, 5374, 983260, 128059, 0, 0, 126618, 120390, 0, 65567, 
     120614, 1929, 0, 12142, 0, 12236, 41419, 194618, 120610, 12982, 194623, 
     5378, 78791, 128679, 41421, 0, 4462, 0, 126599, 128092, 821, 0, 2498, 
     5800, 120157, 983115, 1760, 2421, 4469, 2324, 828, 3611, 78400, 757, 
@@ -17620,7 +17622,7 @@
     77950, 194578, 7074, 92648, 194579, 194582, 11414, 128868, 2531, 13034, 
     0, 0, 4211, 1259, 7517, 0, 0, 194561, 40996, 13037, 7092, 641, 5219, 
     94034, 194566, 11064, 41129, 0, 42850, 13035, 9075, 92387, 5466, 128153, 
-    0, 64098, 65793, 4535, 194573, 4271, 78417, 128357, 6769, 41410, 983444, 
+    0, 64098, 65793, 4535, 194573, 4271, 78417, 128357, 6769, 41410, 983445, 
     64262, 6767, 41407, 0, 0, 6755, 118864, 9046, 127934, 126608, 0, 0, 0, 0, 
     67675, 0, 0, 0, 64338, 2563, 13033, 247, 118915, 0, 12338, 4651, 69895, 
     11270, 0, 0, 11933, 0, 0, 41903, 43447, 11001, 0, 42255, 0, 92661, 69821, 
@@ -17650,7 +17652,7 @@
     1091, 12638, 7977, 4501, 41099, 0, 66309, 0, 0, 1494, 983146, 126613, 0, 
     11693, 126513, 10494, 92655, 65872, 12363, 11386, 0, 0, 0, 0, 64582, 0, 
     73794, 0, 8022, 0, 120462, 74106, 12413, 94069, 917994, 917993, 917995, 
-    5570, 1881, 7210, 0, 1012, 43752, 0, 120709, 7208, 66442, 5569, 983236, 
+    5570, 1881, 7210, 0, 1012, 43752, 0, 120709, 7208, 66442, 5569, 983237, 
     42339, 0, 6063, 0, 78383, 119594, 6053, 65602, 0, 92201, 64727, 9160, 
     194827, 0, 0, 92180, 10503, 118810, 6055, 3870, 4279, 8490, 120114, 4319, 
     64786, 8602, 120110, 11326, 92204, 983116, 0, 120119, 78333, 120117, 
@@ -17658,7 +17660,7 @@
     120108, 42085, 10107, 42159, 42870, 120101, 589, 7050, 983791, 43281, 
     10233, 41263, 66251, 65729, 66253, 126497, 74099, 42645, 0, 194815, 8583, 
     0, 5847, 6928, 128074, 0, 0, 0, 0, 66592, 12204, 917962, 19966, 77856, 
-    42561, 120626, 983245, 0, 8120, 120701, 0, 0, 128012, 41063, 0, 10664, 0, 
+    42561, 120626, 983246, 0, 8120, 120701, 0, 0, 128012, 41063, 0, 10664, 0, 
     8369, 0, 4551, 194964, 3369, 0, 0, 9673, 66334, 65580, 10478, 118960, 
     12517, 557, 9457, 12034, 983662, 6355, 12519, 41004, 0, 195025, 74094, 0, 
     0, 77970, 983560, 0, 128175, 12111, 3927, 0, 12515, 1474, 67893, 5492, 
@@ -17681,7 +17683,7 @@
     73898, 11979, 70051, 118900, 917894, 0, 9635, 12600, 8871, 0, 0, 0, 6469, 
     74227, 0, 65304, 4679, 10230, 64300, 64867, 3427, 4240, 0, 0, 0, 0, 
     42916, 0, 0, 0, 7282, 78728, 65733, 4445, 127138, 128082, 3494, 74606, 
-    6555, 0, 77976, 0, 0, 78566, 0, 983189, 65898, 983238, 65312, 5447, 0, 
+    6555, 0, 77976, 0, 0, 78566, 0, 983189, 65898, 983239, 65312, 5447, 0, 
     12895, 65593, 4010, 0, 41106, 0, 64448, 0, 41105, 0, 65820, 6232, 0, 
     128280, 0, 43608, 119091, 0, 6538, 4335, 78364, 3941, 41122, 11061, 
     78363, 64892, 9113, 1954, 12155, 983665, 42878, 11500, 0, 0, 74578, 0, 
@@ -17695,9 +17697,9 @@
     11428, 1730, 2457, 917808, 19918, 10469, 0, 0, 7703, 8840, 8035, 0, 0, 
     92230, 0, 6129, 0, 128528, 128268, 0, 7874, 8681, 119092, 0, 13136, 0, 0, 
     70102, 63886, 118881, 9605, 71308, 13220, 128776, 120274, 5514, 0, 9228, 
-    0, 0, 0, 5240, 9811, 10012, 3096, 0, 0, 983343, 66676, 65873, 0, 0, 0, 
+    0, 0, 0, 5240, 9811, 10012, 3096, 0, 0, 983344, 66676, 65873, 0, 0, 0, 
     9501, 0, 1272, 64536, 65465, 64654, 7467, 0, 1467, 10158, 10040, 0, 9519, 
-    0, 917812, 0, 118899, 12193, 0, 0, 0, 0, 983345, 19935, 0, 92162, 69676, 
+    0, 917812, 0, 118899, 12193, 0, 0, 0, 0, 983346, 19935, 0, 92162, 69676, 
     0, 0, 0, 5275, 0, 0, 8637, 0, 0, 3789, 63880, 11471, 43554, 65862, 11474, 
     66332, 66603, 128138, 2426, 12042, 92194, 983902, 9537, 3961, 12115, 
     77953, 2605, 4500, 64561, 55224, 4981, 0, 0, 63876, 11667, 42686, 77973, 
@@ -17748,14 +17750,14 @@
     7142, 119881, 12350, 65554, 119882, 119877, 119876, 12785, 63863, 43795, 
     7770, 10712, 64853, 12686, 118916, 42375, 0, 127238, 66352, 10470, 0, 
     11059, 10791, 917944, 450, 119328, 0, 10432, 12097, 5450, 64691, 1233, 0, 
-    44009, 78284, 66338, 0, 0, 1839, 118799, 983217, 10927, 1701, 983655, 
+    44009, 78284, 66338, 0, 0, 1839, 118799, 983218, 10927, 1701, 983655, 
     2388, 41749, 41761, 5453, 8361, 119865, 41758, 5444, 41763, 64889, 7143, 
     92493, 78677, 0, 92429, 78174, 66432, 8801, 3053, 4340, 983044, 0, 65812, 
     917831, 0, 41824, 67985, 120203, 194800, 194803, 42700, 194805, 127980, 
     194807, 78676, 92356, 194808, 0, 0, 4493, 4336, 0, 2314, 43602, 78826, 
     119325, 194811, 42439, 64638, 42327, 43528, 4489, 71331, 0, 194793, 1912, 
     42385, 10306, 10370, 0, 0, 8867, 10250, 10258, 2712, 1635, 78821, 1410, 
-    92671, 983244, 118878, 0, 0, 9919, 120528, 559, 128157, 41825, 127975, 
+    92671, 983245, 118878, 0, 0, 9919, 120528, 559, 128157, 41825, 127975, 
     78188, 4892, 74016, 194781, 6542, 41957, 128865, 5777, 0, 759, 65749, 
     2079, 65248, 12788, 64487, 64552, 0, 10223, 42062, 0, 0, 126573, 3668, 
     65754, 43560, 12226, 67991, 65149, 2340, 41959, 194786, 194785, 194788, 
@@ -17765,7 +17767,7 @@
     42809, 42807, 0, 120046, 10198, 4150, 64371, 8318, 41790, 67976, 41898, 
     2360, 41794, 917942, 71314, 127818, 0, 0, 2418, 983098, 2411, 11336, 799, 
     63823, 10276, 10308, 10372, 917541, 41772, 42813, 2317, 10260, 118980, 
-    55284, 92203, 0, 10384, 983218, 0, 0, 7753, 2351, 6655, 64489, 69931, 0, 
+    55284, 92203, 0, 10384, 983219, 0, 0, 7753, 2351, 6655, 64489, 69931, 0, 
     77872, 4443, 42779, 230, 0, 0, 43549, 4855, 42150, 65739, 5441, 41896, 
     10288, 10320, 0, 855, 7046, 6109, 65045, 63839, 78198, 2049, 10098, 0, 
     74145, 127943, 10264, 10280, 9184, 10376, 7013, 4467, 0, 0, 0, 41887, 0, 
@@ -17776,7 +17778,7 @@
     78167, 10088, 6548, 0, 120156, 43978, 8988, 8888, 0, 0, 0, 0, 10666, 0, 
     73902, 69740, 0, 0, 9975, 128039, 119902, 4689, 8932, 0, 65560, 119209, 
     74441, 78810, 0, 0, 67987, 0, 0, 0, 67989, 0, 10065, 8207, 0, 92613, 
-    128011, 0, 662, 0, 9244, 194863, 0, 119261, 983420, 0, 0, 0, 41929, 0, 0, 
+    128011, 0, 662, 0, 9244, 194863, 0, 119261, 983421, 0, 0, 0, 41929, 0, 0, 
     66674, 41926, 120408, 120443, 10513, 64637, 194862, 68013, 52, 13118, 
     6475, 0, 120341, 12095, 10225, 4812, 92578, 0, 67992, 74085, 0, 3978, 0, 
     917945, 127823, 11582, 120761, 12281, 0, 6544, 13241, 93961, 69782, 
@@ -17786,7 +17788,7 @@
     120410, 0, 120453, 64821, 9478, 2508, 92683, 0, 202, 128246, 74131, 1242, 
     65514, 0, 63940, 128706, 64533, 120129, 0, 67842, 11990, 92430, 63939, 
     43375, 65440, 2504, 0, 78671, 64829, 983901, 6943, 917934, 5859, 0, 2858, 
-    983353, 74294, 983905, 69239, 0, 119027, 12992, 2753, 1936, 70078, 92574, 
+    983354, 74294, 983905, 69239, 0, 119027, 12992, 2753, 1936, 70078, 92574, 
     2751, 12662, 2763, 8953, 64701, 10731, 12922, 7052, 917839, 0, 0, 0, 
     63920, 74128, 2856, 119910, 47, 69908, 126986, 65858, 0, 0, 0, 7899, 0, 
     8417, 43798, 7072, 0, 0, 4033, 128164, 43992, 0, 0, 212, 64600, 1903, 
@@ -17797,13 +17799,13 @@
     12624, 0, 1673, 4811, 92383, 5986, 9338, 3046, 74480, 5985, 917928, 
     119598, 9820, 0, 12187, 0, 0, 5984, 0, 43308, 4393, 67650, 0, 0, 0, 0, 
     74826, 64733, 0, 0, 3491, 0, 0, 128219, 3514, 65485, 0, 7492, 0, 74605, 
-    92483, 7514, 983359, 0, 194731, 7502, 7587, 68353, 0, 0, 63925, 0, 7610, 
+    92483, 7514, 983360, 0, 194731, 7502, 7587, 68353, 0, 0, 63925, 0, 7610, 
     219, 0, 0, 692, 43588, 74433, 41635, 43241, 9688, 7147, 9535, 0, 93991, 
     0, 64530, 0, 64610, 11804, 0, 7149, 7453, 0, 8013, 0, 92301, 0, 8895, 
     5253, 70025, 5458, 0, 2866, 0, 127860, 65111, 68433, 6700, 120484, 0, 
     120583, 0, 8962, 77960, 9641, 43694, 7059, 983668, 0, 9604, 78700, 7441, 
     63826, 67970, 118941, 64392, 194735, 983678, 2844, 983932, 41974, 0, 
-    12139, 67971, 0, 0, 3358, 65295, 0, 3104, 194734, 0, 194765, 983227, 
+    12139, 67971, 0, 0, 3358, 65295, 0, 3104, 194734, 0, 194765, 983228, 
     5308, 0, 290, 0, 0, 2862, 2792, 195088, 983070, 0, 3268, 66591, 0, 6552, 
     42367, 7035, 120558, 0, 0, 1814, 0, 10240, 92338, 74305, 0, 74528, 65903, 
     0, 42646, 7606, 2591, 2837, 4341, 77956, 64482, 127337, 8163, 65270, 0, 
@@ -17864,7 +17866,7 @@
     93998, 5506, 0, 1911, 66652, 0, 9961, 8845, 66698, 0, 10792, 8889, 0, 
     2098, 0, 64751, 0, 66622, 0, 0, 74364, 0, 0, 983796, 74365, 7552, 0, 0, 
     65384, 7223, 4559, 0, 1956, 43138, 7024, 65728, 64501, 1210, 195077, 
-    65175, 10184, 43140, 43654, 0, 0, 0, 38, 8533, 66669, 119124, 983285, 
+    65175, 10184, 43140, 43654, 0, 0, 0, 38, 8533, 66669, 119124, 983286, 
     983783, 0, 4357, 0, 119837, 917863, 74233, 9967, 78884, 42860, 119838, 
     10941, 65721, 6962, 0, 0, 119324, 0, 11014, 127972, 8942, 12000, 69224, 
     92267, 128536, 11974, 92213, 42772, 127518, 11650, 5013, 92663, 126583, 
@@ -17882,7 +17884,7 @@
     41869, 12619, 0, 10154, 983043, 74439, 2039, 0, 7446, 1684, 63979, 10974, 
     458, 120620, 0, 69791, 127161, 11916, 65016, 0, 69671, 42115, 983133, 
     12288, 78057, 0, 1493, 42111, 7553, 4097, 128199, 13080, 0, 65808, 6610, 
-    6030, 8059, 7508, 13131, 0, 983423, 0, 8794, 41278, 41629, 12154, 128192, 
+    6030, 8059, 7508, 13131, 0, 983424, 0, 8794, 41278, 41629, 12154, 128192, 
     41277, 64658, 0, 64380, 6625, 74354, 19904, 0, 0, 0, 65371, 7078, 0, 833, 
     0, 6369, 0, 10979, 41953, 0, 41434, 6062, 0, 0, 19916, 6913, 933, 1341, 
     9842, 6720, 65744, 0, 983592, 128295, 0, 7405, 10105, 65810, 0, 41632, 
@@ -17897,7 +17899,7 @@
     6741, 43047, 0, 13180, 128517, 418, 917972, 64495, 10295, 10327, 10391, 
     41752, 74339, 8641, 41449, 0, 74100, 0, 10911, 6942, 0, 1024, 42849, 
     41751, 69776, 8941, 983556, 4554, 0, 9023, 11685, 0, 9928, 78617, 0, 
-    11437, 43741, 92163, 120700, 63967, 983475, 41206, 120724, 9049, 41185, 
+    11437, 43741, 92163, 120700, 63967, 983476, 41206, 120724, 9049, 41185, 
     43166, 0, 11680, 92619, 11686, 78544, 65224, 4565, 4655, 119553, 0, 
     92183, 64523, 10343, 10407, 0, 66671, 11466, 0, 128003, 42890, 74013, 
     12050, 68201, 2860, 0, 0, 0, 42792, 5743, 10424, 12065, 42872, 0, 92342, 
@@ -17913,7 +17915,7 @@
     42690, 9880, 42010, 74824, 64589, 10111, 64875, 127880, 68399, 43998, 
     11360, 0, 0, 0, 118826, 42149, 0, 0, 0, 64941, 77919, 120421, 128077, 0, 
     55247, 4110, 66005, 6959, 10929, 119110, 0, 66703, 77921, 8617, 41982, 
-    6025, 69242, 983176, 0, 0, 0, 9597, 42099, 43172, 983368, 10117, 983169, 
+    6025, 69242, 983176, 0, 0, 0, 9597, 42099, 43172, 983369, 10117, 983169, 
     92297, 41636, 0, 0, 120681, 8301, 0, 0, 187, 0, 65669, 128339, 4963, 0, 
     127517, 0, 8964, 65676, 7775, 0, 41948, 0, 0, 0, 41942, 65449, 3160, 
     10081, 13226, 42121, 42475, 42663, 128210, 41766, 119114, 65882, 78849, 
@@ -17928,15 +17930,15 @@
     10716, 0, 42822, 0, 6434, 0, 6939, 7766, 6432, 128106, 69932, 916, 769, 
     41742, 11968, 74805, 6433, 5563, 547, 1943, 6439, 5560, 4994, 487, 
     126537, 4497, 3754, 127056, 120424, 9039, 0, 41776, 0, 8716, 1595, 41615, 
-    0, 0, 74260, 0, 42854, 43219, 128709, 983452, 12185, 128879, 70072, 
-    68355, 68357, 0, 42856, 8634, 0, 983389, 4209, 120702, 0, 65879, 41538, 
-    65612, 127543, 669, 5679, 0, 69786, 92540, 0, 983456, 5678, 11821, 0, 
-    6711, 460, 0, 0, 983453, 0, 120747, 0, 0, 78050, 119022, 0, 983454, 0, 
+    0, 0, 74260, 0, 42854, 43219, 128709, 983453, 12185, 128879, 70072, 
+    68355, 68357, 0, 42856, 8634, 0, 983390, 4209, 120702, 0, 65879, 41538, 
+    65612, 127543, 669, 5679, 0, 69786, 92540, 0, 983457, 5678, 11821, 0, 
+    6711, 460, 0, 0, 983454, 0, 120747, 0, 0, 78050, 119022, 0, 983455, 0, 
     7782, 9044, 4974, 11760, 78494, 7577, 65711, 41912, 1216, 0, 128079, 
-    5792, 0, 0, 78501, 0, 2933, 12244, 0, 5683, 983384, 0, 78119, 1549, 0, 0, 
+    5792, 0, 0, 78501, 0, 2933, 12244, 0, 5683, 983385, 0, 78119, 1549, 0, 0, 
     120398, 5682, 6206, 8670, 10256, 5680, 69935, 10001, 128512, 69768, 1449, 
     10241, 78290, 128228, 0, 10552, 64342, 41922, 128548, 8584, 68030, 5567, 
-    2717, 0, 0, 5564, 42886, 41908, 42882, 5565, 983248, 128026, 0, 65708, 
+    2717, 0, 0, 5564, 42886, 41908, 42882, 5565, 983249, 128026, 0, 65708, 
     65709, 5566, 69803, 65704, 65705, 11904, 42875, 43373, 42539, 5942, 8468, 
     120561, 10361, 10425, 65697, 65698, 65699, 0, 66598, 0, 64664, 10647, 
     78702, 78703, 78690, 457, 78502, 65701, 1934, 43006, 119903, 8802, 78710, 
@@ -17950,12 +17952,12 @@
     119570, 42239, 8536, 78740, 78324, 78726, 74432, 724, 0, 1455, 78749, 
     7183, 64583, 78747, 68443, 4175, 78741, 43614, 69801, 939, 0, 43520, 
     68613, 74569, 917958, 0, 78763, 78764, 78760, 10788, 6088, 78759, 78755, 
-    190, 0, 12593, 0, 8188, 64408, 0, 4417, 983211, 92261, 6370, 0, 7827, 
+    190, 0, 12593, 0, 8188, 64408, 0, 4417, 983212, 92261, 6370, 0, 7827, 
     68441, 6965, 0, 0, 13201, 128205, 69896, 0, 74382, 73781, 7918, 73988, 0, 
-    0, 917884, 1728, 0, 43764, 178, 12972, 92679, 0, 917887, 92563, 983373, 
+    0, 917884, 1728, 0, 43764, 178, 12972, 92679, 0, 917887, 92563, 983374, 
     0, 78327, 120405, 65690, 0, 0, 119054, 0, 9252, 917889, 4652, 68371, 0, 
     0, 0, 13065, 9923, 10806, 0, 11763, 70016, 120688, 6723, 78187, 0, 6993, 
-    0, 0, 8333, 0, 0, 11390, 0, 74464, 0, 92320, 74080, 983307, 69911, 11910, 
+    0, 0, 8333, 0, 0, 11390, 0, 74464, 0, 92320, 74080, 983308, 69911, 11910, 
     92559, 8278, 8963, 4034, 128560, 0, 65344, 120517, 41747, 0, 0, 8677, 0, 
     12707, 9350, 66037, 128180, 8836, 12315, 12747, 8300, 983741, 0, 7491, 
     8856, 71361, 0, 43150, 127768, 120404, 65389, 120402, 120403, 10813, 
@@ -17982,27 +17984,27 @@
     116, 12998, 122, 121, 120, 111, 110, 109, 108, 115, 114, 113, 112, 103, 
     102, 101, 100, 107, 106, 105, 104, 6436, 73974, 534, 41212, 77931, 1536, 
     64093, 73970, 77930, 127157, 0, 6020, 12716, 127112, 12744, 475, 120394, 
-    13266, 127813, 127111, 0, 73926, 0, 10645, 1212, 6543, 983299, 8134, 
+    13266, 127813, 127111, 0, 73926, 0, 10645, 1212, 6543, 983300, 8134, 
     128028, 2913, 73870, 127113, 1866, 0, 195095, 0, 8923, 1645, 12059, 
     66585, 71297, 3196, 0, 0, 5935, 1250, 127066, 8174, 9787, 6733, 9859, 
     7916, 9861, 9860, 5258, 1882, 1892, 6731, 10882, 405, 11454, 73911, 0, 
     128781, 41169, 8939, 41245, 0, 41170, 1454, 11369, 6477, 12157, 0, 0, 0, 
-    41172, 7855, 0, 0, 10480, 0, 0, 77936, 8264, 12610, 983300, 645, 126616, 
+    41172, 7855, 0, 0, 10480, 0, 0, 77936, 8264, 12610, 983301, 645, 126616, 
     7609, 40973, 69943, 73833, 69948, 5824, 984, 77918, 10688, 5851, 0, 7729, 
     73982, 120518, 0, 195086, 43369, 0, 128140, 68415, 983093, 4538, 120406, 
-    43141, 0, 983208, 74214, 73886, 0, 0, 118902, 43005, 78448, 9552, 0, 0, 
+    43141, 0, 983209, 74214, 73886, 0, 0, 118902, 43005, 78448, 9552, 0, 0, 
     983159, 12997, 0, 0, 0, 0, 2381, 12883, 10994, 10529, 41906, 0, 0, 0, 
     12425, 10661, 10856, 9614, 2428, 41478, 8582, 10064, 73930, 0, 0, 0, 
-    64896, 119162, 1952, 92181, 8455, 10082, 11575, 983482, 119566, 0, 12808, 
+    64896, 119162, 1952, 92181, 8455, 10082, 11575, 983483, 119566, 0, 12808, 
     12183, 6145, 118955, 64929, 92433, 0, 983193, 43186, 42509, 0, 3922, 
     9187, 983614, 0, 10191, 119057, 11752, 3353, 9358, 0, 71366, 66680, 
-    120090, 8248, 7931, 8558, 9795, 68380, 983289, 0, 120082, 120081, 120084, 
+    120090, 8248, 7931, 8558, 9795, 68380, 983290, 0, 120082, 120081, 120084, 
     41027, 120086, 0, 120088, 7366, 7019, 120073, 0, 11751, 120078, 78294, 
     64657, 8657, 120048, 8594, 120068, 0, 0, 120069, 120072, 120071, 0, 0, 
     43154, 41029, 0, 11332, 65380, 7728, 94077, 11294, 0, 66665, 7851, 0, 
     8375, 8699, 0, 42524, 0, 9085, 94041, 7504, 9327, 6160, 128095, 983855, 
     0, 8088, 0, 74012, 92500, 0, 4439, 6926, 983047, 12924, 128227, 42369, 
-    4350, 65491, 65145, 9041, 43559, 64577, 10826, 0, 11296, 983275, 0, 0, 
+    4350, 65491, 65145, 9041, 43559, 64577, 10826, 0, 11296, 983276, 0, 0, 
     65825, 9577, 68199, 0, 64670, 983121, 78056, 6793, 11295, 0, 78053, 
     73872, 0, 0, 10902, 0, 0, 78070, 78068, 10472, 2995, 0, 0, 64682, 2371, 
     78069, 120808, 259, 1009, 92171, 2402, 2333, 6440, 194741, 0, 65125, 
@@ -18016,13 +18018,13 @@
     11772, 13041, 5928, 4525, 10658, 65911, 1266, 10180, 0, 128584, 12622, 0, 
     0, 0, 194714, 127139, 13310, 773, 19933, 1539, 0, 126983, 42731, 67972, 
     0, 0, 0, 3051, 5862, 7823, 92478, 0, 120411, 3250, 43991, 69687, 66649, 
-    9510, 66237, 983294, 0, 41066, 64673, 917963, 917964, 0, 3505, 8707, 
+    9510, 66237, 983295, 0, 41066, 64673, 917963, 917964, 0, 3505, 8707, 
     917968, 6725, 128013, 917971, 92314, 3471, 917970, 5479, 882, 6686, 
-    119584, 11613, 120772, 42754, 0, 983298, 92696, 0, 0, 0, 128523, 3225, 
+    119584, 11613, 120772, 42754, 0, 983299, 92696, 0, 0, 0, 128523, 3225, 
     917996, 4433, 41156, 43973, 43173, 1443, 4381, 0, 0, 10926, 11756, 11757, 
     64879, 917949, 917950, 127848, 13227, 0, 10021, 5160, 1387, 0, 917953, 
     41418, 0, 65914, 6721, 217, 917955, 917960, 917961, 10443, 10789, 41158, 
-    119257, 4274, 983292, 41483, 0, 41250, 0, 42179, 0, 5931, 11744, 69232, 
+    119257, 4274, 983293, 41483, 0, 41250, 0, 42179, 0, 5931, 11744, 69232, 
     0, 41252, 66682, 0, 119637, 41249, 1366, 64635, 65047, 12466, 0, 0, 4397, 
     128037, 128336, 41296, 9545, 41291, 128049, 0, 41485, 3511, 41282, 5923, 
     10400, 0, 128818, 760, 0, 12088, 5786, 0, 42256, 119869, 119860, 417, 
@@ -18032,7 +18034,7 @@
     119576, 0, 0, 1375, 66705, 43573, 65260, 42063, 0, 42811, 10312, 69845, 
     120794, 7840, 0, 43630, 10252, 0, 128104, 43185, 0, 4396, 0, 119880, 
     10769, 9676, 119041, 0, 9753, 0, 8944, 0, 0, 10473, 0, 0, 6072, 43025, 
-    10299, 0, 0, 120608, 66326, 983439, 127794, 0, 43811, 9330, 120596, 7222, 
+    10299, 0, 0, 120608, 66326, 983440, 127794, 0, 43811, 9330, 120596, 7222, 
     10283, 10315, 10379, 4996, 983773, 13281, 66517, 7865, 10087, 78343, 0, 
     78347, 0, 0, 7565, 66363, 12952, 64806, 43180, 77928, 7414, 77929, 43982, 
     74288, 622, 74023, 885, 43405, 1602, 0, 0, 852, 0, 12160, 0, 10212, 
@@ -18063,7 +18065,7 @@
     7830, 11651, 13093, 64002, 0, 65742, 12874, 119597, 11590, 0, 74048, 
     128350, 8595, 0, 917947, 43703, 13097, 0, 64643, 13283, 12697, 0, 12381, 
     3488, 5933, 10033, 73738, 66241, 65570, 0, 12297, 119153, 1955, 0, 5349, 
-    42538, 0, 0, 7411, 9462, 917554, 0, 0, 0, 42736, 0, 5756, 983219, 7638, 
+    42538, 0, 0, 7411, 9462, 917554, 0, 0, 0, 42736, 0, 5756, 983220, 7638, 
     41642, 42764, 0, 43109, 7637, 5752, 74037, 0, 73832, 128827, 120635, 
     128231, 78334, 0, 7636, 65171, 9124, 0, 78892, 120798, 291, 0, 0, 2027, 
     66230, 10080, 78136, 10403, 0, 4640, 64713, 10224, 120429, 42512, 120431, 
@@ -18110,14 +18112,14 @@
     0, 4916, 0, 380, 10958, 66563, 77955, 69773, 9773, 13167, 12918, 41096, 
     73980, 69245, 78254, 917893, 10684, 0, 917896, 0, 7946, 12541, 8182, 
     67586, 69780, 0, 0, 0, 0, 9005, 1225, 6630, 0, 0, 0, 68011, 8847, 0, 
-    65876, 5535, 8329, 74590, 983206, 92609, 0, 0, 3127, 2595, 65713, 42013, 
+    65876, 5535, 8329, 74590, 983207, 92609, 0, 0, 3127, 2595, 65713, 42013, 
     983849, 5607, 41089, 0, 0, 74256, 2665, 11304, 43751, 74200, 4970, 8764, 
     120459, 8934, 92726, 41566, 4492, 0, 65011, 41090, 0, 0, 1188, 7254, 
     1100, 0, 128301, 41081, 2912, 11749, 69792, 0, 68019, 3572, 10023, 4959, 
-    13079, 0, 983268, 9729, 0, 0, 0, 43361, 0, 0, 11803, 7996, 9907, 41450, 
-    13304, 128290, 127260, 41451, 0, 11095, 8273, 127533, 3451, 983301, 972, 
-    41453, 983434, 0, 73883, 68022, 73945, 983726, 2288, 19955, 9538, 0, 
-    69807, 0, 0, 0, 0, 11396, 983432, 11019, 0, 0, 0, 68020, 41078, 71365, 
+    13079, 0, 983269, 9729, 0, 0, 0, 43361, 0, 0, 11803, 7996, 9907, 41450, 
+    13304, 128290, 127260, 41451, 0, 11095, 8273, 127533, 3451, 983302, 972, 
+    41453, 983435, 0, 73883, 68022, 73945, 983726, 2288, 19955, 9538, 0, 
+    69807, 0, 0, 0, 0, 11396, 983433, 11019, 0, 0, 0, 68020, 41078, 71365, 
     261, 5927, 7791, 0, 7362, 0, 10696, 0, 6073, 9838, 118920, 0, 6075, 
     93995, 282, 126510, 6437, 74078, 128000, 9801, 0, 74177, 0, 0, 3474, 
     118787, 0, 120655, 6081, 0, 78874, 74076, 78879, 0, 0, 0, 0, 0, 8751, 
@@ -18138,7 +18140,7 @@
     4564, 0, 0, 74271, 73753, 8374, 983156, 0, 6829, 5225, 128807, 127385, 0, 
     0, 119615, 0, 74793, 5626, 73807, 11771, 74075, 127236, 128019, 42614, 
     5353, 5625, 74179, 0, 0, 1010, 64572, 41780, 42623, 64277, 69942, 6952, 
-    983264, 120752, 78762, 2590, 5629, 65552, 7551, 10325, 5632, 10471, 
+    983265, 120752, 78762, 2590, 5629, 65552, 7551, 10325, 5632, 10471, 
     120038, 120027, 120028, 120025, 5628, 120031, 970, 120029, 4772, 2400, 
     5627, 120017, 120018, 120023, 64275, 120021, 8786, 0, 203, 0, 0, 0, 0, 
     78350, 0, 64378, 42054, 0, 0, 554, 119649, 11358, 0, 12182, 42048, 11065, 
@@ -18175,10 +18177,10 @@
     612, 0, 64401, 66448, 68376, 0, 1674, 0, 5823, 983163, 12280, 0, 540, 
     74564, 119017, 0, 8432, 0, 11073, 0, 64316, 0, 0, 820, 41741, 0, 120667, 
     0, 64684, 126992, 3359, 7800, 69934, 65177, 6226, 353, 12396, 0, 119612, 
-    64742, 128682, 120282, 0, 983442, 12412, 19941, 0, 120277, 78847, 1884, 
+    64742, 128682, 120282, 0, 983443, 12412, 19941, 0, 120277, 78847, 1884, 
     9481, 42418, 70059, 41157, 0, 1195, 64898, 7924, 0, 41151, 2010, 0, 
     41328, 42344, 0, 12409, 0, 4360, 127009, 9739, 128550, 69933, 73921, 0, 
-    42521, 8539, 983716, 0, 118986, 0, 4788, 0, 68023, 65734, 983447, 43790, 
+    42521, 8539, 983716, 0, 118986, 0, 4788, 0, 68023, 65734, 983448, 43790, 
     0, 13075, 74429, 94063, 64569, 43532, 10837, 2492, 127197, 118901, 68637, 
     41136, 43785, 11813, 9649, 41154, 119617, 5128, 4038, 41143, 65604, 
     64859, 41592, 6771, 1648, 5435, 917837, 6734, 41343, 119848, 65439, 
@@ -18214,7 +18216,7 @@
     41461, 128823, 0, 127912, 0, 8819, 12663, 0, 41184, 74014, 232, 74835, 
     120646, 9168, 65786, 0, 0, 0, 9094, 0, 11758, 68425, 0, 1064, 42467, 
     128044, 10115, 19924, 92711, 0, 7862, 64551, 13224, 8516, 41862, 66650, 
-    7561, 78618, 69793, 1878, 0, 983261, 2911, 0, 41178, 5427, 64823, 0, 0, 
+    7561, 78618, 69793, 1878, 0, 983262, 2911, 0, 41178, 5427, 64823, 0, 0, 
     3787, 41174, 0, 41458, 0, 41463, 42413, 11292, 2406, 775, 0, 65584, 
     69923, 6074, 9618, 128668, 983943, 43440, 0, 194901, 41436, 3656, 0, 
     120600, 41456, 0, 1599, 11333, 0, 6703, 8513, 0, 1613, 0, 68456, 12598, 
@@ -18236,7 +18238,7 @@
     41287, 92610, 0, 0, 42219, 128257, 0, 41987, 41676, 983059, 120823, 
     983144, 41670, 0, 92590, 2796, 55291, 11683, 9902, 74521, 67988, 11451, 
     983111, 128822, 42631, 2359, 0, 67844, 74164, 41238, 548, 11405, 13133, 
-    64368, 983233, 128795, 0, 397, 43622, 42139, 9547, 9590, 128238, 1614, 
+    64368, 983234, 128795, 0, 397, 43622, 42139, 9547, 9590, 128238, 1614, 
     43661, 64356, 66307, 6651, 1358, 0, 428, 9620, 1466, 78112, 10982, 
     118831, 1333, 7104, 407, 6425, 128834, 74253, 0, 0, 0, 5804, 11976, 8554, 
     92721, 0, 0, 9057, 42294, 41218, 0, 0, 78137, 1883, 10952, 8048, 78142, 
@@ -18250,7 +18252,7 @@
     66315, 2106, 120222, 11273, 0, 43004, 7541, 0, 0, 961, 64307, 66324, 
     64906, 128591, 3106, 65917, 41284, 1696, 0, 891, 12105, 0, 42624, 12802, 
     3264, 8824, 13268, 43003, 10936, 0, 0, 0, 194826, 92688, 0, 2322, 120371, 
-    983584, 11449, 128187, 42868, 41285, 3547, 0, 0, 128793, 983390, 43216, 
+    983584, 11449, 128187, 42868, 41285, 3547, 0, 0, 128793, 983391, 43216, 
     6089, 78682, 0, 120578, 4170, 1029, 127761, 127036, 119224, 42374, 0, 
     744, 0, 0, 0, 65823, 127826, 0, 3551, 0, 0, 4623, 55268, 0, 4598, 983162, 
     65136, 127136, 0, 0, 10851, 0, 6179, 92602, 6180, 0, 11952, 120778, 
@@ -18277,8 +18279,8 @@
     6352, 41892, 0, 7555, 13103, 5408, 2817, 1214, 69919, 92335, 983125, 0, 
     0, 0, 127195, 7957, 8689, 64723, 1056, 42896, 74147, 194813, 0, 55286, 
     7073, 65850, 12327, 983939, 119028, 0, 0, 0, 2341, 8450, 8484, 8474, 
-    983252, 0, 70079, 8461, 128102, 12153, 12799, 0, 43709, 43708, 9451, 
-    7571, 13073, 0, 0, 681, 983246, 703, 0, 3272, 8781, 12894, 70077, 11709, 
+    983253, 0, 70079, 8461, 128102, 12153, 12799, 0, 43709, 43708, 9451, 
+    7571, 13073, 0, 0, 681, 983247, 703, 0, 3272, 8781, 12894, 70077, 11709, 
     92288, 74446, 0, 92532, 0, 11338, 120768, 3276, 0, 0, 65928, 0, 0, 65021, 
     64795, 74574, 0, 10047, 78814, 3262, 78811, 42711, 0, 0, 68478, 163, 576, 
     9895, 1655, 78817, 74591, 78815, 78816, 983122, 0, 0, 0, 10039, 0, 
@@ -18288,7 +18290,7 @@
     0, 71362, 4619, 118954, 6654, 73769, 74426, 0, 12040, 65689, 10128, 
     65118, 0, 119151, 74205, 92651, 0, 2401, 68144, 8792, 983639, 0, 65455, 
     0, 92246, 0, 119129, 0, 12886, 127920, 66624, 0, 43557, 10300, 10161, 
-    10396, 74135, 983445, 118945, 78118, 73851, 3010, 6441, 78122, 1458, 
+    10396, 74135, 983446, 118945, 78118, 73851, 3010, 6441, 78122, 1458, 
     41475, 128672, 93975, 0, 11479, 0, 120356, 6350, 12864, 69674, 78114, 
     1061, 64780, 2001, 43111, 55230, 128686, 4052, 0, 7626, 0, 0, 1045, 0, 
     5631, 41113, 0, 0, 43707, 74127, 0, 0, 8486, 0, 73758, 2335, 4362, 
@@ -18304,8 +18306,8 @@
     92245, 440, 0, 13085, 9233, 74216, 0, 0, 9957, 128285, 66447, 8046, 
     64963, 65777, 10125, 74212, 42819, 10910, 0, 1521, 9896, 93965, 10487, 
     69878, 12527, 0, 7970, 0, 128660, 0, 65769, 5243, 9849, 5239, 65771, 
-    983229, 0, 5237, 69714, 0, 10103, 5247, 4769, 0, 118977, 12873, 2283, 
-    983231, 0, 3008, 4896, 0, 12087, 0, 55231, 41103, 0, 64565, 4773, 0, 
+    983230, 0, 5237, 69714, 0, 10103, 5247, 4769, 0, 118977, 12873, 2283, 
+    983232, 0, 3008, 4896, 0, 12087, 0, 55231, 41103, 0, 64565, 4773, 0, 
     92717, 70074, 4770, 0, 917567, 8731, 65378, 127362, 120619, 9122, 128033, 
     126600, 4774, 3019, 9997, 12834, 0, 9456, 10215, 120547, 0, 0, 0, 0, 
     74776, 4281, 4768, 0, 41535, 4099, 9017, 0, 0, 78095, 0, 78096, 0, 0, 0, 
@@ -18333,7 +18335,7 @@
     41521, 118934, 494, 13250, 0, 65098, 6364, 956, 0, 12830, 10462, 73740, 
     73734, 0, 0, 0, 66449, 13263, 74281, 69217, 13171, 127796, 0, 0, 92294, 
     0, 1044, 41276, 0, 0, 0, 42068, 11795, 0, 0, 0, 0, 42450, 3907, 0, 64526, 
-    11829, 68197, 12295, 0, 11475, 0, 3020, 11537, 0, 66441, 983446, 7098, 0, 
+    11829, 68197, 12295, 0, 11475, 0, 3020, 11537, 0, 66441, 983447, 7098, 0, 
     0, 1057, 566, 42696, 0, 3016, 42274, 43464, 66490, 12921, 66571, 78472, 
     92510, 3006, 4620, 127237, 983578, 0, 0, 64659, 0, 127749, 55253, 6357, 
     6362, 8626, 71337, 2216, 9090, 65377, 41596, 0, 42920, 1698, 0, 64477, 0, 
@@ -18364,9 +18366,9 @@
     42249, 7639, 43995, 67845, 42641, 5454, 0, 0, 194997, 120005, 0, 983957, 
     5084, 0, 0, 118861, 0, 733, 917876, 78014, 78436, 78435, 41677, 0, 9218, 
     1731, 0, 983737, 0, 67990, 0, 0, 0, 120001, 127018, 92492, 5155, 120000, 
-    5358, 983735, 0, 917767, 64424, 983225, 3840, 64314, 41432, 0, 78315, 
+    5358, 983735, 0, 917767, 64424, 983226, 3840, 64314, 41432, 0, 78315, 
     68430, 67980, 43253, 65943, 0, 3371, 10988, 0, 8771, 1479, 0, 0, 1109, 
-    11580, 0, 64601, 12205, 0, 0, 64507, 8868, 399, 67978, 74842, 983276, 
+    11580, 0, 64601, 12205, 0, 0, 64507, 8868, 399, 67978, 74842, 983277, 
     983712, 12149, 13088, 551, 0, 10156, 12119, 92572, 0, 2544, 65074, 
     119211, 0, 0, 78011, 351, 119149, 0, 0, 55229, 0, 74268, 0, 0, 0, 42377, 
     0, 0, 0, 983915, 0, 9013, 4054, 0, 983570, 0, 0, 73960, 5585, 65881, 
@@ -18439,33 +18441,33 @@
     0, 43435, 0, 0, 4993, 0, 6168, 10934, 1946, 741, 0, 5494, 4639, 983147, 
     1990, 66589, 4498, 78664, 119183, 0, 0, 69734, 2960, 73779, 0, 8969, 
     128117, 43424, 127059, 0, 2950, 119579, 6210, 65753, 370, 0, 0, 0, 4953, 
-    983673, 0, 0, 0, 69230, 0, 0, 65688, 983240, 5063, 3517, 2964, 43663, 
+    983673, 0, 0, 0, 69230, 0, 0, 65688, 983241, 5063, 3517, 2964, 43663, 
     917762, 6344, 74791, 10566, 10144, 66333, 8252, 729, 66016, 78253, 0, 
     71317, 64923, 128040, 43669, 9032, 78263, 78264, 0, 41215, 0, 65883, 0, 
     917774, 120602, 3761, 0, 0, 70068, 0, 12912, 119012, 3850, 128191, 0, 0, 
     0, 0, 908, 0, 8611, 0, 0, 127555, 43691, 41197, 0, 8978, 120540, 119135, 
     41586, 10527, 0, 917848, 3848, 78739, 194937, 127536, 65241, 5336, 
-    983251, 128786, 663, 0, 10780, 0, 0, 78767, 983249, 127163, 68193, 347, 
+    983252, 128786, 663, 0, 10780, 0, 0, 78767, 983250, 127163, 68193, 347, 
     0, 0, 78775, 64675, 41582, 78774, 78744, 65579, 12980, 78769, 12143, 
     69657, 78512, 0, 43441, 41804, 78523, 0, 78525, 0, 128859, 41584, 10681, 
     0, 983686, 73938, 0, 128022, 4800, 66661, 0, 66306, 64715, 78534, 9518, 
-    6609, 10434, 0, 11319, 1097, 0, 917850, 41730, 983212, 0, 73847, 78761, 
+    6609, 10434, 0, 11319, 1097, 0, 917850, 41730, 983213, 0, 73847, 78761, 
     65172, 41728, 41721, 0, 0, 0, 41203, 917612, 13110, 41726, 983846, 0, 
     1000, 69651, 0, 41140, 1209, 73978, 0, 73750, 1073, 6321, 77878, 41138, 
     0, 68213, 0, 12167, 1115, 41605, 9794, 127062, 67671, 55248, 12237, 
     78787, 66314, 6587, 9290, 78782, 78783, 9231, 78781, 2959, 7926, 0, 0, 0, 
     64398, 0, 119970, 12311, 983718, 78796, 78798, 78794, 78795, 68434, 
     78793, 66670, 0, 0, 12290, 120169, 0, 119873, 42142, 9968, 8205, 0, 5131, 
-    0, 9627, 78536, 78542, 78535, 983210, 1944, 1248, 10148, 127755, 119990, 
+    0, 9627, 78536, 78542, 78535, 983211, 1944, 1248, 10148, 127755, 119990, 
     119991, 12701, 78376, 11308, 119995, 0, 119997, 119998, 65305, 65100, 
     4031, 42794, 120003, 7075, 8154, 119985, 120007, 41817, 73934, 42275, 
     120011, 120012, 78526, 120014, 120015, 6041, 0, 41899, 0, 8002, 0, 4364, 
     0, 0, 64332, 0, 7813, 9064, 119986, 10124, 7526, 8601, 7281, 78455, 7279, 
-    12041, 1418, 10885, 12673, 0, 0, 9660, 983272, 13012, 4571, 0, 0, 120164, 
+    12041, 1418, 10885, 12673, 0, 0, 9660, 983273, 13012, 4571, 0, 0, 120164, 
     12078, 2970, 0, 10933, 0, 77870, 0, 127015, 0, 41599, 0, 128831, 0, 
     12950, 92160, 3486, 0, 78311, 4239, 0, 127799, 66511, 0, 2637, 64629, 
     8460, 127053, 8476, 983966, 0, 0, 0, 65673, 1019, 78495, 4148, 0, 12289, 
-    0, 4316, 0, 13119, 8488, 5412, 66243, 9935, 0, 73864, 983201, 41734, 
+    0, 4316, 0, 13119, 8488, 5412, 66243, 9935, 0, 73864, 983202, 41734, 
     8206, 74081, 9163, 3286, 9072, 5867, 13302, 7622, 7120, 41736, 92546, 
     41731, 0, 7400, 5416, 68663, 118924, 10817, 0, 41539, 127284, 0, 73963, 
     41855, 41867, 65564, 11277, 65892, 11536, 10620, 92272, 7115, 66030, 
@@ -18473,8 +18475,8 @@
     92512, 0, 66377, 69781, 0, 983690, 78511, 3161, 295, 120207, 0, 92223, 
     127856, 78742, 9016, 43454, 63903, 63902, 43641, 0, 3971, 0, 70063, 2952, 
     78765, 11038, 10901, 63900, 63899, 63898, 94043, 667, 12332, 63887, 6086, 
-    41722, 0, 5172, 0, 0, 4159, 0, 0, 9815, 63884, 19934, 63882, 41198, 8555, 
-    63878, 63877, 42460, 6050, 42708, 63881, 63872, 0, 42421, 0, 41723, 
+    41722, 0, 5172, 0, 983271, 4159, 0, 0, 9815, 63884, 19934, 63882, 41198, 
+    8555, 63878, 63877, 42460, 6050, 42708, 63881, 63872, 0, 42421, 0, 41723, 
     63875, 63874, 11460, 7432, 1913, 41913, 63852, 126636, 0, 42348, 73892, 
     6752, 446, 41911, 127906, 63851, 63850, 41910, 0, 63846, 2972, 12932, 
     7262, 0, 63849, 63848, 63847, 128070, 6570, 8302, 7259, 63842, 4178, 
@@ -18515,7 +18517,7 @@
     0, 10515, 41589, 128698, 0, 6218, 0, 1430, 0, 0, 120606, 78754, 5413, 
     7619, 3255, 3493, 74032, 11549, 10735, 41743, 73937, 6801, 983624, 4518, 
     10990, 65073, 5167, 4481, 3771, 120158, 2710, 0, 69243, 41724, 0, 43073, 
-    41690, 12479, 983626, 0, 0, 983809, 70046, 1628, 127149, 983479, 983722, 
+    41690, 12479, 983626, 0, 0, 983809, 70046, 1628, 127149, 983480, 983722, 
     65262, 6333, 10783, 42315, 0, 63855, 94056, 0, 0, 5339, 74323, 0, 13004, 
     0, 4457, 0, 0, 0, 0, 5684, 8678, 10914, 0, 5689, 65807, 0, 68464, 12633, 
     12870, 69705, 65183, 5688, 11926, 6033, 6310, 5686, 0, 74251, 0, 120647, 
@@ -18542,7 +18544,7 @@
     73859, 65904, 7363, 1686, 0, 78406, 11467, 3664, 65921, 64299, 194664, 0, 
     0, 4324, 126, 42246, 119152, 0, 74378, 65926, 7744, 194636, 74277, 74302, 
     78052, 43817, 6966, 43822, 8136, 0, 65600, 1633, 0, 0, 4762, 1103, 0, 0, 
-    4765, 983484, 13078, 0, 4760, 63827, 2050, 10871, 43199, 1102, 0, 42236, 
+    4765, 983485, 13078, 0, 4760, 63827, 2050, 10871, 43199, 1102, 0, 42236, 
     128867, 194667, 11546, 74794, 337, 0, 42591, 8627, 12279, 1111, 0, 92161, 
     4707, 68206, 10143, 7883, 127081, 7880, 4522, 8645, 5704, 13010, 0, 8304, 
     917561, 0, 119575, 2293, 0, 66654, 0, 92676, 0, 13008, 0, 4385, 0, 13011, 
@@ -18566,7 +18568,7 @@
     1349, 63750, 63749, 0, 0, 0, 63753, 63802, 41084, 120622, 68133, 41930, 
     63805, 63804, 43632, 63801, 41082, 8140, 63798, 6260, 0, 0, 94074, 63793, 
     11988, 3898, 128241, 10201, 12238, 63795, 42194, 10367, 12521, 10431, 
-    42114, 41932, 1068, 0, 12523, 12945, 983321, 42203, 7950, 10804, 63771, 
+    42114, 41932, 1068, 0, 12523, 12945, 983322, 42203, 7950, 10804, 63771, 
     42787, 4386, 12224, 6973, 2793, 12475, 0, 0, 63769, 9530, 983119, 12232, 
     13135, 8596, 5681, 63762, 4595, 63760, 792, 0, 64803, 0, 8742, 0, 11053, 
     128796, 63744, 128107, 0, 7588, 63748, 1693, 63746, 43204, 5055, 68426, 
@@ -18595,7 +18597,7 @@
     65835, 0, 2365, 7841, 0, 42855, 118856, 42866, 0, 0, 0, 66438, 41785, 
     12617, 64172, 13173, 4372, 119354, 0, 983568, 0, 0, 92402, 128062, 12965, 
     384, 64512, 10404, 10340, 119352, 1556, 5274, 13210, 120125, 10017, 9733, 
-    41787, 983237, 126994, 41373, 78039, 12303, 0, 13232, 13233, 349, 4863, 
+    41787, 983238, 126994, 41373, 78039, 12303, 0, 13232, 13233, 349, 4863, 
     41371, 11656, 0, 120703, 119883, 12861, 4398, 8543, 65618, 128018, 1096, 
     0, 0, 42688, 12441, 12355, 119348, 119347, 4318, 10452, 0, 8032, 13243, 
     13237, 12719, 126646, 119101, 0, 64884, 119872, 119345, 8597, 0, 0, 9864, 
@@ -18623,7 +18625,7 @@
     5841, 5837, 55234, 0, 3105, 12829, 5838, 5796, 0, 119592, 5793, 0, 5866, 
     5797, 41011, 5865, 120091, 7956, 598, 0, 64649, 5806, 42398, 0, 9037, 
     5671, 120041, 0, 0, 0, 128855, 0, 847, 128242, 9529, 0, 66657, 6980, 
-    78483, 120035, 78484, 983483, 0, 120033, 78486, 0, 0, 120039, 42683, 0, 
+    78483, 120035, 78484, 983484, 0, 120033, 78486, 0, 0, 120039, 42683, 0, 
     983055, 7114, 0, 0, 43190, 65463, 1554, 0, 42611, 42563, 0, 5651, 2929, 
     6792, 43201, 0, 19963, 5698, 0, 0, 0, 0, 5644, 10292, 65546, 69727, 
     68141, 8372, 0, 65116, 0, 120022, 10175, 10388, 42799, 94100, 41013, 
@@ -18631,7 +18633,7 @@
     42608, 78469, 9884, 4759, 0, 0, 10266, 41359, 1170, 43365, 69810, 73908, 
     1609, 902, 0, 63936, 128875, 11661, 8122, 5818, 0, 0, 3861, 9540, 11028, 
     2554, 5158, 5714, 2213, 0, 0, 807, 43079, 0, 78475, 976, 5511, 64553, 0, 
-    42155, 0, 41356, 74110, 118801, 126614, 0, 8676, 983283, 0, 5582, 451, 
+    42155, 0, 41356, 74110, 118801, 126614, 0, 8676, 983284, 0, 5582, 451, 
     63941, 5798, 9349, 42018, 127858, 0, 0, 43609, 5906, 120553, 1440, 0, 
     128853, 120016, 74283, 11005, 0, 66656, 66044, 0, 194698, 0, 0, 43393, 
     10094, 0, 11529, 10857, 120643, 66436, 6546, 93, 8102, 0, 68405, 0, 0, 
@@ -18665,7 +18667,7 @@
     0, 1862, 65800, 9155, 66623, 9786, 65082, 41919, 8579, 41914, 7981, 0, 
     66017, 4508, 64883, 92456, 92522, 127814, 0, 64592, 74276, 120080, 6784, 
     78788, 68181, 0, 0, 0, 127534, 12147, 9024, 66378, 66472, 983920, 64289, 
-    65289, 78151, 66658, 194929, 64509, 78152, 0, 126505, 11051, 983288, 0, 
+    65289, 78151, 66658, 194929, 64509, 78152, 0, 126505, 11051, 983289, 0, 
     11355, 65885, 0, 128310, 41214, 0, 12299, 0, 7500, 4506, 7773, 0, 0, 
     9963, 68649, 126609, 4040, 120570, 6167, 0, 63922, 6594, 983731, 0, 0, 
     3624, 43036, 0, 6387, 63990, 19947, 63988, 41955, 0, 63993, 10440, 9611, 
@@ -18680,7 +18682,7 @@
     119625, 42922, 42103, 8628, 9813, 0, 42453, 1604, 9565, 10539, 69701, 
     65764, 41415, 65767, 0, 8457, 42301, 11372, 64873, 11992, 0, 0, 63980, 
     11801, 3622, 983124, 64336, 12017, 10463, 63981, 4967, 64189, 1966, 
-    43628, 0, 983284, 0, 0, 63971, 4347, 4416, 42098, 11009, 10694, 63973, 
+    43628, 0, 983285, 0, 0, 63971, 4347, 4416, 42098, 11009, 10694, 63973, 
     402, 0, 13147, 128692, 42100, 64646, 13228, 0, 41875, 3515, 74252, 11805, 
     0, 11302, 6259, 43395, 0, 0, 194670, 0, 92351, 0, 74425, 11299, 1561, 0, 
     92359, 64942, 983559, 194733, 983677, 194732, 0, 74301, 0, 11280, 0, 
@@ -18691,7 +18693,7 @@
     3355, 9508, 9867, 5723, 11520, 5611, 0, 3377, 0, 0, 0, 0, 78228, 0, 
     983753, 42691, 917886, 127198, 74767, 0, 127075, 1379, 246, 0, 983752, 
     3788, 983106, 11041, 92549, 66304, 0, 0, 8917, 42403, 301, 0, 0, 0, 0, 0, 
-    983688, 10656, 0, 65214, 119242, 42567, 92217, 13163, 983202, 120831, 
+    983688, 10656, 0, 65214, 119242, 42567, 92217, 13163, 983203, 120831, 
     74597, 3182, 0, 0, 0, 65034, 65889, 42169, 4755, 74244, 194621, 11443, 0, 
     66319, 74598, 608, 600, 0, 1219, 3934, 64206, 11483, 74510, 0, 74485, 
     42442, 65470, 983898, 64202, 13160, 7759, 42482, 485, 128006, 0, 9828, 0, 
@@ -18703,14 +18705,14 @@
     0, 194675, 1406, 0, 0, 92659, 0, 68223, 4143, 194677, 0, 65748, 4141, 
     9682, 65287, 1508, 127013, 8779, 10569, 8725, 13299, 66638, 65750, 42263, 
     4145, 6380, 65751, 66613, 43994, 65738, 55250, 9185, 9550, 0, 43403, 0, 
-    0, 0, 65736, 41951, 64816, 65756, 983203, 12955, 10596, 2888, 194645, 0, 
+    0, 0, 65736, 41951, 64816, 65756, 983204, 12955, 10596, 2888, 194645, 0, 
     0, 9657, 9019, 194766, 0, 2878, 5390, 0, 194961, 0, 68679, 43552, 7501, 
     6328, 0, 10429, 10365, 0, 0, 41946, 7503, 5235, 803, 68381, 0, 0, 8986, 
     126542, 10632, 11934, 11452, 1332, 0, 0, 126647, 0, 118887, 1791, 5191, 
     9288, 64822, 2892, 0, 43394, 555, 0, 0, 66646, 0, 119002, 13151, 74512, 
     7289, 74055, 64161, 8854, 64162, 5858, 41927, 10582, 0, 1784, 1361, 
     195047, 0, 7905, 0, 64868, 128813, 13158, 92166, 7211, 0, 9371, 73973, 
-    917553, 6828, 1625, 92302, 0, 1342, 68440, 64171, 126704, 10903, 983486, 
+    917553, 6828, 1625, 92302, 0, 1342, 68440, 64171, 126704, 10903, 983487, 
     0, 0, 0, 0, 4482, 41606, 0, 128569, 983112, 0, 64381, 0, 0, 195090, 
     42245, 126467, 41972, 0, 444, 0, 9127, 66687, 66619, 126489, 78025, 0, 
     11349, 40991, 917570, 0, 119599, 120830, 0, 1197, 128282, 1149, 194970, 
@@ -18736,10 +18738,10 @@
     4731, 0, 66629, 0, 0, 1255, 4149, 9247, 0, 9913, 0, 0, 64914, 917787, 
     65101, 0, 11694, 92475, 11690, 5835, 127164, 66625, 10842, 41354, 42123, 
     43097, 11688, 66634, 1094, 194, 64692, 0, 8180, 0, 0, 9972, 73865, 4519, 
-    6114, 10898, 43072, 0, 0, 93960, 983314, 126581, 10695, 0, 7540, 0, 881, 
+    6114, 10898, 43072, 0, 0, 93960, 983315, 126581, 10695, 0, 7540, 0, 881, 
     7857, 6067, 65164, 0, 0, 0, 13311, 68403, 41857, 64321, 8359, 0, 12689, 
-    0, 194594, 0, 983304, 983872, 68183, 0, 983306, 1287, 5436, 0, 983309, 
-    74142, 92328, 74152, 119078, 6051, 10497, 69668, 8985, 12109, 983315, 0, 
+    0, 194594, 0, 983305, 983872, 68183, 0, 983307, 1287, 5436, 0, 983310, 
+    74142, 92328, 74152, 119078, 6051, 10497, 69668, 8985, 12109, 983316, 0, 
     127242, 0, 0, 3652, 10537, 0, 1276, 120440, 6549, 279, 73745, 0, 0, 0, 
     1489, 0, 0, 0, 3899, 1007, 42124, 983557, 42122, 92337, 92367, 0, 11985, 
     1345, 78600, 0, 0, 8956, 43083, 94057, 42138, 78610, 0, 12151, 78608, 
@@ -18754,14 +18756,14 @@
     78627, 78628, 78625, 2399, 69693, 8994, 10944, 41208, 983704, 41168, 
     8178, 0, 3367, 92334, 42510, 78641, 78636, 6804, 78634, 1947, 0, 0, 
     92681, 42759, 11068, 1705, 9331, 0, 74798, 9181, 65359, 0, 8017, 119831, 
-    65096, 66720, 0, 43475, 0, 4909, 12126, 128673, 120696, 4904, 983325, 
+    65096, 66720, 0, 43475, 0, 4909, 12126, 128673, 120696, 4904, 983326, 
     69650, 1365, 9253, 42757, 43436, 7462, 0, 0, 0, 0, 119587, 64415, 0, 0, 
     5398, 0, 127386, 93953, 0, 0, 119015, 0, 0, 9476, 0, 983768, 12763, 
     126603, 3629, 0, 13005, 0, 3628, 0, 0, 92502, 3469, 42107, 42116, 917578, 
     64809, 2928, 4905, 9853, 851, 9040, 0, 64665, 43086, 9114, 0, 42583, 
     9315, 4822, 4906, 3852, 2847, 119821, 3236, 11317, 1251, 7777, 41852, 
     11410, 10964, 0, 43222, 12646, 120269, 10259, 9865, 65821, 0, 6018, 
-    92290, 0, 12276, 0, 68372, 0, 92259, 119244, 0, 983224, 10467, 0, 2443, 
+    92290, 0, 12276, 0, 68372, 0, 92259, 119244, 0, 983225, 10467, 0, 2443, 
     10918, 78217, 119825, 1001, 9241, 1927, 0, 0, 73987, 127885, 0, 0, 
     118828, 120271, 65678, 12867, 0, 8260, 77945, 7519, 11505, 12274, 8904, 
     518, 65857, 0, 128674, 13204, 4387, 857, 0, 65369, 0, 92336, 43125, 
@@ -18777,19 +18779,19 @@
     78698, 78697, 78696, 78695, 8710, 42495, 118956, 0, 4051, 10460, 43364, 
     118917, 1356, 12161, 42713, 128857, 127268, 1619, 9703, 43152, 42489, 
     42112, 127978, 1875, 10808, 42109, 120284, 41860, 64862, 13305, 64907, 
-    5289, 13144, 128658, 0, 5575, 9675, 0, 5940, 226, 2649, 6336, 983269, 
+    5289, 13144, 128658, 0, 5575, 9675, 0, 5940, 226, 2649, 6336, 983270, 
     119830, 43236, 3382, 42449, 6498, 1658, 11936, 78232, 0, 11269, 10151, 
     73759, 43100, 69888, 65508, 0, 0, 0, 8935, 917985, 0, 0, 0, 616, 74753, 
     65178, 4684, 78701, 119653, 0, 126551, 0, 6048, 74460, 42110, 73965, 
     10870, 8557, 11054, 68664, 119049, 9681, 4475, 0, 41142, 2100, 0, 120731, 
-    6035, 0, 7651, 10296, 64443, 0, 983287, 917987, 0, 118966, 74144, 40997, 
+    6035, 0, 7651, 10296, 64443, 0, 983288, 917987, 0, 118966, 74144, 40997, 
     0, 10392, 10328, 40998, 43462, 74488, 0, 9800, 8979, 0, 13307, 41000, 0, 
     119239, 6487, 3386, 0, 10344, 0, 65299, 5394, 43246, 78243, 10220, 66505, 
     41200, 128583, 4425, 0, 0, 0, 43074, 73799, 983200, 78147, 0, 12173, 
     78545, 0, 127011, 65338, 0, 0, 119582, 4474, 0, 43093, 128644, 1587, 0, 
     127372, 64475, 128098, 1369, 983663, 9959, 7927, 0, 4560, 0, 0, 92277, 0, 
     64948, 4430, 74347, 42601, 4514, 66434, 93955, 8194, 65462, 10626, 10965, 
-    0, 8893, 983293, 12542, 0, 65341, 0, 65829, 7925, 119822, 10475, 0, 0, 
+    0, 8893, 983294, 12542, 0, 65341, 0, 65829, 7925, 119822, 10475, 0, 0, 
     1352, 11069, 7707, 127560, 126486, 65279, 127102, 68207, 127100, 7099, 
     6040, 127097, 10071, 0, 9336, 43750, 0, 8899, 7798, 64474, 64259, 69873, 
     65188, 7820, 43018, 127082, 0, 7746, 1492, 78551, 10884, 77982, 0, 5127, 
@@ -18811,7 +18813,7 @@
     40988, 92592, 74809, 41727, 0, 42848, 2396, 917766, 0, 74018, 917538, 
     64940, 7027, 3886, 0, 42457, 119008, 0, 996, 68123, 94058, 4249, 0, 
     917594, 11707, 8222, 0, 7939, 92454, 92460, 127801, 917592, 128359, 8534, 
-    127154, 40983, 0, 983234, 0, 7201, 12561, 0, 42371, 12558, 1540, 917549, 
+    127154, 40983, 0, 983235, 0, 7201, 12561, 0, 42371, 12558, 1540, 917549, 
     10052, 40982, 0, 0, 1488, 0, 0, 0, 917559, 0, 0, 1563, 128034, 9619, 
     983931, 0, 0, 127872, 71363, 5803, 7797, 6070, 10006, 0, 2922, 6082, 0, 
     65009, 983933, 12567, 128703, 0, 41412, 0, 0, 3607, 9200, 10046, 9612, 
@@ -18822,13 +18824,13 @@
     12328, 501, 93985, 10601, 0, 583, 0, 41977, 0, 66004, 119350, 6505, 
     74010, 0, 13064, 55267, 120810, 6500, 5526, 65049, 0, 73764, 0, 92376, 
     12745, 9678, 0, 120587, 9869, 128815, 1771, 0, 8936, 0, 0, 4208, 78341, 
-    78567, 78342, 0, 983448, 74101, 0, 11762, 0, 92422, 77997, 68010, 66475, 
+    78567, 78342, 0, 983449, 74101, 0, 11762, 0, 92422, 77997, 68010, 66475, 
     0, 5027, 78172, 128878, 0, 5069, 73862, 5028, 9897, 0, 73739, 5026, 
-    983247, 68639, 6331, 10079, 8931, 0, 1415, 8866, 41901, 74790, 78138, 
+    983248, 68639, 6331, 10079, 8931, 0, 1415, 8866, 41901, 74790, 78138, 
     119361, 983564, 43106, 5029, 65309, 1580, 3598, 68424, 41070, 77903, 0, 
     3440, 78215, 1562, 128656, 127175, 119358, 1716, 983670, 10600, 917867, 
     620, 41001, 6028, 0, 42892, 0, 74822, 5024, 120829, 41003, 0, 5025, 
-    69892, 983207, 0, 118885, 0, 65557, 0, 74541, 983587, 11599, 128209, 
+    69892, 983208, 0, 118885, 0, 65557, 0, 74541, 983587, 11599, 128209, 
     11602, 6243, 11574, 11581, 11597, 11598, 6253, 6105, 11584, 74195, 11569, 
     65275, 8906, 127096, 5755, 2636, 0, 10815, 11619, 2301, 41540, 7815, 
     11616, 6979, 12080, 7721, 11604, 7869, 1592, 0, 42152, 78498, 41048, 
@@ -18943,7 +18945,7 @@
     120357, 845, 0, 41560, 11970, 4562, 917920, 2926, 917919, 4569, 74130, 0, 
     43487, 194630, 611, 74129, 64871, 118891, 65629, 0, 194858, 0, 0, 127545, 
     120543, 0, 0, 6291, 0, 78639, 41669, 7094, 917921, 0, 983581, 74054, 
-    127754, 195029, 0, 839, 983311, 7695, 8769, 65246, 4829, 194663, 4859, 
+    127754, 195029, 0, 839, 983312, 7695, 8769, 65246, 4829, 194663, 4859, 
     64467, 0, 983954, 118998, 7206, 0, 6647, 43986, 0, 69766, 0, 64764, 4210, 
     983854, 127936, 804, 0, 0, 12298, 0, 66653, 0, 64924, 10091, 73931, 9468, 
     74245, 0, 0, 74246, 92503, 12839, 64669, 92202, 0, 1279, 1425, 6224, 
@@ -18966,7 +18968,7 @@
     19936, 7833, 120691, 0, 42599, 42597, 42709, 120409, 127044, 0, 8537, 0, 
     0, 9354, 983164, 128833, 41199, 10121, 2028, 0, 983194, 69715, 0, 3062, 
     0, 74447, 12608, 0, 66440, 7545, 9700, 12580, 92205, 120777, 120502, 
-    41155, 0, 74071, 0, 983449, 12713, 0, 0, 0, 78772, 0, 1734, 0, 0, 127040, 
+    41155, 0, 74071, 0, 983450, 12713, 0, 0, 0, 78772, 0, 1734, 0, 0, 127040, 
     64594, 2456, 231, 0, 74167, 542, 0, 118786, 0, 983970, 1230, 0, 0, 3597, 
     4446, 10584, 74235, 92215, 4037, 127938, 8352, 0, 5687, 0, 64515, 0, 
     194801, 55265, 67846, 78434, 9704, 0, 0, 70080, 71338, 0, 8660, 126495, 
@@ -18986,7 +18988,7 @@
     119173, 0, 0, 7805, 0, 94007, 6935, 92292, 78325, 78326, 78323, 43327, 
     43989, 119046, 8492, 8250, 8459, 0, 8497, 8496, 0, 0, 78336, 78339, 9543, 
     78335, 78332, 77832, 65849, 77831, 983952, 0, 12451, 0, 8684, 0, 6102, 0, 
-    5298, 0, 5294, 0, 0, 983451, 195062, 9949, 119826, 43617, 119215, 0, 
+    5298, 0, 5294, 0, 0, 983452, 195062, 9949, 119826, 43617, 119215, 0, 
     12073, 0, 0, 77863, 13108, 120617, 11439, 41468, 983748, 0, 5292, 55272, 
     983874, 1939, 5302, 3970, 917879, 12455, 1793, 0, 0, 0, 6643, 92477, 
     65263, 0, 78330, 41293, 78328, 65923, 0, 13219, 9569, 0, 74383, 0, 74197, 
@@ -18997,7 +18999,7 @@
     0, 0, 78074, 6947, 41152, 887, 9249, 6565, 78510, 41990, 78509, 41811, 
     74466, 93966, 6670, 77882, 0, 0, 43092, 43325, 0, 10168, 0, 9781, 128655, 
     9190, 0, 9666, 8269, 65944, 74005, 13019, 11670, 69860, 315, 12813, 
-    983450, 78432, 78256, 78351, 78352, 0, 983648, 0, 0, 1378, 9509, 0, 0, 
+    983451, 78432, 78256, 78351, 78352, 0, 983648, 0, 0, 1378, 9509, 0, 0, 
     74475, 3066, 92220, 67847, 0, 92355, 0, 78365, 8787, 120379, 194616, 
     41618, 194615, 78261, 194614, 0, 64652, 0, 194612, 0, 78366, 42088, 0, 
     195061, 7176, 43756, 10137, 6121, 10995, 78259, 74534, 8119, 64874, 
@@ -19016,7 +19018,7 @@
     549, 1570, 0, 2835, 0, 10624, 43623, 11072, 127191, 0, 0, 12606, 78433, 
     2825, 0, 10825, 8079, 2821, 41046, 92327, 7365, 983744, 120593, 13071, 0, 
     452, 41049, 42840, 6346, 2831, 5461, 74596, 11465, 5212, 0, 64703, 
-    119191, 42308, 7181, 0, 41332, 0, 12333, 0, 1668, 0, 0, 0, 1187, 983377, 
+    119191, 42308, 7181, 0, 41332, 0, 12333, 0, 1668, 0, 0, 0, 1187, 983378, 
     42628, 78575, 0, 128777, 0, 3240, 128518, 12194, 0, 11591, 41065, 5323, 
     8166, 0, 0, 0, 74535, 1623, 65297, 128856, 571, 0, 4918, 0, 5288, 127295, 
     8916, 65048, 1909, 8864, 0, 0, 10736, 92508, 11571, 7615, 127300, 92296, 
@@ -19033,7 +19035,7 @@
     66010, 119552, 6078, 9954, 0, 1475, 119247, 9938, 6084, 917546, 41064, 
     41062, 0, 0, 3256, 10189, 42076, 43252, 78823, 917906, 8727, 0, 65875, 0, 
     0, 127762, 10562, 74215, 43065, 0, 0, 3248, 74297, 3261, 9015, 71351, 0, 
-    3635, 64337, 983273, 0, 0, 7195, 0, 2007, 64431, 0, 0, 0, 0, 635, 0, 0, 
+    3635, 64337, 983274, 0, 0, 7195, 0, 2007, 64431, 0, 0, 0, 0, 635, 0, 0, 
     65613, 77909, 92420, 73997, 0, 0, 119218, 7984, 8600, 74434, 127770, 
     4176, 70050, 2034, 92551, 120805, 65891, 127038, 0, 318, 2038, 128860, 
     78596, 0, 3649, 13149, 42145, 42798, 3634, 120291, 118927, 67677, 120124, 
@@ -19043,13 +19045,13 @@
     194567, 12989, 66474, 9368, 12848, 1624, 43270, 0, 74278, 10818, 126644, 
     9953, 0, 78421, 1194, 3242, 9761, 9555, 8598, 120299, 6169, 12871, 1551, 
     2798, 65176, 4958, 42752, 119025, 0, 67875, 120301, 3495, 66648, 194768, 
-    0, 68364, 983222, 4891, 0, 10641, 0, 73746, 0, 68352, 0, 73787, 194829, 
+    0, 68364, 983223, 4891, 0, 10641, 0, 73746, 0, 68352, 0, 73787, 194829, 
     194633, 7199, 64955, 0, 0, 0, 0, 0, 42685, 42679, 193, 0, 0, 0, 42667, 0, 
-    5271, 92318, 92517, 118882, 1362, 13297, 0, 128094, 0, 983323, 73789, 0, 
-    6658, 4426, 0, 92628, 983833, 92319, 7276, 42163, 5220, 0, 0, 983322, 
+    5271, 92318, 92517, 118882, 1362, 13297, 0, 128094, 0, 983324, 73789, 0, 
+    6658, 4426, 0, 92628, 983833, 92319, 7276, 42163, 5220, 0, 0, 983323, 
     2416, 3310, 42703, 0, 379, 0, 43755, 0, 0, 3223, 65492, 1284, 194771, 
     4549, 0, 0, 983154, 127763, 10807, 9558, 194613, 0, 8515, 8688, 12866, 
-    65308, 3294, 983324, 8529, 128101, 43385, 7564, 0, 43329, 0, 92458, 
+    65308, 3294, 983325, 8529, 128101, 43385, 7564, 0, 43329, 0, 92458, 
     73757, 66456, 42359, 0, 2031, 0, 7202, 0, 12676, 42729, 92198, 3215, 0, 
     7710, 1610, 73801, 0, 0, 65682, 0, 120537, 65924, 9974, 228, 66354, 1501, 
     0, 64395, 5179, 7200, 6225, 0, 65794, 1725, 65533, 8196, 7476, 74399, 0, 
@@ -19076,20 +19078,20 @@
     126469, 11946, 0, 3257, 0, 12307, 1845, 983157, 43526, 0, 0, 1886, 42342, 
     10089, 870, 7648, 3499, 8609, 7652, 876, 871, 877, 0, 878, 42015, 879, 
     43692, 4563, 0, 0, 7591, 65887, 867, 9520, 872, 126607, 868, 873, 7642, 
-    0, 869, 874, 7644, 120674, 875, 790, 128303, 0, 0, 0, 66182, 983250, 
-    5429, 195055, 66180, 126480, 66181, 68452, 983281, 983242, 42067, 0, 
+    0, 869, 874, 7644, 120674, 875, 790, 128303, 0, 0, 0, 66182, 983251, 
+    5429, 195055, 66180, 126480, 66181, 68452, 983282, 983243, 42067, 0, 
     5433, 10657, 7911, 194622, 1547, 66176, 42012, 120576, 5425, 4977, 9999, 
     5317, 5423, 4611, 0, 67637, 0, 9679, 74122, 0, 0, 0, 66194, 4418, 66184, 
     4628, 4245, 119648, 0, 0, 1851, 0, 127189, 11908, 0, 9360, 118897, 
-    983270, 42776, 66187, 12837, 8829, 7711, 92714, 0, 92321, 43318, 0, 8809, 
-    69881, 0, 983142, 120604, 983052, 983873, 0, 983262, 0, 0, 7427, 9958, 
+    983201, 42776, 66187, 12837, 8829, 7711, 92714, 0, 92321, 43318, 0, 8809, 
+    69881, 0, 983142, 120604, 983052, 983873, 0, 983263, 0, 0, 7427, 9958, 
     4588, 43680, 0, 74484, 194968, 2433, 0, 119622, 3352, 74363, 983876, 0, 
     793, 74404, 0, 305, 567, 67662, 842, 128519, 8208, 0, 41695, 1647, 
     118877, 0, 7837, 917625, 818, 5337, 194628, 917621, 41376, 119978, 
     126576, 120594, 74086, 917615, 917614, 917613, 10973, 66359, 1372, 
     127172, 917608, 4969, 1254, 917605, 917604, 93967, 917602, 65228, 78221, 
     126612, 0, 2840, 0, 119982, 983930, 0, 3245, 9068, 68194, 64725, 0, 0, 
-    12991, 0, 2651, 68016, 983257, 917611, 127026, 128883, 0, 0, 43648, 
+    12991, 0, 2651, 68016, 983258, 917611, 127026, 128883, 0, 0, 43648, 
     120812, 0, 43322, 92662, 0, 0, 64372, 92698, 3226, 655, 752, 7457, 7456, 
     7452, 3285, 128779, 127821, 119988, 65610, 2391, 0, 92248, 671, 250, 
     7434, 618, 668, 610, 42800, 7431, 1152, 42801, 640, 120666, 7448, 7439, 
@@ -19106,7 +19108,7 @@
     120285, 74225, 94111, 8267, 0, 127265, 0, 7516, 0, 2625, 983968, 8034, 
     74309, 0, 3631, 10955, 7850, 120293, 8416, 0, 0, 0, 43384, 12660, 0, 0, 
     0, 74850, 41069, 0, 128156, 12099, 4310, 10032, 6252, 713, 7990, 0, 3990, 
-    0, 983254, 66368, 5017, 64956, 7071, 0, 119144, 1030, 118800, 983120, 
+    0, 983255, 66368, 5017, 64956, 7071, 0, 119144, 1030, 118800, 983120, 
     9513, 41059, 9357, 0, 1773, 0, 120350, 0, 6339, 7745, 9844, 0, 64650, 94, 
     1880, 74766, 983829, 8908, 0, 128707, 65913, 78470, 10752, 13003, 0, 
     126572, 41307, 8732, 120338, 0, 1757, 6964, 4696, 0, 120335, 64785, 7394, 
@@ -19125,17 +19127,17 @@
     65302, 40989, 0, 194696, 0, 42760, 0, 983566, 0, 40987, 4667, 0, 983923, 
     8828, 0, 0, 1246, 4746, 0, 0, 11021, 4749, 92675, 0, 921, 4744, 0, 12702, 
     242, 0, 1566, 8217, 0, 64653, 78386, 128121, 74036, 74505, 43274, 5313, 
-    951, 0, 0, 983858, 7604, 983282, 4009, 127816, 983701, 120562, 0, 983711, 
+    951, 0, 0, 983858, 7604, 983283, 4009, 127816, 983701, 120562, 0, 983711, 
     64860, 119138, 119069, 0, 127370, 4048, 983598, 0, 70024, 1646, 77890, 
     64534, 73995, 120705, 0, 119890, 2579, 119905, 3177, 11357, 9099, 4107, 
     3441, 119894, 2975, 74442, 9822, 983926, 55220, 10084, 73943, 118840, 0, 
     917562, 194610, 3399, 9851, 983708, 11909, 9059, 0, 7687, 0, 6789, 0, 0, 
     0, 71367, 0, 0, 1777, 9151, 1137, 69767, 749, 42366, 0, 5385, 128574, 
     128218, 0, 0, 5989, 0, 0, 128091, 0, 41685, 69223, 0, 9769, 41684, 
-    983214, 519, 0, 11740, 5766, 0, 0, 2600, 8848, 120138, 41297, 0, 3666, 
+    983215, 519, 0, 11740, 5766, 0, 0, 2600, 8848, 120138, 41297, 0, 3666, 
     74473, 41300, 74468, 65160, 0, 69688, 69771, 74479, 0, 6558, 0, 0, 69765, 
     120750, 252, 0, 41302, 0, 0, 0, 69763, 0, 11729, 8719, 9060, 0, 120139, 
-    10761, 0, 0, 0, 118792, 11734, 983221, 11730, 0, 9593, 5757, 2403, 64808, 
+    10761, 0, 0, 0, 118792, 11734, 983222, 11730, 0, 9593, 5757, 2403, 64808, 
     55275, 0, 11728, 43572, 0, 0, 7764, 983705, 11094, 120825, 0, 0, 4282, 
     8298, 0, 0, 0, 0, 0, 64449, 0, 126650, 63854, 8456, 0, 74783, 65670, 0, 
     78250, 0, 7774, 10607, 9792, 0, 0, 0, 0, 120764, 0, 10019, 74762, 0, 
@@ -19150,48 +19152,48 @@
     70065, 2588, 2914, 7011, 55281, 0, 2471, 194631, 2883, 2749, 119563, 
     73774, 10913, 0, 0, 8666, 675, 42493, 0, 43571, 0, 6219, 0, 9980, 41232, 
     10928, 0, 41153, 41229, 118967, 0, 3738, 94016, 0, 12711, 3181, 66212, 
-    74289, 68472, 42857, 8262, 983371, 0, 983220, 0, 42347, 12092, 9615, 
+    74289, 68472, 42857, 8262, 983372, 0, 983221, 0, 42347, 12092, 9615, 
     7234, 74047, 983088, 0, 43744, 0, 0, 73846, 2934, 12722, 120762, 922, 
     43983, 74507, 983126, 74461, 3218, 120471, 74290, 120469, 64562, 120475, 
     8569, 11404, 11932, 73728, 3214, 120461, 120468, 12128, 3207, 65486, 
     78729, 1901, 78727, 127326, 120460, 7425, 3205, 68003, 78737, 78736, 
     78735, 43383, 69940, 65459, 2606, 78730, 73897, 0, 11496, 1173, 0, 41272, 
-    119661, 0, 0, 983313, 120737, 0, 983962, 983312, 378, 2610, 0, 65079, 
-    983317, 65695, 126559, 37, 7068, 0, 120480, 120479, 3209, 120477, 0, 
-    10638, 9768, 69952, 119909, 983391, 0, 0, 0, 0, 65510, 0, 0, 5233, 
-    983327, 64792, 983326, 0, 126633, 0, 7060, 9847, 120144, 1685, 595, 0, 
+    119661, 0, 0, 983314, 120737, 0, 983962, 983313, 378, 2610, 0, 65079, 
+    983318, 65695, 126559, 37, 7068, 0, 120480, 120479, 3209, 120477, 0, 
+    10638, 9768, 69952, 119909, 983392, 0, 0, 0, 0, 65510, 0, 0, 5233, 
+    983328, 64792, 983327, 0, 126633, 0, 7060, 9847, 120144, 1685, 595, 0, 
     73971, 1292, 8940, 7380, 11088, 0, 10004, 126997, 0, 6541, 0, 0, 0, 3243, 
     9014, 5606, 0, 538, 64620, 5602, 8467, 74391, 6547, 128132, 8203, 78488, 
     983090, 8458, 65211, 8495, 119904, 0, 917552, 779, 78314, 64367, 2465, 
     69901, 8193, 55279, 9730, 9280, 0, 7065, 74155, 4346, 0, 73798, 504, 0, 
     92414, 8982, 0, 0, 0, 782, 0, 10883, 0, 194852, 732, 3737, 127253, 1548, 
     68650, 92507, 1832, 5604, 5735, 41141, 119020, 4376, 0, 11787, 3745, 0, 
-    0, 42888, 65712, 983296, 3869, 11937, 5725, 127539, 1783, 68648, 5728, 0, 
+    0, 42888, 65712, 983297, 3869, 11937, 5725, 127539, 1783, 68648, 5728, 0, 
     0, 0, 11918, 66567, 5724, 0, 5727, 78521, 0, 0, 764, 0, 128116, 43531, 0, 
     9033, 0, 42532, 6223, 11042, 120749, 11423, 0, 119861, 71344, 43465, 0, 
     128267, 6559, 64557, 71348, 92649, 120648, 43019, 43477, 10238, 74491, 0, 
     43377, 92282, 71346, 1478, 9783, 11825, 2607, 64740, 0, 7739, 74543, 0, 
     0, 0, 6132, 0, 63765, 0, 70058, 41144, 0, 92438, 43537, 6761, 10093, 
     4369, 917791, 0, 983148, 8820, 3947, 0, 0, 11515, 526, 128103, 41295, 
-    194603, 917785, 194932, 0, 7688, 917786, 7686, 8288, 11815, 0, 0, 983374, 
+    194603, 917785, 194932, 0, 7688, 917786, 7686, 8288, 11815, 0, 0, 983375, 
     1543, 3713, 41221, 12423, 42281, 917788, 74024, 12293, 0, 64357, 11794, 
     42082, 0, 1737, 8987, 42081, 0, 7205, 0, 9335, 12850, 119870, 6553, 7055, 
     0, 8277, 0, 0, 5475, 74795, 6780, 0, 0, 12990, 1160, 42084, 119650, 
     41217, 119660, 10018, 360, 0, 0, 68176, 5863, 3137, 0, 4147, 983170, 
-    41216, 7844, 2616, 119190, 68461, 65234, 983286, 13076, 3135, 983279, 
+    41216, 7844, 2616, 119190, 68461, 65234, 983287, 13076, 3135, 983280, 
     78143, 119139, 3142, 92451, 94068, 10819, 119580, 10183, 0, 2608, 1470, 
     73967, 94008, 6227, 0, 127173, 69741, 983582, 6163, 983558, 0, 127314, 0, 
     0, 8603, 0, 119866, 3306, 10876, 43392, 119573, 127931, 5751, 0, 6222, 0, 
     0, 12086, 7403, 1600, 64309, 64939, 0, 64783, 92658, 11310, 0, 8882, 0, 
-    0, 2570, 7021, 0, 0, 43110, 0, 1234, 6540, 6974, 0, 0, 983209, 5002, 0, 
+    0, 2570, 7021, 0, 0, 43110, 0, 1234, 6540, 6974, 0, 0, 983210, 5002, 0, 
     41286, 69946, 127019, 0, 43585, 0, 6551, 983953, 128229, 0, 41289, 0, 
-    194602, 0, 8977, 602, 120814, 0, 128778, 128661, 0, 983367, 41279, 0, 0, 
+    194602, 0, 8977, 602, 120814, 0, 128778, 128661, 0, 983368, 41279, 0, 0, 
     0, 11081, 43615, 0, 0, 0, 983612, 12727, 0, 0, 78397, 9475, 7112, 65105, 
     0, 9633, 10886, 43592, 7831, 983820, 194571, 0, 73915, 8076, 43048, 8290, 
     8291, 43051, 92570, 0, 2596, 43584, 0, 13113, 0, 127757, 2393, 7058, 
     9087, 74067, 68673, 41574, 78337, 0, 74058, 6376, 0, 0, 0, 0, 9854, 
     127748, 64696, 0, 128220, 0, 6994, 0, 1720, 0, 0, 0, 6529, 7063, 983182, 
-    3751, 9120, 983477, 0, 1798, 709, 0, 1354, 1876, 13152, 6557, 12430, 
+    3751, 9120, 983478, 0, 1798, 709, 0, 1354, 1876, 13152, 6557, 12430, 
     8137, 94098, 92642, 0, 0, 245, 128097, 11456, 41233, 7070, 0, 94046, 
     6136, 917609, 65677, 8682, 41235, 92595, 42045, 9804, 118963, 432, 3595, 
     194945, 65437, 0, 74455, 42399, 0, 0, 128274, 0, 119658, 0, 0, 0, 77894, 
@@ -19203,7 +19205,7 @@
     3733, 11346, 0, 12054, 0, 74098, 42827, 0, 13091, 0, 0, 0, 917915, 0, 
     127025, 0, 74821, 0, 983724, 119042, 0, 127865, 13090, 66643, 0, 1270, 
     1132, 42360, 0, 74096, 66655, 42569, 127824, 0, 64761, 0, 41021, 8510, 
-    42432, 0, 0, 194782, 0, 64496, 74109, 70030, 9915, 0, 983216, 7061, 
+    42432, 0, 0, 194782, 0, 64496, 74109, 70030, 9915, 0, 983217, 7061, 
     41336, 3854, 69700, 13141, 68413, 43401, 42319, 13082, 0, 7067, 68221, 0, 
     127383, 127171, 0, 0, 127797, 9029, 43543, 119315, 2353, 6308, 0, 74792, 
     2611, 119186, 0, 0, 0, 43664, 92399, 66627, 0, 4484, 8509, 118976, 11066, 
@@ -19217,7 +19219,7 @@
     396, 41580, 68146, 0, 12901, 43058, 0, 343, 7129, 42680, 41360, 78154, 0, 
     4743, 0, 0, 74040, 74108, 8743, 1724, 1433, 119322, 0, 3739, 6263, 71349, 
     0, 3964, 6592, 0, 128693, 66040, 0, 42568, 69806, 128113, 1778, 3956, 0, 
-    42070, 6563, 43075, 9018, 94006, 983388, 12067, 41312, 0, 5547, 74531, 
+    42070, 6563, 43075, 9018, 94006, 983389, 12067, 41312, 0, 5547, 74531, 
     127969, 0, 8175, 0, 284, 8108, 934, 0, 74001, 173, 66460, 7174, 92703, 
     118822, 1750, 0, 4394, 68368, 1807, 983879, 92298, 0, 5889, 0, 7180, 0, 
     119145, 0, 917558, 42471, 6982, 1721, 44022, 7891, 42243, 42160, 2583, 
@@ -19238,26 +19240,26 @@
     128544, 0, 5596, 5545, 7288, 2586, 64887, 0, 5217, 71336, 0, 0, 0, 64293, 
     68098, 2635, 0, 0, 983837, 0, 983632, 7835, 70040, 0, 194988, 92285, 
     64558, 127122, 0, 127121, 0, 127913, 0, 5784, 983102, 0, 0, 70033, 4011, 
-    917616, 68101, 0, 7864, 4254, 65095, 983488, 5600, 3903, 127083, 10447, 
+    917616, 68101, 0, 7864, 4254, 65095, 983489, 5600, 3903, 127083, 10447, 
     5598, 1207, 120521, 66689, 3501, 42582, 43600, 194780, 0, 1124, 5597, 
-    194778, 194772, 9321, 983476, 983473, 983474, 0, 1719, 68356, 68354, 
-    9671, 1125, 4399, 127479, 917610, 983480, 7631, 5488, 7128, 120532, 0, 
+    194778, 194772, 9321, 983477, 983474, 983475, 0, 1719, 68356, 68354, 
+    9671, 1125, 4399, 127479, 917610, 983481, 7631, 5488, 7128, 120532, 0, 
     5491, 0, 8937, 43044, 2604, 74187, 5490, 43046, 5489, 7212, 11768, 43043, 
     6300, 0, 7122, 0, 4390, 454, 41397, 0, 9875, 7593, 194791, 92274, 118913, 
     7207, 0, 65901, 2394, 2575, 0, 3746, 11016, 65752, 120037, 0, 43423, 
     128683, 11989, 0, 0, 0, 0, 0, 8249, 128172, 0, 78531, 6640, 74806, 2598, 
-    513, 0, 6586, 8656, 0, 120710, 65008, 0, 194784, 194989, 194795, 983465, 
-    92515, 68475, 93973, 0, 0, 78637, 12647, 0, 128043, 69893, 1036, 983469, 
-    92419, 1723, 128056, 74217, 0, 41579, 2444, 0, 10705, 73876, 983461, 
-    74486, 983459, 740, 119222, 194978, 194984, 0, 4238, 11071, 9459, 68437, 
+    513, 0, 6586, 8656, 0, 120710, 65008, 0, 194784, 194989, 194795, 983466, 
+    92515, 68475, 93973, 0, 0, 78637, 12647, 0, 128043, 69893, 1036, 983470, 
+    92419, 1723, 128056, 74217, 0, 41579, 2444, 0, 10705, 73876, 983462, 
+    74486, 983460, 740, 119222, 194978, 194984, 0, 4238, 11071, 9459, 68437, 
     78140, 78139, 194985, 8121, 10438, 74487, 42574, 13285, 55263, 11907, 
     195000, 5690, 92255, 93992, 0, 43181, 13095, 0, 127857, 64498, 0, 9506, 
     6978, 194993, 77992, 0, 0, 194992, 0, 127845, 1122, 317, 0, 0, 0, 0, 
     1920, 0, 10173, 827, 0, 0, 78378, 120126, 5223, 1304, 0, 119564, 5226, 
     12602, 94044, 0, 9329, 7758, 9239, 41173, 5224, 5487, 1222, 5692, 41725, 
     69229, 9674, 5695, 41711, 64627, 19909, 0, 74604, 5691, 287, 866, 233, 
-    127490, 983433, 42816, 94036, 65140, 74797, 0, 8830, 6568, 42300, 10524, 
-    41175, 983440, 983437, 983438, 5296, 983436, 42492, 43402, 92466, 3302, 
+    127490, 983434, 42816, 94036, 65140, 74797, 0, 8830, 6568, 42300, 10524, 
+    41175, 983441, 983438, 983439, 5296, 983437, 42492, 43402, 92466, 3302, 
     0, 0, 6516, 6515, 6514, 6513, 6512, 0, 7856, 8690, 0, 0, 12122, 119602, 
     43976, 0, 1785, 69925, 68622, 65153, 194810, 5138, 0, 0, 118869, 0, 4540, 
     41181, 0, 6200, 0, 5134, 0, 322, 4643, 5132, 0, 6389, 128533, 5143, 0, 
@@ -19275,14 +19277,14 @@
     5198, 4349, 10390, 74202, 5196, 43224, 6113, 42009, 5205, 0, 43307, 0, 
     118973, 0, 12134, 0, 0, 118843, 9126, 435, 0, 12014, 10377, 8093, 9079, 
     3203, 192, 65109, 3385, 0, 64430, 5383, 10294, 10326, 128178, 5738, 
-    983213, 3336, 78355, 5361, 3623, 41159, 0, 68112, 7872, 8581, 0, 1260, 
+    983214, 3336, 78355, 5361, 3623, 41159, 0, 68112, 7872, 8581, 0, 1260, 
     3149, 5359, 120134, 0, 7914, 5357, 92170, 128659, 2624, 5364, 0, 11431, 
     120030, 9101, 11058, 78288, 0, 78293, 42271, 78289, 42917, 120793, 0, 
     65566, 6717, 10619, 43360, 78385, 78384, 11832, 78382, 78381, 78380, 
     78379, 9319, 7097, 119055, 77906, 3232, 73824, 74581, 120632, 0, 0, 
     41889, 92453, 0, 1161, 41895, 74103, 9701, 8622, 0, 0, 73819, 120588, 
     5012, 77912, 41362, 69862, 78296, 11921, 0, 11769, 0, 68609, 41364, 0, 
-    74228, 41352, 41361, 0, 41366, 0, 3356, 0, 917, 68422, 119915, 7134, 
+    74228, 41352, 41361, 0, 41366, 0, 3356, 11611, 917, 68422, 119915, 7134, 
     8199, 78389, 119917, 677, 119916, 0, 119932, 127169, 0, 0, 0, 3349, 
     74125, 7022, 8927, 4739, 0, 5802, 0, 8615, 0, 0, 491, 128819, 10190, 
     120698, 65837, 128820, 8426, 11092, 9891, 0, 42497, 7113, 7586, 42305, 
@@ -19323,7 +19325,7 @@
     0, 78621, 194672, 6925, 0, 0, 917929, 0, 11568, 983664, 43367, 64579, 
     917930, 7852, 0, 0, 6754, 6312, 0, 64672, 65296, 0, 118957, 0, 416, 
     12296, 68457, 73834, 68177, 11050, 10984, 92208, 0, 0, 92182, 0, 983605, 
-    9532, 66355, 0, 983228, 917925, 64343, 195032, 128281, 195031, 0, 195030, 
+    9532, 66355, 0, 983229, 917925, 64343, 195032, 128281, 195031, 0, 195030, 
     195057, 11445, 0, 2112, 195056, 128814, 10185, 1021, 128130, 9507, 10210, 
     74544, 8023, 1200, 12243, 78001, 5282, 78003, 9624, 11545, 0, 120493, 
     3343, 4424, 11047, 1885, 43268, 3896, 78444, 66497, 2947, 392, 7894, 
@@ -19358,43 +19360,43 @@
     66454, 9592, 42851, 126993, 1542, 92303, 0, 0, 0, 0, 74311, 78497, 0, 
     10181, 0, 43624, 0, 7779, 0, 10195, 9479, 6029, 0, 92268, 9689, 0, 65577, 
     8993, 66358, 0, 42378, 3368, 606, 127030, 7697, 69237, 69787, 2030, 0, 
-    6027, 8370, 4322, 0, 65207, 0, 983331, 983330, 983329, 983328, 2735, 
+    6027, 8370, 4322, 0, 65207, 0, 983332, 983331, 983330, 983329, 2735, 
     42831, 77935, 127120, 74866, 8881, 119047, 0, 0, 73946, 0, 0, 0, 68140, 
     983919, 9576, 128872, 3347, 4160, 5154, 55288, 3794, 66564, 8530, 127063, 
     7709, 41112, 983132, 66560, 42041, 4572, 12876, 66561, 983749, 6758, 
-    983917, 1615, 5855, 809, 0, 92283, 128316, 128004, 5799, 983320, 70100, 
-    983318, 7260, 983316, 43031, 64425, 65128, 78819, 64386, 65257, 0, 68616, 
+    983917, 1615, 5855, 809, 0, 92283, 128316, 128004, 5799, 983321, 70100, 
+    983319, 7260, 983317, 43031, 64425, 65128, 78819, 64386, 65257, 0, 68616, 
     120607, 9347, 128067, 6532, 0, 0, 0, 127060, 65828, 0, 283, 68665, 78813, 
     532, 78663, 0, 983787, 120609, 0, 3370, 0, 11361, 5443, 78778, 8153, 
-    73767, 0, 10741, 0, 2298, 0, 983908, 65495, 64706, 983310, 43344, 983308, 
-    7144, 9466, 78866, 9824, 983303, 983302, 0, 0, 915, 43425, 0, 0, 0, 0, 
+    73767, 0, 10741, 0, 2298, 0, 983908, 65495, 64706, 983311, 43344, 983309, 
+    7144, 9466, 78866, 9824, 983304, 983303, 0, 0, 915, 43425, 0, 0, 0, 0, 
     127178, 43264, 70096, 0, 0, 43038, 78864, 6730, 78862, 68161, 64550, 
     5186, 7360, 127837, 0, 12108, 0, 65124, 43127, 66043, 0, 6326, 43107, 
-    77826, 0, 42562, 0, 128821, 0, 128520, 11485, 6103, 127123, 983297, 
-    11718, 983295, 12889, 92657, 127137, 0, 0, 0, 55245, 0, 1630, 128232, 
+    77826, 0, 42562, 0, 128821, 0, 128520, 11485, 6103, 127123, 983298, 
+    11718, 983296, 12889, 92657, 127137, 0, 0, 0, 55245, 0, 1630, 128232, 
     65483, 0, 12565, 0, 65476, 120013, 0, 119554, 9283, 7700, 917537, 9690, 
     65499, 0, 64593, 512, 3376, 68210, 0, 128677, 77892, 632, 12940, 77891, 
-    42529, 78587, 0, 5957, 110593, 8926, 983291, 983290, 128273, 10745, 
+    42529, 78587, 0, 5957, 110593, 8926, 983292, 983291, 128273, 10745, 
     10174, 7379, 64581, 5386, 120686, 11713, 10633, 69708, 5056, 0, 0, 0, 
     120773, 0, 9812, 0, 4460, 0, 0, 71307, 128038, 0, 0, 127174, 64278, 
     92370, 43466, 0, 0, 64389, 2953, 73879, 1801, 12835, 119029, 0, 73823, 0, 
-    66375, 2085, 702, 42579, 77884, 77885, 13074, 77883, 983278, 983277, 
-    128570, 12106, 983274, 74207, 1755, 10482, 12863, 77898, 1163, 2951, 
+    66375, 2085, 702, 42579, 77884, 77885, 13074, 77883, 983279, 983278, 
+    128570, 12106, 983275, 74207, 1755, 10482, 12863, 77898, 1163, 2951, 
     9522, 74079, 78266, 66604, 0, 3384, 69227, 10702, 830, 77902, 77899, 
     77900, 8451, 0, 0, 0, 69739, 0, 0, 0, 0, 2908, 0, 43386, 64902, 4243, 0, 
-    12239, 0, 0, 4441, 0, 983271, 73940, 64352, 127513, 983267, 411, 983265, 
-    9199, 983263, 4056, 118992, 41890, 0, 2730, 41604, 983928, 5428, 194743, 
+    12239, 0, 0, 4441, 0, 983272, 73940, 64352, 127513, 983268, 411, 983266, 
+    9199, 983264, 4056, 118992, 41890, 0, 2730, 41604, 983928, 5428, 194743, 
     3364, 42265, 64437, 127935, 118816, 194742, 9684, 216, 0, 1401, 128053, 
     44012, 0, 0, 92585, 9158, 77842, 69905, 5768, 0, 0, 0, 484, 194739, 0, 0, 
-    65895, 0, 0, 3338, 73935, 572, 7041, 2736, 67605, 983255, 93962, 2794, 
+    65895, 0, 0, 3338, 73935, 572, 7041, 2736, 67605, 983256, 93962, 2794, 
     8807, 64491, 77847, 5438, 5222, 5381, 43114, 0, 5193, 5125, 5456, 5509, 
     77846, 194747, 9534, 0, 0, 0, 3430, 0, 0, 78717, 0, 981, 0, 4330, 73929, 
     120536, 1824, 10908, 0, 7034, 41683, 64617, 0, 73754, 3957, 64358, 64547, 
-    128259, 674, 63991, 983243, 2946, 5354, 5251, 5328, 5307, 3759, 11411, 
+    128259, 674, 63991, 983244, 2946, 5354, 5251, 5328, 5307, 3759, 11411, 
     8364, 5123, 119628, 5281, 5469, 5121, 119245, 118993, 0, 5130, 0, 0, 
     77990, 0, 120726, 1221, 2733, 11746, 77991, 5216, 0, 0, 0, 0, 3468, 7033, 
     9230, 5939, 195052, 0, 0, 120677, 68400, 7278, 10321, 10289, 64613, 
-    10385, 41706, 0, 0, 983405, 0, 11739, 983418, 41981, 0, 5938, 0, 43766, 
+    10385, 41706, 0, 0, 983406, 0, 11739, 983419, 41981, 0, 5938, 0, 43766, 
     12448, 7576, 10401, 10337, 73852, 0, 13057, 0, 126976, 0, 10009, 0, 
     41703, 983629, 12165, 0, 0, 9885, 0, 8077, 0, 127908, 0, 0, 0, 92457, 0, 
     4220, 10725, 10433, 0, 68395, 4987, 64519, 0, 128340, 0, 0, 0, 10970, 
@@ -19406,53 +19408,53 @@
     0, 4477, 118964, 814, 42066, 66183, 66204, 43786, 119961, 66198, 41880, 
     66188, 11623, 78148, 11955, 66190, 66191, 41111, 66189, 73788, 7788, 
     4847, 0, 127759, 0, 0, 0, 1581, 6535, 78161, 12954, 430, 78160, 55259, 
-    78158, 128036, 5278, 4945, 42883, 4950, 983430, 68625, 983428, 7269, 0, 
-    5964, 12908, 983555, 0, 74764, 74477, 119146, 194936, 4949, 983421, 443, 
-    983419, 4944, 5467, 119603, 0, 65137, 6044, 65392, 0, 4213, 0, 41303, 0, 
+    78158, 128036, 5278, 4945, 42883, 4950, 983431, 68625, 983429, 7269, 0, 
+    5964, 12908, 983555, 0, 74764, 74477, 119146, 194936, 4949, 983422, 443, 
+    983420, 4944, 5467, 119603, 0, 65137, 6044, 65392, 0, 4213, 0, 41303, 0, 
     194931, 119962, 41306, 73984, 2698, 127159, 0, 12072, 3193, 0, 41304, 
     824, 128676, 12091, 78893, 78894, 119816, 4673, 64804, 4678, 119820, 
     119819, 65059, 0, 6739, 0, 5481, 3490, 1199, 119811, 8356, 69947, 119832, 
     4677, 12688, 3102, 0, 4672, 78173, 78175, 5531, 68367, 42575, 78170, 
     78166, 4674, 4548, 44005, 119949, 68658, 119946, 8025, 68630, 127024, 
-    1855, 983404, 68669, 983402, 92445, 127554, 0, 127339, 119652, 2745, 
-    11797, 983410, 128159, 9202, 4654, 983406, 983408, 68638, 73993, 10525, 
-    4649, 65209, 983409, 0, 4648, 43080, 983398, 983399, 983396, 6246, 64950, 
+    1855, 983405, 68669, 983403, 92445, 127554, 0, 127339, 119652, 2745, 
+    11797, 983411, 128159, 9202, 4654, 983407, 983409, 68638, 73993, 10525, 
+    4649, 65209, 983410, 0, 4648, 43080, 983399, 983400, 983397, 6246, 64950, 
     7828, 4650, 6777, 6776, 6775, 4653, 7822, 78005, 92384, 43187, 8669, 
-    983407, 6821, 65093, 0, 78881, 2716, 0, 983060, 983411, 0, 68369, 120054, 
+    983408, 6821, 65093, 0, 78881, 2716, 0, 983060, 983412, 0, 68369, 120054, 
     11060, 8547, 2711, 42165, 78027, 78026, 7992, 0, 0, 4662, 78033, 78032, 
     9149, 9146, 599, 2081, 78031, 78030, 194962, 4656, 10130, 68450, 7811, 
-    40994, 194965, 6414, 5967, 4658, 3725, 5713, 5814, 4661, 42434, 983403, 
+    40994, 194965, 6414, 5967, 4658, 3725, 5713, 5814, 4661, 42434, 983404, 
     0, 0, 64904, 9026, 10833, 74864, 7547, 4867, 0, 10008, 10222, 3054, 
-    194956, 9744, 78860, 7605, 4622, 119656, 983387, 94070, 983385, 983386, 
-    983383, 9045, 78888, 4225, 19926, 78887, 12880, 65307, 4617, 78883, 
-    983378, 41732, 4616, 10518, 10423, 10359, 983372, 5958, 0, 983425, 4215, 
-    9789, 917941, 4321, 4621, 983381, 41313, 522, 5368, 0, 65803, 0, 5366, 
-    12201, 5372, 0, 983401, 0, 7720, 7390, 2696, 983392, 0, 4638, 983397, 
+    194956, 9744, 78860, 7605, 4622, 119656, 983388, 94070, 983386, 983387, 
+    983384, 9045, 78888, 4225, 19926, 78887, 12880, 65307, 4617, 78883, 
+    983379, 41732, 4616, 10518, 10423, 10359, 983373, 5958, 0, 983426, 4215, 
+    9789, 917941, 4321, 4621, 983382, 41313, 522, 5368, 0, 65803, 0, 5366, 
+    12201, 5372, 0, 983402, 0, 7720, 7390, 2696, 983393, 0, 4638, 983398, 
     1790, 78242, 5965, 64363, 66569, 68646, 127833, 5376, 1835, 5335, 194966, 
     128089, 4633, 0, 68119, 1180, 4632, 128093, 5387, 5333, 0, 0, 42094, 
     5331, 4634, 11928, 983594, 5338, 4637, 128170, 5971, 42414, 0, 1268, 
     65097, 42361, 0, 0, 73853, 1427, 0, 0, 5970, 3431, 0, 10358, 10422, 4758, 
-    983366, 1608, 2738, 0, 10455, 4753, 74026, 11344, 4222, 6240, 5231, 
-    74384, 983370, 68377, 6248, 983354, 983355, 983352, 42318, 92582, 5229, 
+    983367, 1608, 2738, 0, 10455, 4753, 74026, 11344, 4222, 6240, 5231, 
+    74384, 983371, 68377, 6248, 983355, 983356, 983353, 42318, 92582, 5229, 
     4757, 0, 0, 2728, 4752, 64563, 65235, 5234, 0, 128145, 0, 10713, 7166, 0, 
     2622, 7460, 127302, 0, 0, 8954, 74760, 65189, 2632, 42617, 10108, 1011, 
     5574, 1853, 2709, 65139, 5577, 0, 0, 118871, 68641, 8965, 7635, 42177, 
-    5316, 0, 5314, 6451, 5572, 66464, 5312, 0, 5525, 5330, 5319, 983412, 
-    983863, 194907, 44003, 0, 983472, 983415, 120498, 127851, 195009, 983856, 
-    74022, 983414, 64609, 68643, 120634, 983481, 5721, 983393, 5519, 8632, 
-    66465, 11267, 73961, 92278, 5720, 983344, 1692, 4219, 4610, 8696, 4305, 
-    0, 4609, 43478, 4614, 541, 983347, 5287, 5309, 5285, 68389, 5961, 4647, 
-    56, 4216, 10577, 41381, 601, 4613, 983341, 983338, 77849, 4608, 64260, 
+    5316, 0, 5314, 6451, 5572, 66464, 5312, 0, 5525, 5330, 5319, 983413, 
+    983863, 194907, 44003, 0, 983473, 983416, 120498, 127851, 195009, 983856, 
+    74022, 983415, 64609, 68643, 120634, 983482, 5721, 983394, 5519, 8632, 
+    66465, 11267, 73961, 92278, 5720, 983345, 1692, 4219, 4610, 8696, 4305, 
+    0, 4609, 43478, 4614, 541, 983348, 5287, 5309, 5285, 68389, 5961, 4647, 
+    56, 4216, 10577, 41381, 601, 4613, 983342, 983339, 77849, 4608, 64260, 
     41124, 5190, 67628, 0, 68145, 7086, 0, 67998, 67620, 0, 2734, 11074, 0, 
     67627, 43593, 0, 67625, 5960, 0, 8992, 42593, 128260, 1782, 67622, 68114, 
     119939, 0, 68180, 5501, 119952, 42508, 7442, 43665, 359, 41253, 68392, 
     6239, 119956, 41256, 0, 68134, 0, 74209, 917550, 9346, 69660, 41254, 
     128047, 43291, 3767, 5737, 0, 4865, 0, 5740, 917997, 5736, 4368, 64724, 
     7193, 68137, 0, 5739, 41024, 4866, 0, 73904, 983831, 4869, 120563, 0, 
-    4223, 128201, 6650, 126509, 0, 983455, 127890, 4870, 120445, 68661, 6716, 
+    4223, 128201, 6650, 126509, 0, 983456, 127890, 4870, 120445, 68661, 6716, 
     78176, 68667, 68382, 68676, 127925, 10122, 4864, 66568, 4144, 7937, 0, 
     6245, 68652, 2732, 42734, 745, 0, 195097, 92195, 4777, 7821, 0, 68631, 
-    42775, 0, 194954, 0, 3097, 0, 5966, 983478, 4778, 0, 10863, 0, 4781, 0, 
+    42775, 0, 194954, 0, 3097, 0, 5966, 983479, 4778, 0, 10863, 0, 4781, 0, 
     64407, 0, 128323, 8577, 128562, 68196, 43285, 10216, 4782, 0, 0, 120757, 
     68618, 12325, 43056, 8717, 0, 0, 4776, 73818, 11492, 8700, 0, 13176, 
     68363, 10426, 0, 917599, 10362, 194706, 1715, 4849, 8242, 9561, 73922, 
@@ -19460,19 +19462,19 @@
     4854, 127918, 5164, 983861, 1350, 5124, 64420, 1993, 5362, 8471, 2708, 
     92471, 12445, 3785, 234, 3199, 0, 41268, 4848, 2530, 917909, 2068, 1964, 
     0, 73762, 10458, 0, 8576, 78543, 0, 2704, 4794, 0, 68211, 8322, 4797, 
-    5753, 0, 2694, 4792, 0, 2439, 65104, 69804, 983416, 303, 983101, 92622, 
-    983417, 2437, 0, 4221, 4844, 92216, 0, 0, 0, 70042, 0, 43292, 0, 2441, 
+    5753, 0, 2694, 4792, 0, 2439, 65104, 69804, 983417, 303, 983101, 92622, 
+    983418, 2437, 0, 4221, 4844, 92216, 0, 0, 0, 70042, 0, 43292, 0, 2441, 
     10739, 65090, 0, 119327, 126541, 2451, 2714, 119326, 0, 43379, 4937, 
     43376, 753, 5849, 10597, 43089, 11722, 9248, 92555, 42879, 11725, 0, 0, 
     2726, 3107, 73958, 4941, 64937, 119233, 9140, 1408, 5261, 4607, 0, 181, 
-    983422, 4942, 9539, 4938, 0, 65201, 5259, 9369, 64185, 4142, 5257, 
+    983423, 4942, 9539, 4938, 0, 65201, 5259, 9369, 64185, 4142, 5257, 
     983601, 0, 4964, 5264, 64178, 64177, 12979, 41411, 64182, 64181, 64180, 
     64179, 9482, 4873, 41231, 1822, 42526, 128581, 12758, 3865, 0, 0, 10500, 
     0, 119024, 78028, 92408, 9830, 43642, 389, 10893, 7521, 127879, 4872, 
     5463, 0, 3125, 9567, 0, 4878, 5459, 4604, 917931, 9557, 5465, 68617, 0, 
-    11494, 126492, 9563, 10865, 74570, 43279, 64186, 983431, 78714, 64191, 
+    11494, 126492, 9563, 10865, 74570, 43279, 64186, 983432, 78714, 64191, 
     64190, 8898, 64188, 0, 41030, 78836, 0, 917835, 78820, 917834, 0, 78805, 
-    41031, 78801, 11960, 6745, 3082, 983429, 78539, 73919, 10573, 41744, 
+    41031, 78801, 11960, 6745, 3082, 983430, 78539, 73919, 10573, 41744, 
     7079, 5856, 127043, 5163, 78809, 128162, 1817, 66724, 78538, 0, 10564, 
     7763, 13077, 41813, 4400, 41745, 64207, 10275, 8925, 10371, 10307, 41814, 
     4248, 0, 0, 4541, 6299, 64204, 64203, 64201, 64200, 64199, 64198, 126471, 
@@ -19488,30 +19490,30 @@
     3933, 74559, 4740, 7954, 0, 0, 42609, 0, 74175, 0, 127016, 0, 983864, 
     42130, 0, 5151, 917829, 917823, 0, 93980, 0, 7620, 3800, 65122, 0, 0, 
     8355, 7854, 0, 954, 64927, 4185, 41045, 127141, 41438, 41439, 68666, 
-    10711, 4593, 127745, 120584, 983400, 64774, 8053, 10532, 66727, 0, 0, 0, 
+    10711, 4593, 127745, 120584, 983401, 64774, 8053, 10532, 66727, 0, 0, 0, 
     64759, 6381, 5166, 9888, 127800, 5148, 42834, 0, 78205, 78206, 43787, 
     78204, 64131, 3119, 917814, 0, 3060, 64135, 9986, 0, 77876, 636, 11698, 
-    0, 983443, 9916, 11701, 7836, 42741, 64137, 8320, 78640, 8863, 92431, 
-    119960, 1477, 43289, 0, 74358, 8618, 983394, 9908, 983972, 0, 0, 3937, 
-    12312, 0, 983395, 0, 64781, 912, 6349, 4536, 93954, 74532, 126594, 6244, 
-    92209, 71341, 3935, 120665, 983468, 0, 11950, 5392, 42248, 65129, 68656, 
+    0, 983444, 9916, 11701, 7836, 42741, 64137, 8320, 78640, 8863, 92431, 
+    119960, 1477, 43289, 0, 74358, 8618, 983395, 9908, 983972, 0, 0, 3937, 
+    12312, 0, 983396, 0, 64781, 912, 6349, 4536, 93954, 74532, 126594, 6244, 
+    92209, 71341, 3935, 120665, 983469, 0, 11950, 5392, 42248, 65129, 68656, 
     5397, 0, 12046, 12599, 0, 128261, 5395, 0, 5393, 354, 68615, 119948, 
     78503, 0, 0, 42039, 0, 0, 64142, 626, 0, 5895, 0, 0, 5780, 0, 0, 128874, 
     0, 0, 43297, 983079, 4311, 4644, 8818, 0, 128186, 0, 7145, 3918, 66452, 
     3797, 1644, 92346, 9658, 4140, 11385, 65947, 6455, 9030, 813, 119945, 
     68131, 4146, 119957, 5360, 2466, 0, 67669, 119942, 6249, 42117, 92287, 
-    128224, 0, 0, 74046, 43745, 4911, 988, 917807, 0, 983460, 43061, 7054, 
+    128224, 0, 0, 74046, 43745, 4911, 988, 917807, 0, 983461, 43061, 7054, 
     64147, 0, 64920, 68195, 6698, 118933, 92506, 0, 120006, 11981, 12202, 0, 
     11032, 67654, 6093, 11608, 975, 68662, 65843, 170, 0, 0, 4169, 0, 41859, 
     6058, 120401, 13203, 120657, 0, 0, 68657, 9818, 10178, 10324, 42106, 
     5898, 74540, 4738, 41856, 7062, 917865, 4737, 11779, 4742, 120564, 92391, 
-    73736, 983356, 9825, 6448, 6715, 127008, 4831, 0, 92525, 0, 5300, 4741, 
-    42108, 983346, 64159, 4736, 64148, 0, 849, 92191, 78491, 43288, 0, 66620, 
-    917916, 127331, 65549, 9496, 64598, 118866, 983358, 7876, 68132, 917872, 
+    73736, 983357, 9825, 6448, 6715, 127008, 4831, 0, 92525, 0, 5300, 4741, 
+    42108, 983347, 64159, 4736, 64148, 0, 849, 92191, 78491, 43288, 0, 66620, 
+    917916, 127331, 65549, 9496, 64598, 118866, 983359, 7876, 68132, 917872, 
     3928, 917870, 43378, 10706, 7198, 0, 4842, 12053, 128129, 0, 4841, 0, 
     4171, 12008, 6251, 3923, 1490, 0, 119591, 126512, 40972, 5245, 0, 10114, 
     42001, 41888, 4845, 8332, 40974, 64347, 4840, 9077, 78346, 1747, 917849, 
-    4825, 69240, 917852, 68655, 0, 983380, 0, 0, 68628, 983339, 9850, 118937, 
+    4825, 69240, 917852, 68655, 0, 983381, 0, 0, 68628, 983340, 9850, 118937, 
     367, 1472, 917859, 6687, 1274, 0, 5905, 12339, 8919, 73953, 10907, 65261, 
     11023, 119559, 4830, 9134, 78666, 64126, 43011, 0, 126626, 64101, 0, 0, 
     4824, 10614, 119659, 0, 1888, 1960, 7861, 917856, 78524, 41836, 43012, 
@@ -19520,7 +19522,7 @@
     64118, 126998, 12962, 0, 126580, 4017, 12827, 5241, 120392, 0, 41118, 
     3924, 0, 11366, 917843, 0, 0, 917846, 41116, 917844, 917564, 0, 11363, 
     12057, 11917, 1567, 74000, 4721, 126641, 66202, 8957, 4139, 0, 0, 0, 0, 
-    0, 12740, 128702, 4722, 6816, 127793, 12759, 4725, 983375, 4726, 0, 
+    0, 12740, 128702, 4722, 6816, 127793, 12759, 4725, 983376, 4726, 0, 
     194892, 0, 128321, 917905, 0, 12755, 12762, 4015, 0, 8052, 476, 0, 0, 
     128294, 64212, 41020, 1382, 64209, 64216, 44002, 64214, 1656, 41831, 0, 
     0, 41843, 8720, 3908, 1452, 13111, 0, 64067, 127328, 8552, 64113, 41845, 
@@ -19537,11 +19539,11 @@
     4814, 0, 4810, 0, 0, 64928, 10543, 0, 3522, 71335, 414, 65404, 0, 195027, 
     6456, 73820, 0, 6691, 42193, 92225, 128171, 0, 74495, 0, 0, 0, 118820, 
     9751, 65407, 128085, 11770, 3919, 0, 0, 65061, 0, 0, 0, 12235, 0, 0, 
-    127233, 64092, 983462, 64080, 0, 64090, 0, 69913, 10162, 10310, 0, 8454, 
+    127233, 64092, 983463, 64080, 0, 64090, 0, 69913, 10162, 10310, 0, 8454, 
     127888, 42038, 387, 41363, 12737, 0, 4780, 43368, 0, 64310, 64621, 6732, 
     78116, 0, 983139, 0, 983074, 8896, 0, 375, 6976, 66582, 119005, 983865, 
-    0, 983426, 119202, 119203, 12526, 43120, 2315, 0, 1938, 119197, 0, 4529, 
-    119200, 119201, 119198, 119199, 69692, 983424, 69698, 13150, 64492, 0, 0, 
+    0, 983427, 119202, 119203, 12526, 43120, 2315, 0, 1938, 119197, 0, 4529, 
+    119200, 119201, 119198, 119199, 69692, 983425, 69698, 13150, 64492, 0, 0, 
     2291, 12902, 0, 42891, 66327, 74298, 917857, 10799, 69690, 2587, 66372, 
     0, 4193, 92250, 4241, 983057, 7998, 0, 0, 0, 126640, 2316, 118821, 0, 0, 
     0, 64297, 74799, 92442, 74140, 0, 5373, 0, 983877, 3762, 10015, 120672, 
@@ -19550,13 +19552,13 @@
     280, 74558, 127332, 68138, 13072, 1894, 0, 0, 65478, 43310, 7231, 0, 
     11773, 0, 0, 0, 0, 2551, 0, 6453, 10200, 6235, 983743, 119237, 0, 128805, 
     4470, 11826, 917557, 7780, 5369, 118958, 5249, 0, 5367, 8756, 127143, 0, 
-    5377, 120585, 68143, 1688, 78245, 983348, 69685, 983747, 0, 0, 44020, 
+    5377, 120585, 68143, 1688, 78245, 983349, 69685, 983747, 0, 0, 44020, 
     6808, 41319, 1300, 10650, 41692, 64505, 2290, 0, 119624, 1465, 10850, 
     3943, 0, 41205, 41315, 118961, 0, 0, 5352, 0, 0, 8839, 41314, 7384, 7785, 
     41204, 127322, 41209, 69637, 92241, 43607, 0, 0, 5420, 3897, 10134, 0, 
     74417, 4018, 7150, 68127, 0, 0, 0, 0, 127526, 2561, 68621, 3542, 7148, 
     12076, 7951, 68152, 118857, 5303, 6276, 1706, 0, 78751, 7146, 0, 65150, 
-    41819, 0, 73951, 10847, 41822, 9985, 860, 0, 10506, 983427, 69641, 10753, 
+    41819, 0, 73951, 10847, 41822, 9985, 860, 0, 10506, 983428, 69641, 10753, 
     10830, 0, 615, 64490, 7574, 92617, 77922, 0, 12909, 43016, 64559, 127028, 
     0, 0, 67996, 2020, 0, 4022, 128783, 0, 77923, 126593, 41691, 0, 0, 74329, 
     0, 64622, 9070, 0, 68411, 3911, 42829, 43122, 1033, 74440, 0, 7000, 3904, 
@@ -19590,9 +19592,9 @@
     9425, 9426, 9427, 9428, 9429, 64758, 2362, 9655, 0, 2004, 9096, 9782, 
     128848, 9172, 128545, 19965, 0, 5955, 67666, 1108, 0, 74773, 0, 0, 64782, 
     3926, 92448, 65210, 8798, 0, 92165, 1392, 0, 0, 127364, 10606, 8065, 
-    118805, 10353, 10417, 0, 0, 64524, 92418, 4019, 0, 983280, 43280, 8219, 
+    118805, 10353, 10417, 0, 0, 64524, 92418, 4019, 0, 983281, 43280, 8219, 
     68402, 1812, 119963, 983683, 0, 126488, 42410, 74448, 119132, 6054, 
-    10697, 3169, 42297, 42322, 10642, 3909, 9950, 0, 128139, 983253, 68678, 
+    10697, 3169, 42297, 42322, 10642, 3909, 9950, 0, 128139, 983254, 68678, 
     0, 0, 1049, 0, 65707, 2304, 41806, 92326, 42336, 3921, 0, 11775, 64760, 
     11766, 1038, 42303, 9823, 127278, 69236, 4008, 64004, 8773, 10733, 36, 0, 
     5153, 41805, 0, 73735, 763, 41808, 64910, 983130, 2009, 0, 0, 127142, 
@@ -19634,9 +19636,9 @@
     120130, 4267, 1631, 42206, 77983, 0, 195046, 65700, 66562, 0, 64645, 0, 
     0, 126588, 12586, 0, 9242, 127922, 0, 4523, 5842, 10495, 3122, 983788, 
     7793, 78275, 9328, 119104, 78393, 12604, 0, 6615, 2285, 92344, 3986, 
-    44025, 0, 8912, 64555, 7409, 0, 983350, 9541, 78276, 0, 11275, 8540, 
-    11498, 0, 983349, 41040, 2459, 0, 13060, 41041, 74413, 983138, 0, 0, 
-    68427, 10450, 12551, 41043, 7020, 120353, 3765, 983342, 0, 1606, 120348, 
+    44025, 0, 8912, 64555, 7409, 0, 983351, 9541, 78276, 0, 11275, 8540, 
+    11498, 0, 983350, 41040, 2459, 0, 13060, 41041, 74413, 983138, 0, 0, 
+    68427, 10450, 12551, 41043, 7020, 120353, 3765, 983343, 0, 1606, 120348, 
     120351, 3093, 68436, 0, 983061, 119613, 0, 0, 4312, 74091, 120337, 
     120336, 11923, 4023, 120333, 5763, 94015, 4827, 10894, 12810, 64406, 
     118785, 4455, 74321, 433, 119620, 66660, 2499, 0, 0, 118837, 11973, 
@@ -19646,11 +19648,11 @@
     7004, 0, 65880, 127886, 119048, 2380, 11380, 0, 93996, 2376, 0, 119320, 
     0, 5197, 127046, 127047, 127048, 2366, 127050, 127051, 120554, 120045, 0, 
     0, 0, 983084, 0, 0, 0, 74188, 71342, 983086, 983573, 120047, 128575, 0, 
-    0, 120049, 0, 1847, 0, 10339, 983357, 42384, 0, 4227, 74158, 0, 92501, 
-    43032, 0, 42365, 0, 12671, 11384, 0, 983457, 0, 64797, 983337, 5820, 
-    983336, 120052, 120065, 0, 120064, 120650, 42137, 9893, 2754, 12664, 
+    0, 120049, 0, 1847, 0, 10339, 983358, 42384, 0, 4227, 74158, 0, 92501, 
+    43032, 0, 42365, 0, 12671, 11384, 0, 983458, 0, 64797, 983338, 5820, 
+    983337, 120052, 120065, 0, 120064, 120650, 42137, 9893, 2754, 12664, 
     120063, 0, 7377, 127867, 41799, 65530, 1711, 12984, 43039, 3114, 6255, 
-    983332, 118938, 0, 10853, 926, 983361, 74184, 983360, 120055, 0, 43175, 
+    983333, 118938, 0, 10853, 926, 983362, 74184, 983361, 120055, 0, 43175, 
     0, 43037, 41798, 41035, 11583, 127769, 41801, 119088, 119605, 520, 4200, 
     12699, 8331, 0, 3091, 41034, 127353, 983672, 8360, 0, 78044, 321, 4229, 
     64543, 917946, 65563, 0, 917974, 2861, 43793, 10095, 0, 9195, 92386, 
@@ -19664,7 +19666,7 @@
     78222, 1346, 0, 917631, 64573, 64897, 423, 1818, 65144, 0, 8272, 127812, 
     19911, 4218, 3087, 64960, 127234, 43564, 0, 0, 9584, 10465, 983893, 
     74359, 12626, 9106, 0, 42642, 120230, 64750, 9390, 0, 41797, 0, 0, 265, 
-    41795, 64666, 126508, 43530, 2752, 0, 0, 983485, 59, 0, 983593, 0, 92371, 
+    41795, 64666, 126508, 43530, 2752, 0, 0, 983486, 59, 0, 983593, 0, 92371, 
     77873, 41810, 0, 7010, 0, 41809, 41495, 119364, 0, 42252, 42213, 8009, 
     3305, 43033, 511, 92700, 66255, 13127, 120067, 0, 74397, 120235, 917977, 
     65915, 1400, 41812, 10685, 194870, 2103, 10387, 4453, 43276, 917783, 
@@ -19703,7 +19705,7 @@
     78719, 66573, 0, 78724, 78712, 11761, 194655, 0, 41094, 0, 0, 194893, 0, 
     92689, 6196, 6945, 93969, 194890, 128184, 120491, 11816, 194943, 5733, 
     2930, 0, 0, 41098, 0, 41093, 0, 66626, 588, 9760, 0, 194717, 1238, 200, 
-    983205, 1660, 73916, 0, 118905, 74362, 0, 92485, 194651, 0, 983697, 3394, 
+    983206, 1660, 73916, 0, 118905, 74362, 0, 92485, 194651, 0, 983697, 3394, 
     194894, 120668, 0, 0, 127358, 66219, 127183, 43284, 194656, 7817, 1841, 
     11055, 120533, 194979, 194982, 1669, 10776, 194981, 7701, 194980, 0, 
     194995, 1732, 4030, 0, 3963, 66611, 127530, 41768, 6491, 0, 65324, 914, 
@@ -19732,7 +19734,7 @@
     68465, 13027, 42824, 120574, 1039, 7151, 10155, 5745, 188, 41858, 11592, 
     0, 74015, 9055, 41853, 4858, 917780, 0, 436, 4771, 0, 2786, 0, 4856, 
     8051, 0, 119609, 71327, 9644, 0, 0, 0, 194916, 120732, 66710, 118834, 
-    983351, 73906, 128680, 127114, 0, 10234, 5843, 11939, 0, 42157, 0, 3157, 
+    983352, 73906, 128680, 127114, 0, 10234, 5843, 11939, 0, 42157, 0, 3157, 
     194918, 68393, 0, 3504, 119178, 0, 10822, 5149, 66029, 10226, 65142, 
     128025, 3594, 42424, 194959, 40, 12657, 983656, 0, 386, 0, 8834, 0, 
     12815, 43574, 0, 73907, 0, 74196, 7220, 74504, 0, 74316, 0, 65322, 4304, 
@@ -19746,7 +19748,7 @@
     42507, 1962, 43305, 78476, 42505, 11660, 0, 2072, 92312, 6995, 74173, 
     5437, 74174, 10669, 8702, 7964, 92352, 0, 199, 194843, 4105, 194845, 
     194699, 194847, 194710, 119875, 13148, 7560, 78479, 9226, 78480, 195070, 
-    6472, 65814, 73954, 0, 4724, 0, 0, 9191, 0, 64432, 983808, 983241, 
+    6472, 65814, 73954, 0, 4724, 0, 0, 9191, 0, 64432, 983808, 983242, 
     195024, 10196, 7886, 0, 6585, 0, 6680, 195042, 0, 195051, 6679, 74412, 
     92251, 194866, 74421, 11382, 983622, 983628, 127891, 127484, 194833, 
     194832, 6681, 127482, 12693, 194836, 42727, 78196, 128252, 78195, 65442, 
@@ -19792,11 +19794,11 @@
     64032, 42735, 64038, 64037, 64036, 64035, 4291, 194928, 64015, 64014, 
     64681, 194930, 0, 78145, 0, 43090, 0, 3476, 8973, 64012, 42473, 64010, 
     64008, 64007, 2003, 7706, 64517, 78153, 2538, 64009, 204, 0, 4802, 4111, 
-    8239, 9098, 4805, 64001, 64057, 7885, 7247, 64054, 983258, 0, 4767, 9343, 
+    8239, 9098, 4805, 64001, 64057, 7885, 7247, 64054, 983259, 0, 4767, 9343, 
     64049, 64048, 120034, 1133, 64053, 64052, 43453, 64050, 41340, 118975, 
     194835, 10005, 12329, 41333, 0, 8489, 1942, 0, 194834, 42520, 128249, 0, 
     0, 10760, 64023, 64022, 64021, 6582, 43670, 0, 64025, 9167, 42151, 78244, 
-    983226, 2026, 64019, 64018, 64017, 64016, 12768, 0, 7582, 78252, 78248, 
+    983227, 2026, 64019, 64018, 64017, 64016, 12768, 0, 7582, 78252, 78248, 
     77914, 78246, 78247, 0, 77915, 78766, 6788, 13094, 77920, 7532, 41414, 
     78520, 3179, 78518, 64769, 78514, 78517, 11461, 74454, 10751, 9051, 
     120720, 6708, 10535, 0, 68218, 55274, 2008, 64031, 64030, 294, 41874, 0, 
@@ -19804,7 +19806,7 @@
     6343, 43247, 119888, 0, 119886, 119891, 119892, 119889, 11433, 119895, 
     119896, 0, 7801, 65578, 194839, 12915, 43968, 3297, 9699, 194955, 1135, 
     0, 0, 128525, 1995, 6722, 983916, 0, 2552, 41546, 60, 68394, 8649, 41549, 
-    78496, 983319, 0, 6682, 0, 78679, 64710, 41547, 983621, 2013, 128291, 
+    78496, 983320, 0, 6682, 0, 78679, 64710, 41547, 983621, 2013, 128291, 
     78530, 78532, 78528, 78529, 12832, 78493, 8081, 8362, 3537, 119908, 9137, 
     7155, 8999, 0, 78533, 3466, 0, 0, 1996, 0, 3453, 6282, 0, 2002, 2000, 
     120175, 537, 0, 4179, 65119, 1998, 0, 1842, 0, 92674, 9628, 68446, 12081, 
@@ -19819,7 +19821,7 @@
 #define code_poly 32771
 
 static const unsigned int aliases_start = 0xf0000;
-static const unsigned int aliases_end = 0xf01c1;
+static const unsigned int aliases_end = 0xf01c2;
 static const unsigned int name_aliases[] = {
     0x0000,
     0x0000,
@@ -19982,6 +19984,7 @@
     0x01A2,
     0x01A3,
     0x034F,
+    0x0709,
     0x0CDE,
     0x0E9D,
     0x0E9F,
diff --git a/Objects/unicodetype_db.h b/Objects/unicodetype_db.h
--- a/Objects/unicodetype_db.h
+++ b/Objects/unicodetype_db.h
@@ -1919,7 +1919,7 @@
     246, 247, 248, 249, 250, 251, 5, 5, 5, 5, 5, 95, 245, 26, 22, 23, 246, 
     247, 248, 249, 250, 251, 5, 5, 5, 5, 5, 0, 95, 95, 95, 95, 95, 95, 95, 
     95, 95, 95, 95, 95, 95, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
-    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 
     25, 25, 25, 6, 6, 6, 6, 25, 6, 6, 6, 25, 25, 25, 25, 25, 25, 25, 25, 25, 
     25, 25, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 113, 5, 5, 
@@ -2593,10 +2593,10 @@
     0, 0, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
     141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
     141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
-    141, 141, 141, 141, 141, 141, 141, 141, 141, 252, 252, 141, 141, 141, 
     141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
     141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
-    141, 141, 141, 252, 252, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
+    141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
+    141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 
     141, 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 
     0, 0, 0, 0, 0, 0, 0, 0, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 
     55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 
@@ -2925,6 +2925,9 @@
 double _PyUnicode_ToNumeric(Py_UCS4 ch)
 {
     switch (ch) {
+    case 0x12456:
+    case 0x12457:
+        return (double) -1.0;
     case 0x0F33:
         return (double) -1.0/2.0;
     case 0x0030:
@@ -3427,6 +3430,8 @@
         return (double) 20000.0;
     case 0x3251:
         return (double) 21.0;
+    case 0x12432:
+        return (double) 216000.0;
     case 0x3252:
         return (double) 22.0;
     case 0x3253:
@@ -3721,6 +3726,8 @@
         return (double) 42.0;
     case 0x32B8:
         return (double) 43.0;
+    case 0x12433:
+        return (double) 432000.0;
     case 0x32B9:
         return (double) 44.0;
     case 0x32BA:
diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py
--- a/Tools/unicode/makeunicodedata.py
+++ b/Tools/unicode/makeunicodedata.py
@@ -37,7 +37,7 @@
 VERSION = "3.2"
 
 # The Unicode Database
-UNIDATA_VERSION = "6.1.0"
+UNIDATA_VERSION = "6.2.0"
 UNICODE_DATA = "UnicodeData%s.txt"
 COMPOSITION_EXCLUSIONS = "CompositionExclusions%s.txt"
 EASTASIAN_WIDTH = "EastAsianWidth%s.txt"

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 19:48:03 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sat, 29 Sep 2012 19:48:03 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XTcfq3xRZzQRk@mail.python.org>

http://hg.python.org/cpython/rev/43c8701988dd
changeset:   79256:43c8701988dd
parent:      79255:dfe991036531
parent:      79254:f11649b21603
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Sep 29 13:47:47 2012 -0400
summary:
  merge heads

files:
  Doc/whatsnew/3.3.rst |  59 ++++++++++++++++++++++---------
  1 files changed, 41 insertions(+), 18 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1127,7 +1127,7 @@
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
    older than 1000.
- * XXX The :meth:`datetime.datetime.astimezone` method can now be
+ * The :meth:`datetime.datetime.astimezone` method can now be
    called without arguments to convert datetime instance to the system
    timezone.
 
@@ -1534,6 +1534,15 @@
   :issue:`13245`)
 
 
+shlex
+-----
+
+* The previously undocumented helper function ``quote`` from the
+  :mod:`pipes` modules has been moved to the :mod:`shlex` module and
+  documented.  :func:`~shlex.quote` properly escapes all characters in a string
+  that might be otherwise given special meaning by the shell.
+
+
 shutil
 ------
 
@@ -1565,7 +1574,6 @@
   in :issue:`4489`.)
 
 
-
 signal
 ------
 
@@ -1588,14 +1596,27 @@
 * :func:`signal.signal` and :func:`signal.siginterrupt` raise an OSError,
   instead of a RuntimeError: OSError has an errno attribute.
 
+
+smtpd
+-----
+
+* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
+  (size extension).  Per the standard, these extensions are enabled if and only
+  if the client initiates the session with an ``EHLO`` command.
+
+  (Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
+  Jauhiainen.  Substantial additional work on the patch contributed by Michele
+  Orr? and Dan Boswell.  :issue:`8739`)
+
+
 smtplib
 -------
 
-The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
-method now accept an SSLContext parameter to control parameters of the secure
-channel.
-
-(Contributed by Kasun Herath in :issue:`8809`)
+* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+  method now accept an SSLContext parameter to control parameters of the secure
+  channel.
+
+  (Contributed by Kasun Herath in :issue:`8809`)
 
 
 socket
@@ -2070,14 +2091,16 @@
   (implemented in :issue:`14040`.)
 
 
-Other issues
-------------
-
-.. Issue #11591: When :program:`python` was started with :option:`-S`,
-   ``import site`` will not add site-specific paths to the module search
-   paths.  In previous versions, it did.  See changeset for doc changes in
-   various files.  Contributed by Carl Meyer with editions by ?ric Araujo.
-
-.. Issue #10998: the -Q command-line flag and related artifacts have been
-   removed.  Code checking sys.flags.division_warning will need updating.
-   Contributed by ?ric Araujo.
+Command Line Switch Changes
+---------------------------
+
+* The -Q command-line flag and related artifacts have been removed.  Code
+  checking sys.flags.division_warning will need updating.
+
+  (:issue:`10998`, contributed by ?ric Araujo.)
+
+* When :program:`python` is started with :option:`-S`, ``import site``
+  will no longer add site-specific paths to the module search paths.  In
+  previous versions, it did.
+
+  (:issue:`11591`, contributed by Carl Meyer with editions by ?ric Araujo.)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:20:20 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sat, 29 Sep 2012 20:20:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_3=2E3?=
 =?utf-8?q?=29=3A_merge_mostly_from_default?=
Message-ID: <3XTdN41ScNzNwx@mail.python.org>

http://hg.python.org/cpython/rev/83496b5e1916
changeset:   79257:83496b5e1916
branch:      3.3
parent:      79253:127abd16168a
parent:      79238:d4312199103e
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Sep 29 14:14:19 2012 -0400
summary:
  merge mostly from default

files:
  Doc/ACKS.txt                             |   239 -
  Doc/about.rst                            |     9 +-
  Doc/c-api/import.rst                     |     2 +-
  Doc/extending/newtypes.rst               |     6 +-
  Doc/faq/windows.rst                      |    10 +-
  Doc/howto/regex.rst                      |    26 +-
  Doc/howto/unicode.rst                    |    27 +-
  Doc/library/argparse.rst                 |    23 +-
  Doc/library/collections.rst              |     2 +-
  Doc/library/configparser.rst             |    19 +-
  Doc/library/crypt.rst                    |    10 +-
  Doc/library/crypto.rst                   |     1 +
  Doc/library/csv.rst                      |    28 +-
  Doc/library/curses.rst                   |    46 +-
  Doc/library/doctest.rst                  |    12 +-
  Doc/library/functions.rst                |    75 +-
  Doc/library/http.client.rst              |     8 +-
  Doc/library/inspect.rst                  |     4 +-
  Doc/library/itertools.rst                |     3 +-
  Doc/library/json.rst                     |    18 +-
  Doc/library/lzma.rst                     |    12 +-
  Doc/library/mailbox.rst                  |    19 +-
  Doc/library/multiprocessing.rst          |     5 +-
  Doc/library/nntplib.rst                  |     6 +-
  Doc/library/optparse.rst                 |    17 +-
  Doc/library/os.rst                       |     5 +-
  Doc/library/ossaudiodev.rst              |     3 +-
  Doc/library/pyexpat.rst                  |     2 +-
  Doc/library/random.rst                   |    11 +-
  Doc/library/site.rst                     |     2 +-
  Doc/library/smtpd.rst                    |    13 +-
  Doc/library/socket.rst                   |     3 +-
  Doc/library/stdtypes.rst                 |    11 +-
  Doc/library/subprocess.rst               |    14 +-
  Doc/library/syslog.rst                   |     3 +-
  Doc/library/textwrap.rst                 |    19 +-
  Doc/library/threading.rst                |     6 +-
  Doc/library/timeit.rst                   |    20 +-
  Doc/library/tkinter.tix.rst              |     2 +-
  Doc/library/types.rst                    |     2 +-
  Doc/library/unittest.mock.rst            |     4 +-
  Doc/library/unittest.rst                 |     2 +-
  Doc/library/urllib.parse.rst             |     5 +-
  Doc/license.rst                          |     6 +-
  Doc/reference/compound_stmts.rst         |    10 +-
  Doc/reference/datamodel.rst              |    26 +-
  Doc/tools/sphinxext/susp-ignored.csv     |     3 +-
  Doc/tutorial/datastructures.rst          |     2 +-
  Doc/tutorial/interpreter.rst             |     8 +-
  Doc/tutorial/introduction.rst            |     3 +-
  Doc/tutorial/stdlib.rst                  |     2 +-
  Doc/tutorial/stdlib2.rst                 |     8 +-
  Doc/whatsnew/3.3.rst                     |   118 +-
  Include/object.h                         |     2 +-
  Include/objimpl.h                        |     9 +-
  Include/pyfpe.h                          |     8 +-
  Include/pymacro.h                        |    14 +
  Lib/_pyio.py                             |     8 +
  Lib/argparse.py                          |    27 +-
  Lib/calendar.py                          |     6 +-
  Lib/doctest.py                           |     7 +-
  Lib/gzip.py                              |     4 +-
  Lib/http/cookiejar.py                    |     4 +-
  Lib/importlib/_bootstrap.py              |     8 +-
  Lib/lib2to3/fixer_util.py                |     4 +-
  Lib/lib2to3/refactor.py                  |     2 +-
  Lib/mailbox.py                           |    46 +-
  Lib/multiprocessing/pool.py              |    15 +-
  Lib/multiprocessing/util.py              |    42 +-
  Lib/socket.py                            |    15 +-
  Lib/test/sample_doctest_no_docstrings.py |    12 +
  Lib/test/sample_doctest_no_doctests.py   |    15 +
  Lib/test/string_tests.py                 |     3 +
  Lib/test/support.py                      |     2 +-
  Lib/test/test_argparse.py                |    81 +
  Lib/test/test_ast.py                     |     8 +
  Lib/test/test_calendar.py                |     6 +
  Lib/test/test_codecs.py                  |   116 +
  Lib/test/test_compileall.py              |    16 +-
  Lib/test/test_csv.py                     |     9 +
  Lib/test/test_decimal.py                 |    12 +-
  Lib/test/test_doctest.py                 |    25 +
  Lib/test/test_gdb.py                     |     5 +
  Lib/test/test_import.py                  |     2 +-
  Lib/test/test_importlib/test_locks.py    |    22 +-
  Lib/test/test_int.py                     |    12 +
  Lib/test/test_io.py                      |     5 +
  Lib/test/test_mailbox.py                 |    63 +-
  Lib/test/test_memoryio.py                |     7 +-
  Lib/test/test_mmap.py                    |     9 +
  Lib/test/test_multiprocessing.py         |     3 +-
  Lib/test/test_os.py                      |    26 +-
  Lib/test/test_pyexpat.py                 |    10 +
  Lib/test/test_socket.py                  |    11 +
  Lib/test/test_ssl.py                     |     8 +-
  Lib/test/test_startfile.py               |    15 +-
  Lib/test/test_super.py                   |    15 +
  Lib/test/test_support.py                 |     9 +
  Lib/test/test_textwrap.py                |    64 +-
  Lib/test/test_threaded_import.py         |     4 +-
  Lib/test/test_types.py                   |     2 +-
  Lib/test/test_webbrowser.py              |   192 +
  Lib/test/test_xml_etree.py               |    12 +
  Lib/test/test_zipimport_support.py       |    21 +-
  Lib/unittest/__main__.py                 |     9 +-
  Lib/unittest/mock.py                     |     4 +-
  Lib/unittest/runner.py                   |     2 +-
  Lib/unittest/test/test_runner.py         |    13 +
  Lib/unittest/test/testmock/testmock.py   |     7 +
  Lib/webbrowser.py                        |    15 +-
  Lib/xml/etree/ElementTree.py             |     2 +-
  Makefile.pre.in                          |    17 +-
  Misc/ACKS                                |   122 +-
  Modules/_csv.c                           |    11 +-
  Modules/_cursesmodule.c                  |     1 +
  Modules/_decimal/tests/bench.py          |    47 +-
  Modules/_elementtree.c                   |     2 +-
  Modules/_io/_iomodule.c                  |     2 +-
  Modules/_io/bytesio.c                    |    24 +-
  Modules/_io/iobase.c                     |     2 +-
  Modules/_io/stringio.c                   |    19 +-
  Modules/_io/textio.c                     |     2 +-
  Modules/_ssl.c                           |     2 +-
  Modules/_testbuffer.c                    |     7 +-
  Modules/mmapmodule.c                     |    11 +
  Modules/posixmodule.c                    |     9 +-
  Modules/selectmodule.c                   |     2 +-
  Modules/socketmodule.c                   |     3 +-
  Modules/zipimport.c                      |     8 +-
  Objects/classobject.c                    |     3 +-
  Objects/longobject.c                     |    10 +-
  Objects/memoryobject.c                   |    78 +-
  Objects/obmalloc.c                       |     7 +-
  Objects/setobject.c                      |     4 +-
  Objects/stringlib/codecs.h               |    14 +-
  Objects/stringlib/fastsearch.h           |     3 +-
  Objects/stringlib/find_max_char.h        |    11 +-
  Objects/tupleobject.c                    |     4 +-
  Objects/typeobject.c                     |    28 +-
  Objects/unicodeobject.c                  |    27 +-
  Parser/node.c                            |     2 +-
  Python/ast.c                             |   187 +-
  Python/formatter_unicode.c               |     2 +-
  Python/getargs.c                         |     1 +
  Python/importlib.h                       |  6991 ++++-----
  Python/pyarena.c                         |     8 +-
  Python/structmember.c                    |     6 +-
  Python/symtable.c                        |     8 +-
  setup.py                                 |     2 +
  149 files changed, 5346 insertions(+), 4376 deletions(-)


diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
deleted file mode 100644
--- a/Doc/ACKS.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-Contributors to the Python Documentation
-----------------------------------------
-
-This section lists people who have contributed in some way to the Python
-documentation.  It is probably not complete -- if you feel that you or
-anyone else should be on this list, please let us know (send email to
-docs at python.org), and we'll be glad to correct the problem.
-
-.. acks::
-
-   * Aahz
-   * Michael Abbott
-   * Steve Alexander
-   * Jim Ahlstrom
-   * Fred Allen
-   * A. Amoroso
-   * Pehr Anderson
-   * Oliver Andrich
-   * Heidi Annexstad
-   * Jes?s Cea Avi?n
-   * Manuel Balsera
-   * Daniel Barclay
-   * Chris Barker
-   * Don Bashford
-   * Anthony Baxter
-   * Alexander Belopolsky
-   * Bennett Benson
-   * Jonathan Black
-   * Robin Boerdijk
-   * Michal Bozon
-   * Aaron Brancotti
-   * Georg Brandl
-   * Keith Briggs
-   * Ian Bruntlett
-   * Lee Busby
-   * Arnaud Calmettes
-   * Lorenzo M. Catucci
-   * Carl Cerecke
-   * Mauro Cicognini
-   * Gilles Civario
-   * Mike Clarkson
-   * Steve Clift
-   * Dave Cole
-   * Matthew Cowles
-   * Jeremy Craven
-   * Andrew Dalke
-   * Ben Darnell
-   * L. Peter Deutsch
-   * Robert Donohue
-   * Fred L. Drake, Jr.
-   * Jacques Ducasse
-   * Josip Dzolonga
-   * Jeff Epler
-   * Michael Ernst
-   * Blame Andy Eskilsson
-   * Carey Evans
-   * Martijn Faassen
-   * Carl Feynman
-   * Dan Finnie
-   * Hern?n Mart?nez Foffani
-   * Michael Foord
-   * Stefan Franke
-   * Jim Fulton
-   * Peter Funk
-   * Ethan Furman
-   * Lele Gaifax
-   * Matthew Gallagher
-   * Gabriel Genellina
-   * Ben Gertzfield
-   * Nadim Ghaznavi
-   * Jonathan Giddy
-   * Matt Giuca
-   * Shelley Gooch
-   * Nathaniel Gray
-   * Grant Griffin
-   * Thomas Guettler
-   * Anders Hammarquist
-   * Mark Hammond
-   * Harald Hanche-Olsen
-   * Manus Hand
-   * Gerhard H?ring
-   * Travis B. Hartwell
-   * Tim Hatch
-   * Janko Hauser
-   * Ben Hayden
-   * Thomas Heller
-   * Bernhard Herzog
-   * Magnus L. Hetland
-   * Konrad Hinsen
-   * Stefan Hoffmeister
-   * Albert Hofkamp
-   * Gregor Hoffleit
-   * Steve Holden
-   * Thomas Holenstein
-   * Gerrit Holl
-   * Rob Hooft
-   * Brian Hooper
-   * Randall Hopper
-   * Michael Hudson
-   * Eric Huss
-   * Jeremy Hylton
-   * Roger Irwin
-   * Jack Jansen
-   * Philip H. Jensen
-   * Pedro Diaz Jimenez
-   * Kent Johnson
-   * Lucas de Jonge
-   * Andreas Jung
-   * Robert Kern
-   * Jim Kerr
-   * Jan Kim
-   * Kamil Kisiel
-   * Greg Kochanski
-   * Guido Kollerie
-   * Peter A. Koren
-   * Daniel Kozan
-   * Andrew M. Kuchling
-   * Dave Kuhlman
-   * Erno Kuusela
-   * Ross Lagerwall
-   * Thomas Lamb
-   * Detlef Lannert
-   * Piers Lauder
-   * Julia Lawall
-   * Glyph Lefkowitz
-   * Robert Lehmann
-   * Marc-Andr? Lemburg
-   * Ross Light
-   * Gediminas Liktaras
-   * Ulf A. Lindgren
-   * Everett Lipman
-   * Mirko Liss
-   * Martin von L?wis
-   * Fredrik Lundh
-   * Jeff MacDonald
-   * John Machin
-   * Andrew MacIntyre
-   * Vladimir Marangozov
-   * Vincent Marchetti
-   * Westley Mart?nez
-   * Laura Matson
-   * Daniel May
-   * Rebecca McCreary
-   * Doug Mennella
-   * Paolo Milani
-   * Skip Montanaro
-   * Paul Moore
-   * Ross Moore
-   * Sjoerd Mullender
-   * Dale Nagata
-   * Trent Nelson
-   * Michal Nowikowski
-   * Steffen Daode Nurpmeso
-   * Ng Pheng Siong
-   * Koray Oner
-   * Tomas Oppelstrup
-   * Denis S. Otkidach
-   * Zooko O'Whielacronx
-   * Shriphani Palakodety
-   * William Park
-   * Joonas Paalasmaa
-   * Harri Pasanen
-   * Bo Peng
-   * Tim Peters
-   * Benjamin Peterson
-   * Christopher Petrilli
-   * Justin D. Pettit
-   * Chris Phoenix
-   * Fran?ois Pinard
-   * Paul Prescod
-   * Eric S. Raymond
-   * Edward K. Ream
-   * Terry J. Reedy
-   * Sean Reifschneider
-   * Bernhard Reiter
-   * Armin Rigo
-   * Wes Rishel
-   * Armin Ronacher
-   * Jim Roskind
-   * Guido van Rossum
-   * Donald Wallace Rouse II
-   * Mark Russell
-   * Nick Russo
-   * Chris Ryland
-   * Constantina S.
-   * Hugh Sasse
-   * Bob Savage
-   * Scott Schram
-   * Neil Schemenauer
-   * Barry Scott
-   * Joakim Sernbrant
-   * Justin Sheehy
-   * Charlie Shepherd
-   * Yue Shuaijie
-   * SilentGhost
-   * Michael Simcich
-   * Ionel Simionescu
-   * Michael Sloan
-   * Gregory P. Smith
-   * Roy Smith
-   * Clay Spence
-   * Nicholas Spies
-   * Tage Stabell-Kulo
-   * Frank Stajano
-   * Anthony Starks
-   * Greg Stein
-   * Peter Stoehr
-   * Mark Summerfield
-   * Reuben Sumner
-   * Kalle Svensson
-   * Jim Tittsler
-   * David Turner
-   * Sandro Tosi
-   * Ville Vainio
-   * Nadeem Vawda
-   * Martijn Vries
-   * Charles G. Waldman
-   * Greg Ward
-   * Barry Warsaw
-   * Corran Webster
-   * Glyn Webster
-   * Bob Weiner
-   * Eddy Welbourne
-   * Jeff Wheeler
-   * Mats Wichmann
-   * Gerry Wiener
-   * Timothy Wild
-   * Paul Winkler
-   * Collin Winter
-   * Blake Winton
-   * Dan Wolfe
-   * Adam Woodbeck
-   * Steven Work
-   * Thomas Wouters
-   * Ka-Ping Yee
-   * Rory Yorke
-   * Moshe Zadka
-   * Milan Zamazal
-   * Cheng Zhang
diff --git a/Doc/about.rst b/Doc/about.rst
--- a/Doc/about.rst
+++ b/Doc/about.rst
@@ -29,8 +29,13 @@
 See :ref:`reporting-bugs` for information how to report bugs in this
 documentation, or Python itself.
 
-.. including the ACKS file here so that it can be maintained separately
-.. include:: ACKS.txt
+
+Contributors to the Python Documentation
+----------------------------------------
+
+Many people have contributed to the Python language, the Python standard
+library, and the Python documentation.  See :source:`Misc/ACKS` in the Python
+source distribution for a partial list of contributors.
 
 It is only with the input and contributions of the Python community
 that Python has such wonderful documentation -- Thank You!
diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
--- a/Doc/c-api/import.rst
+++ b/Doc/c-api/import.rst
@@ -76,7 +76,7 @@
    UTF-8 encoded string instead of a Unicode object.
 
    .. versionchanged:: 3.3
-         Negative values for **level** are no longer accepted.
+         Negative values for *level* are no longer accepted.
 
 .. c:function:: PyObject* PyImport_Import(PyObject *name)
 
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -1277,9 +1277,9 @@
 bit does not indicate that the slot values are non-*NULL*. The flag may be set
 to indicate the presence of a slot, but a slot may still be unfilled.) ::
 
-   PyNumberMethods   tp_as_number;
-   PySequenceMethods tp_as_sequence;
-   PyMappingMethods  tp_as_mapping;
+   PyNumberMethods   *tp_as_number;
+   PySequenceMethods *tp_as_sequence;
+   PyMappingMethods  *tp_as_mapping;
 
 If you wish your object to be able to act like a number, a sequence, or a
 mapping object, then you place the address of a structure that implements the C
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -464,13 +464,13 @@
 Why does os.path.isdir() fail on NT shared directories?
 -------------------------------------------------------
 
-The solution appears to be always append the "\\" on the end of shared
-drives.
+In order to work correctly, :func:`os.path.isdir` requires a ``"\\"`` at the
+end of the shared drive::
 
    >>> import os
-   >>> os.path.isdir( '\\\\rorschach\\public')
+   >>> os.path.isdir('\\\\rorschach\\public')
    0
-   >>> os.path.isdir( '\\\\rorschach\\public\\')
+   >>> os.path.isdir('\\\\rorschach\\public\\')
    1
 
 It helps to think of share points as being like drive letters.  Example::
@@ -480,7 +480,7 @@
    k:\media is a directory
    k:\media\ is not a directory
 
-The same rules apply if you substitute "k:" with "\\conky\foo"::
+The same rules apply if you substitute ``"k:"`` with ``"\\conky\foo"``::
 
    \\conky\foo  is not a directory
    \\conky\foo\ is a directory
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -260,7 +260,7 @@
 
    >>> import re
    >>> p = re.compile('ab*')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 :func:`re.compile` also accepts an optional *flags* argument, used to enable
@@ -372,7 +372,7 @@
 
    >>> import re
    >>> p = re.compile('[a-z]+')
-   >>> p
+   >>> p  #doctest: +ELLIPSIS
    <_sre.SRE_Pattern object at 0x...>
 
 Now, you can try matching various strings against the RE ``[a-z]+``.  An empty
@@ -390,7 +390,7 @@
 result in a variable for later use. ::
 
    >>> m = p.match('tempo')
-   >>> m
+   >>> m  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Now you can query the :class:`MatchObject` for information about the matching
@@ -429,7 +429,7 @@
 
    >>> print(p.match('::: message'))
    None
-   >>> m = p.search('::: message') ; print(m)
+   >>> m = p.search('::: message'); print(m)  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
    >>> m.group()
    'message'
@@ -458,7 +458,7 @@
 instances as an :term:`iterator`::
 
    >>> iterator = p.finditer('12 drummers drumming, 11 ... 10 ...')
-   >>> iterator
+   >>> iterator  #doctest: +ELLIPSIS
    <callable_iterator object at 0x...>
    >>> for match in iterator:
    ...     print(match.span())
@@ -480,7 +480,7 @@
 
    >>> print(re.match(r'From\s+', 'Fromage amk'))
    None
-   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')
+   >>> re.match(r'From\s+', 'From amk Thu May 14 19:12:10 1998')  #doctest: +ELLIPSIS
    <_sre.SRE_Match object at 0x...>
 
 Under the hood, these functions simply create a pattern object for you
@@ -682,7 +682,7 @@
    For example, if you wish to match the word ``From`` only at the beginning of a
    line, the RE to use is ``^From``. ::
 
-      >>> print(re.search('^From', 'From Here to Eternity'))
+      >>> print(re.search('^From', 'From Here to Eternity'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('^From', 'Reciting From Memory'))
       None
@@ -694,11 +694,11 @@
    Matches at the end of a line, which is defined as either the end of the string,
    or any location followed by a newline character.     ::
 
-      >>> print(re.search('}$', '{block}'))
+      >>> print(re.search('}$', '{block}'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(re.search('}$', '{block} '))
       None
-      >>> print(re.search('}$', '{block}\n'))
+      >>> print(re.search('}$', '{block}\n'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    To match a literal ``'$'``, use ``\$`` or enclose it inside a character class,
@@ -723,7 +723,7 @@
    match when it's contained inside another word. ::
 
       >>> p = re.compile(r'\bclass\b')
-      >>> print(p.search('no class at all'))
+      >>> print(p.search('no class at all'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
       >>> print(p.search('the declassified algorithm'))
       None
@@ -741,7 +741,7 @@
       >>> p = re.compile('\bclass\b')
       >>> print(p.search('no class at all'))
       None
-      >>> print(p.search('\b' + 'class' + '\b')  )
+      >>> print(p.search('\b' + 'class' + '\b'))  #doctest: +ELLIPSIS
       <_sre.SRE_Match object at 0x...>
 
    Second, inside a character class, where there's no use for this assertion,
@@ -1182,9 +1182,9 @@
 In the following example, the replacement function translates  decimals into
 hexadecimal::
 
-   >>> def hexrepl( match ):
+   >>> def hexrepl(match):
    ...     "Return the hex string for a decimal number"
-   ...     value = int( match.group() )
+   ...     value = int(match.group())
    ...     return hex(value)
    ...
    >>> p = re.compile(r'\d+')
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -257,13 +257,13 @@
 'REPLACEMENT CHARACTER'), or 'ignore' (just leave the character out of the
 Unicode result).  The following examples show the differences::
 
-    >>> b'\x80abc'.decode("utf-8", "strict")
+    >>> b'\x80abc'.decode("utf-8", "strict")  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    UnicodeDecodeError: 'utf8' codec can't decode byte 0x80 in position 0:
-                        unexpected code byte
+        ...
+    UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
+      invalid start byte
     >>> b'\x80abc'.decode("utf-8", "replace")
-    '?abc'
+    '\ufffdabc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 
@@ -301,11 +301,11 @@
     >>> u = chr(40960) + 'abcd' + chr(1972)
     >>> u.encode('utf-8')
     b'\xea\x80\x80abcd\xde\xb4'
-    >>> u.encode('ascii')
+    >>> u.encode('ascii')  #doctest: +NORMALIZE_WHITESPACE
     Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
+        ...
     UnicodeEncodeError: 'ascii' codec can't encode character '\ua000' in
-                        position 0: ordinal not in range(128)
+      position 0: ordinal not in range(128)
     >>> u.encode('ascii', 'ignore')
     b'abcd'
     >>> u.encode('ascii', 'replace')
@@ -331,12 +331,11 @@
 not four::
 
     >>> s = "a\xac\u1234\u20ac\U00008000"
-              ^^^^ two-digit hex escape
-                   ^^^^^ four-digit Unicode escape
-                              ^^^^^^^^^^ eight-digit Unicode escape
-    >>> for c in s:  print(ord(c), end=" ")
-    ...
-    97 172 4660 8364 32768
+    ... #     ^^^^ two-digit hex escape
+    ... #         ^^^^^^ four-digit Unicode escape
+    ... #                     ^^^^^^^^^^ eight-digit Unicode escape
+    >>> [ord(c) for c in s]
+    [97, 172, 4660, 8364, 32768]
 
 Using escape sequences for code points greater than 127 is fine in small doses,
 but becomes an annoyance if you're using many accented characters, as you would
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -130,9 +130,12 @@
 ArgumentParser objects
 ----------------------
 
-.. class:: ArgumentParser([description], [epilog], [prog], [usage], [add_help], \
-                          [argument_default], [parents], [prefix_chars], \
-                          [conflict_handler], [formatter_class])
+.. class:: ArgumentParser(prog=None, usage=None, description=None, \
+                          epilog=None, parents=[], \
+                          formatter_class=argparse.HelpFormatter, \
+                          prefix_chars='-', fromfile_prefix_chars=None, \
+                          argument_default=None, conflict_handler='error', \
+                          add_help=True)
 
    Create a new :class:`ArgumentParser` object.  Each parameter has its own more
    detailed description below, but in short they are:
@@ -920,6 +923,17 @@
    >>> parser.parse_args(''.split())
    Namespace(foo=42)
 
+If the ``default`` value is a string, the parser parses the value as if it
+were a command-line argument.  In particular, the parser applies any type_
+conversion argument, if provided, before setting the attribute on the
+:class:`Namespace` return value.  Otherwise, the parser uses the value as is::
+
+   >>> parser = argparse.ArgumentParser()
+   >>> parser.add_argument('--length', default='10', type=int)
+   >>> parser.add_argument('--width', default=10.5, type=int)
+   >>> parser.parse_args()
+   Namespace(length=10, width=10.5)
+
 For positional arguments with nargs_ equal to ``?`` or ``*``, the ``default`` value
 is used when no command-line argument was present::
 
@@ -958,6 +972,9 @@
    >>> parser.parse_args('2 temp.txt'.split())
    Namespace(bar=<_io.TextIOWrapper name='temp.txt' encoding='UTF-8'>, foo=2)
 
+See the section on the default_ keyword argument for information on when the
+``type`` argument is applied to default arguments.
+
 To ease the use of various types of files, the argparse module provides the
 factory FileType which takes the ``mode=`` and ``bufsize=`` arguments of the
 :func:`open` function.  For example, ``FileType('w')`` can be used to create a
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -1012,7 +1012,7 @@
 to the end and the sort is not maintained.
 
 It is also straight-forward to create an ordered dictionary variant
-that the remembers the order the keys were *last* inserted.
+that remembers the order the keys were *last* inserted.
 If a new entry overwrites an existing entry, the
 original insertion position is changed and moved to the end::
 
diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -1007,7 +1007,7 @@
       .. versionadded:: 3.2
 
 
-   .. method:: get(section, option, raw=False, [vars, fallback])
+   .. method:: get(section, option, *, raw=False, vars=None[, fallback])
 
       Get an *option* value for the named *section*.  If *vars* is provided, it
       must be a dictionary.  The *option* is looked up in *vars* (if provided),
@@ -1025,21 +1025,21 @@
          (especially when using the mapping protocol).
 
 
-   .. method:: getint(section, option, raw=False, [vars, fallback])
+   .. method:: getint(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to an integer.  See :meth:`get` for explanation of *raw*, *vars* and
       *fallback*.
 
 
-   .. method:: getfloat(section, option, raw=False, [vars, fallback])
+   .. method:: getfloat(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a floating point number.  See :meth:`get` for explanation of *raw*,
       *vars* and *fallback*.
 
 
-   .. method:: getboolean(section, option, raw=False, [vars, fallback])
+   .. method:: getboolean(section, option, *, raw=False, vars=None[, fallback])
 
       A convenience method which coerces the *option* in the specified *section*
       to a Boolean value.  Note that the accepted values for the option are
@@ -1051,7 +1051,8 @@
       *fallback*.
 
 
-   .. method:: items([section], raw=False, vars=None)
+   .. method:: items(raw=False, vars=None)
+               items(section, raw=False, vars=None)
 
       When *section* is not given, return a list of *section_name*,
       *section_proxy* pairs, including DEFAULTSECT.
@@ -1149,7 +1150,13 @@
 RawConfigParser Objects
 -----------------------
 
-.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, allow_no_value=False, delimiters=('=', ':'), comment_prefixes=('#', ';'), inline_comment_prefixes=None, strict=True, empty_lines_in_values=True, default_section=configaparser.DEFAULTSECT, interpolation=None)
+.. class:: RawConfigParser(defaults=None, dict_type=collections.OrderedDict, \
+                           allow_no_value=False, *, delimiters=('=', ':'), \
+                           comment_prefixes=('#', ';'), \
+                           inline_comment_prefixes=None, strict=True, \
+                           empty_lines_in_values=True, \
+                           default_section=configparser.DEFAULTSECT[, \
+                           interpolation])
 
    Legacy variant of the :class:`ConfigParser` with interpolation disabled
    by default and unsafe ``add_section`` and ``set`` methods.
diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -121,11 +121,14 @@
 Examples
 --------
 
-A simple example illustrating typical use::
+A simple example illustrating typical use (a constant-time comparison
+operation is needed to limit exposure to timing attacks.
+:func:`hmac.compare_digest` is suitable for this purpose)::
 
    import pwd
    import crypt
    import getpass
+   from hmac import compare_digest as compare_hash
 
    def login():
        username = input('Python login: ')
@@ -134,7 +137,7 @@
            if cryptedpasswd == 'x' or cryptedpasswd == '*':
                raise ValueError('no support for shadow passwords')
            cleartext = getpass.getpass()
-           return crypt.crypt(cleartext, cryptedpasswd) == cryptedpasswd
+           return compare_hash(crypt.crypt(cleartext, cryptedpasswd), cryptedpasswd)
        else:
            return True
 
@@ -142,7 +145,8 @@
 check it against the original::
 
    import crypt
+   from hmac import compare_digest as compare_hash
 
    hashed = crypt.crypt(plaintext)
-   if hashed != crypt.crypt(plaintext, hashed):
+   if not compare_hash(hashed, crypt.crypt(plaintext, hashed)):
       raise ValueError("hashed version doesn't validate against original")
diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst
--- a/Doc/library/crypto.rst
+++ b/Doc/library/crypto.rst
@@ -8,6 +8,7 @@
 
 The modules described in this chapter implement various algorithms of a
 cryptographic nature.  They are available at the discretion of the installation.
+On Unix systems, the :mod:`crypt` module may also be available.
 Here's an overview:
 
 
diff --git a/Doc/library/csv.rst b/Doc/library/csv.rst
--- a/Doc/library/csv.rst
+++ b/Doc/library/csv.rst
@@ -71,9 +71,10 @@
    A short usage example::
 
       >>> import csv
-      >>> spamReader = csv.reader(open('eggs.csv', newline=''), delimiter=' ', quotechar='|')
-      >>> for row in spamReader:
-      ...     print(', '.join(row))
+      >>> with open('eggs.csv', newline='') as csvfile:
+      ...     spamreader = csv.reader(csvfile, delimiter=' ', quotechar='|')
+      ...     for row in spamreader:
+      ...         print(', '.join(row))
       Spam, Spam, Spam, Spam, Spam, Baked Beans
       Spam, Lovely Spam, Wonderful Spam
 
@@ -99,11 +100,12 @@
 
    A short usage example::
 
-      >>> import csv
-      >>> spamWriter = csv.writer(open('eggs.csv', 'w', newline=''), delimiter=' ',
-      ...                         quotechar='|', quoting=csv.QUOTE_MINIMAL)
-      >>> spamWriter.writerow(['Spam'] * 5 + ['Baked Beans'])
-      >>> spamWriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
+      import csv
+      with open('eggs.csv', 'w', newline='') as csvfile:
+          spamwriter = csv.writer(csvfile, delimiter=' ',
+                                  quotechar='|', quoting=csv.QUOTE_MINIMAL)
+          spamwriter.writerow(['Spam'] * 5 + ['Baked Beans'])
+          spamwriter.writerow(['Spam', 'Lovely Spam', 'Wonderful Spam'])
 
 
 .. function:: register_dialect(name[, dialect], **fmtparams)
@@ -221,11 +223,11 @@
 
 An example for :class:`Sniffer` use::
 
-   csvfile = open("example.csv")
-   dialect = csv.Sniffer().sniff(csvfile.read(1024))
-   csvfile.seek(0)
-   reader = csv.reader(csvfile, dialect)
-   # ... process CSV file contents here ...
+   with open('example.csv') as csvfile:
+       dialect = csv.Sniffer().sniff(csvfile.read(1024))
+       csvfile.seek(0)
+       reader = csv.reader(csvfile, dialect)
+       # ... process CSV file contents here ...
 
 
 The :mod:`csv` module defines the following constants:
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -377,7 +377,8 @@
    is to be displayed.
 
 
-.. function:: newwin([nlines, ncols,] begin_y, begin_x)
+.. function:: newwin(begin_y, begin_x)
+              newwin(nlines, ncols, begin_y, begin_x)
 
    Return a new window, whose left-upper corner is at  ``(begin_y, begin_x)``, and
    whose height/width is  *nlines*/*ncols*.
@@ -656,7 +657,8 @@
 the following methods and attributes:
 
 
-.. method:: window.addch([y, x,] ch[, attr])
+.. method:: window.addch(ch[, attr])
+            window.addch(y, x, ch[, attr])
 
    .. note::
 
@@ -670,13 +672,15 @@
    position and attributes are the current settings for the window object.
 
 
-.. method:: window.addnstr([y, x,] str, n[, attr])
+.. method:: window.addnstr(str, n[, attr])
+            window.addnstr(y, x, str, n[, attr])
 
    Paint at most *n* characters of the  string *str* at ``(y, x)`` with attributes
    *attr*, overwriting anything previously on the display.
 
 
-.. method:: window.addstr([y, x,] str[, attr])
+.. method:: window.addstr(str[, attr])
+            window.addstr(y, x, str[, attr])
 
    Paint the string *str* at ``(y, x)`` with attributes *attr*, overwriting
    anything previously on the display.
@@ -763,7 +767,10 @@
    *bs* are *horch*.  The default corner characters are always used by this function.
 
 
-.. method:: window.chgat([y, x, ] [num,] attr)
+.. method:: window.chgat(attr)
+            window.chgat(num, attr)
+            window.chgat(y, x, attr)
+            window.chgat(y, x, num, attr)
 
    Set the attributes of *num* characters at the current cursor position, or at
    position ``(y, x)`` if supplied. If no value of *num* is given or *num* = -1,
@@ -812,7 +819,8 @@
    Delete the line under the cursor. All following lines are moved up by one line.
 
 
-.. method:: window.derwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.derwin(begin_y, begin_x)
+            window.derwin(nlines, ncols, begin_y, begin_x)
 
    An abbreviation for "derive window", :meth:`derwin` is the same as calling
    :meth:`subwin`, except that *begin_y* and *begin_x* are relative to the origin
@@ -837,7 +845,7 @@
 .. attribute:: window.encoding
 
    Encoding used to encode method arguments (Unicode strings and characters).
-   The encoding attribute is inherited from by parent window when a subwindow
+   The encoding attribute is inherited from the parent window when a subwindow
    is created, for example with :meth:`window.subwin`. By default, the locale
    encoding is used (see :func:`locale.getpreferredencoding`).
 
@@ -906,7 +914,8 @@
    upper-left corner.
 
 
-.. method:: window.hline([y, x,] ch, n)
+.. method:: window.hline(ch, n)
+            window.hline(y, x, ch, n)
 
    Display a horizontal line starting at ``(y, x)`` with length *n* consisting of
    the character *ch*.
@@ -940,7 +949,8 @@
    the character proper, and upper bits are the attributes.
 
 
-.. method:: window.insch([y, x,] ch[, attr])
+.. method:: window.insch(ch[, attr])
+            window.insch(y, x, ch[, attr])
 
    Paint character *ch* at ``(y, x)`` with attributes *attr*, moving the line from
    position *x* right by one character.
@@ -961,7 +971,8 @@
    line.
 
 
-.. method:: window.insnstr([y, x,] str, n [, attr])
+.. method:: window.insnstr(str, n[, attr])
+            window.insnstr(y, x, str, n[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor, up to *n* characters.   If *n* is zero or
@@ -970,7 +981,8 @@
    The cursor position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.insstr([y, x, ] str [, attr])
+.. method:: window.insstr(str[, attr])
+            window.insstr(y, x, str[, attr])
 
    Insert a character string (as many characters as will fit on the line) before
    the character under the cursor.  All characters to the right of the cursor are
@@ -978,7 +990,8 @@
    position does not change (after moving to *y*, *x*, if specified).
 
 
-.. method:: window.instr([y, x] [, n])
+.. method:: window.instr([n])
+            window.instr(y, x[, n])
 
    Return a string of characters, extracted from the window starting at the
    current cursor position, or at *y*, *x* if specified. Attributes are stripped
@@ -1153,13 +1166,15 @@
    Turn on attribute *A_STANDOUT*.
 
 
-.. method:: window.subpad([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subpad(begin_y, begin_x)
+            window.subpad(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
 
 
-.. method:: window.subwin([nlines, ncols,] begin_y, begin_x)
+.. method:: window.subwin(begin_y, begin_x)
+            window.subwin(nlines, ncols, begin_y, begin_x)
 
    Return a sub-window, whose upper-left corner is at ``(begin_y, begin_x)``, and
    whose width/height is *ncols*/*nlines*.
@@ -1216,7 +1231,8 @@
    :meth:`refresh`.
 
 
-.. method:: window.vline([y, x,] ch, n)
+.. method:: window.vline(ch, n)
+            window.vline(y, x, ch, n)
 
    Display a vertical line starting at ``(y, x)`` with length *n* consisting of the
    character *ch*.
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -338,7 +338,7 @@
      Backslashes in a raw docstring: m\n
 
   Otherwise, the backslash will be interpreted as part of the string. For example,
-  the "\\" above would be interpreted as a newline character.  Alternatively, you
+  the ``\n`` above would be interpreted as a newline character.  Alternatively, you
   can double each backslash in the doctest version (and not use a raw string)::
 
      >>> def f(x):
@@ -1024,6 +1024,16 @@
 
    This function uses the same search technique as :func:`testmod`.
 
+   .. note::
+      Unlike :func:`testmod` and :class:`DocTestFinder`, this function raises
+      a :exc:`ValueError` if *module* contains no docstrings.  You can prevent
+      this error by passing a :class:`DocTestFinder` instance as the
+      *test_finder* argument with its *exclude_empty* keyword argument set
+      to ``False``::
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite(test_finder=finder)
+
 
 Under the covers, :func:`DocTestSuite` creates a :class:`unittest.TestSuite` out
 of :class:`doctest.DocTestCase` instances, and :class:`DocTestCase` is a
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -629,14 +629,19 @@
    to provide elaborate line editing and history features.
 
 
-.. function:: int([number | string[, base]])
+.. function:: int(x=0)
+              int(x, base=10)
 
-   Convert a number or string to an integer.  If no arguments are given, return
-   ``0``.  If a number is given, return ``number.__int__()``.  Conversion of
-   floating point numbers to integers truncates towards zero.  A string must be
-   a base-radix integer literal optionally preceded by '+' or '-' (with no space
-   in between) and optionally surrounded by whitespace.  A base-n literal
-   consists of the digits 0 to n-1, with 'a' to 'z' (or 'A' to 'Z') having
+   Convert a number or string *x* to an integer, or return ``0`` if no
+   arguments are given.  If *x* is a number, return :meth:`x.__int__()
+   <object.__int__>`.  For floating point numbers, this truncates towards zero.
+
+   If *x* is not a number or if *base* is given, then *x* must be a string,
+   :class:`bytes`, or :class:`bytearray` instance representing an :ref:`integer
+   literal <integers>` in radix *base*.  Optionally, the literal can be
+   preceded by ``+`` or ``-`` (with no space in between) and surrounded by
+   whitespace.  A base-n literal consists of the digits 0 to n-1, with ``a``
+   to ``z`` (or ``A`` to ``Z``) having
    values 10 to 35.  The default *base* is 10. The allowed values are 0 and 2-36.
    Base-2, -8, and -16 literals can be optionally prefixed with ``0b``/``0B``,
    ``0o``/``0O``, or ``0x``/``0X``, as with integer literals in code.  Base 0
@@ -725,11 +730,16 @@
    already arranged into argument tuples, see :func:`itertools.starmap`\.
 
 
-.. function:: max(iterable[, args...], *[, key])
+.. function:: max(iterable, *[, key])
+              max(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the largest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the largest of the arguments.
+   Return the largest item in an iterable or the largest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The largest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the largest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -748,11 +758,16 @@
    :ref:`typememoryview` for more information.
 
 
-.. function:: min(iterable[, args...], *[, key])
+.. function:: min(iterable, *[, key])
+              min(arg1, arg2, *args[, key])
 
-   With a single argument *iterable*, return the smallest item of a non-empty
-   iterable (such as a string, tuple or list).  With more than one argument, return
-   the smallest of the arguments.
+   Return the smallest item in an iterable or the smallest of two or more
+   arguments.
+
+   If one positional argument is provided, *iterable* must be a non-empty
+   iterable (such as a non-empty string, tuple or list).  The smallest item
+   in the iterable is returned.  If two or more positional arguments are
+   provided, the smallest of the positional arguments is returned.
 
    The optional keyword-only *key* argument specifies a one-argument ordering
    function like that used for :meth:`list.sort`.
@@ -970,16 +985,16 @@
    must be of integer types, and *y* must be non-negative.
 
 
-.. function:: print([object, ...], *, sep=' ', end='\\n', file=sys.stdout, flush=False)
+.. function:: print(*objects, sep=' ', end='\\n', file=sys.stdout, flush=False)
 
-   Print *object*\(s) to the stream *file*, separated by *sep* and followed by
+   Print *objects* to the stream *file*, separated by *sep* and followed by
    *end*.  *sep*, *end* and *file*, if present, must be given as keyword
    arguments.
 
    All non-keyword arguments are converted to strings like :func:`str` does and
    written to the stream, separated by *sep* and followed by *end*.  Both *sep*
    and *end* must be strings; they can also be ``None``, which means to use the
-   default values.  If no *object* is given, :func:`print` will just write
+   default values.  If no *objects* are given, :func:`print` will just write
    *end*.
 
    The *file* argument must be an object with a ``write(string)`` method; if it
@@ -1061,7 +1076,8 @@
 
 
 .. _func-range:
-.. function:: range([start,] stop[, step])
+.. function:: range(stop)
+              range(start, stop[, step])
    :noindex:
 
    Rather than being a function, :class:`range` is actually an immutable
@@ -1087,18 +1103,18 @@
    arguments starting at ``0``).
 
 
-.. function:: round(x[, n])
+.. function:: round(number[, ndigits])
 
-   Return the floating point value *x* rounded to *n* digits after the decimal
-   point.  If *n* is omitted, it defaults to zero.  Delegates to
-   ``x.__round__(n)``.
+   Return the floating point value *number* rounded to *ndigits* digits after
+   the decimal point.  If *ndigits* is omitted, it defaults to zero. Delegates
+   to ``number.__round__(ndigits)``.
 
    For the built-in types supporting :func:`round`, values are rounded to the
-   closest multiple of 10 to the power minus *n*; if two multiples are equally
-   close, rounding is done toward the even choice (so, for example, both
-   ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is ``2``).
-   The return value is an integer if called with one argument, otherwise of the
-   same type as *x*.
+   closest multiple of 10 to the power minus *ndigits*; if two multiples are
+   equally close, rounding is done toward the even choice (so, for example,
+   both ``round(0.5)`` and ``round(-0.5)`` are ``0``, and ``round(1.5)`` is
+   ``2``).  The return value is an integer if called with one argument,
+   otherwise of the same type as *number*.
 
    .. note::
 
@@ -1126,7 +1142,8 @@
    ``x.foobar = 123``.
 
 
-.. function:: slice([start,] stop[, step])
+.. function:: slice(stop)
+              slice(start, stop[, step])
 
    .. index:: single: Numerical Python
 
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -27,7 +27,8 @@
 The module provides the following classes:
 
 
-.. class:: HTTPConnection(host, port=None[, strict[, timeout[, source_address]]])
+.. class:: HTTPConnection(host, port=None[, strict][, timeout], \
+                          source_address=None)
 
    An :class:`HTTPConnection` instance represents one transaction with an HTTP
    server.  It should be instantiated passing it a host and optional port
@@ -55,7 +56,10 @@
       are not supported anymore.
 
 
-.. class:: HTTPSConnection(host, port=None, key_file=None, cert_file=None[, strict[, timeout[, source_address]]], *, context=None, check_hostname=None)
+.. class:: HTTPSConnection(host, port=None, key_file=None, \
+                           cert_file=None[, strict][, timeout], \
+                           source_address=None, *, context=None, \
+                           check_hostname=None)
 
    A subclass of :class:`HTTPConnection` that uses SSL for communication with
    secure servers.  Default port is ``443``.  If *context* is specified, it
diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -471,7 +471,7 @@
       Returns :class:`BoundArguments`, or raises a :exc:`TypeError` if the
       passed arguments do not match the signature.
 
-   .. method:: Signature.replace([parameters], *, [return_annotation])
+   .. method:: Signature.replace(*[, parameters][, return_annotation])
 
       Create a new Signature instance based on the instance replace was invoked
       on.  It is possible to pass different ``parameters`` and/or
@@ -565,7 +565,7 @@
          ...         print('Parameter:', param)
          Parameter: c
 
-   .. method:: Parameter.replace(*, [name], [kind], [default], [annotation])
+   .. method:: Parameter.replace(*[, name][, kind][, default][, annotation])
 
       Create a new Parameter instance based on the instance replaced was invoked
       on.  To override a :class:`Parameter` attribute, pass the corresponding
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -401,7 +401,8 @@
                   self.currkey = self.keyfunc(self.currvalue)
 
 
-.. function:: islice(iterable, [start,] stop [, step])
+.. function:: islice(iterable, stop)
+              islice(iterable, start, stop[, step])
 
    Make an iterator that returns selected elements from the iterable. If *start* is
    non-zero, then elements from the iterable are skipped until start is reached.
diff --git a/Doc/library/json.rst b/Doc/library/json.rst
--- a/Doc/library/json.rst
+++ b/Doc/library/json.rst
@@ -146,9 +146,12 @@
    object members will be pretty-printed with that indent level.  An indent level
    of 0, negative, or ``""`` will only insert newlines.  ``None`` (the default)
    selects the most compact representation. Using a positive integer indent
-   indents that many spaces per level.  If *indent* is a string (such at '\t'),
+   indents that many spaces per level.  If *indent* is a string (such as ``"\t"``),
    that string is used to indent each level.
 
+   .. versionchanged:: 3.2
+      Allow strings for *indent* in addition to integers.
+
    If *separators* is an ``(item_separator, dict_separator)`` tuple, then it
    will be used instead of the default ``(', ', ': ')`` separators.  ``(',',
    ':')`` is the most compact JSON representation.
@@ -371,10 +374,15 @@
    will be sorted by key; this is useful for regression tests to ensure that
    JSON serializations can be compared on a day-to-day basis.
 
-   If *indent* is a non-negative integer (it is ``None`` by default), then JSON
-   array elements and object members will be pretty-printed with that indent
-   level.  An indent level of 0 will only insert newlines.  ``None`` is the most
-   compact representation.
+   If *indent* is a non-negative integer or string, then JSON array elements and
+   object members will be pretty-printed with that indent level.  An indent level
+   of 0, negative, or ``""`` will only insert newlines.  ``None`` (the default)
+   selects the most compact representation. Using a positive integer indent
+   indents that many spaces per level.  If *indent* is a string (such as ``"\t"``),
+   that string is used to indent each level.
+
+   .. versionchanged:: 3.2
+      Allow strings for *indent* in addition to integers.
 
    If specified, *separators* should be an ``(item_separator, key_separator)``
    tuple.  The default is ``(', ', ': ')``.  To get the most compact JSON
diff --git a/Doc/library/lzma.rst b/Doc/library/lzma.rst
--- a/Doc/library/lzma.rst
+++ b/Doc/library/lzma.rst
@@ -335,15 +335,15 @@
 Reading in a compressed file::
 
    import lzma
-   with lzma.LZMAFile("file.xz") as f:
-      file_content = f.read()
+   with lzma.open("file.xz") as f:
+       file_content = f.read()
 
 Creating a compressed file::
 
    import lzma
    data = b"Insert Data Here"
-   with lzma.LZMAFile("file.xz", "w") as f:
-      f.write(data)
+   with lzma.open("file.xz", "w") as f:
+       f.write(data)
 
 Compressing data in memory::
 
@@ -367,7 +367,7 @@
    import lzma
    with open("file.xz", "wb") as f:
        f.write(b"This data will not be compressed\n")
-       with lzma.LZMAFile(f, "w") as lzf:
+       with lzma.open(f, "w") as lzf:
            lzf.write(b"This *will* be compressed\n")
        f.write(b"Not compressed\n")
 
@@ -378,5 +378,5 @@
        {"id": lzma.FILTER_DELTA, "dist": 5},
        {"id": lzma.FILTER_LZMA2, "preset": 7 | lzma.PRESET_EXTREME},
    ]
-   with lzma.LZMAFile("file.xz", "w", filters=my_filters) as f:
+   with lzma.open("file.xz", "w", filters=my_filters) as f:
        f.write(b"blah blah blah")
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -10,9 +10,9 @@
 This module defines two classes, :class:`Mailbox` and :class:`Message`, for
 accessing and manipulating on-disk mailboxes and the messages they contain.
 :class:`Mailbox` offers a dictionary-like mapping from keys to messages.
-:class:`Message` extends the :mod:`email.Message` module's :class:`Message`
-class with format-specific state and behavior. Supported mailbox formats are
-Maildir, mbox, MH, Babyl, and MMDF.
+:class:`Message` extends the :mod:`email.message` module's
+:class:`~email.message.Message` class with format-specific state and behavior.
+Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
 
 
 .. seealso::
@@ -81,7 +81,7 @@
       it.
 
       Parameter *message* may be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, a byte string, or a
+      :class:`email.message.Message` instance, a string, a byte string, or a
       file-like object (which should be open in binary mode). If *message* is
       an instance of the
       appropriate format-specific :class:`Message` subclass (e.g., if it's an
@@ -112,7 +112,7 @@
       :exc:`KeyError` exception if no message already corresponds to *key*.
 
       As with :meth:`add`, parameter *message* may be a :class:`Message`
-      instance, an :class:`email.Message.Message` instance, a string, a byte
+      instance, an :class:`email.message.Message` instance, a string, a byte
       string, or a file-like object (which should be open in binary mode). If
       *message* is an
       instance of the appropriate format-specific :class:`Message` subclass
@@ -757,11 +757,12 @@
 
 .. class:: Message(message=None)
 
-   A subclass of the :mod:`email.Message` module's :class:`Message`. Subclasses of
-   :class:`mailbox.Message` add mailbox-format-specific state and behavior.
+   A subclass of the :mod:`email.message` module's
+   :class:`~email.message.Message`. Subclasses of :class:`mailbox.Message` add
+   mailbox-format-specific state and behavior.
 
    If *message* is omitted, the new instance is created in a default, empty state.
-   If *message* is an :class:`email.Message.Message` instance, its contents are
+   If *message* is an :class:`email.message.Message` instance, its contents are
    copied; furthermore, any format-specific information is converted insofar as
    possible if *message* is a :class:`Message` instance. If *message* is a string,
    a byte string,
@@ -1267,7 +1268,7 @@
 
       Set the message's visible headers to be the same as the headers in
       *message*.  Parameter *visible* should be a :class:`Message` instance, an
-      :class:`email.Message.Message` instance, a string, or a file-like object
+      :class:`email.message.Message` instance, a string, or a file-like object
       (which should be open in text mode).
 
 
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -295,7 +295,8 @@
 :class:`Process` and exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. class:: Process([group[, target[, name[, args[, kwargs]]]]], *, daemon=None)
+.. class:: Process(group=None, target=None, name=None, args=(), kwargs={}, \
+                   *, daemon=None)
 
    Process objects represent activity that is run in a separate process. The
    :class:`Process` class has equivalents of all the methods of
@@ -1147,7 +1148,7 @@
 
        n = Value('i', 7)
        x = Value(c_double, 1.0/3.0, lock=False)
-       s = Array('c', 'hello world', lock=lock)
+       s = Array('c', b'hello world', lock=lock)
        A = Array(Point, [(1.875,-6.25), (-5.75,2.0), (2.375,9.5)], lock=lock)
 
        p = Process(target=modify, args=(n, x, s, A))
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -487,10 +487,10 @@
 them have been superseded by newer commands in :rfc:`3977`.
 
 
-.. method:: NNTP.xhdr(header, string, *, file=None)
+.. method:: NNTP.xhdr(hdr, str, *, file=None)
 
-   Send an ``XHDR`` command.  The *header* argument is a header keyword, e.g.
-   ``'subject'``.  The *string* argument should have the form ``'first-last'``
+   Send an ``XHDR`` command.  The *hdr* argument is a header keyword, e.g.
+   ``'subject'``.  The *str* argument should have the form ``'first-last'``
    where *first* and *last* are the first and last article numbers to search.
    Return a pair ``(response, list)``, where *list* is a list of pairs ``(id,
    text)``, where *id* is an article number (as a string) and *text* is the text of
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -273,7 +273,8 @@
 strings as you like (including zero), as long as there is at least one option
 string overall.
 
-The option strings passed to :meth:`add_option` are effectively labels for the
+The option strings passed to :meth:`OptionParser.add_option` are effectively
+labels for the
 option defined by that call.  For brevity, we will frequently refer to
 *encountering an option* on the command line; in reality, :mod:`optparse`
 encounters *option strings* and looks up options from them.
@@ -892,7 +893,8 @@
 The canonical way to create an :class:`Option` instance is with the
 :meth:`add_option` method of :class:`OptionParser`.
 
-.. method:: OptionParser.add_option(opt_str[, ...], attr=value, ...)
+.. method:: OptionParser.add_option(option)
+            OptionParser.add_option(*opt_str, attr=value, ...)
 
    To define an option with only a short option string::
 
@@ -1165,6 +1167,17 @@
 
      options.tracks.append(int("4"))
 
+  The ``append`` action calls the ``append`` method on the current value of the
+  option.  This means that any default value specified must have an ``append``
+  method.  It also means that if the default value is non-empty, the default
+  elements will be present in the parsed value for the option, with any values
+  from the command line appended after those default values::
+
+     >>> parser.add_option("--files", action="append", default=['~/.mypkg/defaults'])
+     >>> opts, args = parser.parse_args(['--files', 'overrides.mypkg'])
+     >>> opts.files
+     ['~/.mypkg/defaults', 'overrides.mypkg']
+
 * ``"append_const"`` [required: :attr:`~Option.const`; relevant:
   :attr:`~Option.dest`]
 
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1855,9 +1855,8 @@
    :attr:`st_mtime`, :attr:`st_ctime`. More items may be added at the end by
    some implementations.
 
-   This function can support :ref:`specifying a file descriptor
-   <path_fd>`, :ref:`specifying a file descriptor <path_fd>` and :ref:`not
-   following symlinks <follow_symlinks>`.
+   This function can support :ref:`specifying a file descriptor <path_fd>` and
+   :ref:`not following symlinks <follow_symlinks>`.
 
    .. index:: module: stat
 
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -67,7 +67,8 @@
    ``ossaudiodev.error``.)
 
 
-.. function:: open([device, ]mode)
+.. function:: open(mode)
+              open(device, mode)
 
    Open an audio device and return an OSS audio device object.  This object
    supports many file-like methods, such as :meth:`read`, :meth:`write`, and
diff --git a/Doc/library/pyexpat.rst b/Doc/library/pyexpat.rst
--- a/Doc/library/pyexpat.rst
+++ b/Doc/library/pyexpat.rst
@@ -402,7 +402,7 @@
 .. method:: xmlparser.CommentHandler(data)
 
    Called for comments.  *data* is the text of the comment, excluding the leading
-   '``<!-``\ ``-``' and trailing '``-``\ ``->``'.
+   ``'<!-``\ ``-'`` and trailing ``'-``\ ``->'``.
 
 
 .. method:: xmlparser.StartCdataSectionHandler()
diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -52,20 +52,20 @@
 
 Bookkeeping functions:
 
-.. function:: seed([x], version=2)
+.. function:: seed(a=None, version=2)
 
    Initialize the random number generator.
 
-   If *x* is omitted or ``None``, the current system time is used.  If
+   If *a* is omitted or ``None``, the current system time is used.  If
    randomness sources are provided by the operating system, they are used
    instead of the system time (see the :func:`os.urandom` function for details
    on availability).
 
-   If *x* is an int, it is used directly.
+   If *a* is an int, it is used directly.
 
    With version 2 (the default), a :class:`str`, :class:`bytes`, or :class:`bytearray`
    object gets converted to an :class:`int` and all of its bits are used.  With version 1,
-   the :func:`hash` of *x* is used instead.
+   the :func:`hash` of *a* is used instead.
 
    .. versionchanged:: 3.2
       Moved to the version 2 scheme which uses all of the bits in a string seed.
@@ -93,7 +93,8 @@
 
 Functions for integers:
 
-.. function:: randrange([start,] stop[, step])
+.. function:: randrange(stop)
+              randrange(start, stop[, step])
 
    Return a randomly selected element from ``range(start, stop, step)``.  This is
    equivalent to ``choice(range(start, stop, step))``, but doesn't actually build a
diff --git a/Doc/library/site.rst b/Doc/library/site.rst
--- a/Doc/library/site.rst
+++ b/Doc/library/site.rst
@@ -33,7 +33,7 @@
 For the head part, it uses ``sys.prefix`` and ``sys.exec_prefix``; empty heads
 are skipped.  For the tail part, it uses the empty string and then
 :file:`lib/site-packages` (on Windows) or
-:file:`lib/python|version|/site-packages` and then :file:`lib/site-python` (on
+:file:`lib/python{X.Y}/site-packages` and then :file:`lib/site-python` (on
 Unix and Macintosh).  For each of the distinct head-tail combinations, it sees
 if it refers to an existing directory, and if so, adds it to ``sys.path`` and
 also inspects the newly added path for configuration files.
diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -111,12 +111,13 @@
    .. attribute:: addr
 
       Holds the address of the client, the second value returned by
-      socket.accept()
+      :func:`socket.accept <socket.socket.accept>`
 
    .. attribute:: received_lines
 
       Holds a list of the line strings (decoded using UTF-8) received from
-      the client. The lines have their "\\r\\n" line ending translated to "\\n".
+      the client. The lines have their ``"\r\n"`` line ending translated to
+      ``"\n"``.
 
    .. attribute:: smtp_state
 
@@ -141,12 +142,12 @@
    .. attribute:: received_data
 
       Holds a string containing all of the data sent by the client during the
-      DATA state, up to but not including the terminating "\r\n.\r\n".
+      DATA state, up to but not including the terminating ``"\r\n.\r\n"``.
 
    .. attribute:: fqdn
 
       Holds the fully-qualified domain name of the server as returned by
-      ``socket.getfqdn()``.
+      :func:`socket.getfqdn`.
 
    .. attribute:: peer
 
@@ -170,14 +171,14 @@
    MAIL     Accepts the "MAIL FROM:" syntax and stores the supplied address as
             :attr:`mailfrom`.  In extended command mode, accepts the
             :rfc:`1870` SIZE attribute and responds appropriately based on the
-            value of ``data_size_limit``.
+            value of *data_size_limit*.
    RCPT     Accepts the "RCPT TO:" syntax and stores the supplied addresses in
             the :attr:`rcpttos` list.
    RSET     Resets the :attr:`mailfrom`, :attr:`rcpttos`, and
             :attr:`received_data`, but not the greeting.
    DATA     Sets the internal state to :attr:`DATA` and stores remaining lines
             from the client in :attr:`received_data` until the terminator
-            "\r\n.\r\n" is received.
+            ``"\r\n.\r\n"`` is received.
    HELP     Returns minimal information on command syntax
    VRFY     Returns code 252 (the server doesn't know if the address is valid)
    EXPN     Reports that the command is not implemented.
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -1005,7 +1005,8 @@
    much data, if any, was successfully sent.
 
 
-.. method:: socket.sendto(bytes[, flags], address)
+.. method:: socket.sendto(bytes, address)
+            socket.sendto(bytes, flags, address)
 
    Send data to the socket.  The socket should not be connected to a remote socket,
    since the destination socket is specified by *address*.  The optional *flags*
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1235,7 +1235,8 @@
 commonly used for looping a specific number of times in :keyword:`for`
 loops.
 
-.. class:: range([start, ]stop[, step])
+.. class:: range(stop)
+           range(start, stop[, step])
 
    The arguments to the range constructor must be integers (either built-in
    :class:`int` or any object that implements the ``__index__`` special
@@ -2687,13 +2688,19 @@
    .. attribute:: shape
 
       A tuple of integers the length of :attr:`ndim` giving the shape of the
-      memory as a N-dimensional array.
+      memory as an N-dimensional array.
+
+      .. versionchanged:: 3.3
+         An empty tuple instead of None when ndim = 0.
 
    .. attribute:: strides
 
       A tuple of integers the length of :attr:`ndim` giving the size in bytes to
       access each element for each dimension of the array.
 
+      .. versionchanged:: 3.3
+         An empty tuple instead of None when ndim = 0.
+
    .. attribute:: suboffsets
 
       Used internally for PIL-style arrays. The value is informational only.
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -307,10 +307,14 @@
       :meth:`Popen.communicate` method.
 
    If *shell* is ``True``, the specified command will be executed through
-   the shell. This can be useful if you are using Python primarily for the
+   the shell.  This can be useful if you are using Python primarily for the
    enhanced control flow it offers over most system shells and still want
-   access to other shell features such as filename wildcards, shell pipes and
-   environment variable expansion.
+   convenient access to other shell features such as shell pipes, filename
+   wildcards, environment variable expansion, and expansion of ``~`` to a
+   user's home directory.  However, note that Python itself offers
+   implementations of many shell-like features (in particular, :mod:`glob`,
+   :mod:`fnmatch`, :func:`os.walk`, :func:`os.path.expandvars`,
+   :func:`os.path.expanduser`, and :mod:`shutil`).
 
    .. versionchanged:: 3.3
       When *universal_newlines* is ``True``, the class uses the encoding
@@ -669,8 +673,8 @@
 
 .. warning::
 
-   Use :meth:`communicate` rather than :attr:`.stdin.write <stdin>`,
-   :attr:`.stdout.read <stdout>` or :attr:`.stderr.read <stderr>` to avoid
+   Use :meth:`~Popen.communicate` rather than :attr:`.stdin.write <Popen.stdin>`,
+   :attr:`.stdout.read <Popen.stdout>` or :attr:`.stderr.read <Popen.stderr>` to avoid
    deadlocks due to any of the other OS pipe buffers filling up and blocking the
    child process.
 
diff --git a/Doc/library/syslog.rst b/Doc/library/syslog.rst
--- a/Doc/library/syslog.rst
+++ b/Doc/library/syslog.rst
@@ -17,7 +17,8 @@
 The module defines the following functions:
 
 
-.. function:: syslog([priority,] message)
+.. function:: syslog(message)
+              syslog(priority, message)
 
    Send the string *message* to the system logger.  A trailing newline is added
    if necessary.  Each message is tagged with a priority composed of a
diff --git a/Doc/library/textwrap.rst b/Doc/library/textwrap.rst
--- a/Doc/library/textwrap.rst
+++ b/Doc/library/textwrap.rst
@@ -25,6 +25,9 @@
    Optional keyword arguments correspond to the instance attributes of
    :class:`TextWrapper`, documented below.  *width* defaults to ``70``.
 
+   See the :meth:`TextWrapper.wrap` method for additional details on how
+   :func:`wrap` behaves.
+
 
 .. function:: fill(text, width=70, **kwargs)
 
@@ -167,15 +170,18 @@
 
    .. attribute:: drop_whitespace
 
-      (default: ``True``) If true, whitespace that, after wrapping, happens to
-      end up at the beginning or end of a line is dropped (leading whitespace in
-      the first line is always preserved, though).
+      (default: ``True``) If true, whitespace at the beginning and ending of
+      every line (after wrapping but before indenting) is dropped.
+      Whitespace at the beginning of the paragraph, however, is not dropped
+      if non-whitespace follows it.  If whitespace being dropped takes up an
+      entire line, the whole line is dropped.
 
 
    .. attribute:: initial_indent
 
       (default: ``''``) String that will be prepended to the first line of
-      wrapped output.  Counts towards the length of the first line.
+      wrapped output.  Counts towards the length of the first line.  The empty
+      string is not indented.
 
 
    .. attribute:: subsequent_indent
@@ -236,8 +242,9 @@
 
       Wraps the single paragraph in *text* (a string) so every line is at most
       :attr:`width` characters long.  All wrapping options are taken from
-      instance attributes of the :class:`TextWrapper` instance. Returns a list
-      of output lines, without final newlines.
+      instance attributes of the :class:`TextWrapper` instance.  Returns a list
+      of output lines, without final newlines.  If the wrapped output has no
+      content, the returned list is empty.
 
 
    .. method:: fill(text)
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -255,8 +255,8 @@
 since it is impossible to detect the termination of alien threads.
 
 
-.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={},
-                  verbose=None, *, daemon=None)
+.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}, *, \
+                  daemon=None)
 
    This constructor should always be called with keyword arguments.  Arguments
    are:
@@ -275,8 +275,6 @@
    *kwargs* is a dictionary of keyword arguments for the target invocation.
    Defaults to ``{}``.
 
-   *verbose* is a flag used for debugging messages.
-
    If not ``None``, *daemon* explicitly sets whether the thread is daemonic.
    If ``None`` (the default), the daemonic property is inherited from the
    current thread.
diff --git a/Doc/library/timeit.rst b/Doc/library/timeit.rst
--- a/Doc/library/timeit.rst
+++ b/Doc/library/timeit.rst
@@ -31,13 +31,13 @@
    may also contain multiple statements separated by ``;`` or newlines, as long as
    they don't contain multi-line string literals.
 
-   To measure the execution time of the first statement, use the :meth:`timeit`
-   method.  The :meth:`repeat` method is a convenience to call :meth:`timeit`
+   To measure the execution time of the first statement, use the :meth:`Timer.timeit`
+   method.  The :meth:`repeat` method is a convenience to call :meth:`.timeit`
    multiple times and return a list of results.
 
    The *stmt* and *setup* parameters can also take objects that are callable
    without arguments. This will embed calls to them in a timer function that
-   will then be executed by :meth:`timeit`.  Note that the timing overhead is a
+   will then be executed by :meth:`.timeit`.  Note that the timing overhead is a
    little larger in this case because of the extra function calls.
 
 
@@ -60,12 +60,12 @@
 
 .. method:: Timer.repeat(repeat=3, number=1000000)
 
-   Call :meth:`timeit` a few times.
+   Call :meth:`.timeit` a few times.
 
-   This is a convenience function that calls the :meth:`timeit` repeatedly,
+   This is a convenience function that calls the :meth:`.timeit` repeatedly,
    returning a list of results.  The first argument specifies how many times to
-   call :meth:`timeit`.  The second argument specifies the *number* argument for
-   :func:`timeit`.
+   call :meth:`.timeit`.  The second argument specifies the *number* argument for
+   :meth:`.timeit`.
 
    .. note::
 
@@ -89,7 +89,7 @@
 
    .. note::
 
-      By default, :meth:`timeit` temporarily turns off :term:`garbage collection`
+      By default, :meth:`.timeit` temporarily turns off :term:`garbage collection`
       during the timing.  The advantage of this approach is that it makes
       independent timings more comparable.  This disadvantage is that GC may be
       an important component of the performance of the function being measured.
@@ -117,7 +117,7 @@
 .. function:: timeit(stmt='pass', setup='pass', timer=<default timer>, number=1000000)
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
-   function and run its :meth:`timeit` method with *number* executions.
+   function and run its :meth:`.timeit` method with *number* executions.
 
 
 Command Line Interface
@@ -243,7 +243,7 @@
    3.15 usec/pass
 
 To give the :mod:`timeit` module access to functions you define, you can pass a
-``setup`` parameter which contains an import statement::
+*setup* parameter which contains an import statement::
 
    def test():
        """Stupid test function"""
diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst
--- a/Doc/library/tkinter.tix.rst
+++ b/Doc/library/tkinter.tix.rst
@@ -504,7 +504,7 @@
       print(root.tix_configure())
 
 
-.. method:: tixCommand.tix_configure([cnf,] **kw)
+.. method:: tixCommand.tix_configure(cnf=None, **kw)
 
    Query or modify the configuration options of the Tix application context. If no
    option is specified, returns a dictionary all of the available options.  If
diff --git a/Doc/library/types.rst b/Doc/library/types.rst
--- a/Doc/library/types.rst
+++ b/Doc/library/types.rst
@@ -69,7 +69,7 @@
 the types that arise only incidentally during processing such as the
 ``listiterator`` type.
 
-Typical use is of these names is for :func:`isinstance` or
+Typical use of these names is for :func:`isinstance` or
 :func:`issubclass` checks.
 
 Standard names are defined for the following types:
diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst
+++ b/Doc/library/unittest.mock.rst
@@ -276,7 +276,7 @@
             >>> mock.assert_called_once_with('foo', bar='baz')
             Traceback (most recent call last):
               ...
-            AssertionError: Expected to be called once. Called 2 times.
+            AssertionError: Expected 'mock' to be called once. Called 2 times.
 
 
     .. method:: assert_any_call(*args, **kwargs)
@@ -2020,7 +2020,7 @@
     >>> mock.assert_called_once_with(1, 2, 3)
     Traceback (most recent call last):
      ...
-    AssertionError: Expected to be called once. Called 2 times.
+    AssertionError: Expected 'mock' to be called once. Called 2 times.
 
 Because mocks auto-create attributes on demand, and allow you to call them
 with arbitrary arguments, if you misspell one of these assert methods then
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1265,7 +1265,7 @@
    .. method:: assertListEqual(first, second, msg=None)
                assertTupleEqual(first, second, msg=None)
 
-      Tests that two lists or tuples are equal.  If not an error message is
+      Tests that two lists or tuples are equal.  If not, an error message is
       constructed that shows only the differences between the two.  An error
       is also raised if either of the parameters are of the wrong type.
       These methods are used by default when comparing lists or tuples with
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -145,8 +145,9 @@
    percent-encoded sequences into Unicode characters, as accepted by the
    :meth:`bytes.decode` method.
 
-   Use the :func:`urllib.parse.urlencode` function to convert such
-   dictionaries into query strings.
+   Use the :func:`urllib.parse.urlencode` function (with the ``doseq``
+   parameter set to ``True``) to convert such dictionaries into query
+   strings.
 
 
    .. versionchanged:: 3.2
diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -327,7 +327,7 @@
 ----------------
 
 The :mod:`_random` module includes code based on a download from
-http://www.math.keio.ac.jp/ matumoto/MT2002/emt19937ar.html. The following are
+http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html. The following are
 the verbatim comments from the original code::
 
    A C-program for MT19937, with initialization improved 2002/1/26.
@@ -368,8 +368,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: matumoto at math.keio.ac.jp
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
 
 
 Sockets
diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -307,11 +307,11 @@
 :keyword:`try` clause is executed, including any :keyword:`except` and
 :keyword:`else` clauses.  If an exception occurs in any of the clauses and is
 not handled, the exception is temporarily saved. The :keyword:`finally` clause
-is executed.  If there is a saved exception or :keyword:`break` statement,
-it is re-raised at the end of the :keyword:`finally` clause. If the
-:keyword:`finally` clause raises another exception the saved exception
-is set as the context of the new exception; if the :keyword:`finally` clause
-executes a :keyword:`return` statement, the saved exception is discarded::
+is executed.  If there is a saved exception it is re-raised at the end of the
+:keyword:`finally` clause.  If the :keyword:`finally` clause raises another
+exception, the saved exception is set as the context of the new exception.
+If the :keyword:`finally` clause executes a :keyword:`return` or :keyword:`break`
+statement, the saved exception is discarded::
 
     def f():
         try:
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1271,22 +1271,22 @@
    and ``x.__hash__()`` returns an appropriate value such that ``x == y``
    implies both that ``x is y`` and ``hash(x) == hash(y)``.
 
-   Classes which inherit a :meth:`__hash__` method from a parent class but
-   change the meaning of :meth:`__eq__` such that the hash value returned is no
-   longer appropriate (e.g. by switching to a value-based concept of equality
-   instead of the default identity based equality) can explicitly flag
-   themselves as being unhashable by setting ``__hash__ = None`` in the class
-   definition. Doing so means that not only will instances of the class raise an
-   appropriate :exc:`TypeError` when a program attempts to retrieve their hash
-   value, but they will also be correctly identified as unhashable when checking
-   ``isinstance(obj, collections.Hashable)`` (unlike classes which define their
-   own :meth:`__hash__` to explicitly raise :exc:`TypeError`).
+   A class that overrides :meth:`__eq__` and does not define :meth:`__hash__`
+   will have its :meth:`__hash__` implicitly set to ``None``.  When the
+   :meth:`__hash__` method of a class is ``None``, instances of the class will
+   raise an appropriate :exc:`TypeError` when a program attempts to retrieve
+   their hash value, and will also be correctly identified as unhashable when
+   checking ``isinstance(obj, collections.Hashable``).
 
    If a class that overrides :meth:`__eq__` needs to retain the implementation
    of :meth:`__hash__` from a parent class, the interpreter must be told this
-   explicitly by setting ``__hash__ = <ParentClass>.__hash__``. Otherwise the
-   inheritance of :meth:`__hash__` will be blocked, just as if :attr:`__hash__`
-   had been explicitly set to :const:`None`.
+   explicitly by setting ``__hash__ = <ParentClass>.__hash__``.
+
+   If a class that does not override :meth:`__eq__` wishes to suppress hash
+   support, it should include ``__hash__ = None`` in the class definition.
+   A class which defines its own :meth:`__hash__` that explicitly raises
+   a :exc:`TypeError` would be incorrectly identified as hashable by
+   an ``isinstance(obj, collections.Hashable)`` call.
 
 
    .. note::
diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/sphinxext/susp-ignored.csv
--- a/Doc/tools/sphinxext/susp-ignored.csv
+++ b/Doc/tools/sphinxext/susp-ignored.csv
@@ -124,9 +124,8 @@
 library/functions,,:stop,"a[start:stop, i]"
 library/functions,,:stop,a[start:stop:step]
 library/hotshot,,:lineno,"ncalls  tottime  percall  cumtime  percall filename:lineno(function)"
-library/http.client,52,:port,host:port
+library/http.client,,:port,host:port
 library/http.cookies,,`,!#$%&'*+-.^_`|~:
-library/httplib,,:port,host:port
 library/imaplib,,:MM,"""DD-Mmm-YYYY HH:MM:SS"
 library/imaplib,,:SS,"""DD-Mmm-YYYY HH:MM:SS"
 library/inspect,,:int,">>> def foo(a, *, b:int, **kwargs):"
diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -186,7 +186,7 @@
 
    squares = [x**2 for x in range(10)]
 
-This is also equivalent to ``squares = map(lambda x: x**2, range(10))``,
+This is also equivalent to ``squares = list(map(lambda x: x**2, range(10)))``,
 but it's more concise and readable.
 
 A list comprehension consists of brackets containing an expression followed
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -12,7 +12,9 @@
 
 The Python interpreter is usually installed as :file:`/usr/local/bin/python3.3`
 on those machines where it is available; putting :file:`/usr/local/bin` in your
-Unix shell's search path makes it possible to start it by typing the command ::
+Unix shell's search path makes it possible to start it by typing the command:
+
+.. code-block:: text
 
    python3.3
 
@@ -94,8 +96,8 @@
 before printing the first prompt::
 
    $ python3.3
-   Python 3.3 (py3k, Sep 12 2007, 12:21:02)
-   [GCC 3.4.6 20060404 (Red Hat 3.4.6-8)] on linux2
+   Python 3.3 (default, Sep 24 2012, 09:25:04)
+   [GCC 4.6.3] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>>
 
diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -94,8 +94,7 @@
 Variables must be "defined" (assigned a value) before they can be used, or an
 error will occur::
 
-   >>> # try to access an undefined variable
-   ... n
+   >>> n  # try to access an undefined variable
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    NameError: name 'n' is not defined
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -148,7 +148,7 @@
 
 There are a number of modules for accessing the internet and processing internet
 protocols. Two of the simplest are :mod:`urllib.request` for retrieving data
-from urls and :mod:`smtplib` for sending mail::
+from URLs and :mod:`smtplib` for sending mail::
 
    >>> from urllib.request import urlopen
    >>> for line in urlopen('http://tycho.usno.navy.mil/cgi-bin/timer.pl'):
diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -95,7 +95,7 @@
    >>> d = dict(item='unladen swallow')
    >>> t.substitute(d)
    Traceback (most recent call last):
-     . . .
+     ...
    KeyError: 'owner'
    >>> t.safe_substitute(d)
    'Return the unladen swallow to $owner.'
@@ -220,7 +220,9 @@
    logging.error('Error occurred')
    logging.critical('Critical error -- shutting down')
 
-This produces the following output::
+This produces the following output:
+
+.. code-block:: none
 
    WARNING:root:Warning:config file server.conf not found
    ERROR:root:Error occurred
@@ -311,6 +313,8 @@
    >>> print("Handling", d.popleft())
    Handling task1
 
+::
+
    unsearched = deque([starting_node])
    def breadth_first_search(unsearched):
        node = unsearched.popleft()
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -66,6 +66,7 @@
 * :mod:`faulthandler` (helps debugging low-level crashes)
 * :mod:`ipaddress` (high-level objects representing IP addresses and masks)
 * :mod:`lzma` (compress data using the XZ / LZMA algorithm)
+* :mod:`unittest.mock` (replace parts of your system under test with mock objects)
 * :mod:`venv` (Python :ref:`virtual environments <pep-405>`, as in the
   popular ``virtualenv`` package)
 
@@ -560,6 +561,41 @@
 or amends calling signatures or arguments.
 
 
+PEP 421: Adding sys.implementation
+==================================
+
+:pep:`421` - Adding sys.implementation
+ PEP written and implemented by Eric Snow.
+
+A new attribute on the :mod:`sys` module exposes details specific to the
+implementation of the currently running interpreter.  The initial set of
+attributes on :attr:`sys.implementation` are ``name``, ``version``,
+``hexversion``, and ``cache_tag``.
+
+The intention of ``sys.implementation`` is to consolidate into one namespace
+the implementation-specific data used by the standard library.  This allows
+different Python implementations to share a single standard library code base
+much more easily.  In its initial state, ``sys.implementation`` holds only a
+small portion of the implementation-specific data.  Over time that ratio will
+shift in order to make the standard library more portable.
+
+One example of improved standard library portability is ``cache_tag``.  As of
+Python 3.3, ``sys.implementation.cache_tag`` is used by :mod:`importlib` to
+support :pep:`3147` compliance.  Any Python implementation that uses
+``importlib`` for its built-in import system may use ``cache_tag`` to control
+the caching behavior for modules.
+
+SimpleNamespace
+---------------
+
+The implementation of ``sys.implementation`` also introduces a new type to
+Python: :class:`types.SimpleNamespace`.  In contrast to a mapping-based
+namespace, like :class:`dict`, ``SimpleNamespace`` is attribute-based, like
+:class:`object`.  However, unlike ``object``, ``SimpleNamespace`` instances
+are writable.  This means that you can add, remove, and modify the namespace
+through normal attribute access.
+
+
 .. _importlib:
 
 Using importlib as the Implementation of Import
@@ -815,6 +851,8 @@
 
   (Contributed by Ezio Melotti in :issue:`12753`)
 
+* Unicode database updated to UCD version 6.1.0
+
 * Equality comparisons on :func:`range` objects now return a result reflecting
   the equality of the underlying sequences generated by those range objects.
 
@@ -885,7 +923,7 @@
 faulthandler
 ------------
 
-This new debug module contains functions to dump Python tracebacks explicitly,
+This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
 on a fault (a crash like a segmentation fault), after a timeout, or on a user
 signal. Call :func:`faulthandler.enable` to install fault handlers for the
 :const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
@@ -1044,7 +1082,7 @@
 contextlib
 ----------
 
-:class:`~collections.ExitStack` now provides a solid foundation for
+:class:`~contextlib.ExitStack` now provides a solid foundation for
 programmatic manipulation of context managers and similar cleanup
 functionality. Unlike the previous ``contextlib.nested`` API (which was
 deprecated and removed), the new API is designed to work correctly
@@ -1084,7 +1122,7 @@
 --------
 
  * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances don't raise :exc:`TypeError`.
+   instances now return :const:`False` instead of raising :exc:`TypeError`.
  * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
@@ -1193,13 +1231,18 @@
 ftplib
 ------
 
-The :class:`~ftplib.FTP_TLS` class now provides a new
-:func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
-plaintext.  This can be useful to take advantage of firewalls that know how to
-handle NAT with non-secure FTP without opening fixed ports.
-
-(Contributed by Giampaolo Rodol? in :issue:`12139`)
-
+* The :class:`~ftplib.FTP_TLS` class now provides a new
+  :func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
+  plaintext.  This can be useful to take advantage of firewalls that know how to
+  handle NAT with non-secure FTP without opening fixed ports.
+
+  (Contributed by Giampaolo Rodol? in :issue:`12139`)
+
+* Added :meth:`ftplib.FTP.mlsd` method which provides a parsable directory
+  listing format and deprecates :meth:`ftplib.FTP.nlst` and
+  :meth:`ftplib.FTP.dir`.
+
+  (Contributed by Giampaolo Rodol? in :issue:`11072`)
 
 gc
 --
@@ -1217,6 +1260,31 @@
 (Contributed by Nick Coghlan and Christian Heimes in issue:`15061`)
 
 
+html.entities
+-------------
+
+A new :data:`~html.entities.html5` dictionary that maps HTML5 named character
+references to the equivalent Unicode character(s) (e.g. ``html5['gt;'] == '>'``)
+has been added to the :mod:`html.entities` module.  The dictionary is now also
+used by :class:`~html.parser.HTMLParser`.
+
+(Contributed by Ezio Melotti in :issue:`11113` and :issue:`15156`)
+
+
+html.parser
+-----------
+
+:class:`~html.parser.HTMLParser` is now able to parse broken markup without
+raising errors, therefore the *strict* argument of the constructor and the
+:exc:`~html.parser.HTMLParseError` exception are now deprecated.
+The ability to parse broken markup is the result of a number of bug fixes that
+are also available on the latest bug fix releases of Python 2.7/3.2.
+
+(Contributed by Ezio Melotti in :issue:`15114`, and :issue:`14538`,
+:issue:`13993`, :issue:`13960`, :issue:`13358`, :issue:`1745761`,
+:issue:`755670`, :issue:`13357`, :issue:`12629`, :issue:`1200313`,
+:issue:`670664`, :issue:`13273`, :issue:`12888`, :issue:`7311`)
+
 imaplib
 -------
 
@@ -1680,6 +1748,16 @@
 for PEP 3115 compliant dynamic type creation. (:issue:`14588`)
 
 
+unittest
+--------
+
+:meth:`.assertRaises`, :meth:`.assertRaisesRegex`, :meth:`.assertWarns`, and
+:meth:`.assertWarnsRegex` now accept a keyword argument *msg* when used as
+context managers.
+
+(Contributed by Ezio Melotti and Winston Ewert in :issue:`10775`)
+
+
 urllib
 ------
 
@@ -1813,6 +1891,15 @@
   * :class:`abc.abstractstaticmethod` has been deprecated, use
     :class:`staticmethod` with :func:`abc.abstractmethod` instead.
 
+* :mod:`importlib` package:
+
+  * :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
+    :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
+    both the modification time and size of the source file the bytecode file was
+    compiled from.
+
+
+
 
 
 Deprecated functions and types of the C API
@@ -1921,7 +2008,7 @@
   updated to use the full name of the module instead of just the tail of the
   name.
 
-* The **index** argument to :func:`__import__` now defaults to 0 instead of -1
+* The *index* argument to :func:`__import__` now defaults to 0 instead of -1
   and no longer support negative values. It was an oversight when :pep:`328` was
   implemented that the default value remained -1. If you need to continue to
   perform a relative import followed by an absolute import, then perform the
@@ -1944,11 +2031,6 @@
   :attr:`sys.path_importer_cache` where it repesents the use of implicit
   finders, but semantically it should not change anything.
 
-* :meth:`importlib.abc.SourceLoader.path_mtime` is now deprecated in favour of
-  :meth:`importlib.abc.SourceLoader.path_stats` as bytecode files now store
-  both the modification time and size of the source file the bytecode file was
-  compiled from.
-
 * :class:`importlib.abc.Finder` no longer specifies a `find_module()` abstract
   method that must be implemented. If you were relying on subclasses to
   implement that method, make sure to check for the method's existence first.
@@ -1989,9 +2071,9 @@
 
 * :c:func:`PyImport_GetMagicNumber` now returns -1 upon failure.
 
-* As a negative value for the **level** argument to :func:`__import__` is no
+* As a negative value for the *level* argument to :func:`__import__` is no
   longer valid, the same now holds for :c:func:`PyImport_ImportModuleLevel`.
-  This also means that the value of **level** used by
+  This also means that the value of *level* used by
   :c:func:`PyImport_ImportModuleEx` is now 0 instead of -1.
 
 
diff --git a/Include/object.h b/Include/object.h
--- a/Include/object.h
+++ b/Include/object.h
@@ -962,7 +962,7 @@
 */
 
 /* This is the old private API, invoked by the macros before 3.2.4.
-   Kept for binary compatibility of extensions. */
+   Kept for binary compatibility of extensions using the stable ABI. */
 PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*);
 PyAPI_FUNC(void) _PyTrash_destroy_chain(void);
 PyAPI_DATA(int) _PyTrash_delete_nesting;
diff --git a/Include/objimpl.h b/Include/objimpl.h
--- a/Include/objimpl.h
+++ b/Include/objimpl.h
@@ -181,12 +181,9 @@
 #endif
 
 #define _PyObject_VAR_SIZE(typeobj, nitems)     \
-    (size_t)                                    \
-    ( ( (typeobj)->tp_basicsize +               \
-        (nitems)*(typeobj)->tp_itemsize +       \
-        (SIZEOF_VOID_P - 1)                     \
-      ) & ~(SIZEOF_VOID_P - 1)                  \
-    )
+    _Py_SIZE_ROUND_UP((typeobj)->tp_basicsize + \
+        (nitems)*(typeobj)->tp_itemsize,        \
+        SIZEOF_VOID_P)
 
 #define PyObject_NEW(type, typeobj) \
 ( (type *) PyObject_Init( \
diff --git a/Include/pyfpe.h b/Include/pyfpe.h
--- a/Include/pyfpe.h
+++ b/Include/pyfpe.h
@@ -4,8 +4,8 @@
 extern "C" {
 #endif
 /*
-     ---------------------------------------------------------------------  
-    /                       Copyright (c) 1996.                           \ 
+     ---------------------------------------------------------------------
+    /                       Copyright (c) 1996.                           \
    |          The Regents of the University of California.                 |
    |                        All rights reserved.                           |
    |                                                                       |
@@ -37,8 +37,8 @@
    |   opinions  of authors expressed herein do not necessarily state or   |
    |   reflect those of the United States Government or  the  University   |
    |   of  California,  and shall not be used for advertising or product   |
-    \  endorsement purposes.                                              / 
-     ---------------------------------------------------------------------  
+    \  endorsement purposes.                                              /
+     ---------------------------------------------------------------------
 */
 
 /*
diff --git a/Include/pymacro.h b/Include/pymacro.h
--- a/Include/pymacro.h
+++ b/Include/pymacro.h
@@ -52,4 +52,18 @@
 #define PyDoc_STR(str) ""
 #endif
 
+/* Below "a" is a power of 2. */
+/* Round down size "n" to be a multiple of "a". */
+#define _Py_SIZE_ROUND_DOWN(n, a) ((size_t)(n) & ~(size_t)((a) - 1))
+/* Round up size "n" to be a multiple of "a". */
+#define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \
+        (size_t)((a) - 1)) & ~(size_t)((a) - 1))
+/* Round pointer "p" down to the closest "a"-aligned address <= "p". */
+#define _Py_ALIGN_DOWN(p, a) ((void *)((Py_uintptr_t)(p) & ~(Py_uintptr_t)((a) - 1)))
+/* Round pointer "p" up to the closest "a"-aligned address >= "p". */
+#define _Py_ALIGN_UP(p, a) ((void *)(((Py_uintptr_t)(p) + \
+        (Py_uintptr_t)((a) - 1)) & ~(Py_uintptr_t)((a) - 1)))
+/* Check if pointer "p" is aligned to "a"-bytes boundary. */
+#define _Py_IS_ALIGNED(p, a) (!((Py_uintptr_t)(p) & (Py_uintptr_t)((a) - 1)))
+
 #endif /* Py_PYMACRO_H */
diff --git a/Lib/_pyio.py b/Lib/_pyio.py
--- a/Lib/_pyio.py
+++ b/Lib/_pyio.py
@@ -895,12 +895,18 @@
         return pos
 
     def readable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def writable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return True
 
 
@@ -1562,6 +1568,8 @@
         return self._buffer
 
     def seekable(self):
+        if self.closed:
+            raise ValueError("I/O operation on closed file.")
         return self._seekable
 
     def readable(self):
diff --git a/Lib/argparse.py b/Lib/argparse.py
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1725,10 +1725,7 @@
             if action.dest is not SUPPRESS:
                 if not hasattr(namespace, action.dest):
                     if action.default is not SUPPRESS:
-                        default = action.default
-                        if isinstance(action.default, str):
-                            default = self._get_value(action, default)
-                        setattr(namespace, action.dest, default)
+                        setattr(namespace, action.dest, action.default)
 
         # add any parser defaults that aren't present
         for dest in self._defaults:
@@ -1951,9 +1948,25 @@
         # if we didn't consume all the argument strings, there were extras
         extras.extend(arg_strings[stop_index:])
 
-        # make sure all required actions were present
-        required_actions = [_get_action_name(action) for action in self._actions
-                            if action.required and action not in seen_actions]
+        # make sure all required actions were present and also convert
+        # action defaults which were not given as arguments
+        required_actions = []
+        for action in self._actions:
+            if action not in seen_actions:
+                if action.required:
+                    required_actions.append(_get_action_name(action))
+                else:
+                    # Convert action default now instead of doing it before
+                    # parsing arguments to avoid calling convert functions
+                    # twice (which may fail) if the argument was given, but
+                    # only if it was defined already in the namespace
+                    if (action.default is not None and
+                        isinstance(action.default, str) and
+                        hasattr(namespace, action.dest) and
+                        action.default is getattr(namespace, action.dest)):
+                        setattr(namespace, action.dest,
+                                self._get_value(action, action.default))
+
         if required_actions:
             self.error(_('the following arguments are required: %s') %
                        ', '.join(required_actions))
diff --git a/Lib/calendar.py b/Lib/calendar.py
--- a/Lib/calendar.py
+++ b/Lib/calendar.py
@@ -161,7 +161,11 @@
         oneday = datetime.timedelta(days=1)
         while True:
             yield date
-            date += oneday
+            try:
+                date += oneday
+            except OverflowError:
+                # Adding one day could fail after datetime.MAXYEAR
+                break
             if date.month != month and date.weekday() == self.firstweekday:
                 break
 
diff --git a/Lib/doctest.py b/Lib/doctest.py
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -2334,7 +2334,12 @@
     elif not tests:
         # Why do we want to do this? Because it reveals a bug that might
         # otherwise be hidden.
-        raise ValueError(module, "has no tests")
+        # It is probably a bug that this exception is not also raised if the
+        # number of doctest examples in tests is zero (i.e. if no doctest
+        # examples were found).  However, we should probably not be raising
+        # an exception at all here, though it is too late to make this change
+        # for a maintenance release.  See also issue #14649.
+        raise ValueError(module, "has no docstrings")
 
     tests.sort()
     suite = unittest.TestSuite()
diff --git a/Lib/gzip.py b/Lib/gzip.py
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -670,9 +670,9 @@
             if not chunk:
                 break
             g.write(chunk)
-        if g is not sys.stdout:
+        if g is not sys.stdout.buffer:
             g.close()
-        if f is not sys.stdin:
+        if f is not sys.stdin.buffer:
             f.close()
 
 if __name__ == '__main__':
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1825,7 +1825,7 @@
 
 class LWPCookieJar(FileCookieJar):
     """
-    The LWPCookieJar saves a sequence of"Set-Cookie3" lines.
+    The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
     "Set-Cookie3" is the format used by the libwww-perl libary, not known
     to be compatible with any browser, but which is easy to read and
     doesn't lose information about RFC 2965 cookies.
@@ -1837,7 +1837,7 @@
     """
 
     def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
-        """Return cookies as a string of "\n"-separated "Set-Cookie3" headers.
+        """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
 
         ignore_discard and ignore_expires: see docstring for FileCookieJar.save
 
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -419,8 +419,8 @@
     .pyc/.pyo file calculated as if the .py file were imported.  The extension
     will be .pyc unless sys.flags.optimize is non-zero, then it will be .pyo.
 
-    If debug_override is not None, then it must be a boolean and is taken as
-    the value of bool(sys.flags.optimize) instead.
+    If debug_override is not None, then it must be a boolean and is used in
+    place of sys.flags.optimize.
 
     If sys.implementation.cache_tag is None then NotImplementedError is raised.
 
@@ -1669,7 +1669,11 @@
         elif not name:
             return module
         else:
+            # Figure out where to slice the module's name up to the first dot
+            # in 'name'.
             cut_off = len(name) - len(name.partition('.')[0])
+            # Slice end needs to be positive to alleviate need to special-case
+            # when ``'.' not in name``.
             return sys.modules[module.__name__[:len(module.__name__)-cut_off]]
     else:
         return _handle_fromlist(module, fromlist, _gcd_import)
diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py
--- a/Lib/lib2to3/fixer_util.py
+++ b/Lib/lib2to3/fixer_util.py
@@ -274,9 +274,9 @@
     """Find the top level namespace."""
     # Scamper up to the top level namespace
     while node.type != syms.file_input:
-        assert node.parent, "Tree is insane! root found before "\
-                           "file_input node was found."
         node = node.parent
+        if not node:
+            raise ValueError("root found before file_input node was found.")
     return node
 
 def does_tree_import(package, name, node):
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -445,7 +445,7 @@
 
                         try:
                             find_root(node)
-                        except AssertionError:
+                        except ValueError:
                             # this node has been cut off from a
                             # previous transformation ; skip
                             continue
diff --git a/Lib/mailbox.py b/Lib/mailbox.py
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -208,6 +208,9 @@
             raise ValueError("String input must be ASCII-only; "
                 "use bytes or a Message instead")
 
+    # Whether each message must end in a newline
+    _append_newline = False
+
     def _dump_message(self, message, target, mangle_from_=False):
         # This assumes the target file is open in binary mode.
         """Dump message contents to target file."""
@@ -219,6 +222,9 @@
             data = buffer.read()
             data = data.replace(b'\n', linesep)
             target.write(data)
+            if self._append_newline and not data.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif isinstance(message, (str, bytes, io.StringIO)):
             if isinstance(message, io.StringIO):
                 warnings.warn("Use of StringIO input is deprecated, "
@@ -230,11 +236,15 @@
                 message = message.replace(b'\nFrom ', b'\n>From ')
             message = message.replace(b'\n', linesep)
             target.write(message)
+            if self._append_newline and not message.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         elif hasattr(message, 'read'):
             if hasattr(message, 'buffer'):
                 warnings.warn("Use of text mode files is deprecated, "
                     "use a binary mode file instead", DeprecationWarning, 3)
                 message = message.buffer
+            lastline = None
             while True:
                 line = message.readline()
                 # Universal newline support.
@@ -248,6 +258,10 @@
                     line = b'>From ' + line[5:]
                 line = line.replace(b'\n', linesep)
                 target.write(line)
+                lastline = line
+            if self._append_newline and lastline and not lastline.endswith(linesep):
+                # Make sure the message ends with a newline
+                target.write(linesep)
         else:
             raise TypeError('Invalid message type: %s' % type(message))
 
@@ -833,30 +847,48 @@
 
     _mangle_from_ = True
 
+    # All messages must end in a newline character, and
+    # _post_message_hooks outputs an empty line between messages.
+    _append_newline = True
+
     def __init__(self, path, factory=None, create=True):
         """Initialize an mbox mailbox."""
         self._message_factory = mboxMessage
         _mboxMMDF.__init__(self, path, factory, create)
 
-    def _pre_message_hook(self, f):
-        """Called before writing each message to file f."""
-        if f.tell() != 0:
-            f.write(linesep)
+    def _post_message_hook(self, f):
+        """Called after writing each message to file f."""
+        f.write(linesep)
 
     def _generate_toc(self):
         """Generate key-to-(start, stop) table of contents."""
         starts, stops = [], []
+        last_was_empty = False
         self._file.seek(0)
         while True:
             line_pos = self._file.tell()
             line = self._file.readline()
             if line.startswith(b'From '):
                 if len(stops) < len(starts):
+                    if last_was_empty:
+                        stops.append(line_pos - len(linesep))
+                    else:
+                        # The last line before the "From " line wasn't
+                        # blank, but we consider it a start of a
+                        # message anyway.
+                        stops.append(line_pos)
+                starts.append(line_pos)
+                last_was_empty = False
+            elif not line:
+                if last_was_empty:
                     stops.append(line_pos - len(linesep))
-                starts.append(line_pos)
-            elif not line:
-                stops.append(line_pos)
+                else:
+                    stops.append(line_pos)
                 break
+            elif line == linesep:
+                last_was_empty = True
+            else:
+                last_was_empty = False
         self._toc = dict(enumerate(zip(starts, stops)))
         self._next_key = len(self._toc)
         self._file_length = self._file.tell()
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -225,7 +225,6 @@
         Apply `func` to each element in `iterable`, collecting the results
         in a list that is returned.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, mapstar, chunksize).get()
 
     def starmap(self, func, iterable, chunksize=None):
@@ -234,7 +233,6 @@
         be iterables as well and will be unpacked as arguments. Hence
         `func` and (a, b) becomes func(a, b).
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, starmapstar, chunksize).get()
 
     def starmap_async(self, func, iterable, chunksize=None, callback=None,
@@ -242,7 +240,6 @@
         '''
         Asynchronous version of `starmap()` method.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, starmapstar, chunksize,
                                callback, error_callback)
 
@@ -250,7 +247,8 @@
         '''
         Equivalent of `map()` -- can be MUCH slower than `Pool.map()`.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if chunksize == 1:
             result = IMapIterator(self._cache)
             self._taskqueue.put((((result._job, i, func, (x,), {})
@@ -268,7 +266,8 @@
         '''
         Like `imap()` method but ordering of results is arbitrary.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if chunksize == 1:
             result = IMapUnorderedIterator(self._cache)
             self._taskqueue.put((((result._job, i, func, (x,), {})
@@ -287,7 +286,8 @@
         '''
         Asynchronous version of `apply()` method.
         '''
-        assert self._state == RUN
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         result = ApplyResult(self._cache, callback, error_callback)
         self._taskqueue.put(([(result._job, None, func, args, kwds)], None))
         return result
@@ -297,7 +297,6 @@
         '''
         Asynchronous version of `map()` method.
         '''
-        assert self._state == RUN
         return self._map_async(func, iterable, mapstar, chunksize)
 
     def _map_async(self, func, iterable, mapper, chunksize=None, callback=None,
@@ -305,6 +304,8 @@
         '''
         Helper function to implement map, starmap and their async counterparts.
         '''
+        if self._state != RUN:
+            raise ValueError("Pool not running")
         if not hasattr(iterable, '__len__'):
             iterable = list(iterable)
 
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -235,6 +235,12 @@
     Finalizers with highest priority are called first; finalizers with
     the same priority will be called in reverse order of creation.
     '''
+    if _finalizer_registry is None:
+        # This function may be called after this module's globals are
+        # destroyed.  See the _exit_function function in this module for more
+        # notes.
+        return
+
     if minpriority is None:
         f = lambda p : p[0][0] is not None
     else:
@@ -266,7 +272,13 @@
 
 _exiting = False
 
-def _exit_function():
+def _exit_function(info=info, debug=debug, _run_finalizers=_run_finalizers,
+                   active_children=active_children,
+                   current_process=current_process):
+    # We hold on to references to functions in the arglist due to the
+    # situation described below, where this function is called after this
+    # module's globals are destroyed.
+
     global _exiting
 
     if not _exiting:
@@ -276,14 +288,28 @@
         debug('running all "atexit" finalizers with priority >= 0')
         _run_finalizers(0)
 
-        for p in active_children():
-            if p._daemonic:
-                info('calling terminate() for daemon %s', p.name)
-                p._popen.terminate()
+        if current_process() is not None:
+            # We check if the current process is None here because if
+            # it's None, any call to ``active_children()`` will throw
+            # an AttributeError (active_children winds up trying to
+            # get attributes from util._current_process).  One
+            # situation where this can happen is if someone has
+            # manipulated sys.modules, causing this module to be
+            # garbage collected.  The destructor for the module type
+            # then replaces all values in the module dict with None.
+            # For instance, after setuptools runs a test it replaces
+            # sys.modules with a copy created earlier.  See issues
+            # #9775 and #15881.  Also related: #4106, #9205, and
+            # #9207.
 
-        for p in active_children():
-            info('calling join() for process %s', p.name)
-            p.join()
+            for p in active_children():
+                if p._daemonic:
+                    info('calling terminate() for daemon %s', p.name)
+                    p._popen.terminate()
+
+            for p in active_children():
+                info('calling join() for process %s', p.name)
+                p.join()
 
         debug('running the remaining "atexit" finalizers')
         _run_finalizers()
diff --git a/Lib/socket.py b/Lib/socket.py
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -324,12 +324,23 @@
     def readable(self):
         """True if the SocketIO is open for reading.
         """
-        return self._reading and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._reading
 
     def writable(self):
         """True if the SocketIO is open for writing.
         """
-        return self._writing and not self.closed
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return self._writing
+
+    def seekable(self):
+        """True if the SocketIO is open for seeking.
+        """
+        if self.closed:
+            raise ValueError("I/O operation on closed socket.")
+        return super().seekable()
 
     def fileno(self):
         """Return the file descriptor of the underlying socket.
diff --git a/Lib/test/sample_doctest_no_docstrings.py b/Lib/test/sample_doctest_no_docstrings.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_docstrings.py
@@ -0,0 +1,12 @@
+# This is a sample module used for testing doctest.
+#
+# This module is for testing how doctest handles a module with no
+# docstrings.
+
+
+class Foo(object):
+
+    # A class with no docstring.
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/sample_doctest_no_doctests.py b/Lib/test/sample_doctest_no_doctests.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/sample_doctest_no_doctests.py
@@ -0,0 +1,15 @@
+"""This is a sample module used for testing doctest.
+
+This module is for testing how doctest handles a module with docstrings
+but no doctest examples.
+
+"""
+
+
+class Foo(object):
+    """A docstring with no doctest examples.
+
+    """
+
+    def __init__(self):
+        pass
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -1206,6 +1206,9 @@
         self.checkraises(ValueError, '%%%df' % (2**64), '__mod__', (3.2))
         self.checkraises(ValueError, '%%.%df' % (2**64), '__mod__', (3.2))
 
+        class X(object): pass
+        self.checkraises(TypeError, 'abc', '__mod__', X())
+
     def test_floatformatting(self):
         # float formatting
         for prec in range(100):
diff --git a/Lib/test/support.py b/Lib/test/support.py
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -680,7 +680,7 @@
     except OSError:
         if not quiet:
             raise
-        warnings.warn('tests may fail, unable to change the CWD to ' + name,
+        warnings.warn('tests may fail, unable to change the CWD to ' + path,
                       RuntimeWarning, stacklevel=3)
     try:
         yield os.getcwd()
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1463,6 +1463,22 @@
         ('readonly', NS(x=None, spam=RFile('readonly'))),
     ]
 
+class TestFileTypeDefaults(TempDirMixin, ParserTestCase):
+    """Test that a file is not created unless the default is needed"""
+    def setUp(self):
+        super(TestFileTypeDefaults, self).setUp()
+        file = open(os.path.join(self.temp_dir, 'good'), 'w')
+        file.write('good')
+        file.close()
+
+    argument_signatures = [
+        Sig('-c', type=argparse.FileType('r'), default='no-file.txt'),
+    ]
+    # should provoke no such file error
+    failures = ['']
+    # should not provoke error because default file is created
+    successes = [('-c good', NS(c=RFile('good')))]
+
 
 class TestFileTypeRB(TempDirMixin, ParserTestCase):
     """Test the FileType option/argument type for reading files"""
@@ -4559,6 +4575,71 @@
         self.assertNotIn(msg, 'optional_positional')
 
 
+# ================================================
+# Check that the type function is called only once
+# ================================================
+
+class TestTypeFunctionCallOnlyOnce(TestCase):
+
+    def test_type_function_call_only_once(self):
+        def spam(string_to_convert):
+            self.assertEqual(string_to_convert, 'spam!')
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='bar')
+        args = parser.parse_args('--foo spam!'.split())
+        self.assertEqual(NS(foo='foo_converted'), args)
+
+# ==================================================================
+# Check semantics regarding the default argument and type conversion
+# ==================================================================
+
+class TestTypeFunctionCalledOnDefault(TestCase):
+
+    def test_type_function_call_with_non_string_default(self):
+        def spam(int_to_convert):
+            self.assertEqual(int_to_convert, 0)
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default=0)
+        args = parser.parse_args([])
+        # foo should *not* be converted because its default is not a string.
+        self.assertEqual(NS(foo=0), args)
+
+    def test_type_function_call_with_string_default(self):
+        def spam(int_to_convert):
+            return 'foo_converted'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--foo', type=spam, default='0')
+        args = parser.parse_args([])
+        # foo is converted because its default is a string.
+        self.assertEqual(NS(foo='foo_converted'), args)
+
+    def test_no_double_type_conversion_of_default(self):
+        def extend(str_to_convert):
+            return str_to_convert + '*'
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', type=extend, default='*')
+        args = parser.parse_args([])
+        # The test argument will be two stars, one coming from the default
+        # value and one coming from the type conversion being called exactly
+        # once.
+        self.assertEqual(NS(test='**'), args)
+
+    def test_issue_15906(self):
+        # Issue #15906: When action='append', type=str, default=[] are
+        # providing, the dest value was the string representation "[]" when it
+        # should have been an empty list.
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--test', dest='test', type=str,
+                            default=[], action='append')
+        args = parser.parse_args([])
+        self.assertEqual(args.test, [])
+
 # ======================
 # parse_known_args tests
 # ======================
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -407,6 +407,14 @@
         b = compile('foo(1 + 1)', '<unknown>', 'exec', ast.PyCF_ONLY_AST)
         self.assertEqual(ast.dump(a), ast.dump(b))
 
+    def test_parse_in_error(self):
+        try:
+            1/0
+        except Exception:
+            with self.assertRaises(SyntaxError) as e:
+                ast.literal_eval(r"'\U'")
+            self.assertIsNotNone(e.exception.__context__)
+
     def test_dump(self):
         node = ast.parse('spam(eggs, "and cheese")')
         self.assertEqual(ast.dump(node),
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -6,6 +6,7 @@
 import time
 import locale
 import sys
+import datetime
 
 result_2004_01_text = """
     January 2004
@@ -464,6 +465,11 @@
         new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
         self.assertEqual(old_october, new_october)
 
+    def test_itermonthdates(self):
+        # ensure itermonthdates doesn't overflow after datetime.MAXYEAR
+        # see #15421
+        list(calendar.Calendar().itermonthdates(datetime.MAXYEAR, 12))
+
 
 class MonthCalendarTestCase(unittest.TestCase):
     def setUp(self):
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -1693,6 +1693,15 @@
         )
 
         self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict", "\U0010FFFFbc"),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict", "ab"
+        )
+
+        self.assertEqual(
             codecs.charmap_decode(b"\x00\x01\x02", "replace", "ab"),
             ("ab\ufffd", 3)
         )
@@ -1718,6 +1727,113 @@
             ("", len(allbytes))
         )
 
+    def test_decode_with_int2str_map(self):
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: 'c'}),
+            ("abc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'Aa', 1: 'Bb', 2: 'Cc'}),
+            ("AaBbCc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: '\U0010FFFF', 1: 'b', 2: 'c'}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 'a', 1: 'b', 2: ''}),
+            ("ab", 3)
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: 'a', 1: 'b'}
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b'}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b'}),
+            ("ab", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: 'a', 1: 'b', 2: None}),
+            ("ab", 3)
+        )
+
+        allbytes = bytes(range(256))
+        self.assertEqual(
+            codecs.charmap_decode(allbytes, "ignore", {}),
+            ("", len(allbytes))
+        )
+
+    def test_decode_with_int2int_map(self):
+        a = ord('a')
+        b = ord('b')
+        c = ord('c')
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: a, 1: b, 2: c}),
+            ("abc", 3)
+        )
+
+        # Issue #15379
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: 0x10FFFF, 1: b, 2: c}),
+            ("\U0010FFFFbc", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "strict",
+                                  {0: sys.maxunicode, 1: b, 2: c}),
+            (chr(sys.maxunicode) + "bc", 3)
+        )
+
+        self.assertRaises(TypeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: sys.maxunicode + 1, 1: b, 2: c}
+        )
+
+        self.assertRaises(UnicodeDecodeError,
+            codecs.charmap_decode, b"\x00\x01\x02", "strict",
+                                   {0: a, 1: b},
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "replace",
+                                  {0: a, 1: b}),
+            ("ab\ufffd", 3)
+        )
+
+        self.assertEqual(
+            codecs.charmap_decode(b"\x00\x01\x02", "ignore",
+                                  {0: a, 1: b}),
+            ("ab", 3)
+        )
+
+
 class WithStmtTest(unittest.TestCase):
     def test_encodedfile(self):
         f = io.BytesIO(b"\xc3\xbc")
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -134,15 +134,21 @@
 class CommandLineTests(unittest.TestCase):
     """Test compileall's CLI."""
 
+    def _get_run_args(self, args):
+        interp_args = ['-S']
+        if sys.flags.optimize:
+            interp_args.append({1 : '-O', 2 : '-OO'}[sys.flags.optimize])
+        return interp_args + ['-m', 'compileall'] + list(args)
+
     def assertRunOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_ok(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                         *self._get_run_args(args), **env_vars)
         self.assertEqual(b'', err)
         return out
 
     def assertRunNotOK(self, *args, **env_vars):
         rc, out, err = script_helper.assert_python_failure(
-                        '-S', '-m', 'compileall', *args, **env_vars)
+                        *self._get_run_args(args), **env_vars)
         return rc, out, err
 
     def assertCompiled(self, fn):
@@ -198,7 +204,9 @@
         self.assertRunOK('-b', '-q', self.pkgdir)
         # Verify the __pycache__ directory contents.
         self.assertFalse(os.path.exists(self.pkgdir_cachedir))
-        expected = sorted(['__init__.py', '__init__.pyc', 'bar.py', 'bar.pyc'])
+        opt = 'c' if __debug__ else 'o'
+        expected = sorted(['__init__.py', '__init__.py' + opt, 'bar.py',
+                           'bar.py' + opt])
         self.assertEqual(sorted(os.listdir(self.pkgdir)), expected)
 
     def test_multiple_runs(self):
@@ -326,7 +334,7 @@
         f2 = script_helper.make_script(self.pkgdir, 'f2', '')
         f3 = script_helper.make_script(self.pkgdir, 'f3', '')
         f4 = script_helper.make_script(self.pkgdir, 'f4', '')
-        p = script_helper.spawn_python('-m', 'compileall', '-i', '-')
+        p = script_helper.spawn_python(*(self._get_run_args(()) + ['-i', '-']))
         p.stdin.write((f3+os.linesep).encode('ascii'))
         script_helper.kill_python(p)
         self.assertNotCompiled(f1)
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -225,6 +225,15 @@
         self.assertRaises(csv.Error, self._read_test, ['a,b\nc,d'], [])
         self.assertRaises(csv.Error, self._read_test, ['a,b\r\nc,d'], [])
 
+    def test_read_eof(self):
+        self._read_test(['a,"'], [['a', '']])
+        self._read_test(['"a'], [['a']])
+        self._read_test(['^'], [['\n']], escapechar='^')
+        self.assertRaises(csv.Error, self._read_test, ['a,"'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test, ['"a'], [], strict=True)
+        self.assertRaises(csv.Error, self._read_test,
+                          ['^'], [], escapechar='^', strict=True)
+
     def test_read_escape(self):
         self._read_test(['a,\\b,c'], [['a', 'b', 'c']], escapechar='\\')
         self._read_test(['a,b\\,c'], [['a', 'b,c']], escapechar='\\')
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -34,7 +34,8 @@
 import locale
 from test.support import (run_unittest, run_doctest, is_resource_enabled,
                           requires_IEEE_754)
-from test.support import check_warnings, import_fresh_module, TestFailed
+from test.support import (check_warnings, import_fresh_module, TestFailed,
+                          run_with_locale)
 import random
 import time
 import warnings
@@ -1136,18 +1137,19 @@
         self.assertEqual(get_fmt(Decimal('-1.5'), dotsep_wide, '020n'),
                          '-0\u00b4000\u00b4000\u00b4000\u00b4001\u00bf5')
 
+    @run_with_locale('LC_ALL', 'ps_AF')
     def test_wide_char_separator_decimal_point(self):
         # locale with wide char separator and decimal point
+        import locale
         Decimal = self.decimal.Decimal
 
-        try:
-            locale.setlocale(locale.LC_ALL, 'ps_AF')
-        except locale.Error:
+        decimal_point = locale.localeconv()['decimal_point']
+        thousands_sep = locale.localeconv()['thousands_sep']
+        if decimal_point != '\u066b' or thousands_sep != '\u066c':
             return
 
         self.assertEqual(format(Decimal('100000000.123'), 'n'),
                          '100\u066c000\u066c000\u066b123')
-        locale.resetlocale()
 
 class CFormatTest(FormatTest):
     decimal = C
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -1986,6 +1986,31 @@
          >>> suite.run(unittest.TestResult())
          <unittest.result.TestResult run=9 errors=0 failures=4>
 
+       The module need not contain any doctest examples:
+
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_doctests')
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
+       However, if DocTestSuite finds no docstrings, it raises an error:
+
+         >>> try:
+         ...     doctest.DocTestSuite('test.sample_doctest_no_docstrings')
+         ... except ValueError as e:
+         ...     error = e
+
+         >>> print(error.args[1])
+         has no docstrings
+
+       You can prevent this error by passing a DocTestFinder instance with
+       the `exclude_empty` keyword argument set to False:
+
+         >>> finder = doctest.DocTestFinder(exclude_empty=False)
+         >>> suite = doctest.DocTestSuite('test.sample_doctest_no_docstrings',
+         ...                              test_finder=finder)
+         >>> suite.run(unittest.TestResult())
+         <unittest.result.TestResult run=0 errors=0 failures=0>
+
        We can use the current module:
 
          >>> suite = test.sample_doctest.test_suite()
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -154,6 +154,11 @@
         err = err.replace("warning: Cannot initialize thread debugging"
                           " library: Debugger service failed\n",
                           '')
+        err = err.replace('warning: Could not load shared library symbols for '
+                          'linux-vdso.so.1.\n'
+                          'Do you need "set solib-search-path" or '
+                          '"set sysroot"?\n',
+                          '')
 
         # Ensure no unexpected error messages:
         self.assertEqual(err, '')
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -591,7 +591,7 @@
         self.assertTrue(os.path.exists('__pycache__'))
         self.assertTrue(os.path.exists(os.path.join(
             '__pycache__', '{}.{}.py{}'.format(
-            TESTFN, self.tag, __debug__ and 'c' or 'o'))))
+            TESTFN, self.tag, 'c' if __debug__ else 'o'))))
 
     @unittest.skipUnless(os.name == 'posix',
                          "test meaningful only on posix systems")
diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py
--- a/Lib/test/test_importlib/test_locks.py
+++ b/Lib/test/test_importlib/test_locks.py
@@ -1,4 +1,5 @@
 from importlib import _bootstrap
+import sys
 import time
 import unittest
 import weakref
@@ -41,6 +42,17 @@
 @unittest.skipUnless(threading, "threads needed for this test")
 class DeadlockAvoidanceTests(unittest.TestCase):
 
+    def setUp(self):
+        try:
+            self.old_switchinterval = sys.getswitchinterval()
+            sys.setswitchinterval(0.000001)
+        except AttributeError:
+            self.old_switchinterval = None
+
+    def tearDown(self):
+        if self.old_switchinterval is not None:
+            sys.setswitchinterval(self.old_switchinterval)
+
     def run_deadlock_avoidance_test(self, create_deadlock):
         NLOCKS = 10
         locks = [LockType(str(i)) for i in range(NLOCKS)]
@@ -75,10 +87,12 @@
 
     def test_deadlock(self):
         results = self.run_deadlock_avoidance_test(True)
-        # One of the threads detected a potential deadlock on its second
-        # acquire() call.
-        self.assertEqual(results.count((True, False)), 1)
-        self.assertEqual(results.count((True, True)), len(results) - 1)
+        # At least one of the threads detected a potential deadlock on its
+        # second acquire() call.  It may be several of them, because the
+        # deadlock avoidance mechanism is conservative.
+        nb_deadlocks = results.count((True, False))
+        self.assertGreaterEqual(nb_deadlocks, 1)
+        self.assertEqual(results.count((True, True)), len(results) - nb_deadlocks)
 
     def test_no_deadlock(self):
         results = self.run_deadlock_avoidance_test(False)
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -305,6 +305,18 @@
                     self.fail("Failed to raise TypeError with %s" %
                               ((base, trunc_result_base),))
 
+                # Regression test for bugs.python.org/issue16060.
+                class BadInt(trunc_result_base):
+                    def __int__(self):
+                        return 42.0
+
+                class TruncReturnsBadInt(base):
+                    def __trunc__(self):
+                        return BadInt()
+
+                with self.assertRaises(TypeError):
+                    int(TruncReturnsBadInt())
+
     def test_error_message(self):
         testlist = ('\xbd', '123\xbd', '  123 456  ')
         for s in testlist:
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2887,6 +2887,11 @@
         with self.open(support.TESTFN, 'rb') as f:
             self.assertEqual(b"spam", f.read())
 
+    def test_open_allargs(self):
+        # there used to be a buffer overflow in the parser for rawmode
+        self.assertRaises(ValueError, self.open, support.TESTFN, 'rwax+')
+
+
 class CMiscIOTest(MiscIOTest):
     io = io
 
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -53,7 +53,7 @@
     maxDiff = None
 
     _factory = None     # Overridden by subclasses to reuse tests
-    _template = 'From: foo\n\n%s'
+    _template = 'From: foo\n\n%s\n'
 
     def setUp(self):
         self._path = support.TESTFN
@@ -232,7 +232,7 @@
         key0 = self._box.add(self._template % 0)
         msg = self._box.get(key0)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertIs(self._box.get('foo'), None)
         self.assertIs(self._box.get('foo', False), False)
         self._box.close()
@@ -240,14 +240,14 @@
         key1 = self._box.add(self._template % 1)
         msg = self._box.get(key1)
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '1')
+        self.assertEqual(msg.get_payload(), '1\n')
 
     def test_getitem(self):
         # Retrieve message using __getitem__()
         key0 = self._box.add(self._template % 0)
         msg = self._box[key0]
         self.assertEqual(msg['from'], 'foo')
-        self.assertEqual(msg.get_payload(), '0')
+        self.assertEqual(msg.get_payload(), '0\n')
         self.assertRaises(KeyError, lambda: self._box['foo'])
         self._box.discard(key0)
         self.assertRaises(KeyError, lambda: self._box[key0])
@@ -259,7 +259,7 @@
         msg0 = self._box.get_message(key0)
         self.assertIsInstance(msg0, mailbox.Message)
         self.assertEqual(msg0['from'], 'foo')
-        self.assertEqual(msg0.get_payload(), '0')
+        self.assertEqual(msg0.get_payload(), '0\n')
         self._check_sample(self._box.get_message(key1))
 
     def test_get_bytes(self):
@@ -432,15 +432,15 @@
         self.assertIn(key0, self._box)
         key1 = self._box.add(self._template % 1)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key0).get_payload(), '0')
+        self.assertEqual(self._box.pop(key0).get_payload(), '0\n')
         self.assertNotIn(key0, self._box)
         self.assertIn(key1, self._box)
         key2 = self._box.add(self._template % 2)
         self.assertIn(key2, self._box)
-        self.assertEqual(self._box.pop(key2).get_payload(), '2')
+        self.assertEqual(self._box.pop(key2).get_payload(), '2\n')
         self.assertNotIn(key2, self._box)
         self.assertIn(key1, self._box)
-        self.assertEqual(self._box.pop(key1).get_payload(), '1')
+        self.assertEqual(self._box.pop(key1).get_payload(), '1\n')
         self.assertNotIn(key1, self._box)
         self.assertEqual(len(self._box), 0)
 
@@ -635,7 +635,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), '')
-        self.assertEqual(msg_returned.get_payload(), '1')
+        self.assertEqual(msg_returned.get_payload(), '1\n')
         msg2 = mailbox.MaildirMessage(self._template % 2)
         msg2.set_info('2,S')
         self._box[key] = msg2
@@ -643,7 +643,7 @@
         msg_returned = self._box.get_message(key)
         self.assertEqual(msg_returned.get_subdir(), 'new')
         self.assertEqual(msg_returned.get_flags(), 'S')
-        self.assertEqual(msg_returned.get_payload(), '3')
+        self.assertEqual(msg_returned.get_payload(), '3\n')
 
     def test_consistent_factory(self):
         # Add a message.
@@ -763,13 +763,13 @@
             self.assertIsNot(match, None, "Invalid file name: '%s'" % tail)
             groups = match.groups()
             if previous_groups is not None:
-                self.assertTrue(int(groups[0] >= previous_groups[0]),
+                self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]),
                              "Non-monotonic seconds: '%s' before '%s'" %
                              (previous_groups[0], groups[0]))
-                self.assertTrue(int(groups[1] >= previous_groups[1]) or
-                             groups[0] != groups[1],
-                             "Non-monotonic milliseconds: '%s' before '%s'" %
-                             (previous_groups[1], groups[1]))
+                if int(groups[0]) == int(previous_groups[0]):
+                    self.assertGreaterEqual(int(groups[1]), int(previous_groups[1]),
+                                "Non-monotonic milliseconds: '%s' before '%s'" %
+                                (previous_groups[1], groups[1]))
                 self.assertEqual(int(groups[2]), pid,
                              "Process ID mismatch: '%s' should be '%s'" %
                              (groups[2], pid))
@@ -996,20 +996,20 @@
 
     def test_add_from_string(self):
         # Add a string starting with 'From ' to the mailbox
-        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add('From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_from_bytes(self):
         # Add a byte string starting with 'From ' to the mailbox
-        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0')
+        key = self._box.add(b'From foo at bar blah\nFrom: foo\n\n0\n')
         self.assertEqual(self._box[key].get_from(), 'foo at bar blah')
-        self.assertEqual(self._box[key].get_payload(), '0')
+        self.assertEqual(self._box[key].get_payload(), '0\n')
 
     def test_add_mbox_or_mmdf_message(self):
         # Add an mboxMessage or MMDFMessage
         for class_ in (mailbox.mboxMessage, mailbox.MMDFMessage):
-            msg = class_('From foo at bar blah\nFrom: foo\n\n0')
+            msg = class_('From foo at bar blah\nFrom: foo\n\n0\n')
             key = self._box.add(msg)
 
     def test_open_close_open(self):
@@ -1116,6 +1116,29 @@
             perms = st.st_mode
             self.assertFalse((perms & 0o111)) # Execute bits should all be off.
 
+    def test_terminating_newline(self):
+        message = email.message.Message()
+        message['From'] = 'john at example.com'
+        message.set_payload('No newline at the end')
+        i = self._box.add(message)
+
+        # A newline should have been appended to the payload
+        message = self._box.get(i)
+        self.assertEqual(message.get_payload(), 'No newline at the end\n')
+
+    def test_message_separator(self):
+        # Check there's always a single blank line after each message
+        self._box.add('From: foo\n\n0')  # No newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+        self._box.add('From: foo\n\n0\n')  # Newline at the end
+        with open(self._path) as f:
+            data = f.read()
+            self.assertEqual(data[-3:], '0\n\n')
+
+
 class TestMMDF(_TestMboxMMDF, unittest.TestCase):
 
     _factory = lambda self, path, factory=None: mailbox.MMDF(path, factory)
diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -318,9 +318,9 @@
         self.assertEqual(memio.isatty(), False)
         self.assertEqual(memio.closed, False)
         memio.close()
-        self.assertEqual(memio.writable(), True)
-        self.assertEqual(memio.readable(), True)
-        self.assertEqual(memio.seekable(), True)
+        self.assertRaises(ValueError, memio.writable)
+        self.assertRaises(ValueError, memio.readable)
+        self.assertRaises(ValueError, memio.seekable)
         self.assertRaises(ValueError, memio.isatty)
         self.assertEqual(memio.closed, True)
 
@@ -665,7 +665,6 @@
         check(io.BytesIO(b'a'), basesize + 1 + 1 )
         check(io.BytesIO(b'a' * 1000), basesize + 1000 + 1 )
 
-
 class CStringIOTest(PyStringIOTest):
     ioclass = io.StringIO
     UnsupportedOperation = io.UnsupportedOperation
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -488,6 +488,15 @@
         f.flush ()
         return mmap.mmap (f.fileno(), 0)
 
+    def test_empty_file (self):
+        f = open (TESTFN, 'w+b')
+        f.close()
+        with open(TESTFN, "rb") as f :
+            self.assertRaisesRegex(ValueError,
+                                   "cannot mmap an empty file",
+                                   mmap.mmap, f.fileno(), 0,
+                                   access=mmap.ACCESS_READ)
+
     def test_offset (self):
         f = open (TESTFN, 'w+b')
 
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -1727,7 +1727,8 @@
             with multiprocessing.Pool(2) as p:
                 r = p.map_async(sqr, L)
                 self.assertEqual(r.get(), expected)
-            self.assertRaises(AssertionError, p.map_async, sqr, L)
+            print(p._state)
+            self.assertRaises(ValueError, p.map_async, sqr, L)
 
 def raising():
     raise KeyError("key")
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -514,23 +514,23 @@
         return os.environ
 
     # Bug 1110478
+    @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
     def test_update2(self):
         os.environ.clear()
-        if os.path.exists("/bin/sh"):
-            os.environ.update(HELLO="World")
-            with os.popen("/bin/sh -c 'echo $HELLO'") as popen:
-                value = popen.read().strip()
-                self.assertEqual(value, "World")
+        os.environ.update(HELLO="World")
+        with os.popen("/bin/sh -c 'echo $HELLO'") as popen:
+            value = popen.read().strip()
+            self.assertEqual(value, "World")
 
+    @unittest.skipUnless(os.path.exists('/bin/sh'), 'requires /bin/sh')
     def test_os_popen_iter(self):
-        if os.path.exists("/bin/sh"):
-            with os.popen(
-                "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen:
-                it = iter(popen)
-                self.assertEqual(next(it), "line1\n")
-                self.assertEqual(next(it), "line2\n")
-                self.assertEqual(next(it), "line3\n")
-                self.assertRaises(StopIteration, next, it)
+        with os.popen(
+            "/bin/sh -c 'echo \"line1\nline2\nline3\"'") as popen:
+            it = iter(popen)
+            self.assertEqual(next(it), "line1\n")
+            self.assertEqual(next(it), "line2\n")
+            self.assertEqual(next(it), "line3\n")
+            self.assertRaises(StopIteration, next, it)
 
     # Verify environ keys and values from the OS are of the
     # correct str type.
diff --git a/Lib/test/test_pyexpat.py b/Lib/test/test_pyexpat.py
--- a/Lib/test/test_pyexpat.py
+++ b/Lib/test/test_pyexpat.py
@@ -641,6 +641,16 @@
         parser.Parse("<?xml version='1.0'?><element/>")
         self.assertEqual(handler_call_args, [(None, None)])
 
+        # test UseForeignDTD() is equal to UseForeignDTD(True)
+        handler_call_args[:] = []
+
+        parser = expat.ParserCreate()
+        parser.UseForeignDTD()
+        parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_ALWAYS)
+        parser.ExternalEntityRefHandler = resolve_entity
+        parser.Parse("<?xml version='1.0'?><element/>")
+        self.assertEqual(handler_call_args, [(None, None)])
+
     def test_ignore_use_foreign_dtd(self):
         """
         If UseForeignDTD is passed True and a document with an external
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1245,6 +1245,17 @@
             fp.close()
             self.assertEqual(repr(fp), "<_io.BufferedReader name=-1>")
 
+    def test_unusable_closed_socketio(self):
+        with socket.socket() as sock:
+            fp = sock.makefile("rb", buffering=0)
+            self.assertTrue(fp.readable())
+            self.assertFalse(fp.writable())
+            self.assertFalse(fp.seekable())
+            fp.close()
+            self.assertRaises(ValueError, fp.readable)
+            self.assertRaises(ValueError, fp.writable)
+            self.assertRaises(ValueError, fp.seekable)
+
     def test_pickle(self):
         sock = socket.socket()
         with sock:
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -125,12 +125,8 @@
         else:
             self.assertRaises(ssl.SSLError, ssl.RAND_bytes, 16)
 
-        try:
-            ssl.RAND_egd(1)
-        except TypeError:
-            pass
-        else:
-            print("didn't raise TypeError")
+        self.assertRaises(TypeError, ssl.RAND_egd, 1)
+        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
         ssl.RAND_add("this is a random string", 75.0)
 
     def test_parse_cert(self):
diff --git a/Lib/test/test_startfile.py b/Lib/test/test_startfile.py
--- a/Lib/test/test_startfile.py
+++ b/Lib/test/test_startfile.py
@@ -10,8 +10,8 @@
 import unittest
 from test import support
 import os
+import sys
 from os import path
-from time import sleep
 
 startfile = support.get_attribute(os, 'startfile')
 
@@ -21,13 +21,12 @@
         self.assertRaises(OSError, startfile, "nonexisting.vbs")
 
     def test_empty(self):
-        empty = path.join(path.dirname(__file__), "empty.vbs")
-        startfile(empty)
-        startfile(empty, "open")
-        # Give the child process some time to exit before we finish.
-        # Otherwise the cleanup code will not be able to delete the cwd,
-        # because it is still in use.
-        sleep(0.1)
+        # Switch to an existing, but safe, working directory to let the
+        # cleanup code do its thing without permission errors.
+        with support.temp_cwd(path=path.dirname(sys.executable)):
+            empty = path.join(path.dirname(__file__), "empty.vbs")
+            startfile(empty)
+            startfile(empty, "open")
 
 def test_main():
     support.run_unittest(TestCase)
diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
--- a/Lib/test/test_super.py
+++ b/Lib/test/test_super.py
@@ -115,6 +115,21 @@
                 return __class__
         self.assertIs(X.f(), X)
 
+    def test_obscure_super_errors(self):
+        def f():
+            super()
+        self.assertRaises(RuntimeError, f)
+        def f(x):
+            del x
+            super()
+        self.assertRaises(RuntimeError, f, None)
+        class X:
+            def f(x):
+                nonlocal __class__
+                del __class__
+                super()
+        self.assertRaises(RuntimeError, X().f)
+
 
 def test_main():
     support.run_unittest(TestSuper)
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py
--- a/Lib/test/test_support.py
+++ b/Lib/test/test_support.py
@@ -95,6 +95,15 @@
         self.assertFalse(os.path.exists(TESTFN))
         self.assertTrue(os.path.basename(os.getcwd()), here)
 
+    def test_temp_cwd__chdir_warning(self):
+        """Check the warning message when os.chdir() fails."""
+        path = TESTFN + '_does_not_exist'
+        with support.check_warnings() as recorder:
+            with support.temp_cwd(path=path, quiet=True):
+                pass
+            messages = [str(w.message) for w in recorder.warnings]
+        self.assertEqual(messages, ['tests may fail, unable to change the CWD to ' + path])
+
     def test_sortdict(self):
         self.assertEqual(support.sortdict({3:3, 2:2, 1:1}), "{1: 1, 2: 2, 3: 3}")
 
diff --git a/Lib/test/test_textwrap.py b/Lib/test/test_textwrap.py
--- a/Lib/test/test_textwrap.py
+++ b/Lib/test/test_textwrap.py
@@ -22,7 +22,7 @@
             result = []
             for i in range(len(textin)):
                 result.append("  %d: %r" % (i, textin[i]))
-            result = '\n'.join(result)
+            result = "\n".join(result) if result else "  no lines"
         elif isinstance(textin, str):
             result = "  %s\n" % repr(textin)
         return result
@@ -66,6 +66,15 @@
                          "I'm glad to hear it!"])
         self.check_wrap(text, 80, [text])
 
+    def test_empty_string(self):
+        # Check that wrapping the empty string returns an empty list.
+        self.check_wrap("", 6, [])
+        self.check_wrap("", 6, [], drop_whitespace=False)
+
+    def test_empty_string_with_initial_indent(self):
+        # Check that the empty string is not indented.
+        self.check_wrap("", 6, [], initial_indent="++")
+        self.check_wrap("", 6, [], initial_indent="++", drop_whitespace=False)
 
     def test_whitespace(self):
         # Whitespace munging and end-of-sentence detection
@@ -331,7 +340,32 @@
                          ["blah", " ", "(ding", " ", "dong),",
                           " ", "wubba"])
 
-    def test_initial_whitespace(self):
+    def test_drop_whitespace_false(self):
+        # Check that drop_whitespace=False preserves whitespace.
+        # SF patch #1581073
+        text = " This is a    sentence with     much whitespace."
+        self.check_wrap(text, 10,
+                        [" This is a", "    ", "sentence ",
+                         "with     ", "much white", "space."],
+                        drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only(self):
+        # Check that drop_whitespace=False preserves a whitespace-only string.
+        self.check_wrap("   ", 6, ["   "], drop_whitespace=False)
+
+    def test_drop_whitespace_false_whitespace_only_with_indent(self):
+        # Check that a whitespace-only string gets indented (when
+        # drop_whitespace is False).
+        self.check_wrap("   ", 6, ["     "], drop_whitespace=False,
+                        initial_indent="  ")
+
+    def test_drop_whitespace_whitespace_only(self):
+        # Check drop_whitespace on a whitespace-only string.
+        self.check_wrap("  ", 6, [])
+
+    def test_drop_whitespace_leading_whitespace(self):
+        # Check that drop_whitespace does not drop leading whitespace (if
+        # followed by non-whitespace).
         # SF bug #622849 reported inconsistent handling of leading
         # whitespace; let's test that a bit, shall we?
         text = " This is a sentence with leading whitespace."
@@ -340,13 +374,27 @@
         self.check_wrap(text, 30,
                         [" This is a sentence with", "leading whitespace."])
 
-    def test_no_drop_whitespace(self):
-        # SF patch #1581073
-        text = " This is a    sentence with     much whitespace."
-        self.check_wrap(text, 10,
-                        [" This is a", "    ", "sentence ",
-                         "with     ", "much white", "space."],
+    def test_drop_whitespace_whitespace_line(self):
+        # Check that drop_whitespace skips the whole line if a non-leading
+        # line consists only of whitespace.
+        text = "abcd    efgh"
+        # Include the result for drop_whitespace=False for comparison.
+        self.check_wrap(text, 6, ["abcd", "    ", "efgh"],
                         drop_whitespace=False)
+        self.check_wrap(text, 6, ["abcd", "efgh"])
+
+    def test_drop_whitespace_whitespace_only_with_indent(self):
+        # Check that initial_indent is not applied to a whitespace-only
+        # string.  This checks a special case of the fact that dropping
+        # whitespace occurs before indenting.
+        self.check_wrap("  ", 6, [], initial_indent="++")
+
+    def test_drop_whitespace_whitespace_indent(self):
+        # Check that drop_whitespace does not drop whitespace indents.
+        # This checks a special case of the fact that dropping whitespace
+        # occurs before indenting.
+        self.check_wrap("abcd efgh", 6, ["  abcd", "  efgh"],
+                        initial_indent="  ", subsequent_indent="  ")
 
     def test_split(self):
         # Ensure that the standard _split() method works as advertised
diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py
--- a/Lib/test/test_threaded_import.py
+++ b/Lib/test/test_threaded_import.py
@@ -225,9 +225,11 @@
 @reap_threads
 def test_main():
     old_switchinterval = None
+    # Issue #15599: FreeBSD/KVM cannot handle gil_interval == 1.
+    new_switchinterval = 0.00001 if 'freebsd' in sys.platform else 0.00000001
     try:
         old_switchinterval = sys.getswitchinterval()
-        sys.setswitchinterval(0.00000001)
+        sys.setswitchinterval(new_switchinterval)
     except AttributeError:
         pass
     try:
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -791,7 +791,7 @@
         self.assertEqual(C.y, 1)
         self.assertEqual(C.z, 2)
 
-    def test_new_class_exec_body(self):
+    def test_new_class_metaclass_keywords(self):
         #Test that keywords are passed to the metaclass:
         def meta_func(name, bases, ns, **kw):
             return name, bases, ns, kw
diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/test_webbrowser.py
@@ -0,0 +1,192 @@
+import webbrowser
+import unittest
+import subprocess
+from unittest import mock
+from test import support
+
+
+URL = 'http://www.example.com'
+CMD_NAME = 'test'
+
+
+class PopenMock(mock.MagicMock):
+
+    def poll(self):
+        return 0
+
+    def wait(self, seconds=None):
+        return 0
+
+
+class CommandTestMixin:
+
+    def _test(self, meth, *, args=[URL], kw={}, options, arguments):
+        """Given a web browser instance method name along with arguments and
+        keywords for same (which defaults to the single argument URL), creates
+        a browser instance from the class pointed to by self.browser, calls the
+        indicated instance method with the indicated arguments, and compares
+        the resulting options and arguments passed to Popen by the browser
+        instance against the 'options' and 'args' lists.  Options are compared
+        in a position independent fashion, and the arguments are compared in
+        sequence order to whatever is left over after removing the options.
+
+        """
+        popen = PopenMock()
+        support.patch(self, subprocess, 'Popen', popen)
+        browser = self.browser_class(name=CMD_NAME)
+        getattr(browser, meth)(*args, **kw)
+        popen_args = subprocess.Popen.call_args[0][0]
+        self.assertEqual(popen_args[0], CMD_NAME)
+        popen_args.pop(0)
+        for option in options:
+            self.assertIn(option, popen_args)
+            popen_args.pop(popen_args.index(option))
+        self.assertEqual(popen_args, arguments)
+
+
+class GenericBrowserCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.GenericBrowser
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+
+class BackgroundBrowserCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.BackgroundBrowser
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+
+class ChromeCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Chrome
+
+    def test_open(self):
+        self._test('open',
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=[],
+                   arguments=[URL])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['--new-window'],
+                   arguments=[URL])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=[],
+                   arguments=[URL])
+
+
+class MozillaCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Mozilla
+
+    def test_open(self):
+        self._test('open',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-noraise', '-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-raise', '-remote'],
+                   arguments=['openURL({},new-tab)'.format(URL)])
+
+
+class GaleonCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Galeon
+
+    def test_open(self):
+        self._test('open',
+                   options=['-n'],
+                   arguments=[URL])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-noraise', '-n'],
+                   arguments=[URL])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-w'],
+                   arguments=[URL])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-w'],
+                   arguments=[URL])
+
+
+class OperaCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Opera
+
+    def test_open(self):
+        self._test('open',
+                   options=['-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open', kw=dict(autoraise=False),
+                   options=['-remote', '-noraise'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new_tab',
+                   options=['-remote'],
+                   arguments=['openURL({},new-page)'.format(URL)])
+
+
+class ELinksCommandTest(CommandTestMixin, unittest.TestCase):
+
+    browser_class = webbrowser.Elinks
+
+    def test_open(self):
+        self._test('open', options=['-remote'],
+                           arguments=['openURL({})'.format(URL)])
+
+    def test_open_with_autoraise_false(self):
+        self._test('open',
+                   options=['-remote'],
+                   arguments=['openURL({})'.format(URL)])
+
+    def test_open_new(self):
+        self._test('open_new',
+                   options=['-remote'],
+                   arguments=['openURL({},new-window)'.format(URL)])
+
+    def test_open_new_tab(self):
+        self._test('open_new_tab',
+                   options=['-remote'],
+                   arguments=['openURL({},new-tab)'.format(URL)])
+
+
+if __name__=='__main__':
+    unittest.main()
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1809,6 +1809,18 @@
         mye = MyElement('joe')
         self.assertEqual(mye.newmethod(), 'joe')
 
+    def test_html_empty_elems_serialization(self):
+        # issue 15970
+        # from http://www.w3.org/TR/html401/index/elements.html
+        for element in ['AREA', 'BASE', 'BASEFONT', 'BR', 'COL', 'FRAME', 'HR',
+                        'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM']:
+            for elem in [element, element.lower()]:
+                expected = '<%s>' % elem
+                serialized = serialize(ET.XML('<%s />' % elem), method='html')
+                self.assertEqual(serialized, expected)
+                serialized = serialize(ET.XML('<%s></%s>' % (elem,elem)),
+                                       method='html')
+                self.assertEqual(serialized, expected)
 
 class ElementIterTest(unittest.TestCase):
     def _ilist(self, elem, tag=None):
diff --git a/Lib/test/test_zipimport_support.py b/Lib/test/test_zipimport_support.py
--- a/Lib/test/test_zipimport_support.py
+++ b/Lib/test/test_zipimport_support.py
@@ -29,7 +29,8 @@
 #  test_cmd_line_script (covers the zipimport support in runpy)
 
 # Retrieve some helpers from other test cases
-from test import test_doctest, sample_doctest
+from test import (test_doctest, sample_doctest, sample_doctest_no_doctests,
+                  sample_doctest_no_docstrings)
 
 
 def _run_object_doctest(obj, module):
@@ -105,16 +106,26 @@
                                     "test_zipped_doctest")
         test_src = test_src.replace("test.sample_doctest",
                                     "sample_zipped_doctest")
-        sample_src = inspect.getsource(sample_doctest)
-        sample_src = sample_src.replace("test.test_doctest",
-                                        "test_zipped_doctest")
+        # The sample doctest files rewritten to include in the zipped version.
+        sample_sources = {}
+        for mod in [sample_doctest, sample_doctest_no_doctests,
+                    sample_doctest_no_docstrings]:
+            src = inspect.getsource(mod)
+            src = src.replace("test.test_doctest", "test_zipped_doctest")
+            # Rewrite the module name so that, for example,
+            # "test.sample_doctest" becomes "sample_zipped_doctest".
+            mod_name = mod.__name__.split(".")[-1]
+            mod_name = mod_name.replace("sample_", "sample_zipped_")
+            sample_sources[mod_name] = src
+
         with temp_dir() as d:
             script_name = make_script(d, 'test_zipped_doctest',
                                             test_src)
             zip_name, run_name = make_zip_script(d, 'test_zip',
                                                 script_name)
             z = zipfile.ZipFile(zip_name, 'a')
-            z.writestr("sample_zipped_doctest.py", sample_src)
+            for mod_name, src in sample_sources.items():
+                z.writestr(mod_name + ".py", src)
             z.close()
             if verbose:
                 zip_file = zipfile.ZipFile(zip_name, 'r')
diff --git a/Lib/unittest/__main__.py b/Lib/unittest/__main__.py
--- a/Lib/unittest/__main__.py
+++ b/Lib/unittest/__main__.py
@@ -2,7 +2,14 @@
 
 import sys
 if sys.argv[0].endswith("__main__.py"):
-    sys.argv[0] = "python -m unittest"
+    import os.path
+    # We change sys.argv[0] to make help message more useful
+    # use executable without path, unquoted
+    # (it's just a hint anyway)
+    # (if you have spaces in your executable you get what you deserve!)
+    executable = os.path.basename(sys.executable)
+    sys.argv[0] = executable + " -m unittest"
+    del os
 
 __unittest = True
 
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -731,8 +731,8 @@
         arguments."""
         self = _mock_self
         if not self.call_count == 1:
-            msg = ("Expected to be called once. Called %s times." %
-                   self.call_count)
+            msg = ("Expected '%s' to be called once. Called %s times." %
+                   (self._mock_name or 'mock', self.call_count))
             raise AssertionError(msg)
         return self.assert_called_with(*args, **kwargs)
 
diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -35,7 +35,7 @@
     separator2 = '-' * 70
 
     def __init__(self, stream, descriptions, verbosity):
-        super(TextTestResult, self).__init__()
+        super(TextTestResult, self).__init__(stream, descriptions, verbosity)
         self.stream = stream
         self.showAll = verbosity > 1
         self.dots = verbosity == 1
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -149,6 +149,19 @@
         self.assertEqual(runner.resultclass, unittest.TextTestResult)
 
 
+    def test_multiple_inheritance(self):
+        class AResult(unittest.TestResult):
+            def __init__(self, stream, descriptions, verbosity):
+                super(AResult, self).__init__(stream, descriptions, verbosity)
+
+        class ATextResult(unittest.TextTestResult, AResult):
+            pass
+
+        # This used to raise an exception due to TextTestResult not passing
+        # on arguments in its __init__ super call
+        ATextResult(None, None, 1)
+
+
     def testBufferAndFailfast(self):
         class Test(unittest.TestCase):
             def testFoo(self):
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -463,6 +463,13 @@
                                 mock.assert_called_with)
 
 
+    def test_assert_called_once_with_message(self):
+        mock = Mock(name='geoffrey')
+        self.assertRaisesRegex(AssertionError,
+                     r"Expected 'geoffrey' to be called once\.",
+                     mock.assert_called_once_with)
+
+
     def test__name__(self):
         mock = Mock()
         self.assertRaises(AttributeError, lambda: mock.__name__)
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py
--- a/Lib/webbrowser.py
+++ b/Lib/webbrowser.py
@@ -206,12 +206,18 @@
     """Parent class for all Unix browsers with remote functionality."""
 
     raise_opts = None
+    background = False
+    redirect_stdout = True
+    # In remote_args, %s will be replaced with the requested URL.  %action will
+    # be replaced depending on the value of 'new' passed to open.
+    # remote_action is used for new=0 (open).  If newwin is not None, it is
+    # used for new=1 (open_new).  If newtab is not None, it is used for
+    # new=3 (open_new_tab).  After both substitutions are made, any empty
+    # strings in the transformed remote_args list will be removed.
     remote_args = ['%action', '%s']
     remote_action = None
     remote_action_newwin = None
     remote_action_newtab = None
-    background = False
-    redirect_stdout = True
 
     def _invoke(self, args, remote, autoraise):
         raise_opt = []
@@ -224,7 +230,7 @@
         cmdline = [self.name] + raise_opt + args
 
         if remote or self.background:
-            inout = io.open(os.devnull, "r+")
+            inout = subprocess.DEVNULL
         else:
             # for TTY browsers, we need stdin/out
             inout = None
@@ -264,6 +270,7 @@
 
         args = [arg.replace("%s", url).replace("%action", action)
                 for arg in self.remote_args]
+        args = [arg for arg in args if arg]
         success = self._invoke(args, True, autoraise)
         if not success:
             # remote invocation failed, try straight way
@@ -347,7 +354,7 @@
         else:
             action = "openURL"
 
-        devnull = io.open(os.devnull, "r+")
+        devnull = subprocess.DEVNULL
         # if possible, put browser in separate process group, so
         # keyboard interrupts don't affect browser as well as Python
         setsid = getattr(os, 'setsid', None)
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@ -995,7 +995,7 @@
         write(_escape_cdata(elem.tail))
 
 HTML_EMPTY = ("area", "base", "basefont", "br", "col", "frame", "hr",
-              "img", "input", "isindex", "link", "meta" "param")
+              "img", "input", "isindex", "link", "meta", "param")
 
 try:
     HTML_EMPTY = set(HTML_EMPTY)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -229,8 +229,8 @@
 
 ##########################################################################
 # Grammar
-GRAMMAR_H=	$(srcdir)/Include/graminit.h
-GRAMMAR_C=	$(srcdir)/Python/graminit.c
+GRAMMAR_H=	Include/graminit.h
+GRAMMAR_C=	Python/graminit.c
 GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
 
 
@@ -296,9 +296,9 @@
 
 ##########################################################################
 # AST
-AST_H_DIR=	$(srcdir)/Include
+AST_H_DIR=	Include
 AST_H=		$(AST_H_DIR)/Python-ast.h
-AST_C_DIR=	$(srcdir)/Python
+AST_C_DIR=	Python
 AST_C=		$(AST_C_DIR)/Python-ast.c
 AST_ASDL=	$(srcdir)/Parser/Python.asdl
 
@@ -474,8 +474,13 @@
 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
 
 # Build the shared modules
+# MAKEFLAGS are sorted and normalized. Under GNU make the 's' for
+# -s, --silent or --quiet is always the first char.
 sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
-	case $$MAKEFLAGS in *s*) quiet=-q; esac; \
+	@case "$$MAKEFLAGS" in \
+	    s*) quiet="-q";; \
+	    *) quiet="";; \
+	esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 
@@ -660,9 +665,11 @@
 Parser/pgenmain.o:	$(srcdir)/Include/parsetok.h
 
 $(AST_H): $(AST_ASDL) $(ASDLGEN_FILES)
+	$(MKDIR_P) $(AST_H_DIR)
 	$(ASDLGEN) -h $(AST_H_DIR) $(AST_ASDL)
 
 $(AST_C): $(AST_H) $(AST_ASDL) $(ASDLGEN_FILES)
+	$(MKDIR_P) $(AST_C_DIR)
 	$(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
 
 Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -11,6 +11,8 @@
 PS: In the standard Python distribution, this file is encoded in UTF-8
 and the list is in rough alphabetical order by last names.
 
+Aahz
+Michael Abbott
 Rajiv Abraham
 David Abrahams
 Marc Abramowitz
@@ -22,26 +24,32 @@
 Nir Aides
 Yaniv Aknin
 Jyrki Alakuijala
+Steve Alexander
+Fred Allen
 Ray Allen
 Billy G. Allie
 Kevin Altis
 Joe Amenta
+A. Amoroso
 Mark Anacker
 Shashwat Anand
 Anders Andersen
 John Anderson
+Pehr Anderson
 Erik Anders?n
 Oliver Andrich
 Ross Andrus
 Juancarlo A?ez
 J?r?my Anger
 Jon Anglin
+Heidi Annexstad
 ?ric Araujo
 Alicia Arlen
 Jason Asbahr
 David Ascher
 Chris AtLee
 Aymeric Augustin
+Jes?s Cea Avi?n
 John Aycock
 Donovan Baarda
 Attila Babo
@@ -52,8 +60,10 @@
 Greg Ball
 Luigi Ballabio
 Jeff Balogh
+Manuel Balsera
 Matt Bandy
 Michael J. Barber
+Daniel Barclay
 Nicolas Bareil
 Chris Barker
 Anton Barkovsky
@@ -64,6 +74,7 @@
 Cesar Eduardo Barros
 Des Barry
 Ulf Bartelt
+Don Bashford
 Pior Bastida
 Nick Bastin
 Jeff Bauer
@@ -85,6 +96,7 @@
 Eli Bendersky
 Andrew Bennetts
 Andy Bensky
+Bennett Benson
 Ezra Berch
 Michel Van den Bergh
 Julian Berman
@@ -100,6 +112,7 @@
 Philippe Biondi
 Stuart Bishop
 Roy Bixler
+Jonathan Black
 Renaud Blanch
 Mike Bland
 Martin Bless
@@ -109,6 +122,7 @@
 Finn Bock
 Paul Boddie
 Matthew Boedicker
+Robin Boerdijk
 David Bolen
 Gawain Bolton
 Forest Bond
@@ -120,7 +134,9 @@
 Eric Bouck
 Thierry Bousch
 Sebastian Boving
+Michal Bozon
 Jeff Bradberry
+Aaron Brancotti
 Monty Brandenberg
 Georg Brandl
 Christopher Brannon
@@ -130,6 +146,7 @@
 Dave Brennan
 Tom Bridgman
 Anthony Briggs
+Keith Briggs
 Tobias Brink
 Richard Brodie
 Michael Broghton
@@ -140,6 +157,7 @@
 Oleg Broytmann
 Dave Brueck
 Francisco Mart?n Brugu?
+Ian Bruntlett
 Floris Bruynooghe
 Stan Bubrouski
 Erik de Bueger
@@ -167,6 +185,7 @@
 Charles Cazabon
 Per Cederqvist
 Matej Cepl
+Carl Cerecke
 Octavian Cerna
 Pascal Chambon
 John Chandler
@@ -186,8 +205,10 @@
 Anders Chrigstr?m
 Tom Christiansen
 Vadim Chugunov
+Mauro Cicognini
 David Cinege
 Craig Citro
+Gilles Civario
 Chris Clark
 Mike Clarkson
 Andrew Clegg
@@ -222,6 +243,7 @@
 Matthew Dixon Cowles
 Ryan Coyner
 Christopher A. Craig
+Jeremy Craven
 Laura Creighton
 Simon Cross
 Drew Csillag
@@ -249,6 +271,7 @@
 Konrad Delong
 Erik Demaine
 John Dennis
+L. Peter Deutsch
 Roger Dev
 Philippe Devalkeneer
 Raghuram Devarakonda
@@ -265,6 +288,7 @@
 Josip Djolonga
 Jaromir Dolecek
 Ismail Donmez
+Robert Donohue
 Marcos Donolo
 Dima Dorfman
 Yves Dorfsman
@@ -274,6 +298,7 @@
 Derk Drukker
 John DuBois
 Paul Dubois
+Jacques Ducasse
 Graham Dumpleton
 Quinn Dunkan
 Robin Dunn
@@ -282,6 +307,7 @@
 Andy Dustman
 Gary Duzan
 Eugene Dvurechenski
+Josip Dzolonga
 Maxim Dzumanenko
 Walter D?rwald
 Hans Eckardt
@@ -327,19 +353,23 @@
 Sebastian Fernandez
 Florian Festi
 John Feuerstein
+Carl Feynman
 Vincent Fiack
 Tomer Filiba
 Jeffrey Finkelstein
 Russell Finn
+Dan Finnie
 Nils Fischbeck
 Frederik Fix
 Matt Fleming
 Hern?n Mart?nez Foffani
+Arnaud Fontaine
 Michael Foord
 Amaury Forgeot d'Arc
 Doug Fort
 John Fouhy
 Andrew Francis
+Stefan Franke
 Martin Franklin
 Bruce Frederiksen
 Robin Friedrich
@@ -360,6 +390,7 @@
 Lele Gaifax
 Santiago Gala
 Yitzchak Gale
+Matthew Gallagher
 Quentin Gallet-Gilles
 Riccardo Attilio Galli
 Raymund Galvin
@@ -376,25 +407,31 @@
 Gabriel Genellina
 Christos Georgiou
 Ben Gertzfield
+Nadim Ghaznavi
 Dinu Gherman
 Jonathan Giddy
 Johannes Gijsbers
 Michael Gilfix
 Yannick Gingras
+Matt Giuca
 Michael Goderbauer
 Christoph Gohlke
 Tim Golden
 Guilherme Gon?alves
 Tiago Gon?alves
 Chris Gonnerman
+Shelley Gooch
 David Goodger
 Hans de Graaff
+Nathaniel Gray
 Eddy De Greef
+Grant Griffin
 Duncan Grisby
 Fabian Groffen
 Eric Groo
 Dag Gruneau
 Filip Gruszczy?ski
+Thomas Guettler
 Michael Guravage
 Lars Gust?bel
 Thomas G?ttler
@@ -410,7 +447,9 @@
 Jesse Hallio
 Jun Hamano
 Alexandre Hamelin
+Anders Hammarquist
 Mark Hammond
+Harald Hanche-Olsen
 Manus Hand
 Milton L. Hankins
 Stephen Hansen
@@ -420,8 +459,11 @@
 Jason Harper
 Brian Harring
 Jonathan Hartley
+Travis B. Hartwell
 Larry Hastings
+Tim Hatch
 Shane Hathaway
+Janko Hauser
 Rycharde Hawkes
 Ben Hayden
 Jochen Hayek
@@ -451,10 +493,13 @@
 Joerg-Cyril Hoehle
 Gregor Hoffleit
 Chris Hoffman
+Stefan Hoffmeister
 Albert Hofkamp
 Tomas Hoger
 Jonathan Hogg
+Steve Holden
 Akintayo Holder
+Thomas Holenstein
 Gerrit Holl
 Shane Holloway
 Rune Holm
@@ -494,6 +539,7 @@
 Tony Ingraldi
 John Interrante
 Bob Ippolito
+Roger Irwin
 Atsuo Ishimoto
 Adam Jackson
 Ben Jackson
@@ -511,12 +557,15 @@
 Julien Jehannet
 Drew Jenkins
 Flemming Kj?r Jensen
+Philip H. Jensen
 MunSic Jeong
 Chris Jerdonek
 Jim Jewett
+Pedro Diaz Jimenez
 Orjan Johansen
 Fredrik Johansson
 Gregory K. Johnson
+Kent Johnson
 Simon Johnston
 Matt Joiner
 Thomas Jollans
@@ -549,16 +598,19 @@
 Dan Kenigsberg
 Randall Kern
 Robert Kern
+Jim Kerr
 Magnus Kessler
 Lawrence Kesteloot
 Vivek Khera
 Mads Kiilerich
 Jason Killen
+Jan Kim
 Taek Joo Kim
 W. Trevor King
 Paul Kippes
 Steve Kirsch
 Sebastian Kirsche
+Kamil Kisiel
 Akira Kitada
 Ron Klatchko
 Reid Kleckner
@@ -574,11 +626,14 @@
 Greg Kochanski
 Damon Kohler
 Marko Kohtala
+Guido Kollerie
 Jacek Konieczny
 ???? ?????????
 Arkady Koplyarov
+Peter A. Koren
 Vlad Korolev
 Joseph Koshy
+Daniel Kozan
 Jerzy Kozera
 Maksim Kozyarchuk
 Stefan Krah
@@ -592,10 +647,13 @@
 Andrej Krpic
 Ivan Krsti?
 Andrew Kuchling
+Dave Kuhlman
 Jon Kuhn
 Vladimir Kushnir
+Erno Kuusela
 Ross Lagerwall
 Cameron Laird
+Thomas Lamb
 Jean-Baptiste "Jiba" Lamy
 Ronan Lamy
 Torsten Landschoff
@@ -619,6 +677,7 @@
 Thomas Lee
 Tennessee Leeuwenburg
 Luc Lefebvre
+Glyph Lefkowitz
 Vincent Legoll
 Kip Lehman
 Joerg Lehmann
@@ -626,7 +685,7 @@
 Petri Lehtinen
 Luke Kenneth Casson Leighton
 Tshepang Lekhonkhobe
-Marc-Andre Lemburg
+Marc-Andr? Lemburg
 John Lenton
 Christopher Tur Lesniewski-Laas
 Alain Leufroy
@@ -638,12 +697,16 @@
 Ross Light
 Shawn Ligocki
 Martin Ligr
+Gediminas Liktaras
 Grant Limberg
 Christopher Lindblad
+Ulf A. Lindgren
 Bj?rn Lindqvist
 Per Lindqvist
 Eric Lindvall
 Gregor Lingl
+Everett Lipman
+Mirko Liss
 Nick Lockwood
 Stephanie Lockwood
 Hugo Lopes Tavares
@@ -661,6 +724,8 @@
 Mikael Lyngvig
 Martin von L?wis
 Guillermo L?pez-Anglada
+Jeff MacDonald
+John Machin
 Andrew I MacIntyre
 Tim MacKenzie
 Nick Maclaren
@@ -671,20 +736,25 @@
 Ken Manheimer
 Vladimir Marangozov
 Colin Marc
+Vincent Marchetti
 David Marek
 Doug Marien
 Sven Marnach
 Alex Martelli
 Anthony Martin
 Owen Martin
+Westley Mart?nez
 S?bastien Martini
 Sidney San Mart?n
 Roger Masse
 Nick Mathewson
 Simon Mathieu
+Laura Matson
 Graham Matthews
 Dieter Maurer
+Daniel May
 Arnaud Mazin
+Rebecca McCreary
 Kirk McDonald
 Chris McDonough
 Greg McFarlane
@@ -699,6 +769,7 @@
 Bill van Melle
 Lucas Prado Melo
 Ezio Melotti
+Doug Mennella
 Brian Merrell
 Luke Mewburn
 Carl Meyer
@@ -711,6 +782,7 @@
 Stan Mihai
 Stefan Mihaila
 Aristotelis Mikropoulos
+Paolo Milani
 Chad Miller
 Damien Miller
 Jason V. Miller
@@ -727,9 +799,11 @@
 Skip Montanaro
 Peter Moody
 Paul Moore
+Ross Moore
 Derek Morr
 James A Morrison
 Derek McTavish Mounce
+Alessandro Moura
 Pablo Mouzo
 Mher Movsisyan
 Ruslan Mstoi
@@ -740,6 +814,7 @@
 Neil Muller
 Louis Munro
 R. David Murray
+Dale Nagata
 John Nagle
 Takahiro Nakayama
 Travers Naran
@@ -771,13 +846,16 @@
 John O'Connor
 Kevin O'Connor
 Tim O'Malley
+Zooko O'Whielacronx
 James Oakley
 Jon Oberheide
 Pascal Oberndoerfer
 Jeffrey Ollie
 Adam Olsen
 Grant Olson
+Koray Oner
 Piet van Oostrum
+Tomas Oppelstrup
 Jason Orendorff
 Douglas Orr
 Michele Orr?
@@ -787,6 +865,8 @@
 Michael Otteneder
 R. M. Oudkerk
 Russel Owen
+Joonas Paalasmaa
+Shriphani Palakodety
 Ondrej Palkovsky
 Mike Pall
 Todd R. Palmer
@@ -796,8 +876,10 @@
 Peter Parente
 Alexandre Parenteau
 Dan Parisien
+William Park
 Harri Pasanen
 Ga?l Pasgrimaud
+Bo Peng
 Joe Peterson
 Randy Pausch
 Samuele Pedroni
@@ -816,6 +898,7 @@
 Joe Peterson
 Chris Petrilli
 Bjorn Pettersen
+Justin D. Pettit
 Ronny Pfannschmidt
 Geoff Philbrick
 Gavrie Philipson
@@ -856,12 +939,12 @@
 Antti Rasinen
 Sridhar Ratnakumar
 Ysj Ray
-Eric Raymond
+Eric S. Raymond
 Edward K. Ream
 Chris Rebert
 Marc Recht
 John Redford
-Terry Reedy
+Terry J. Reedy
 Gareth Rees
 Steve Reeves
 Lennart Regebro
@@ -883,6 +966,7 @@
 Nicholas Riley
 Jean-Claude Rimbault
 Vlad Riscutia
+Wes Rishel
 Juan M. Bello Rivas
 Davide Rizzo
 Anthony Roach
@@ -903,6 +987,7 @@
 Erik Rose
 Jim Roskind
 Brian Rosner
+Guido van Rossum
 Just van Rossum
 Hugo van Rossum
 Saskia van Rossum
@@ -920,6 +1005,8 @@
 Mark Russell
 Rusty Russell
 Nick Russo
+Chris Ryland
+Constantina S.
 Patrick Sabin
 S?bastien Sabl?
 Suman Saha
@@ -932,6 +1019,8 @@
 Ilya Sandler
 Mark Sapiro
 Ty Sarna
+Hugh Sasse
+Bob Savage
 Ben Sayer
 sbt
 Marco Scataglini
@@ -947,6 +1036,7 @@
 Michael Schneider
 Peter Schneider-Kamp
 Arvin Schnell
+Scott Schram
 Robin Schreiber
 Chad J. Schroeder
 Sam Schulenburg
@@ -961,6 +1051,7 @@
 Fred Sells
 Jiwon Seo
 I?igo Serna
+Joakim Sernbrant
 Roger D. Serwy
 Jerry Seutter
 Denis Severson
@@ -968,6 +1059,8 @@
 Ha Shao
 Mark Shannon
 Richard Shapiro
+Justin Sheehy
+Charlie Shepherd
 Bruce Sherwood
 Alexander Shigin
 Pete Shinners
@@ -975,20 +1068,27 @@
 John W. Shipman
 Joel Shprentz
 Itamar Shtull-Trauring
+Yue Shuaijie
 Eric Siegerman
 Paul Sijben
+SilentGhost
 Tim Silk
+Michael Simcich
+Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
 Adam Simpkins
 Janne Sinkkonen
+Ng Pheng Siong
 George Sipe
 J. Sipprell
 Kragen Sitaker
+Michael Sloan
 Christopher Smith
 Eric V. Smith
 Gregory P. Smith
 Mark Smith
+Roy Smith
 Rafal Smotrzyk
 Eric Snow
 Dirk Soede
@@ -997,14 +1097,17 @@
 Edoardo Spadolini
 Clay Spence
 Stefan Sperling
+Nicholas Spies
 Per Spilling
 Joshua Spoerri
 Noah Spurrier
 Nathan Srebro
 RajGopal Srinivasan
+Tage Stabell-Kulo
 Quentin Stafford-Fraser
 Frank Stajano
 Joel Stanley
+Anthony Starks
 Oliver Steele
 Greg Stein
 Baruch Sterin
@@ -1024,6 +1127,7 @@
 Pal Subbiah
 Nathan Sullivan
 Mark Summerfield
+Reuben Sumner
 Hisao Suzuki
 Kalle Svensson
 Andrew Svetlov
@@ -1054,6 +1158,7 @@
 Oren Tirosh
 Jason Tishler
 Christian Tismer
+Jim Tittsler
 Frank J. Tobin
 Bennett Todd
 R Lindsay Todd
@@ -1070,6 +1175,7 @@
 Jason Trowbridge
 Anthony Tuininga
 Erno Tukia
+David Turner
 Stephen Turner
 Theodore Turocy
 Bill Tutt
@@ -1080,6 +1186,7 @@
 Daniel Urban
 Michael Urman
 Hector Urtubia
+Ville Vainio
 Andi Vajda
 Case Van Horsen
 Kyle VanderBeek
@@ -1101,6 +1208,7 @@
 Pauli Virtanen
 Frank Visser
 Johannes Vogel
+Martijn Vries
 Sjoerd de Vries
 Niki W. Waibel
 Wojtek Walczak
@@ -1118,8 +1226,10 @@
 Aaron Watters
 Henrik Weber
 Corran Webster
+Glyn Webster
 Stefan Wehr
 Zack Weinberg
+Bob Weiner
 Edward Welbourne
 Cliff Wells
 Rickard Westman
@@ -1132,14 +1242,17 @@
 Gerry Wiener
 Frank Wierzbicki
 Bryce "Zooko" Wilcox-O'Hearn
+Timothy Wild
 Jakub Wilk
 Gerald S. Williams
 Jason Williams
 John Williams
 Sue Williams
+Steven Willis
 Frank Willison
 Greg V. Wilson
 J Derek Wilson
+Paul Winkler
 Jody Winston
 Collin Winter
 Dik Winter
@@ -1155,6 +1268,7 @@
 Dan Wolfe
 Richard Wolff
 Adam Woodbeck
+Steven Work
 Gordon Worley
 Darren Worrall
 Thomas Wouters
@@ -1168,6 +1282,7 @@
 EungJun Yi
 Bob Yodlowski
 Danny Yoo
+Rory Yorke
 George Yoshida
 Masazumi Yoshikawa
 Arnaud Ysmal
@@ -1179,6 +1294,7 @@
 Siebren van der Zee
 Yuxiao Zeng
 Uwe Zessin
+Cheng Zhang
 Kai Zhu
 Tarek Ziad?
 Peter ?strand
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -788,9 +788,14 @@
         lineobj = PyIter_Next(self->input_iter);
         if (lineobj == NULL) {
             /* End of input OR exception */
-            if (!PyErr_Occurred() && self->field_len != 0)
-                PyErr_Format(_csvstate_global->error_obj,
-                             "newline inside string");
+            if (!PyErr_Occurred() && (self->field_len != 0 ||
+                                      self->state == IN_QUOTED_FIELD)) {
+                if (self->dialect->strict)
+                    PyErr_SetString(_csvstate_global->error_obj,
+                                    "unexpected end of data");
+                else if (parse_save_field(self) >= 0)
+                    break;
+            }
             return NULL;
         }
         if (!PyUnicode_Check(lineobj)) {
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1938,6 +1938,7 @@
     if (ascii == NULL)
         return -1;
     encoding = strdup(PyBytes_AS_STRING(ascii));
+    Py_DECREF(ascii);
     if (encoding == NULL) {
         PyErr_NoMemory();
         return -1;
diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -10,7 +10,10 @@
 
 import time
 from math import log, ceil
-from test.support import import_fresh_module
+try:
+    from test.support import import_fresh_module
+except ImportError:
+    from test.test_support import import_fresh_module
 
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
@@ -67,11 +70,16 @@
 print("#                   Calculating pi, 10000 iterations")
 print("# ======================================================================\n")
 
+to_benchmark = [pi_float, pi_decimal]
+if C is not None:
+    to_benchmark.insert(1, pi_cdecimal)
+
 for prec in [9, 19]:
     print("\nPrecision: %d decimal digits\n" % prec)
-    for func in [pi_float, pi_cdecimal, pi_decimal]:
+    for func in to_benchmark:
         start = time.time()
-        C.getcontext().prec = prec
+        if C is not None:
+            C.getcontext().prec = prec
         P.getcontext().prec = prec
         for i in range(10000):
             x = func()
@@ -84,25 +92,27 @@
 print("#                               Factorial")
 print("# ======================================================================\n")
 
-c = C.getcontext()
-c.prec = C.MAX_PREC
-c.Emax = C.MAX_EMAX
-c.Emin = C.MIN_EMIN
+if C is not None:
+    c = C.getcontext()
+    c.prec = C.MAX_PREC
+    c.Emax = C.MAX_EMAX
+    c.Emin = C.MIN_EMIN
 
 for n in [100000, 1000000]:
 
     print("n = %d\n" % n)
 
-    # C version of decimal
-    start_calc = time.time()
-    x = factorial(C.Decimal(n), 0)
-    end_calc = time.time()
-    start_conv = time.time()
-    sx = str(x)
-    end_conv = time.time()
-    print("cdecimal:")
-    print("calculation time: %fs" % (end_calc-start_calc))
-    print("conversion time: %fs\n" % (end_conv-start_conv))
+    if C is not None:
+        # C version of decimal
+        start_calc = time.time()
+        x = factorial(C.Decimal(n), 0)
+        end_calc = time.time()
+        start_conv = time.time()
+        sx = str(x)
+        end_conv = time.time()
+        print("cdecimal:")
+        print("calculation time: %fs" % (end_calc-start_calc))
+        print("conversion time: %fs\n" % (end_conv-start_conv))
 
     # Python integers
     start_calc = time.time()
@@ -116,4 +126,5 @@
     print("calculation time: %fs" % (end_calc-start_calc))
     print("conversion time: %fs\n\n" % (end_conv-start_conv))
 
-    assert(sx == sy)
+    if C is not None:
+        assert(sx == sy)
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -98,7 +98,7 @@
    info. */
 #define JOIN_GET(p) ((Py_uintptr_t) (p) & 1)
 #define JOIN_SET(p, flag) ((void*) ((Py_uintptr_t) (JOIN_OBJ(p)) | (flag)))
-#define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~1))
+#define JOIN_OBJ(p) ((PyObject*) ((Py_uintptr_t) (p) & ~(Py_uintptr_t)1))
 
 /* glue functions (see the init function for details) */
 static PyObject* elementtree_parseerror_obj;
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -185,7 +185,7 @@
 "\n"
 "* On output, if newline is None, any '\\n' characters written are\n"
 "  translated to the system default line separator, os.linesep. If\n"
-"  newline is '' or '\n', no translation takes place. If newline is any\n"
+"  newline is '' or '\\n', no translation takes place. If newline is any\n"
 "  of the other legal values, any '\\n' characters written are translated\n"
 "  to the given string.\n"
 "\n"
diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c
--- a/Modules/_io/bytesio.c
+++ b/Modules/_io/bytesio.c
@@ -121,7 +121,7 @@
 }
 
 /* Internal routine for writing a string of bytes to the buffer of a BytesIO
-   object. Returns the number of bytes wrote, or -1 on error. */
+   object. Returns the number of bytes written, or -1 on error. */
 static Py_ssize_t
 write_bytes(bytesio *self, const char *bytes, Py_ssize_t len)
 {
@@ -171,10 +171,20 @@
     }
 }
 
+PyDoc_STRVAR(readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 /* Generic getter for the writable, readable and seekable properties */
 static PyObject *
-return_true(bytesio *self)
+return_not_closed(bytesio *self)
 {
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -682,8 +692,10 @@
     }
     else {
         dict = PyDict_Copy(self->dict);
-        if (dict == NULL)
+        if (dict == NULL) {
+            Py_DECREF(initvalue);
             return NULL;
+        }
     }
 
     state = Py_BuildValue("(OnN)", initvalue, self->pos, dict);
@@ -867,9 +879,9 @@
 };
 
 static struct PyMethodDef bytesio_methods[] = {
-    {"readable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"seekable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
-    {"writable",   (PyCFunction)return_true,        METH_NOARGS, NULL},
+    {"readable",   (PyCFunction)return_not_closed,  METH_NOARGS, readable_doc},
+    {"seekable",   (PyCFunction)return_not_closed,  METH_NOARGS, seekable_doc},
+    {"writable",   (PyCFunction)return_not_closed,  METH_NOARGS, writable_doc},
     {"close",      (PyCFunction)bytesio_close,      METH_NOARGS, close_doc},
     {"flush",      (PyCFunction)bytesio_flush,      METH_NOARGS, flush_doc},
     {"isatty",     (PyCFunction)bytesio_isatty,     METH_NOARGS, isatty_doc},
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
--- a/Modules/_io/iobase.c
+++ b/Modules/_io/iobase.c
@@ -442,7 +442,7 @@
     "\n"
     "If limit is specified, at most limit bytes will be read.\n"
     "\n"
-    "The line terminator is always b'\n' for binary files; for text\n"
+    "The line terminator is always b'\\n' for binary files; for text\n"
     "files, the newlines argument to open can be used to select the line\n"
     "terminator(s) recognized.\n");
 
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
--- a/Modules/_io/stringio.c
+++ b/Modules/_io/stringio.c
@@ -760,10 +760,21 @@
 }
 
 /* Properties and pseudo-properties */
+
+PyDoc_STRVAR(stringio_readable_doc,
+"readable() -> bool. Returns True if the IO object can be read.");
+
+PyDoc_STRVAR(stringio_writable_doc,
+"writable() -> bool. Returns True if the IO object can be written.");
+
+PyDoc_STRVAR(stringio_seekable_doc,
+"seekable() -> bool. Returns True if the IO object can be seeked.");
+
 static PyObject *
 stringio_seekable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -771,6 +782,7 @@
 stringio_readable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -778,6 +790,7 @@
 stringio_writable(stringio *self, PyObject *args)
 {
     CHECK_INITIALIZED(self);
+    CHECK_CLOSED(self);
     Py_RETURN_TRUE;
 }
 
@@ -956,9 +969,9 @@
     {"seek",     (PyCFunction)stringio_seek,     METH_VARARGS, stringio_seek_doc},
     {"write",    (PyCFunction)stringio_write,    METH_O,       stringio_write_doc},
 
-    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS},
-    {"readable", (PyCFunction)stringio_readable, METH_NOARGS},
-    {"writable", (PyCFunction)stringio_writable, METH_NOARGS},
+    {"seekable", (PyCFunction)stringio_seekable, METH_NOARGS, stringio_seekable_doc},
+    {"readable", (PyCFunction)stringio_readable, METH_NOARGS, stringio_readable_doc},
+    {"writable", (PyCFunction)stringio_writable, METH_NOARGS, stringio_writable_doc},
 
     {"__getstate__", (PyCFunction)stringio_getstate, METH_NOARGS},
     {"__setstate__", (PyCFunction)stringio_setstate, METH_O},
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
--- a/Modules/_io/textio.c
+++ b/Modules/_io/textio.c
@@ -648,7 +648,7 @@
     "\n"
     "* On output, if newline is None, any '\\n' characters written are\n"
     "  translated to the system default line separator, os.linesep. If\n"
-    "  newline is '' or '\n', no translation takes place. If newline is any\n"
+    "  newline is '' or '\\n', no translation takes place. If newline is any\n"
     "  of the other legal values, any '\\n' characters written are translated\n"
     "  to the given string.\n"
     "\n"
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -2488,7 +2488,7 @@
     PyObject *path;
     int bytes;
 
-    if (!PyArg_ParseTuple(args, "O&|i:RAND_egd",
+    if (!PyArg_ParseTuple(args, "O&:RAND_egd",
                           PyUnicode_FSConverter, &path))
         return NULL;
 
diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
--- a/Modules/_testbuffer.c
+++ b/Modules/_testbuffer.c
@@ -16,6 +16,7 @@
 static const char *simple_fmt = "B";
 PyObject *simple_format = NULL;
 #define SIMPLE_FORMAT(fmt) (fmt == NULL || strcmp(fmt, "B") == 0)
+#define FIX_FORMAT(fmt) (fmt == NULL ? "B" : fmt)
 
 
 /**************************************************************************/
@@ -513,10 +514,8 @@
 cmp_structure(Py_buffer *dest, Py_buffer *src)
 {
     Py_ssize_t i;
-    int same_fmt = ((dest->format == NULL && src->format == NULL) || \
-                    (strcmp(dest->format, src->format) == 0));
-
-    if (!same_fmt ||
+
+    if (strcmp(FIX_FORMAT(dest->format), FIX_FORMAT(src->format)) != 0 ||
         dest->itemsize != src->itemsize ||
         dest->ndim != src->ndim)
         return -1;
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1163,6 +1163,11 @@
     if (fd != -1 && fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
         if (map_size == 0) {
             off_t calc_size;
+            if (st.st_size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= st.st_size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");
@@ -1359,6 +1364,12 @@
             }
 
             size = (((PY_LONG_LONG) high) << 32) + low;
+            if (size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                Py_DECREF(m_obj);
+                return NULL;
+            }
             if (offset >= size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -414,7 +414,14 @@
 
 
 #ifdef AT_FDCWD
-#define DEFAULT_DIR_FD AT_FDCWD
+/*
+ * Why the (int) cast?  Solaris 10 defines AT_FDCWD as 0xffd19553 (-3041965);
+ * without the int cast, the value gets interpreted as uint (4291925331),
+ * which doesn't play nicely with all the initializer lines in this file that
+ * look like this:
+ *      int dir_fd = DEFAULT_DIR_FD;
+ */
+#define DEFAULT_DIR_FD (int)AT_FDCWD
 #else
 #define DEFAULT_DIR_FD (-100)
 #endif
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -239,7 +239,7 @@
 #else
         /* 64-bit OS X has struct timeval.tv_usec as an int (and thus still 4
            bytes as required), but no longer defined by a long. */
-        long tv_usec = tv.tv_usec;
+        long tv_usec;
         if (_PyTime_ObjectToTimeval(tout, &tv.tv_sec, &tv_usec) == -1)
             return NULL;
         tv.tv_usec = tv_usec;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1674,7 +1674,8 @@
             if (len == 0) {
                 ifr.ifr_ifindex = 0;
             } else if (len < sizeof(ifr.ifr_name)) {
-                strcpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName));
+                strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
+                ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
                 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
                     s->errorhandler();
                     Py_DECREF(interfaceName);
diff --git a/Modules/zipimport.c b/Modules/zipimport.c
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -236,12 +236,16 @@
         return NULL;
     }
 
-    if (!PyUnicode_AsUCS4(prefix, p, len, 0))
+    if (!PyUnicode_AsUCS4(prefix, p, len, 0)) {
+        PyMem_Free(buf);
         return NULL;
+    }
     p += PyUnicode_GET_LENGTH(prefix);
     len -= PyUnicode_GET_LENGTH(prefix);
-    if (!PyUnicode_AsUCS4(name, p, len, 1))
+    if (!PyUnicode_AsUCS4(name, p, len, 1)) {
+        PyMem_Free(buf);
         return NULL;
+    }
     for (; *p; p++) {
         if (*p == '.')
             *p = SEP;
diff --git a/Objects/classobject.c b/Objects/classobject.c
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -219,7 +219,7 @@
 {
     PyObject *self = a->im_self;
     PyObject *func = a->im_func;
-    PyObject *klass = (PyObject*)Py_TYPE(self);
+    PyObject *klass;
     PyObject *funcname = NULL ,*klassname = NULL, *result = NULL;
     char *defname = "?";
 
@@ -227,6 +227,7 @@
         PyErr_BadInternalCall();
         return NULL;
     }
+    klass = (PyObject*)Py_TYPE(self);
 
     funcname = _PyObject_GetAttrId(func, &PyId___name__);
     if (funcname == NULL) {
diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -30,7 +30,7 @@
 */
 static PyLongObject small_ints[NSMALLNEGINTS + NSMALLPOSINTS];
 #ifdef COUNT_ALLOCS
-int quick_int_allocs, quick_neg_int_allocs;
+Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
 #endif
 
 static PyObject *
@@ -1628,8 +1628,10 @@
         strlen++;
     }
     if (writer) {
-        if (_PyUnicodeWriter_Prepare(writer, strlen, '9') == -1)
+        if (_PyUnicodeWriter_Prepare(writer, strlen, '9') == -1) {
+            Py_DECREF(scratch);
             return -1;
+        }
         kind = writer->kind;
         str = NULL;
     }
@@ -4283,8 +4285,8 @@
             string = PyByteArray_AS_STRING(x);
         else
             string = PyBytes_AS_STRING(x);
-        if (strlen(string) != (size_t)size) {
-            /* We only see this if there's a null byte in x,
+        if (strlen(string) != (size_t)size || !size) {
+            /* We only see this if there's a null byte in x or x is empty,
                x is a bytes or buffer, *and* a base is given. */
             PyErr_Format(PyExc_ValueError,
                          "invalid literal for int() with base %d: %R",
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -2861,28 +2861,74 @@
     return PyBool_FromLong(MV_ANY_CONTIGUOUS(self->flags));
 }
 
+PyDoc_STRVAR(memory_obj_doc,
+             "The underlying object of the memoryview.");
+PyDoc_STRVAR(memory_nbytes_doc,
+             "The amount of space in bytes that the array would use in\n"
+             " a contiguous representation.");
+PyDoc_STRVAR(memory_readonly_doc,
+             "A bool indicating whether the memory is read only.");
+PyDoc_STRVAR(memory_itemsize_doc,
+             "The size in bytes of each element of the memoryview.");
+PyDoc_STRVAR(memory_format_doc,
+             "A string containing the format (in struct module style)\n"
+             " for each element in the view.");
+PyDoc_STRVAR(memory_ndim_doc,
+             "An integer indicating how many dimensions of a multi-dimensional\n"
+             " array the memory represents.");
+PyDoc_STRVAR(memory_shape_doc,
+             "A tuple of ndim integers giving the shape of the memory\n"
+             " as an N-dimensional array.");
+PyDoc_STRVAR(memory_strides_doc,
+             "A tuple of ndim integers giving the size in bytes to access\n"
+             " each element for each dimension of the array.");
+PyDoc_STRVAR(memory_suboffsets_doc,
+             "A tuple of integers used internally for PIL-style arrays.");
+PyDoc_STRVAR(memory_c_contiguous_doc,
+             "A bool indicating whether the memory is C contiguous.");
+PyDoc_STRVAR(memory_f_contiguous_doc,
+             "A bool indicating whether the memory is Fortran contiguous.");
+PyDoc_STRVAR(memory_contiguous_doc,
+             "A bool indicating whether the memory is contiguous.");
+
 static PyGetSetDef memory_getsetlist[] = {
-    {"obj",             (getter)memory_obj_get,        NULL, NULL},
-    {"nbytes",          (getter)memory_nbytes_get,     NULL, NULL},
-    {"readonly",        (getter)memory_readonly_get,   NULL, NULL},
-    {"itemsize",        (getter)memory_itemsize_get,   NULL, NULL},
-    {"format",          (getter)memory_format_get,     NULL, NULL},
-    {"ndim",            (getter)memory_ndim_get,       NULL, NULL},
-    {"shape",           (getter)memory_shape_get,      NULL, NULL},
-    {"strides",         (getter)memory_strides_get,    NULL, NULL},
-    {"suboffsets",      (getter)memory_suboffsets_get, NULL, NULL},
-    {"c_contiguous",    (getter)memory_c_contiguous,   NULL, NULL},
-    {"f_contiguous",    (getter)memory_f_contiguous,   NULL, NULL},
-    {"contiguous",      (getter)memory_contiguous,     NULL, NULL},
+    {"obj",             (getter)memory_obj_get,        NULL, memory_obj_doc},
+    {"nbytes",          (getter)memory_nbytes_get,     NULL, memory_nbytes_doc},
+    {"readonly",        (getter)memory_readonly_get,   NULL, memory_readonly_doc},
+    {"itemsize",        (getter)memory_itemsize_get,   NULL, memory_itemsize_doc},
+    {"format",          (getter)memory_format_get,     NULL, memory_format_doc},
+    {"ndim",            (getter)memory_ndim_get,       NULL, memory_ndim_doc},
+    {"shape",           (getter)memory_shape_get,      NULL, memory_shape_doc},
+    {"strides",         (getter)memory_strides_get,    NULL, memory_strides_doc},
+    {"suboffsets",      (getter)memory_suboffsets_get, NULL, memory_suboffsets_doc},
+    {"c_contiguous",    (getter)memory_c_contiguous,   NULL, memory_c_contiguous_doc},
+    {"f_contiguous",    (getter)memory_f_contiguous,   NULL, memory_f_contiguous_doc},
+    {"contiguous",      (getter)memory_contiguous,     NULL, memory_contiguous_doc},
     {NULL, NULL, NULL, NULL},
 };
 
+PyDoc_STRVAR(memory_release_doc,
+"M.release() -> None\n\
+\n\
+Release the underlying buffer exposed by the memoryview object.");
+PyDoc_STRVAR(memory_tobytes_doc,
+"M.tobytes() -> bytes\n\
+\n\
+Return the data in the buffer as a byte string.");
+PyDoc_STRVAR(memory_tolist_doc,
+"M.tolist() -> list\n\
+\n\
+Return the data in the buffer as a list of elements.");
+PyDoc_STRVAR(memory_cast_doc,
+"M.cast(format[, shape]) -> memoryview\n\
+\n\
+Cast a memoryview to a new format or shape.");
 
 static PyMethodDef memory_methods[] = {
-    {"release",     (PyCFunction)memory_release, METH_NOARGS, NULL},
-    {"tobytes",     (PyCFunction)memory_tobytes, METH_NOARGS, NULL},
-    {"tolist",      (PyCFunction)memory_tolist, METH_NOARGS, NULL},
-    {"cast",        (PyCFunction)memory_cast, METH_VARARGS|METH_KEYWORDS, NULL},
+    {"release",     (PyCFunction)memory_release, METH_NOARGS, memory_release_doc},
+    {"tobytes",     (PyCFunction)memory_tobytes, METH_NOARGS, memory_tobytes_doc},
+    {"tolist",      (PyCFunction)memory_tolist, METH_NOARGS, memory_tolist_doc},
+    {"cast",        (PyCFunction)memory_cast, METH_VARARGS|METH_KEYWORDS, memory_cast_doc},
     {"__enter__",   memory_enter, METH_NOARGS, NULL},
     {"__exit__",    memory_exit, METH_VARARGS, NULL},
     {NULL,          NULL}
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
--- a/Objects/obmalloc.c
+++ b/Objects/obmalloc.c
@@ -138,7 +138,6 @@
  */
 #define ALIGNMENT               8               /* must be 2^N */
 #define ALIGNMENT_SHIFT         3
-#define ALIGNMENT_MASK          (ALIGNMENT - 1)
 
 /* Return the number of bytes in size class I, as a uint. */
 #define INDEX2SIZE(I) (((uint)(I) + 1) << ALIGNMENT_SHIFT)
@@ -314,14 +313,12 @@
     struct arena_object* prevarena;
 };
 
-#undef  ROUNDUP
-#define ROUNDUP(x)              (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
-#define POOL_OVERHEAD           ROUNDUP(sizeof(struct pool_header))
+#define POOL_OVERHEAD   _Py_SIZE_ROUND_UP(sizeof(struct pool_header), ALIGNMENT)
 
 #define DUMMY_SIZE_IDX          0xffff  /* size class of newly cached pools */
 
 /* Round pointer P down to the closest pool-aligned address <= P, as a poolp */
-#define POOL_ADDR(P) ((poolp)((uptr)(P) & ~(uptr)POOL_SIZE_MASK))
+#define POOL_ADDR(P) ((poolp)_Py_ALIGN_DOWN((P), POOL_SIZE))
 
 /* Return total number of blocks in pool of size index I, as a uint. */
 #define NUMBLOCKS(I) ((uint)(POOL_SIZE - POOL_OVERHEAD) / INDEX2SIZE(I))
diff --git a/Objects/setobject.c b/Objects/setobject.c
--- a/Objects/setobject.c
+++ b/Objects/setobject.c
@@ -831,10 +831,10 @@
     if (!list)
         return NULL;
 
-    /* copy the itertor state */
+    /* copy the iterator state */
     tmp = *si;
     Py_XINCREF(tmp.si_set);
-    
+
     /* iterate the temporary into a list */
     for(;;) {
         PyObject *element = setiter_iternext(&tmp);
diff --git a/Objects/stringlib/codecs.h b/Objects/stringlib/codecs.h
--- a/Objects/stringlib/codecs.h
+++ b/Objects/stringlib/codecs.h
@@ -2,9 +2,6 @@
 
 #if STRINGLIB_IS_UNICODE
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -25,7 +22,7 @@
 {
     Py_UCS4 ch;
     const char *s = *inptr;
-    const char *aligned_end = (const char *) ((size_t) end & ~LONG_PTR_MASK);
+    const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
     STRINGLIB_CHAR *p = dest + *outpos;
 
     while (s < end) {
@@ -39,7 +36,7 @@
                First, check if we can do an aligned read, as most CPUs have
                a penalty for unaligned reads.
             */
-            if (!((size_t) s & LONG_PTR_MASK)) {
+            if (_Py_IS_ALIGNED(s, SIZEOF_LONG)) {
                 /* Help register allocation */
                 register const char *_s = s;
                 register STRINGLIB_CHAR *_p = p;
@@ -453,7 +450,7 @@
 {
     Py_UCS4 ch;
     const unsigned char *aligned_end =
-            (const unsigned char *) ((size_t) e & ~LONG_PTR_MASK);
+            (const unsigned char *) _Py_ALIGN_DOWN(e, SIZEOF_LONG);
     const unsigned char *q = *inptr;
     STRINGLIB_CHAR *p = dest + *outpos;
     /* Offsets from q for retrieving byte pairs in the right order. */
@@ -468,7 +465,7 @@
         Py_UCS4 ch2;
         /* First check for possible aligned read of a C 'long'. Unaligned
            reads are more expensive, better to defer to another iteration. */
-        if (!((size_t) q & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(q, SIZEOF_LONG)) {
             /* Fast path for runs of in-range non-surrogate chars. */
             register const unsigned char *_q = q;
             while (_q < aligned_end) {
@@ -565,7 +562,6 @@
 #undef FAST_CHAR_MASK
 #undef STRIPPED_MASK
 #undef SWAB
-#undef LONG_PTR_MASK
 
 
 Py_LOCAL_INLINE(void)
@@ -588,7 +584,7 @@
         _PyUnicode_CONVERT_BYTES(STRINGLIB_CHAR, unsigned short, in, end, out);
 # endif
     } else {
-        const STRINGLIB_CHAR *unrolled_end = in + (len & ~ (Py_ssize_t) 3);
+        const STRINGLIB_CHAR *unrolled_end = in + _Py_SIZE_ROUND_DOWN(len, 4);
         while (in < unrolled_end) {
             out[0] = SWAB2(in[0]);
             out[1] = SWAB2(in[1]);
diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h
--- a/Objects/stringlib/fastsearch.h
+++ b/Objects/stringlib/fastsearch.h
@@ -43,8 +43,7 @@
 
 #define DO_MEMCHR(memchr, s, needle, nchars) do { \
     candidate = memchr((const void *) (s), (needle), (nchars) * sizeof(STRINGLIB_CHAR)); \
-    found = (const STRINGLIB_CHAR *) \
-        ((Py_ssize_t) candidate & (~ ((Py_ssize_t) sizeof(STRINGLIB_CHAR) - 1))); \
+    found = (const STRINGLIB_CHAR *) _Py_ALIGN_DOWN(candidate, sizeof(STRINGLIB_CHAR)); \
     } while (0)
 
     if (mode == FAST_SEARCH) {
diff --git a/Objects/stringlib/find_max_char.h b/Objects/stringlib/find_max_char.h
--- a/Objects/stringlib/find_max_char.h
+++ b/Objects/stringlib/find_max_char.h
@@ -2,9 +2,6 @@
 
 #if STRINGLIB_IS_UNICODE
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -21,10 +18,11 @@
 STRINGLIB(find_max_char)(const STRINGLIB_CHAR *begin, const STRINGLIB_CHAR *end)
 {
     const unsigned char *p = (const unsigned char *) begin;
-    const unsigned char *aligned_end = (const unsigned char *) ((size_t) end & ~LONG_PTR_MASK);
+    const unsigned char *aligned_end =
+            (const unsigned char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
 
     while (p < end) {
-        if (!((size_t) p & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
             /* Help register allocation */
             register const unsigned char *_p = p;
             while (_p < aligned_end) {
@@ -43,7 +41,6 @@
     return 127;
 }
 
-#undef LONG_PTR_MASK
 #undef ASCII_CHAR_MASK
 
 #else /* STRINGLIB_SIZEOF_CHAR == 1 */
@@ -72,7 +69,7 @@
     register Py_UCS4 mask;
     Py_ssize_t n = end - begin;
     const STRINGLIB_CHAR *p = begin;
-    const STRINGLIB_CHAR *unrolled_end = begin + (n & ~ (Py_ssize_t) 3);
+    const STRINGLIB_CHAR *unrolled_end = begin + _Py_SIZE_ROUND_DOWN(n, 4);
     Py_UCS4 max_char;
 
     max_char = MAX_CHAR_ASCII;
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -210,8 +210,10 @@
 
     va_start(vargs, n);
     result = PyTuple_New(n);
-    if (result == NULL)
+    if (result == NULL) {
+        va_end(vargs);
         return NULL;
+    }
     items = ((PyTupleObject *)result)->ob_item;
     for (i = 0; i < n; i++) {
         o = va_arg(vargs, PyObject *);
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -691,8 +691,10 @@
         mod = NULL;
     }
     name = type_qualname(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
 
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<class '%U.%U'>", mod, name);
@@ -3128,8 +3130,10 @@
         mod = NULL;
     }
     name = type_qualname(type, NULL);
-    if (name == NULL)
+    if (name == NULL) {
+        Py_XDECREF(mod);
         return NULL;
+    }
     if (mod != NULL && PyUnicode_CompareWithASCIIString(mod, "builtins"))
         rtn = PyUnicode_FromFormat("<%U.%U object at %p>", mod, name, self);
     else
@@ -5988,7 +5992,7 @@
         descr = _PyType_Lookup(type, p->name_strobj);
         if (descr == NULL) {
             if (ptr == (void**)&type->tp_iternext) {
-                specific = _PyObject_NextNotImplemented;
+                specific = (void *)_PyObject_NextNotImplemented;
             }
             continue;
         }
@@ -6035,7 +6039,7 @@
             /* We specifically allow __hash__ to be set to None
                to prevent inheritance of the default
                implementation from object.__hash__ */
-            specific = PyObject_HashNotImplemented;
+            specific = (void *)PyObject_HashNotImplemented;
         }
         else {
             use_generic = 1;
@@ -6250,7 +6254,7 @@
             continue;
         if (PyDict_GetItem(dict, p->name_strobj))
             continue;
-        if (*ptr == PyObject_HashNotImplemented) {
+        if (*ptr == (void *)PyObject_HashNotImplemented) {
             /* Classes may prevent the inheritance of the tp_hash
                slot by storing PyObject_HashNotImplemented in it. Make it
                visible as a None value for the __hash__ attribute. */
@@ -6502,18 +6506,18 @@
         PyCodeObject *co = f->f_code;
         Py_ssize_t i, n;
         if (co == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): no code object");
             return -1;
         }
         if (co->co_argcount == 0) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): no arguments");
             return -1;
         }
         obj = f->f_localsplus[0];
         if (obj == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): arg[0] deleted");
             return -1;
         }
@@ -6532,18 +6536,18 @@
                     PyTuple_GET_SIZE(co->co_cellvars) + i;
                 PyObject *cell = f->f_localsplus[index];
                 if (cell == NULL || !PyCell_Check(cell)) {
-                    PyErr_SetString(PyExc_SystemError,
+                    PyErr_SetString(PyExc_RuntimeError,
                       "super(): bad __class__ cell");
                     return -1;
                 }
                 type = (PyTypeObject *) PyCell_GET(cell);
                 if (type == NULL) {
-                    PyErr_SetString(PyExc_SystemError,
+                    PyErr_SetString(PyExc_RuntimeError,
                       "super(): empty __class__ cell");
                     return -1;
                 }
                 if (!PyType_Check(type)) {
-                    PyErr_Format(PyExc_SystemError,
+                    PyErr_Format(PyExc_RuntimeError,
                       "super(): __class__ is not a type (%s)",
                       Py_TYPE(type)->tp_name);
                     return -1;
@@ -6552,7 +6556,7 @@
             }
         }
         if (type == NULL) {
-            PyErr_SetString(PyExc_SystemError,
+            PyErr_SetString(PyExc_RuntimeError,
                             "super(): __class__ cell not found");
             return -1;
         }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -159,7 +159,7 @@
         const from_type *_end = (end);                  \
         Py_ssize_t n = (_end) - (_iter);                \
         const from_type *_unrolled_end =                \
-            _iter + (n & ~ (Py_ssize_t) 3);             \
+            _iter + _Py_SIZE_ROUND_DOWN(n, 4);          \
         while (_iter < (_unrolled_end)) {               \
             _to[0] = (to_type) _iter[0];                \
             _to[1] = (to_type) _iter[1];                \
@@ -4635,9 +4635,6 @@
 #include "stringlib/codecs.h"
 #include "stringlib/undef.h"
 
-/* Mask to check or force alignment of a pointer to C 'long' boundaries */
-#define LONG_PTR_MASK (size_t) (SIZEOF_LONG - 1)
-
 /* Mask to quickly check whether a C 'long' contains a
    non-ASCII, UTF8-encoded char. */
 #if (SIZEOF_LONG == 8)
@@ -4652,11 +4649,11 @@
 ascii_decode(const char *start, const char *end, Py_UCS1 *dest)
 {
     const char *p = start;
-    const char *aligned_end = (const char *) ((size_t) end & ~LONG_PTR_MASK);
+    const char *aligned_end = (const char *) _Py_ALIGN_DOWN(end, SIZEOF_LONG);
 
 #if SIZEOF_LONG <= SIZEOF_VOID_P
-    assert(!((size_t) dest & LONG_PTR_MASK));
-    if (!((size_t) p & LONG_PTR_MASK)) {
+    assert(_Py_IS_ALIGNED(dest, SIZEOF_LONG));
+    if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
         /* Fast path, see in STRINGLIB(utf8_decode) for
            an explanation. */
         /* Help register allocation */
@@ -4682,7 +4679,7 @@
     while (p < end) {
         /* Fast path, see in STRINGLIB(utf8_decode) in stringlib/codecs.h
            for an explanation. */
-        if (!((size_t) p & LONG_PTR_MASK)) {
+        if (_Py_IS_ALIGNED(p, SIZEOF_LONG)) {
             /* Help register allocation */
             register const char *_p = p;
             while (_p < aligned_end) {
@@ -5390,7 +5387,7 @@
         return NULL;
 
     /* output buffer is 2-bytes aligned */
-    assert(((Py_uintptr_t)PyBytes_AS_STRING(v) & 1) == 0);
+    assert(_Py_IS_ALIGNED(PyBytes_AS_STRING(v), 2));
     out = (unsigned short *)PyBytes_AS_STRING(v);
     if (byteorder == 0)
         *out++ = 0xFEFF;
@@ -7528,9 +7525,10 @@
             /* Apply mapping */
             if (PyLong_Check(x)) {
                 long value = PyLong_AS_LONG(x);
-                if (value < 0 || value > 65535) {
-                    PyErr_SetString(PyExc_TypeError,
-                                    "character mapping must be in range(65536)");
+                if (value < 0 || value > MAX_UNICODE) {
+                    PyErr_Format(PyExc_TypeError,
+                                 "character mapping must be in range(0x%lx)",
+                                 (unsigned long)MAX_UNICODE + 1);
                     Py_DECREF(x);
                     goto onError;
                 }
@@ -9145,7 +9143,7 @@
             /* We do not need to compare 0 and len(substring)-1 because
                the if statement above ensured already that they are equal
                when we end up here. */
-            // TODO: honor direction and do a forward or backwards search
+            /* TODO: honor direction and do a forward or backwards search */
             for (i = 1; i < end_sub; ++i) {
                 if (PyUnicode_READ(kind_self, data_self, offset + i) !=
                     PyUnicode_READ(kind_sub, data_sub, i))
@@ -13462,8 +13460,7 @@
         arglen = -1;
         argidx = -2;
     }
-    if (Py_TYPE(args)->tp_as_mapping && !PyTuple_Check(args) &&
-        !PyUnicode_Check(args))
+    if (PyMapping_Check(args) && !PyTuple_Check(args) && !PyUnicode_Check(args))
         dict = args;
 
     while (--fmtcnt >= 0) {
diff --git a/Parser/node.c b/Parser/node.c
--- a/Parser/node.c
+++ b/Parser/node.c
@@ -71,7 +71,7 @@
  * capacity.  The code is tricky to avoid that.
  */
 #define XXXROUNDUP(n) ((n) <= 1 ? (n) :                 \
-               (n) <= 128 ? (((n) + 3) & ~3) :          \
+               (n) <= 128 ? _Py_SIZE_ROUND_UP((n), 4) : \
                fancy_roundup(n))
 
 
diff --git a/Python/ast.c b/Python/ast.c
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -545,9 +545,9 @@
 }
 
 static identifier
-new_identifier(const char* n, struct compiling *c)
+new_identifier(const char *n, struct compiling *c)
 {
-    PyObject* id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
+    PyObject *id = PyUnicode_DecodeUTF8(n, strlen(n), NULL);
     if (!id)
         return NULL;
     /* PyUnicode_DecodeUTF8 should always return a ready string. */
@@ -574,79 +574,43 @@
 
 #define NEW_IDENTIFIER(n) new_identifier(STR(n), c)
 
-/* This routine provides an invalid object for the syntax error.
-   The outermost routine must unpack this error and create the
-   proper object.  We do this so that we don't have to pass
-   the filename to everything function.
-
-   XXX Maybe we should just pass the filename...
-*/
-
 static int
-ast_error(const node *n, const char *errstr)
+ast_error(struct compiling *c, const node *n, const char *errmsg)
 {
-    PyObject *u = Py_BuildValue("zii", errstr, LINENO(n), n->n_col_offset);
-    if (!u)
-        return 0;
-    PyErr_SetObject(PyExc_SyntaxError, u);
-    Py_DECREF(u);
-    return 0;
-}
-
-static void
-ast_error_finish(const char *filename)
-{
-    PyObject *type, *value, *tback, *errstr, *offset, *loc, *tmp;
+    PyObject *value, *errstr, *loc, *tmp;
     PyObject *filename_obj;
-    long lineno;
-
-    assert(PyErr_Occurred());
-    if (!PyErr_ExceptionMatches(PyExc_SyntaxError))
-        return;
-
-    PyErr_Fetch(&type, &value, &tback);
-    errstr = PyTuple_GetItem(value, 0);
-    if (!errstr)
-        return;
-    Py_INCREF(errstr);
-    lineno = PyLong_AsLong(PyTuple_GetItem(value, 1));
-    if (lineno == -1) {
-        Py_DECREF(errstr);
-        return;
-    }
-    offset = PyTuple_GetItem(value, 2);
-    if (!offset) {
-        Py_DECREF(errstr);
-        return;
-    }
-    Py_DECREF(value);
-
-    loc = PyErr_ProgramText(filename, lineno);
+
+    loc = PyErr_ProgramText(c->c_filename, LINENO(n));
     if (!loc) {
         Py_INCREF(Py_None);
         loc = Py_None;
     }
-    if (filename != NULL)
-        filename_obj = PyUnicode_DecodeFSDefault(filename);
-    else {
+    if (c->c_filename) {
+        filename_obj = PyUnicode_DecodeFSDefault(c->c_filename);
+        if (!filename_obj) {
+            Py_DECREF(loc);
+            return 0;
+        }
+    } else {
         Py_INCREF(Py_None);
         filename_obj = Py_None;
     }
-    if (filename_obj != NULL)
-        tmp = Py_BuildValue("(NlOO)", filename_obj, lineno, offset, loc);
-    else
-        tmp = NULL;
-    Py_DECREF(loc);
-    if (!tmp) {
-        Py_DECREF(errstr);
-        return;
+    tmp = Py_BuildValue("(NiiN)", filename_obj, LINENO(n), n->n_col_offset, loc);
+    if (!tmp)
+        return 0;
+    errstr = PyUnicode_FromString(errmsg);
+    if (!errstr) {
+        Py_DECREF(tmp);
+        return 0;
     }
     value = PyTuple_Pack(2, errstr, tmp);
     Py_DECREF(errstr);
     Py_DECREF(tmp);
-    if (!value)
-        return;
-    PyErr_Restore(type, value, tback);
+    if (value) {
+        PyErr_SetObject(PyExc_SyntaxError, value);
+        Py_DECREF(value);
+    }
+    return 0;
 }
 
 /* num_stmts() returns number of contained statements.
@@ -724,11 +688,14 @@
     struct compiling c;
     mod_ty res = NULL;
 
+    c.c_arena = arena;
+    c.c_filename = filename;
+    c.c_normalize = c.c_normalize_args = NULL;
     if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) {
         c.c_encoding = "utf-8";
         if (TYPE(n) == encoding_decl) {
 #if 0
-            ast_error(n, "encoding declaration in Unicode string");
+            ast_error(c, n, "encoding declaration in Unicode string");
             goto out;
 #endif
             n = CHILD(n, 0);
@@ -740,9 +707,6 @@
         /* PEP 3120 */
         c.c_encoding = "utf-8";
     }
-    c.c_arena = arena;
-    c.c_filename = filename;
-    c.c_normalize = c.c_normalize_args = NULL;
 
     k = 0;
     switch (TYPE(n)) {
@@ -835,8 +799,6 @@
         PyTuple_SET_ITEM(c.c_normalize_args, 1, NULL);
         Py_DECREF(c.c_normalize_args);
     }
-    if (!res)
-        ast_error_finish(filename);
     return res;
 }
 
@@ -882,18 +844,18 @@
 };
 
 static int
-forbidden_name(identifier name, const node *n, int full_checks)
+forbidden_name(struct compiling *c, identifier name, const node *n, int full_checks)
 {
     assert(PyUnicode_Check(name));
     if (PyUnicode_CompareWithASCIIString(name, "__debug__") == 0) {
-        ast_error(n, "assignment to keyword");
+        ast_error(c, n, "assignment to keyword");
         return 1;
     }
     if (full_checks) {
         const char **p;
         for (p = FORBIDDEN; *p; p++) {
             if (PyUnicode_CompareWithASCIIString(name, *p) == 0) {
-                ast_error(n, "assignment to keyword");
+                ast_error(c, n, "assignment to keyword");
                 return 1;
             }
         }
@@ -929,7 +891,7 @@
     switch (e->kind) {
         case Attribute_kind:
             e->v.Attribute.ctx = ctx;
-            if (ctx == Store && forbidden_name(e->v.Attribute.attr, n, 1))
+            if (ctx == Store && forbidden_name(c, e->v.Attribute.attr, n, 1))
                 return 0;
             break;
         case Subscript_kind:
@@ -942,7 +904,7 @@
             break;
         case Name_kind:
             if (ctx == Store) {
-                if (forbidden_name(e->v.Name.id, n, 1))
+                if (forbidden_name(c, e->v.Name.id, n, 1))
                     return 0; /* forbidden_name() calls ast_error() */
             }
             e->v.Name.ctx = ctx;
@@ -1016,7 +978,7 @@
                       "can't %s %s",
                       ctx == Store ? "assign to" : "delete",
                       expr_name);
-        return ast_error(n, buf);
+        return ast_error(c, n, buf);
     }
 
     /* If the LHS is a list or tuple, we need to set the assignment
@@ -1164,7 +1126,7 @@
     name = NEW_IDENTIFIER(ch);
     if (!name)
         return NULL;
-    if (forbidden_name(name, ch, 0))
+    if (forbidden_name(c, name, ch, 0))
         return NULL;
 
     if (NCH(n) == 3 && TYPE(CHILD(n, 1)) == COLON) {
@@ -1194,7 +1156,7 @@
     int j = 0; /* index for kwdefaults and kwonlyargs */
 
     if (kwonlyargs == NULL) {
-        ast_error(CHILD(n, start), "named arguments must follow bare *");
+        ast_error(c, CHILD(n, start), "named arguments must follow bare *");
         return -1;
     }
     assert(kwdefaults != NULL);
@@ -1226,7 +1188,7 @@
                 argname = NEW_IDENTIFIER(ch);
                 if (!argname)
                     goto error;
-                if (forbidden_name(argname, ch, 0))
+                if (forbidden_name(c, argname, ch, 0))
                     goto error;
                 arg = arg(argname, annotation, c->c_arena);
                 if (!arg)
@@ -1237,7 +1199,7 @@
             case DOUBLESTAR:
                 return i;
             default:
-                ast_error(ch, "unexpected node");
+                ast_error(c, ch, "unexpected node");
                 goto error;
         }
     }
@@ -1329,7 +1291,7 @@
         return NULL;
 
     if (nposargs + nkwonlyargs > 255) {
-        ast_error(n, "more than 255 arguments");
+        ast_error(c, n, "more than 255 arguments");
         return NULL;
     }
 
@@ -1357,7 +1319,7 @@
                     found_default = 1;
                 }
                 else if (found_default) {
-                    ast_error(n,
+                    ast_error(c, n,
                              "non-default argument follows default argument");
                     return NULL;
                 }
@@ -1369,7 +1331,7 @@
                 break;
             case STAR:
                 if (i+1 >= NCH(n)) {
-                    ast_error(CHILD(n, i),
+                    ast_error(c, CHILD(n, i),
                         "named arguments must follow bare *");
                     return NULL;
                 }
@@ -1386,7 +1348,7 @@
                     vararg = NEW_IDENTIFIER(CHILD(ch, 0));
                     if (!vararg)
                         return NULL;
-                    if (forbidden_name(vararg, CHILD(ch, 0), 0))
+                    if (forbidden_name(c, vararg, CHILD(ch, 0), 0))
                         return NULL;
                     if (NCH(ch) > 1) {
                         /* there is an annotation on the vararg */
@@ -1417,7 +1379,7 @@
                     if (!kwargannotation)
                         return NULL;
                 }
-                if (forbidden_name(kwarg, CHILD(ch, 0), 0))
+                if (forbidden_name(c, kwarg, CHILD(ch, 0), 0))
                     return NULL;
                 i += 3;
                 break;
@@ -1536,7 +1498,7 @@
     name = NEW_IDENTIFIER(CHILD(n, name_i));
     if (!name)
         return NULL;
-    if (forbidden_name(name, CHILD(n, name_i), 0))
+    if (forbidden_name(c, name, CHILD(n, name_i), 0))
         return NULL;
     args = ast_for_arguments(c, CHILD(n, name_i + 1));
     if (!args)
@@ -1877,10 +1839,10 @@
                     char buf[128];
                     s = _PyUnicode_AsString(errstr);
                     PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s);
-                    ast_error(n, buf);
+                    ast_error(c, n, buf);
                     Py_DECREF(errstr);
                 } else {
-                    ast_error(n, "(unicode error) unknown error");
+                    ast_error(c, n, "(unicode error) unknown error");
                 }
                 Py_DECREF(type);
                 Py_DECREF(value);
@@ -2465,14 +2427,14 @@
         }
     }
     if (ngens > 1 || (ngens && (nargs || nkeywords))) {
-        ast_error(n, "Generator expression must be parenthesized "
+        ast_error(c, n, "Generator expression must be parenthesized "
                   "if not sole argument");
         return NULL;
     }
 
     if (nargs + nkeywords + ngens > 255) {
-      ast_error(n, "more than 255 arguments");
-      return NULL;
+        ast_error(c, n, "more than 255 arguments");
+        return NULL;
     }
 
     args = asdl_seq_new(nargs + ngens, c->c_arena);
@@ -2489,12 +2451,12 @@
             expr_ty e;
             if (NCH(ch) == 1) {
                 if (nkeywords) {
-                    ast_error(CHILD(ch, 0),
+                    ast_error(c, CHILD(ch, 0),
                               "non-keyword arg after keyword arg");
                     return NULL;
                 }
                 if (vararg) {
-                    ast_error(CHILD(ch, 0),
+                    ast_error(c, CHILD(ch, 0),
                               "only named arguments may follow *expression");
                     return NULL;
                 }
@@ -2524,19 +2486,19 @@
                  * then is very confusing.
                  */
                 if (e->kind == Lambda_kind) {
-                    ast_error(CHILD(ch, 0), "lambda cannot contain assignment");
+                    ast_error(c, CHILD(ch, 0), "lambda cannot contain assignment");
                     return NULL;
                 } else if (e->kind != Name_kind) {
-                    ast_error(CHILD(ch, 0), "keyword can't be an expression");
+                    ast_error(c, CHILD(ch, 0), "keyword can't be an expression");
                     return NULL;
-                } else if (forbidden_name(e->v.Name.id, ch, 1)) {
+                } else if (forbidden_name(c, e->v.Name.id, ch, 1)) {
                     return NULL;
                 }
                 key = e->v.Name.id;
                 for (k = 0; k < nkeywords; k++) {
                     tmp = ((keyword_ty)asdl_seq_GET(keywords, k))->arg;
                     if (!PyUnicode_Compare(tmp, key)) {
-                        ast_error(CHILD(ch, 0), "keyword argument repeated");
+                        ast_error(c, CHILD(ch, 0), "keyword argument repeated");
                         return NULL;
                     }
                 }
@@ -2629,7 +2591,7 @@
             case Subscript_kind:
                 break;
             default:
-                ast_error(ch, "illegal expression for augmented assignment");
+                ast_error(c, ch, "illegal expression for augmented assignment");
                 return NULL;
         }
 
@@ -2662,7 +2624,7 @@
             expr_ty e;
             node *ch = CHILD(n, i);
             if (TYPE(ch) == yield_expr) {
-                ast_error(ch, "assignment to yield expression not possible");
+                ast_error(c, ch, "assignment to yield expression not possible");
                 return NULL;
             }
             e = ast_for_testlist(c, ch);
@@ -2809,11 +2771,11 @@
                 str = NEW_IDENTIFIER(str_node);
                 if (!str)
                     return NULL;
-                if (store && forbidden_name(str, str_node, 0))
+                if (store && forbidden_name(c, str, str_node, 0))
                     return NULL;
             }
             else {
-                if (forbidden_name(name, name_node, 0))
+                if (forbidden_name(c, name, name_node, 0))
                     return NULL;
             }
             return alias(name, str, c->c_arena);
@@ -2832,7 +2794,7 @@
                 a->asname = NEW_IDENTIFIER(asname_node);
                 if (!a->asname)
                     return NULL;
-                if (forbidden_name(a->asname, asname_node, 0))
+                if (forbidden_name(c, a->asname, asname_node, 0))
                     return NULL;
                 return a;
             }
@@ -2843,7 +2805,7 @@
                 name = NEW_IDENTIFIER(name_node);
                 if (!name)
                     return NULL;
-                if (store && forbidden_name(name, name_node, 0))
+                if (store && forbidden_name(c, name, name_node, 0))
                     return NULL;
                 return alias(name, NULL, c->c_arena);
             }
@@ -2972,13 +2934,13 @@
             n = CHILD(n, idx);
             n_children = NCH(n);
             if (n_children % 2 == 0) {
-                ast_error(n, "trailing comma not allowed without"
+                ast_error(c, n, "trailing comma not allowed without"
                              " surrounding parentheses");
                 return NULL;
             }
             break;
         default:
-            ast_error(n, "Unexpected node-type in from-import");
+            ast_error(c, n, "Unexpected node-type in from-import");
             return NULL;
         }
 
@@ -3384,7 +3346,7 @@
         identifier e = NEW_IDENTIFIER(CHILD(exc, 3));
         if (!e)
             return NULL;
-        if (forbidden_name(e, CHILD(exc, 3), 0))
+        if (forbidden_name(c, e, CHILD(exc, 3), 0))
             return NULL;
         expression = ast_for_expr(c, CHILD(exc, 1));
         if (!expression)
@@ -3443,7 +3405,7 @@
         }
     }
     else if (TYPE(CHILD(n, nch - 3)) != except_clause) {
-        ast_error(n, "malformed 'try' statement");
+        ast_error(c, n, "malformed 'try' statement");
         return NULL;
     }
 
@@ -3535,7 +3497,7 @@
         classname = NEW_IDENTIFIER(CHILD(n, 1));
         if (!classname)
             return NULL;
-        if (forbidden_name(classname, CHILD(n, 3), 0))
+        if (forbidden_name(c, classname, CHILD(n, 3), 0))
             return NULL;
         return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
                         LINENO(n), n->n_col_offset, c->c_arena);
@@ -3548,7 +3510,7 @@
         classname = NEW_IDENTIFIER(CHILD(n, 1));
         if (!classname)
             return NULL;
-        if (forbidden_name(classname, CHILD(n, 3), 0))
+        if (forbidden_name(c, classname, CHILD(n, 3), 0))
             return NULL;
         return ClassDef(classname, NULL, NULL, NULL, NULL, s, decorator_seq,
                         LINENO(n), n->n_col_offset, c->c_arena);
@@ -3573,7 +3535,7 @@
     classname = NEW_IDENTIFIER(CHILD(n, 1));
     if (!classname)
         return NULL;
-    if (forbidden_name(classname, CHILD(n, 1), 0))
+    if (forbidden_name(c, classname, CHILD(n, 1), 0))
         return NULL;
 
     return ClassDef(classname, call->v.Call.args, call->v.Call.keywords,
@@ -3832,10 +3794,10 @@
     }
     if (*bytesmode) {
         /* Disallow non-ascii characters (but not escapes) */
-        const char *c;
-        for (c = s; *c; c++) {
-            if (Py_CHARMASK(*c) >= 0x80) {
-                ast_error(n, "bytes can only contain ASCII "
+        const char *ch;
+        for (ch = s; *ch; ch++) {
+            if (Py_CHARMASK(*ch) >= 0x80) {
+                ast_error(c, n, "bytes can only contain ASCII "
                           "literal characters.");
                 return NULL;
             }
@@ -3883,7 +3845,8 @@
             if (s == NULL)
                 goto onError;
             if (*bytesmode != subbm) {
-                ast_error(n, "cannot mix bytes and nonbytes literals");
+                ast_error(c, n, "cannot mix bytes and nonbytes literals");
+                Py_DECREF(s);
                 goto onError;
             }
             if (PyBytes_Check(v) && PyBytes_Check(s)) {
diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -1099,7 +1099,7 @@
                          &locale, 0);
 
 done:
-    Py_DECREF(unicode_tmp);
+    Py_XDECREF(unicode_tmp);
     free_locale_info(&locale);
     return result;
 }
diff --git a/Python/getargs.c b/Python/getargs.c
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1742,6 +1742,7 @@
     assert(min >= 0);
     assert(min <= max);
     if (!PyTuple_Check(args)) {
+        va_end(vargs);
         PyErr_SetString(PyExc_SystemError,
             "PyArg_UnpackTuple() argument list is not a tuple");
         return 0;
diff --git a/Python/importlib.h b/Python/importlib.h
--- a/Python/importlib.h
+++ b/Python/importlib.h
[stripped]
diff --git a/Python/pyarena.c b/Python/pyarena.c
--- a/Python/pyarena.c
+++ b/Python/pyarena.c
@@ -12,8 +12,6 @@
 
 #define DEFAULT_BLOCK_SIZE 8192
 #define ALIGNMENT               8
-#define ALIGNMENT_MASK          (ALIGNMENT - 1)
-#define ROUNDUP(x)              (((x) + ALIGNMENT_MASK) & ~ALIGNMENT_MASK)
 
 typedef struct _block {
     /* Total number of bytes owned by this block available to pass out.
@@ -85,8 +83,8 @@
     b->ab_size = size;
     b->ab_mem = (void *)(b + 1);
     b->ab_next = NULL;
-    b->ab_offset = ROUNDUP((Py_uintptr_t)(b->ab_mem)) -
-      (Py_uintptr_t)(b->ab_mem);
+    b->ab_offset = (char *)_Py_ALIGN_UP(b->ab_mem, ALIGNMENT) -
+            (char *)(b->ab_mem);
     return b;
 }
 
@@ -104,7 +102,7 @@
 {
     void *p;
     assert(b);
-    size = ROUNDUP(size);
+    size = _Py_SIZE_ROUND_UP(size, ALIGNMENT);
     if (b->ab_offset + size > b->ab_size) {
         /* If we need to allocate more memory than will fit in
            the default block, allocate a one-off block that is
diff --git a/Python/structmember.c b/Python/structmember.c
--- a/Python/structmember.c
+++ b/Python/structmember.c
@@ -254,12 +254,8 @@
         char *string;
         Py_ssize_t len;
 
-        if (!PyUnicode_Check(v)) {
-            PyErr_BadArgument();
-            return -1;
-        }
         string = _PyUnicode_AsStringAndSize(v, &len);
-        if (len != 1) {
+        if (string == NULL || len != 1) {
             PyErr_BadArgument();
             return -1;
         }
diff --git a/Python/symtable.c b/Python/symtable.c
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -24,16 +24,18 @@
         void *key, int lineno, int col_offset)
 {
     PySTEntryObject *ste = NULL;
-    PyObject *k;
+    PyObject *k = NULL;
 
     k = PyLong_FromVoidPtr(key);
     if (k == NULL)
         goto fail;
     ste = PyObject_New(PySTEntryObject, &PySTEntry_Type);
-    if (ste == NULL)
+    if (ste == NULL) {
+        Py_DECREF(k);
         goto fail;
+    }
     ste->ste_table = st;
-    ste->ste_id = k;
+    ste->ste_id = k; /* ste owns reference to k */
 
     ste->ste_name = name;
     Py_INCREF(name);
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1788,6 +1788,8 @@
                 mkpath(ffi_builddir)
                 config_args = [arg for arg in sysconfig.get_config_var("CONFIG_ARGS").split()
                                if (('--host=' in arg) or ('--build=' in arg))]
+                if not self.verbose:
+                    config_args.append("-q")
 
                 # Pass empty CFLAGS because we'll just append the resulting
                 # CFLAGS to Python's; -g or -O2 is to be avoided.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:20:21 2012
From: python-checkins at python.org (benjamin.peterson)
Date: Sat, 29 Sep 2012 20:20:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_merge_3=2E3_nully?=
Message-ID: <3XTdN600FWzNnl@mail.python.org>

http://hg.python.org/cpython/rev/344d67063c8f
changeset:   79258:344d67063c8f
parent:      79256:43c8701988dd
parent:      79257:83496b5e1916
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Sep 29 14:20:09 2012 -0400
summary:
  merge 3.3 nully

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:35:55 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 20:35:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Clarify_descri?=
 =?utf-8?q?ption_of_who_needs_to_worry_about_importlib_changes=2E?=
Message-ID: <3XTdk33ZfSzQSF@mail.python.org>

http://hg.python.org/cpython/rev/efb34b311132
changeset:   79259:efb34b311132
branch:      3.3
parent:      79257:83496b5e1916
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 14:34:43 2012 -0400
summary:
  Clarify description of who needs to worry about importlib changes.

files:
  Doc/whatsnew/3.3.rst |  9 ++++-----
  1 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -616,11 +616,10 @@
 import semantics. And finally it eases the maintenance of import, allowing for
 future growth to occur.
 
-For the common user, this change should result in no visible change in
-semantics. Any possible changes required in one's code to handle this change
-should read the `Porting Python code`_ section of this document to see what
-needs to be changed, but it will only affect those that currently manipulate
-import or try calling it programmatically.
+For the common user, there should be no visible change in semantics.  For
+those whose code currently manipulates import or calls import
+programmatically, the code changes that might possibly be required are covered
+in the `Porting Python code`_ section of this document.
 
 New APIs
 --------

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:35:56 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 20:35:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Clarify_description_of_who_needs_to_worry_about?=
 =?utf-8?q?_importlib_changes=2E?=
Message-ID: <3XTdk460cTzNsy@mail.python.org>

http://hg.python.org/cpython/rev/766159fa5f68
changeset:   79260:766159fa5f68
parent:      79258:344d67063c8f
parent:      79259:efb34b311132
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 14:35:44 2012 -0400
summary:
  Merge: Clarify description of who needs to worry about importlib changes.

files:
  Doc/whatsnew/3.3.rst |  9 ++++-----
  1 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -616,11 +616,10 @@
 import semantics. And finally it eases the maintenance of import, allowing for
 future growth to occur.
 
-For the common user, this change should result in no visible change in
-semantics. Any possible changes required in one's code to handle this change
-should read the `Porting Python code`_ section of this document to see what
-needs to be changed, but it will only affect those that currently manipulate
-import or try calling it programmatically.
+For the common user, there should be no visible change in semantics.  For
+those whose code currently manipulates import or calls import
+programmatically, the code changes that might possibly be required are covered
+in the `Porting Python code`_ section of this document.
 
 New APIs
 --------

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:44:36 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 20:44:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE2MDg1OiBEb24n?=
 =?utf-8?q?t_promote_shadowing_builtins_in_the_configparser_example=2E?=
Message-ID: <3XTdw44kgszMtd@mail.python.org>

http://hg.python.org/cpython/rev/178e7183931e
changeset:   79261:178e7183931e
branch:      3.2
parent:      79224:70af6b53b52a
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 14:40:23 2012 -0400
summary:
  #16085: Don't promote shadowing builtins in the configparser example.

files:
  Doc/library/configparser.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -770,9 +770,9 @@
    # values using the mapping protocol or ConfigParser's set() does not allow
    # such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -790,13 +790,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print(float + int)
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print(a_float + an_int)
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print(config.get('Section1', 'foo'))
 
 To get interpolation, use :class:`ConfigParser`::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:44:37 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 20:44:37 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_=2316085=3A_Don=27t_promote_shadowing_builtins_in_the_co?=
 =?utf-8?q?nfigparser_example=2E?=
Message-ID: <3XTdw571tdzMtd@mail.python.org>

http://hg.python.org/cpython/rev/769247e6edbf
changeset:   79262:769247e6edbf
branch:      3.3
parent:      79259:efb34b311132
parent:      79261:178e7183931e
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 14:40:56 2012 -0400
summary:
  Merge #16085: Don't promote shadowing builtins in the configparser example.

files:
  Doc/library/configparser.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -770,9 +770,9 @@
    # values using the mapping protocol or ConfigParser's set() does not allow
    # such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -790,13 +790,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print(float + int)
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print(a_float + an_int)
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print(config.get('Section1', 'foo'))
 
 To get interpolation, use :class:`ConfigParser`::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:44:39 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 20:44:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2316085=3A_Don=27t_promote_shadowing_builtins_in_?=
 =?utf-8?q?the_configparser_example=2E?=
Message-ID: <3XTdw72sCNzQW4@mail.python.org>

http://hg.python.org/cpython/rev/1c9b0b37f097
changeset:   79263:1c9b0b37f097
parent:      79260:766159fa5f68
parent:      79262:769247e6edbf
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 14:41:26 2012 -0400
summary:
  Merge #16085: Don't promote shadowing builtins in the configparser example.

files:
  Doc/library/configparser.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -770,9 +770,9 @@
    # values using the mapping protocol or ConfigParser's set() does not allow
    # such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -790,13 +790,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print(float + int)
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print(a_float + an_int)
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print(config.get('Section1', 'foo'))
 
 To get interpolation, use :class:`ConfigParser`::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:44:40 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 20:44:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE2MDg1OiBEb24n?=
 =?utf-8?q?t_promote_shadowing_builtins_in_the_configparser_example=2E?=
Message-ID: <3XTdw86K8WzQSF@mail.python.org>

http://hg.python.org/cpython/rev/1ee270d522f3
changeset:   79264:1ee270d522f3
branch:      2.7
parent:      79227:bff269ee7288
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 14:44:16 2012 -0400
summary:
  #16085: Don't promote shadowing builtins in the configparser example.

files:
  Doc/library/configparser.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -451,9 +451,9 @@
    # when attempting to write to a file or when you get it in non-raw
    # mode. SafeConfigParser does not allow such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -471,13 +471,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print float + int
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print a_float + an_int
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print config.get('Section1', 'foo')
 
 To get interpolation, you will need to use a :class:`ConfigParser` or

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:51:58 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sat, 29 Sep 2012 20:51:58 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Close_issue_?=
 =?utf-8?q?=2316077=3A_fix_code_example_in_documentation_of_reduce=28=29_b?=
 =?utf-8?q?uilt-in?=
Message-ID: <3XTf4Z1dhfzQLs@mail.python.org>

http://hg.python.org/cpython/rev/a6779524962c
changeset:   79265:a6779524962c
branch:      2.7
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sat Sep 29 11:51:37 2012 -0700
summary:
  Close issue #16077: fix code example in documentation of reduce() built-in (from docs@).

files:
  Doc/library/functions.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1100,7 +1100,7 @@
               except StopIteration:
                   raise TypeError('reduce() of empty sequence with no initial value')
           accum_value = initializer
-          for x in iterable:
+          for x in it:
               accum_value = function(accum_value, x)
           return accum_value
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:45 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Fixes_issue_?=
 =?utf-8?q?=2315756=3A_subprocess=2Epoll=28=29_now_properly_handles_errno?=
 =?utf-8?q?=2EECHILD?=
Message-ID: <3XTfDP2btgzNkN@mail.python.org>

http://hg.python.org/cpython/rev/484c50bf445c
changeset:   79266:484c50bf445c
branch:      3.2
parent:      79224:70af6b53b52a
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:40:38 2012 -0700
summary:
  Fixes issue #15756: subprocess.poll() now properly handles errno.ECHILD
to return a returncode of 0 when the child has already exited or cannot
be waited on.

files:
  Lib/subprocess.py                          |   9 +++++++-
  Lib/test/subprocessdata/sigchild_ignore.py |  11 +++++++++-
  Misc/NEWS                                  |   4 +++
  3 files changed, 22 insertions(+), 2 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1400,9 +1400,16 @@
                     pid, sts = _waitpid(self.pid, _WNOHANG)
                     if pid == self.pid:
                         self._handle_exitstatus(sts)
-                except _os_error:
+                except _os_error as e:
                     if _deadstate is not None:
                         self.returncode = _deadstate
+                    elif e.errno == errno.ECHILD:
+                        # This happens if SIGCLD is set to be ignored or
+                        # waiting for child processes has otherwise been
+                        # disabled for our process.  This child is dead, we
+                        # can't get the status.
+                        # http://bugs.python.org/issue15756
+                        self.returncode = 0
             return self.returncode
 
 
diff --git a/Lib/test/subprocessdata/sigchild_ignore.py b/Lib/test/subprocessdata/sigchild_ignore.py
--- a/Lib/test/subprocessdata/sigchild_ignore.py
+++ b/Lib/test/subprocessdata/sigchild_ignore.py
@@ -1,6 +1,15 @@
-import signal, subprocess, sys
+import signal, subprocess, sys, time
 # On Linux this causes os.waitpid to fail with OSError as the OS has already
 # reaped our child process.  The wait() passing the OSError on to the caller
 # and causing us to exit with an error is what we are testing against.
 signal.signal(signal.SIGCHLD, signal.SIG_IGN)
 subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
+# Also ensure poll() handles an errno.ECHILD appropriately.
+p = subprocess.Popen([sys.executable, '-c', 'print("albatross")'])
+num_polls = 0
+while p.poll() is None:
+    # Waiting for the process to finish.
+    time.sleep(0.01)  # Avoid being a CPU busy loop.
+    num_polls += 1
+    if num_polls > 3000:
+        raise RuntimeError('poll should have returned 0 within 30 seconds')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,10 @@
 Library
 -------
 
+- Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
+  return a returncode of 0 when the child has already exited or cannot
+  be waited on.
+
 - Issue #12376: Pass on parameters in TextTestResult.__init__ super call
 
 - Issue #15222: Insert blank line after each message in mbox mailboxes

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:46 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Fixes_issue_=2315756=3A_subprocess=2Epoll=28=29_now_properly_h?=
 =?utf-8?q?andles_errno=2EECHILD?=
Message-ID: <3XTfDQ5hrYzQSF@mail.python.org>

http://hg.python.org/cpython/rev/ba8d85552e34
changeset:   79267:ba8d85552e34
branch:      3.3
parent:      79259:efb34b311132
parent:      79266:484c50bf445c
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:53:08 2012 -0700
summary:
  Fixes issue #15756: subprocess.poll() now properly handles errno.ECHILD
to return a returncode of 0 when the child has already exited or cannot be
waited on.

files:
  Lib/subprocess.py                          |   9 +++++++-
  Lib/test/subprocessdata/sigchild_ignore.py |  11 +++++++++-
  Misc/NEWS                                  |   4 +++
  3 files changed, 22 insertions(+), 2 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1445,9 +1445,16 @@
                     pid, sts = _waitpid(self.pid, _WNOHANG)
                     if pid == self.pid:
                         self._handle_exitstatus(sts)
-                except _os_error:
+                except _os_error as e:
                     if _deadstate is not None:
                         self.returncode = _deadstate
+                    elif e.errno == errno.ECHILD:
+                        # This happens if SIGCLD is set to be ignored or
+                        # waiting for child processes has otherwise been
+                        # disabled for our process.  This child is dead, we
+                        # can't get the status.
+                        # http://bugs.python.org/issue15756
+                        self.returncode = 0
             return self.returncode
 
 
diff --git a/Lib/test/subprocessdata/sigchild_ignore.py b/Lib/test/subprocessdata/sigchild_ignore.py
--- a/Lib/test/subprocessdata/sigchild_ignore.py
+++ b/Lib/test/subprocessdata/sigchild_ignore.py
@@ -1,6 +1,15 @@
-import signal, subprocess, sys
+import signal, subprocess, sys, time
 # On Linux this causes os.waitpid to fail with OSError as the OS has already
 # reaped our child process.  The wait() passing the OSError on to the caller
 # and causing us to exit with an error is what we are testing against.
 signal.signal(signal.SIGCHLD, signal.SIG_IGN)
 subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
+# Also ensure poll() handles an errno.ECHILD appropriately.
+p = subprocess.Popen([sys.executable, '-c', 'print("albatross")'])
+num_polls = 0
+while p.poll() is None:
+    # Waiting for the process to finish.
+    time.sleep(0.01)  # Avoid being a CPU busy loop.
+    num_polls += 1
+    if num_polls > 3000:
+        raise RuntimeError('poll should have returned 0 within 30 seconds')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,10 @@
 Library
 -------
 
+- Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
+  return a returncode of 0 when the child has already exited or cannot
+  be waited on.
+
 
 What's New in Python 3.3.0?
 ===========================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:48 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:48 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Fixes_issue_=2315756=3A_subprocess=2Epoll=28=29_now_prop?=
 =?utf-8?q?erly_handles_errno=2EECHILD_to?=
Message-ID: <3XTfDS17NBzQWg@mail.python.org>

http://hg.python.org/cpython/rev/9032b3f52819
changeset:   79268:9032b3f52819
parent:      79260:766159fa5f68
parent:      79267:ba8d85552e34
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:55:16 2012 -0700
summary:
  Fixes issue #15756: subprocess.poll() now properly handles errno.ECHILD to
return a returncode of 0 when the child has already exited or cannot be
waited on.

files:
  Lib/subprocess.py                          |   9 +++++++-
  Lib/test/subprocessdata/sigchild_ignore.py |  11 +++++++++-
  Misc/NEWS                                  |   4 +++
  3 files changed, 22 insertions(+), 2 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1445,9 +1445,16 @@
                     pid, sts = _waitpid(self.pid, _WNOHANG)
                     if pid == self.pid:
                         self._handle_exitstatus(sts)
-                except _os_error:
+                except _os_error as e:
                     if _deadstate is not None:
                         self.returncode = _deadstate
+                    elif e.errno == errno.ECHILD:
+                        # This happens if SIGCLD is set to be ignored or
+                        # waiting for child processes has otherwise been
+                        # disabled for our process.  This child is dead, we
+                        # can't get the status.
+                        # http://bugs.python.org/issue15756
+                        self.returncode = 0
             return self.returncode
 
 
diff --git a/Lib/test/subprocessdata/sigchild_ignore.py b/Lib/test/subprocessdata/sigchild_ignore.py
--- a/Lib/test/subprocessdata/sigchild_ignore.py
+++ b/Lib/test/subprocessdata/sigchild_ignore.py
@@ -1,6 +1,15 @@
-import signal, subprocess, sys
+import signal, subprocess, sys, time
 # On Linux this causes os.waitpid to fail with OSError as the OS has already
 # reaped our child process.  The wait() passing the OSError on to the caller
 # and causing us to exit with an error is what we are testing against.
 signal.signal(signal.SIGCHLD, signal.SIG_IGN)
 subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
+# Also ensure poll() handles an errno.ECHILD appropriately.
+p = subprocess.Popen([sys.executable, '-c', 'print("albatross")'])
+num_polls = 0
+while p.poll() is None:
+    # Waiting for the process to finish.
+    time.sleep(0.01)  # Avoid being a CPU busy loop.
+    num_polls += 1
+    if num_polls > 3000:
+        raise RuntimeError('poll should have returned 0 within 30 seconds')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,10 @@
 Library
 -------
 
+- Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
+  return a returncode of 0 when the child has already exited or cannot
+  be waited on.
+
 Extension Modules
 -----------------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:49 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:49 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XTfDT3kf2zP53@mail.python.org>

http://hg.python.org/cpython/rev/7e2ec3dd84a9
changeset:   79269:7e2ec3dd84a9
parent:      79268:9032b3f52819
parent:      79263:1c9b0b37f097
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:56:11 2012 -0700
summary:
  merge heads

files:
  Doc/library/configparser.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -770,9 +770,9 @@
    # values using the mapping protocol or ConfigParser's set() does not allow
    # such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -790,13 +790,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print(float + int)
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print(a_float + an_int)
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print(config.get('Section1', 'foo'))
 
 To get interpolation, use :class:`ConfigParser`::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:51 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:51 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
	=?utf-8?q?_merge_heads?=
Message-ID: <3XTfDW00RwzQSF@mail.python.org>

http://hg.python.org/cpython/rev/26f06a9d17b1
changeset:   79270:26f06a9d17b1
branch:      3.3
parent:      79267:ba8d85552e34
parent:      79262:769247e6edbf
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:56:41 2012 -0700
summary:
  merge heads

files:
  Doc/library/configparser.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -770,9 +770,9 @@
    # values using the mapping protocol or ConfigParser's set() does not allow
    # such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -790,13 +790,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print(float + int)
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print(a_float + an_int)
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print(config.get('Section1', 'foo'))
 
 To get interpolation, use :class:`ConfigParser`::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:52 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:52 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMik6?=
	=?utf-8?q?_merge_heads?=
Message-ID: <3XTfDX2q82zP53@mail.python.org>

http://hg.python.org/cpython/rev/d3288f1e1025
changeset:   79271:d3288f1e1025
branch:      3.2
parent:      79266:484c50bf445c
parent:      79261:178e7183931e
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:56:56 2012 -0700
summary:
  merge heads

files:
  Doc/library/configparser.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -770,9 +770,9 @@
    # values using the mapping protocol or ConfigParser's set() does not allow
    # such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -790,13 +790,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print(float + int)
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print(a_float + an_int)
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print(config.get('Section1', 'foo'))
 
 To get interpolation, use :class:`ConfigParser`::

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:53 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:53 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
	=?utf-8?q?_merge_heads?=
Message-ID: <3XTfDY5sLYzQRk@mail.python.org>

http://hg.python.org/cpython/rev/67a16727333a
changeset:   79272:67a16727333a
branch:      3.3
parent:      79270:26f06a9d17b1
parent:      79271:d3288f1e1025
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:57:40 2012 -0700
summary:
  merge heads

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 20:58:55 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 20:58:55 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XTfDb2F0SzQRk@mail.python.org>

http://hg.python.org/cpython/rev/ea5d1f0116a7
changeset:   79273:ea5d1f0116a7
parent:      79269:7e2ec3dd84a9
parent:      79272:67a16727333a
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 11:58:31 2012 -0700
summary:
  merge heads

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:03:26 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 21:03:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogSXNzdWUgIzE1NzU2?=
 =?utf-8?q?=3A_subprocess=2Epoll=28=29_now_properly_handles_errno=2EECHILD?=
 =?utf-8?q?_to?=
Message-ID: <3XTfKp1PQ7zQHq@mail.python.org>

http://hg.python.org/cpython/rev/53e91fa35f8e
changeset:   79274:53e91fa35f8e
branch:      2.7
parent:      79227:bff269ee7288
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 12:02:48 2012 -0700
summary:
  Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
return a returncode of 0 when the child has already exited or cannot
be waited on.

files:
  Lib/subprocess.py                          |   9 +++++++-
  Lib/test/subprocessdata/sigchild_ignore.py |  11 +++++++++-
  Misc/NEWS                                  |   4 +++
  3 files changed, 22 insertions(+), 2 deletions(-)


diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1287,9 +1287,16 @@
                     pid, sts = _waitpid(self.pid, _WNOHANG)
                     if pid == self.pid:
                         self._handle_exitstatus(sts)
-                except _os_error:
+                except _os_error as e:
                     if _deadstate is not None:
                         self.returncode = _deadstate
+                    if e.errno == errno.ECHILD:
+                        # This happens if SIGCLD is set to be ignored or
+                        # waiting for child processes has otherwise been
+                        # disabled for our process.  This child is dead, we
+                        # can't get the status.
+                        # http://bugs.python.org/issue15756
+                        self.returncode = 0
             return self.returncode
 
 
diff --git a/Lib/test/subprocessdata/sigchild_ignore.py b/Lib/test/subprocessdata/sigchild_ignore.py
--- a/Lib/test/subprocessdata/sigchild_ignore.py
+++ b/Lib/test/subprocessdata/sigchild_ignore.py
@@ -1,6 +1,15 @@
-import signal, subprocess, sys
+import signal, subprocess, sys, time
 # On Linux this causes os.waitpid to fail with OSError as the OS has already
 # reaped our child process.  The wait() passing the OSError on to the caller
 # and causing us to exit with an error is what we are testing against.
 signal.signal(signal.SIGCHLD, signal.SIG_IGN)
 subprocess.Popen([sys.executable, '-c', 'print("albatross")']).wait()
+# Also ensure poll() handles an errno.ECHILD appropriately.
+p = subprocess.Popen([sys.executable, '-c', 'print("albatross")'])
+num_polls = 0
+while p.poll() is None:
+    # Waiting for the process to finish.
+    time.sleep(0.01)  # Avoid being a CPU busy loop.
+    num_polls += 1
+    if num_polls > 3000:
+        raise RuntimeError('poll should have returned 0 within 30 seconds')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,10 @@
 Library
 -------
 
+- Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
+  return a returncode of 0 when the child has already exited or cannot
+  be waited on.
+
 - Issue #12376: Pass on parameters in TextTestResult.__init__ super call
 
 - Issue #15222: Insert blank line after each message in mbox mailboxes

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:03:28 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 21:03:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMi43IC0+IDIuNyk6?=
	=?utf-8?q?_merge_heads?=
Message-ID: <3XTfKr0yjTzQRh@mail.python.org>

http://hg.python.org/cpython/rev/f09bc2555e83
changeset:   79275:f09bc2555e83
branch:      2.7
parent:      79274:53e91fa35f8e
parent:      79265:a6779524962c
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 12:03:12 2012 -0700
summary:
  merge heads

files:
  Doc/library/configparser.rst |  14 +++++++-------
  Doc/library/functions.rst    |   2 +-
  2 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -451,9 +451,9 @@
    # when attempting to write to a file or when you get it in non-raw
    # mode. SafeConfigParser does not allow such assignments to take place.
    config.add_section('Section1')
-   config.set('Section1', 'int', '15')
-   config.set('Section1', 'bool', 'true')
-   config.set('Section1', 'float', '3.1415')
+   config.set('Section1', 'an_int', '15')
+   config.set('Section1', 'a_bool', 'true')
+   config.set('Section1', 'a_float', '3.1415')
    config.set('Section1', 'baz', 'fun')
    config.set('Section1', 'bar', 'Python')
    config.set('Section1', 'foo', '%(bar)s is %(baz)s!')
@@ -471,13 +471,13 @@
 
    # getfloat() raises an exception if the value is not a float
    # getint() and getboolean() also do this for their respective types
-   float = config.getfloat('Section1', 'float')
-   int = config.getint('Section1', 'int')
-   print float + int
+   a_float = config.getfloat('Section1', 'a_float')
+   an_int = config.getint('Section1', 'an_int')
+   print a_float + an_int
 
    # Notice that the next output does not interpolate '%(bar)s' or '%(baz)s'.
    # This is because we are using a RawConfigParser().
-   if config.getboolean('Section1', 'bool'):
+   if config.getboolean('Section1', 'a_bool'):
        print config.get('Section1', 'foo')
 
 To get interpolation, you will need to use a :class:`ConfigParser` or
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1100,7 +1100,7 @@
               except StopIteration:
                   raise TypeError('reduce() of empty sequence with no initial value')
           accum_value = initializer
-          for x in iterable:
+          for x in it:
               accum_value = function(accum_value, x)
           return accum_value
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:14:24 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:14:24 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Be_consistent_?=
 =?utf-8?q?and_don=27t_use_a_bullet_list_when_a_section_has_only_one_item?=
 =?utf-8?q?=2E?=
Message-ID: <3XTfZS5wTFzNhX@mail.python.org>

http://hg.python.org/cpython/rev/28918c54f141
changeset:   79276:28918c54f141
branch:      3.3
parent:      79272:67a16727333a
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:13:35 2012 -0400
summary:
  Be consistent and don't use a bullet list when a section has only one item.

files:
  Doc/whatsnew/3.3.rst |  77 ++++++++++++++++---------------
  1 files changed, 40 insertions(+), 37 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1329,10 +1329,10 @@
 math
 ----
 
-The :mod:`math` module has a new function:
-
-  * :func:`~math.log2`: return the base-2 logarithm of *x*
-    (Written by Mark Dickinson in :issue:`11888`).
+The :mod:`math` module has a new function, :func:`~math.log2`,  which returns
+the base-2 logarithm of *x*.
+
+(Written by Mark Dickinson in :issue:`11888`).
 
 
 multiprocessing
@@ -1476,9 +1476,11 @@
 pdb
 ---
 
-* Tab-completion is now available not only for command names, but also their
-  arguments.  For example, for the ``break`` command, function and file names
-  are completed.  (Contributed by Georg Brandl in :issue:`14210`)
+Tab-completion is now available not only for command names, but also their
+arguments.  For example, for the ``break`` command, function and file names
+are completed.
+
+(Contributed by Georg Brandl in :issue:`14210`)
 
 
 pickle
@@ -1487,6 +1489,7 @@
 :class:`pickle.Pickler` objects now have an optional
 :attr:`~pickle.Pickler.dispatch_table` attribute allowing to set per-pickler
 reduction functions.
+
 (Contributed by Richard Oudkerk in :issue:`14166`.)
 
 
@@ -1536,10 +1539,10 @@
 shlex
 -----
 
-* The previously undocumented helper function ``quote`` from the
-  :mod:`pipes` modules has been moved to the :mod:`shlex` module and
-  documented.  :func:`~shlex.quote` properly escapes all characters in a string
-  that might be otherwise given special meaning by the shell.
+The previously undocumented helper function ``quote`` from the
+:mod:`pipes` modules has been moved to the :mod:`shlex` module and
+documented.  :func:`~shlex.quote` properly escapes all characters in a string
+that might be otherwise given special meaning by the shell.
 
 
 shutil
@@ -1599,23 +1602,23 @@
 smtpd
 -----
 
-* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
-  (size extension).  Per the standard, these extensions are enabled if and only
-  if the client initiates the session with an ``EHLO`` command.
-
-  (Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
-  Jauhiainen.  Substantial additional work on the patch contributed by Michele
-  Orr? and Dan Boswell.  :issue:`8739`)
+The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
+(size extension).  Per the standard, these extensions are enabled if and only
+if the client initiates the session with an ``EHLO`` command.
+
+(Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
+Jauhiainen.  Substantial additional work on the patch contributed by Michele
+Orr? and Dan Boswell.  :issue:`8739`)
 
 
 smtplib
 -------
 
-* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
-  method now accept an SSLContext parameter to control parameters of the secure
-  channel.
-
-  (Contributed by Kasun Herath in :issue:`8809`)
+The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+method now accept an SSLContext parameter to control parameters of the secure
+channel.
+
+(Contributed by Kasun Herath in :issue:`8809`)
 
 
 socket
@@ -1693,28 +1696,28 @@
 stat
 ----
 
-- The undocumented tarfile.filemode function has been moved to
-  :func:`stat.filemode`. It can be used to convert a file's mode to a string of
-  the form '-rwxrwxrwx'.
-
-  (Contributed by Giampaolo Rodol? in :issue:`14807`)
+The undocumented tarfile.filemode function has been moved to
+:func:`stat.filemode`. It can be used to convert a file's mode to a string of
+the form '-rwxrwxrwx'.
+
+(Contributed by Giampaolo Rodol? in :issue:`14807`)
 
 sys
 ---
 
-* The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct
-  sequence` holding informations about the thread implementation.
-
-  (:issue:`11223`)
+The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct
+sequence` holding informations about the thread implementation.
+
+(:issue:`11223`)
 
 textwrap
 --------
 
-* The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes
-  it straightforward to add a common prefix to selected lines in a block
-  of text.
-
-  (:issue:`13857`)
+The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes
+it straightforward to add a common prefix to selected lines in a block
+of text.
+
+(:issue:`13857`)
 
 time
 ----

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:14:26 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:14:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Be_consistent_and_don=27t_use_a_bullet_list_whe?=
 =?utf-8?q?n_a_section_has_only_one?=
Message-ID: <3XTfZV33RNzNsy@mail.python.org>

http://hg.python.org/cpython/rev/dc3687eb48f3
changeset:   79277:dc3687eb48f3
parent:      79273:ea5d1f0116a7
parent:      79276:28918c54f141
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:14:10 2012 -0400
summary:
  Merge: Be consistent and don't use a bullet list when a section has only one item.

files:
  Doc/whatsnew/3.3.rst |  77 ++++++++++++++++---------------
  1 files changed, 40 insertions(+), 37 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1329,10 +1329,10 @@
 math
 ----
 
-The :mod:`math` module has a new function:
-
-  * :func:`~math.log2`: return the base-2 logarithm of *x*
-    (Written by Mark Dickinson in :issue:`11888`).
+The :mod:`math` module has a new function, :func:`~math.log2`,  which returns
+the base-2 logarithm of *x*.
+
+(Written by Mark Dickinson in :issue:`11888`).
 
 
 multiprocessing
@@ -1476,9 +1476,11 @@
 pdb
 ---
 
-* Tab-completion is now available not only for command names, but also their
-  arguments.  For example, for the ``break`` command, function and file names
-  are completed.  (Contributed by Georg Brandl in :issue:`14210`)
+Tab-completion is now available not only for command names, but also their
+arguments.  For example, for the ``break`` command, function and file names
+are completed.
+
+(Contributed by Georg Brandl in :issue:`14210`)
 
 
 pickle
@@ -1487,6 +1489,7 @@
 :class:`pickle.Pickler` objects now have an optional
 :attr:`~pickle.Pickler.dispatch_table` attribute allowing to set per-pickler
 reduction functions.
+
 (Contributed by Richard Oudkerk in :issue:`14166`.)
 
 
@@ -1536,10 +1539,10 @@
 shlex
 -----
 
-* The previously undocumented helper function ``quote`` from the
-  :mod:`pipes` modules has been moved to the :mod:`shlex` module and
-  documented.  :func:`~shlex.quote` properly escapes all characters in a string
-  that might be otherwise given special meaning by the shell.
+The previously undocumented helper function ``quote`` from the
+:mod:`pipes` modules has been moved to the :mod:`shlex` module and
+documented.  :func:`~shlex.quote` properly escapes all characters in a string
+that might be otherwise given special meaning by the shell.
 
 
 shutil
@@ -1599,23 +1602,23 @@
 smtpd
 -----
 
-* The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
-  (size extension).  Per the standard, these extensions are enabled if and only
-  if the client initiates the session with an ``EHLO`` command.
-
-  (Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
-  Jauhiainen.  Substantial additional work on the patch contributed by Michele
-  Orr? and Dan Boswell.  :issue:`8739`)
+The :mod:`smtpd` module now supports :rfc:`5321` (extended SMTP) and :rfc:`1870`
+(size extension).  Per the standard, these extensions are enabled if and only
+if the client initiates the session with an ``EHLO`` command.
+
+(Initial ``ELHO`` support by Alberto Trevino.  Size extension by Juhana
+Jauhiainen.  Substantial additional work on the patch contributed by Michele
+Orr? and Dan Boswell.  :issue:`8739`)
 
 
 smtplib
 -------
 
-* The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
-  method now accept an SSLContext parameter to control parameters of the secure
-  channel.
-
-  (Contributed by Kasun Herath in :issue:`8809`)
+The :class:`~smtplib.SMTP_SSL` constructor and the :meth:`~smtplib.SMTP.starttls`
+method now accept an SSLContext parameter to control parameters of the secure
+channel.
+
+(Contributed by Kasun Herath in :issue:`8809`)
 
 
 socket
@@ -1693,28 +1696,28 @@
 stat
 ----
 
-- The undocumented tarfile.filemode function has been moved to
-  :func:`stat.filemode`. It can be used to convert a file's mode to a string of
-  the form '-rwxrwxrwx'.
-
-  (Contributed by Giampaolo Rodol? in :issue:`14807`)
+The undocumented tarfile.filemode function has been moved to
+:func:`stat.filemode`. It can be used to convert a file's mode to a string of
+the form '-rwxrwxrwx'.
+
+(Contributed by Giampaolo Rodol? in :issue:`14807`)
 
 sys
 ---
 
-* The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct
-  sequence` holding informations about the thread implementation.
-
-  (:issue:`11223`)
+The :mod:`sys` module has a new :data:`~sys.thread_info` :term:`struct
+sequence` holding informations about the thread implementation.
+
+(:issue:`11223`)
 
 textwrap
 --------
 
-* The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes
-  it straightforward to add a common prefix to selected lines in a block
-  of text.
-
-  (:issue:`13857`)
+The :mod:`textwrap` module has a new :func:`~textwrap.indent` that makes
+it straightforward to add a common prefix to selected lines in a block
+of text.
+
+(:issue:`13857`)
 
 time
 ----

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:28:33 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:28:33 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_over-inden?=
	=?utf-8?q?tation_of_bullet_lists=2E?=
Message-ID: <3XTftn6nSgzNpC@mail.python.org>

http://hg.python.org/cpython/rev/1bb5dfb56adc
changeset:   79278:1bb5dfb56adc
branch:      3.3
parent:      79276:28918c54f141
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:27:53 2012 -0400
summary:
  Fix over-indentation of bullet lists.

files:
  Doc/whatsnew/3.3.rst |  90 ++++++++++++++++----------------
  1 files changed, 45 insertions(+), 45 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1913,58 +1913,58 @@
 Unicode functions and methods using :c:type:`Py_UNICODE` and
 :c:type:`Py_UNICODE*` types:
 
- * :c:macro:`PyUnicode_FromUnicode`: use :c:func:`PyUnicode_FromWideChar` or
-   :c:func:`PyUnicode_FromKindAndData`
- * :c:macro:`PyUnicode_AS_UNICODE`, :c:func:`PyUnicode_AsUnicode`,
-   :c:func:`PyUnicode_AsUnicodeAndSize`: use :c:func:`PyUnicode_AsWideCharString`
- * :c:macro:`PyUnicode_AS_DATA`: use :c:macro:`PyUnicode_DATA` with
-   :c:macro:`PyUnicode_READ` and :c:macro:`PyUnicode_WRITE`
- * :c:macro:`PyUnicode_GET_SIZE`, :c:func:`PyUnicode_GetSize`: use
-   :c:macro:`PyUnicode_GET_LENGTH` or :c:func:`PyUnicode_GetLength`
- * :c:macro:`PyUnicode_GET_DATA_SIZE`: use
-   ``PyUnicode_GET_LENGTH(str) * PyUnicode_KIND(str)`` (only work on ready
-   strings)
- * :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy` or
-   :c:func:`PyUnicode_AsWideCharString`
- * :c:func:`PyUnicode_GetMax`
+* :c:macro:`PyUnicode_FromUnicode`: use :c:func:`PyUnicode_FromWideChar` or
+  :c:func:`PyUnicode_FromKindAndData`
+* :c:macro:`PyUnicode_AS_UNICODE`, :c:func:`PyUnicode_AsUnicode`,
+  :c:func:`PyUnicode_AsUnicodeAndSize`: use :c:func:`PyUnicode_AsWideCharString`
+* :c:macro:`PyUnicode_AS_DATA`: use :c:macro:`PyUnicode_DATA` with
+  :c:macro:`PyUnicode_READ` and :c:macro:`PyUnicode_WRITE`
+* :c:macro:`PyUnicode_GET_SIZE`, :c:func:`PyUnicode_GetSize`: use
+  :c:macro:`PyUnicode_GET_LENGTH` or :c:func:`PyUnicode_GetLength`
+* :c:macro:`PyUnicode_GET_DATA_SIZE`: use
+  ``PyUnicode_GET_LENGTH(str) * PyUnicode_KIND(str)`` (only work on ready
+  strings)
+* :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy` or
+  :c:func:`PyUnicode_AsWideCharString`
+* :c:func:`PyUnicode_GetMax`
 
 
 Functions and macros manipulating Py_UNICODE* strings:
 
- * :c:macro:`Py_UNICODE_strlen`: use :c:func:`PyUnicode_GetLength` or
-   :c:macro:`PyUnicode_GET_LENGTH`
- * :c:macro:`Py_UNICODE_strcat`: use :c:func:`PyUnicode_CopyCharacters` or
-   :c:func:`PyUnicode_FromFormat`
- * :c:macro:`Py_UNICODE_strcpy`, :c:macro:`Py_UNICODE_strncpy`,
-   :c:macro:`Py_UNICODE_COPY`: use :c:func:`PyUnicode_CopyCharacters` or
-   :c:func:`PyUnicode_Substring`
- * :c:macro:`Py_UNICODE_strcmp`: use :c:func:`PyUnicode_Compare`
- * :c:macro:`Py_UNICODE_strncmp`: use :c:func:`PyUnicode_Tailmatch`
- * :c:macro:`Py_UNICODE_strchr`, :c:macro:`Py_UNICODE_strrchr`: use
-   :c:func:`PyUnicode_FindChar`
- * :c:macro:`Py_UNICODE_FILL`: use :c:func:`PyUnicode_Fill`
- * :c:macro:`Py_UNICODE_MATCH`
+* :c:macro:`Py_UNICODE_strlen`: use :c:func:`PyUnicode_GetLength` or
+  :c:macro:`PyUnicode_GET_LENGTH`
+* :c:macro:`Py_UNICODE_strcat`: use :c:func:`PyUnicode_CopyCharacters` or
+  :c:func:`PyUnicode_FromFormat`
+* :c:macro:`Py_UNICODE_strcpy`, :c:macro:`Py_UNICODE_strncpy`,
+  :c:macro:`Py_UNICODE_COPY`: use :c:func:`PyUnicode_CopyCharacters` or
+  :c:func:`PyUnicode_Substring`
+* :c:macro:`Py_UNICODE_strcmp`: use :c:func:`PyUnicode_Compare`
+* :c:macro:`Py_UNICODE_strncmp`: use :c:func:`PyUnicode_Tailmatch`
+* :c:macro:`Py_UNICODE_strchr`, :c:macro:`Py_UNICODE_strrchr`: use
+  :c:func:`PyUnicode_FindChar`
+* :c:macro:`Py_UNICODE_FILL`: use :c:func:`PyUnicode_Fill`
+* :c:macro:`Py_UNICODE_MATCH`
 
 Encoders:
 
- * :c:func:`PyUnicode_Encode`: use :c:func:`PyUnicode_AsEncodedObject`
- * :c:func:`PyUnicode_EncodeUTF7`
- * :c:func:`PyUnicode_EncodeUTF8`: use :c:func:`PyUnicode_AsUTF8` or
-   :c:func:`PyUnicode_AsUTF8String`
- * :c:func:`PyUnicode_EncodeUTF32`
- * :c:func:`PyUnicode_EncodeUTF16`
- * :c:func:`PyUnicode_EncodeUnicodeEscape:` use
-   :c:func:`PyUnicode_AsUnicodeEscapeString`
- * :c:func:`PyUnicode_EncodeRawUnicodeEscape:` use
-   :c:func:`PyUnicode_AsRawUnicodeEscapeString`
- * :c:func:`PyUnicode_EncodeLatin1`: use :c:func:`PyUnicode_AsLatin1String`
- * :c:func:`PyUnicode_EncodeASCII`: use :c:func:`PyUnicode_AsASCIIString`
- * :c:func:`PyUnicode_EncodeCharmap`
- * :c:func:`PyUnicode_TranslateCharmap`
- * :c:func:`PyUnicode_EncodeMBCS`: use :c:func:`PyUnicode_AsMBCSString` or
-   :c:func:`PyUnicode_EncodeCodePage` (with ``CP_ACP`` code_page)
- * :c:func:`PyUnicode_EncodeDecimal`,
-   :c:func:`PyUnicode_TransformDecimalToASCII`
+* :c:func:`PyUnicode_Encode`: use :c:func:`PyUnicode_AsEncodedObject`
+* :c:func:`PyUnicode_EncodeUTF7`
+* :c:func:`PyUnicode_EncodeUTF8`: use :c:func:`PyUnicode_AsUTF8` or
+  :c:func:`PyUnicode_AsUTF8String`
+* :c:func:`PyUnicode_EncodeUTF32`
+* :c:func:`PyUnicode_EncodeUTF16`
+* :c:func:`PyUnicode_EncodeUnicodeEscape:` use
+  :c:func:`PyUnicode_AsUnicodeEscapeString`
+* :c:func:`PyUnicode_EncodeRawUnicodeEscape:` use
+  :c:func:`PyUnicode_AsRawUnicodeEscapeString`
+* :c:func:`PyUnicode_EncodeLatin1`: use :c:func:`PyUnicode_AsLatin1String`
+* :c:func:`PyUnicode_EncodeASCII`: use :c:func:`PyUnicode_AsASCIIString`
+* :c:func:`PyUnicode_EncodeCharmap`
+* :c:func:`PyUnicode_TranslateCharmap`
+* :c:func:`PyUnicode_EncodeMBCS`: use :c:func:`PyUnicode_AsMBCSString` or
+  :c:func:`PyUnicode_EncodeCodePage` (with ``CP_ACP`` code_page)
+* :c:func:`PyUnicode_EncodeDecimal`,
+  :c:func:`PyUnicode_TransformDecimalToASCII`
 
 
 Deprecated features

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:28:35 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:28:35 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Fix_over-indentation_of_bullet_lists=2E?=
Message-ID: <3XTftq4BNpzNy0@mail.python.org>

http://hg.python.org/cpython/rev/27dd8ff6496d
changeset:   79279:27dd8ff6496d
parent:      79277:dc3687eb48f3
parent:      79278:1bb5dfb56adc
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:28:25 2012 -0400
summary:
  Merge: Fix over-indentation of bullet lists.

files:
  Doc/whatsnew/3.3.rst |  90 ++++++++++++++++----------------
  1 files changed, 45 insertions(+), 45 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1913,58 +1913,58 @@
 Unicode functions and methods using :c:type:`Py_UNICODE` and
 :c:type:`Py_UNICODE*` types:
 
- * :c:macro:`PyUnicode_FromUnicode`: use :c:func:`PyUnicode_FromWideChar` or
-   :c:func:`PyUnicode_FromKindAndData`
- * :c:macro:`PyUnicode_AS_UNICODE`, :c:func:`PyUnicode_AsUnicode`,
-   :c:func:`PyUnicode_AsUnicodeAndSize`: use :c:func:`PyUnicode_AsWideCharString`
- * :c:macro:`PyUnicode_AS_DATA`: use :c:macro:`PyUnicode_DATA` with
-   :c:macro:`PyUnicode_READ` and :c:macro:`PyUnicode_WRITE`
- * :c:macro:`PyUnicode_GET_SIZE`, :c:func:`PyUnicode_GetSize`: use
-   :c:macro:`PyUnicode_GET_LENGTH` or :c:func:`PyUnicode_GetLength`
- * :c:macro:`PyUnicode_GET_DATA_SIZE`: use
-   ``PyUnicode_GET_LENGTH(str) * PyUnicode_KIND(str)`` (only work on ready
-   strings)
- * :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy` or
-   :c:func:`PyUnicode_AsWideCharString`
- * :c:func:`PyUnicode_GetMax`
+* :c:macro:`PyUnicode_FromUnicode`: use :c:func:`PyUnicode_FromWideChar` or
+  :c:func:`PyUnicode_FromKindAndData`
+* :c:macro:`PyUnicode_AS_UNICODE`, :c:func:`PyUnicode_AsUnicode`,
+  :c:func:`PyUnicode_AsUnicodeAndSize`: use :c:func:`PyUnicode_AsWideCharString`
+* :c:macro:`PyUnicode_AS_DATA`: use :c:macro:`PyUnicode_DATA` with
+  :c:macro:`PyUnicode_READ` and :c:macro:`PyUnicode_WRITE`
+* :c:macro:`PyUnicode_GET_SIZE`, :c:func:`PyUnicode_GetSize`: use
+  :c:macro:`PyUnicode_GET_LENGTH` or :c:func:`PyUnicode_GetLength`
+* :c:macro:`PyUnicode_GET_DATA_SIZE`: use
+  ``PyUnicode_GET_LENGTH(str) * PyUnicode_KIND(str)`` (only work on ready
+  strings)
+* :c:func:`PyUnicode_AsUnicodeCopy`: use :c:func:`PyUnicode_AsUCS4Copy` or
+  :c:func:`PyUnicode_AsWideCharString`
+* :c:func:`PyUnicode_GetMax`
 
 
 Functions and macros manipulating Py_UNICODE* strings:
 
- * :c:macro:`Py_UNICODE_strlen`: use :c:func:`PyUnicode_GetLength` or
-   :c:macro:`PyUnicode_GET_LENGTH`
- * :c:macro:`Py_UNICODE_strcat`: use :c:func:`PyUnicode_CopyCharacters` or
-   :c:func:`PyUnicode_FromFormat`
- * :c:macro:`Py_UNICODE_strcpy`, :c:macro:`Py_UNICODE_strncpy`,
-   :c:macro:`Py_UNICODE_COPY`: use :c:func:`PyUnicode_CopyCharacters` or
-   :c:func:`PyUnicode_Substring`
- * :c:macro:`Py_UNICODE_strcmp`: use :c:func:`PyUnicode_Compare`
- * :c:macro:`Py_UNICODE_strncmp`: use :c:func:`PyUnicode_Tailmatch`
- * :c:macro:`Py_UNICODE_strchr`, :c:macro:`Py_UNICODE_strrchr`: use
-   :c:func:`PyUnicode_FindChar`
- * :c:macro:`Py_UNICODE_FILL`: use :c:func:`PyUnicode_Fill`
- * :c:macro:`Py_UNICODE_MATCH`
+* :c:macro:`Py_UNICODE_strlen`: use :c:func:`PyUnicode_GetLength` or
+  :c:macro:`PyUnicode_GET_LENGTH`
+* :c:macro:`Py_UNICODE_strcat`: use :c:func:`PyUnicode_CopyCharacters` or
+  :c:func:`PyUnicode_FromFormat`
+* :c:macro:`Py_UNICODE_strcpy`, :c:macro:`Py_UNICODE_strncpy`,
+  :c:macro:`Py_UNICODE_COPY`: use :c:func:`PyUnicode_CopyCharacters` or
+  :c:func:`PyUnicode_Substring`
+* :c:macro:`Py_UNICODE_strcmp`: use :c:func:`PyUnicode_Compare`
+* :c:macro:`Py_UNICODE_strncmp`: use :c:func:`PyUnicode_Tailmatch`
+* :c:macro:`Py_UNICODE_strchr`, :c:macro:`Py_UNICODE_strrchr`: use
+  :c:func:`PyUnicode_FindChar`
+* :c:macro:`Py_UNICODE_FILL`: use :c:func:`PyUnicode_Fill`
+* :c:macro:`Py_UNICODE_MATCH`
 
 Encoders:
 
- * :c:func:`PyUnicode_Encode`: use :c:func:`PyUnicode_AsEncodedObject`
- * :c:func:`PyUnicode_EncodeUTF7`
- * :c:func:`PyUnicode_EncodeUTF8`: use :c:func:`PyUnicode_AsUTF8` or
-   :c:func:`PyUnicode_AsUTF8String`
- * :c:func:`PyUnicode_EncodeUTF32`
- * :c:func:`PyUnicode_EncodeUTF16`
- * :c:func:`PyUnicode_EncodeUnicodeEscape:` use
-   :c:func:`PyUnicode_AsUnicodeEscapeString`
- * :c:func:`PyUnicode_EncodeRawUnicodeEscape:` use
-   :c:func:`PyUnicode_AsRawUnicodeEscapeString`
- * :c:func:`PyUnicode_EncodeLatin1`: use :c:func:`PyUnicode_AsLatin1String`
- * :c:func:`PyUnicode_EncodeASCII`: use :c:func:`PyUnicode_AsASCIIString`
- * :c:func:`PyUnicode_EncodeCharmap`
- * :c:func:`PyUnicode_TranslateCharmap`
- * :c:func:`PyUnicode_EncodeMBCS`: use :c:func:`PyUnicode_AsMBCSString` or
-   :c:func:`PyUnicode_EncodeCodePage` (with ``CP_ACP`` code_page)
- * :c:func:`PyUnicode_EncodeDecimal`,
-   :c:func:`PyUnicode_TransformDecimalToASCII`
+* :c:func:`PyUnicode_Encode`: use :c:func:`PyUnicode_AsEncodedObject`
+* :c:func:`PyUnicode_EncodeUTF7`
+* :c:func:`PyUnicode_EncodeUTF8`: use :c:func:`PyUnicode_AsUTF8` or
+  :c:func:`PyUnicode_AsUTF8String`
+* :c:func:`PyUnicode_EncodeUTF32`
+* :c:func:`PyUnicode_EncodeUTF16`
+* :c:func:`PyUnicode_EncodeUnicodeEscape:` use
+  :c:func:`PyUnicode_AsUnicodeEscapeString`
+* :c:func:`PyUnicode_EncodeRawUnicodeEscape:` use
+  :c:func:`PyUnicode_AsRawUnicodeEscapeString`
+* :c:func:`PyUnicode_EncodeLatin1`: use :c:func:`PyUnicode_AsLatin1String`
+* :c:func:`PyUnicode_EncodeASCII`: use :c:func:`PyUnicode_AsASCIIString`
+* :c:func:`PyUnicode_EncodeCharmap`
+* :c:func:`PyUnicode_TranslateCharmap`
+* :c:func:`PyUnicode_EncodeMBCS`: use :c:func:`PyUnicode_AsMBCSString` or
+  :c:func:`PyUnicode_EncodeCodePage` (with ``CP_ACP`` code_page)
+* :c:func:`PyUnicode_EncodeDecimal`,
+  :c:func:`PyUnicode_TransformDecimalToASCII`
 
 
 Deprecated features

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:34:40 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:34:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Raymond_didn?=
 =?utf-8?q?=27t_write_any_of_the_text_this_time=2C_remove_as_author=2E?=
Message-ID: <3XTg1r4Hc3zPH2@mail.python.org>

http://hg.python.org/cpython/rev/b31da14ec12f
changeset:   79280:b31da14ec12f
branch:      3.3
parent:      79278:1bb5dfb56adc
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:33:49 2012 -0400
summary:
  Raymond didn't write any of the text this time, remove as author.

files:
  Doc/whatsnew/3.3.rst |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -2,7 +2,6 @@
   What's New In Python 3.3
 ****************************
 
-:Author: Raymond Hettinger
 :Release: |release|
 :Date: |today|
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:34:41 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:34:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Raymond_didn=27t_write_any_of_the_text_this_tim?=
 =?utf-8?q?e=2C_remove_as_author=2E?=
Message-ID: <3XTg1s6cH0zPH2@mail.python.org>

http://hg.python.org/cpython/rev/85ac7089203d
changeset:   79281:85ac7089203d
parent:      79279:27dd8ff6496d
parent:      79280:b31da14ec12f
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:34:26 2012 -0400
summary:
  Merge: Raymond didn't write any of the text this time, remove as author.

files:
  Doc/whatsnew/3.3.rst |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -2,7 +2,6 @@
   What's New In Python 3.3
 ****************************
 
-:Author: Raymond Hettinger
 :Release: |release|
 :Date: |today|
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:41:11 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 21:41:11 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_pty=2Espawn=28=29_now_retu?=
 =?utf-8?q?rns_the_child_process_status_as_returned_by_os=2Ewaitpid=28=29?=
 =?utf-8?q?=2E?=
Message-ID: <3XTg9M40qSzNg6@mail.python.org>

http://hg.python.org/cpython/rev/ec2921d4de37
changeset:   79282:ec2921d4de37
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 12:41:03 2012 -0700
summary:
  pty.spawn() now returns the child process status as returned by os.waitpid().
Addresses the remaining feature request from issue #2489.

files:
  Doc/library/pty.rst  |  3 +++
  Lib/pty.py           |  1 +
  Lib/test/test_pty.py |  6 ++++++
  Misc/NEWS            |  2 ++
  4 files changed, 12 insertions(+), 0 deletions(-)


diff --git a/Doc/library/pty.rst b/Doc/library/pty.rst
--- a/Doc/library/pty.rst
+++ b/Doc/library/pty.rst
@@ -45,6 +45,9 @@
    a file descriptor. The defaults try to read 1024 bytes each time they are
    called.
 
+   .. versionchanged:: 3.4
+      :func:`spawn` now returns the status value from :func:`os.waitpid`
+      on the child process.
 
 Example
 -------
diff --git a/Lib/pty.py b/Lib/pty.py
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -178,3 +178,4 @@
             tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
 
     os.close(master_fd)
+    return os.waitpid(pid, 0)[1]
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -196,6 +196,12 @@
 
         # pty.fork() passed.
 
+    def test_spawn_returns_status(self):
+        status = pty.spawn([sys.executable, '-c', 'import sys; sys.exit(0)'])
+        self.assertEqual(status, 0)
+        status = pty.spawn([sys.executable, '-c', 'import sys; sys.exit(5)'])
+        self.assertEqual(status, 5 << 8)
+
 
 class SmallPtyTests(unittest.TestCase):
     """These tests don't spawn children or hang."""
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@
 Library
 -------
 
+- pty.spawn() now returns the child process status returned by os.waitpid().
+
 - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
   return a returncode of 0 when the child has already exited or cannot
   be waited on.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:44:26 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:44:26 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Move_discussio?=
 =?utf-8?q?n_of_email_changes_into_Improved_Modules_section=2E?=
Message-ID: <3XTgF64nhlzNQB@mail.python.org>

http://hg.python.org/cpython/rev/c3d90fb70247
changeset:   79283:c3d90fb70247
branch:      3.3
parent:      79280:b31da14ec12f
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:43:33 2012 -0400
summary:
  Move discussion of email changes into Improved Modules section.

files:
  Doc/whatsnew/3.3.rst |  784 +++++++++++++++---------------
  1 files changed, 392 insertions(+), 392 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -687,11 +687,399 @@
 in the `Porting Python code`_ section of this document.
 
 
-New Email Package Features
-==========================
+Other Language Changes
+======================
+
+Some smaller changes made to the core Python language are:
+
+* Added support for Unicode name aliases and named sequences.
+  Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases,
+  and :func:`unicodedata.lookup()` resolves named sequences too.
+
+  (Contributed by Ezio Melotti in :issue:`12753`)
+
+* Unicode database updated to UCD version 6.1.0
+
+* Equality comparisons on :func:`range` objects now return a result reflecting
+  the equality of the underlying sequences generated by those range objects.
+
+  (:issue:`13201`)
+
+* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
+  methods of :class:`bytes` and :class:`bytearray` objects now accept an
+  integer between 0 and 255 as their first argument.
+
+  (Contributed by Petri Lehtinen in :issue:`12170`)
+
+* New methods have been added to :class:`list` and :class:`bytearray`:
+  ``copy()`` and ``clear()``.
+
+  (:issue:`10516`)
+
+* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
+  (Contributed by Antoine Pitrou in :issue:`13748`.)
+
+* :meth:`dict.setdefault` now does only one lookup for the given key, making
+  it atomic when used with built-in types.
+  (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
+
+
+.. XXX mention new error messages for passing wrong number of arguments to functions
+
+
+A Finer-Grained Import Lock
+===========================
+
+Previous versions of CPython have always relied on a global import lock.
+This led to unexpected annoyances, such as deadlocks when importing a module
+would trigger code execution in a different thread as a side-effect.
+Clumsy workarounds were sometimes employed, such as the
+:c:func:`PyImport_ImportModuleNoBlock` C API function.
+
+In Python 3.3, importing a module takes a per-module lock.  This correctly
+serializes importation of a given module from multiple threads (preventing
+the exposure of incompletely initialized modules), while eliminating the
+aforementioned annoyances.
+
+(contributed by Antoine Pitrou in :issue:`9260`.)
+
+
+Builtin functions and types
+===========================
+
+* :func:`open` gets a new *opener* parameter: the underlying file descriptor
+  for the file object is then obtained by calling *opener* with (*file*,
+  *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for
+  example. The ``'x'`` mode was added: open for exclusive creation, failing if
+  the file already exists.
+* :func:`print`: added the *flush* keyword argument. If the *flush* keyword
+  argument is true, the stream is forcibly flushed.
+* :func:`hash`: hash randomization is enabled by default, see
+  :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`.
+* The :class:`str` type gets a new :meth:`~str.casefold` method: return a
+  casefolded copy of the string, casefolded strings may be used for caseless
+  matching. For example, ``'?'.casefold()`` returns ``'ss'``.
+* The sequence documentation has been substantially rewritten to better
+  explain the binary/text sequence distinction and to provide specific
+  documentation sections for the individual builtin sequence types
+  (:issue:`4966`)
+
+New Modules
+===========
+
+faulthandler
+------------
+
+This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
+on a fault (a crash like a segmentation fault), after a timeout, or on a user
+signal. Call :func:`faulthandler.enable` to install fault handlers for the
+:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
+:const:`SIGILL` signals. You can also enable them at startup by setting the
+:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X`
+``faulthandler`` command line option.
+
+Example of a segmentation fault on Linux: ::
+
+    $ python -q -X faulthandler
+    >>> import ctypes
+    >>> ctypes.string_at(0)
+    Fatal Python error: Segmentation fault
+
+    Current thread 0x00007fb899f39700:
+      File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at
+      File "<stdin>", line 1 in <module>
+    Segmentation fault
+
+
+ipaddress
+---------
+
+The new :mod:`ipaddress` module provides tools for creating and manipulating
+objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e.
+an IP address associated with a specific IP subnet).
+
+(Contributed by Google and Peter Moody in :pep:`3144`)
+
+lzma
+----
+
+The newly-added :mod:`lzma` module provides data compression and decompression
+using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
+file formats.
+
+(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`)
+
+
+Improved Modules
+================
+
+abc
+---
+
+Improved support for abstract base classes containing descriptors composed with
+abstract methods. The recommended approach to declaring abstract descriptors is
+now to provide :attr:`__isabstractmethod__` as a dynamically updated
+property. The built-in descriptors have been updated accordingly.
+
+  * :class:`abc.abstractproperty` has been deprecated, use :class:`property`
+    with :func:`abc.abstractmethod` instead.
+  * :class:`abc.abstractclassmethod` has been deprecated, use
+    :class:`classmethod` with :func:`abc.abstractmethod` instead.
+  * :class:`abc.abstractstaticmethod` has been deprecated, use
+    :class:`staticmethod` with :func:`abc.abstractmethod` instead.
+
+(Contributed by Darren Dale in :issue:`11610`)
+
+array
+-----
+
+The :mod:`array` module supports the :c:type:`long long` type using ``q`` and
+``Q`` type codes.
+
+(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`)
+
+
+base64, binascii
+----------------
+
+ASCII-only Unicode strings are now accepted by the decoding functions of the
+modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
+
+
+bz2
+---
+
+The :mod:`bz2` module has been rewritten from scratch. In the process, several
+new features have been added:
+
+* New :func:`bz2.open` function: open a bzip2-compressed file in binary or
+  text mode.
+
+* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like
+  objects, by means of its constructor's *fileobj* argument.
+
+  (Contributed by Nadeem Vawda in :issue:`5863`)
+
+* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress
+  multi-stream inputs (such as those produced by the :program:`pbzip2` tool).
+  :class:`bz2.BZ2File` can now also be used to create this type of file, using
+  the ``'a'`` (append) mode.
+
+  (Contributed by Nir Aides in :issue:`1625`)
+
+* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API,
+  except for the :meth:`detach` and :meth:`truncate` methods.
+
+
+codecs
+------
+
+The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly
+``replace`` and ``ignore`` error handlers on all Windows versions.  The
+:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only
+``replace`` to encode and ``ignore`` to decode.
+
+A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the
+Windows code page 65001 (Windows UTF-8, ``CP_UTF8``).  For example, it is used
+by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using
+``chcp 65001`` command).
+
+Multibyte CJK decoders now resynchronize faster.  They only ignore the first
+byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312',
+'replace')`` now returns a ``\n`` after the replacement character.
+
+(:issue:`12016`)
+
+Incremental CJK codec encoders are no longer reset at each call to their
+encode() methods. For example::
+
+    $ ./python -q
+    >>> import codecs
+    >>> encoder = codecs.getincrementalencoder('hz')('strict')
+    >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.')
+    b'~{NpJ)l6HK!#~} Bye.'
+
+This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python
+versions.
+
+(:issue:`12100`)
+
+The ``unicode_internal`` codec has been deprecated.
+
+
+collections
+-----------
+
+Addition of a new :class:`~collections.ChainMap` class to allow treating a
+number of mappings as a single unit.
+
+(Written by Raymond Hettinger for :issue:`11089`, made public in
+:issue:`11297`)
+
+The abstract base classes have been moved in a new :mod:`collections.abc`
+module, to better differentiate between the abstract and the concrete
+collections classes.  Aliases for ABCs are still present in the
+:mod:`collections` module to preserve existing imports.
+
+(:issue:`11085`)
+
+.. XXX addition of __slots__ to ABCs not recorded here: internal detail
+
+
+contextlib
+----------
+
+:class:`~contextlib.ExitStack` now provides a solid foundation for
+programmatic manipulation of context managers and similar cleanup
+functionality. Unlike the previous ``contextlib.nested`` API (which was
+deprecated and removed), the new API is designed to work correctly
+regardless of whether context managers acquire their resources in
+their ``__init__`` method (for example, file objects) or in their
+``__enter__`` method (for example, synchronisation objects from the
+:mod:`threading` module).
+
+(:issue:`13585`)
+
+
+crypt
+-----
+
+Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt`
+function to the :mod:`crypt` module.
+
+(:issue:`10924`)
+
+curses
+------
+
+ * If the :mod:`curses` module is linked to the ncursesw library, use Unicode
+   functions when Unicode strings or characters are passed (e.g.
+   :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`).
+ * Use the locale encoding instead of ``utf-8`` to encode Unicode strings.
+ * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute.
+ * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch`
+   method to get a wide character
+ * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to
+   push a wide character so the next :meth:`~curses.window.get_wch` will return
+   it
+
+(Contributed by I?igo Serna in :issue:`6755`)
+
+datetime
+--------
+
+ * Equality comparisons between naive and aware :class:`~datetime.datetime`
+   instances now return :const:`False` instead of raising :exc:`TypeError`.
+ * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
+   corresponding to the :class:`~datetime.datetime` instance.
+ * The :meth:`datetime.datetime.strftime` method supports formatting years
+   older than 1000.
+ * The :meth:`datetime.datetime.astimezone` method can now be
+   called without arguments to convert datetime instance to the system
+   timezone.
+
+decimal
+-------
+
+:issue:`7652` - integrate fast native decimal arithmetic.
+   C-module and libmpdec written by Stefan Krah.
+
+The new C version of the decimal module integrates the high speed libmpdec
+library for arbitrary precision correctly-rounded decimal floating point
+arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
+
+Performance gains range from 10x for database applications to 100x for
+numerically intensive applications. These numbers are expected gains
+for standard precisions used in decimal floating point arithmetic. Since
+the precision is user configurable, the exact figures may vary. For example,
+in integer bignum arithmetic the differences can be significantly higher.
+
+The following table is meant as an illustration. Benchmarks are available
+at http://www.bytereef.org/mpdecimal/quickstart.html.
+
+   +---------+-------------+--------------+-------------+
+   |         |  decimal.py |   _decimal   |   speedup   |
+   +=========+=============+==============+=============+
+   |   pi    |    42.02s   |    0.345s    |    120x     |
+   +---------+-------------+--------------+-------------+
+   | telco   |   172.19s   |    5.68s     |     30x     |
+   +---------+-------------+--------------+-------------+
+   | psycopg |     3.57s   |    0.29s     |     12x     |
+   +---------+-------------+--------------+-------------+
+
+Features
+~~~~~~~~
+
+* The :exc:`~decimal.FloatOperation` signal optionally enables stricter
+  semantics for mixing floats and Decimals.
+
+* If Python is compiled without threads, the C version automatically
+  disables the expensive thread local context machinery. In this case,
+  the variable :data:`~decimal.HAVE_THREADS` is set to False.
+
+API changes
+~~~~~~~~~~~
+
+* The C module has the following context limits, depending on the machine
+  architecture:
+
+   +-------------------+---------------------+------------------------------+
+   |                   |       32-bit        |            64-bit            |
+   +===================+=====================+==============================+
+   | :const:`MAX_PREC` | :const:`425000000`  | :const:`999999999999999999`  |
+   +-------------------+---------------------+------------------------------+
+   | :const:`MAX_EMAX` | :const:`425000000`  | :const:`999999999999999999`  |
+   +-------------------+---------------------+------------------------------+
+   | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` |
+   +-------------------+---------------------+------------------------------+
+
+* In the context templates (:class:`~decimal.DefaultContext`,
+  :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`)
+  the magnitude of :attr:`~decimal.Context.Emax` and
+  :attr:`~decimal.Context.Emin` has changed to :const:`999999`.
+
+* The :class:`~decimal.Decimal` constructor in decimal.py does not observe
+  the context limits and converts values with arbitrary exponents or precision
+  exactly. Since the C version has internal limits, the following scheme is
+  used: If possible, values are converted exactly, otherwise
+  :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the
+  latter case it is always possible to use :meth:`~decimal.Context.create_decimal`
+  in order to obtain a rounded or inexact value.
+
+
+* The power function in decimal.py is always correctly-rounded. In the
+  C version, it is defined in terms of the correctly-rounded
+  :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
+  but the final result is only "almost always correctly rounded".
+
+
+* In the C version, the context dictionary containing the signals is a
+  :class:`~collections.abc.MutableMapping`.  For speed reasons,
+  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always
+  refer to the same :class:`~collections.abc.MutableMapping` that the context
+  was initialized with. If a new signal dictionary is assigned,
+  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps`
+  are updated with the new values, but they do not reference the RHS
+  dictionary.
+
+
+* Pickling a :class:`~decimal.Context` produces a different output in order
+  to have a common interchange format for the Python and C versions.
+
+
+* The order of arguments in the :class:`~decimal.Context` constructor has been
+  changed to match the order displayed by :func:`repr`.
+
+
+* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method
+  is deprecated.
+
+
+email
+-----
 
 Policy Framework
-----------------
+~~~~~~~~~~~~~~~~
 
 The email package now has a :mod:`~email.policy` framework.  A
 :class:`~email.policy.Policy` is an object with several methods and properties
@@ -746,7 +1134,7 @@
 
 
 Provisional Policy with New Header API
---------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 While the policy framework is worthwhile all by itself, the main motivation for
 introducing it is to allow the creation of new policies that implement new
@@ -838,394 +1226,6 @@
 standard Content Transfer Encodings.
 
 
-Other Language Changes
-======================
-
-Some smaller changes made to the core Python language are:
-
-* Added support for Unicode name aliases and named sequences.
-  Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases,
-  and :func:`unicodedata.lookup()` resolves named sequences too.
-
-  (Contributed by Ezio Melotti in :issue:`12753`)
-
-* Unicode database updated to UCD version 6.1.0
-
-* Equality comparisons on :func:`range` objects now return a result reflecting
-  the equality of the underlying sequences generated by those range objects.
-
-  (:issue:`13201`)
-
-* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
-  methods of :class:`bytes` and :class:`bytearray` objects now accept an
-  integer between 0 and 255 as their first argument.
-
-  (Contributed by Petri Lehtinen in :issue:`12170`)
-
-* New methods have been added to :class:`list` and :class:`bytearray`:
-  ``copy()`` and ``clear()``.
-
-  (:issue:`10516`)
-
-* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
-  (Contributed by Antoine Pitrou in :issue:`13748`.)
-
-* :meth:`dict.setdefault` now does only one lookup for the given key, making
-  it atomic when used with built-in types.
-  (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
-
-
-.. XXX mention new error messages for passing wrong number of arguments to functions
-
-
-A Finer-Grained Import Lock
-===========================
-
-Previous versions of CPython have always relied on a global import lock.
-This led to unexpected annoyances, such as deadlocks when importing a module
-would trigger code execution in a different thread as a side-effect.
-Clumsy workarounds were sometimes employed, such as the
-:c:func:`PyImport_ImportModuleNoBlock` C API function.
-
-In Python 3.3, importing a module takes a per-module lock.  This correctly
-serializes importation of a given module from multiple threads (preventing
-the exposure of incompletely initialized modules), while eliminating the
-aforementioned annoyances.
-
-(contributed by Antoine Pitrou in :issue:`9260`.)
-
-
-Builtin functions and types
-===========================
-
-* :func:`open` gets a new *opener* parameter: the underlying file descriptor
-  for the file object is then obtained by calling *opener* with (*file*,
-  *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for
-  example. The ``'x'`` mode was added: open for exclusive creation, failing if
-  the file already exists.
-* :func:`print`: added the *flush* keyword argument. If the *flush* keyword
-  argument is true, the stream is forcibly flushed.
-* :func:`hash`: hash randomization is enabled by default, see
-  :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`.
-* The :class:`str` type gets a new :meth:`~str.casefold` method: return a
-  casefolded copy of the string, casefolded strings may be used for caseless
-  matching. For example, ``'?'.casefold()`` returns ``'ss'``.
-* The sequence documentation has been substantially rewritten to better
-  explain the binary/text sequence distinction and to provide specific
-  documentation sections for the individual builtin sequence types
-  (:issue:`4966`)
-
-New Modules
-===========
-
-faulthandler
-------------
-
-This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
-on a fault (a crash like a segmentation fault), after a timeout, or on a user
-signal. Call :func:`faulthandler.enable` to install fault handlers for the
-:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
-:const:`SIGILL` signals. You can also enable them at startup by setting the
-:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X`
-``faulthandler`` command line option.
-
-Example of a segmentation fault on Linux: ::
-
-    $ python -q -X faulthandler
-    >>> import ctypes
-    >>> ctypes.string_at(0)
-    Fatal Python error: Segmentation fault
-
-    Current thread 0x00007fb899f39700:
-      File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at
-      File "<stdin>", line 1 in <module>
-    Segmentation fault
-
-
-ipaddress
----------
-
-The new :mod:`ipaddress` module provides tools for creating and manipulating
-objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e.
-an IP address associated with a specific IP subnet).
-
-(Contributed by Google and Peter Moody in :pep:`3144`)
-
-lzma
-----
-
-The newly-added :mod:`lzma` module provides data compression and decompression
-using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
-file formats.
-
-(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`)
-
-
-Improved Modules
-================
-
-abc
----
-
-Improved support for abstract base classes containing descriptors composed with
-abstract methods. The recommended approach to declaring abstract descriptors is
-now to provide :attr:`__isabstractmethod__` as a dynamically updated
-property. The built-in descriptors have been updated accordingly.
-
-  * :class:`abc.abstractproperty` has been deprecated, use :class:`property`
-    with :func:`abc.abstractmethod` instead.
-  * :class:`abc.abstractclassmethod` has been deprecated, use
-    :class:`classmethod` with :func:`abc.abstractmethod` instead.
-  * :class:`abc.abstractstaticmethod` has been deprecated, use
-    :class:`staticmethod` with :func:`abc.abstractmethod` instead.
-
-(Contributed by Darren Dale in :issue:`11610`)
-
-array
------
-
-The :mod:`array` module supports the :c:type:`long long` type using ``q`` and
-``Q`` type codes.
-
-(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`)
-
-
-base64, binascii
-----------------
-
-ASCII-only Unicode strings are now accepted by the decoding functions of the
-modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
-
-
-bz2
----
-
-The :mod:`bz2` module has been rewritten from scratch. In the process, several
-new features have been added:
-
-* New :func:`bz2.open` function: open a bzip2-compressed file in binary or
-  text mode.
-
-* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like
-  objects, by means of its constructor's *fileobj* argument.
-
-  (Contributed by Nadeem Vawda in :issue:`5863`)
-
-* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress
-  multi-stream inputs (such as those produced by the :program:`pbzip2` tool).
-  :class:`bz2.BZ2File` can now also be used to create this type of file, using
-  the ``'a'`` (append) mode.
-
-  (Contributed by Nir Aides in :issue:`1625`)
-
-* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API,
-  except for the :meth:`detach` and :meth:`truncate` methods.
-
-
-codecs
-------
-
-The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly
-``replace`` and ``ignore`` error handlers on all Windows versions.  The
-:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only
-``replace`` to encode and ``ignore`` to decode.
-
-A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the
-Windows code page 65001 (Windows UTF-8, ``CP_UTF8``).  For example, it is used
-by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using
-``chcp 65001`` command).
-
-Multibyte CJK decoders now resynchronize faster.  They only ignore the first
-byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312',
-'replace')`` now returns a ``\n`` after the replacement character.
-
-(:issue:`12016`)
-
-Incremental CJK codec encoders are no longer reset at each call to their
-encode() methods. For example::
-
-    $ ./python -q
-    >>> import codecs
-    >>> encoder = codecs.getincrementalencoder('hz')('strict')
-    >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.')
-    b'~{NpJ)l6HK!#~} Bye.'
-
-This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python
-versions.
-
-(:issue:`12100`)
-
-The ``unicode_internal`` codec has been deprecated.
-
-
-collections
------------
-
-Addition of a new :class:`~collections.ChainMap` class to allow treating a
-number of mappings as a single unit.
-
-(Written by Raymond Hettinger for :issue:`11089`, made public in
-:issue:`11297`)
-
-The abstract base classes have been moved in a new :mod:`collections.abc`
-module, to better differentiate between the abstract and the concrete
-collections classes.  Aliases for ABCs are still present in the
-:mod:`collections` module to preserve existing imports.
-
-(:issue:`11085`)
-
-.. XXX addition of __slots__ to ABCs not recorded here: internal detail
-
-
-contextlib
-----------
-
-:class:`~contextlib.ExitStack` now provides a solid foundation for
-programmatic manipulation of context managers and similar cleanup
-functionality. Unlike the previous ``contextlib.nested`` API (which was
-deprecated and removed), the new API is designed to work correctly
-regardless of whether context managers acquire their resources in
-their ``__init__`` method (for example, file objects) or in their
-``__enter__`` method (for example, synchronisation objects from the
-:mod:`threading` module).
-
-(:issue:`13585`)
-
-
-crypt
------
-
-Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt`
-function to the :mod:`crypt` module.
-
-(:issue:`10924`)
-
-curses
-------
-
- * If the :mod:`curses` module is linked to the ncursesw library, use Unicode
-   functions when Unicode strings or characters are passed (e.g.
-   :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`).
- * Use the locale encoding instead of ``utf-8`` to encode Unicode strings.
- * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute.
- * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch`
-   method to get a wide character
- * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to
-   push a wide character so the next :meth:`~curses.window.get_wch` will return
-   it
-
-(Contributed by I?igo Serna in :issue:`6755`)
-
-datetime
---------
-
- * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances now return :const:`False` instead of raising :exc:`TypeError`.
- * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
-   corresponding to the :class:`~datetime.datetime` instance.
- * The :meth:`datetime.datetime.strftime` method supports formatting years
-   older than 1000.
- * The :meth:`datetime.datetime.astimezone` method can now be
-   called without arguments to convert datetime instance to the system
-   timezone.
-
-decimal
--------
-
-:issue:`7652` - integrate fast native decimal arithmetic.
-   C-module and libmpdec written by Stefan Krah.
-
-The new C version of the decimal module integrates the high speed libmpdec
-library for arbitrary precision correctly-rounded decimal floating point
-arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
-
-Performance gains range from 10x for database applications to 100x for
-numerically intensive applications. These numbers are expected gains
-for standard precisions used in decimal floating point arithmetic. Since
-the precision is user configurable, the exact figures may vary. For example,
-in integer bignum arithmetic the differences can be significantly higher.
-
-The following table is meant as an illustration. Benchmarks are available
-at http://www.bytereef.org/mpdecimal/quickstart.html.
-
-   +---------+-------------+--------------+-------------+
-   |         |  decimal.py |   _decimal   |   speedup   |
-   +=========+=============+==============+=============+
-   |   pi    |    42.02s   |    0.345s    |    120x     |
-   +---------+-------------+--------------+-------------+
-   | telco   |   172.19s   |    5.68s     |     30x     |
-   +---------+-------------+--------------+-------------+
-   | psycopg |     3.57s   |    0.29s     |     12x     |
-   +---------+-------------+--------------+-------------+
-
-Features
-~~~~~~~~
-
-* The :exc:`~decimal.FloatOperation` signal optionally enables stricter
-  semantics for mixing floats and Decimals.
-
-* If Python is compiled without threads, the C version automatically
-  disables the expensive thread local context machinery. In this case,
-  the variable :data:`~decimal.HAVE_THREADS` is set to False.
-
-API changes
-~~~~~~~~~~~
-
-* The C module has the following context limits, depending on the machine
-  architecture:
-
-   +-------------------+---------------------+------------------------------+
-   |                   |       32-bit        |            64-bit            |
-   +===================+=====================+==============================+
-   | :const:`MAX_PREC` | :const:`425000000`  | :const:`999999999999999999`  |
-   +-------------------+---------------------+------------------------------+
-   | :const:`MAX_EMAX` | :const:`425000000`  | :const:`999999999999999999`  |
-   +-------------------+---------------------+------------------------------+
-   | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` |
-   +-------------------+---------------------+------------------------------+
-
-* In the context templates (:class:`~decimal.DefaultContext`,
-  :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`)
-  the magnitude of :attr:`~decimal.Context.Emax` and
-  :attr:`~decimal.Context.Emin` has changed to :const:`999999`.
-
-* The :class:`~decimal.Decimal` constructor in decimal.py does not observe
-  the context limits and converts values with arbitrary exponents or precision
-  exactly. Since the C version has internal limits, the following scheme is
-  used: If possible, values are converted exactly, otherwise
-  :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the
-  latter case it is always possible to use :meth:`~decimal.Context.create_decimal`
-  in order to obtain a rounded or inexact value.
-
-
-* The power function in decimal.py is always correctly-rounded. In the
-  C version, it is defined in terms of the correctly-rounded
-  :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
-  but the final result is only "almost always correctly rounded".
-
-
-* In the C version, the context dictionary containing the signals is a
-  :class:`~collections.abc.MutableMapping`.  For speed reasons,
-  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always
-  refer to the same :class:`~collections.abc.MutableMapping` that the context
-  was initialized with. If a new signal dictionary is assigned,
-  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps`
-  are updated with the new values, but they do not reference the RHS
-  dictionary.
-
-
-* Pickling a :class:`~decimal.Context` produces a different output in order
-  to have a common interchange format for the Python and C versions.
-
-
-* The order of arguments in the :class:`~decimal.Context` constructor has been
-  changed to match the order displayed by :func:`repr`.
-
-
-* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method
-  is deprecated.
-
-
 ftplib
 ------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 21:44:28 2012
From: python-checkins at python.org (r.david.murray)
Date: Sat, 29 Sep 2012 21:44:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Move_discussion_of_email_changes_into_Improved_Modules_s?=
 =?utf-8?q?ection=2E?=
Message-ID: <3XTgF83vCTzNxg@mail.python.org>

http://hg.python.org/cpython/rev/e82891aad755
changeset:   79284:e82891aad755
parent:      79282:ec2921d4de37
parent:      79283:c3d90fb70247
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 15:44:17 2012 -0400
summary:
  Move discussion of email changes into Improved Modules section.

files:
  Doc/whatsnew/3.3.rst |  784 +++++++++++++++---------------
  1 files changed, 392 insertions(+), 392 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -687,11 +687,399 @@
 in the `Porting Python code`_ section of this document.
 
 
-New Email Package Features
-==========================
+Other Language Changes
+======================
+
+Some smaller changes made to the core Python language are:
+
+* Added support for Unicode name aliases and named sequences.
+  Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases,
+  and :func:`unicodedata.lookup()` resolves named sequences too.
+
+  (Contributed by Ezio Melotti in :issue:`12753`)
+
+* Unicode database updated to UCD version 6.1.0
+
+* Equality comparisons on :func:`range` objects now return a result reflecting
+  the equality of the underlying sequences generated by those range objects.
+
+  (:issue:`13201`)
+
+* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
+  methods of :class:`bytes` and :class:`bytearray` objects now accept an
+  integer between 0 and 255 as their first argument.
+
+  (Contributed by Petri Lehtinen in :issue:`12170`)
+
+* New methods have been added to :class:`list` and :class:`bytearray`:
+  ``copy()`` and ``clear()``.
+
+  (:issue:`10516`)
+
+* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
+  (Contributed by Antoine Pitrou in :issue:`13748`.)
+
+* :meth:`dict.setdefault` now does only one lookup for the given key, making
+  it atomic when used with built-in types.
+  (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
+
+
+.. XXX mention new error messages for passing wrong number of arguments to functions
+
+
+A Finer-Grained Import Lock
+===========================
+
+Previous versions of CPython have always relied on a global import lock.
+This led to unexpected annoyances, such as deadlocks when importing a module
+would trigger code execution in a different thread as a side-effect.
+Clumsy workarounds were sometimes employed, such as the
+:c:func:`PyImport_ImportModuleNoBlock` C API function.
+
+In Python 3.3, importing a module takes a per-module lock.  This correctly
+serializes importation of a given module from multiple threads (preventing
+the exposure of incompletely initialized modules), while eliminating the
+aforementioned annoyances.
+
+(contributed by Antoine Pitrou in :issue:`9260`.)
+
+
+Builtin functions and types
+===========================
+
+* :func:`open` gets a new *opener* parameter: the underlying file descriptor
+  for the file object is then obtained by calling *opener* with (*file*,
+  *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for
+  example. The ``'x'`` mode was added: open for exclusive creation, failing if
+  the file already exists.
+* :func:`print`: added the *flush* keyword argument. If the *flush* keyword
+  argument is true, the stream is forcibly flushed.
+* :func:`hash`: hash randomization is enabled by default, see
+  :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`.
+* The :class:`str` type gets a new :meth:`~str.casefold` method: return a
+  casefolded copy of the string, casefolded strings may be used for caseless
+  matching. For example, ``'?'.casefold()`` returns ``'ss'``.
+* The sequence documentation has been substantially rewritten to better
+  explain the binary/text sequence distinction and to provide specific
+  documentation sections for the individual builtin sequence types
+  (:issue:`4966`)
+
+New Modules
+===========
+
+faulthandler
+------------
+
+This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
+on a fault (a crash like a segmentation fault), after a timeout, or on a user
+signal. Call :func:`faulthandler.enable` to install fault handlers for the
+:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
+:const:`SIGILL` signals. You can also enable them at startup by setting the
+:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X`
+``faulthandler`` command line option.
+
+Example of a segmentation fault on Linux: ::
+
+    $ python -q -X faulthandler
+    >>> import ctypes
+    >>> ctypes.string_at(0)
+    Fatal Python error: Segmentation fault
+
+    Current thread 0x00007fb899f39700:
+      File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at
+      File "<stdin>", line 1 in <module>
+    Segmentation fault
+
+
+ipaddress
+---------
+
+The new :mod:`ipaddress` module provides tools for creating and manipulating
+objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e.
+an IP address associated with a specific IP subnet).
+
+(Contributed by Google and Peter Moody in :pep:`3144`)
+
+lzma
+----
+
+The newly-added :mod:`lzma` module provides data compression and decompression
+using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
+file formats.
+
+(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`)
+
+
+Improved Modules
+================
+
+abc
+---
+
+Improved support for abstract base classes containing descriptors composed with
+abstract methods. The recommended approach to declaring abstract descriptors is
+now to provide :attr:`__isabstractmethod__` as a dynamically updated
+property. The built-in descriptors have been updated accordingly.
+
+  * :class:`abc.abstractproperty` has been deprecated, use :class:`property`
+    with :func:`abc.abstractmethod` instead.
+  * :class:`abc.abstractclassmethod` has been deprecated, use
+    :class:`classmethod` with :func:`abc.abstractmethod` instead.
+  * :class:`abc.abstractstaticmethod` has been deprecated, use
+    :class:`staticmethod` with :func:`abc.abstractmethod` instead.
+
+(Contributed by Darren Dale in :issue:`11610`)
+
+array
+-----
+
+The :mod:`array` module supports the :c:type:`long long` type using ``q`` and
+``Q`` type codes.
+
+(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`)
+
+
+base64, binascii
+----------------
+
+ASCII-only Unicode strings are now accepted by the decoding functions of the
+modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
+
+
+bz2
+---
+
+The :mod:`bz2` module has been rewritten from scratch. In the process, several
+new features have been added:
+
+* New :func:`bz2.open` function: open a bzip2-compressed file in binary or
+  text mode.
+
+* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like
+  objects, by means of its constructor's *fileobj* argument.
+
+  (Contributed by Nadeem Vawda in :issue:`5863`)
+
+* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress
+  multi-stream inputs (such as those produced by the :program:`pbzip2` tool).
+  :class:`bz2.BZ2File` can now also be used to create this type of file, using
+  the ``'a'`` (append) mode.
+
+  (Contributed by Nir Aides in :issue:`1625`)
+
+* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API,
+  except for the :meth:`detach` and :meth:`truncate` methods.
+
+
+codecs
+------
+
+The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly
+``replace`` and ``ignore`` error handlers on all Windows versions.  The
+:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only
+``replace`` to encode and ``ignore`` to decode.
+
+A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the
+Windows code page 65001 (Windows UTF-8, ``CP_UTF8``).  For example, it is used
+by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using
+``chcp 65001`` command).
+
+Multibyte CJK decoders now resynchronize faster.  They only ignore the first
+byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312',
+'replace')`` now returns a ``\n`` after the replacement character.
+
+(:issue:`12016`)
+
+Incremental CJK codec encoders are no longer reset at each call to their
+encode() methods. For example::
+
+    $ ./python -q
+    >>> import codecs
+    >>> encoder = codecs.getincrementalencoder('hz')('strict')
+    >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.')
+    b'~{NpJ)l6HK!#~} Bye.'
+
+This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python
+versions.
+
+(:issue:`12100`)
+
+The ``unicode_internal`` codec has been deprecated.
+
+
+collections
+-----------
+
+Addition of a new :class:`~collections.ChainMap` class to allow treating a
+number of mappings as a single unit.
+
+(Written by Raymond Hettinger for :issue:`11089`, made public in
+:issue:`11297`)
+
+The abstract base classes have been moved in a new :mod:`collections.abc`
+module, to better differentiate between the abstract and the concrete
+collections classes.  Aliases for ABCs are still present in the
+:mod:`collections` module to preserve existing imports.
+
+(:issue:`11085`)
+
+.. XXX addition of __slots__ to ABCs not recorded here: internal detail
+
+
+contextlib
+----------
+
+:class:`~contextlib.ExitStack` now provides a solid foundation for
+programmatic manipulation of context managers and similar cleanup
+functionality. Unlike the previous ``contextlib.nested`` API (which was
+deprecated and removed), the new API is designed to work correctly
+regardless of whether context managers acquire their resources in
+their ``__init__`` method (for example, file objects) or in their
+``__enter__`` method (for example, synchronisation objects from the
+:mod:`threading` module).
+
+(:issue:`13585`)
+
+
+crypt
+-----
+
+Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt`
+function to the :mod:`crypt` module.
+
+(:issue:`10924`)
+
+curses
+------
+
+ * If the :mod:`curses` module is linked to the ncursesw library, use Unicode
+   functions when Unicode strings or characters are passed (e.g.
+   :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`).
+ * Use the locale encoding instead of ``utf-8`` to encode Unicode strings.
+ * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute.
+ * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch`
+   method to get a wide character
+ * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to
+   push a wide character so the next :meth:`~curses.window.get_wch` will return
+   it
+
+(Contributed by I?igo Serna in :issue:`6755`)
+
+datetime
+--------
+
+ * Equality comparisons between naive and aware :class:`~datetime.datetime`
+   instances now return :const:`False` instead of raising :exc:`TypeError`.
+ * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
+   corresponding to the :class:`~datetime.datetime` instance.
+ * The :meth:`datetime.datetime.strftime` method supports formatting years
+   older than 1000.
+ * The :meth:`datetime.datetime.astimezone` method can now be
+   called without arguments to convert datetime instance to the system
+   timezone.
+
+decimal
+-------
+
+:issue:`7652` - integrate fast native decimal arithmetic.
+   C-module and libmpdec written by Stefan Krah.
+
+The new C version of the decimal module integrates the high speed libmpdec
+library for arbitrary precision correctly-rounded decimal floating point
+arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
+
+Performance gains range from 10x for database applications to 100x for
+numerically intensive applications. These numbers are expected gains
+for standard precisions used in decimal floating point arithmetic. Since
+the precision is user configurable, the exact figures may vary. For example,
+in integer bignum arithmetic the differences can be significantly higher.
+
+The following table is meant as an illustration. Benchmarks are available
+at http://www.bytereef.org/mpdecimal/quickstart.html.
+
+   +---------+-------------+--------------+-------------+
+   |         |  decimal.py |   _decimal   |   speedup   |
+   +=========+=============+==============+=============+
+   |   pi    |    42.02s   |    0.345s    |    120x     |
+   +---------+-------------+--------------+-------------+
+   | telco   |   172.19s   |    5.68s     |     30x     |
+   +---------+-------------+--------------+-------------+
+   | psycopg |     3.57s   |    0.29s     |     12x     |
+   +---------+-------------+--------------+-------------+
+
+Features
+~~~~~~~~
+
+* The :exc:`~decimal.FloatOperation` signal optionally enables stricter
+  semantics for mixing floats and Decimals.
+
+* If Python is compiled without threads, the C version automatically
+  disables the expensive thread local context machinery. In this case,
+  the variable :data:`~decimal.HAVE_THREADS` is set to False.
+
+API changes
+~~~~~~~~~~~
+
+* The C module has the following context limits, depending on the machine
+  architecture:
+
+   +-------------------+---------------------+------------------------------+
+   |                   |       32-bit        |            64-bit            |
+   +===================+=====================+==============================+
+   | :const:`MAX_PREC` | :const:`425000000`  | :const:`999999999999999999`  |
+   +-------------------+---------------------+------------------------------+
+   | :const:`MAX_EMAX` | :const:`425000000`  | :const:`999999999999999999`  |
+   +-------------------+---------------------+------------------------------+
+   | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` |
+   +-------------------+---------------------+------------------------------+
+
+* In the context templates (:class:`~decimal.DefaultContext`,
+  :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`)
+  the magnitude of :attr:`~decimal.Context.Emax` and
+  :attr:`~decimal.Context.Emin` has changed to :const:`999999`.
+
+* The :class:`~decimal.Decimal` constructor in decimal.py does not observe
+  the context limits and converts values with arbitrary exponents or precision
+  exactly. Since the C version has internal limits, the following scheme is
+  used: If possible, values are converted exactly, otherwise
+  :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the
+  latter case it is always possible to use :meth:`~decimal.Context.create_decimal`
+  in order to obtain a rounded or inexact value.
+
+
+* The power function in decimal.py is always correctly-rounded. In the
+  C version, it is defined in terms of the correctly-rounded
+  :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
+  but the final result is only "almost always correctly rounded".
+
+
+* In the C version, the context dictionary containing the signals is a
+  :class:`~collections.abc.MutableMapping`.  For speed reasons,
+  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always
+  refer to the same :class:`~collections.abc.MutableMapping` that the context
+  was initialized with. If a new signal dictionary is assigned,
+  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps`
+  are updated with the new values, but they do not reference the RHS
+  dictionary.
+
+
+* Pickling a :class:`~decimal.Context` produces a different output in order
+  to have a common interchange format for the Python and C versions.
+
+
+* The order of arguments in the :class:`~decimal.Context` constructor has been
+  changed to match the order displayed by :func:`repr`.
+
+
+* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method
+  is deprecated.
+
+
+email
+-----
 
 Policy Framework
-----------------
+~~~~~~~~~~~~~~~~
 
 The email package now has a :mod:`~email.policy` framework.  A
 :class:`~email.policy.Policy` is an object with several methods and properties
@@ -746,7 +1134,7 @@
 
 
 Provisional Policy with New Header API
---------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 While the policy framework is worthwhile all by itself, the main motivation for
 introducing it is to allow the creation of new policies that implement new
@@ -838,394 +1226,6 @@
 standard Content Transfer Encodings.
 
 
-Other Language Changes
-======================
-
-Some smaller changes made to the core Python language are:
-
-* Added support for Unicode name aliases and named sequences.
-  Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases,
-  and :func:`unicodedata.lookup()` resolves named sequences too.
-
-  (Contributed by Ezio Melotti in :issue:`12753`)
-
-* Unicode database updated to UCD version 6.1.0
-
-* Equality comparisons on :func:`range` objects now return a result reflecting
-  the equality of the underlying sequences generated by those range objects.
-
-  (:issue:`13201`)
-
-* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
-  methods of :class:`bytes` and :class:`bytearray` objects now accept an
-  integer between 0 and 255 as their first argument.
-
-  (Contributed by Petri Lehtinen in :issue:`12170`)
-
-* New methods have been added to :class:`list` and :class:`bytearray`:
-  ``copy()`` and ``clear()``.
-
-  (:issue:`10516`)
-
-* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
-  (Contributed by Antoine Pitrou in :issue:`13748`.)
-
-* :meth:`dict.setdefault` now does only one lookup for the given key, making
-  it atomic when used with built-in types.
-  (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
-
-
-.. XXX mention new error messages for passing wrong number of arguments to functions
-
-
-A Finer-Grained Import Lock
-===========================
-
-Previous versions of CPython have always relied on a global import lock.
-This led to unexpected annoyances, such as deadlocks when importing a module
-would trigger code execution in a different thread as a side-effect.
-Clumsy workarounds were sometimes employed, such as the
-:c:func:`PyImport_ImportModuleNoBlock` C API function.
-
-In Python 3.3, importing a module takes a per-module lock.  This correctly
-serializes importation of a given module from multiple threads (preventing
-the exposure of incompletely initialized modules), while eliminating the
-aforementioned annoyances.
-
-(contributed by Antoine Pitrou in :issue:`9260`.)
-
-
-Builtin functions and types
-===========================
-
-* :func:`open` gets a new *opener* parameter: the underlying file descriptor
-  for the file object is then obtained by calling *opener* with (*file*,
-  *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for
-  example. The ``'x'`` mode was added: open for exclusive creation, failing if
-  the file already exists.
-* :func:`print`: added the *flush* keyword argument. If the *flush* keyword
-  argument is true, the stream is forcibly flushed.
-* :func:`hash`: hash randomization is enabled by default, see
-  :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`.
-* The :class:`str` type gets a new :meth:`~str.casefold` method: return a
-  casefolded copy of the string, casefolded strings may be used for caseless
-  matching. For example, ``'?'.casefold()`` returns ``'ss'``.
-* The sequence documentation has been substantially rewritten to better
-  explain the binary/text sequence distinction and to provide specific
-  documentation sections for the individual builtin sequence types
-  (:issue:`4966`)
-
-New Modules
-===========
-
-faulthandler
-------------
-
-This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
-on a fault (a crash like a segmentation fault), after a timeout, or on a user
-signal. Call :func:`faulthandler.enable` to install fault handlers for the
-:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
-:const:`SIGILL` signals. You can also enable them at startup by setting the
-:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X`
-``faulthandler`` command line option.
-
-Example of a segmentation fault on Linux: ::
-
-    $ python -q -X faulthandler
-    >>> import ctypes
-    >>> ctypes.string_at(0)
-    Fatal Python error: Segmentation fault
-
-    Current thread 0x00007fb899f39700:
-      File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at
-      File "<stdin>", line 1 in <module>
-    Segmentation fault
-
-
-ipaddress
----------
-
-The new :mod:`ipaddress` module provides tools for creating and manipulating
-objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e.
-an IP address associated with a specific IP subnet).
-
-(Contributed by Google and Peter Moody in :pep:`3144`)
-
-lzma
-----
-
-The newly-added :mod:`lzma` module provides data compression and decompression
-using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
-file formats.
-
-(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`)
-
-
-Improved Modules
-================
-
-abc
----
-
-Improved support for abstract base classes containing descriptors composed with
-abstract methods. The recommended approach to declaring abstract descriptors is
-now to provide :attr:`__isabstractmethod__` as a dynamically updated
-property. The built-in descriptors have been updated accordingly.
-
-  * :class:`abc.abstractproperty` has been deprecated, use :class:`property`
-    with :func:`abc.abstractmethod` instead.
-  * :class:`abc.abstractclassmethod` has been deprecated, use
-    :class:`classmethod` with :func:`abc.abstractmethod` instead.
-  * :class:`abc.abstractstaticmethod` has been deprecated, use
-    :class:`staticmethod` with :func:`abc.abstractmethod` instead.
-
-(Contributed by Darren Dale in :issue:`11610`)
-
-array
------
-
-The :mod:`array` module supports the :c:type:`long long` type using ``q`` and
-``Q`` type codes.
-
-(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`)
-
-
-base64, binascii
-----------------
-
-ASCII-only Unicode strings are now accepted by the decoding functions of the
-modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
-
-
-bz2
----
-
-The :mod:`bz2` module has been rewritten from scratch. In the process, several
-new features have been added:
-
-* New :func:`bz2.open` function: open a bzip2-compressed file in binary or
-  text mode.
-
-* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like
-  objects, by means of its constructor's *fileobj* argument.
-
-  (Contributed by Nadeem Vawda in :issue:`5863`)
-
-* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress
-  multi-stream inputs (such as those produced by the :program:`pbzip2` tool).
-  :class:`bz2.BZ2File` can now also be used to create this type of file, using
-  the ``'a'`` (append) mode.
-
-  (Contributed by Nir Aides in :issue:`1625`)
-
-* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API,
-  except for the :meth:`detach` and :meth:`truncate` methods.
-
-
-codecs
-------
-
-The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly
-``replace`` and ``ignore`` error handlers on all Windows versions.  The
-:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only
-``replace`` to encode and ``ignore`` to decode.
-
-A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the
-Windows code page 65001 (Windows UTF-8, ``CP_UTF8``).  For example, it is used
-by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using
-``chcp 65001`` command).
-
-Multibyte CJK decoders now resynchronize faster.  They only ignore the first
-byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312',
-'replace')`` now returns a ``\n`` after the replacement character.
-
-(:issue:`12016`)
-
-Incremental CJK codec encoders are no longer reset at each call to their
-encode() methods. For example::
-
-    $ ./python -q
-    >>> import codecs
-    >>> encoder = codecs.getincrementalencoder('hz')('strict')
-    >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.')
-    b'~{NpJ)l6HK!#~} Bye.'
-
-This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python
-versions.
-
-(:issue:`12100`)
-
-The ``unicode_internal`` codec has been deprecated.
-
-
-collections
------------
-
-Addition of a new :class:`~collections.ChainMap` class to allow treating a
-number of mappings as a single unit.
-
-(Written by Raymond Hettinger for :issue:`11089`, made public in
-:issue:`11297`)
-
-The abstract base classes have been moved in a new :mod:`collections.abc`
-module, to better differentiate between the abstract and the concrete
-collections classes.  Aliases for ABCs are still present in the
-:mod:`collections` module to preserve existing imports.
-
-(:issue:`11085`)
-
-.. XXX addition of __slots__ to ABCs not recorded here: internal detail
-
-
-contextlib
-----------
-
-:class:`~contextlib.ExitStack` now provides a solid foundation for
-programmatic manipulation of context managers and similar cleanup
-functionality. Unlike the previous ``contextlib.nested`` API (which was
-deprecated and removed), the new API is designed to work correctly
-regardless of whether context managers acquire their resources in
-their ``__init__`` method (for example, file objects) or in their
-``__enter__`` method (for example, synchronisation objects from the
-:mod:`threading` module).
-
-(:issue:`13585`)
-
-
-crypt
------
-
-Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt`
-function to the :mod:`crypt` module.
-
-(:issue:`10924`)
-
-curses
-------
-
- * If the :mod:`curses` module is linked to the ncursesw library, use Unicode
-   functions when Unicode strings or characters are passed (e.g.
-   :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`).
- * Use the locale encoding instead of ``utf-8`` to encode Unicode strings.
- * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute.
- * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch`
-   method to get a wide character
- * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to
-   push a wide character so the next :meth:`~curses.window.get_wch` will return
-   it
-
-(Contributed by I?igo Serna in :issue:`6755`)
-
-datetime
---------
-
- * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances now return :const:`False` instead of raising :exc:`TypeError`.
- * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
-   corresponding to the :class:`~datetime.datetime` instance.
- * The :meth:`datetime.datetime.strftime` method supports formatting years
-   older than 1000.
- * The :meth:`datetime.datetime.astimezone` method can now be
-   called without arguments to convert datetime instance to the system
-   timezone.
-
-decimal
--------
-
-:issue:`7652` - integrate fast native decimal arithmetic.
-   C-module and libmpdec written by Stefan Krah.
-
-The new C version of the decimal module integrates the high speed libmpdec
-library for arbitrary precision correctly-rounded decimal floating point
-arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
-
-Performance gains range from 10x for database applications to 100x for
-numerically intensive applications. These numbers are expected gains
-for standard precisions used in decimal floating point arithmetic. Since
-the precision is user configurable, the exact figures may vary. For example,
-in integer bignum arithmetic the differences can be significantly higher.
-
-The following table is meant as an illustration. Benchmarks are available
-at http://www.bytereef.org/mpdecimal/quickstart.html.
-
-   +---------+-------------+--------------+-------------+
-   |         |  decimal.py |   _decimal   |   speedup   |
-   +=========+=============+==============+=============+
-   |   pi    |    42.02s   |    0.345s    |    120x     |
-   +---------+-------------+--------------+-------------+
-   | telco   |   172.19s   |    5.68s     |     30x     |
-   +---------+-------------+--------------+-------------+
-   | psycopg |     3.57s   |    0.29s     |     12x     |
-   +---------+-------------+--------------+-------------+
-
-Features
-~~~~~~~~
-
-* The :exc:`~decimal.FloatOperation` signal optionally enables stricter
-  semantics for mixing floats and Decimals.
-
-* If Python is compiled without threads, the C version automatically
-  disables the expensive thread local context machinery. In this case,
-  the variable :data:`~decimal.HAVE_THREADS` is set to False.
-
-API changes
-~~~~~~~~~~~
-
-* The C module has the following context limits, depending on the machine
-  architecture:
-
-   +-------------------+---------------------+------------------------------+
-   |                   |       32-bit        |            64-bit            |
-   +===================+=====================+==============================+
-   | :const:`MAX_PREC` | :const:`425000000`  | :const:`999999999999999999`  |
-   +-------------------+---------------------+------------------------------+
-   | :const:`MAX_EMAX` | :const:`425000000`  | :const:`999999999999999999`  |
-   +-------------------+---------------------+------------------------------+
-   | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` |
-   +-------------------+---------------------+------------------------------+
-
-* In the context templates (:class:`~decimal.DefaultContext`,
-  :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`)
-  the magnitude of :attr:`~decimal.Context.Emax` and
-  :attr:`~decimal.Context.Emin` has changed to :const:`999999`.
-
-* The :class:`~decimal.Decimal` constructor in decimal.py does not observe
-  the context limits and converts values with arbitrary exponents or precision
-  exactly. Since the C version has internal limits, the following scheme is
-  used: If possible, values are converted exactly, otherwise
-  :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the
-  latter case it is always possible to use :meth:`~decimal.Context.create_decimal`
-  in order to obtain a rounded or inexact value.
-
-
-* The power function in decimal.py is always correctly-rounded. In the
-  C version, it is defined in terms of the correctly-rounded
-  :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
-  but the final result is only "almost always correctly rounded".
-
-
-* In the C version, the context dictionary containing the signals is a
-  :class:`~collections.abc.MutableMapping`.  For speed reasons,
-  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always
-  refer to the same :class:`~collections.abc.MutableMapping` that the context
-  was initialized with. If a new signal dictionary is assigned,
-  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps`
-  are updated with the new values, but they do not reference the RHS
-  dictionary.
-
-
-* Pickling a :class:`~decimal.Context` produces a different output in order
-  to have a common interchange format for the Python and C versions.
-
-
-* The order of arguments in the :class:`~decimal.Context` constructor has been
-  changed to match the order displayed by :func:`repr`.
-
-
-* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method
-  is deprecated.
-
-
 ftplib
 ------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 22:51:06 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 22:51:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Remove_the_new_trivial_pty?=
 =?utf-8?q?=2Espawn=28=29_test_as_it_hangs_on_many_buildbots=2E?=
Message-ID: <3XThk22MqDzNkh@mail.python.org>

http://hg.python.org/cpython/rev/2bcfcb65a067
changeset:   79285:2bcfcb65a067
parent:      79282:ec2921d4de37
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 13:50:40 2012 -0700
summary:
  Remove the new trivial pty.spawn() test as it hangs on many buildbots.

files:
  Lib/test/test_pty.py |  6 ------
  1 files changed, 0 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -196,12 +196,6 @@
 
         # pty.fork() passed.
 
-    def test_spawn_returns_status(self):
-        status = pty.spawn([sys.executable, '-c', 'import sys; sys.exit(0)'])
-        self.assertEqual(status, 0)
-        status = pty.spawn([sys.executable, '-c', 'import sys; sys.exit(5)'])
-        self.assertEqual(status, 5 << 8)
-
 
 class SmallPtyTests(unittest.TestCase):
     """These tests don't spawn children or hang."""

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sat Sep 29 22:51:08 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sat, 29 Sep 2012 22:51:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge_heads?=
Message-ID: <3XThk41T9BzNwK@mail.python.org>

http://hg.python.org/cpython/rev/6e32db819b90
changeset:   79286:6e32db819b90
parent:      79285:2bcfcb65a067
parent:      79284:e82891aad755
user:        Gregory P. Smith <greg at krypto.org>
date:        Sat Sep 29 13:51:00 2012 -0700
summary:
  merge heads

files:
  Doc/whatsnew/3.3.rst |  784 +++++++++++++++---------------
  1 files changed, 392 insertions(+), 392 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -687,11 +687,399 @@
 in the `Porting Python code`_ section of this document.
 
 
-New Email Package Features
-==========================
+Other Language Changes
+======================
+
+Some smaller changes made to the core Python language are:
+
+* Added support for Unicode name aliases and named sequences.
+  Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases,
+  and :func:`unicodedata.lookup()` resolves named sequences too.
+
+  (Contributed by Ezio Melotti in :issue:`12753`)
+
+* Unicode database updated to UCD version 6.1.0
+
+* Equality comparisons on :func:`range` objects now return a result reflecting
+  the equality of the underlying sequences generated by those range objects.
+
+  (:issue:`13201`)
+
+* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
+  methods of :class:`bytes` and :class:`bytearray` objects now accept an
+  integer between 0 and 255 as their first argument.
+
+  (Contributed by Petri Lehtinen in :issue:`12170`)
+
+* New methods have been added to :class:`list` and :class:`bytearray`:
+  ``copy()`` and ``clear()``.
+
+  (:issue:`10516`)
+
+* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
+  (Contributed by Antoine Pitrou in :issue:`13748`.)
+
+* :meth:`dict.setdefault` now does only one lookup for the given key, making
+  it atomic when used with built-in types.
+  (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
+
+
+.. XXX mention new error messages for passing wrong number of arguments to functions
+
+
+A Finer-Grained Import Lock
+===========================
+
+Previous versions of CPython have always relied on a global import lock.
+This led to unexpected annoyances, such as deadlocks when importing a module
+would trigger code execution in a different thread as a side-effect.
+Clumsy workarounds were sometimes employed, such as the
+:c:func:`PyImport_ImportModuleNoBlock` C API function.
+
+In Python 3.3, importing a module takes a per-module lock.  This correctly
+serializes importation of a given module from multiple threads (preventing
+the exposure of incompletely initialized modules), while eliminating the
+aforementioned annoyances.
+
+(contributed by Antoine Pitrou in :issue:`9260`.)
+
+
+Builtin functions and types
+===========================
+
+* :func:`open` gets a new *opener* parameter: the underlying file descriptor
+  for the file object is then obtained by calling *opener* with (*file*,
+  *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for
+  example. The ``'x'`` mode was added: open for exclusive creation, failing if
+  the file already exists.
+* :func:`print`: added the *flush* keyword argument. If the *flush* keyword
+  argument is true, the stream is forcibly flushed.
+* :func:`hash`: hash randomization is enabled by default, see
+  :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`.
+* The :class:`str` type gets a new :meth:`~str.casefold` method: return a
+  casefolded copy of the string, casefolded strings may be used for caseless
+  matching. For example, ``'?'.casefold()`` returns ``'ss'``.
+* The sequence documentation has been substantially rewritten to better
+  explain the binary/text sequence distinction and to provide specific
+  documentation sections for the individual builtin sequence types
+  (:issue:`4966`)
+
+New Modules
+===========
+
+faulthandler
+------------
+
+This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
+on a fault (a crash like a segmentation fault), after a timeout, or on a user
+signal. Call :func:`faulthandler.enable` to install fault handlers for the
+:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
+:const:`SIGILL` signals. You can also enable them at startup by setting the
+:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X`
+``faulthandler`` command line option.
+
+Example of a segmentation fault on Linux: ::
+
+    $ python -q -X faulthandler
+    >>> import ctypes
+    >>> ctypes.string_at(0)
+    Fatal Python error: Segmentation fault
+
+    Current thread 0x00007fb899f39700:
+      File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at
+      File "<stdin>", line 1 in <module>
+    Segmentation fault
+
+
+ipaddress
+---------
+
+The new :mod:`ipaddress` module provides tools for creating and manipulating
+objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e.
+an IP address associated with a specific IP subnet).
+
+(Contributed by Google and Peter Moody in :pep:`3144`)
+
+lzma
+----
+
+The newly-added :mod:`lzma` module provides data compression and decompression
+using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
+file formats.
+
+(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`)
+
+
+Improved Modules
+================
+
+abc
+---
+
+Improved support for abstract base classes containing descriptors composed with
+abstract methods. The recommended approach to declaring abstract descriptors is
+now to provide :attr:`__isabstractmethod__` as a dynamically updated
+property. The built-in descriptors have been updated accordingly.
+
+  * :class:`abc.abstractproperty` has been deprecated, use :class:`property`
+    with :func:`abc.abstractmethod` instead.
+  * :class:`abc.abstractclassmethod` has been deprecated, use
+    :class:`classmethod` with :func:`abc.abstractmethod` instead.
+  * :class:`abc.abstractstaticmethod` has been deprecated, use
+    :class:`staticmethod` with :func:`abc.abstractmethod` instead.
+
+(Contributed by Darren Dale in :issue:`11610`)
+
+array
+-----
+
+The :mod:`array` module supports the :c:type:`long long` type using ``q`` and
+``Q`` type codes.
+
+(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`)
+
+
+base64, binascii
+----------------
+
+ASCII-only Unicode strings are now accepted by the decoding functions of the
+modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
+
+
+bz2
+---
+
+The :mod:`bz2` module has been rewritten from scratch. In the process, several
+new features have been added:
+
+* New :func:`bz2.open` function: open a bzip2-compressed file in binary or
+  text mode.
+
+* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like
+  objects, by means of its constructor's *fileobj* argument.
+
+  (Contributed by Nadeem Vawda in :issue:`5863`)
+
+* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress
+  multi-stream inputs (such as those produced by the :program:`pbzip2` tool).
+  :class:`bz2.BZ2File` can now also be used to create this type of file, using
+  the ``'a'`` (append) mode.
+
+  (Contributed by Nir Aides in :issue:`1625`)
+
+* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API,
+  except for the :meth:`detach` and :meth:`truncate` methods.
+
+
+codecs
+------
+
+The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly
+``replace`` and ``ignore`` error handlers on all Windows versions.  The
+:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only
+``replace`` to encode and ``ignore`` to decode.
+
+A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the
+Windows code page 65001 (Windows UTF-8, ``CP_UTF8``).  For example, it is used
+by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using
+``chcp 65001`` command).
+
+Multibyte CJK decoders now resynchronize faster.  They only ignore the first
+byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312',
+'replace')`` now returns a ``\n`` after the replacement character.
+
+(:issue:`12016`)
+
+Incremental CJK codec encoders are no longer reset at each call to their
+encode() methods. For example::
+
+    $ ./python -q
+    >>> import codecs
+    >>> encoder = codecs.getincrementalencoder('hz')('strict')
+    >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.')
+    b'~{NpJ)l6HK!#~} Bye.'
+
+This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python
+versions.
+
+(:issue:`12100`)
+
+The ``unicode_internal`` codec has been deprecated.
+
+
+collections
+-----------
+
+Addition of a new :class:`~collections.ChainMap` class to allow treating a
+number of mappings as a single unit.
+
+(Written by Raymond Hettinger for :issue:`11089`, made public in
+:issue:`11297`)
+
+The abstract base classes have been moved in a new :mod:`collections.abc`
+module, to better differentiate between the abstract and the concrete
+collections classes.  Aliases for ABCs are still present in the
+:mod:`collections` module to preserve existing imports.
+
+(:issue:`11085`)
+
+.. XXX addition of __slots__ to ABCs not recorded here: internal detail
+
+
+contextlib
+----------
+
+:class:`~contextlib.ExitStack` now provides a solid foundation for
+programmatic manipulation of context managers and similar cleanup
+functionality. Unlike the previous ``contextlib.nested`` API (which was
+deprecated and removed), the new API is designed to work correctly
+regardless of whether context managers acquire their resources in
+their ``__init__`` method (for example, file objects) or in their
+``__enter__`` method (for example, synchronisation objects from the
+:mod:`threading` module).
+
+(:issue:`13585`)
+
+
+crypt
+-----
+
+Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt`
+function to the :mod:`crypt` module.
+
+(:issue:`10924`)
+
+curses
+------
+
+ * If the :mod:`curses` module is linked to the ncursesw library, use Unicode
+   functions when Unicode strings or characters are passed (e.g.
+   :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`).
+ * Use the locale encoding instead of ``utf-8`` to encode Unicode strings.
+ * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute.
+ * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch`
+   method to get a wide character
+ * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to
+   push a wide character so the next :meth:`~curses.window.get_wch` will return
+   it
+
+(Contributed by I?igo Serna in :issue:`6755`)
+
+datetime
+--------
+
+ * Equality comparisons between naive and aware :class:`~datetime.datetime`
+   instances now return :const:`False` instead of raising :exc:`TypeError`.
+ * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
+   corresponding to the :class:`~datetime.datetime` instance.
+ * The :meth:`datetime.datetime.strftime` method supports formatting years
+   older than 1000.
+ * The :meth:`datetime.datetime.astimezone` method can now be
+   called without arguments to convert datetime instance to the system
+   timezone.
+
+decimal
+-------
+
+:issue:`7652` - integrate fast native decimal arithmetic.
+   C-module and libmpdec written by Stefan Krah.
+
+The new C version of the decimal module integrates the high speed libmpdec
+library for arbitrary precision correctly-rounded decimal floating point
+arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
+
+Performance gains range from 10x for database applications to 100x for
+numerically intensive applications. These numbers are expected gains
+for standard precisions used in decimal floating point arithmetic. Since
+the precision is user configurable, the exact figures may vary. For example,
+in integer bignum arithmetic the differences can be significantly higher.
+
+The following table is meant as an illustration. Benchmarks are available
+at http://www.bytereef.org/mpdecimal/quickstart.html.
+
+   +---------+-------------+--------------+-------------+
+   |         |  decimal.py |   _decimal   |   speedup   |
+   +=========+=============+==============+=============+
+   |   pi    |    42.02s   |    0.345s    |    120x     |
+   +---------+-------------+--------------+-------------+
+   | telco   |   172.19s   |    5.68s     |     30x     |
+   +---------+-------------+--------------+-------------+
+   | psycopg |     3.57s   |    0.29s     |     12x     |
+   +---------+-------------+--------------+-------------+
+
+Features
+~~~~~~~~
+
+* The :exc:`~decimal.FloatOperation` signal optionally enables stricter
+  semantics for mixing floats and Decimals.
+
+* If Python is compiled without threads, the C version automatically
+  disables the expensive thread local context machinery. In this case,
+  the variable :data:`~decimal.HAVE_THREADS` is set to False.
+
+API changes
+~~~~~~~~~~~
+
+* The C module has the following context limits, depending on the machine
+  architecture:
+
+   +-------------------+---------------------+------------------------------+
+   |                   |       32-bit        |            64-bit            |
+   +===================+=====================+==============================+
+   | :const:`MAX_PREC` | :const:`425000000`  | :const:`999999999999999999`  |
+   +-------------------+---------------------+------------------------------+
+   | :const:`MAX_EMAX` | :const:`425000000`  | :const:`999999999999999999`  |
+   +-------------------+---------------------+------------------------------+
+   | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` |
+   +-------------------+---------------------+------------------------------+
+
+* In the context templates (:class:`~decimal.DefaultContext`,
+  :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`)
+  the magnitude of :attr:`~decimal.Context.Emax` and
+  :attr:`~decimal.Context.Emin` has changed to :const:`999999`.
+
+* The :class:`~decimal.Decimal` constructor in decimal.py does not observe
+  the context limits and converts values with arbitrary exponents or precision
+  exactly. Since the C version has internal limits, the following scheme is
+  used: If possible, values are converted exactly, otherwise
+  :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the
+  latter case it is always possible to use :meth:`~decimal.Context.create_decimal`
+  in order to obtain a rounded or inexact value.
+
+
+* The power function in decimal.py is always correctly-rounded. In the
+  C version, it is defined in terms of the correctly-rounded
+  :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
+  but the final result is only "almost always correctly rounded".
+
+
+* In the C version, the context dictionary containing the signals is a
+  :class:`~collections.abc.MutableMapping`.  For speed reasons,
+  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always
+  refer to the same :class:`~collections.abc.MutableMapping` that the context
+  was initialized with. If a new signal dictionary is assigned,
+  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps`
+  are updated with the new values, but they do not reference the RHS
+  dictionary.
+
+
+* Pickling a :class:`~decimal.Context` produces a different output in order
+  to have a common interchange format for the Python and C versions.
+
+
+* The order of arguments in the :class:`~decimal.Context` constructor has been
+  changed to match the order displayed by :func:`repr`.
+
+
+* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method
+  is deprecated.
+
+
+email
+-----
 
 Policy Framework
-----------------
+~~~~~~~~~~~~~~~~
 
 The email package now has a :mod:`~email.policy` framework.  A
 :class:`~email.policy.Policy` is an object with several methods and properties
@@ -746,7 +1134,7 @@
 
 
 Provisional Policy with New Header API
---------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 While the policy framework is worthwhile all by itself, the main motivation for
 introducing it is to allow the creation of new policies that implement new
@@ -838,394 +1226,6 @@
 standard Content Transfer Encodings.
 
 
-Other Language Changes
-======================
-
-Some smaller changes made to the core Python language are:
-
-* Added support for Unicode name aliases and named sequences.
-  Both :func:`unicodedata.lookup()` and ``'\N{...}'`` now resolve name aliases,
-  and :func:`unicodedata.lookup()` resolves named sequences too.
-
-  (Contributed by Ezio Melotti in :issue:`12753`)
-
-* Unicode database updated to UCD version 6.1.0
-
-* Equality comparisons on :func:`range` objects now return a result reflecting
-  the equality of the underlying sequences generated by those range objects.
-
-  (:issue:`13201`)
-
-* The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
-  methods of :class:`bytes` and :class:`bytearray` objects now accept an
-  integer between 0 and 255 as their first argument.
-
-  (Contributed by Petri Lehtinen in :issue:`12170`)
-
-* New methods have been added to :class:`list` and :class:`bytearray`:
-  ``copy()`` and ``clear()``.
-
-  (:issue:`10516`)
-
-* Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
-  (Contributed by Antoine Pitrou in :issue:`13748`.)
-
-* :meth:`dict.setdefault` now does only one lookup for the given key, making
-  it atomic when used with built-in types.
-  (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
-
-
-.. XXX mention new error messages for passing wrong number of arguments to functions
-
-
-A Finer-Grained Import Lock
-===========================
-
-Previous versions of CPython have always relied on a global import lock.
-This led to unexpected annoyances, such as deadlocks when importing a module
-would trigger code execution in a different thread as a side-effect.
-Clumsy workarounds were sometimes employed, such as the
-:c:func:`PyImport_ImportModuleNoBlock` C API function.
-
-In Python 3.3, importing a module takes a per-module lock.  This correctly
-serializes importation of a given module from multiple threads (preventing
-the exposure of incompletely initialized modules), while eliminating the
-aforementioned annoyances.
-
-(contributed by Antoine Pitrou in :issue:`9260`.)
-
-
-Builtin functions and types
-===========================
-
-* :func:`open` gets a new *opener* parameter: the underlying file descriptor
-  for the file object is then obtained by calling *opener* with (*file*,
-  *flags*). It can be used to use custom flags like :data:`os.O_CLOEXEC` for
-  example. The ``'x'`` mode was added: open for exclusive creation, failing if
-  the file already exists.
-* :func:`print`: added the *flush* keyword argument. If the *flush* keyword
-  argument is true, the stream is forcibly flushed.
-* :func:`hash`: hash randomization is enabled by default, see
-  :meth:`object.__hash__` and :envvar:`PYTHONHASHSEED`.
-* The :class:`str` type gets a new :meth:`~str.casefold` method: return a
-  casefolded copy of the string, casefolded strings may be used for caseless
-  matching. For example, ``'?'.casefold()`` returns ``'ss'``.
-* The sequence documentation has been substantially rewritten to better
-  explain the binary/text sequence distinction and to provide specific
-  documentation sections for the individual builtin sequence types
-  (:issue:`4966`)
-
-New Modules
-===========
-
-faulthandler
-------------
-
-This new debug module :mod:`faulthandler` contains functions to dump Python tracebacks explicitly,
-on a fault (a crash like a segmentation fault), after a timeout, or on a user
-signal. Call :func:`faulthandler.enable` to install fault handlers for the
-:const:`SIGSEGV`, :const:`SIGFPE`, :const:`SIGABRT`, :const:`SIGBUS`, and
-:const:`SIGILL` signals. You can also enable them at startup by setting the
-:envvar:`PYTHONFAULTHANDLER` environment variable or by using :option:`-X`
-``faulthandler`` command line option.
-
-Example of a segmentation fault on Linux: ::
-
-    $ python -q -X faulthandler
-    >>> import ctypes
-    >>> ctypes.string_at(0)
-    Fatal Python error: Segmentation fault
-
-    Current thread 0x00007fb899f39700:
-      File "/home/python/cpython/Lib/ctypes/__init__.py", line 486 in string_at
-      File "<stdin>", line 1 in <module>
-    Segmentation fault
-
-
-ipaddress
----------
-
-The new :mod:`ipaddress` module provides tools for creating and manipulating
-objects representing IPv4 and IPv6 addresses, networks and interfaces (i.e.
-an IP address associated with a specific IP subnet).
-
-(Contributed by Google and Peter Moody in :pep:`3144`)
-
-lzma
-----
-
-The newly-added :mod:`lzma` module provides data compression and decompression
-using the LZMA algorithm, including support for the ``.xz`` and ``.lzma``
-file formats.
-
-(Contributed by Nadeem Vawda and Per ?yvind Karlsen in :issue:`6715`)
-
-
-Improved Modules
-================
-
-abc
----
-
-Improved support for abstract base classes containing descriptors composed with
-abstract methods. The recommended approach to declaring abstract descriptors is
-now to provide :attr:`__isabstractmethod__` as a dynamically updated
-property. The built-in descriptors have been updated accordingly.
-
-  * :class:`abc.abstractproperty` has been deprecated, use :class:`property`
-    with :func:`abc.abstractmethod` instead.
-  * :class:`abc.abstractclassmethod` has been deprecated, use
-    :class:`classmethod` with :func:`abc.abstractmethod` instead.
-  * :class:`abc.abstractstaticmethod` has been deprecated, use
-    :class:`staticmethod` with :func:`abc.abstractmethod` instead.
-
-(Contributed by Darren Dale in :issue:`11610`)
-
-array
------
-
-The :mod:`array` module supports the :c:type:`long long` type using ``q`` and
-``Q`` type codes.
-
-(Contributed by Oren Tirosh and Hirokazu Yamamoto in :issue:`1172711`)
-
-
-base64, binascii
-----------------
-
-ASCII-only Unicode strings are now accepted by the decoding functions of the
-modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
-
-
-bz2
----
-
-The :mod:`bz2` module has been rewritten from scratch. In the process, several
-new features have been added:
-
-* New :func:`bz2.open` function: open a bzip2-compressed file in binary or
-  text mode.
-
-* :class:`bz2.BZ2File` can now read from and write to arbitrary file-like
-  objects, by means of its constructor's *fileobj* argument.
-
-  (Contributed by Nadeem Vawda in :issue:`5863`)
-
-* :class:`bz2.BZ2File` and :func:`bz2.decompress` can now decompress
-  multi-stream inputs (such as those produced by the :program:`pbzip2` tool).
-  :class:`bz2.BZ2File` can now also be used to create this type of file, using
-  the ``'a'`` (append) mode.
-
-  (Contributed by Nir Aides in :issue:`1625`)
-
-* :class:`bz2.BZ2File` now implements all of the :class:`io.BufferedIOBase` API,
-  except for the :meth:`detach` and :meth:`truncate` methods.
-
-
-codecs
-------
-
-The :mod:`~encodings.mbcs` codec has been rewritten to handle correctly
-``replace`` and ``ignore`` error handlers on all Windows versions.  The
-:mod:`~encodings.mbcs` codec now supports all error handlers, instead of only
-``replace`` to encode and ``ignore`` to decode.
-
-A new Windows-only codec has been added: ``cp65001`` (:issue:`13216`). It is the
-Windows code page 65001 (Windows UTF-8, ``CP_UTF8``).  For example, it is used
-by ``sys.stdout`` if the console output code page is set to cp65001 (e.g., using
-``chcp 65001`` command).
-
-Multibyte CJK decoders now resynchronize faster.  They only ignore the first
-byte of an invalid byte sequence. For example, ``b'\xff\n'.decode('gb2312',
-'replace')`` now returns a ``\n`` after the replacement character.
-
-(:issue:`12016`)
-
-Incremental CJK codec encoders are no longer reset at each call to their
-encode() methods. For example::
-
-    $ ./python -q
-    >>> import codecs
-    >>> encoder = codecs.getincrementalencoder('hz')('strict')
-    >>> b''.join(encoder.encode(x) for x in '\u52ff\u65bd\u65bc\u4eba\u3002 Bye.')
-    b'~{NpJ)l6HK!#~} Bye.'
-
-This example gives ``b'~{Np~}~{J)~}~{l6~}~{HK~}~{!#~} Bye.'`` with older Python
-versions.
-
-(:issue:`12100`)
-
-The ``unicode_internal`` codec has been deprecated.
-
-
-collections
------------
-
-Addition of a new :class:`~collections.ChainMap` class to allow treating a
-number of mappings as a single unit.
-
-(Written by Raymond Hettinger for :issue:`11089`, made public in
-:issue:`11297`)
-
-The abstract base classes have been moved in a new :mod:`collections.abc`
-module, to better differentiate between the abstract and the concrete
-collections classes.  Aliases for ABCs are still present in the
-:mod:`collections` module to preserve existing imports.
-
-(:issue:`11085`)
-
-.. XXX addition of __slots__ to ABCs not recorded here: internal detail
-
-
-contextlib
-----------
-
-:class:`~contextlib.ExitStack` now provides a solid foundation for
-programmatic manipulation of context managers and similar cleanup
-functionality. Unlike the previous ``contextlib.nested`` API (which was
-deprecated and removed), the new API is designed to work correctly
-regardless of whether context managers acquire their resources in
-their ``__init__`` method (for example, file objects) or in their
-``__enter__`` method (for example, synchronisation objects from the
-:mod:`threading` module).
-
-(:issue:`13585`)
-
-
-crypt
------
-
-Addition of salt and modular crypt format (hashing method) and the :func:`~crypt.mksalt`
-function to the :mod:`crypt` module.
-
-(:issue:`10924`)
-
-curses
-------
-
- * If the :mod:`curses` module is linked to the ncursesw library, use Unicode
-   functions when Unicode strings or characters are passed (e.g.
-   :c:func:`waddwstr`), and bytes functions otherwise (e.g. :c:func:`waddstr`).
- * Use the locale encoding instead of ``utf-8`` to encode Unicode strings.
- * :class:`curses.window` has a new :attr:`curses.window.encoding` attribute.
- * The :class:`curses.window` class has a new :meth:`~curses.window.get_wch`
-   method to get a wide character
- * The :mod:`curses` module has a new :meth:`~curses.unget_wch` function to
-   push a wide character so the next :meth:`~curses.window.get_wch` will return
-   it
-
-(Contributed by I?igo Serna in :issue:`6755`)
-
-datetime
---------
-
- * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances now return :const:`False` instead of raising :exc:`TypeError`.
- * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
-   corresponding to the :class:`~datetime.datetime` instance.
- * The :meth:`datetime.datetime.strftime` method supports formatting years
-   older than 1000.
- * The :meth:`datetime.datetime.astimezone` method can now be
-   called without arguments to convert datetime instance to the system
-   timezone.
-
-decimal
--------
-
-:issue:`7652` - integrate fast native decimal arithmetic.
-   C-module and libmpdec written by Stefan Krah.
-
-The new C version of the decimal module integrates the high speed libmpdec
-library for arbitrary precision correctly-rounded decimal floating point
-arithmetic. libmpdec conforms to IBM's General Decimal Arithmetic Specification.
-
-Performance gains range from 10x for database applications to 100x for
-numerically intensive applications. These numbers are expected gains
-for standard precisions used in decimal floating point arithmetic. Since
-the precision is user configurable, the exact figures may vary. For example,
-in integer bignum arithmetic the differences can be significantly higher.
-
-The following table is meant as an illustration. Benchmarks are available
-at http://www.bytereef.org/mpdecimal/quickstart.html.
-
-   +---------+-------------+--------------+-------------+
-   |         |  decimal.py |   _decimal   |   speedup   |
-   +=========+=============+==============+=============+
-   |   pi    |    42.02s   |    0.345s    |    120x     |
-   +---------+-------------+--------------+-------------+
-   | telco   |   172.19s   |    5.68s     |     30x     |
-   +---------+-------------+--------------+-------------+
-   | psycopg |     3.57s   |    0.29s     |     12x     |
-   +---------+-------------+--------------+-------------+
-
-Features
-~~~~~~~~
-
-* The :exc:`~decimal.FloatOperation` signal optionally enables stricter
-  semantics for mixing floats and Decimals.
-
-* If Python is compiled without threads, the C version automatically
-  disables the expensive thread local context machinery. In this case,
-  the variable :data:`~decimal.HAVE_THREADS` is set to False.
-
-API changes
-~~~~~~~~~~~
-
-* The C module has the following context limits, depending on the machine
-  architecture:
-
-   +-------------------+---------------------+------------------------------+
-   |                   |       32-bit        |            64-bit            |
-   +===================+=====================+==============================+
-   | :const:`MAX_PREC` | :const:`425000000`  | :const:`999999999999999999`  |
-   +-------------------+---------------------+------------------------------+
-   | :const:`MAX_EMAX` | :const:`425000000`  | :const:`999999999999999999`  |
-   +-------------------+---------------------+------------------------------+
-   | :const:`MIN_EMIN` | :const:`-425000000` | :const:`-999999999999999999` |
-   +-------------------+---------------------+------------------------------+
-
-* In the context templates (:class:`~decimal.DefaultContext`,
-  :class:`~decimal.BasicContext` and :class:`~decimal.ExtendedContext`)
-  the magnitude of :attr:`~decimal.Context.Emax` and
-  :attr:`~decimal.Context.Emin` has changed to :const:`999999`.
-
-* The :class:`~decimal.Decimal` constructor in decimal.py does not observe
-  the context limits and converts values with arbitrary exponents or precision
-  exactly. Since the C version has internal limits, the following scheme is
-  used: If possible, values are converted exactly, otherwise
-  :exc:`~decimal.InvalidOperation` is raised and the result is NaN. In the
-  latter case it is always possible to use :meth:`~decimal.Context.create_decimal`
-  in order to obtain a rounded or inexact value.
-
-
-* The power function in decimal.py is always correctly-rounded. In the
-  C version, it is defined in terms of the correctly-rounded
-  :meth:`~decimal.Decimal.exp` and :meth:`~decimal.Decimal.ln` functions,
-  but the final result is only "almost always correctly rounded".
-
-
-* In the C version, the context dictionary containing the signals is a
-  :class:`~collections.abc.MutableMapping`.  For speed reasons,
-  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps` always
-  refer to the same :class:`~collections.abc.MutableMapping` that the context
-  was initialized with. If a new signal dictionary is assigned,
-  :attr:`~decimal.Context.flags` and :attr:`~decimal.Context.traps`
-  are updated with the new values, but they do not reference the RHS
-  dictionary.
-
-
-* Pickling a :class:`~decimal.Context` produces a different output in order
-  to have a common interchange format for the Python and C versions.
-
-
-* The order of arguments in the :class:`~decimal.Context` constructor has been
-  changed to match the order displayed by :func:`repr`.
-
-
-* The ``watchexp`` parameter in the :meth:`~decimal.Decimal.quantize` method
-  is deprecated.
-
-
 ftplib
 ------
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 01:11:15 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 30 Sep 2012 01:11:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E2=29=3A_Speed_up_test?=
 =?utf-8?q?=5Fhttpservers_by_avoiding_a_one-second_cleanup_wait_after_each?=
 =?utf-8?q?_test?=
Message-ID: <3XTlql36GRzNbq@mail.python.org>

http://hg.python.org/cpython/rev/247d3e3c08ca
changeset:   79287:247d3e3c08ca
branch:      3.2
parent:      79271:d3288f1e1025
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 30 01:05:30 2012 +0200
summary:
  Speed up test_httpservers by avoiding a one-second cleanup wait after each test case.

files:
  Lib/test/test_httpservers.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -62,6 +62,7 @@
 
     def tearDown(self):
         self.thread.stop()
+        self.thread = None
         os.environ.__exit__()
         support.threading_cleanup(*self._threads)
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 01:11:16 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 30 Sep 2012 01:11:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Speed_up_test=5Fhttpservers_by_avoiding_a_one-second_cleanup_w?=
 =?utf-8?q?ait_after_each_test?=
Message-ID: <3XTlqm5KWjzNZb@mail.python.org>

http://hg.python.org/cpython/rev/7b71c093ae81
changeset:   79288:7b71c093ae81
branch:      3.3
parent:      79283:c3d90fb70247
parent:      79287:247d3e3c08ca
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 30 01:08:55 2012 +0200
summary:
  Speed up test_httpservers by avoiding a one-second cleanup wait after each test case.

files:
  Lib/test/test_httpservers.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -62,6 +62,7 @@
 
     def tearDown(self):
         self.thread.stop()
+        self.thread = None
         os.environ.__exit__()
         support.threading_cleanup(*self._threads)
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 01:11:18 2012
From: python-checkins at python.org (antoine.pitrou)
Date: Sun, 30 Sep 2012 01:11:18 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Speed_up_test=5Fhttpservers_by_avoiding_a_one-second_cle?=
 =?utf-8?q?anup_wait_after_each_test?=
Message-ID: <3XTlqp0X1tzNlw@mail.python.org>

http://hg.python.org/cpython/rev/1eb434a945bb
changeset:   79289:1eb434a945bb
parent:      79286:6e32db819b90
parent:      79288:7b71c093ae81
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Sep 30 01:09:59 2012 +0200
summary:
  Speed up test_httpservers by avoiding a one-second cleanup wait after each test case.

files:
  Lib/test/test_httpservers.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -62,6 +62,7 @@
 
     def tearDown(self):
         self.thread.stop()
+        self.thread = None
         os.environ.__exit__()
         support.threading_cleanup(*self._threads)
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 01:42:05 2012
From: python-checkins at python.org (r.david.murray)
Date: Sun, 30 Sep 2012 01:42:05 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Make_whatsnew_?=
 =?utf-8?q?PEP_markup_conform_to_previous_whatsnew_docs=2E?=
Message-ID: <3XTmWK0qblzNQB@mail.python.org>

http://hg.python.org/cpython/rev/1861937676e1
changeset:   79290:1861937676e1
branch:      3.3
parent:      79288:7b71c093ae81
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 19:41:26 2012 -0400
summary:
  Make whatsnew PEP markup conform to previous whatsnew docs.

Also some other consistency tweaks.

files:
  Doc/whatsnew/3.3.rst |  148 +++++++++++++++++++++---------
  1 files changed, 102 insertions(+), 46 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -46,7 +46,12 @@
    when researching a change.
 
 This article explains the new features in Python 3.3, compared to 3.2.
-Python 3.3 was released on September 29, 2012.
+Python 3.3 was released on September 29, 2012.  For full details,
+see the :source:`Misc/NEWS` file.
+
+.. seealso::
+
+    :pep:`398` - Python 3.2 Release Schedule
 
 
 Summary -- Release highlights
@@ -79,6 +84,12 @@
 * More compact :ref:`unicode strings <pep-393>`.
 * More compact :ref:`attribute dictionaries <pep-412>`.
 
+Significantly Improved Library Modules:
+
+* C Accelerator for the :ref:`decimal <new-decimal>` module.
+* Better unicode handling in the :ref:`email <new-email>` module
+  (:term:`provisional <provisional package>`).
+
 Security improvements:
 
 * Hash randomization is switched on by default.
@@ -91,9 +102,6 @@
 PEP 405: Virtual Environments
 =============================
 
-:pep:`405` - Python Virtual Environments
- PEP written by Carl Meyer, implemented by Carl Meyer and Vinay Sajip.
-
 Virtual environments help create separate Python setups while sharing a
 system-wide base install, for ease of maintenance.  Virtual environments
 have their own set of private site packages (i.e. locally-installed
@@ -104,10 +112,17 @@
 
 This PEP adds the :mod:`venv` module for programmatic access, and the
 :ref:`pyvenv <scripts-pyvenv>` script for command-line access and
-administration.  The Python interpreter becomes aware of a ``pvenv.cfg``
+administration.  The Python interpreter checks for a ``pvenv.cfg``,
 file whose existence signals the base of a virtual environment's directory
 tree.
 
+(Implemented by Carl Meyer and Vinay Sajip.)
+
+.. seealso::
+
+    :pep:`405` - Python Virtual Environments
+       PEP written by Carl Meyer
+
 
 PEP 420: Namespace Packages
 ===========================
@@ -117,14 +132,19 @@
 various third party approaches to namespace packages, as described in
 :pep:`420`)
 
+.. seealso::
+
+   :pep:`420` - Namespace packages
+      PEP written by Eric V. Smith; implementation by Eric V. Smith
+      and Barry Warsaw
+
 
 .. _pep-3118-update:
 
 PEP 3118: New memoryview implementation and buffer protocol documentation
 =========================================================================
 
-:issue:`10181` - memoryview bug fixes and features.
-  Written by Stefan Krah.
+The implementation of :pep:`3118` has been significantly improved.
 
 The new memoryview implementation comprehensively fixes all ownership and
 lifetime issues of dynamically allocated fields in the Py_buffer struct
@@ -181,6 +201,13 @@
 
 * For further changes see `Build and C API Changes`_ and `Porting C code`_ .
 
+(Contributed by Stefan Krah in :issue:`10181`)
+
+.. seealso::
+
+   :pep:`3118` - Revising the Buffer Protocol
+
+
 .. _pep-393:
 
 PEP 393: Flexible String Representation
@@ -255,15 +282,18 @@
 bit better than Python 2.7, on a Django benchmark (see the PEP for
 details).
 
+.. seealso::
+
+   :pep:`393` - Flexible String Representation
+      PEP written by Martin von L?wis; implementation by Torsten Becker
+      and Martin von L?wis.
+
 
 .. _pep-3151:
 
 PEP 3151: Reworking the OS and IO exception hierarchy
 =====================================================
 
-:pep:`3151` - Reworking the OS and IO exception hierarchy
- PEP written and implemented by Antoine Pitrou.
-
 The hierarchy of exceptions raised by operating system errors is now both
 simplified and finer-grained.
 
@@ -325,15 +355,17 @@
     except PermissionError:
         print("You are not allowed to read document.txt")
 
+.. seealso::
+
+   :pep:`3151` - Reworking the OS and IO Exception Hierarchy
+      PEP written and implemented by Antoine Pitrou
+
 
 .. _pep-380:
 
 PEP 380: Syntax for Delegating to a Subgenerator
 ================================================
 
-:pep:`380` - Syntax for Delegating to a Subgenerator
- PEP written by Greg Ewing.
-
 PEP 380 adds the ``yield from`` expression, allowing a generator to delegate
 part of its operations to another generator. This allows a section of code
 containing 'yield' to be factored out and placed in another generator.
@@ -389,17 +421,17 @@
 multiple subgenerators as easily as a single large function can be split into
 multiple subfunctions.
 
-(Implementation by Greg Ewing, integrated into 3.3 by Renaud Blanch, Ryan
-Kelly and Nick Coghlan, documentation by Zbigniew J?drzejewski-Szmek and
-Nick Coghlan)
+.. seealso::
+
+   :pep:`380` - Syntax for Delegating to a Subgenerator
+      PEP written by Greg Ewing; implementation by Greg Ewing, integrated into
+      3.3 by Renaud Blanch, Ryan Kelly and Nick Coghlan, documentation by
+      Zbigniew J?drzejewski-Szmek and Nick Coghlan)
 
 
 PEP 409: Suppressing exception context
 ======================================
 
-:pep:`409` - Suppressing exception context
- PEP written by Ethan Furman, implemented by Ethan Furman and Nick Coghlan.
-
 PEP 409 introduces new syntax that allows the display of the chained
 exception context to be disabled. This allows cleaner error messages in
 applications that convert between exception types::
@@ -454,13 +486,16 @@
     ...
     KeyError('x',)
 
+.. seealso::
+
+   :pep:`409` - Suppressing exception context
+      PEP written by Ethan Furman; implemented by Ethan Furman and Nick
+      Coghlan.
+
 
 PEP 414: Explicit Unicode literals
 ======================================
 
-:pep:`414` - Explicit Unicode literals
- PEP written by Armin Ronacher.
-
 To ease the transition from Python 2 for Unicode aware Python applications
 that make heavy use of Unicode literals, Python 3.3 once again supports the
 "``u``" prefix for string literals. This prefix has no semantic significance
@@ -469,13 +504,15 @@
 the more significant semantic changes (such as the stricter default
 separation of binary and text data).
 
+.. seealso::
+
+   :pep:`414` - Explicit Unicode literals
+      PEP written by Armin Ronacher.
+
 
 PEP 3155: Qualified name for classes and functions
 ==================================================
 
-:pep:`3155` - Qualified name for classes and functions
- PEP written and implemented by Antoine Pitrou.
-
 Functions and class objects have a new ``__qualname__`` attribute representing
 the "path" from the module top-level to their definition.  For global functions
 and classes, this is the same as ``__name__``.  For other functions and classes,
@@ -528,28 +565,31 @@
    >>> str(C.D.meth)
    '<function C.D.meth at 0x7f46b9fe31e0>'
 
+.. seealso::
+
+   :pep:`3155` - Qualified name for classes and functions
+      PEP written and implemented by Antoine Pitrou.
+
 
 .. _pep-412:
 
 PEP 412: Key-Sharing Dictionary
 ===============================
 
-:pep:`412` - Key-Sharing Dictionary
- PEP written and implemented by Mark Shannon.
-
 Dictionaries used for the storage of objects' attributes are now able to
 share part of their internal storage between each other (namely, the part
 which stores the keys and their respective hashes).  This reduces the memory
 consumption of programs creating many instances of non-builtin types.
 
+.. seealso::
+
+   :pep:`412` - Key-Sharing Dictionary
+      PEP written and implemented by Mark Shannon.
+
 
 PEP 362: Function Signature Object
 ==================================
 
-:pep:`362`: -  Function Signature Object
- PEP written by Brett Cannon, Yury Selivanov, Larry Hastings, Jiwon Seo.
- Implemented by Yury Selivanov.
-
 A new function :func:`inspect.signature` makes introspection of python
 callables easy and straightforward.  A broad range of callables is supported:
 python functions, decorated or not, classes, and :func:`functools.partial`
@@ -559,13 +599,16 @@
 which considerably simplifies writing decorators and any code that validates
 or amends calling signatures or arguments.
 
+.. seealso::
+
+   :pep:`362`: -  Function Signature Object
+      PEP written by Brett Cannon, Yury Selivanov, Larry Hastings, Jiwon Seo;
+      implemented by Yury Selivanov.
+
 
 PEP 421: Adding sys.implementation
 ==================================
 
-:pep:`421` - Adding sys.implementation
- PEP written and implemented by Eric Snow.
-
 A new attribute on the :mod:`sys` module exposes details specific to the
 implementation of the currently running interpreter.  The initial set of
 attributes on :attr:`sys.implementation` are ``name``, ``version``,
@@ -594,6 +637,11 @@
 are writable.  This means that you can add, remove, and modify the namespace
 through normal attribute access.
 
+.. seealso::
+
+   :pep:`421` - Adding sys.implementation
+      PEP written and implemented by Eric Snow.
+
 
 .. _importlib:
 
@@ -604,8 +652,6 @@
 :issue:`14605` - Make import machinery explicit
 :issue:`14646` - Require loaders set __loader__ and __package__
 
-(Written by Brett Cannon)
-
 The :func:`__import__` function is now powered by :func:`importlib.__import__`.
 This work leads to the completion of "phase 2" of :pep:`302`. There are
 multiple benefits to this change. First, it has allowed for more of the
@@ -657,8 +703,9 @@
 
 Visible Changes
 ---------------
-[For potential required changes to code, see the `Porting Python code`_
-section]
+
+For potential required changes to code, see the `Porting Python code`_
+section.
 
 Beyond the expanse of what :mod:`importlib` now exposes, there are other
 visible changes to import. The biggest is that :attr:`sys.meta_path` and
@@ -686,6 +733,8 @@
 consideration when updating code for Python 3.3, and thus should be read about
 in the `Porting Python code`_ section of this document.
 
+(Implementation by Brett Cannon)
+
 
 Other Language Changes
 ======================
@@ -702,7 +751,6 @@
 
 * Equality comparisons on :func:`range` objects now return a result reflecting
   the equality of the underlying sequences generated by those range objects.
-
   (:issue:`13201`)
 
 * The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
@@ -712,19 +760,21 @@
   (Contributed by Petri Lehtinen in :issue:`12170`)
 
 * New methods have been added to :class:`list` and :class:`bytearray`:
-  ``copy()`` and ``clear()``.
-
-  (:issue:`10516`)
+  ``copy()`` and ``clear()``.  (:issue:`10516`)
 
 * Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
+
   (Contributed by Antoine Pitrou in :issue:`13748`.)
 
 * :meth:`dict.setdefault` now does only one lookup for the given key, making
   it atomic when used with built-in types.
+
   (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
 
-
-.. XXX mention new error messages for passing wrong number of arguments to functions
+* The error messages produced when a function call does not match the function
+  signature have been significantly improved.
+
+  (Contributed by Benjamin Peterson.)
 
 
 A Finer-Grained Import Lock
@@ -741,7 +791,7 @@
 the exposure of incompletely initialized modules), while eliminating the
 aforementioned annoyances.
 
-(contributed by Antoine Pitrou in :issue:`9260`.)
+(Contributed by Antoine Pitrou in :issue:`9260`.)
 
 
 Builtin functions and types
@@ -764,6 +814,7 @@
   documentation sections for the individual builtin sequence types
   (:issue:`4966`)
 
+
 New Modules
 ===========
 
@@ -978,6 +1029,9 @@
    called without arguments to convert datetime instance to the system
    timezone.
 
+
+.. _new-decimal:
+
 decimal
 -------
 
@@ -1075,6 +1129,8 @@
   is deprecated.
 
 
+.. _new-email:
+
 email
 -----
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 01:42:06 2012
From: python-checkins at python.org (r.david.murray)
Date: Sun, 30 Sep 2012 01:42:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Make_whatsnew_PEP_markup_conform_to_previous_wh?=
 =?utf-8?q?atsnew_docs=2E?=
Message-ID: <3XTmWL4pBkzNg2@mail.python.org>

http://hg.python.org/cpython/rev/d7124524c6a6
changeset:   79291:d7124524c6a6
parent:      79289:1eb434a945bb
parent:      79290:1861937676e1
user:        R David Murray <rdmurray at bitdance.com>
date:        Sat Sep 29 19:41:52 2012 -0400
summary:
  Merge: Make whatsnew PEP markup conform to previous whatsnew docs.

Also some other consistency tweaks.

files:
  Doc/whatsnew/3.3.rst |  148 +++++++++++++++++++++---------
  1 files changed, 102 insertions(+), 46 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -46,7 +46,12 @@
    when researching a change.
 
 This article explains the new features in Python 3.3, compared to 3.2.
-Python 3.3 was released on September 29, 2012.
+Python 3.3 was released on September 29, 2012.  For full details,
+see the :source:`Misc/NEWS` file.
+
+.. seealso::
+
+    :pep:`398` - Python 3.2 Release Schedule
 
 
 Summary -- Release highlights
@@ -79,6 +84,12 @@
 * More compact :ref:`unicode strings <pep-393>`.
 * More compact :ref:`attribute dictionaries <pep-412>`.
 
+Significantly Improved Library Modules:
+
+* C Accelerator for the :ref:`decimal <new-decimal>` module.
+* Better unicode handling in the :ref:`email <new-email>` module
+  (:term:`provisional <provisional package>`).
+
 Security improvements:
 
 * Hash randomization is switched on by default.
@@ -91,9 +102,6 @@
 PEP 405: Virtual Environments
 =============================
 
-:pep:`405` - Python Virtual Environments
- PEP written by Carl Meyer, implemented by Carl Meyer and Vinay Sajip.
-
 Virtual environments help create separate Python setups while sharing a
 system-wide base install, for ease of maintenance.  Virtual environments
 have their own set of private site packages (i.e. locally-installed
@@ -104,10 +112,17 @@
 
 This PEP adds the :mod:`venv` module for programmatic access, and the
 :ref:`pyvenv <scripts-pyvenv>` script for command-line access and
-administration.  The Python interpreter becomes aware of a ``pvenv.cfg``
+administration.  The Python interpreter checks for a ``pvenv.cfg``,
 file whose existence signals the base of a virtual environment's directory
 tree.
 
+(Implemented by Carl Meyer and Vinay Sajip.)
+
+.. seealso::
+
+    :pep:`405` - Python Virtual Environments
+       PEP written by Carl Meyer
+
 
 PEP 420: Namespace Packages
 ===========================
@@ -117,14 +132,19 @@
 various third party approaches to namespace packages, as described in
 :pep:`420`)
 
+.. seealso::
+
+   :pep:`420` - Namespace packages
+      PEP written by Eric V. Smith; implementation by Eric V. Smith
+      and Barry Warsaw
+
 
 .. _pep-3118-update:
 
 PEP 3118: New memoryview implementation and buffer protocol documentation
 =========================================================================
 
-:issue:`10181` - memoryview bug fixes and features.
-  Written by Stefan Krah.
+The implementation of :pep:`3118` has been significantly improved.
 
 The new memoryview implementation comprehensively fixes all ownership and
 lifetime issues of dynamically allocated fields in the Py_buffer struct
@@ -181,6 +201,13 @@
 
 * For further changes see `Build and C API Changes`_ and `Porting C code`_ .
 
+(Contributed by Stefan Krah in :issue:`10181`)
+
+.. seealso::
+
+   :pep:`3118` - Revising the Buffer Protocol
+
+
 .. _pep-393:
 
 PEP 393: Flexible String Representation
@@ -255,15 +282,18 @@
 bit better than Python 2.7, on a Django benchmark (see the PEP for
 details).
 
+.. seealso::
+
+   :pep:`393` - Flexible String Representation
+      PEP written by Martin von L?wis; implementation by Torsten Becker
+      and Martin von L?wis.
+
 
 .. _pep-3151:
 
 PEP 3151: Reworking the OS and IO exception hierarchy
 =====================================================
 
-:pep:`3151` - Reworking the OS and IO exception hierarchy
- PEP written and implemented by Antoine Pitrou.
-
 The hierarchy of exceptions raised by operating system errors is now both
 simplified and finer-grained.
 
@@ -325,15 +355,17 @@
     except PermissionError:
         print("You are not allowed to read document.txt")
 
+.. seealso::
+
+   :pep:`3151` - Reworking the OS and IO Exception Hierarchy
+      PEP written and implemented by Antoine Pitrou
+
 
 .. _pep-380:
 
 PEP 380: Syntax for Delegating to a Subgenerator
 ================================================
 
-:pep:`380` - Syntax for Delegating to a Subgenerator
- PEP written by Greg Ewing.
-
 PEP 380 adds the ``yield from`` expression, allowing a generator to delegate
 part of its operations to another generator. This allows a section of code
 containing 'yield' to be factored out and placed in another generator.
@@ -389,17 +421,17 @@
 multiple subgenerators as easily as a single large function can be split into
 multiple subfunctions.
 
-(Implementation by Greg Ewing, integrated into 3.3 by Renaud Blanch, Ryan
-Kelly and Nick Coghlan, documentation by Zbigniew J?drzejewski-Szmek and
-Nick Coghlan)
+.. seealso::
+
+   :pep:`380` - Syntax for Delegating to a Subgenerator
+      PEP written by Greg Ewing; implementation by Greg Ewing, integrated into
+      3.3 by Renaud Blanch, Ryan Kelly and Nick Coghlan, documentation by
+      Zbigniew J?drzejewski-Szmek and Nick Coghlan)
 
 
 PEP 409: Suppressing exception context
 ======================================
 
-:pep:`409` - Suppressing exception context
- PEP written by Ethan Furman, implemented by Ethan Furman and Nick Coghlan.
-
 PEP 409 introduces new syntax that allows the display of the chained
 exception context to be disabled. This allows cleaner error messages in
 applications that convert between exception types::
@@ -454,13 +486,16 @@
     ...
     KeyError('x',)
 
+.. seealso::
+
+   :pep:`409` - Suppressing exception context
+      PEP written by Ethan Furman; implemented by Ethan Furman and Nick
+      Coghlan.
+
 
 PEP 414: Explicit Unicode literals
 ======================================
 
-:pep:`414` - Explicit Unicode literals
- PEP written by Armin Ronacher.
-
 To ease the transition from Python 2 for Unicode aware Python applications
 that make heavy use of Unicode literals, Python 3.3 once again supports the
 "``u``" prefix for string literals. This prefix has no semantic significance
@@ -469,13 +504,15 @@
 the more significant semantic changes (such as the stricter default
 separation of binary and text data).
 
+.. seealso::
+
+   :pep:`414` - Explicit Unicode literals
+      PEP written by Armin Ronacher.
+
 
 PEP 3155: Qualified name for classes and functions
 ==================================================
 
-:pep:`3155` - Qualified name for classes and functions
- PEP written and implemented by Antoine Pitrou.
-
 Functions and class objects have a new ``__qualname__`` attribute representing
 the "path" from the module top-level to their definition.  For global functions
 and classes, this is the same as ``__name__``.  For other functions and classes,
@@ -528,28 +565,31 @@
    >>> str(C.D.meth)
    '<function C.D.meth at 0x7f46b9fe31e0>'
 
+.. seealso::
+
+   :pep:`3155` - Qualified name for classes and functions
+      PEP written and implemented by Antoine Pitrou.
+
 
 .. _pep-412:
 
 PEP 412: Key-Sharing Dictionary
 ===============================
 
-:pep:`412` - Key-Sharing Dictionary
- PEP written and implemented by Mark Shannon.
-
 Dictionaries used for the storage of objects' attributes are now able to
 share part of their internal storage between each other (namely, the part
 which stores the keys and their respective hashes).  This reduces the memory
 consumption of programs creating many instances of non-builtin types.
 
+.. seealso::
+
+   :pep:`412` - Key-Sharing Dictionary
+      PEP written and implemented by Mark Shannon.
+
 
 PEP 362: Function Signature Object
 ==================================
 
-:pep:`362`: -  Function Signature Object
- PEP written by Brett Cannon, Yury Selivanov, Larry Hastings, Jiwon Seo.
- Implemented by Yury Selivanov.
-
 A new function :func:`inspect.signature` makes introspection of python
 callables easy and straightforward.  A broad range of callables is supported:
 python functions, decorated or not, classes, and :func:`functools.partial`
@@ -559,13 +599,16 @@
 which considerably simplifies writing decorators and any code that validates
 or amends calling signatures or arguments.
 
+.. seealso::
+
+   :pep:`362`: -  Function Signature Object
+      PEP written by Brett Cannon, Yury Selivanov, Larry Hastings, Jiwon Seo;
+      implemented by Yury Selivanov.
+
 
 PEP 421: Adding sys.implementation
 ==================================
 
-:pep:`421` - Adding sys.implementation
- PEP written and implemented by Eric Snow.
-
 A new attribute on the :mod:`sys` module exposes details specific to the
 implementation of the currently running interpreter.  The initial set of
 attributes on :attr:`sys.implementation` are ``name``, ``version``,
@@ -594,6 +637,11 @@
 are writable.  This means that you can add, remove, and modify the namespace
 through normal attribute access.
 
+.. seealso::
+
+   :pep:`421` - Adding sys.implementation
+      PEP written and implemented by Eric Snow.
+
 
 .. _importlib:
 
@@ -604,8 +652,6 @@
 :issue:`14605` - Make import machinery explicit
 :issue:`14646` - Require loaders set __loader__ and __package__
 
-(Written by Brett Cannon)
-
 The :func:`__import__` function is now powered by :func:`importlib.__import__`.
 This work leads to the completion of "phase 2" of :pep:`302`. There are
 multiple benefits to this change. First, it has allowed for more of the
@@ -657,8 +703,9 @@
 
 Visible Changes
 ---------------
-[For potential required changes to code, see the `Porting Python code`_
-section]
+
+For potential required changes to code, see the `Porting Python code`_
+section.
 
 Beyond the expanse of what :mod:`importlib` now exposes, there are other
 visible changes to import. The biggest is that :attr:`sys.meta_path` and
@@ -686,6 +733,8 @@
 consideration when updating code for Python 3.3, and thus should be read about
 in the `Porting Python code`_ section of this document.
 
+(Implementation by Brett Cannon)
+
 
 Other Language Changes
 ======================
@@ -702,7 +751,6 @@
 
 * Equality comparisons on :func:`range` objects now return a result reflecting
   the equality of the underlying sequences generated by those range objects.
-
   (:issue:`13201`)
 
 * The ``count()``, ``find()``, ``rfind()``, ``index()`` and ``rindex()``
@@ -712,19 +760,21 @@
   (Contributed by Petri Lehtinen in :issue:`12170`)
 
 * New methods have been added to :class:`list` and :class:`bytearray`:
-  ``copy()`` and ``clear()``.
-
-  (:issue:`10516`)
+  ``copy()`` and ``clear()``.  (:issue:`10516`)
 
 * Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
+
   (Contributed by Antoine Pitrou in :issue:`13748`.)
 
 * :meth:`dict.setdefault` now does only one lookup for the given key, making
   it atomic when used with built-in types.
+
   (Contributed by Filip Gruszczy?ski in :issue:`13521`.)
 
-
-.. XXX mention new error messages for passing wrong number of arguments to functions
+* The error messages produced when a function call does not match the function
+  signature have been significantly improved.
+
+  (Contributed by Benjamin Peterson.)
 
 
 A Finer-Grained Import Lock
@@ -741,7 +791,7 @@
 the exposure of incompletely initialized modules), while eliminating the
 aforementioned annoyances.
 
-(contributed by Antoine Pitrou in :issue:`9260`.)
+(Contributed by Antoine Pitrou in :issue:`9260`.)
 
 
 Builtin functions and types
@@ -764,6 +814,7 @@
   documentation sections for the individual builtin sequence types
   (:issue:`4966`)
 
+
 New Modules
 ===========
 
@@ -978,6 +1029,9 @@
    called without arguments to convert datetime instance to the system
    timezone.
 
+
+.. _new-decimal:
+
 decimal
 -------
 
@@ -1075,6 +1129,8 @@
   is deprecated.
 
 
+.. _new-email:
+
 email
 -----
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 04:02:21 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 30 Sep 2012 04:02:21 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogSXNzdWUgIzE2MDM0?=
 =?utf-8?q?=3A_Fix_performance_regressions_in_the_new_BZ2File_implementati?=
 =?utf-8?b?b24u?=
Message-ID: <3XTqd93nRxzNSY@mail.python.org>

http://hg.python.org/cpython/rev/1a08f4887cff
changeset:   79292:1a08f4887cff
branch:      3.3
parent:      79290:1861937676e1
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Sep 30 03:57:33 2012 +0200
summary:
  Issue #16034: Fix performance regressions in the new BZ2File implementation.

Thanks to Victor Hooi for the bug report, and Serhiy Storchaka for the initial patch.

files:
  Lib/bz2.py |  81 ++++++++++++++++++++++++++++-------------
  Misc/NEWS  |   3 +
  2 files changed, 58 insertions(+), 26 deletions(-)


diff --git a/Lib/bz2.py b/Lib/bz2.py
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -79,7 +79,8 @@
             mode = "rb"
             mode_code = _MODE_READ
             self._decompressor = BZ2Decompressor()
-            self._buffer = None
+            self._buffer = b""
+            self._buffer_offset = 0
         elif mode in ("w", "wb"):
             mode = "wb"
             mode_code = _MODE_WRITE
@@ -124,7 +125,8 @@
                     self._fp = None
                     self._closefp = False
                     self._mode = _MODE_CLOSED
-                    self._buffer = None
+                    self._buffer = b""
+                    self._buffer_offset = 0
 
     @property
     def closed(self):
@@ -174,16 +176,13 @@
 
     # Fill the readahead buffer if it is empty. Returns False on EOF.
     def _fill_buffer(self):
+        if self._mode == _MODE_READ_EOF:
+            return False
         # Depending on the input data, our call to the decompressor may not
         # return any data. In this case, try again after reading another block.
-        while True:
-            if self._buffer:
-                return True
-
-            if self._decompressor.unused_data:
-                rawblock = self._decompressor.unused_data
-            else:
-                rawblock = self._fp.read(_BUFFER_SIZE)
+        while self._buffer_offset == len(self._buffer):
+            rawblock = (self._decompressor.unused_data or
+                        self._fp.read(_BUFFER_SIZE))
 
             if not rawblock:
                 if self._decompressor.eof:
@@ -199,30 +198,48 @@
                 self._decompressor = BZ2Decompressor()
 
             self._buffer = self._decompressor.decompress(rawblock)
+            self._buffer_offset = 0
+        return True
 
     # Read data until EOF.
     # If return_data is false, consume the data without returning it.
     def _read_all(self, return_data=True):
+        # The loop assumes that _buffer_offset is 0. Ensure that this is true.
+        self._buffer = self._buffer[self._buffer_offset:]
+        self._buffer_offset = 0
+
         blocks = []
         while self._fill_buffer():
             if return_data:
                 blocks.append(self._buffer)
             self._pos += len(self._buffer)
-            self._buffer = None
+            self._buffer = b""
         if return_data:
             return b"".join(blocks)
 
     # Read a block of up to n bytes.
     # If return_data is false, consume the data without returning it.
     def _read_block(self, n, return_data=True):
+        # If we have enough data buffered, return immediately.
+        end = self._buffer_offset + n
+        if end <= len(self._buffer):
+            data = self._buffer[self._buffer_offset : end]
+            self._buffer_offset = end
+            self._pos += len(data)
+            return data
+
+        # The loop assumes that _buffer_offset is 0. Ensure that this is true.
+        self._buffer = self._buffer[self._buffer_offset:]
+        self._buffer_offset = 0
+
         blocks = []
         while n > 0 and self._fill_buffer():
             if n < len(self._buffer):
                 data = self._buffer[:n]
-                self._buffer = self._buffer[n:]
+                self._buffer_offset = n
             else:
                 data = self._buffer
-                self._buffer = None
+                self._buffer = b""
             if return_data:
                 blocks.append(data)
             self._pos += len(data)
@@ -238,9 +255,9 @@
         """
         with self._lock:
             self._check_can_read()
-            if self._mode == _MODE_READ_EOF or not self._fill_buffer():
+            if not self._fill_buffer():
                 return b""
-            return self._buffer
+            return self._buffer[self._buffer_offset:]
 
     def read(self, size=-1):
         """Read up to size uncompressed bytes from the file.
@@ -250,7 +267,7 @@
         """
         with self._lock:
             self._check_can_read()
-            if self._mode == _MODE_READ_EOF or size == 0:
+            if size == 0:
                 return b""
             elif size < 0:
                 return self._read_all()
@@ -268,15 +285,19 @@
         # In this case we make multiple reads, to avoid returning b"".
         with self._lock:
             self._check_can_read()
-            if (size == 0 or self._mode == _MODE_READ_EOF or
-                not self._fill_buffer()):
+            if (size == 0 or
+                # Only call _fill_buffer() if the buffer is actually empty.
+                # This gives a significant speedup if *size* is small.
+                (self._buffer_offset == len(self._buffer) and not self._fill_buffer())):
                 return b""
-            if 0 < size < len(self._buffer):
-                data = self._buffer[:size]
-                self._buffer = self._buffer[size:]
+            if size > 0:
+                data = self._buffer[self._buffer_offset :
+                                    self._buffer_offset + size]
+                self._buffer_offset += len(data)
             else:
-                data = self._buffer
-                self._buffer = None
+                data = self._buffer[self._buffer_offset:]
+                self._buffer = b""
+                self._buffer_offset = 0
             self._pos += len(data)
             return data
 
@@ -299,6 +320,14 @@
             raise TypeError("Integer argument expected")
         size = size.__index__()
         with self._lock:
+            # Shortcut for the common case - the whole line is in the buffer.
+            if size < 0:
+                end = self._buffer.find(b"\n", self._buffer_offset) + 1
+                if end > 0:
+                    line = self._buffer[self._buffer_offset : end]
+                    self._buffer_offset = end
+                    self._pos += len(line)
+                    return line
             return io.BufferedIOBase.readline(self, size)
 
     def readlines(self, size=-1):
@@ -345,7 +374,8 @@
         self._mode = _MODE_READ
         self._pos = 0
         self._decompressor = BZ2Decompressor()
-        self._buffer = None
+        self._buffer = b""
+        self._buffer_offset = 0
 
     def seek(self, offset, whence=0):
         """Change the file position.
@@ -385,8 +415,7 @@
                 offset -= self._pos
 
             # Read and discard data until we reach the desired position.
-            if self._mode != _MODE_READ_EOF:
-                self._read_block(offset, return_data=False)
+            self._read_block(offset, return_data=False)
 
             return self._pos
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@
 Library
 -------
 
+- Issue #16034: Fix performance regressions in the new BZ2File implementation.
+  Initial patch by Serhiy Storchaka.
+
 - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
   return a returncode of 0 when the child has already exited or cannot
   be waited on.

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 04:02:23 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 30 Sep 2012 04:02:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_=2316034=3A_Fix_performance_regressions_in_the_new?=
 =?utf-8?q?_BZ2File_implementation=2E?=
Message-ID: <3XTqdC0fCtzNd0@mail.python.org>

http://hg.python.org/cpython/rev/cf50a352fe22
changeset:   79293:cf50a352fe22
parent:      79291:d7124524c6a6
parent:      79292:1a08f4887cff
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Sep 30 04:01:31 2012 +0200
summary:
  Merge #16034: Fix performance regressions in the new BZ2File implementation.

Thanks to Victor Hooi for the bug report, and Serhiy Storchaka for the initial patch.

files:
  Lib/bz2.py |  81 ++++++++++++++++++++++++++++-------------
  Misc/NEWS  |   3 +
  2 files changed, 58 insertions(+), 26 deletions(-)


diff --git a/Lib/bz2.py b/Lib/bz2.py
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -79,7 +79,8 @@
             mode = "rb"
             mode_code = _MODE_READ
             self._decompressor = BZ2Decompressor()
-            self._buffer = None
+            self._buffer = b""
+            self._buffer_offset = 0
         elif mode in ("w", "wb"):
             mode = "wb"
             mode_code = _MODE_WRITE
@@ -124,7 +125,8 @@
                     self._fp = None
                     self._closefp = False
                     self._mode = _MODE_CLOSED
-                    self._buffer = None
+                    self._buffer = b""
+                    self._buffer_offset = 0
 
     @property
     def closed(self):
@@ -174,16 +176,13 @@
 
     # Fill the readahead buffer if it is empty. Returns False on EOF.
     def _fill_buffer(self):
+        if self._mode == _MODE_READ_EOF:
+            return False
         # Depending on the input data, our call to the decompressor may not
         # return any data. In this case, try again after reading another block.
-        while True:
-            if self._buffer:
-                return True
-
-            if self._decompressor.unused_data:
-                rawblock = self._decompressor.unused_data
-            else:
-                rawblock = self._fp.read(_BUFFER_SIZE)
+        while self._buffer_offset == len(self._buffer):
+            rawblock = (self._decompressor.unused_data or
+                        self._fp.read(_BUFFER_SIZE))
 
             if not rawblock:
                 if self._decompressor.eof:
@@ -199,30 +198,48 @@
                 self._decompressor = BZ2Decompressor()
 
             self._buffer = self._decompressor.decompress(rawblock)
+            self._buffer_offset = 0
+        return True
 
     # Read data until EOF.
     # If return_data is false, consume the data without returning it.
     def _read_all(self, return_data=True):
+        # The loop assumes that _buffer_offset is 0. Ensure that this is true.
+        self._buffer = self._buffer[self._buffer_offset:]
+        self._buffer_offset = 0
+
         blocks = []
         while self._fill_buffer():
             if return_data:
                 blocks.append(self._buffer)
             self._pos += len(self._buffer)
-            self._buffer = None
+            self._buffer = b""
         if return_data:
             return b"".join(blocks)
 
     # Read a block of up to n bytes.
     # If return_data is false, consume the data without returning it.
     def _read_block(self, n, return_data=True):
+        # If we have enough data buffered, return immediately.
+        end = self._buffer_offset + n
+        if end <= len(self._buffer):
+            data = self._buffer[self._buffer_offset : end]
+            self._buffer_offset = end
+            self._pos += len(data)
+            return data
+
+        # The loop assumes that _buffer_offset is 0. Ensure that this is true.
+        self._buffer = self._buffer[self._buffer_offset:]
+        self._buffer_offset = 0
+
         blocks = []
         while n > 0 and self._fill_buffer():
             if n < len(self._buffer):
                 data = self._buffer[:n]
-                self._buffer = self._buffer[n:]
+                self._buffer_offset = n
             else:
                 data = self._buffer
-                self._buffer = None
+                self._buffer = b""
             if return_data:
                 blocks.append(data)
             self._pos += len(data)
@@ -238,9 +255,9 @@
         """
         with self._lock:
             self._check_can_read()
-            if self._mode == _MODE_READ_EOF or not self._fill_buffer():
+            if not self._fill_buffer():
                 return b""
-            return self._buffer
+            return self._buffer[self._buffer_offset:]
 
     def read(self, size=-1):
         """Read up to size uncompressed bytes from the file.
@@ -250,7 +267,7 @@
         """
         with self._lock:
             self._check_can_read()
-            if self._mode == _MODE_READ_EOF or size == 0:
+            if size == 0:
                 return b""
             elif size < 0:
                 return self._read_all()
@@ -268,15 +285,19 @@
         # In this case we make multiple reads, to avoid returning b"".
         with self._lock:
             self._check_can_read()
-            if (size == 0 or self._mode == _MODE_READ_EOF or
-                not self._fill_buffer()):
+            if (size == 0 or
+                # Only call _fill_buffer() if the buffer is actually empty.
+                # This gives a significant speedup if *size* is small.
+                (self._buffer_offset == len(self._buffer) and not self._fill_buffer())):
                 return b""
-            if 0 < size < len(self._buffer):
-                data = self._buffer[:size]
-                self._buffer = self._buffer[size:]
+            if size > 0:
+                data = self._buffer[self._buffer_offset :
+                                    self._buffer_offset + size]
+                self._buffer_offset += len(data)
             else:
-                data = self._buffer
-                self._buffer = None
+                data = self._buffer[self._buffer_offset:]
+                self._buffer = b""
+                self._buffer_offset = 0
             self._pos += len(data)
             return data
 
@@ -299,6 +320,14 @@
             raise TypeError("Integer argument expected")
         size = size.__index__()
         with self._lock:
+            # Shortcut for the common case - the whole line is in the buffer.
+            if size < 0:
+                end = self._buffer.find(b"\n", self._buffer_offset) + 1
+                if end > 0:
+                    line = self._buffer[self._buffer_offset : end]
+                    self._buffer_offset = end
+                    self._pos += len(line)
+                    return line
             return io.BufferedIOBase.readline(self, size)
 
     def readlines(self, size=-1):
@@ -345,7 +374,8 @@
         self._mode = _MODE_READ
         self._pos = 0
         self._decompressor = BZ2Decompressor()
-        self._buffer = None
+        self._buffer = b""
+        self._buffer_offset = 0
 
     def seek(self, offset, whence=0):
         """Change the file position.
@@ -385,8 +415,7 @@
                 offset -= self._pos
 
             # Read and discard data until we reach the desired position.
-            if self._mode != _MODE_READ_EOF:
-                self._read_block(offset, return_data=False)
+            self._read_block(offset, return_data=False)
 
             return self._pos
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@
 Library
 -------
 
+- Issue #16034: Fix performance regressions in the new BZ2File implementation.
+  Initial patch by Serhiy Storchaka.
+
 - pty.spawn() now returns the child process status returned by os.waitpid().
 
 - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 05:15:40 2012
From: python-checkins at python.org (daniel.holth)
Date: Sun, 30 Sep 2012 05:15:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_note_that_wheel_installers_sh?=
	=?utf-8?q?ould_compile_=2Epy?=
Message-ID: <3XTsFm38FrzNd0@mail.python.org>

http://hg.python.org/peps/rev/a787a442bd02
changeset:   4525:a787a442bd02
user:        Daniel Holth <dholth at fastmail.fm>
date:        Sat Sep 29 23:15:29 2012 -0400
summary:
  note that wheel installers should compile .py

files:
  pep-0427.txt |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/pep-0427.txt b/pep-0427.txt
--- a/pep-0427.txt
+++ b/pep-0427.txt
@@ -72,6 +72,8 @@
   d. Update ``distribution-1.0.dist.info/RECORD`` with the installed
      paths.
   e. Remove empty ``distribution-1.0.data`` directory.
+  f. Compile any installed .py to .pyc. (Uninstallers should be smart
+     enough to remove .pyc even if it is not mentioned in RECORD.)
 
 File Format
 -----------

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 30 07:29:01 2012
From: python-checkins at python.org (r.david.murray)
Date: Sun, 30 Sep 2012 07:29:01 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_notes_to_w?=
 =?utf-8?q?hatsnew_porting_for_visible_changes_in_email_compatibility_mode?=
 =?utf-8?q?=2E?=
Message-ID: <3XTwCd0HM8zMSq@mail.python.org>

http://hg.python.org/cpython/rev/74be0e7d8d58
changeset:   79294:74be0e7d8d58
branch:      3.3
parent:      79292:1a08f4887cff
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Sep 30 01:27:24 2012 -0400
summary:
  Add notes to whatsnew porting for visible changes in email compatibility mode.

files:
  Doc/whatsnew/3.3.rst |  16 ++++++++++++++++
  1 files changed, 16 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -2102,6 +2102,22 @@
   special case the standard import hooks so they are still supported even
   though they do not provide the non-standard ``iter_modules()`` method.
 
+* A longstanding RFC-compliance bug (:issue:`1079`) in the parsing done by
+  :func:`email.header.decode_header` has been fixed.  Code that uses the
+  standard idiom to convert encoded headers into unicode
+  (``str(make_header(decode_header(h))``) will see no change, but code that
+  looks at the individual tuples returned by decode_header will see that
+  whitespace that precedes or follows ``ASCII`` sections is now included in the
+  ``ASCII`` section.  Code that builds headers using ``make_header`` should
+  also continue to work without change, since ``make_header`` continues to add
+  whitespace between ``ASCII`` and non-``ASCII`` sections if it is not already
+  present in the input strings.
+
+* :func:`email.utils.formataddr` now does the correct content transfer
+  encoding when passed non-``ASCII`` display names.  Any code that depended on
+  the previous buggy behavior that preserved the non-``ASCII`` unicode in the
+  formatted output string will need to be changed.
+
 
 Porting C code
 --------------

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 07:29:02 2012
From: python-checkins at python.org (r.david.murray)
Date: Sun, 30 Sep 2012 07:29:02 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Add_notes_to_whatsnew_porting_for_visible_chang?=
 =?utf-8?q?es_in_email_compatibility?=
Message-ID: <3XTwCf2gh9zMSq@mail.python.org>

http://hg.python.org/cpython/rev/ce2a1553ad5c
changeset:   79295:ce2a1553ad5c
parent:      79293:cf50a352fe22
parent:      79294:74be0e7d8d58
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Sep 30 01:28:53 2012 -0400
summary:
  Merge: Add notes to whatsnew porting for visible changes in email compatibility mode.

files:
  Doc/whatsnew/3.3.rst |  16 ++++++++++++++++
  1 files changed, 16 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -2102,6 +2102,22 @@
   special case the standard import hooks so they are still supported even
   though they do not provide the non-standard ``iter_modules()`` method.
 
+* A longstanding RFC-compliance bug (:issue:`1079`) in the parsing done by
+  :func:`email.header.decode_header` has been fixed.  Code that uses the
+  standard idiom to convert encoded headers into unicode
+  (``str(make_header(decode_header(h))``) will see no change, but code that
+  looks at the individual tuples returned by decode_header will see that
+  whitespace that precedes or follows ``ASCII`` sections is now included in the
+  ``ASCII`` section.  Code that builds headers using ``make_header`` should
+  also continue to work without change, since ``make_header`` continues to add
+  whitespace between ``ASCII`` and non-``ASCII`` sections if it is not already
+  present in the input strings.
+
+* :func:`email.utils.formataddr` now does the correct content transfer
+  encoding when passed non-``ASCII`` display names.  Any code that depended on
+  the previous buggy behavior that preserved the non-``ASCII`` unicode in the
+  formatted output string will need to be changed.
+
 
 Porting C code
 --------------

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 08:39:27 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 08:39:27 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_release_PE?=
	=?utf-8?q?P_description?=
Message-ID: <3XTxmv6W0hzNPV@mail.python.org>

http://hg.python.org/cpython/rev/40f0e240d33b
changeset:   79296:40f0e240d33b
branch:      3.3
parent:      79294:74be0e7d8d58
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 12:08:13 2012 +0530
summary:
  Fix release PEP description

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -51,7 +51,7 @@
 
 .. seealso::
 
-    :pep:`398` - Python 3.2 Release Schedule
+    :pep:`398` - Python 3.3 Release Schedule
 
 
 Summary -- Release highlights

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 08:39:29 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 08:39:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_What=27s_New_fix_from_3=2E3?=
Message-ID: <3XTxmx21mkzNSY@mail.python.org>

http://hg.python.org/cpython/rev/c813f2a522c5
changeset:   79297:c813f2a522c5
parent:      79295:ce2a1553ad5c
parent:      79296:40f0e240d33b
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 12:08:44 2012 +0530
summary:
  Merge What's New fix from 3.3

files:
  Doc/whatsnew/3.3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -51,7 +51,7 @@
 
 .. seealso::
 
-    :pep:`398` - Python 3.2 Release Schedule
+    :pep:`398` - Python 3.3 Release Schedule
 
 
 Summary -- Release highlights

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 08:56:39 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 08:56:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?peps=3A_Some_typo_fixes_in_PEP_3138?=
 =?utf-8?q?=3B_also_add_variables_footer=2E?=
Message-ID: <3XTy8l5B4xzNQV@mail.python.org>

http://hg.python.org/peps/rev/d8b05eefbf45
changeset:   4526:d8b05eefbf45
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 08:55:27 2012 +0200
summary:
  Some typo fixes in PEP 3138; also add variables footer.

files:
  pep-3138.txt |  273 ++++++++++++++++++++------------------
  1 files changed, 146 insertions(+), 127 deletions(-)


diff --git a/pep-3138.txt b/pep-3138.txt
--- a/pep-3138.txt
+++ b/pep-3138.txt
@@ -13,11 +13,11 @@
 Abstract
 ========
 
-This PEP proposes a new string representation form for Python 3000. In
-Python prior to Python 3000, the repr() built-in function converted
-arbitrary objects to printable ASCII strings for debugging and logging.
-For Python 3000, a wider range of characters, based on the Unicode
-standard, should be considered 'printable'.
+This PEP proposes a new string representation form for Python 3000.
+In Python prior to Python 3000, the repr() built-in function converted
+arbitrary objects to printable ASCII strings for debugging and
+logging.  For Python 3000, a wider range of characters, based on the
+Unicode standard, should be considered 'printable'.
 
 
 Motivation
@@ -28,8 +28,8 @@
 
 - Convert CR, LF, TAB and '\\' to '\\r', '\\n', '\\t', '\\\\'.
 
-- Convert other non-printable characters(0x00-0x1f, 0x7f) and non-ASCII
-  characters(>=0x80) to '\\xXX'.
+- Convert other non-printable characters(0x00-0x1f, 0x7f) and
+  non-ASCII characters (>= 0x80) to '\\xXX'.
 
 - Backslash-escape quote characters (apostrophe, ') and add the quote
   character at the beginning and the end.
@@ -39,177 +39,184 @@
 - Convert leading surrogate pair characters without trailing character
   (0xd800-0xdbff, but not followed by 0xdc00-0xdfff) to '\\uXXXX'.
 
-- Convert 16-bit characters(>=0x100) to '\\uXXXX'.
+- Convert 16-bit characters (>= 0x100) to '\\uXXXX'.
 
-- Convert 21-bit characters(>=0x10000) and surrogate pair characters to
-  '\\U00xxxxxx'.
+- Convert 21-bit characters (>= 0x10000) and surrogate pair characters
+  to '\\U00xxxxxx'.
 
 This algorithm converts any string to printable ASCII, and repr() is
 used as a handy and safe way to print strings for debugging or for
-logging. Although all non-ASCII characters are escaped, this does not
-matter when most of the string's characters are ASCII. But for other
+logging.  Although all non-ASCII characters are escaped, this does not
+matter when most of the string's characters are ASCII.  But for other
 languages, such as Japanese where most characters in a string are not
 ASCII, this is very inconvenient.
 
 We can use ``print(aJapaneseString)`` to get a readable string, but we
 don't have a similar workaround for printing strings from collections
-such as lists or tuples. ``print(listOfJapaneseStrings)`` uses repr() to
-build the string to be printed, so the resulting strings are always
-hex-escaped. Or when ``open(japaneseFilemame)`` raises an exception, the
-error message is something like ``IOError: [Errno 2] No such file or
-directory: '\u65e5\u672c\u8a9e'``, which isn't helpful.
+such as lists or tuples.  ``print(listOfJapaneseStrings)`` uses repr()
+to build the string to be printed, so the resulting strings are always
+hex-escaped.  Or when ``open(japaneseFilemame)`` raises an exception,
+the error message is something like ``IOError: [Errno 2] No such file
+or directory: '\u65e5\u672c\u8a9e'``, which isn't helpful.
 
 Python 3000 has a lot of nice features for non-Latin users such as
-non-ASCII identifiers, so it would be helpful if Python could also progress
-in a similar way for printable output.
+non-ASCII identifiers, so it would be helpful if Python could also
+progress in a similar way for printable output.
 
 Some users might be concerned that such output will mess up their
-console if they print binary data like images. But this is unlikely to
-happen in practice because bytes and strings are different types in
+console if they print binary data like images.  But this is unlikely
+to happen in practice because bytes and strings are different types in
 Python 3000, so printing an image to the console won't mess it up.
 
-This issue was once discussed by Hye-Shik Chang [1]_ , but was rejected.
+This issue was once discussed by Hye-Shik Chang [1]_, but was rejected.
 
 
 Specification
 =============
 
 - Add a new function to the Python C API ``int Py_UNICODE_ISPRINTABLE
-  (Py_UNICODE ch)``. This function returns 0 if repr() should escape the
-  Unicode character ``ch``; otherwise it returns 1. Characters that should
-  be escaped are defined in the Unicode character database as:
+  (Py_UNICODE ch)``.  This function returns 0 if repr() should escape
+  the Unicode character ``ch``; otherwise it returns 1.  Characters
+  that should be escaped are defined in the Unicode character database
+  as:
 
- * Cc (Other, Control)
- * Cf (Other, Format)
- * Cs (Other, Surrogate)
- * Co (Other, Private Use)
- * Cn (Other, Not Assigned)
- * Zl (Separator, Line), refers to LINE SEPARATOR ('\\u2028').
- * Zp (Separator, Paragraph), refers to PARAGRAPH SEPARATOR ('\\u2029').
- * Zs (Separator, Space) other than ASCII space('\\x20'). Characters in
-   this category should be escaped to avoid ambiguity.
+  * Cc (Other, Control)
+  * Cf (Other, Format)
+  * Cs (Other, Surrogate)
+  * Co (Other, Private Use)
+  * Cn (Other, Not Assigned)
+  * Zl (Separator, Line), refers to LINE SEPARATOR ('\\u2028').
+  * Zp (Separator, Paragraph), refers to PARAGRAPH SEPARATOR
+    ('\\u2029').
+  * Zs (Separator, Space) other than ASCII space ('\\x20').  Characters
+    in this category should be escaped to avoid ambiguity.
 
 - The algorithm to build repr() strings should be changed to:
 
- * Convert CR, LF, TAB and '\\' to '\\r', '\\n', '\\t', '\\\\'.
+  * Convert CR, LF, TAB and '\\' to '\\r', '\\n', '\\t', '\\\\'.
 
- * Convert non-printable ASCII characters(0x00-0x1f, 0x7f) to '\\xXX'.
+  * Convert non-printable ASCII characters (0x00-0x1f, 0x7f) to
+    '\\xXX'.
 
- * Convert leading surrogate pair characters without trailing character
-   (0xd800-0xdbff, but not followed by 0xdc00-0xdfff) to '\\uXXXX'.
+  * Convert leading surrogate pair characters without trailing
+    character (0xd800-0xdbff, but not followed by 0xdc00-0xdfff) to
+    '\\uXXXX'.
 
- * Convert non-printable characters(Py_UNICODE_ISPRINTABLE() returns 0)
-   to 'xXX', '\\uXXXX' or '\\U00xxxxxx'.
+  * Convert non-printable characters (Py_UNICODE_ISPRINTABLE() returns
+    0) to 'xXX', '\\uXXXX' or '\\U00xxxxxx'.
 
- * Backslash-escape quote characters (apostrophe, 0x27) and add quote
-   character at the beginning and the end.
+  * Backslash-escape quote characters (apostrophe, 0x27) and add a
+    quote character at the beginning and the end.
 
-- Set the Unicode error-handler for sys.stderr to 'backslashreplace' by
-  default.
+- Set the Unicode error-handler for sys.stderr to 'backslashreplace'
+  by default.
 
 - Add a new function to the Python C API ``PyObject *PyObject_ASCII
-  (PyObject *o)``. This function converts any python object to a string
-  using PyObject_Repr() and then hex-escapes all non-ASCII characters. 
-  ``PyObject_ASCII()`` generates the same string as ``PyObject_Repr()``
-  in Python 2.
+  (PyObject *o)``.  This function converts any python object to a
+  string using PyObject_Repr() and then hex-escapes all non-ASCII
+  characters.  ``PyObject_ASCII()`` generates the same string as
+  ``PyObject_Repr()`` in Python 2.
 
-- Add a new built-in function, ``ascii()``. This function converts any
-  python object to a string using repr() and then hex-escapes all non-ASCII
-  characters. ``ascii()`` generates the same string as ``repr()`` in
-  Python 2.
+- Add a new built-in function, ``ascii()``.  This function converts
+  any python object to a string using repr() and then hex-escapes all
+  non-ASCII characters.  ``ascii()`` generates the same string as
+  ``repr()`` in Python 2.
 
-- Add ``'%a'`` string format operator. ``'%a'`` converts any python
+- Add a ``'%a'`` string format operator.  ``'%a'`` converts any python
   object to a string using repr() and then hex-escapes all non-ASCII
-  characters. The ``'%a'`` format operator generates the same string as
-  ``'%r'`` in Python 2. Also, add ``'!a'`` conversion flags to the
+  characters.  The ``'%a'`` format operator generates the same string
+  as ``'%r'`` in Python 2.  Also, add ``'!a'`` conversion flags to the
   ``string.format()`` method and add ``'%A'`` operator to the
-  PyUnicode_FromFormat(). They converts any object to an ASCII string
+  PyUnicode_FromFormat().  They convert any object to an ASCII string
   as ``'%a'`` string format operator.
 
-- Add an ``isprintable()`` method to the string type. ``str.isprintable()``
-  returns False if repr() should escape any character in the string;
-  otherwise returns True. The ``isprintable()`` method calls the
-  ``Py_UNICODE_ISPRINTABLE()`` function internally.
+- Add an ``isprintable()`` method to the string type.
+  ``str.isprintable()`` returns False if repr() would escape any
+  character in the string; otherwise returns True.  The
+  ``isprintable()`` method calls the ``Py_UNICODE_ISPRINTABLE()``
+  function internally.
 
 
 Rationale
 =========
 
-The repr() in Python 3000 should be Unicode not ASCII based, just like
-Python 3000 strings. Also, conversion should not be affected by the
-locale setting, because the locale is not necessarily the same as the
-output device's locale. For example, it is common for a daemon process
-to be invoked in an ASCII setting, but writes UTF-8 to its log files.
-Also, web applications might want to report the error information in
-more readable form based on the HTML page's encoding.
+The repr() in Python 3000 should be Unicode, not ASCII based, just
+like Python 3000 strings.  Also, conversion should not be affected by
+the locale setting, because the locale is not necessarily the same as
+the output device's locale.  For example, it is common for a daemon
+process to be invoked in an ASCII setting, but writes UTF-8 to its log
+files.  Also, web applications might want to report the error
+information in more readable form based on the HTML page's encoding.
 
 Characters not supported by the user's console could be hex-escaped on
-printing, by the Unicode encoder's error-handler. If the error-handler
-of the output file is 'backslashreplace', such characters are
-hex-escaped without raising UnicodeEncodeError. For example, if your default
-encoding is ASCII, ``print('Hello ?')`` will print 'Hello \\xa2'. If
-your encoding is ISO-8859-1, 'Hello ?' will be printed.
+printing, by the Unicode encoder's error-handler.  If the
+error-handler of the output file is 'backslashreplace', such
+characters are hex-escaped without raising UnicodeEncodeError.  For
+example, if the default encoding is ASCII, ``print('Hello ?')`` will
+print 'Hello \\xa2'.  If the encoding is ISO-8859-1, 'Hello ?' will be
+printed.
 
-The default error-handler for sys.stdout is 'strict'. Other applications
-reading the output might not understand hex-escaped characters, so
-unsupported characters should be trapped when writing. If you need to
-escape unsupported characters, you should explicitly change the
-error-handler. Unlike sys.stdout, sys.stderr doesn't raise
+The default error-handler for sys.stdout is 'strict'.  Other
+applications reading the output might not understand hex-escaped
+characters, so unsupported characters should be trapped when writing.
+If unsupported characters must be escaped, the error-handler should be
+changed explicitly.  Unlike sys.stdout, sys.stderr doesn't raise
 UnicodeEncodingError by default, because the default error-handler is
-'backslashreplace'. So printing error messeges containing non-ASCII
-characters to sys.stderr will not raise an exception. Also, information
-about uncaught exceptions (exception object, traceback) are printed by
-the interpreter without raising exceptions.
+'backslashreplace'.  So printing error messages containing non-ASCII
+characters to sys.stderr will not raise an exception.  Also,
+information about uncaught exceptions (exception object, traceback) is
+printed by the interpreter without raising exceptions.
 
 Alternate Solutions
 -------------------
 
-To help debugging in non-Latin languages without changing repr(), other
-suggestions were made.
+To help debugging in non-Latin languages without changing repr(),
+other suggestions were made.
 
 - Supply a tool to print lists or dicts.
 
-  Strings to be printed for debugging are not only contained by lists or
-  dicts, but also in many other types of object. File objects contain a
-  file name in Unicode, exception objects contain a message in Unicode,
-  etc. These strings should be printed in readable form when repr()ed.
-  It is unlikely to be possible to implement a tool to print all
-  possible object types.
+  Strings to be printed for debugging are not only contained by lists
+  or dicts, but also in many other types of object.  File objects
+  contain a file name in Unicode, exception objects contain a message
+  in Unicode, etc.  These strings should be printed in readable form
+  when repr()ed.  It is unlikely to be possible to implement a tool to
+  print all possible object types.
 
 - Use sys.displayhook and sys.excepthook.
 
   For interactive sessions, we can write hooks to restore hex escaped
-  characters to the original characters. But these hooks are called only
-  when printing the result of evaluating an expression entered in an
-  interactive Python session, and doesn't work for the ``print()`` function,
-  for non-interactive sessions or for ``logging.debug("%r", ...)``, etc.
+  characters to the original characters.  But these hooks are called
+  only when printing the result of evaluating an expression entered in
+  an interactive Python session, and don't work for the ``print()``
+  function, for non-interactive sessions or for ``logging.debug("%r",
+  ...)``, etc.
 
 - Subclass sys.stdout and sys.stderr.
 
   It is difficult to implement a subclass to restore hex-escaped
-  characters since there isn't enough information left by the time it's
-  a string to undo the escaping correctly in all cases. For example,
-  ``print("\\"+"u0041")`` should be printed as '\\u0041', not 'A'. But
-  there is no chance to tell file objects apart.
+  characters since there isn't enough information left by the time
+  it's a string to undo the escaping correctly in all cases.  For
+  example, ``print("\\"+"u0041")`` should be printed as '\\u0041', not
+  'A'. But there is no chance to tell file objects apart.
 
 - Make the encoding used by unicode_repr() adjustable, and make the
   existing repr() the default.
 
   With adjustable repr(), the result of using repr() is unpredictable
   and would make it impossible to write correct code involving repr().
-  And if current repr() is the default, then the old convention remains
-  intact and users may expect ASCII strings as the result of repr().
-  Third party applications or libraries could be confused when a custom
-  repr() function is used.
+  And if current repr() is the default, then the old convention
+  remains intact and users may expect ASCII strings as the result of
+  repr().  Third party applications or libraries could be confused
+  when a custom repr() function is used.
 
 
 Backwards Compatibility
 =======================
 
 Changing repr() may break some existing code, especially testing code.
-Five of Python's regression tests fail with this modification. If you
-need repr() strings without non-ASCII character as Python 2, you can use
-the following function. ::
+Five of Python's regression tests fail with this modification.  If you
+need repr() strings without non-ASCII character as Python 2, you can
+use the following function. ::
 
   def repr_ascii(obj):
       return str(repr(obj).encode("ASCII", "backslashreplace"), "ASCII")
@@ -221,25 +228,25 @@
   log.write(repr(data))     # UnicodeEncodeError will be raised
                             # if data contains unsupported characters.
 
-To avoid exceptions being raised, you can explicitly specify the error-
-handler. ::
+To avoid exceptions being raised, you can explicitly specify the
+error-handler. ::
 
   log = open("logfile", "w", errors="backslashreplace")
   log.write(repr(data))  # Unsupported characters will be escaped.
 
 
-For a console that uses a Unicode-based encoding, for example, en_US.
-utf8 or de_DE.utf8, the backslashescape trick doesn't work and all
-printable characters are not escaped. This will cause a problem of
-similarly drawing characters in Western, Greek and Cyrillic languages.
-These languages use similar (but different) alphabets (descended from a
-common ancestor) and contain letters that look similar but have
-different character codes. For example, it is hard to distinguish Latin
-'a', 'e' and 'o' from Cyrillic '?', '?' and '?'. (The visual
-representation, of course, very much depends on the fonts used but
-usually these letters are almost indistinguishable.) To avoid the
-problem, the user can adjust the terminal encoding to get a result
-suitable for their environment.
+For a console that uses a Unicode-based encoding, for example,
+en_US.utf8 or de_DE.utf8, the backslashreplace trick doesn't work and
+all printable characters are not escaped.  This will cause a problem
+of similarly drawing characters in Western, Greek and Cyrillic
+languages.  These languages use similar (but different) alphabets
+(descended from a common ancestor) and contain letters that look
+similar but have different character codes.  For example, it is hard
+to distinguish Latin 'a', 'e' and 'o' from Cyrillic '?', '?' and '?'.
+(The visual representation, of course, very much depends on the fonts
+used but usually these letters are almost indistinguishable.)  To
+avoid the problem, the user can adjust the terminal encoding to get a
+result suitable for their environment.
 
 
 Rejected Proposals
@@ -252,20 +259,21 @@
   idea. [2]_
 
 - Use character names to escape characters, instead of hex character
-  codes. For example, ``repr('\u03b1')`` can be converted to ``"\N{GREEK
-  SMALL LETTER ALPHA}"``.
+  codes.  For example, ``repr('\u03b1')`` can be converted to
+  ``"\N{GREEK SMALL LETTER ALPHA}"``.
 
-  Using character names can be very verbose compared to hex-escape. 
-  e.g., ``repr("\ufbf9")`` is converted to ``"\N{ARABIC LIGATURE UIGHUR
-  KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM}"``.
+  Using character names can be very verbose compared to hex-escape.
+  e.g., ``repr("\ufbf9")`` is converted to ``"\N{ARABIC LIGATURE
+  UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED
+  FORM}"``.
 
 - Default error-handler of sys.stdout should be 'backslashreplace'.
 
   Stuff written to stdout might be consumed by another program that
-  might misinterpret the \ escapes. For interactive session, it is
-  possible to make 'backslashreplace' error-handler to default, but may
-  add confusion of the kind "it works in interactive mode but not when
-  redirecting to a file".
+  might misinterpret the \\ escapes.  For interactive sessions, it is
+  possible to make the 'backslashreplace' error-handler the default,
+  but this may add confusion of the kind "it works in interactive mode
+  but not when redirecting to a file".
 
 
 Implementation
@@ -288,3 +296,14 @@
 =========
 
 This document has been placed in the public domain.
+
+
+
+..
+  Local Variables:
+  mode: indented-text
+  indent-tabs-mode: nil
+  sentence-end-double-space: t
+  fill-column: 70
+  coding: utf-8
+  End:

-- 
Repository URL: http://hg.python.org/peps

From python-checkins at python.org  Sun Sep 30 09:00:43 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:00:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Doc_sidebar=3A_point_to_3?=
	=?utf-8?q?=2E3_as_stable=2E?=
Message-ID: <3XTyFR5c88zNg2@mail.python.org>

http://hg.python.org/cpython/rev/33d5e3c86237
changeset:   79298:33d5e3c86237
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 08:57:40 2012 +0200
summary:
  Doc sidebar: point to 3.3 as stable.

files:
  Doc/tools/sphinxext/indexsidebar.html |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/sphinxext/indexsidebar.html b/Doc/tools/sphinxext/indexsidebar.html
--- a/Doc/tools/sphinxext/indexsidebar.html
+++ b/Doc/tools/sphinxext/indexsidebar.html
@@ -3,7 +3,7 @@
 	    <h3>Docs for other versions</h3>
 	    <ul>
 	      <li><a href="http://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
-	      <li><a href="http://docs.python.org/3.2/">Python 3.2 (stable)</a></li>
+	      <li><a href="http://docs.python.org/3.3/">Python 3.3 (stable)</a></li>
               <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
             </ul>
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:00:45 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:00:45 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogRG9jIHNpZGViYXI6?=
	=?utf-8?q?_point_to_3=2E4_as_dev=2E?=
Message-ID: <3XTyFT0m2bzNtX@mail.python.org>

http://hg.python.org/cpython/rev/2d7e14df367a
changeset:   79299:2d7e14df367a
branch:      3.3
parent:      79296:40f0e240d33b
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 08:58:21 2012 +0200
summary:
  Doc sidebar: point to 3.4 as dev.

files:
  Doc/tools/sphinxext/indexsidebar.html |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/sphinxext/indexsidebar.html b/Doc/tools/sphinxext/indexsidebar.html
--- a/Doc/tools/sphinxext/indexsidebar.html
+++ b/Doc/tools/sphinxext/indexsidebar.html
@@ -3,7 +3,7 @@
 	    <h3>Docs for other versions</h3>
 	    <ul>
 	      <li><a href="http://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
-	      <li><a href="http://docs.python.org/3.2/">Python 3.2 (stable)</a></li>
+	      <li><a href="http://docs.python.org/3.4/">Python 3.4 (in development)</a></li>
               <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
             </ul>
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:00:46 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:00:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogRG9jIHNpZGViYXI6?=
	=?utf-8?q?_point_to_3=2E4_as_dev=2E?=
Message-ID: <3XTyFV3KzfzP8b@mail.python.org>

http://hg.python.org/cpython/rev/11943e8ac032
changeset:   79300:11943e8ac032
branch:      2.7
parent:      79275:f09bc2555e83
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 08:59:31 2012 +0200
summary:
  Doc sidebar: point to 3.4 as dev.

files:
  Doc/tools/sphinxext/indexsidebar.html |  5 ++---
  1 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Doc/tools/sphinxext/indexsidebar.html b/Doc/tools/sphinxext/indexsidebar.html
--- a/Doc/tools/sphinxext/indexsidebar.html
+++ b/Doc/tools/sphinxext/indexsidebar.html
@@ -2,9 +2,8 @@
             <p><a href="{{ pathto('download') }}">Download these documents</a></p>
 	    <h3>Docs for other versions</h3>
 	    <ul>
-	      <li><a href="http://docs.python.org/2.6/">Python 2.6 (stable)</a></li>
-	      <li><a href="http://docs.python.org/3.2/">Python 3.2 (stable)</a></li>
-	      <li><a href="http://docs.python.org/dev/">Python 3.3 (in development)</a></li>
+	      <li><a href="http://docs.python.org/3.3/">Python 3.3 (stable)</a></li>
+	      <li><a href="http://docs.python.org/3.4/">Python 3.4 (in development)</a></li>
               <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
             </ul>
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:00:48 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:00:48 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Closes_=2316091=3A_fix_the_references_to_3=2E3/3=2E4_in_?=
 =?utf-8?q?the_Doc_sidebar=2E?=
Message-ID: <3XTyFX087dzNtX@mail.python.org>

http://hg.python.org/cpython/rev/eac9a50a2bdd
changeset:   79301:eac9a50a2bdd
parent:      79298:33d5e3c86237
parent:      79299:2d7e14df367a
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 09:00:19 2012 +0200
summary:
  Closes #16091: fix the references to 3.3/3.4 in the Doc sidebar.

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:03:16 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:03:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=282=2E7=29=3A_Commit_current?=
 =?utf-8?q?_version_of_the_doc_=22dailybuild=22_script=2E?=
Message-ID: <3XTyJN6nsMzNQV@mail.python.org>

http://hg.python.org/cpython/rev/15fd0b4496e0
changeset:   79302:15fd0b4496e0
branch:      2.7
parent:      79300:11943e8ac032
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 09:03:09 2012 +0200
summary:
  Commit current version of the doc "dailybuild" script.

files:
  Doc/tools/dailybuild.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/tools/dailybuild.py b/Doc/tools/dailybuild.py
--- a/Doc/tools/dailybuild.py
+++ b/Doc/tools/dailybuild.py
@@ -33,17 +33,17 @@
 
 BRANCHES = [
     # checkout, target, isdev
-    (BUILDROOT + '/python33', WWWROOT + '/dev', True),
+    (BUILDROOT + '/python33', WWWROOT + '/py3k', False),
+    (BUILDROOT + '/python34', WWWROOT + '/dev', True),
     (BUILDROOT + '/python27', WWWROOT, False),
-    (BUILDROOT + '/python32', WWWROOT + '/py3k', False),
 ]
 
 
 def build_one(checkout, target, isdev):
     print 'Doc autobuild started in %s' % checkout
     os.chdir(checkout)
-    print 'Running svn update'
-    os.system('svn update')
+    print 'Running hg pull --update'
+    os.system('/usr/local/bin/hg pull --update')
     print 'Running make autobuild'
     if os.WEXITSTATUS(os.system(
         'cd Doc; make autobuild-%s' % (isdev and 'dev' or 'stable'))) == 2:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:12:05 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:12:05 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_a_stub_=22whatsnew_in_?=
	=?utf-8?q?3=2E4=22_document=2E?=
Message-ID: <3XTyVY5tzqzNRx@mail.python.org>

http://hg.python.org/cpython/rev/65bc6ce16a4e
changeset:   79303:65bc6ce16a4e
parent:      79301:eac9a50a2bdd
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 09:11:58 2012 +0200
summary:
  Add a stub "whatsnew in 3.4" document.

files:
  Doc/whatsnew/3.4.rst   |  188 +++++++++++++++++++++++++++++
  Doc/whatsnew/index.rst |    1 +
  2 files changed, 189 insertions(+), 0 deletions(-)


diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
new file mode 100644
--- /dev/null
+++ b/Doc/whatsnew/3.4.rst
@@ -0,0 +1,188 @@
+****************************
+  What's New In Python 3.4
+****************************
+
+:Release: |release|
+:Date: |today|
+
+.. Rules for maintenance:
+
+   * Anyone can add text to this document.  Do not spend very much time
+   on the wording of your changes, because your text will probably
+   get rewritten to some degree.
+
+   * The maintainer will go through Misc/NEWS periodically and add
+   changes; it's therefore more important to add your changes to
+   Misc/NEWS than to this file.
+
+   * This is not a complete list of every single change; completeness
+   is the purpose of Misc/NEWS.  Some changes I consider too small
+   or esoteric to include.  If such a change is added to the text,
+   I'll just remove it.  (This is another reason you shouldn't spend
+   too much time on writing your addition.)
+
+   * If you want to draw your new text to the attention of the
+   maintainer, add 'XXX' to the beginning of the paragraph or
+   section.
+
+   * It's OK to just add a fragmentary note about a change.  For
+   example: "XXX Describe the transmogrify() function added to the
+   socket module."  The maintainer will research the change and
+   write the necessary text.
+
+   * You can comment out your additions if you like, but it's not
+   necessary (especially when a final release is some months away).
+
+   * Credit the author of a patch or bugfix.   Just the name is
+   sufficient; the e-mail address isn't necessary.
+
+   * It's helpful to add the bug/patch number as a comment:
+
+   XXX Describe the transmogrify() function added to the socket
+   module.
+   (Contributed by P.Y. Developer in :issue:`12345`.)
+
+   This saves the maintainer the effort of going through the Mercurial log
+   when researching a change.
+
+This article explains the new features in Python 3.4, compared to 3.3.
+
+.. Python 3.4 was released on September 29, 2012.
+
+For full details, see the :source:`Misc/NEWS` file.
+
+.. note:: Prerelease users should be aware that this document is currently in
+   draft form. It will be updated substantially as Python 3.4 moves towards
+   release, so it's worth checking back even after reading earlier versions.
+
+
+.. seealso::
+
+    .. :pep:`4XX` - Python 3.4 Release Schedule
+
+
+Summary -- Release highlights
+=============================
+
+.. This section singles out the most important changes in Python 3.3.
+   Brevity is key.
+
+New syntax features:
+
+* None yet.
+
+New library modules:
+
+* None yet.
+
+New built-in features:
+
+* None yet.
+
+Implementation improvements:
+
+* None yet.
+
+Significantly Improved Library Modules:
+
+* None yet.
+
+Security improvements:
+
+* None yet.
+
+Please read on for a comprehensive list of user-facing changes.
+
+
+.. PEP-sized items next.
+
+.. _pep-4XX:
+
+.. PEP 4XX: Virtual Environments
+.. =============================
+
+
+.. (Implemented by Foo Bar.)
+
+.. .. seealso::
+
+    :pep:`4XX` - Python Virtual Environments
+       PEP written by Carl Meyer
+
+
+
+
+Other Language Changes
+======================
+
+Some smaller changes made to the core Python language are:
+
+* None yet.
+
+
+
+New Modules
+===========
+
+.. module name
+.. -----------
+
+* None yet.
+
+
+Improved Modules
+================
+
+* None yet.
+
+
+Optimizations
+=============
+
+Major performance enhancements have been added:
+
+* None yet.
+
+
+Build and C API Changes
+=======================
+
+Changes to Python's build process and to the C API include:
+
+* None yet.
+
+
+Deprecated
+==========
+
+Unsupported Operating Systems
+-----------------------------
+
+* None yet.
+
+
+Deprecated Python modules, functions and methods
+------------------------------------------------
+
+* None yet.
+
+
+Deprecated functions and types of the C API
+-------------------------------------------
+
+* None yet.
+
+
+Deprecated features
+-------------------
+
+* None yet.
+
+
+Porting to Python 3.3
+=====================
+
+This section lists previously described changes and other bugfixes
+that may require changes to your code.
+
+* Nothing yet.
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -11,6 +11,7 @@
 .. toctree::
    :maxdepth: 2
 
+   3.4.rst
    3.3.rst
    3.2.rst
    3.1.rst

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:34:00 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 09:34:00 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Make_it_clear_?=
 =?utf-8?q?that_the_pi_function_is_modified_for_benchmarking_purposes=2E?=
Message-ID: <3XTyzr3rqhzNSY@mail.python.org>

http://hg.python.org/cpython/rev/ad93862e5c70
changeset:   79304:ad93862e5c70
branch:      3.3
parent:      79299:2d7e14df367a
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 09:24:41 2012 +0200
summary:
  Make it clear that the pi function is modified for benchmarking purposes.

files:
  Modules/_decimal/tests/bench.py |  9 +++++++--
  1 files changed, 7 insertions(+), 2 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -18,8 +18,13 @@
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
 
-
-# Pi function from the decimal.py documentation
+#
+# NOTE: This is the pi function from the decimal documentation, modified
+# for benchmarking purposes. Since floats do not have a context, the higher
+# intermediate precision from the original is NOT used, so the modified
+# algorithm only gives an approximation to the correctly rounded result.
+# For serious use, refer to the documentation or the appropriate literature.
+#
 def pi_float():
     """native float"""
     lasts, t, s, n, na, d, da = 0, 3.0, 3, 1, 0, 0, 24

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:34:01 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 09:34:01 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XTyzs6g95zNSY@mail.python.org>

http://hg.python.org/cpython/rev/67930559b2ad
changeset:   79305:67930559b2ad
parent:      79303:65bc6ce16a4e
parent:      79304:ad93862e5c70
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 09:25:34 2012 +0200
summary:
  Merge 3.3.

files:
  Modules/_decimal/tests/bench.py |  9 +++++++--
  1 files changed, 7 insertions(+), 2 deletions(-)


diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -18,8 +18,13 @@
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
 
-
-# Pi function from the decimal.py documentation
+#
+# NOTE: This is the pi function from the decimal documentation, modified
+# for benchmarking purposes. Since floats do not have a context, the higher
+# intermediate precision from the original is NOT used, so the modified
+# algorithm only gives an approximation to the correctly rounded result.
+# For serious use, refer to the documentation or the appropriate literature.
+#
 def pi_float():
     """native float"""
     lasts, t, s, n, na, d, da = 0, 3.0, 3, 1, 0, 0, 24

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:42:19 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:42:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_missing_3?=
 =?utf-8?q?=2E3=2E1_NEWS_entries_deleted_in_83496b5e1916=2E?=
Message-ID: <3XTz9R1gpNzNc6@mail.python.org>

http://hg.python.org/cpython/rev/5f4cd44cd8e5
changeset:   79306:5f4cd44cd8e5
branch:      3.3
parent:      79304:ad93862e5c70
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 09:40:45 2012 +0200
summary:
  Add missing 3.3.1 NEWS entries deleted in 83496b5e1916.

files:
  Misc/NEWS |  98 +++++++++++++++++++++++++++++++++++++++++++
  1 files changed, 98 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,25 @@
 Core and Builtins
 -----------------
 
+- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
+  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
+
+- Issue #15144: Fix possible integer overflow when handling pointers as
+  integer values, by using Py_uintptr_t instead of size_t.  Patch by
+  Serhiy Storchaka.
+
+- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
+  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
+
+- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
+
+- Issue #15846: Fix SystemError which happened when using ast.parse in an
+  exception handler on code with syntax errors.
+
+- Issue #15801: Make sure mappings passed to '%' formatting are actually
+  subscriptable.
+
+
 Library
 -------
 
@@ -20,6 +39,85 @@
   return a returncode of 0 when the child has already exited or cannot
   be waited on.
 
+- Issue #15323: improve failure message of Mock.assert_called_once_with
+
+- Issue #16064: unittest -m claims executable is "python", not "python3"
+
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
+- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
+  Patch by Serhiy Storchaka.
+
+- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
+  datetime.MAXYEAR.  Patch by C?dric Krier.
+
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
+- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
+  raise ValueError when the file-like object is closed.  Patch by Alessandro
+  Moura.
+
+- Issue #15876: Fix a refleak in the curses module: window.encoding.
+
+- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
+  by Chris McDonough.
+
+- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
+  and StringIO objects now raise ValueError when the object has been closed.
+  Patch by Alessandro Moura.
+
+- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
+  os.devnull explicitly and leaving it open.
+
+- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
+  Popen when %action substitutions produce empty strings.
+
+- Issues #12776, #11839: call argparse type function (specified by add_argument)
+  only once. Before, the type function was called twice in the case where the
+  default was specified and the argument was given as well.  This was especially
+  problematic for the FileType type, as a default file would always be opened,
+  even if a file argument was specified on the command line.
+
+- Issue #15906: Fix a regression in argparse caused by the preceding change,
+  when action='append', type='str' and default=[].
+
+Tests
+-----
+
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
+Build
+-----
+
+- Issue #15819: Make sure we can build Python out-of-tree from a readonly
+  source directory.  (Somewhat related to Issue #9860.)
+
+Documentation
+-------------
+
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
+- Issue #11964: Document a change in v3.2 to the behavior of the indent
+  parameter of json encoding operations.
+
+Tools/Demos
+-----------
+
+
 
 What's New in Python 3.3.0?
 ===========================

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 09:42:20 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 09:42:20 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_null-merge_from_3=2E3?=
Message-ID: <3XTz9S49vMzNZb@mail.python.org>

http://hg.python.org/cpython/rev/d139fc47b887
changeset:   79307:d139fc47b887
parent:      79305:67930559b2ad
parent:      79306:5f4cd44cd8e5
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 09:42:11 2012 +0200
summary:
  null-merge from 3.3

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 10:03:10 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 10:03:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogV2hhdCdzIG5ldyBl?=
 =?utf-8?q?ntry_for_PEP_397_and_Windows_PATH_modification?=
Message-ID: <3XTzdV5XFjzNPV@mail.python.org>

http://hg.python.org/cpython/rev/22afbf35e60a
changeset:   79308:22afbf35e60a
branch:      3.3
parent:      79296:40f0e240d33b
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 13:00:43 2012 +0530
summary:
  What's new entry for PEP 397 and Windows PATH modification

files:
  Doc/using/windows.rst |   2 +
  Doc/whatsnew/3.3.rst  |  37 +++++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+), 0 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -132,6 +132,8 @@
       Setting Environment variables, Louis J. Farrugia
 
 
+.. _windows-path-mod:
+
 Finding the Python executable
 -----------------------------
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -289,6 +289,43 @@
       and Martin von L?wis.
 
 
+.. _pep-397:
+
+PEP 397: Python Launcher for Windows
+====================================
+
+The Python 3.3 Windows installer now includes a ``py`` launcher application
+that can be used to launch Python applications in a version independent
+fashion.
+
+This launcher is invoked implicitly when double-clicking ``*.py`` files.
+If only a single Python version is installed on the system, that version
+will be used to run the file. If multiple versions are installed, the most
+recent version is used by default, but this can be overridden by including
+a Unix-style "shebang line" in the Python script.
+
+The launcher can also be used explicitly from the command line as the ``py``
+application. Running ``py`` follows the same version selection rules as
+implicitly launching scripts, but a more specific version can be selected
+by passing appropriate arguments (such as ``-3`` to request Python 3 when
+Python 2 is also installed, or ``-2.6`` to specifclly request an earlier
+Python version when a more recent version is installed).
+
+In addition to the launcher, the Windows installer now includes an
+option to add the newly installed Python to the system PATH (contributed
+by Brian Curtain in :issue:`3561`).
+
+.. seealso::
+
+   :pep:`397` - Python Launcher for Windows
+      PEP written by Mark Hammond and Martin v. L?wis; implementation by
+      Vinay Sajip.
+
+   Launcher documentation: :ref:`launcher`
+
+   Installer PATH modification: :ref:`windows-path-mod`
+
+
 .. _pep-3151:
 
 PEP 3151: Reworking the OS and IO exception hierarchy

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 10:03:12 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 10:03:12 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge_Windows_What=27s_New_changes_from_3=2E3?=
Message-ID: <3XTzdX1BFMzNVN@mail.python.org>

http://hg.python.org/cpython/rev/8714edcaf9af
changeset:   79309:8714edcaf9af
parent:      79297:c813f2a522c5
parent:      79308:22afbf35e60a
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 13:02:03 2012 +0530
summary:
  Merge Windows What's New changes from 3.3

files:
  Doc/using/windows.rst |   2 +
  Doc/whatsnew/3.3.rst  |  37 +++++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+), 0 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -132,6 +132,8 @@
       Setting Environment variables, Louis J. Farrugia
 
 
+.. _windows-path-mod:
+
 Finding the Python executable
 -----------------------------
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -289,6 +289,43 @@
       and Martin von L?wis.
 
 
+.. _pep-397:
+
+PEP 397: Python Launcher for Windows
+====================================
+
+The Python 3.3 Windows installer now includes a ``py`` launcher application
+that can be used to launch Python applications in a version independent
+fashion.
+
+This launcher is invoked implicitly when double-clicking ``*.py`` files.
+If only a single Python version is installed on the system, that version
+will be used to run the file. If multiple versions are installed, the most
+recent version is used by default, but this can be overridden by including
+a Unix-style "shebang line" in the Python script.
+
+The launcher can also be used explicitly from the command line as the ``py``
+application. Running ``py`` follows the same version selection rules as
+implicitly launching scripts, but a more specific version can be selected
+by passing appropriate arguments (such as ``-3`` to request Python 3 when
+Python 2 is also installed, or ``-2.6`` to specifclly request an earlier
+Python version when a more recent version is installed).
+
+In addition to the launcher, the Windows installer now includes an
+option to add the newly installed Python to the system PATH (contributed
+by Brian Curtain in :issue:`3561`).
+
+.. seealso::
+
+   :pep:`397` - Python Launcher for Windows
+      PEP written by Mark Hammond and Martin v. L?wis; implementation by
+      Vinay Sajip.
+
+   Launcher documentation: :ref:`launcher`
+
+   Installer PATH modification: :ref:`windows-path-mod`
+
+
 .. _pep-3151:
 
 PEP 3151: Reworking the OS and IO exception hierarchy

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 10:03:13 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 10:03:13 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
 =?utf-8?q?_Merge_commit=2C_because_Mercurial=27s_handling_of_push_races_i?=
 =?utf-8?q?s_bloody_awful?=
Message-ID: <3XTzdY48mSzNn8@mail.python.org>

http://hg.python.org/cpython/rev/5ffc588a0c79
changeset:   79310:5ffc588a0c79
branch:      3.3
parent:      79306:5f4cd44cd8e5
parent:      79308:22afbf35e60a
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 13:25:23 2012 +0530
summary:
  Merge commit, because Mercurial's handling of push races is bloody awful

files:
  Doc/using/windows.rst |   2 +
  Doc/whatsnew/3.3.rst  |  37 +++++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+), 0 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -132,6 +132,8 @@
       Setting Environment variables, Louis J. Farrugia
 
 
+.. _windows-path-mod:
+
 Finding the Python executable
 -----------------------------
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -289,6 +289,43 @@
       and Martin von L?wis.
 
 
+.. _pep-397:
+
+PEP 397: Python Launcher for Windows
+====================================
+
+The Python 3.3 Windows installer now includes a ``py`` launcher application
+that can be used to launch Python applications in a version independent
+fashion.
+
+This launcher is invoked implicitly when double-clicking ``*.py`` files.
+If only a single Python version is installed on the system, that version
+will be used to run the file. If multiple versions are installed, the most
+recent version is used by default, but this can be overridden by including
+a Unix-style "shebang line" in the Python script.
+
+The launcher can also be used explicitly from the command line as the ``py``
+application. Running ``py`` follows the same version selection rules as
+implicitly launching scripts, but a more specific version can be selected
+by passing appropriate arguments (such as ``-3`` to request Python 3 when
+Python 2 is also installed, or ``-2.6`` to specifclly request an earlier
+Python version when a more recent version is installed).
+
+In addition to the launcher, the Windows installer now includes an
+option to add the newly installed Python to the system PATH (contributed
+by Brian Curtain in :issue:`3561`).
+
+.. seealso::
+
+   :pep:`397` - Python Launcher for Windows
+      PEP written by Mark Hammond and Martin v. L?wis; implementation by
+      Vinay Sajip.
+
+   Launcher documentation: :ref:`launcher`
+
+   Installer PATH modification: :ref:`windows-path-mod`
+
+
 .. _pep-3151:
 
 PEP 3151: Reworking the OS and IO exception hierarchy

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 10:03:14 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 10:03:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_Close_previous_head?=
Message-ID: <3XTzdZ6S4DzNlw@mail.python.org>

http://hg.python.org/cpython/rev/9af8037fb999
changeset:   79311:9af8037fb999
parent:      79307:d139fc47b887
parent:      79309:8714edcaf9af
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 13:27:29 2012 +0530
summary:
  Close previous head

files:
  Doc/using/windows.rst |   2 +
  Doc/whatsnew/3.3.rst  |  37 +++++++++++++++++++++++++++++++
  2 files changed, 39 insertions(+), 0 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -132,6 +132,8 @@
       Setting Environment variables, Louis J. Farrugia
 
 
+.. _windows-path-mod:
+
 Finding the Python executable
 -----------------------------
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -289,6 +289,43 @@
       and Martin von L?wis.
 
 
+.. _pep-397:
+
+PEP 397: Python Launcher for Windows
+====================================
+
+The Python 3.3 Windows installer now includes a ``py`` launcher application
+that can be used to launch Python applications in a version independent
+fashion.
+
+This launcher is invoked implicitly when double-clicking ``*.py`` files.
+If only a single Python version is installed on the system, that version
+will be used to run the file. If multiple versions are installed, the most
+recent version is used by default, but this can be overridden by including
+a Unix-style "shebang line" in the Python script.
+
+The launcher can also be used explicitly from the command line as the ``py``
+application. Running ``py`` follows the same version selection rules as
+implicitly launching scripts, but a more specific version can be selected
+by passing appropriate arguments (such as ``-3`` to request Python 3 when
+Python 2 is also installed, or ``-2.6`` to specifclly request an earlier
+Python version when a more recent version is installed).
+
+In addition to the launcher, the Windows installer now includes an
+option to add the newly installed Python to the system PATH (contributed
+by Brian Curtain in :issue:`3561`).
+
+.. seealso::
+
+   :pep:`397` - Python Launcher for Windows
+      PEP written by Mark Hammond and Martin v. L?wis; implementation by
+      Vinay Sajip.
+
+   Launcher documentation: :ref:`launcher`
+
+   Installer PATH modification: :ref:`windows-path-mod`
+
+
 .. _pep-3151:
 
 PEP 3151: Reworking the OS and IO exception hierarchy

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 10:03:16 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 10:03:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Redo_3=2E3_merge?=
Message-ID: <3XTzdc1LLzzNVN@mail.python.org>

http://hg.python.org/cpython/rev/fe8a3ffeb617
changeset:   79312:fe8a3ffeb617
parent:      79311:9af8037fb999
parent:      79310:5ffc588a0c79
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 13:27:41 2012 +0530
summary:
  Redo 3.3 merge

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 10:30:43 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sun, 30 Sep 2012 10:30:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Add_Misc/NEWS_entries_from?=
 =?utf-8?q?_3=2E3=2E1_in_3=2E3_branch_to_3=2E4=2E0_in_default_branch=2E?=
Message-ID: <3XV0FH63rpzNSY@mail.python.org>

http://hg.python.org/cpython/rev/f2a7774e50e1
changeset:   79313:f2a7774e50e1
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Sep 30 01:27:18 2012 -0700
summary:
  Add Misc/NEWS entries from 3.3.1 in 3.3 branch to 3.4.0 in default branch.

files:
  Misc/NEWS |  97 +++++++++++++++++++++++++++++++++++++++++++
  1 files changed, 97 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,24 @@
 
 - Upgrade Unicode data (UCD) to version 6.2.
 
+- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
+  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
+
+- Issue #15144: Fix possible integer overflow when handling pointers as
+  integer values, by using Py_uintptr_t instead of size_t.  Patch by
+  Serhiy Storchaka.
+
+- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
+  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
+
+- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
+
+- Issue #15846: Fix SystemError which happened when using ast.parse in an
+  exception handler on code with syntax errors.
+
+- Issue #15801: Make sure mappings passed to '%' formatting are actually
+  subscriptable.
+
 Library
 -------
 
@@ -24,10 +42,89 @@
   return a returncode of 0 when the child has already exited or cannot
   be waited on.
 
+- Issue #15323: improve failure message of Mock.assert_called_once_with
+
+- Issue #16064: unittest -m claims executable is "python", not "python3"
+
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
+- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
+  Patch by Serhiy Storchaka.
+
+- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
+  datetime.MAXYEAR.  Patch by C?dric Krier.
+
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
+- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
+  raise ValueError when the file-like object is closed.  Patch by Alessandro
+  Moura.
+
+- Issue #15876: Fix a refleak in the curses module: window.encoding.
+
+- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
+  by Chris McDonough.
+
+- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
+  and StringIO objects now raise ValueError when the object has been closed.
+  Patch by Alessandro Moura.
+
+- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
+  os.devnull explicitly and leaving it open.
+
+- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
+  Popen when %action substitutions produce empty strings.
+
+- Issues #12776, #11839: call argparse type function (specified by add_argument)
+  only once. Before, the type function was called twice in the case where the
+  default was specified and the argument was given as well.  This was especially
+  problematic for the FileType type, as a default file would always be opened,
+  even if a file argument was specified on the command line.
+
+- Issue #15906: Fix a regression in argparse caused by the preceding change,
+  when action='append', type='str' and default=[].
+
 Extension Modules
 -----------------
 
 
+Tests
+-----
+
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
+Build
+-----
+
+- Issue #15819: Make sure we can build Python out-of-tree from a readonly
+  source directory.  (Somewhat related to Issue #9860.)
+
+Documentation
+-------------
+
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
+- Issue #11964: Document a change in v3.2 to the behavior of the indent
+  parameter of json encoding operations.
+
+Tools/Demos
+-----------
+
+
 What's New in Python 3.3.0?
 ===========================
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 11:24:39 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sun, 30 Sep 2012 11:24:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1NTMz?=
 =?utf-8?q?=3A_Clarify_docs_and_add_tests_for_subprocess=2EPopen=28=29=27s?=
 =?utf-8?q?_cwd_argument=2E?=
Message-ID: <3XV1RW3ZwszNPm@mail.python.org>

http://hg.python.org/cpython/rev/abfaa4368263
changeset:   79314:abfaa4368263
branch:      3.2
parent:      79287:247d3e3c08ca
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Sep 30 00:10:28 2012 -0700
summary:
  Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd argument.

files:
  Doc/library/subprocess.rst  |    8 +-
  Lib/test/test_subprocess.py |  123 ++++++++++++++++++-----
  Misc/NEWS                   |    3 +
  3 files changed, 101 insertions(+), 33 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -415,10 +415,10 @@
    .. versionadded:: 3.2
       The *pass_fds* parameter was added.
 
-   If *cwd* is not ``None``, the child's current directory will be changed to *cwd*
-   before it is executed.  Note that this directory is not considered when
-   searching the executable, so you can't specify the program's path relative to
-   *cwd*.
+   If *cwd* is not ``None``, the function changes the working directory to
+   *cwd* before executing the child.  In particular, the function looks for
+   *executable* (or for the first item in *args*) relative to *cwd* if the
+   executable path is a relative path.
 
    If *restore_signals* is True (the default) all signals that Python has set to
    SIG_IGN are restored to SIG_DFL in the child process before the exec.
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1,4 +1,5 @@
 import unittest
+from test import script_helper
 from test import support
 import subprocess
 import sys
@@ -164,24 +165,106 @@
         p.wait()
         self.assertEqual(p.stderr, None)
 
+    # For use in the test_cwd* tests below.
+    def _normalize_cwd(self, cwd):
+        # Normalize an expected cwd (for Tru64 support).
+        # We can't use os.path.realpath since it doesn't expand Tru64 {memb}
+        # strings.  See bug #1063571.
+        original_cwd = os.getcwd()
+        os.chdir(cwd)
+        cwd = os.getcwd()
+        os.chdir(original_cwd)
+        return cwd
+
+    # For use in the test_cwd* tests below.
+    def _split_python_path(self):
+        # Return normalized (python_dir, python_base).
+        python_path = os.path.realpath(sys.executable)
+        return os.path.split(python_path)
+
+    # For use in the test_cwd* tests below.
+    def _assert_cwd(self, expected_cwd, python_arg, **kwargs):
+        # Invoke Python via Popen, and assert that (1) the call succeeds,
+        # and that (2) the current working directory of the child process
+        # matches *expected_cwd*.
+        p = subprocess.Popen([python_arg, "-c",
+                              "import os, sys; "
+                              "sys.stdout.write(os.getcwd()); "
+                              "sys.exit(47)"],
+                              stdout=subprocess.PIPE,
+                              **kwargs)
+        self.addCleanup(p.stdout.close)
+        p.wait()
+        self.assertEqual(47, p.returncode)
+        normcase = os.path.normcase
+        self.assertEqual(normcase(expected_cwd),
+                         normcase(p.stdout.read().decode("utf-8")))
+
+    def test_cwd(self):
+        # Check that cwd changes the cwd for the child process.
+        temp_dir = tempfile.gettempdir()
+        temp_dir = self._normalize_cwd(temp_dir)
+        self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir)
+
+    def test_cwd_with_relative_arg(self):
+        # Check that Popen looks for args[0] relative to cwd if args[0]
+        # is relative.
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(OSError, subprocess.Popen,
+                              [rel_python])
+            self.assertRaises(OSError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, rel_python, cwd=python_dir)
+
+    def test_cwd_with_relative_executable(self):
+        # Check that Popen looks for executable relative to cwd if executable
+        # is relative (and that executable takes precedence over args[0]).
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        doesntexist = "somethingyoudonthave"
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(OSError, subprocess.Popen,
+                              [doesntexist], executable=rel_python)
+            self.assertRaises(OSError, subprocess.Popen,
+                              [doesntexist], executable=rel_python,
+                              cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, doesntexist, executable=rel_python,
+                             cwd=python_dir)
+
+    def test_cwd_with_absolute_arg(self):
+        # Check that Popen can find the executable when the cwd is wrong
+        # if args[0] is an absolute path.
+        python_dir, python_base = self._split_python_path()
+        abs_python = os.path.join(python_dir, python_base)
+        rel_python = os.path.join(os.curdir, python_base)
+        with script_helper.temp_dir() as wrong_dir:
+            # Before calling with an absolute path, confirm that using a
+            # relative path fails.
+            self.assertRaises(OSError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            wrong_dir = self._normalize_cwd(wrong_dir)
+            self._assert_cwd(wrong_dir, abs_python, cwd=wrong_dir)
+
     def test_executable_with_cwd(self):
-        python_dir = os.path.dirname(os.path.realpath(sys.executable))
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable, cwd=python_dir)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        python_dir, python_base = self._split_python_path()
+        python_dir = self._normalize_cwd(python_dir)
+        self._assert_cwd(python_dir, "somethingyoudonthave",
+                         executable=sys.executable, cwd=python_dir)
 
     @unittest.skipIf(sysconfig.is_python_build(),
                      "need an installed Python. See #7774")
     def test_executable_without_cwd(self):
         # For a normal installation, it should work without 'cwd'
         # argument.  For test runs in the build directory, see #7774.
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        self._assert_cwd('', "somethingyoudonthave", executable=sys.executable)
 
     def test_stdin_pipe(self):
         # stdin redirection
@@ -313,24 +396,6 @@
         rc = subprocess.call([sys.executable, "-c", cmd], stdout=1)
         self.assertEqual(rc, 2)
 
-    def test_cwd(self):
-        tmpdir = tempfile.gettempdir()
-        # We cannot use os.path.realpath to canonicalize the path,
-        # since it doesn't expand Tru64 {memb} strings. See bug 1063571.
-        cwd = os.getcwd()
-        os.chdir(tmpdir)
-        tmpdir = os.getcwd()
-        os.chdir(cwd)
-        p = subprocess.Popen([sys.executable, "-c",
-                              'import sys,os;'
-                              'sys.stdout.write(os.getcwd())'],
-                             stdout=subprocess.PIPE,
-                             cwd=tmpdir)
-        self.addCleanup(p.stdout.close)
-        normcase = os.path.normcase
-        self.assertEqual(normcase(p.stdout.read().decode("utf-8")),
-                         normcase(tmpdir))
-
     def test_env(self):
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -597,6 +597,9 @@
 Documentation
 -------------
 
+- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd
+  argument.
+
 - Issue #16036: Improve documentation of built-in int()'s signature and
   arguments.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 11:24:41 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sun, 30 Sep 2012 11:24:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2315533=3A_Merge_fix_from_3=2E2=2E?=
Message-ID: <3XV1RY1NLWzNlw@mail.python.org>

http://hg.python.org/cpython/rev/f66ff96f0030
changeset:   79315:f66ff96f0030
branch:      3.3
parent:      79310:5ffc588a0c79
parent:      79314:abfaa4368263
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Sep 30 02:15:37 2012 -0700
summary:
  Issue #15533: Merge fix from 3.2.

files:
  Doc/library/subprocess.rst  |    8 +-
  Lib/test/test_subprocess.py |  123 ++++++++++++++++++-----
  Misc/NEWS                   |    3 +
  3 files changed, 101 insertions(+), 33 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -484,10 +484,10 @@
    .. versionadded:: 3.2
       The *pass_fds* parameter was added.
 
-   If *cwd* is not ``None``, the child's current directory will be changed to *cwd*
-   before it is executed.  Note that this directory is not considered when
-   searching the executable, so you can't specify the program's path relative to
-   *cwd*.
+   If *cwd* is not ``None``, the function changes the working directory to
+   *cwd* before executing the child.  In particular, the function looks for
+   *executable* (or for the first item in *args*) relative to *cwd* if the
+   executable path is a relative path.
 
    If *restore_signals* is True (the default) all signals that Python has set to
    SIG_IGN are restored to SIG_DFL in the child process before the exec.
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1,4 +1,5 @@
 import unittest
+from test import script_helper
 from test import support
 import subprocess
 import sys
@@ -191,15 +192,101 @@
         p.wait()
         self.assertEqual(p.stderr, None)
 
+    # For use in the test_cwd* tests below.
+    def _normalize_cwd(self, cwd):
+        # Normalize an expected cwd (for Tru64 support).
+        # We can't use os.path.realpath since it doesn't expand Tru64 {memb}
+        # strings.  See bug #1063571.
+        original_cwd = os.getcwd()
+        os.chdir(cwd)
+        cwd = os.getcwd()
+        os.chdir(original_cwd)
+        return cwd
+
+    # For use in the test_cwd* tests below.
+    def _split_python_path(self):
+        # Return normalized (python_dir, python_base).
+        python_path = os.path.realpath(sys.executable)
+        return os.path.split(python_path)
+
+    # For use in the test_cwd* tests below.
+    def _assert_cwd(self, expected_cwd, python_arg, **kwargs):
+        # Invoke Python via Popen, and assert that (1) the call succeeds,
+        # and that (2) the current working directory of the child process
+        # matches *expected_cwd*.
+        p = subprocess.Popen([python_arg, "-c",
+                              "import os, sys; "
+                              "sys.stdout.write(os.getcwd()); "
+                              "sys.exit(47)"],
+                              stdout=subprocess.PIPE,
+                              **kwargs)
+        self.addCleanup(p.stdout.close)
+        p.wait()
+        self.assertEqual(47, p.returncode)
+        normcase = os.path.normcase
+        self.assertEqual(normcase(expected_cwd),
+                         normcase(p.stdout.read().decode("utf-8")))
+
+    def test_cwd(self):
+        # Check that cwd changes the cwd for the child process.
+        temp_dir = tempfile.gettempdir()
+        temp_dir = self._normalize_cwd(temp_dir)
+        self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir)
+
+    def test_cwd_with_relative_arg(self):
+        # Check that Popen looks for args[0] relative to cwd if args[0]
+        # is relative.
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python])
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, rel_python, cwd=python_dir)
+
+    def test_cwd_with_relative_executable(self):
+        # Check that Popen looks for executable relative to cwd if executable
+        # is relative (and that executable takes precedence over args[0]).
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        doesntexist = "somethingyoudonthave"
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [doesntexist], executable=rel_python)
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [doesntexist], executable=rel_python,
+                              cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, doesntexist, executable=rel_python,
+                             cwd=python_dir)
+
+    def test_cwd_with_absolute_arg(self):
+        # Check that Popen can find the executable when the cwd is wrong
+        # if args[0] is an absolute path.
+        python_dir, python_base = self._split_python_path()
+        abs_python = os.path.join(python_dir, python_base)
+        rel_python = os.path.join(os.curdir, python_base)
+        with script_helper.temp_dir() as wrong_dir:
+            # Before calling with an absolute path, confirm that using a
+            # relative path fails.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            wrong_dir = self._normalize_cwd(wrong_dir)
+            self._assert_cwd(wrong_dir, abs_python, cwd=wrong_dir)
+
     @unittest.skipIf(sys.base_prefix != sys.prefix,
                      'Test is not venv-compatible')
     def test_executable_with_cwd(self):
-        python_dir = os.path.dirname(os.path.realpath(sys.executable))
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable, cwd=python_dir)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        python_dir, python_base = self._split_python_path()
+        python_dir = self._normalize_cwd(python_dir)
+        self._assert_cwd(python_dir, "somethingyoudonthave",
+                         executable=sys.executable, cwd=python_dir)
 
     @unittest.skipIf(sys.base_prefix != sys.prefix,
                      'Test is not venv-compatible')
@@ -208,11 +295,7 @@
     def test_executable_without_cwd(self):
         # For a normal installation, it should work without 'cwd'
         # argument.  For test runs in the build directory, see #7774.
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        self._assert_cwd('', "somethingyoudonthave", executable=sys.executable)
 
     def test_stdin_pipe(self):
         # stdin redirection
@@ -369,24 +452,6 @@
         p.wait()
         self.assertEqual(p.stdin, None)
 
-    def test_cwd(self):
-        tmpdir = tempfile.gettempdir()
-        # We cannot use os.path.realpath to canonicalize the path,
-        # since it doesn't expand Tru64 {memb} strings. See bug 1063571.
-        cwd = os.getcwd()
-        os.chdir(tmpdir)
-        tmpdir = os.getcwd()
-        os.chdir(cwd)
-        p = subprocess.Popen([sys.executable, "-c",
-                              'import sys,os;'
-                              'sys.stdout.write(os.getcwd())'],
-                             stdout=subprocess.PIPE,
-                             cwd=tmpdir)
-        self.addCleanup(p.stdout.close)
-        normcase = os.path.normcase
-        self.assertEqual(normcase(p.stdout.read().decode("utf-8")),
-                         normcase(tmpdir))
-
     def test_env(self):
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -105,6 +105,9 @@
 Documentation
 -------------
 
+- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd
+  argument.
+
 - Issue #16036: Improve documentation of built-in int()'s signature and
   arguments.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 11:24:42 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sun, 30 Sep 2012 11:24:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315533=3A_Merge_fix_from_3=2E3=2E?=
Message-ID: <3XV1RZ58R6zNmk@mail.python.org>

http://hg.python.org/cpython/rev/37f4aa15a1c6
changeset:   79316:37f4aa15a1c6
parent:      79313:f2a7774e50e1
parent:      79315:f66ff96f0030
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Sep 30 02:22:50 2012 -0700
summary:
  Issue #15533: Merge fix from 3.3.

files:
  Doc/library/subprocess.rst  |    8 +-
  Lib/test/test_subprocess.py |  123 ++++++++++++++++++-----
  Misc/NEWS                   |    3 +
  3 files changed, 101 insertions(+), 33 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -484,10 +484,10 @@
    .. versionadded:: 3.2
       The *pass_fds* parameter was added.
 
-   If *cwd* is not ``None``, the child's current directory will be changed to *cwd*
-   before it is executed.  Note that this directory is not considered when
-   searching the executable, so you can't specify the program's path relative to
-   *cwd*.
+   If *cwd* is not ``None``, the function changes the working directory to
+   *cwd* before executing the child.  In particular, the function looks for
+   *executable* (or for the first item in *args*) relative to *cwd* if the
+   executable path is a relative path.
 
    If *restore_signals* is True (the default) all signals that Python has set to
    SIG_IGN are restored to SIG_DFL in the child process before the exec.
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1,4 +1,5 @@
 import unittest
+from test import script_helper
 from test import support
 import subprocess
 import sys
@@ -191,15 +192,101 @@
         p.wait()
         self.assertEqual(p.stderr, None)
 
+    # For use in the test_cwd* tests below.
+    def _normalize_cwd(self, cwd):
+        # Normalize an expected cwd (for Tru64 support).
+        # We can't use os.path.realpath since it doesn't expand Tru64 {memb}
+        # strings.  See bug #1063571.
+        original_cwd = os.getcwd()
+        os.chdir(cwd)
+        cwd = os.getcwd()
+        os.chdir(original_cwd)
+        return cwd
+
+    # For use in the test_cwd* tests below.
+    def _split_python_path(self):
+        # Return normalized (python_dir, python_base).
+        python_path = os.path.realpath(sys.executable)
+        return os.path.split(python_path)
+
+    # For use in the test_cwd* tests below.
+    def _assert_cwd(self, expected_cwd, python_arg, **kwargs):
+        # Invoke Python via Popen, and assert that (1) the call succeeds,
+        # and that (2) the current working directory of the child process
+        # matches *expected_cwd*.
+        p = subprocess.Popen([python_arg, "-c",
+                              "import os, sys; "
+                              "sys.stdout.write(os.getcwd()); "
+                              "sys.exit(47)"],
+                              stdout=subprocess.PIPE,
+                              **kwargs)
+        self.addCleanup(p.stdout.close)
+        p.wait()
+        self.assertEqual(47, p.returncode)
+        normcase = os.path.normcase
+        self.assertEqual(normcase(expected_cwd),
+                         normcase(p.stdout.read().decode("utf-8")))
+
+    def test_cwd(self):
+        # Check that cwd changes the cwd for the child process.
+        temp_dir = tempfile.gettempdir()
+        temp_dir = self._normalize_cwd(temp_dir)
+        self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir)
+
+    def test_cwd_with_relative_arg(self):
+        # Check that Popen looks for args[0] relative to cwd if args[0]
+        # is relative.
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python])
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, rel_python, cwd=python_dir)
+
+    def test_cwd_with_relative_executable(self):
+        # Check that Popen looks for executable relative to cwd if executable
+        # is relative (and that executable takes precedence over args[0]).
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        doesntexist = "somethingyoudonthave"
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [doesntexist], executable=rel_python)
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [doesntexist], executable=rel_python,
+                              cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, doesntexist, executable=rel_python,
+                             cwd=python_dir)
+
+    def test_cwd_with_absolute_arg(self):
+        # Check that Popen can find the executable when the cwd is wrong
+        # if args[0] is an absolute path.
+        python_dir, python_base = self._split_python_path()
+        abs_python = os.path.join(python_dir, python_base)
+        rel_python = os.path.join(os.curdir, python_base)
+        with script_helper.temp_dir() as wrong_dir:
+            # Before calling with an absolute path, confirm that using a
+            # relative path fails.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            wrong_dir = self._normalize_cwd(wrong_dir)
+            self._assert_cwd(wrong_dir, abs_python, cwd=wrong_dir)
+
     @unittest.skipIf(sys.base_prefix != sys.prefix,
                      'Test is not venv-compatible')
     def test_executable_with_cwd(self):
-        python_dir = os.path.dirname(os.path.realpath(sys.executable))
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable, cwd=python_dir)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        python_dir, python_base = self._split_python_path()
+        python_dir = self._normalize_cwd(python_dir)
+        self._assert_cwd(python_dir, "somethingyoudonthave",
+                         executable=sys.executable, cwd=python_dir)
 
     @unittest.skipIf(sys.base_prefix != sys.prefix,
                      'Test is not venv-compatible')
@@ -208,11 +295,7 @@
     def test_executable_without_cwd(self):
         # For a normal installation, it should work without 'cwd'
         # argument.  For test runs in the build directory, see #7774.
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        self._assert_cwd('', "somethingyoudonthave", executable=sys.executable)
 
     def test_stdin_pipe(self):
         # stdin redirection
@@ -369,24 +452,6 @@
         p.wait()
         self.assertEqual(p.stdin, None)
 
-    def test_cwd(self):
-        tmpdir = tempfile.gettempdir()
-        # We cannot use os.path.realpath to canonicalize the path,
-        # since it doesn't expand Tru64 {memb} strings. See bug 1063571.
-        cwd = os.getcwd()
-        os.chdir(tmpdir)
-        tmpdir = os.getcwd()
-        os.chdir(cwd)
-        p = subprocess.Popen([sys.executable, "-c",
-                              'import sys,os;'
-                              'sys.stdout.write(os.getcwd())'],
-                             stdout=subprocess.PIPE,
-                             cwd=tmpdir)
-        self.addCleanup(p.stdout.close)
-        normcase = os.path.normcase
-        self.assertEqual(normcase(p.stdout.read().decode("utf-8")),
-                         normcase(tmpdir))
-
     def test_env(self):
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -112,6 +112,9 @@
 Documentation
 -------------
 
+- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd
+  argument.
+
 - Issue #16036: Improve documentation of built-in int()'s signature and
   arguments.
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 13:45:42 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 30 Sep 2012 13:45:42 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_the_return?=
 =?utf-8?q?_value_of_BZ2File=2E=5Fread=5Fblock=28=29_to_be_consistent_with?=
 =?utf-8?q?_comments=2E?=
Message-ID: <3XV4ZG0SlqzNVN@mail.python.org>

http://hg.python.org/cpython/rev/1b4190d918c9
changeset:   79317:1b4190d918c9
branch:      3.3
parent:      79315:f66ff96f0030
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Sep 30 13:41:29 2012 +0200
summary:
  Fix the return value of BZ2File._read_block() to be consistent with comments.

files:
  Lib/bz2.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/bz2.py b/Lib/bz2.py
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -226,7 +226,7 @@
             data = self._buffer[self._buffer_offset : end]
             self._buffer_offset = end
             self._pos += len(data)
-            return data
+            return data if return_data else None
 
         # The loop assumes that _buffer_offset is 0. Ensure that this is true.
         self._buffer = self._buffer[self._buffer_offset:]

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 13:45:43 2012
From: python-checkins at python.org (nadeem.vawda)
Date: Sun, 30 Sep 2012 13:45:43 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Fix_the_return_value_of_BZ2File=2E=5Fread=5Fblo?=
 =?utf-8?q?ck=28=29_to_be_consistent_with?=
Message-ID: <3XV4ZH2g5tzPjZ@mail.python.org>

http://hg.python.org/cpython/rev/d79dc761f683
changeset:   79318:d79dc761f683
parent:      79316:37f4aa15a1c6
parent:      79317:1b4190d918c9
user:        Nadeem Vawda <nadeem.vawda at gmail.com>
date:        Sun Sep 30 13:45:22 2012 +0200
summary:
  Merge: Fix the return value of BZ2File._read_block() to be consistent with comments.

files:
  Lib/bz2.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/bz2.py b/Lib/bz2.py
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -226,7 +226,7 @@
             data = self._buffer[self._buffer_offset : end]
             self._buffer_offset = end
             self._pos += len(data)
-            return data
+            return data if return_data else None
 
         # The loop assumes that _buffer_offset is 0. Ensure that this is true.
         self._buffer = self._buffer[self._buffer_offset:]

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 14:39:46 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 14:39:46 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Record_UCD_update_in_whats?=
	=?utf-8?q?new=2E?=
Message-ID: <3XV5mf1f9yzNkx@mail.python.org>

http://hg.python.org/cpython/rev/d2f9a0acdbf4
changeset:   79319:d2f9a0acdbf4
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 14:39:18 2012 +0200
summary:
  Record UCD update in whatsnew.

files:
  Doc/whatsnew/3.4.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -117,7 +117,7 @@
 
 Some smaller changes made to the core Python language are:
 
-* None yet.
+* Unicode database updated to UCD version 6.2.
 
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 15:10:14 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 15:10:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Fix_reST_marku?=
	=?utf-8?q?p_in_NEWS=2E?=
Message-ID: <3XV6Rp4Lh4zPH2@mail.python.org>

http://hg.python.org/cpython/rev/6ee3f3989c72
changeset:   79320:6ee3f3989c72
branch:      3.3
parent:      79317:1b4190d918c9
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 14:42:22 2012 +0200
summary:
  Fix reST markup in NEWS.

files:
  Misc/NEWS |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -664,9 +664,10 @@
 - Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been
   enhanced to show information on more C frames relevant to CPython within the
   "py-bt" and "py-bt-full" commands:
-    * C frames that are waiting on the GIL
-    * C frames that are garbage-collecting
-    * C frames that are due to the invocation of a PyCFunction
+
+  * C frames that are waiting on the GIL
+  * C frames that are garbage-collecting
+  * C frames that are due to the invocation of a PyCFunction
 
 Documentation
 -------------

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 15:10:16 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 15:10:16 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_a_filterab?=
 =?utf-8?q?le_HTML_version_of_Misc/NEWS_to_the_docs_=22whatsnew=22_section?=
 =?utf-8?q?=2E?=
Message-ID: <3XV6Rr0y72zQPb@mail.python.org>

http://hg.python.org/cpython/rev/6347fb67239a
changeset:   79321:6347fb67239a
branch:      3.3
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 15:10:06 2012 +0200
summary:
  Add a filterable HTML version of Misc/NEWS to the docs "whatsnew" section.

files:
  Doc/tools/sphinxext/layout.html   |  17 ++++++++
  Doc/tools/sphinxext/pyspecific.py |  40 +++++++++++++++++++
  Doc/whatsnew/index.rst            |   8 +++
  Doc/whatsnew/news.rst             |  14 ++++++
  4 files changed, 79 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
--- a/Doc/tools/sphinxext/layout.html
+++ b/Doc/tools/sphinxext/layout.html
@@ -8,6 +8,23 @@
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
+    {% if pagename == 'whatsnew/news' %}
+    <script type="text/javascript">
+      function dofilter() {
+        var el = document.getElementById('searchbox');
+        var string = el.value.toLowerCase();
+        var litags = document.getElementsByTagName('li')
+        for (var idx = 0; idx < litags.length; idx++) {
+          var li = litags[idx];
+          if (li.innerHTML.toLowerCase().indexOf(string) >= 0) {
+            li.style.display = '';
+          } else {
+            li.style.display = 'none';
+          }
+        }
+      }
+    </script>
+    {% endif %}
 {{ super() }}
 {% endblock %}
 {% block footer %}
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -145,6 +145,45 @@
         return ret
 
 
+# Support for including Misc/NEWS
+
+import re
+import codecs
+from docutils.statemachine import string2lines
+from sphinx.util.nodes import nested_parse_with_titles
+
+issue_re = re.compile('Issue #([0-9]+)')
+
+class MiscNews(Directive):
+    has_content = False
+    required_arguments = 1
+    optional_arguments = 0
+    final_argument_whitespace = False
+    option_spec = {}
+
+    def run(self):
+        fname = self.arguments[0]
+        source = self.state_machine.input_lines.source(
+            self.lineno - self.state_machine.input_offset - 1)
+        source_dir = path.dirname(path.abspath(source))
+        try:
+            fp = codecs.open(path.join(source_dir, fname), encoding='utf-8')
+            try:
+                content = fp.read()
+            finally:
+                fp.close()
+        except Exception:
+            text = 'The NEWS file is not available.'
+            node = nodes.strong(text, text)
+            return [node]
+        content = issue_re.sub(r'`Issue #\1 <http://bugs.python.org/\1>`__',
+                               content)
+        # remove first 3 lines as they are the main heading
+        lines = content.splitlines()[3:]
+        self.state_machine.insert_input(lines, fname)
+        return []
+
+
 # Support for building "topic help" for pydoc
 
 pydoc_topic_labels = [
@@ -276,3 +315,4 @@
     app.add_description_unit('2to3fixer', '2to3fixer', '%s (2to3 fixer)')
     app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction)
     app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod)
+    app.add_directive('miscnews', MiscNews)
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -23,3 +23,11 @@
    2.2.rst
    2.1.rst
    2.0.rst
+
+The "Python News" is a HTML version of the file :source:`Misc/NEWS` which
+contains *all* nontrivial changes to Python.
+
+.. toctree::
+   :maxdepth: 1
+
+   news.rst
diff --git a/Doc/whatsnew/news.rst b/Doc/whatsnew/news.rst
new file mode 100644
--- /dev/null
+++ b/Doc/whatsnew/news.rst
@@ -0,0 +1,14 @@
++++++++++++
+Python News
++++++++++++
+
+.. raw:: html
+
+   <p>
+   Filter entries by content:
+   <input type="text" value="" id="searchbox" style="width: 50%" onchange="dofilter()">
+   <input type="submit" value="Filter" onclick="dofilter()">
+   </p>
+
+.. miscnews:: ../../Misc/NEWS
+

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 15:10:40 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 15:10:40 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_merge_with_3=2E3?=
Message-ID: <3XV6SJ3sVkzPYN@mail.python.org>

http://hg.python.org/cpython/rev/b19f3259eca3
changeset:   79322:b19f3259eca3
parent:      79319:d2f9a0acdbf4
parent:      79321:6347fb67239a
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 15:10:34 2012 +0200
summary:
  merge with 3.3

files:
  Doc/tools/sphinxext/layout.html   |  17 ++++++++
  Doc/tools/sphinxext/pyspecific.py |  40 +++++++++++++++++++
  Doc/whatsnew/index.rst            |   8 +++
  Doc/whatsnew/news.rst             |  14 ++++++
  Misc/NEWS                         |   7 +-
  5 files changed, 83 insertions(+), 3 deletions(-)


diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
--- a/Doc/tools/sphinxext/layout.html
+++ b/Doc/tools/sphinxext/layout.html
@@ -8,6 +8,23 @@
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
+    {% if pagename == 'whatsnew/news' %}
+    <script type="text/javascript">
+      function dofilter() {
+        var el = document.getElementById('searchbox');
+        var string = el.value.toLowerCase();
+        var litags = document.getElementsByTagName('li')
+        for (var idx = 0; idx < litags.length; idx++) {
+          var li = litags[idx];
+          if (li.innerHTML.toLowerCase().indexOf(string) >= 0) {
+            li.style.display = '';
+          } else {
+            li.style.display = 'none';
+          }
+        }
+      }
+    </script>
+    {% endif %}
 {{ super() }}
 {% endblock %}
 {% block footer %}
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -145,6 +145,45 @@
         return ret
 
 
+# Support for including Misc/NEWS
+
+import re
+import codecs
+from docutils.statemachine import string2lines
+from sphinx.util.nodes import nested_parse_with_titles
+
+issue_re = re.compile('Issue #([0-9]+)')
+
+class MiscNews(Directive):
+    has_content = False
+    required_arguments = 1
+    optional_arguments = 0
+    final_argument_whitespace = False
+    option_spec = {}
+
+    def run(self):
+        fname = self.arguments[0]
+        source = self.state_machine.input_lines.source(
+            self.lineno - self.state_machine.input_offset - 1)
+        source_dir = path.dirname(path.abspath(source))
+        try:
+            fp = codecs.open(path.join(source_dir, fname), encoding='utf-8')
+            try:
+                content = fp.read()
+            finally:
+                fp.close()
+        except Exception:
+            text = 'The NEWS file is not available.'
+            node = nodes.strong(text, text)
+            return [node]
+        content = issue_re.sub(r'`Issue #\1 <http://bugs.python.org/\1>`__',
+                               content)
+        # remove first 3 lines as they are the main heading
+        lines = content.splitlines()[3:]
+        self.state_machine.insert_input(lines, fname)
+        return []
+
+
 # Support for building "topic help" for pydoc
 
 pydoc_topic_labels = [
@@ -276,3 +315,4 @@
     app.add_description_unit('2to3fixer', '2to3fixer', '%s (2to3 fixer)')
     app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction)
     app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod)
+    app.add_directive('miscnews', MiscNews)
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -24,3 +24,11 @@
    2.2.rst
    2.1.rst
    2.0.rst
+
+The "Python News" is a HTML version of the file :source:`Misc/NEWS` which
+contains *all* nontrivial changes to Python.
+
+.. toctree::
+   :maxdepth: 1
+
+   news.rst
diff --git a/Doc/whatsnew/news.rst b/Doc/whatsnew/news.rst
new file mode 100644
--- /dev/null
+++ b/Doc/whatsnew/news.rst
@@ -0,0 +1,14 @@
++++++++++++
+Python News
++++++++++++
+
+.. raw:: html
+
+   <p>
+   Filter entries by content:
+   <input type="text" value="" id="searchbox" style="width: 50%" onchange="dofilter()">
+   <input type="submit" value="Filter" onclick="dofilter()">
+   </p>
+
+.. miscnews:: ../../Misc/NEWS
+
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -674,9 +674,10 @@
 - Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been
   enhanced to show information on more C frames relevant to CPython within the
   "py-bt" and "py-bt-full" commands:
-    * C frames that are waiting on the GIL
-    * C frames that are garbage-collecting
-    * C frames that are due to the invocation of a PyCFunction
+
+  * C frames that are waiting on the GIL
+  * C frames that are garbage-collecting
+  * C frames that are due to the invocation of a PyCFunction
 
 Documentation
 -------------

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 15:51:49 2012
From: python-checkins at python.org (christian.heimes)
Date: Sun, 30 Sep 2012 15:51:49 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Change_libmpde?=
 =?utf-8?q?c_to_use_ANSI_code_in_strict_ansi_mode_as_inline_asm_isn=27t?=
Message-ID: <3XV7Mn2CknzPH2@mail.python.org>

http://hg.python.org/cpython/rev/29506c7db353
changeset:   79323:29506c7db353
branch:      3.3
parent:      79290:1861937676e1
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 30 15:49:56 2012 +0200
summary:
  Change libmpdec to use ANSI code in strict ansi mode as inline asm isn't supported in ANSI C

files:
  Modules/_decimal/libmpdec/mpdecimal.h |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
--- a/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/Modules/_decimal/libmpdec/mpdecimal.h
@@ -106,6 +106,11 @@
   #endif
 #endif
 
+/* ASM isn't available in strict ansi C mode */
+#if defined(ASM) && defined(__STRICT_ANSI__)
+  #undef ASM
+  #define ANSI
+#endif
 
 /* BEGIN CONFIG_64 */
 #if defined(CONFIG_64)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 15:51:50 2012
From: python-checkins at python.org (christian.heimes)
Date: Sun, 30 Sep 2012 15:51:50 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Change_libmpdec_to_use_ANSI_code_in_strict_ansi_mode_as_?=
 =?utf-8?q?inline_asm_isn=27t?=
Message-ID: <3XV7Mp5BS5zNpc@mail.python.org>

http://hg.python.org/cpython/rev/256ab69f5911
changeset:   79324:256ab69f5911
parent:      79319:d2f9a0acdbf4
parent:      79323:29506c7db353
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 30 15:50:20 2012 +0200
summary:
  Change libmpdec to use ANSI code in strict ansi mode as inline asm isn't supported in ANSI C

files:
  Modules/_decimal/libmpdec/mpdecimal.h |  5 +++++
  1 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
--- a/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/Modules/_decimal/libmpdec/mpdecimal.h
@@ -106,6 +106,11 @@
   #endif
 #endif
 
+/* ASM isn't available in strict ansi C mode */
+#if defined(ASM) && defined(__STRICT_ANSI__)
+  #undef ASM
+  #define ANSI
+#endif
 
 /* BEGIN CONFIG_64 */
 #if defined(CONFIG_64)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 15:51:52 2012
From: python-checkins at python.org (christian.heimes)
Date: Sun, 30 Sep 2012 15:51:52 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_default_-=3E_default?=
	=?utf-8?q?=29=3A_merge?=
Message-ID: <3XV7Mr2tp4zQMr@mail.python.org>

http://hg.python.org/cpython/rev/3384077a9906
changeset:   79325:3384077a9906
parent:      79324:256ab69f5911
parent:      79322:b19f3259eca3
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 30 15:51:07 2012 +0200
summary:
  merge

files:
  Doc/tools/sphinxext/layout.html   |  17 ++++++++
  Doc/tools/sphinxext/pyspecific.py |  40 +++++++++++++++++++
  Doc/whatsnew/index.rst            |   8 +++
  Doc/whatsnew/news.rst             |  14 ++++++
  Misc/NEWS                         |   7 +-
  5 files changed, 83 insertions(+), 3 deletions(-)


diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
--- a/Doc/tools/sphinxext/layout.html
+++ b/Doc/tools/sphinxext/layout.html
@@ -8,6 +8,23 @@
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
+    {% if pagename == 'whatsnew/news' %}
+    <script type="text/javascript">
+      function dofilter() {
+        var el = document.getElementById('searchbox');
+        var string = el.value.toLowerCase();
+        var litags = document.getElementsByTagName('li')
+        for (var idx = 0; idx < litags.length; idx++) {
+          var li = litags[idx];
+          if (li.innerHTML.toLowerCase().indexOf(string) >= 0) {
+            li.style.display = '';
+          } else {
+            li.style.display = 'none';
+          }
+        }
+      }
+    </script>
+    {% endif %}
 {{ super() }}
 {% endblock %}
 {% block footer %}
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -145,6 +145,45 @@
         return ret
 
 
+# Support for including Misc/NEWS
+
+import re
+import codecs
+from docutils.statemachine import string2lines
+from sphinx.util.nodes import nested_parse_with_titles
+
+issue_re = re.compile('Issue #([0-9]+)')
+
+class MiscNews(Directive):
+    has_content = False
+    required_arguments = 1
+    optional_arguments = 0
+    final_argument_whitespace = False
+    option_spec = {}
+
+    def run(self):
+        fname = self.arguments[0]
+        source = self.state_machine.input_lines.source(
+            self.lineno - self.state_machine.input_offset - 1)
+        source_dir = path.dirname(path.abspath(source))
+        try:
+            fp = codecs.open(path.join(source_dir, fname), encoding='utf-8')
+            try:
+                content = fp.read()
+            finally:
+                fp.close()
+        except Exception:
+            text = 'The NEWS file is not available.'
+            node = nodes.strong(text, text)
+            return [node]
+        content = issue_re.sub(r'`Issue #\1 <http://bugs.python.org/\1>`__',
+                               content)
+        # remove first 3 lines as they are the main heading
+        lines = content.splitlines()[3:]
+        self.state_machine.insert_input(lines, fname)
+        return []
+
+
 # Support for building "topic help" for pydoc
 
 pydoc_topic_labels = [
@@ -276,3 +315,4 @@
     app.add_description_unit('2to3fixer', '2to3fixer', '%s (2to3 fixer)')
     app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction)
     app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod)
+    app.add_directive('miscnews', MiscNews)
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -24,3 +24,11 @@
    2.2.rst
    2.1.rst
    2.0.rst
+
+The "Python News" is a HTML version of the file :source:`Misc/NEWS` which
+contains *all* nontrivial changes to Python.
+
+.. toctree::
+   :maxdepth: 1
+
+   news.rst
diff --git a/Doc/whatsnew/news.rst b/Doc/whatsnew/news.rst
new file mode 100644
--- /dev/null
+++ b/Doc/whatsnew/news.rst
@@ -0,0 +1,14 @@
++++++++++++
+Python News
++++++++++++
+
+.. raw:: html
+
+   <p>
+   Filter entries by content:
+   <input type="text" value="" id="searchbox" style="width: 50%" onchange="dofilter()">
+   <input type="submit" value="Filter" onclick="dofilter()">
+   </p>
+
+.. miscnews:: ../../Misc/NEWS
+
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -674,9 +674,10 @@
 - Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been
   enhanced to show information on more C frames relevant to CPython within the
   "py-bt" and "py-bt-full" commands:
-    * C frames that are waiting on the GIL
-    * C frames that are garbage-collecting
-    * C frames that are due to the invocation of a PyCFunction
+
+  * C frames that are waiting on the GIL
+  * C frames that are garbage-collecting
+  * C frames that are due to the invocation of a PyCFunction
 
 Documentation
 -------------

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 15:51:54 2012
From: python-checkins at python.org (christian.heimes)
Date: Sun, 30 Sep 2012 15:51:54 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4zIC0+IDMuMyk6?=
	=?utf-8?q?_merge?=
Message-ID: <3XV7Mt2t97zMtd@mail.python.org>

http://hg.python.org/cpython/rev/3d10897fef9b
changeset:   79326:3d10897fef9b
branch:      3.3
parent:      79323:29506c7db353
parent:      79321:6347fb67239a
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Sep 30 15:51:39 2012 +0200
summary:
  merge

files:
  Doc/library/subprocess.rst            |    8 +-
  Doc/tools/sphinxext/indexsidebar.html |    2 +-
  Doc/tools/sphinxext/layout.html       |   17 +
  Doc/tools/sphinxext/pyspecific.py     |   40 ++++
  Doc/using/windows.rst                 |    2 +
  Doc/whatsnew/3.3.rst                  |   55 ++++++-
  Doc/whatsnew/index.rst                |    8 +
  Doc/whatsnew/news.rst                 |   14 +
  Lib/bz2.py                            |   81 ++++++--
  Lib/test/test_subprocess.py           |  123 ++++++++++---
  Misc/NEWS                             |  111 ++++++++++++-
  Modules/_decimal/tests/bench.py       |    9 +-
  12 files changed, 404 insertions(+), 66 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -484,10 +484,10 @@
    .. versionadded:: 3.2
       The *pass_fds* parameter was added.
 
-   If *cwd* is not ``None``, the child's current directory will be changed to *cwd*
-   before it is executed.  Note that this directory is not considered when
-   searching the executable, so you can't specify the program's path relative to
-   *cwd*.
+   If *cwd* is not ``None``, the function changes the working directory to
+   *cwd* before executing the child.  In particular, the function looks for
+   *executable* (or for the first item in *args*) relative to *cwd* if the
+   executable path is a relative path.
 
    If *restore_signals* is True (the default) all signals that Python has set to
    SIG_IGN are restored to SIG_DFL in the child process before the exec.
diff --git a/Doc/tools/sphinxext/indexsidebar.html b/Doc/tools/sphinxext/indexsidebar.html
--- a/Doc/tools/sphinxext/indexsidebar.html
+++ b/Doc/tools/sphinxext/indexsidebar.html
@@ -3,7 +3,7 @@
 	    <h3>Docs for other versions</h3>
 	    <ul>
 	      <li><a href="http://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
-	      <li><a href="http://docs.python.org/3.2/">Python 3.2 (stable)</a></li>
+	      <li><a href="http://docs.python.org/3.4/">Python 3.4 (in development)</a></li>
               <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
             </ul>
 
diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
--- a/Doc/tools/sphinxext/layout.html
+++ b/Doc/tools/sphinxext/layout.html
@@ -8,6 +8,23 @@
 {% block extrahead %}
     <link rel="shortcut icon" type="image/png" href="{{ pathto('_static/py.png', 1) }}" />
     {% if not embedded %}<script type="text/javascript" src="{{ pathto('_static/copybutton.js', 1) }}"></script>{% endif %}
+    {% if pagename == 'whatsnew/news' %}
+    <script type="text/javascript">
+      function dofilter() {
+        var el = document.getElementById('searchbox');
+        var string = el.value.toLowerCase();
+        var litags = document.getElementsByTagName('li')
+        for (var idx = 0; idx < litags.length; idx++) {
+          var li = litags[idx];
+          if (li.innerHTML.toLowerCase().indexOf(string) >= 0) {
+            li.style.display = '';
+          } else {
+            li.style.display = 'none';
+          }
+        }
+      }
+    </script>
+    {% endif %}
 {{ super() }}
 {% endblock %}
 {% block footer %}
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -145,6 +145,45 @@
         return ret
 
 
+# Support for including Misc/NEWS
+
+import re
+import codecs
+from docutils.statemachine import string2lines
+from sphinx.util.nodes import nested_parse_with_titles
+
+issue_re = re.compile('Issue #([0-9]+)')
+
+class MiscNews(Directive):
+    has_content = False
+    required_arguments = 1
+    optional_arguments = 0
+    final_argument_whitespace = False
+    option_spec = {}
+
+    def run(self):
+        fname = self.arguments[0]
+        source = self.state_machine.input_lines.source(
+            self.lineno - self.state_machine.input_offset - 1)
+        source_dir = path.dirname(path.abspath(source))
+        try:
+            fp = codecs.open(path.join(source_dir, fname), encoding='utf-8')
+            try:
+                content = fp.read()
+            finally:
+                fp.close()
+        except Exception:
+            text = 'The NEWS file is not available.'
+            node = nodes.strong(text, text)
+            return [node]
+        content = issue_re.sub(r'`Issue #\1 <http://bugs.python.org/\1>`__',
+                               content)
+        # remove first 3 lines as they are the main heading
+        lines = content.splitlines()[3:]
+        self.state_machine.insert_input(lines, fname)
+        return []
+
+
 # Support for building "topic help" for pydoc
 
 pydoc_topic_labels = [
@@ -276,3 +315,4 @@
     app.add_description_unit('2to3fixer', '2to3fixer', '%s (2to3 fixer)')
     app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction)
     app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod)
+    app.add_directive('miscnews', MiscNews)
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -132,6 +132,8 @@
       Setting Environment variables, Louis J. Farrugia
 
 
+.. _windows-path-mod:
+
 Finding the Python executable
 -----------------------------
 
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -51,7 +51,7 @@
 
 .. seealso::
 
-    :pep:`398` - Python 3.2 Release Schedule
+    :pep:`398` - Python 3.3 Release Schedule
 
 
 Summary -- Release highlights
@@ -289,6 +289,43 @@
       and Martin von L?wis.
 
 
+.. _pep-397:
+
+PEP 397: Python Launcher for Windows
+====================================
+
+The Python 3.3 Windows installer now includes a ``py`` launcher application
+that can be used to launch Python applications in a version independent
+fashion.
+
+This launcher is invoked implicitly when double-clicking ``*.py`` files.
+If only a single Python version is installed on the system, that version
+will be used to run the file. If multiple versions are installed, the most
+recent version is used by default, but this can be overridden by including
+a Unix-style "shebang line" in the Python script.
+
+The launcher can also be used explicitly from the command line as the ``py``
+application. Running ``py`` follows the same version selection rules as
+implicitly launching scripts, but a more specific version can be selected
+by passing appropriate arguments (such as ``-3`` to request Python 3 when
+Python 2 is also installed, or ``-2.6`` to specifclly request an earlier
+Python version when a more recent version is installed).
+
+In addition to the launcher, the Windows installer now includes an
+option to add the newly installed Python to the system PATH (contributed
+by Brian Curtain in :issue:`3561`).
+
+.. seealso::
+
+   :pep:`397` - Python Launcher for Windows
+      PEP written by Mark Hammond and Martin v. L?wis; implementation by
+      Vinay Sajip.
+
+   Launcher documentation: :ref:`launcher`
+
+   Installer PATH modification: :ref:`windows-path-mod`
+
+
 .. _pep-3151:
 
 PEP 3151: Reworking the OS and IO exception hierarchy
@@ -2102,6 +2139,22 @@
   special case the standard import hooks so they are still supported even
   though they do not provide the non-standard ``iter_modules()`` method.
 
+* A longstanding RFC-compliance bug (:issue:`1079`) in the parsing done by
+  :func:`email.header.decode_header` has been fixed.  Code that uses the
+  standard idiom to convert encoded headers into unicode
+  (``str(make_header(decode_header(h))``) will see no change, but code that
+  looks at the individual tuples returned by decode_header will see that
+  whitespace that precedes or follows ``ASCII`` sections is now included in the
+  ``ASCII`` section.  Code that builds headers using ``make_header`` should
+  also continue to work without change, since ``make_header`` continues to add
+  whitespace between ``ASCII`` and non-``ASCII`` sections if it is not already
+  present in the input strings.
+
+* :func:`email.utils.formataddr` now does the correct content transfer
+  encoding when passed non-``ASCII`` display names.  Any code that depended on
+  the previous buggy behavior that preserved the non-``ASCII`` unicode in the
+  formatted output string will need to be changed.
+
 
 Porting C code
 --------------
diff --git a/Doc/whatsnew/index.rst b/Doc/whatsnew/index.rst
--- a/Doc/whatsnew/index.rst
+++ b/Doc/whatsnew/index.rst
@@ -23,3 +23,11 @@
    2.2.rst
    2.1.rst
    2.0.rst
+
+The "Python News" is a HTML version of the file :source:`Misc/NEWS` which
+contains *all* nontrivial changes to Python.
+
+.. toctree::
+   :maxdepth: 1
+
+   news.rst
diff --git a/Doc/whatsnew/news.rst b/Doc/whatsnew/news.rst
new file mode 100644
--- /dev/null
+++ b/Doc/whatsnew/news.rst
@@ -0,0 +1,14 @@
++++++++++++
+Python News
++++++++++++
+
+.. raw:: html
+
+   <p>
+   Filter entries by content:
+   <input type="text" value="" id="searchbox" style="width: 50%" onchange="dofilter()">
+   <input type="submit" value="Filter" onclick="dofilter()">
+   </p>
+
+.. miscnews:: ../../Misc/NEWS
+
diff --git a/Lib/bz2.py b/Lib/bz2.py
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -79,7 +79,8 @@
             mode = "rb"
             mode_code = _MODE_READ
             self._decompressor = BZ2Decompressor()
-            self._buffer = None
+            self._buffer = b""
+            self._buffer_offset = 0
         elif mode in ("w", "wb"):
             mode = "wb"
             mode_code = _MODE_WRITE
@@ -124,7 +125,8 @@
                     self._fp = None
                     self._closefp = False
                     self._mode = _MODE_CLOSED
-                    self._buffer = None
+                    self._buffer = b""
+                    self._buffer_offset = 0
 
     @property
     def closed(self):
@@ -174,16 +176,13 @@
 
     # Fill the readahead buffer if it is empty. Returns False on EOF.
     def _fill_buffer(self):
+        if self._mode == _MODE_READ_EOF:
+            return False
         # Depending on the input data, our call to the decompressor may not
         # return any data. In this case, try again after reading another block.
-        while True:
-            if self._buffer:
-                return True
-
-            if self._decompressor.unused_data:
-                rawblock = self._decompressor.unused_data
-            else:
-                rawblock = self._fp.read(_BUFFER_SIZE)
+        while self._buffer_offset == len(self._buffer):
+            rawblock = (self._decompressor.unused_data or
+                        self._fp.read(_BUFFER_SIZE))
 
             if not rawblock:
                 if self._decompressor.eof:
@@ -199,30 +198,48 @@
                 self._decompressor = BZ2Decompressor()
 
             self._buffer = self._decompressor.decompress(rawblock)
+            self._buffer_offset = 0
+        return True
 
     # Read data until EOF.
     # If return_data is false, consume the data without returning it.
     def _read_all(self, return_data=True):
+        # The loop assumes that _buffer_offset is 0. Ensure that this is true.
+        self._buffer = self._buffer[self._buffer_offset:]
+        self._buffer_offset = 0
+
         blocks = []
         while self._fill_buffer():
             if return_data:
                 blocks.append(self._buffer)
             self._pos += len(self._buffer)
-            self._buffer = None
+            self._buffer = b""
         if return_data:
             return b"".join(blocks)
 
     # Read a block of up to n bytes.
     # If return_data is false, consume the data without returning it.
     def _read_block(self, n, return_data=True):
+        # If we have enough data buffered, return immediately.
+        end = self._buffer_offset + n
+        if end <= len(self._buffer):
+            data = self._buffer[self._buffer_offset : end]
+            self._buffer_offset = end
+            self._pos += len(data)
+            return data if return_data else None
+
+        # The loop assumes that _buffer_offset is 0. Ensure that this is true.
+        self._buffer = self._buffer[self._buffer_offset:]
+        self._buffer_offset = 0
+
         blocks = []
         while n > 0 and self._fill_buffer():
             if n < len(self._buffer):
                 data = self._buffer[:n]
-                self._buffer = self._buffer[n:]
+                self._buffer_offset = n
             else:
                 data = self._buffer
-                self._buffer = None
+                self._buffer = b""
             if return_data:
                 blocks.append(data)
             self._pos += len(data)
@@ -238,9 +255,9 @@
         """
         with self._lock:
             self._check_can_read()
-            if self._mode == _MODE_READ_EOF or not self._fill_buffer():
+            if not self._fill_buffer():
                 return b""
-            return self._buffer
+            return self._buffer[self._buffer_offset:]
 
     def read(self, size=-1):
         """Read up to size uncompressed bytes from the file.
@@ -250,7 +267,7 @@
         """
         with self._lock:
             self._check_can_read()
-            if self._mode == _MODE_READ_EOF or size == 0:
+            if size == 0:
                 return b""
             elif size < 0:
                 return self._read_all()
@@ -268,15 +285,19 @@
         # In this case we make multiple reads, to avoid returning b"".
         with self._lock:
             self._check_can_read()
-            if (size == 0 or self._mode == _MODE_READ_EOF or
-                not self._fill_buffer()):
+            if (size == 0 or
+                # Only call _fill_buffer() if the buffer is actually empty.
+                # This gives a significant speedup if *size* is small.
+                (self._buffer_offset == len(self._buffer) and not self._fill_buffer())):
                 return b""
-            if 0 < size < len(self._buffer):
-                data = self._buffer[:size]
-                self._buffer = self._buffer[size:]
+            if size > 0:
+                data = self._buffer[self._buffer_offset :
+                                    self._buffer_offset + size]
+                self._buffer_offset += len(data)
             else:
-                data = self._buffer
-                self._buffer = None
+                data = self._buffer[self._buffer_offset:]
+                self._buffer = b""
+                self._buffer_offset = 0
             self._pos += len(data)
             return data
 
@@ -299,6 +320,14 @@
             raise TypeError("Integer argument expected")
         size = size.__index__()
         with self._lock:
+            # Shortcut for the common case - the whole line is in the buffer.
+            if size < 0:
+                end = self._buffer.find(b"\n", self._buffer_offset) + 1
+                if end > 0:
+                    line = self._buffer[self._buffer_offset : end]
+                    self._buffer_offset = end
+                    self._pos += len(line)
+                    return line
             return io.BufferedIOBase.readline(self, size)
 
     def readlines(self, size=-1):
@@ -345,7 +374,8 @@
         self._mode = _MODE_READ
         self._pos = 0
         self._decompressor = BZ2Decompressor()
-        self._buffer = None
+        self._buffer = b""
+        self._buffer_offset = 0
 
     def seek(self, offset, whence=0):
         """Change the file position.
@@ -385,8 +415,7 @@
                 offset -= self._pos
 
             # Read and discard data until we reach the desired position.
-            if self._mode != _MODE_READ_EOF:
-                self._read_block(offset, return_data=False)
+            self._read_block(offset, return_data=False)
 
             return self._pos
 
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1,4 +1,5 @@
 import unittest
+from test import script_helper
 from test import support
 import subprocess
 import sys
@@ -191,15 +192,101 @@
         p.wait()
         self.assertEqual(p.stderr, None)
 
+    # For use in the test_cwd* tests below.
+    def _normalize_cwd(self, cwd):
+        # Normalize an expected cwd (for Tru64 support).
+        # We can't use os.path.realpath since it doesn't expand Tru64 {memb}
+        # strings.  See bug #1063571.
+        original_cwd = os.getcwd()
+        os.chdir(cwd)
+        cwd = os.getcwd()
+        os.chdir(original_cwd)
+        return cwd
+
+    # For use in the test_cwd* tests below.
+    def _split_python_path(self):
+        # Return normalized (python_dir, python_base).
+        python_path = os.path.realpath(sys.executable)
+        return os.path.split(python_path)
+
+    # For use in the test_cwd* tests below.
+    def _assert_cwd(self, expected_cwd, python_arg, **kwargs):
+        # Invoke Python via Popen, and assert that (1) the call succeeds,
+        # and that (2) the current working directory of the child process
+        # matches *expected_cwd*.
+        p = subprocess.Popen([python_arg, "-c",
+                              "import os, sys; "
+                              "sys.stdout.write(os.getcwd()); "
+                              "sys.exit(47)"],
+                              stdout=subprocess.PIPE,
+                              **kwargs)
+        self.addCleanup(p.stdout.close)
+        p.wait()
+        self.assertEqual(47, p.returncode)
+        normcase = os.path.normcase
+        self.assertEqual(normcase(expected_cwd),
+                         normcase(p.stdout.read().decode("utf-8")))
+
+    def test_cwd(self):
+        # Check that cwd changes the cwd for the child process.
+        temp_dir = tempfile.gettempdir()
+        temp_dir = self._normalize_cwd(temp_dir)
+        self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir)
+
+    def test_cwd_with_relative_arg(self):
+        # Check that Popen looks for args[0] relative to cwd if args[0]
+        # is relative.
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python])
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, rel_python, cwd=python_dir)
+
+    def test_cwd_with_relative_executable(self):
+        # Check that Popen looks for executable relative to cwd if executable
+        # is relative (and that executable takes precedence over args[0]).
+        python_dir, python_base = self._split_python_path()
+        rel_python = os.path.join(os.curdir, python_base)
+        doesntexist = "somethingyoudonthave"
+        with support.temp_cwd() as wrong_dir:
+            # Before calling with the correct cwd, confirm that the call fails
+            # without cwd and with the wrong cwd.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [doesntexist], executable=rel_python)
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [doesntexist], executable=rel_python,
+                              cwd=wrong_dir)
+            python_dir = self._normalize_cwd(python_dir)
+            self._assert_cwd(python_dir, doesntexist, executable=rel_python,
+                             cwd=python_dir)
+
+    def test_cwd_with_absolute_arg(self):
+        # Check that Popen can find the executable when the cwd is wrong
+        # if args[0] is an absolute path.
+        python_dir, python_base = self._split_python_path()
+        abs_python = os.path.join(python_dir, python_base)
+        rel_python = os.path.join(os.curdir, python_base)
+        with script_helper.temp_dir() as wrong_dir:
+            # Before calling with an absolute path, confirm that using a
+            # relative path fails.
+            self.assertRaises(FileNotFoundError, subprocess.Popen,
+                              [rel_python], cwd=wrong_dir)
+            wrong_dir = self._normalize_cwd(wrong_dir)
+            self._assert_cwd(wrong_dir, abs_python, cwd=wrong_dir)
+
     @unittest.skipIf(sys.base_prefix != sys.prefix,
                      'Test is not venv-compatible')
     def test_executable_with_cwd(self):
-        python_dir = os.path.dirname(os.path.realpath(sys.executable))
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable, cwd=python_dir)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        python_dir, python_base = self._split_python_path()
+        python_dir = self._normalize_cwd(python_dir)
+        self._assert_cwd(python_dir, "somethingyoudonthave",
+                         executable=sys.executable, cwd=python_dir)
 
     @unittest.skipIf(sys.base_prefix != sys.prefix,
                      'Test is not venv-compatible')
@@ -208,11 +295,7 @@
     def test_executable_without_cwd(self):
         # For a normal installation, it should work without 'cwd'
         # argument.  For test runs in the build directory, see #7774.
-        p = subprocess.Popen(["somethingyoudonthave", "-c",
-                              "import sys; sys.exit(47)"],
-                             executable=sys.executable)
-        p.wait()
-        self.assertEqual(p.returncode, 47)
+        self._assert_cwd('', "somethingyoudonthave", executable=sys.executable)
 
     def test_stdin_pipe(self):
         # stdin redirection
@@ -369,24 +452,6 @@
         p.wait()
         self.assertEqual(p.stdin, None)
 
-    def test_cwd(self):
-        tmpdir = tempfile.gettempdir()
-        # We cannot use os.path.realpath to canonicalize the path,
-        # since it doesn't expand Tru64 {memb} strings. See bug 1063571.
-        cwd = os.getcwd()
-        os.chdir(tmpdir)
-        tmpdir = os.getcwd()
-        os.chdir(cwd)
-        p = subprocess.Popen([sys.executable, "-c",
-                              'import sys,os;'
-                              'sys.stdout.write(os.getcwd())'],
-                             stdout=subprocess.PIPE,
-                             cwd=tmpdir)
-        self.addCleanup(p.stdout.close)
-        normcase = os.path.normcase
-        self.assertEqual(normcase(p.stdout.read().decode("utf-8")),
-                         normcase(tmpdir))
-
     def test_env(self):
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,13 +10,117 @@
 Core and Builtins
 -----------------
 
+- Issue #15379: Fix passing of non-BMP characters as integers for the charmap
+  decoder (already working as unicode strings).  Patch by Serhiy Storchaka.
+
+- Issue #15144: Fix possible integer overflow when handling pointers as
+  integer values, by using Py_uintptr_t instead of size_t.  Patch by
+  Serhiy Storchaka.
+
+- Issue #15965: Explicitly cast AT_FDCWD as (int).  Required on Solaris 10
+  (which defines AT_FDCWD as 0xffd19553), harmless on other platforms.
+
+- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
+
+- Issue #15846: Fix SystemError which happened when using ast.parse in an
+  exception handler on code with syntax errors.
+
+- Issue #15801: Make sure mappings passed to '%' formatting are actually
+  subscriptable.
+
+
 Library
 -------
 
+- Issue #16034: Fix performance regressions in the new BZ2File implementation.
+  Initial patch by Serhiy Storchaka.
+
 - Issue #15756: subprocess.poll() now properly handles errno.ECHILD to
   return a returncode of 0 when the child has already exited or cannot
   be waited on.
 
+- Issue #15323: improve failure message of Mock.assert_called_once_with
+
+- Issue #16064: unittest -m claims executable is "python", not "python3"
+
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
+- Issue #15222: Insert blank line after each message in mbox mailboxes
+
+- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
+  Patch by Serhiy Storchaka.
+
+- Issue #15421: Fix an OverflowError in Calendar.itermonthdates() after
+  datetime.MAXYEAR.  Patch by C?dric Krier.
+
+- Issue #15970: xml.etree.ElementTree now serializes correctly the empty HTML
+  elements 'meta' and 'param'.
+
+- Issue #15842: The SocketIO.{readable,writable,seekable} methods now
+  raise ValueError when the file-like object is closed.  Patch by Alessandro
+  Moura.
+
+- Issue #15876: Fix a refleak in the curses module: window.encoding.
+
+- Issue #15881: Fixed atexit hook in multiprocessing.  Original patch
+  by Chris McDonough.
+
+- Issue #15841: The readable(), writable() and seekable() methods of BytesIO
+  and StringIO objects now raise ValueError when the object has been closed.
+  Patch by Alessandro Moura.
+
+- Issue #15447: Use subprocess.DEVNULL in webbrowser, instead of opening
+  os.devnull explicitly and leaving it open.
+
+- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
+  Popen when %action substitutions produce empty strings.
+
+- Issues #12776, #11839: call argparse type function (specified by add_argument)
+  only once. Before, the type function was called twice in the case where the
+  default was specified and the argument was given as well.  This was especially
+  problematic for the FileType type, as a default file would always be opened,
+  even if a file argument was specified on the command line.
+
+- Issue #15906: Fix a regression in argparse caused by the preceding change,
+  when action='append', type='str' and default=[].
+
+Tests
+-----
+
+- Issue #15304: Fix warning message when os.chdir() fails inside
+  test.support.temp_cwd().  Patch by Chris Jerdonek.
+
+- Issue #15802: Fix test logic in TestMaildir.test_create_tmp. Patch
+  by Serhiy Storchaka.
+
+- Issue #15557: Added a test suite for the webbrowser module, thanks
+  to Anton Barkovsky.
+
+Build
+-----
+
+- Issue #15819: Make sure we can build Python out-of-tree from a readonly
+  source directory.  (Somewhat related to Issue #9860.)
+
+Documentation
+-------------
+
+- Issue #15533: Clarify docs and add tests for subprocess.Popen()'s cwd
+  argument.
+
+- Issue #16036: Improve documentation of built-in int()'s signature and
+  arguments.
+
+- Issue #15935: Clarification of argparse docs, re: add_argument() type and
+  default arguments.  Patch contributed by Chris Jerdonek.
+
+- Issue #11964: Document a change in v3.2 to the behavior of the indent
+  parameter of json encoding operations.
+
+Tools/Demos
+-----------
+
+
 
 What's New in Python 3.3.0?
 ===========================
@@ -560,9 +664,10 @@
 - Issue #12605: The gdb hooks for debugging CPython (within Tools/gdb) have been
   enhanced to show information on more C frames relevant to CPython within the
   "py-bt" and "py-bt-full" commands:
-    * C frames that are waiting on the GIL
-    * C frames that are garbage-collecting
-    * C frames that are due to the invocation of a PyCFunction
+
+  * C frames that are waiting on the GIL
+  * C frames that are garbage-collecting
+  * C frames that are due to the invocation of a PyCFunction
 
 Documentation
 -------------
diff --git a/Modules/_decimal/tests/bench.py b/Modules/_decimal/tests/bench.py
--- a/Modules/_decimal/tests/bench.py
+++ b/Modules/_decimal/tests/bench.py
@@ -18,8 +18,13 @@
 C = import_fresh_module('decimal', fresh=['_decimal'])
 P = import_fresh_module('decimal', blocked=['_decimal'])
 
-
-# Pi function from the decimal.py documentation
+#
+# NOTE: This is the pi function from the decimal documentation, modified
+# for benchmarking purposes. Since floats do not have a context, the higher
+# intermediate precision from the original is NOT used, so the modified
+# algorithm only gives an approximation to the correctly rounded result.
+# For serious use, refer to the documentation or the appropriate literature.
+#
 def pi_float():
     """native float"""
     lasts, t, s, n, na, d, da = 0, 3.0, 3, 1, 0, 0, 24

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 17:25:56 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 17:25:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XV9SN4wYhzNBf@mail.python.org>

http://hg.python.org/cpython/rev/8cde24557d4a
changeset:   79327:8cde24557d4a
parent:      79325:3384077a9906
parent:      79326:3d10897fef9b
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 17:17:36 2012 +0200
summary:
  Merge 3.3.

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 17:29:56 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 17:29:56 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Revert_29506c7?=
 =?utf-8?q?db353_=28build_output_should_be_accurate=29=2E?=
Message-ID: <3XV9Y06wH7zNJV@mail.python.org>

http://hg.python.org/cpython/rev/d835fb9d1658
changeset:   79328:d835fb9d1658
branch:      3.3
parent:      79326:3d10897fef9b
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 17:20:47 2012 +0200
summary:
  Revert 29506c7db353 (build output should be accurate).

files:
  Modules/_decimal/libmpdec/mpdecimal.h |  5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
--- a/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/Modules/_decimal/libmpdec/mpdecimal.h
@@ -106,11 +106,6 @@
   #endif
 #endif
 
-/* ASM isn't available in strict ansi C mode */
-#if defined(ASM) && defined(__STRICT_ANSI__)
-  #undef ASM
-  #define ANSI
-#endif
 
 /* BEGIN CONFIG_64 */
 #if defined(CONFIG_64)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 17:30:02 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 17:30:02 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XV9Y6158tzPjZ@mail.python.org>

http://hg.python.org/cpython/rev/a531781e511a
changeset:   79329:a531781e511a
parent:      79327:8cde24557d4a
parent:      79328:d835fb9d1658
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 17:21:49 2012 +0200
summary:
  Merge 3.3.

files:
  Modules/_decimal/libmpdec/mpdecimal.h |  5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)


diff --git a/Modules/_decimal/libmpdec/mpdecimal.h b/Modules/_decimal/libmpdec/mpdecimal.h
--- a/Modules/_decimal/libmpdec/mpdecimal.h
+++ b/Modules/_decimal/libmpdec/mpdecimal.h
@@ -106,11 +106,6 @@
   #endif
 #endif
 
-/* ASM isn't available in strict ansi C mode */
-#if defined(ASM) && defined(__STRICT_ANSI__)
-  #undef ASM
-  #define ANSI
-#endif
 
 /* BEGIN CONFIG_64 */
 #if defined(CONFIG_64)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 17:44:23 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 17:44:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4zKTogU3VwcG9ydCBnY2Mn?=
 =?utf-8?b?cyAtYW5zaSBmbGFnOiB1c2UgIl9fYXNtX18iIGluc3RlYWQgb2YgImFzbSIu?=
Message-ID: <3XV9sg69wvzMRP@mail.python.org>

http://hg.python.org/cpython/rev/fd8d3abab1c6
changeset:   79330:fd8d3abab1c6
branch:      3.3
parent:      79328:d835fb9d1658
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 17:31:04 2012 +0200
summary:
  Support gcc's -ansi flag: use "__asm__" instead of "asm".

files:
  Modules/_decimal/libmpdec/typearith.h |   32 +-
  Modules/_decimal/libmpdec/umodarith.h |  156 +++++++-------
  2 files changed, 94 insertions(+), 94 deletions(-)


diff --git a/Modules/_decimal/libmpdec/typearith.h b/Modules/_decimal/libmpdec/typearith.h
--- a/Modules/_decimal/libmpdec/typearith.h
+++ b/Modules/_decimal/libmpdec/typearith.h
@@ -207,10 +207,10 @@
 {
     mpd_uint_t h, l;
 
-    asm ( "mulq %3\n\t"
-          : "=d" (h), "=a" (l)
-          : "%a" (a), "rm" (b)
-          : "cc"
+    __asm__ ( "mulq %3\n\t"
+              : "=d" (h), "=a" (l)
+              : "%a" (a), "rm" (b)
+              : "cc"
     );
 
     *hi = h;
@@ -223,10 +223,10 @@
 {
     mpd_uint_t qq, rr;
 
-    asm ( "divq %4\n\t"
-          : "=a" (qq), "=d" (rr)
-          : "a" (lo), "d" (hi), "rm" (d)
-          : "cc"
+    __asm__ ( "divq %4\n\t"
+              : "=a" (qq), "=d" (rr)
+              : "a" (lo), "d" (hi), "rm" (d)
+              : "cc"
     );
 
     *q = qq;
@@ -464,10 +464,10 @@
 {
     mpd_uint_t h, l;
 
-    asm ( "mull %3\n\t"
-          : "=d" (h), "=a" (l)
-          : "%a" (a), "rm" (b)
-          : "cc"
+    __asm__ ( "mull %3\n\t"
+              : "=d" (h), "=a" (l)
+              : "%a" (a), "rm" (b)
+              : "cc"
     );
 
     *hi = h;
@@ -480,10 +480,10 @@
 {
     mpd_uint_t qq, rr;
 
-    asm ( "divl %4\n\t"
-          : "=a" (qq), "=d" (rr)
-          : "a" (lo), "d" (hi), "rm" (d)
-          : "cc"
+    __asm__ ( "divl %4\n\t"
+              : "=a" (qq), "=d" (rr)
+              : "a" (lo), "d" (hi), "rm" (d)
+              : "cc"
     );
 
     *q = qq;
diff --git a/Modules/_decimal/libmpdec/umodarith.h b/Modules/_decimal/libmpdec/umodarith.h
--- a/Modules/_decimal/libmpdec/umodarith.h
+++ b/Modules/_decimal/libmpdec/umodarith.h
@@ -402,22 +402,22 @@
 {
     mpd_uint_t retval;
 
-    asm (
-        "fildl  %2\n\t"
-        "fildl  %1\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fldt   (%4)\n\t"
-        "fmul   %%st(1), %%st\n\t"
-        "flds   %5\n\t"
-        "fadd   %%st, %%st(1)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fldl   (%3)\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fistpl %0\n\t"
-        : "=m" (retval)
-        : "m" (a), "m" (b), "r" (dmod), "r" (dinvmod), "m" (MPD_TWO63)
-        : "st", "memory"
+    __asm__ (
+            "fildl  %2\n\t"
+            "fildl  %1\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fldt   (%4)\n\t"
+            "fmul   %%st(1), %%st\n\t"
+            "flds   %5\n\t"
+            "fadd   %%st, %%st(1)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fldl   (%3)\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fistpl %0\n\t"
+            : "=m" (retval)
+            : "m" (a), "m" (b), "r" (dmod), "r" (dinvmod), "m" (MPD_TWO63)
+            : "st", "memory"
     );
 
     return retval;
@@ -432,33 +432,33 @@
 ppro_mulmod2c(mpd_uint_t *a0, mpd_uint_t *a1, mpd_uint_t w,
               double *dmod, uint32_t *dinvmod)
 {
-    asm (
-        "fildl  %2\n\t"
-        "fildl  (%1)\n\t"
-        "fmul   %%st(1), %%st\n\t"
-        "fxch   %%st(1)\n\t"
-        "fildl  (%0)\n\t"
-        "fmulp  %%st, %%st(1) \n\t"
-        "fldt   (%4)\n\t"
-        "flds   %5\n\t"
-        "fld    %%st(2)\n\t"
-        "fmul   %%st(2)\n\t"
-        "fadd   %%st(1)\n\t"
-        "fsub   %%st(1)\n\t"
-        "fmull  (%3)\n\t"
-        "fsubrp %%st, %%st(3)\n\t"
-        "fxch   %%st(2)\n\t"
-        "fistpl (%0)\n\t"
-        "fmul   %%st(2)\n\t"
-        "fadd   %%st(1)\n\t"
-        "fsubp  %%st, %%st(1)\n\t"
-        "fmull  (%3)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fistpl (%1)\n\t"
-        : : "r" (a0), "r" (a1), "m" (w),
-            "r" (dmod), "r" (dinvmod),
-            "m" (MPD_TWO63)
-        : "st", "memory"
+    __asm__ (
+            "fildl  %2\n\t"
+            "fildl  (%1)\n\t"
+            "fmul   %%st(1), %%st\n\t"
+            "fxch   %%st(1)\n\t"
+            "fildl  (%0)\n\t"
+            "fmulp  %%st, %%st(1) \n\t"
+            "fldt   (%4)\n\t"
+            "flds   %5\n\t"
+            "fld    %%st(2)\n\t"
+            "fmul   %%st(2)\n\t"
+            "fadd   %%st(1)\n\t"
+            "fsub   %%st(1)\n\t"
+            "fmull  (%3)\n\t"
+            "fsubrp %%st, %%st(3)\n\t"
+            "fxch   %%st(2)\n\t"
+            "fistpl (%0)\n\t"
+            "fmul   %%st(2)\n\t"
+            "fadd   %%st(1)\n\t"
+            "fsubp  %%st, %%st(1)\n\t"
+            "fmull  (%3)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fistpl (%1)\n\t"
+            : : "r" (a0), "r" (a1), "m" (w),
+                "r" (dmod), "r" (dinvmod),
+                "m" (MPD_TWO63)
+            : "st", "memory"
     );
 }
 
@@ -471,41 +471,41 @@
 ppro_mulmod2(mpd_uint_t *a0, mpd_uint_t b0, mpd_uint_t *a1, mpd_uint_t b1,
              double *dmod, uint32_t *dinvmod)
 {
-    asm (
-        "fildl  %3\n\t"
-        "fildl  (%2)\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fildl  %1\n\t"
-        "fildl  (%0)\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fldt   (%5)\n\t"
-        "fld    %%st(2)\n\t"
-        "fmul   %%st(1), %%st\n\t"
-        "fxch   %%st(1)\n\t"
-        "fmul   %%st(2), %%st\n\t"
-        "flds   %6\n\t"
-        "fldl   (%4)\n\t"
-        "fxch   %%st(3)\n\t"
-        "fadd   %%st(1), %%st\n\t"
-        "fxch   %%st(2)\n\t"
-        "fadd   %%st(1), %%st\n\t"
-        "fxch   %%st(2)\n\t"
-        "fsub   %%st(1), %%st\n\t"
-        "fxch   %%st(2)\n\t"
-        "fsubp  %%st, %%st(1)\n\t"
-        "fxch   %%st(1)\n\t"
-        "fmul   %%st(2), %%st\n\t"
-        "fxch   %%st(1)\n\t"
-        "fmulp  %%st, %%st(2)\n\t"
-        "fsubrp %%st, %%st(3)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fxch   %%st(1)\n\t"
-        "fistpl (%2)\n\t"
-        "fistpl (%0)\n\t"
-        : : "r" (a0), "m" (b0), "r" (a1), "m" (b1),
-            "r" (dmod), "r" (dinvmod),
-            "m" (MPD_TWO63)
-        : "st", "memory"
+    __asm__ (
+            "fildl  %3\n\t"
+            "fildl  (%2)\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fildl  %1\n\t"
+            "fildl  (%0)\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fldt   (%5)\n\t"
+            "fld    %%st(2)\n\t"
+            "fmul   %%st(1), %%st\n\t"
+            "fxch   %%st(1)\n\t"
+            "fmul   %%st(2), %%st\n\t"
+            "flds   %6\n\t"
+            "fldl   (%4)\n\t"
+            "fxch   %%st(3)\n\t"
+            "fadd   %%st(1), %%st\n\t"
+            "fxch   %%st(2)\n\t"
+            "fadd   %%st(1), %%st\n\t"
+            "fxch   %%st(2)\n\t"
+            "fsub   %%st(1), %%st\n\t"
+            "fxch   %%st(2)\n\t"
+            "fsubp  %%st, %%st(1)\n\t"
+            "fxch   %%st(1)\n\t"
+            "fmul   %%st(2), %%st\n\t"
+            "fxch   %%st(1)\n\t"
+            "fmulp  %%st, %%st(2)\n\t"
+            "fsubrp %%st, %%st(3)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fxch   %%st(1)\n\t"
+            "fistpl (%2)\n\t"
+            "fistpl (%0)\n\t"
+            : : "r" (a0), "m" (b0), "r" (a1), "m" (b1),
+                "r" (dmod), "r" (dinvmod),
+                "m" (MPD_TWO63)
+            : "st", "memory"
     );
 }
 /* END PPRO GCC ASM */

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 17:44:25 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 17:44:25 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?b?KTogTWVyZ2UgMy4zLg==?=
Message-ID: <3XV9sj2VdvzNTS@mail.python.org>

http://hg.python.org/cpython/rev/07d9d2901adb
changeset:   79331:07d9d2901adb
parent:      79329:a531781e511a
parent:      79330:fd8d3abab1c6
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 17:35:57 2012 +0200
summary:
  Merge 3.3.

files:
  Modules/_decimal/libmpdec/typearith.h |   32 +-
  Modules/_decimal/libmpdec/umodarith.h |  156 +++++++-------
  2 files changed, 94 insertions(+), 94 deletions(-)


diff --git a/Modules/_decimal/libmpdec/typearith.h b/Modules/_decimal/libmpdec/typearith.h
--- a/Modules/_decimal/libmpdec/typearith.h
+++ b/Modules/_decimal/libmpdec/typearith.h
@@ -207,10 +207,10 @@
 {
     mpd_uint_t h, l;
 
-    asm ( "mulq %3\n\t"
-          : "=d" (h), "=a" (l)
-          : "%a" (a), "rm" (b)
-          : "cc"
+    __asm__ ( "mulq %3\n\t"
+              : "=d" (h), "=a" (l)
+              : "%a" (a), "rm" (b)
+              : "cc"
     );
 
     *hi = h;
@@ -223,10 +223,10 @@
 {
     mpd_uint_t qq, rr;
 
-    asm ( "divq %4\n\t"
-          : "=a" (qq), "=d" (rr)
-          : "a" (lo), "d" (hi), "rm" (d)
-          : "cc"
+    __asm__ ( "divq %4\n\t"
+              : "=a" (qq), "=d" (rr)
+              : "a" (lo), "d" (hi), "rm" (d)
+              : "cc"
     );
 
     *q = qq;
@@ -464,10 +464,10 @@
 {
     mpd_uint_t h, l;
 
-    asm ( "mull %3\n\t"
-          : "=d" (h), "=a" (l)
-          : "%a" (a), "rm" (b)
-          : "cc"
+    __asm__ ( "mull %3\n\t"
+              : "=d" (h), "=a" (l)
+              : "%a" (a), "rm" (b)
+              : "cc"
     );
 
     *hi = h;
@@ -480,10 +480,10 @@
 {
     mpd_uint_t qq, rr;
 
-    asm ( "divl %4\n\t"
-          : "=a" (qq), "=d" (rr)
-          : "a" (lo), "d" (hi), "rm" (d)
-          : "cc"
+    __asm__ ( "divl %4\n\t"
+              : "=a" (qq), "=d" (rr)
+              : "a" (lo), "d" (hi), "rm" (d)
+              : "cc"
     );
 
     *q = qq;
diff --git a/Modules/_decimal/libmpdec/umodarith.h b/Modules/_decimal/libmpdec/umodarith.h
--- a/Modules/_decimal/libmpdec/umodarith.h
+++ b/Modules/_decimal/libmpdec/umodarith.h
@@ -402,22 +402,22 @@
 {
     mpd_uint_t retval;
 
-    asm (
-        "fildl  %2\n\t"
-        "fildl  %1\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fldt   (%4)\n\t"
-        "fmul   %%st(1), %%st\n\t"
-        "flds   %5\n\t"
-        "fadd   %%st, %%st(1)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fldl   (%3)\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fistpl %0\n\t"
-        : "=m" (retval)
-        : "m" (a), "m" (b), "r" (dmod), "r" (dinvmod), "m" (MPD_TWO63)
-        : "st", "memory"
+    __asm__ (
+            "fildl  %2\n\t"
+            "fildl  %1\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fldt   (%4)\n\t"
+            "fmul   %%st(1), %%st\n\t"
+            "flds   %5\n\t"
+            "fadd   %%st, %%st(1)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fldl   (%3)\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fistpl %0\n\t"
+            : "=m" (retval)
+            : "m" (a), "m" (b), "r" (dmod), "r" (dinvmod), "m" (MPD_TWO63)
+            : "st", "memory"
     );
 
     return retval;
@@ -432,33 +432,33 @@
 ppro_mulmod2c(mpd_uint_t *a0, mpd_uint_t *a1, mpd_uint_t w,
               double *dmod, uint32_t *dinvmod)
 {
-    asm (
-        "fildl  %2\n\t"
-        "fildl  (%1)\n\t"
-        "fmul   %%st(1), %%st\n\t"
-        "fxch   %%st(1)\n\t"
-        "fildl  (%0)\n\t"
-        "fmulp  %%st, %%st(1) \n\t"
-        "fldt   (%4)\n\t"
-        "flds   %5\n\t"
-        "fld    %%st(2)\n\t"
-        "fmul   %%st(2)\n\t"
-        "fadd   %%st(1)\n\t"
-        "fsub   %%st(1)\n\t"
-        "fmull  (%3)\n\t"
-        "fsubrp %%st, %%st(3)\n\t"
-        "fxch   %%st(2)\n\t"
-        "fistpl (%0)\n\t"
-        "fmul   %%st(2)\n\t"
-        "fadd   %%st(1)\n\t"
-        "fsubp  %%st, %%st(1)\n\t"
-        "fmull  (%3)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fistpl (%1)\n\t"
-        : : "r" (a0), "r" (a1), "m" (w),
-            "r" (dmod), "r" (dinvmod),
-            "m" (MPD_TWO63)
-        : "st", "memory"
+    __asm__ (
+            "fildl  %2\n\t"
+            "fildl  (%1)\n\t"
+            "fmul   %%st(1), %%st\n\t"
+            "fxch   %%st(1)\n\t"
+            "fildl  (%0)\n\t"
+            "fmulp  %%st, %%st(1) \n\t"
+            "fldt   (%4)\n\t"
+            "flds   %5\n\t"
+            "fld    %%st(2)\n\t"
+            "fmul   %%st(2)\n\t"
+            "fadd   %%st(1)\n\t"
+            "fsub   %%st(1)\n\t"
+            "fmull  (%3)\n\t"
+            "fsubrp %%st, %%st(3)\n\t"
+            "fxch   %%st(2)\n\t"
+            "fistpl (%0)\n\t"
+            "fmul   %%st(2)\n\t"
+            "fadd   %%st(1)\n\t"
+            "fsubp  %%st, %%st(1)\n\t"
+            "fmull  (%3)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fistpl (%1)\n\t"
+            : : "r" (a0), "r" (a1), "m" (w),
+                "r" (dmod), "r" (dinvmod),
+                "m" (MPD_TWO63)
+            : "st", "memory"
     );
 }
 
@@ -471,41 +471,41 @@
 ppro_mulmod2(mpd_uint_t *a0, mpd_uint_t b0, mpd_uint_t *a1, mpd_uint_t b1,
              double *dmod, uint32_t *dinvmod)
 {
-    asm (
-        "fildl  %3\n\t"
-        "fildl  (%2)\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fildl  %1\n\t"
-        "fildl  (%0)\n\t"
-        "fmulp  %%st, %%st(1)\n\t"
-        "fldt   (%5)\n\t"
-        "fld    %%st(2)\n\t"
-        "fmul   %%st(1), %%st\n\t"
-        "fxch   %%st(1)\n\t"
-        "fmul   %%st(2), %%st\n\t"
-        "flds   %6\n\t"
-        "fldl   (%4)\n\t"
-        "fxch   %%st(3)\n\t"
-        "fadd   %%st(1), %%st\n\t"
-        "fxch   %%st(2)\n\t"
-        "fadd   %%st(1), %%st\n\t"
-        "fxch   %%st(2)\n\t"
-        "fsub   %%st(1), %%st\n\t"
-        "fxch   %%st(2)\n\t"
-        "fsubp  %%st, %%st(1)\n\t"
-        "fxch   %%st(1)\n\t"
-        "fmul   %%st(2), %%st\n\t"
-        "fxch   %%st(1)\n\t"
-        "fmulp  %%st, %%st(2)\n\t"
-        "fsubrp %%st, %%st(3)\n\t"
-        "fsubrp %%st, %%st(1)\n\t"
-        "fxch   %%st(1)\n\t"
-        "fistpl (%2)\n\t"
-        "fistpl (%0)\n\t"
-        : : "r" (a0), "m" (b0), "r" (a1), "m" (b1),
-            "r" (dmod), "r" (dinvmod),
-            "m" (MPD_TWO63)
-        : "st", "memory"
+    __asm__ (
+            "fildl  %3\n\t"
+            "fildl  (%2)\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fildl  %1\n\t"
+            "fildl  (%0)\n\t"
+            "fmulp  %%st, %%st(1)\n\t"
+            "fldt   (%5)\n\t"
+            "fld    %%st(2)\n\t"
+            "fmul   %%st(1), %%st\n\t"
+            "fxch   %%st(1)\n\t"
+            "fmul   %%st(2), %%st\n\t"
+            "flds   %6\n\t"
+            "fldl   (%4)\n\t"
+            "fxch   %%st(3)\n\t"
+            "fadd   %%st(1), %%st\n\t"
+            "fxch   %%st(2)\n\t"
+            "fadd   %%st(1), %%st\n\t"
+            "fxch   %%st(2)\n\t"
+            "fsub   %%st(1), %%st\n\t"
+            "fxch   %%st(2)\n\t"
+            "fsubp  %%st, %%st(1)\n\t"
+            "fxch   %%st(1)\n\t"
+            "fmul   %%st(2), %%st\n\t"
+            "fxch   %%st(1)\n\t"
+            "fmulp  %%st, %%st(2)\n\t"
+            "fsubrp %%st, %%st(3)\n\t"
+            "fsubrp %%st, %%st(1)\n\t"
+            "fxch   %%st(1)\n\t"
+            "fistpl (%2)\n\t"
+            "fistpl (%0)\n\t"
+            : : "r" (a0), "m" (b0), "r" (a1), "m" (b1),
+                "r" (dmod), "r" (dinvmod),
+                "m" (MPD_TWO63)
+            : "st", "memory"
     );
 }
 /* END PPRO GCC ASM */

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 18:14:17 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 18:14:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Use_newer_vers?=
 =?utf-8?q?ion_of_Pygments_that_handles_=22yield_from=22=2E?=
Message-ID: <3XVBX96MvczNQV@mail.python.org>

http://hg.python.org/cpython/rev/543c6a8d5787
changeset:   79332:543c6a8d5787
branch:      3.3
parent:      79330:fd8d3abab1c6
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 18:00:50 2012 +0200
summary:
  Use newer version of Pygments that handles "yield from".

files:
  Doc/Makefile |  2 +-
  Doc/make.bat |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -53,7 +53,7 @@
 	fi
 	@if [ ! -d tools/pygments ]; then \
 	  echo "Checking out Pygments..."; \
-	  svn checkout $(SVNROOT)/external/Pygments-1.3.1/pygments tools/pygments; \
+	  svn checkout $(SVNROOT)/external/Pygments-1.5dev-20120930/pygments tools/pygments; \
 	fi
 
 update: clean checkout
diff --git a/Doc/make.bat b/Doc/make.bat
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -37,7 +37,7 @@
 svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx
 svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils
 svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2
-svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments
+svn co %SVNROOT%/external/Pygments-1.5dev-20120930/pygments tools/pygments
 goto end
 
 :update

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 18:14:19 2012
From: python-checkins at python.org (georg.brandl)
Date: Sun, 30 Sep 2012 18:14:19 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_merge_with_3=2E3?=
Message-ID: <3XVBXC1YYrzNQV@mail.python.org>

http://hg.python.org/cpython/rev/8c6791aac0f2
changeset:   79333:8c6791aac0f2
parent:      79331:07d9d2901adb
parent:      79332:543c6a8d5787
user:        Georg Brandl <georg at python.org>
date:        Sun Sep 30 18:14:10 2012 +0200
summary:
  merge with 3.3

files:
  Doc/Makefile |  2 +-
  Doc/make.bat |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -53,7 +53,7 @@
 	fi
 	@if [ ! -d tools/pygments ]; then \
 	  echo "Checking out Pygments..."; \
-	  svn checkout $(SVNROOT)/external/Pygments-1.3.1/pygments tools/pygments; \
+	  svn checkout $(SVNROOT)/external/Pygments-1.5dev-20120930/pygments tools/pygments; \
 	fi
 
 update: clean checkout
diff --git a/Doc/make.bat b/Doc/make.bat
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -37,7 +37,7 @@
 svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx
 svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils
 svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2
-svn co %SVNROOT%/external/Pygments-1.3.1/pygments tools/pygments
+svn co %SVNROOT%/external/Pygments-1.5dev-20120930/pygments tools/pygments
 goto end
 
 :update

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 18:49:14 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sun, 30 Sep 2012 18:49:14 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogSXNzdWUgIzE1NTMz?=
 =?utf-8?q?=3A_Skip_test=5Fcwd=5Fwith=5Frelative=5F*=28=29_tests_on_Window?=
 =?utf-8?q?s_pending?=
Message-ID: <3XVCJV4PJwzMhf@mail.python.org>

http://hg.python.org/cpython/rev/d8d52b5b4bc2
changeset:   79334:d8d52b5b4bc2
branch:      3.2
parent:      79314:abfaa4368263
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Sep 30 09:45:00 2012 -0700
summary:
  Issue #15533: Skip test_cwd_with_relative_*() tests on Windows pending resolution of issue.

files:
  Lib/test/test_subprocess.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -206,6 +206,7 @@
         temp_dir = self._normalize_cwd(temp_dir)
         self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir)
 
+    @unittest.skipIf(mswindows, "pending resolution of issue #15533")
     def test_cwd_with_relative_arg(self):
         # Check that Popen looks for args[0] relative to cwd if args[0]
         # is relative.
@@ -221,6 +222,7 @@
             python_dir = self._normalize_cwd(python_dir)
             self._assert_cwd(python_dir, rel_python, cwd=python_dir)
 
+    @unittest.skipIf(mswindows, "pending resolution of issue #15533")
     def test_cwd_with_relative_executable(self):
         # Check that Popen looks for executable relative to cwd if executable
         # is relative (and that executable takes precedence over args[0]).

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 18:49:15 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sun, 30 Sep 2012 18:49:15 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_Issue_=2315533=3A_Merge_update_from_3=2E2=2E?=
Message-ID: <3XVCJW6kJTzMtd@mail.python.org>

http://hg.python.org/cpython/rev/17d709f0b69b
changeset:   79335:17d709f0b69b
branch:      3.3
parent:      79332:543c6a8d5787
parent:      79334:d8d52b5b4bc2
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Sep 30 09:46:04 2012 -0700
summary:
  Issue #15533: Merge update from 3.2.

files:
  Lib/test/test_subprocess.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -233,6 +233,7 @@
         temp_dir = self._normalize_cwd(temp_dir)
         self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir)
 
+    @unittest.skipIf(mswindows, "pending resolution of issue #15533")
     def test_cwd_with_relative_arg(self):
         # Check that Popen looks for args[0] relative to cwd if args[0]
         # is relative.
@@ -248,6 +249,7 @@
             python_dir = self._normalize_cwd(python_dir)
             self._assert_cwd(python_dir, rel_python, cwd=python_dir)
 
+    @unittest.skipIf(mswindows, "pending resolution of issue #15533")
     def test_cwd_with_relative_executable(self):
         # Check that Popen looks for executable relative to cwd if executable
         # is relative (and that executable takes precedence over args[0]).

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 18:49:17 2012
From: python-checkins at python.org (chris.jerdonek)
Date: Sun, 30 Sep 2012 18:49:17 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Issue_=2315533=3A_Merge_update_from_3=2E3=2E?=
Message-ID: <3XVCJY34hfzQLs@mail.python.org>

http://hg.python.org/cpython/rev/d10a7c1ac3a7
changeset:   79336:d10a7c1ac3a7
parent:      79333:8c6791aac0f2
parent:      79335:17d709f0b69b
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Sun Sep 30 09:46:55 2012 -0700
summary:
  Issue #15533: Merge update from 3.3.

files:
  Lib/test/test_subprocess.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -233,6 +233,7 @@
         temp_dir = self._normalize_cwd(temp_dir)
         self._assert_cwd(temp_dir, sys.executable, cwd=temp_dir)
 
+    @unittest.skipIf(mswindows, "pending resolution of issue #15533")
     def test_cwd_with_relative_arg(self):
         # Check that Popen looks for args[0] relative to cwd if args[0]
         # is relative.
@@ -248,6 +249,7 @@
             python_dir = self._normalize_cwd(python_dir)
             self._assert_cwd(python_dir, rel_python, cwd=python_dir)
 
+    @unittest.skipIf(mswindows, "pending resolution of issue #15533")
     def test_cwd_with_relative_executable(self):
         # Check that Popen looks for executable relative to cwd if executable
         # is relative (and that executable takes precedence over args[0]).

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 19:36:29 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 30 Sep 2012 19:36:29 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_doc_typo_fixes?=
Message-ID: <3XVDM11K9TzNtX@mail.python.org>

http://hg.python.org/cpython/rev/4f09f93e86b5
changeset:   79337:4f09f93e86b5
branch:      3.3
parent:      79335:17d709f0b69b
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Sep 30 10:36:07 2012 -0700
summary:
  doc typo fixes

files:
  Doc/library/gc.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst
--- a/Doc/library/gc.rst
+++ b/Doc/library/gc.rst
@@ -189,13 +189,13 @@
    after collection.  The callbacks will be called with two arguments,
    *phase* and *info*.
 
-   *phase* can one of two values:
+   *phase* can be one of two values:
 
       "start": The garbage collection is about to start.
 
       "stop": The garbage collection has finished.
 
-   *info* provides more information for the callback.  The following
+   *info* is a dict providing more information for the callback.  The following
    keys are currently defined:
 
       "generation": The oldest generation being collected.
@@ -203,7 +203,7 @@
       "collected": When *phase* is "stop", the number of objects
       successfully collected.
 
-      "uncollectable": when *phase* is "stop", the number of objects
+      "uncollectable": When *phase* is "stop", the number of objects
       that could not be collected and were put in :data:`garbage`.
 
    Applications can add their own callbacks to this list.  The primary

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 19:36:30 2012
From: python-checkins at python.org (gregory.p.smith)
Date: Sun, 30 Sep 2012 19:36:30 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_doc_typo_fixes?=
Message-ID: <3XVDM24sbYzQRh@mail.python.org>

http://hg.python.org/cpython/rev/cb2a8aefa0db
changeset:   79338:cb2a8aefa0db
parent:      79336:d10a7c1ac3a7
parent:      79337:4f09f93e86b5
user:        Gregory P. Smith <greg at krypto.org>
date:        Sun Sep 30 10:36:24 2012 -0700
summary:
  doc typo fixes

files:
  Doc/library/gc.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/gc.rst b/Doc/library/gc.rst
--- a/Doc/library/gc.rst
+++ b/Doc/library/gc.rst
@@ -189,13 +189,13 @@
    after collection.  The callbacks will be called with two arguments,
    *phase* and *info*.
 
-   *phase* can one of two values:
+   *phase* can be one of two values:
 
       "start": The garbage collection is about to start.
 
       "stop": The garbage collection has finished.
 
-   *info* provides more information for the callback.  The following
+   *info* is a dict providing more information for the callback.  The following
    keys are currently defined:
 
       "generation": The oldest generation being collected.
@@ -203,7 +203,7 @@
       "collected": When *phase* is "stop", the number of objects
       successfully collected.
 
-      "uncollectable": when *phase* is "stop", the number of objects
+      "uncollectable": When *phase* is "stop", the number of objects
       that could not be collected and were put in :data:`garbage`.
 
    Applications can add their own callbacks to this list.  The primary

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 19:47:36 2012
From: python-checkins at python.org (nick.coghlan)
Date: Sun, 30 Sep 2012 19:47:36 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Adjust_guidelines_for_What?=
 =?utf-8?q?=27s_New_maintenance_to_account_for_issues_encountered?=
Message-ID: <3XVDbr2zRmzQVm@mail.python.org>

http://hg.python.org/cpython/rev/6a358a4d2f75
changeset:   79339:6a358a4d2f75
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Sun Sep 30 18:51:53 2012 +0530
summary:
  Adjust guidelines for What's New maintenance to account for issues encountered in 3.3 and in past releases

files:
  Doc/whatsnew/3.4.rst |  62 ++++++++++++++++++++-----------
  1 files changed, 39 insertions(+), 23 deletions(-)


diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -7,28 +7,42 @@
 
 .. Rules for maintenance:
 
-   * Anyone can add text to this document.  Do not spend very much time
-   on the wording of your changes, because your text will probably
-   get rewritten to some degree.
+   * Anyone can add text to this document, but the maintainer reserves the
+   right to rewrite any additions. In particular, for obscure or esoteric
+   features, the maintainer may reduce any addition to a simple reference to
+   the new documentation rather than explaining the feature inline.
 
-   * The maintainer will go through Misc/NEWS periodically and add
-   changes; it's therefore more important to add your changes to
-   Misc/NEWS than to this file.
+   * While the maintainer will periodically go through Misc/NEWS
+   and add changes, it's best not to rely on this. We know from experience
+   that any changes that aren't in the What's New documentation around the
+   time of the original release will remain largely unknown to the community
+   for years, even if they're added later. We also know from experience that
+   other priorities can arise, and the maintainer will run out of time to do
+   updates - in such cases, end users will be much better served by partial
+   notifications that at least give a hint about new features to
+   investigate.
 
    * This is not a complete list of every single change; completeness
-   is the purpose of Misc/NEWS.  Some changes I consider too small
-   or esoteric to include.  If such a change is added to the text,
-   I'll just remove it.  (This is another reason you shouldn't spend
-   too much time on writing your addition.)
+   is the purpose of Misc/NEWS. The What's New should focus on changes that
+   are visible to Python *users* and that *require* a feature release (i.e.
+   most bug fixes should only be recorded in Misc/NEWS)
+
+   * PEPs should not be marked Final until they have an entry in What's New.
+   A placeholder entry that is just a section header and a link to the PEP
+   (e.g ":pep:`397` has been implemented") is acceptable. If a PEP has been
+   implemented and noted in What's New, don't forget to mark it as Final!
 
    * If you want to draw your new text to the attention of the
    maintainer, add 'XXX' to the beginning of the paragraph or
    section.
 
-   * It's OK to just add a fragmentary note about a change.  For
-   example: "XXX Describe the transmogrify() function added to the
-   socket module."  The maintainer will research the change and
-   write the necessary text.
+   * It's OK to add just a very brief note about a change.  For
+   example: "The :ref:`~socket.transmogrify()` function was added to the
+   :mod:`socket` module."  The maintainer will research the change and
+   write the necessary text (if appropriate). The advantage of doing this
+   is that even if no more descriptive text is ever added, readers will at
+   least have a notification that the new feature exists and a link to the
+   relevant documentation.
 
    * You can comment out your additions if you like, but it's not
    necessary (especially when a final release is some months away).
@@ -38,16 +52,18 @@
 
    * It's helpful to add the bug/patch number as a comment:
 
-   XXX Describe the transmogrify() function added to the socket
-   module.
-   (Contributed by P.Y. Developer in :issue:`12345`.)
+   The :ref:`~socket.transmogrify()` function was added to the
+   :mod:`socket` module. (Contributed by P.Y. Developer in :issue:`12345`.)
 
    This saves the maintainer the effort of going through the Mercurial log
    when researching a change.
 
+   * Cross referencing tip: :ref:`mod.attr` will display as ``mod.attr``,
+   while :ref:`~mod.attr` will display as ``attr``.
+
 This article explains the new features in Python 3.4, compared to 3.3.
 
-.. Python 3.4 was released on September 29, 2012.
+.. Python 3.4 was released on TBD.
 
 For full details, see the :source:`Misc/NEWS` file.
 
@@ -58,7 +74,7 @@
 
 .. seealso::
 
-    .. :pep:`4XX` - Python 3.4 Release Schedule
+   .. :pep:`4XX` - Python 3.4 Release Schedule
 
 
 Summary -- Release highlights
@@ -98,16 +114,16 @@
 
 .. _pep-4XX:
 
-.. PEP 4XX: Virtual Environments
-.. =============================
+.. PEP 4XX: Example PEP
+.. ====================
 
 
 .. (Implemented by Foo Bar.)
 
 .. .. seealso::
 
-    :pep:`4XX` - Python Virtual Environments
-       PEP written by Carl Meyer
+   :pep:`4XX` - Example PEP
+      PEP written by Example Author
 
 
 

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 21:21:28 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 21:21:28 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython=3A_Suppress_unknown_pragma_wa?=
 =?utf-8?q?rning_=28STDC_FENV=5FACCESS=29=2E?=
Message-ID: <3XVGh83g53zNZP@mail.python.org>

http://hg.python.org/cpython/rev/5cfe8af7abb2
changeset:   79340:5cfe8af7abb2
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 21:12:53 2012 +0200
summary:
  Suppress unknown pragma warning (STDC FENV_ACCESS).

files:
  setup.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1985,6 +1985,7 @@
                 # solaris: problems with register allocation.
                 # icc >= 11.0 works as well.
                 define_macros = config['ppro']
+                extra_compile_args.append('-Wno-unknown-pragmas')
             else:
                 define_macros = config['ansi32']
         else:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 21:37:39 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 21:37:39 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Backport_5cfe8?=
	=?utf-8?q?af7abb2=2E?=
Message-ID: <3XVH2q4DqszQcw@mail.python.org>

http://hg.python.org/cpython/rev/cb1402f70599
changeset:   79341:cb1402f70599
branch:      3.3
parent:      79337:4f09f93e86b5
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 21:26:33 2012 +0200
summary:
  Backport 5cfe8af7abb2.

files:
  setup.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1985,6 +1985,7 @@
                 # solaris: problems with register allocation.
                 # icc >= 11.0 works as well.
                 define_macros = config['ppro']
+                extra_compile_args.append('-Wno-unknown-pragmas')
             else:
                 define_macros = config['ansi32']
         else:

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 21:37:41 2012
From: python-checkins at python.org (stefan.krah)
Date: Sun, 30 Sep 2012 21:37:41 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
	=?utf-8?q?=29=3A_Null_merge=2E?=
Message-ID: <3XVH2s08kGzQcx@mail.python.org>

http://hg.python.org/cpython/rev/86b8a0576386
changeset:   79342:86b8a0576386
parent:      79340:5cfe8af7abb2
parent:      79341:cb1402f70599
user:        Stefan Krah <skrah at bytereef.org>
date:        Sun Sep 30 21:28:46 2012 +0200
summary:
  Null merge.

files:



-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 21:49:06 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 30 Sep 2012 21:49:06 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMi43KTogIzE1OTIzOiBmaXgg?=
 =?utf-8?q?a_mistake_in_asdl=5Fc=2Epy_that_resulted_in_a_TypeError_after?=
Message-ID: <3XVHJ26VB0zQfD@mail.python.org>

http://hg.python.org/cpython/rev/8f07ab82de92
changeset:   79343:8f07ab82de92
branch:      2.7
parent:      79302:15fd0b4496e0
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Sep 30 22:41:37 2012 +0300
summary:
  #15923: fix a mistake in asdl_c.py that resulted in a TypeError after 2801bf875a24 (see #15801).

files:
  Misc/NEWS        |  3 +++
  Parser/asdl_c.py |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -430,6 +430,9 @@
 Build
 -----
 
+- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after
+  2801bf875a24 (see #15801).
+
 - Issue #11715: Fix multiarch detection without having Debian development
   tools (dpkg-dev) installed.
 
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1033,7 +1033,7 @@
             self.emit("case %s:" % t.name, 2)
             self.emit("Py_INCREF(%s_singleton);" % t.name, 3)
             self.emit("return %s_singleton;" % t.name, 3)
-        self.emit("default:" % name, 2)
+        self.emit("default:", 2)
         self.emit('/* should never happen, but just in case ... */', 3)
         code = "PyErr_Format(PyExc_SystemError, \"unknown %s found\");" % name
         self.emit(code, 3, reflow=False)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 21:49:08 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 30 Sep 2012 21:49:08 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAoMy4yKTogIzE1OTIzOiBmaXgg?=
 =?utf-8?q?a_mistake_in_asdl=5Fc=2Epy_that_resulted_in_a_TypeError_after?=
Message-ID: <3XVHJ41mt6zQgf@mail.python.org>

http://hg.python.org/cpython/rev/cb988d601803
changeset:   79344:cb988d601803
branch:      3.2
parent:      79334:d8d52b5b4bc2
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Sep 30 22:41:37 2012 +0300
summary:
  #15923: fix a mistake in asdl_c.py that resulted in a TypeError after 2801bf875a24 (see #15801).

files:
  Misc/NEWS        |  3 +++
  Parser/asdl_c.py |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -564,6 +564,9 @@
 Build
 -----
 
+- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after
+  2801bf875a24 (see #15801).
+
 - Issue #11715: Fix multiarch detection without having Debian development
   tools (dpkg-dev) installed.
 
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1010,7 +1010,7 @@
             self.emit("case %s:" % t.name, 2)
             self.emit("Py_INCREF(%s_singleton);" % t.name, 3)
             self.emit("return %s_singleton;" % t.name, 3)
-        self.emit("default:" % name, 2)
+        self.emit("default:", 2)
         self.emit('/* should never happen, but just in case ... */', 3)
         code = "PyErr_Format(PyExc_SystemError, \"unknown %s found\");" % name
         self.emit(code, 3, reflow=False)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 21:49:09 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 30 Sep 2012 21:49:09 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?b?Y3B5dGhvbiAobWVyZ2UgMy4yIC0+IDMuMyk6?=
 =?utf-8?q?_=2315923=3A_merge_with_3=2E2=2E?=
Message-ID: <3XVHJ548MzzQcw@mail.python.org>

http://hg.python.org/cpython/rev/e7a55a393a80
changeset:   79345:e7a55a393a80
branch:      3.3
parent:      79341:cb1402f70599
parent:      79344:cb988d601803
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Sep 30 22:47:47 2012 +0300
summary:
  #15923: merge with 3.2.

files:
  Misc/NEWS        |  3 +++
  Parser/asdl_c.py |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -99,6 +99,9 @@
 Build
 -----
 
+- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after
+  2801bf875a24 (see #15801).
+
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1064,7 +1064,7 @@
             self.emit("case %s:" % t.name, 2)
             self.emit("Py_INCREF(%s_singleton);" % t.name, 3)
             self.emit("return %s_singleton;" % t.name, 3)
-        self.emit("default:" % name, 2)
+        self.emit("default:", 2)
         self.emit('/* should never happen, but just in case ... */', 3)
         code = "PyErr_Format(PyExc_SystemError, \"unknown %s found\");" % name
         self.emit(code, 3, reflow=False)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 21:49:10 2012
From: python-checkins at python.org (ezio.melotti)
Date: Sun, 30 Sep 2012 21:49:10 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?b?KTogIzE1OTIzOiBtZXJnZSB3aXRoIDMuMy4=?=
Message-ID: <3XVHJ66VfwzQhm@mail.python.org>

http://hg.python.org/cpython/rev/b392a39970bb
changeset:   79346:b392a39970bb
parent:      79342:86b8a0576386
parent:      79345:e7a55a393a80
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Sep 30 22:48:20 2012 +0300
summary:
  #15923: merge with 3.3.

files:
  Misc/NEWS        |  3 +++
  Parser/asdl_c.py |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -106,6 +106,9 @@
 Build
 -----
 
+- Issue #15923: fix a mistake in asdl_c.py that resulted in a TypeError after
+  2801bf875a24 (see #15801).
+
 - Issue #15819: Make sure we can build Python out-of-tree from a readonly
   source directory.  (Somewhat related to Issue #9860.)
 
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1064,7 +1064,7 @@
             self.emit("case %s:" % t.name, 2)
             self.emit("Py_INCREF(%s_singleton);" % t.name, 3)
             self.emit("return %s_singleton;" % t.name, 3)
-        self.emit("default:" % name, 2)
+        self.emit("default:", 2)
         self.emit('/* should never happen, but just in case ... */', 3)
         code = "PyErr_Format(PyExc_SystemError, \"unknown %s found\");" % name
         self.emit(code, 3, reflow=False)

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 23:30:22 2012
From: python-checkins at python.org (r.david.murray)
Date: Sun, 30 Sep 2012 23:30:22 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=283=2E3=29=3A_Add_some_missi?=
	=?utf-8?q?ng_stuff_to_whatsnew=2E?=
Message-ID: <3XVKXt0GcXzQcH@mail.python.org>

http://hg.python.org/cpython/rev/51175f1e67fd
changeset:   79347:51175f1e67fd
branch:      3.3
parent:      79345:e7a55a393a80
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Sep 30 17:28:54 2012 -0400
summary:
  Add some missing stuff to whatsnew.

files:
  Doc/whatsnew/3.3.rst |  62 ++++++++++++++++++++++++-------
  Misc/NEWS            |   2 +-
  2 files changed, 48 insertions(+), 16 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -797,7 +797,9 @@
   (Contributed by Petri Lehtinen in :issue:`12170`)
 
 * New methods have been added to :class:`list` and :class:`bytearray`:
-  ``copy()`` and ``clear()``.  (:issue:`10516`)
+  ``copy()`` and ``clear()`` (:issue:`10516`).  Consequently,
+  :class:`~collections.abc.MutableSequence` now also defines a
+  :meth:`~collections.abc.MutableSequence.clear` method (:issue:`11388`).
 
 * Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
 
@@ -918,6 +920,10 @@
 
 (Contributed by Darren Dale in :issue:`11610`)
 
+:meth:`abc.ABCMeta.register` now returns the registered subclass, which means
+it can now be used as a class decorator (:issue:`10868`).
+
+
 array
 -----
 
@@ -1057,7 +1063,8 @@
 --------
 
  * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances now return :const:`False` instead of raising :exc:`TypeError`.
+   instances now return :const:`False` instead of raising :exc:`TypeError`
+   (:issue:`15006`).
  * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
@@ -1322,18 +1329,20 @@
 ftplib
 ------
 
+* :class:`ftplib.FTP` now accepts a ``source_address`` keyword argument to
+  specify the ``(host, port)`` to use as the source address in the bind call
+  when creating the outgoing socket.  (Contributed by Giampaolo Rodol?
+  in :issue:`8594`.)
+
 * The :class:`~ftplib.FTP_TLS` class now provides a new
   :func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
-  plaintext.  This can be useful to take advantage of firewalls that know how to
-  handle NAT with non-secure FTP without opening fixed ports.
-
-  (Contributed by Giampaolo Rodol? in :issue:`12139`)
+  plaintext.  This can be useful to take advantage of firewalls that know how
+  to handle NAT with non-secure FTP without opening fixed ports.  (Contributed
+  by Giampaolo Rodol? in :issue:`12139`)
 
 * Added :meth:`ftplib.FTP.mlsd` method which provides a parsable directory
   listing format and deprecates :meth:`ftplib.FTP.nlst` and
-  :meth:`ftplib.FTP.dir`.
-
-  (Contributed by Giampaolo Rodol? in :issue:`11072`)
+  :meth:`ftplib.FTP.dir`.  (Contributed by Giampaolo Rodol? in :issue:`11072`)
 
 gc
 --
@@ -1438,6 +1447,10 @@
 multiprocessing connections.
 (Contributed by Richard Oudkerk in :issue:`4892`.)
 
+:class:`multiprocessing.Process` now accepts a ``daemon`` keyword argument
+to override the default behavior of inheriting the ``daemon`` flag from
+the parent process (:issue:`6064`).
+
 
 nntplib
 -------
@@ -1640,23 +1653,22 @@
 shutil
 ------
 
-* The :mod:`shutil` module has these new fuctions:
+* New functions:
 
   * :func:`~shutil.disk_usage`: provides total, used and free disk space
     statistics. (Contributed by Giampaolo Rodol? in :issue:`12442`)
   * :func:`~shutil.chown`: allows one to change user and/or group of the given
     path also specifying the user/group names and not only their numeric
     ids. (Contributed by Sandro Tosi in :issue:`12191`)
+  * :func:`shutil.get_terminal_size`: returns the size of the terminal window
+    to which the interpreter is attached.  (Contributed by Zbigniew
+    J?drzejewski-Szmek in :issue:`13609`.)
 
 * :func:`~shutil.copy2` and :func:`~shutil.copystat` now preserve file
   timestamps with nanosecond precision on platforms that support it.
   They also preserve file "extended attributes" on Linux.  (Contributed
   by Larry Hastings in :issue:`14127` and  :issue:`15238`.)
 
-* The new :func:`shutil.get_terminal_size` function returns the size of the
-  terminal window the interpreter is attached to.
-  (Contributed by Zbigniew J?drzejewski-Szmek in :issue:`13609`.)
-
 * Several functions now take an optional ``symlinks`` argument: when that
   parameter is true, symlinks aren't dereferenced and the operation instead
   acts on the symlink itself (or creates one, if relevant).
@@ -1736,6 +1748,10 @@
   (http://en.wikipedia.org/wiki/Reliable_Datagram_Sockets and
   http://oss.oracle.com/projects/rds/).
 
+* New function :func:`~socket.sethostname` allows the hostname to be set
+  on unix systems if the calling process has sufficient privileges.
+  (Contributed by Ross Lagerwall in :issue:`10866`.)
+
 
 ssl
 ---
@@ -1811,6 +1827,15 @@
 
 (:issue:`13857`)
 
+
+threading
+---------
+
+The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword
+argument to override the default behavior of inheriting the ``deamon`` flag
+value from the parent thread (:issue:`6064`).
+
+
 time
 ----
 
@@ -1956,6 +1981,8 @@
 Windows 2000 and Windows platforms which set ``COMSPEC`` to ``command.com``
 are no longer supported due to maintenance burden.
 
+OSF support, which was deprecated in 3.2, has been completely removed.
+
 
 Deprecated Python modules, functions and methods
 ------------------------------------------------
@@ -2153,7 +2180,12 @@
 * :func:`email.utils.formataddr` now does the correct content transfer
   encoding when passed non-``ASCII`` display names.  Any code that depended on
   the previous buggy behavior that preserved the non-``ASCII`` unicode in the
-  formatted output string will need to be changed.
+  formatted output string will need to be changed (:issue:`1690608`).
+
+* :meth:`poplib.POP3.quit` may now raise protocol errors like all other
+  ``poplib`` methods.  Code that assumes ``quit`` does not raise
+  :exc:`poplib.error_proto` errors may need to be changed if errors on ``quit``
+  are encountered by a particular application (:issue:`11291`).
 
 
 Porting C code
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3859,7 +3859,7 @@
   functions (BSD and OS X).  Also add new stat file flags for OS X
   (UF_HIDDEN and UF_COMPRESSED).
 
-- Issue #10645: Installing Python does no longer create a
+- Issue #10645: Installing Python no longer creates a
   Python-X.Y.Z-pyX.Y.egg-info file in the lib-dynload directory.
 
 - Do not accidentally include the directory containing sqlite.h twice when

-- 
Repository URL: http://hg.python.org/cpython

From python-checkins at python.org  Sun Sep 30 23:30:23 2012
From: python-checkins at python.org (r.david.murray)
Date: Sun, 30 Sep 2012 23:30:23 +0200 (CEST)
Subject: [Python-checkins] =?utf-8?q?cpython_=28merge_3=2E3_-=3E_default?=
 =?utf-8?q?=29=3A_Merge=3A_Add_some_missing_stuff_to_whatsnew=2E?=
Message-ID: <3XVKXv3y4SzQYR@mail.python.org>

http://hg.python.org/cpython/rev/5876a24b613a
changeset:   79348:5876a24b613a
parent:      79346:b392a39970bb
parent:      79347:51175f1e67fd
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Sep 30 17:29:54 2012 -0400
summary:
  Merge: Add some missing stuff to whatsnew.

files:
  Doc/whatsnew/3.3.rst |  62 ++++++++++++++++++++++++-------
  Misc/NEWS            |   2 +-
  2 files changed, 48 insertions(+), 16 deletions(-)


diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -797,7 +797,9 @@
   (Contributed by Petri Lehtinen in :issue:`12170`)
 
 * New methods have been added to :class:`list` and :class:`bytearray`:
-  ``copy()`` and ``clear()``.  (:issue:`10516`)
+  ``copy()`` and ``clear()`` (:issue:`10516`).  Consequently,
+  :class:`~collections.abc.MutableSequence` now also defines a
+  :meth:`~collections.abc.MutableSequence.clear` method (:issue:`11388`).
 
 * Raw bytes literals can now be written ``rb"..."`` as well as ``br"..."``.
 
@@ -918,6 +920,10 @@
 
 (Contributed by Darren Dale in :issue:`11610`)
 
+:meth:`abc.ABCMeta.register` now returns the registered subclass, which means
+it can now be used as a class decorator (:issue:`10868`).
+
+
 array
 -----
 
@@ -1057,7 +1063,8 @@
 --------
 
  * Equality comparisons between naive and aware :class:`~datetime.datetime`
-   instances now return :const:`False` instead of raising :exc:`TypeError`.
+   instances now return :const:`False` instead of raising :exc:`TypeError`
+   (:issue:`15006`).
  * New :meth:`datetime.datetime.timestamp` method: Return POSIX timestamp
    corresponding to the :class:`~datetime.datetime` instance.
  * The :meth:`datetime.datetime.strftime` method supports formatting years
@@ -1322,18 +1329,20 @@
 ftplib
 ------
 
+* :class:`ftplib.FTP` now accepts a ``source_address`` keyword argument to
+  specify the ``(host, port)`` to use as the source address in the bind call
+  when creating the outgoing socket.  (Contributed by Giampaolo Rodol?
+  in :issue:`8594`.)
+
 * The :class:`~ftplib.FTP_TLS` class now provides a new
   :func:`~ftplib.FTP_TLS.ccc` function to revert control channel back to
-  plaintext.  This can be useful to take advantage of firewalls that know how to
-  handle NAT with non-secure FTP without opening fixed ports.
-
-  (Contributed by Giampaolo Rodol? in :issue:`12139`)
+  plaintext.  This can be useful to take advantage of firewalls that know how
+  to handle NAT with non-secure FTP without opening fixed ports.  (Contributed
+  by Giampaolo Rodol? in :issue:`12139`)
 
 * Added :meth:`ftplib.FTP.mlsd` method which provides a parsable directory
   listing format and deprecates :meth:`ftplib.FTP.nlst` and
-  :meth:`ftplib.FTP.dir`.
-
-  (Contributed by Giampaolo Rodol? in :issue:`11072`)
+  :meth:`ftplib.FTP.dir`.  (Contributed by Giampaolo Rodol? in :issue:`11072`)
 
 gc
 --
@@ -1438,6 +1447,10 @@
 multiprocessing connections.
 (Contributed by Richard Oudkerk in :issue:`4892`.)
 
+:class:`multiprocessing.Process` now accepts a ``daemon`` keyword argument
+to override the default behavior of inheriting the ``daemon`` flag from
+the parent process (:issue:`6064`).
+
 
 nntplib
 -------
@@ -1640,23 +1653,22 @@
 shutil
 ------
 
-* The :mod:`shutil` module has these new fuctions:
+* New functions:
 
   * :func:`~shutil.disk_usage`: provides total, used and free disk space
     statistics. (Contributed by Giampaolo Rodol? in :issue:`12442`)
   * :func:`~shutil.chown`: allows one to change user and/or group of the given
     path also specifying the user/group names and not only their numeric
     ids. (Contributed by Sandro Tosi in :issue:`12191`)
+  * :func:`shutil.get_terminal_size`: returns the size of the terminal window
+    to which the interpreter is attached.  (Contributed by Zbigniew
+    J?drzejewski-Szmek in :issue:`13609`.)
 
 * :func:`~shutil.copy2` and :func:`~shutil.copystat` now preserve file
   timestamps with nanosecond precision on platforms that support it.
   They also preserve file "extended attributes" on Linux.  (Contributed
   by Larry Hastings in :issue:`14127` and  :issue:`15238`.)
 
-* The new :func:`shutil.get_terminal_size` function returns the size of the
-  terminal window the interpreter is attached to.
-  (Contributed by Zbigniew J?drzejewski-Szmek in :issue:`13609`.)
-
 * Several functions now take an optional ``symlinks`` argument: when that
   parameter is true, symlinks aren't dereferenced and the operation instead
   acts on the symlink itself (or creates one, if relevant).
@@ -1736,6 +1748,10 @@
   (http://en.wikipedia.org/wiki/Reliable_Datagram_Sockets and
   http://oss.oracle.com/projects/rds/).
 
+* New function :func:`~socket.sethostname` allows the hostname to be set
+  on unix systems if the calling process has sufficient privileges.
+  (Contributed by Ross Lagerwall in :issue:`10866`.)
+
 
 ssl
 ---
@@ -1811,6 +1827,15 @@
 
 (:issue:`13857`)
 
+
+threading
+---------
+
+The :class:`threading.Thread` constructor now accepts a ``daemon`` keyword
+argument to override the default behavior of inheriting the ``deamon`` flag
+value from the parent thread (:issue:`6064`).
+
+
 time
 ----
 
@@ -1956,6 +1981,8 @@
 Windows 2000 and Windows platforms which set ``COMSPEC`` to ``command.com``
 are no longer supported due to maintenance burden.
 
+OSF support, which was deprecated in 3.2, has been completely removed.
+
 
 Deprecated Python modules, functions and methods
 ------------------------------------------------
@@ -2153,7 +2180,12 @@
 * :func:`email.utils.formataddr` now does the correct content transfer
   encoding when passed non-``ASCII`` display names.  Any code that depended on
   the previous buggy behavior that preserved the non-``ASCII`` unicode in the
-  formatted output string will need to be changed.
+  formatted output string will need to be changed (:issue:`1690608`).
+
+* :meth:`poplib.POP3.quit` may now raise protocol errors like all other
+  ``poplib`` methods.  Code that assumes ``quit`` does not raise
+  :exc:`poplib.error_proto` errors may need to be changed if errors on ``quit``
+  are encountered by a particular application (:issue:`11291`).
 
 
 Porting C code
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3869,7 +3869,7 @@
   functions (BSD and OS X).  Also add new stat file flags for OS X
   (UF_HIDDEN and UF_COMPRESSED).
 
-- Issue #10645: Installing Python does no longer create a
+- Issue #10645: Installing Python no longer creates a
   Python-X.Y.Z-pyX.Y.egg-info file in the lib-dynload directory.
 
 - Do not accidentally include the directory containing sqlite.h twice when

-- 
Repository URL: http://hg.python.org/cpython